From 407867c9b13e43d51268b28b6454107796325716 Mon Sep 17 00:00:00 2001 From: John Cardinal Date: Wed, 19 Dec 2018 18:28:06 +0000 Subject: [PATCH] --- server/AyaNova/biz/UserBiz.cs | 25 ++++++++++++++----------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/server/AyaNova/biz/UserBiz.cs b/server/AyaNova/biz/UserBiz.cs index 87d03cca..c9fef09d 100644 --- a/server/AyaNova/biz/UserBiz.cs +++ b/server/AyaNova/biz/UserBiz.cs @@ -84,6 +84,8 @@ namespace AyaNova.Biz var SearchParams = new Search.SearchIndexProcessObjectParameters(UserLocaleId, inObj.Id, BizType, inObj.Name); SearchParams.AddWord(inObj.Notes).AddWord(inObj.Name).AddWord(inObj.EmployeeNumber).AddWord(inObj.Tags); Search.ProcessNewObjectKeywords(SearchParams); + //TAGS + TagUtil.ProcessUpdateTagsInRepository(ct, inObj.Tags, null); return inObj; @@ -124,6 +126,9 @@ namespace AyaNova.Biz SearchParams.AddWord(inObj.Notes).AddWord(inObj.Name).AddWord(inObj.EmployeeNumber).AddWord(inObj.Tags); Search.ProcessNewObjectKeywords(SearchParams); + //TAGS + TagUtil.ProcessUpdateTagsInRepository(TempContext, inObj.Tags, null); + return inObj; } @@ -289,11 +294,12 @@ namespace AyaNova.Biz //Log modification EventLogProcessor.LogEventToDatabase(new Event(UserId, dbObj.Id, BizType, AyaEvent.Modified), ct); //Update keywords - // Search.ProcessUpdatedObjectKeywords(UserLocaleId, dbObj.Id, BizType, dbObj.Name, dbObj.EmployeeNumber, dbObj.Notes, dbObj.Name); var SearchParams = new Search.SearchIndexProcessObjectParameters(UserLocaleId, dbObj.Id, BizType, dbObj.Name); SearchParams.AddWord(dbObj.Notes).AddWord(dbObj.Name).AddWord(dbObj.EmployeeNumber).AddWord(dbObj.Tags); Search.ProcessUpdatedObjectKeywords(SearchParams); + TagUtil.ProcessUpdateTagsInRepository(ct, dbObj.Tags, SnapshotOfOriginalDBObj.Tags); + return true; } @@ -332,6 +338,8 @@ namespace AyaNova.Biz SearchParams.AddWord(dbObj.Notes).AddWord(dbObj.Name).AddWord(dbObj.EmployeeNumber).AddWord(dbObj.Tags); Search.ProcessUpdatedObjectKeywords(SearchParams); + TagUtil.ProcessUpdateTagsInRepository(ct, dbObj.Tags, SnapshotOfOriginalDBObj.Tags); + return true; } @@ -353,16 +361,11 @@ namespace AyaNova.Biz //USEROPTIONS ct.Database.ExecuteSqlCommand($"delete from auseroptions where userid={dbObj.Id}"); - //Event log process delete + EventLogProcessor.DeleteObject(UserId, BizType, dbObj.Id, dbObj.Name, ct); - ct.SaveChanges(); - - //Delete search index + ct.SaveChanges(); Search.ProcessDeletedObjectKeywords(dbObj.Id, BizType); - - // //TAGS - // TagMapBiz.DeleteAllForObject(new AyaTypeId(BizType, dbObj.Id), ct); - // ct.SaveChanges(); + TagUtil.ProcessDeleteTagsInRepository(ct, dbObj.Tags); return true; } @@ -399,8 +402,8 @@ namespace AyaNova.Biz { //going from non tech to tech and active //Yes, this is about to consume one more license, check that we are not at the limit already - CheckActiveForValidation(CurrentActiveCount, LicensedUserCount); - } + CheckActiveForValidation(CurrentActiveCount, LicensedUserCount); + } } }