diff --git a/server/AyaNova/biz/UserBiz.cs b/server/AyaNova/biz/UserBiz.cs index 4be598de..ea9350cb 100644 --- a/server/AyaNova/biz/UserBiz.cs +++ b/server/AyaNova/biz/UserBiz.cs @@ -474,12 +474,19 @@ namespace AyaNova.Biz break; case "eventlog": { - var V7Id = new Guid(j["ID"].Value()); - //handle EventLog entries for users now that we have the user's created - //Log - //EventLogProcessor.AddEntry(new Event(userId, o.Id, AyaType.User, AyaEvent.Created), ct); - //MODIFIED HERE - // await ct.SaveChangesAsync(); + var V7Id = new Guid(j["ID"].Value()); + var RavenUserId = importMap.Where(m => m.V7ObjectId == V7Id).First().NewObjectAyaTypeId.ObjectId; + var Creator = importMap.Where(m => m.V7ObjectId == new Guid(j["Creator"].Value())).First().NewObjectAyaTypeId.ObjectId; + var Modifier = importMap.Where(m => m.V7ObjectId == new Guid(j["Modifier"].Value())).First().NewObjectAyaTypeId.ObjectId; + var Created = j["Created"].Value(); + var Modified = j["Modified"].Value(); + + //handle EventLog entries for users now that we have the user's created + //Created + EventLogProcessor.AddEntry(new Event(Creator, RavenUserId, AyaType.User, AyaEvent.Created, Created), ct); + //MODIFIED + EventLogProcessor.AddEntry(new Event(Modifier, RavenUserId, AyaType.User, AyaEvent.Modified, Modified), ct); + await ct.SaveChangesAsync(); } break; diff --git a/server/AyaNova/models/Event.cs b/server/AyaNova/models/Event.cs index 1577d444..37f76e52 100644 --- a/server/AyaNova/models/Event.cs +++ b/server/AyaNova/models/Event.cs @@ -47,6 +47,21 @@ namespace AyaNova.Models } } + public Event(long ownerId, long ayId, AyaType ayType, AyaEvent ayEvent, DateTime created, string textra = null) + { + Created = created; + OwnerId = ownerId; + AyId = ayId; + AyType = ayType; + AyEvent = ayEvent; + if (textra != null) + { + if (textra.Length > 255) + textra = textra.Substring(0, 255); + Textra = textra; + } + } + }//eoc }//eons