From 40dc2783106f1db128d5cf9c93e09e54a4893b26 Mon Sep 17 00:00:00 2001 From: John Cardinal Date: Mon, 8 Oct 2018 18:20:10 +0000 Subject: [PATCH] --- .../Controllers/AttachmentController.cs | 14 +++---- .../AyaNova/Controllers/LicenseController.cs | 10 ++--- .../AyaNova/Controllers/LocaleController.cs | 34 +++++------------ .../AyaNova/Controllers/MetricsController.cs | 8 ++-- .../Controllers/ServerStateController.cs | 3 +- server/AyaNova/Controllers/TrialController.cs | 5 +-- .../Controllers/UserOptionsController.cs | 37 ++++++++----------- server/AyaNova/biz/EventLogProcessor.cs | 10 ++--- server/AyaNova/biz/ImportAyaNova7Biz.cs | 6 +-- server/AyaNova/biz/LocaleBiz.cs | 14 ++++++- server/AyaNova/biz/TagBiz.cs | 15 ++++---- server/AyaNova/biz/TagGroupBiz.cs | 13 +++---- server/AyaNova/biz/UserBiz.cs | 20 ++++------ server/AyaNova/biz/UserOptionsBiz.cs | 7 ++++ server/AyaNova/biz/WidgetBiz.cs | 19 +++++----- 15 files changed, 96 insertions(+), 119 deletions(-) diff --git a/server/AyaNova/Controllers/AttachmentController.cs b/server/AyaNova/Controllers/AttachmentController.cs index e9082ae1..7cfe8c4d 100644 --- a/server/AyaNova/Controllers/AttachmentController.cs +++ b/server/AyaNova/Controllers/AttachmentController.cs @@ -230,9 +230,8 @@ namespace AyaNova.Api.Controllers }); //EVENT LOG - EventLogProcessor.AddEntryToContextNoSave(new Event(UserId, attachToObject.ObjectId, attachToObject.ObjectType, AyaEvent.AttachmentCreate, v.DisplayFileName), ct); - ct.SaveChanges(); - + EventLogProcessor.LogEventToDatabase(new Event(UserId, attachToObject.ObjectId, attachToObject.ObjectType, AyaEvent.AttachmentCreate, v.DisplayFileName), ct); + //SEARCH INDEXING Search.ProcessNewObjectKeywords(ct, UserLocaleIdFromContext.Id(HttpContext.Items), v.Id, AyaType.FileAttachment, v.DisplayFileName, v.DisplayFileName, v.Notes, v.StoredFileName); @@ -301,9 +300,8 @@ namespace AyaNova.Api.Controllers FileUtil.deleteFileAttachment(dbObj, ct); //Event log process delete - EventLogProcessor.AddEntryToContextNoSave(new Event(UserId, dbObj.AttachToObjectId, dbObj.AttachToObjectType, AyaEvent.AttachmentDelete, dbObj.DisplayFileName), ct); - ct.SaveChanges(); - + EventLogProcessor.LogEventToDatabase(new Event(UserId, dbObj.AttachToObjectId, dbObj.AttachToObjectType, AyaEvent.AttachmentDelete, dbObj.DisplayFileName), ct); + //Delete search index Search.ProcessDeletedObjectKeywords(ct, dbObj.Id, AyaType.FileAttachment); @@ -384,8 +382,8 @@ namespace AyaNova.Api.Controllers } //Log - EventLogProcessor.AddEntryToContextNoSave(new Event(UserId, dbObj.AttachToObjectId, dbObj.AttachToObjectType, AyaEvent.AttachmentDownload, dbObj.DisplayFileName), ct); - ct.SaveChanges(); + EventLogProcessor.LogEventToDatabase(new Event(UserId, dbObj.AttachToObjectId, dbObj.AttachToObjectType, AyaEvent.AttachmentDownload, dbObj.DisplayFileName), ct); + return PhysicalFile(filePath, mimetype, dbObj.DisplayFileName); } diff --git a/server/AyaNova/Controllers/LicenseController.cs b/server/AyaNova/Controllers/LicenseController.cs index d6b6cc15..8d9d84f3 100644 --- a/server/AyaNova/Controllers/LicenseController.cs +++ b/server/AyaNova/Controllers/LicenseController.cs @@ -127,9 +127,8 @@ namespace AyaNova.Api.Controllers } var ret = AyaNova.Core.License.LicenseInfoAsJson; //Log - EventLogProcessor.AddEntryToContextNoSave(new Event(UserIdFromContext.Id(HttpContext.Items), 0, AyaType.License, AyaEvent.LicenseFetch), ct); - ct.SaveChanges(); - + EventLogProcessor.LogEventToDatabase(new Event(UserIdFromContext.Id(HttpContext.Items), 0, AyaType.License, AyaEvent.LicenseFetch), ct); + return Ok(new ApiOkResponse(ret)); } @@ -180,9 +179,8 @@ namespace AyaNova.Api.Controllers var ret = Core.License.RequestTrial(requestData.EmailAddress, requestData.RegisteredTo, log); //Log - EventLogProcessor.AddEntryToContextNoSave(new Event(UserIdFromContext.Id(HttpContext.Items), 0, AyaType.License, AyaEvent.LicenseTrialRequest), ct); - ct.SaveChanges(); - + EventLogProcessor.LogEventToDatabase(new Event(UserIdFromContext.Id(HttpContext.Items), 0, AyaType.License, AyaEvent.LicenseTrialRequest), ct); + return Ok(new ApiOkResponse(ret)); } diff --git a/server/AyaNova/Controllers/LocaleController.cs b/server/AyaNova/Controllers/LocaleController.cs index 62fd9ea2..34f0f1da 100644 --- a/server/AyaNova/Controllers/LocaleController.cs +++ b/server/AyaNova/Controllers/LocaleController.cs @@ -183,13 +183,6 @@ namespace AyaNova.Api.Controllers } else { - //save to get Id - await ct.SaveChangesAsync(); - - //Log - EventLogProcessor.AddEntryToContextNoSave(new Event(biz.UserId, o.Id, AyaType.Locale, AyaEvent.Created), ct); - await ct.SaveChangesAsync(); - return CreatedAtAction("GetLocale", new { id = o.Id }, new ApiCreatedResponse(o)); } } @@ -241,17 +234,12 @@ namespace AyaNova.Api.Controllers //Instantiate the business object handler LocaleBiz biz = new LocaleBiz(ct, UserIdFromContext.Id(HttpContext.Items), UserRolesFromContext.Roles(HttpContext.Items)); - if (!biz.PutLocaleItemDisplayText(oFromDb, inObj, oDbParent)) - { - return BadRequest(new ApiErrorResponse(biz.Errors)); - } - - //Log - EventLogProcessor.AddEntryToContextNoSave(new Event(biz.UserId, oDbParent.Id, AyaType.Locale, AyaEvent.Modified), ct); - try { - await ct.SaveChangesAsync(); + if (!biz.PutLocaleItemDisplayText(oFromDb, inObj, oDbParent)) + { + return BadRequest(new ApiErrorResponse(biz.Errors)); + } } catch (DbUpdateConcurrencyException) { @@ -311,17 +299,13 @@ namespace AyaNova.Api.Controllers //Instantiate the business object handler LocaleBiz biz = new LocaleBiz(ct, UserIdFromContext.Id(HttpContext.Items), UserRolesFromContext.Roles(HttpContext.Items)); - if (!biz.PutLocaleName(oFromDb, inObj)) - { - return BadRequest(new ApiErrorResponse(biz.Errors)); - } - - //Log - EventLogProcessor.AddEntryToContextNoSave(new Event(biz.UserId, oFromDb.Id, AyaType.Locale, AyaEvent.Modified), ct); - try { - await ct.SaveChangesAsync(); + if (!biz.PutLocaleName(oFromDb, inObj)) + { + return BadRequest(new ApiErrorResponse(biz.Errors)); + } + } catch (DbUpdateConcurrencyException) { diff --git a/server/AyaNova/Controllers/MetricsController.cs b/server/AyaNova/Controllers/MetricsController.cs index 6c1773fd..aa9c54df 100644 --- a/server/AyaNova/Controllers/MetricsController.cs +++ b/server/AyaNova/Controllers/MetricsController.cs @@ -68,8 +68,7 @@ namespace AyaNova.Api.Controllers string sResult = await GetTheMetrics("plain"); //Log - EventLogProcessor.AddEntryToContextNoSave(new Event(UserIdFromContext.Id(HttpContext.Items), 0, AyaType.Metrics, AyaEvent.Retrieved), ct); - await ct.SaveChangesAsync(); + EventLogProcessor.LogEventToDatabase(new Event(UserIdFromContext.Id(HttpContext.Items), 0, AyaType.Metrics, AyaEvent.Retrieved), ct); return Content(sResult); } @@ -100,9 +99,8 @@ namespace AyaNova.Api.Controllers JObject json = JObject.Parse(sResult); //Log - EventLogProcessor.AddEntryToContextNoSave(new Event(UserIdFromContext.Id(HttpContext.Items), 0, AyaType.Metrics, AyaEvent.Retrieved), ct); - await ct.SaveChangesAsync(); - + EventLogProcessor.LogEventToDatabase(new Event(UserIdFromContext.Id(HttpContext.Items), 0, AyaType.Metrics, AyaEvent.Retrieved), ct); + return Ok(new ApiOkResponse(json)); } diff --git a/server/AyaNova/Controllers/ServerStateController.cs b/server/AyaNova/Controllers/ServerStateController.cs index c93c0247..d9798dc9 100644 --- a/server/AyaNova/Controllers/ServerStateController.cs +++ b/server/AyaNova/Controllers/ServerStateController.cs @@ -95,8 +95,7 @@ namespace AyaNova.Api.Controllers serverState.SetState(desiredState, state.Reason); //Log - EventLogProcessor.AddEntryToContextNoSave(new Event(UserIdFromContext.Id(HttpContext.Items), 0, AyaType.ServerState, AyaEvent.ServerStateChange, $"{state.ServerState}-{state.Reason}"), ct); - ct.SaveChanges(); + EventLogProcessor.LogEventToDatabase(new Event(UserIdFromContext.Id(HttpContext.Items), 0, AyaType.ServerState, AyaEvent.ServerStateChange, $"{state.ServerState}-{state.Reason}"), ct); return NoContent(); } diff --git a/server/AyaNova/Controllers/TrialController.cs b/server/AyaNova/Controllers/TrialController.cs index 69fce66e..36f6ae34 100644 --- a/server/AyaNova/Controllers/TrialController.cs +++ b/server/AyaNova/Controllers/TrialController.cs @@ -100,12 +100,9 @@ namespace AyaNova.Api.Controllers JobsBiz.AddJob(j, ct); //Log - EventLogProcessor.AddEntryToContextNoSave(new Event(UserIdFromContext.Id(HttpContext.Items), 0, AyaType.TrialSeeder, AyaEvent.Created, size), ct); - ct.SaveChanges(); - + EventLogProcessor.LogEventToDatabase(new Event(UserIdFromContext.Id(HttpContext.Items), 0, AyaType.TrialSeeder, AyaEvent.Created, size), ct); return Accepted(new { JobId = j.GId });//202 accepted - } diff --git a/server/AyaNova/Controllers/UserOptionsController.cs b/server/AyaNova/Controllers/UserOptionsController.cs index 728c6299..b5a3a777 100644 --- a/server/AyaNova/Controllers/UserOptionsController.cs +++ b/server/AyaNova/Controllers/UserOptionsController.cs @@ -81,14 +81,14 @@ namespace AyaNova.Api.Controllers if (o == null) { return NotFound(new ApiErrorResponse(ApiErrorCode.NOT_FOUND)); - } - + } + return Ok(new ApiOkResponse(o)); } - + /// /// Put (update) UserOptions /// @@ -111,7 +111,7 @@ namespace AyaNova.Api.Controllers { return BadRequest(new ApiErrorResponse(ModelState)); } - var UserId = UserIdFromContext.Id(HttpContext.Items); + var UserId = UserIdFromContext.Id(HttpContext.Items); var o = await ct.UserOptions.SingleOrDefaultAsync(m => m.UserId == id); @@ -128,16 +128,12 @@ namespace AyaNova.Api.Controllers //Instantiate the business object handler UserOptionsBiz biz = new UserOptionsBiz(ct, UserIdFromContext.Id(HttpContext.Items), UserRolesFromContext.Roles(HttpContext.Items)); - if (!biz.Put(o, inObj)) - { - return BadRequest(new ApiErrorResponse(biz.Errors)); - } - try { - //Log - EventLogProcessor.AddEntryToContextNoSave(new Event(biz.UserId, o.Id, AyaType.UserOptions, AyaEvent.Modified), ct); - await ct.SaveChangesAsync(); + if (!biz.Put(o, inObj)) + { + return BadRequest(new ApiErrorResponse(biz.Errors)); + } } catch (DbUpdateConcurrencyException) { @@ -169,7 +165,7 @@ namespace AyaNova.Api.Controllers /// [HttpPatch("{id}/{concurrencyToken}")] public async Task PatchUserOptions([FromRoute] long id, [FromRoute] uint concurrencyToken, [FromBody]JsonPatchDocument objectPatch) - { + { if (!serverState.IsOpen) { @@ -181,7 +177,7 @@ namespace AyaNova.Api.Controllers return BadRequest(new ApiErrorResponse(ModelState)); } - var UserId = UserIdFromContext.Id(HttpContext.Items); + var UserId = UserIdFromContext.Id(HttpContext.Items); //Instantiate the business object handler UserOptionsBiz biz = new UserOptionsBiz(ct, UserId, UserRolesFromContext.Roles(HttpContext.Items)); @@ -198,17 +194,14 @@ namespace AyaNova.Api.Controllers return StatusCode(401, new ApiNotAuthorizedResponse()); } - //patch and validate - if (!biz.Patch(o, objectPatch, concurrencyToken)) - { - return BadRequest(new ApiErrorResponse(biz.Errors)); - } try { - //Log - EventLogProcessor.AddEntryToContextNoSave(new Event(biz.UserId, o.Id, AyaType.UserOptions, AyaEvent.Modified), ct); - await ct.SaveChangesAsync(); + //patch and validate + if (!biz.Patch(o, objectPatch, concurrencyToken)) + { + return BadRequest(new ApiErrorResponse(biz.Errors)); + } } catch (DbUpdateConcurrencyException) { diff --git a/server/AyaNova/biz/EventLogProcessor.cs b/server/AyaNova/biz/EventLogProcessor.cs index 463ded7a..6c1a6b15 100644 --- a/server/AyaNova/biz/EventLogProcessor.cs +++ b/server/AyaNova/biz/EventLogProcessor.cs @@ -13,18 +13,18 @@ namespace AyaNova.Biz { internal static class EventLogProcessor { - private static ILogger log = AyaNova.Util.ApplicationLogging.CreateLogger("EventLogProcessor"); - + /// /// Add an entry to the log - /// DOES NOT SAVE + /// /// /// /// /// - internal static void AddEntryToContextNoSave(Event newEvent, AyContext ct) + internal static void LogEventToDatabase(Event newEvent, AyContext ct) { - ct.Event.Add(newEvent); + ct.Event.Add(newEvent); + ct.SaveChanges(); } diff --git a/server/AyaNova/biz/ImportAyaNova7Biz.cs b/server/AyaNova/biz/ImportAyaNova7Biz.cs index 02f88bf4..97850bd2 100644 --- a/server/AyaNova/biz/ImportAyaNova7Biz.cs +++ b/server/AyaNova/biz/ImportAyaNova7Biz.cs @@ -249,10 +249,10 @@ namespace AyaNova.Biz //handle EventLog entries for users now that we have the user's created //Created - EventLogProcessor.AddEntryToContextNoSave(new Event(Creator, RavenId, ayaType, AyaEvent.Created, Created), ct); + EventLogProcessor.LogEventToDatabase(new Event(Creator, RavenId, ayaType, AyaEvent.Created, Created), ct); //MODIFIED - EventLogProcessor.AddEntryToContextNoSave(new Event(Modifier, RavenId, ayaType, AyaEvent.Modified, Modified), ct); - await ct.SaveChangesAsync(); + EventLogProcessor.LogEventToDatabase(new Event(Modifier, RavenId, ayaType, AyaEvent.Modified, Modified), ct); + } ///////////////////////////////////////////////////////////////////// diff --git a/server/AyaNova/biz/LocaleBiz.cs b/server/AyaNova/biz/LocaleBiz.cs index be640438..ddd19996 100644 --- a/server/AyaNova/biz/LocaleBiz.cs +++ b/server/AyaNova/biz/LocaleBiz.cs @@ -63,6 +63,9 @@ namespace AyaNova.Biz //Add it to the context so the controller can save it ct.Locale.Add(NewLocale); + await ct.SaveChangesAsync(); + //Log + EventLogProcessor.LogEventToDatabase(new Event(UserId, NewLocale.Id, AyaType.Locale, AyaEvent.Created), ct); return NewLocale; } @@ -223,6 +226,10 @@ namespace AyaNova.Biz if (HasErrors) return false; + ct.SaveChanges(); + + //Log + EventLogProcessor.LogEventToDatabase(new Event(UserId, dbParent.Id, AyaType.Locale, AyaEvent.Modified), ct); return true; } @@ -247,6 +254,10 @@ namespace AyaNova.Biz if (HasErrors) return false; + ct.SaveChanges(); + //Log + EventLogProcessor.LogEventToDatabase(new Event(UserId, dbObj.Id, AyaType.Locale, AyaEvent.Modified), ct); + return true; } @@ -537,8 +548,7 @@ namespace AyaNova.Biz ct.SaveChanges(); //Log now that we have the Id, note that there is no source created / modified for this so just attributing to current userId - EventLogProcessor.AddEntryToContextNoSave(new Event(UserId, l.Id, AyaType.Locale, AyaEvent.Created), ct); - ct.SaveChanges(); + EventLogProcessor.LogEventToDatabase(new Event(UserId, l.Id, AyaType.Locale, AyaEvent.Created), ct); } break; diff --git a/server/AyaNova/biz/TagBiz.cs b/server/AyaNova/biz/TagBiz.cs index 103fa380..0c6f8537 100644 --- a/server/AyaNova/biz/TagBiz.cs +++ b/server/AyaNova/biz/TagBiz.cs @@ -76,8 +76,7 @@ namespace AyaNova.Biz //Handle child and associated items: //EVENT LOG - EventLogProcessor.AddEntryToContextNoSave(new Event(UserId, outObj.Id, BizType, AyaEvent.Created), ct); - await ct.SaveChangesAsync(); + EventLogProcessor.LogEventToDatabase(new Event(UserId, outObj.Id, BizType, AyaEvent.Created), ct); //SEARCH INDEXING Search.ProcessNewObjectKeywords(ct, UserLocaleId, outObj.Id, BizType, outObj.Name, outObj.Name); @@ -185,8 +184,8 @@ namespace AyaNova.Biz return false; //Log modification - EventLogProcessor.AddEntryToContextNoSave(new Event(UserId, dbObj.Id, BizType, AyaEvent.Modified), ct); - ct.SaveChanges(); + EventLogProcessor.LogEventToDatabase(new Event(UserId, dbObj.Id, BizType, AyaEvent.Modified), ct); + //Update keywords Search.ProcessUpdatedObjectKeywords(ct, UserLocaleId, dbObj.Id, BizType, dbObj.Name, dbObj.Name); @@ -210,8 +209,8 @@ namespace AyaNova.Biz return false; //Log modification - EventLogProcessor.AddEntryToContextNoSave(new Event(UserId, dbObj.Id, BizType, AyaEvent.Modified), ct); - ct.SaveChanges(); + EventLogProcessor.LogEventToDatabase(new Event(UserId, dbObj.Id, BizType, AyaEvent.Modified), ct); + //Update keywords Search.ProcessUpdatedObjectKeywords(ct, UserLocaleId, dbObj.Id, BizType, dbObj.Name, dbObj.Name); @@ -258,8 +257,8 @@ namespace AyaNova.Biz ct.Database.ExecuteSqlCommand($"delete from atagmap where tagid = {dbObj.Id}"); ct.Database.ExecuteSqlCommand($"delete from ataggroupmap where tagid = {dbObj.Id}"); //Log - EventLogProcessor.AddEntryToContextNoSave(new Event(UserId, dbObj.Id, BizType, AyaEvent.TagMassUntag), ct); - ct.SaveChanges(); + EventLogProcessor.LogEventToDatabase(new Event(UserId, dbObj.Id, BizType, AyaEvent.TagMassUntag), ct); + return true; } diff --git a/server/AyaNova/biz/TagGroupBiz.cs b/server/AyaNova/biz/TagGroupBiz.cs index 4db41fb8..33d2718b 100644 --- a/server/AyaNova/biz/TagGroupBiz.cs +++ b/server/AyaNova/biz/TagGroupBiz.cs @@ -66,9 +66,8 @@ namespace AyaNova.Biz await ct.TagGroup.AddAsync(outObj); //EVENT LOG - EventLogProcessor.AddEntryToContextNoSave(new Event(UserId, outObj.Id, BizType, AyaEvent.Created), ct); - await ct.SaveChangesAsync(); - + EventLogProcessor.LogEventToDatabase(new Event(UserId, outObj.Id, BizType, AyaEvent.Created), ct); + //SEARCH INDEXING Search.ProcessNewObjectKeywords(ct, UserLocaleId, outObj.Id, BizType, outObj.Name, outObj.Name); @@ -202,8 +201,8 @@ namespace AyaNova.Biz return false; //Log modification - EventLogProcessor.AddEntryToContextNoSave(new Event(UserId, dbObj.Id, BizType, AyaEvent.Modified), ct); - ct.SaveChanges(); + EventLogProcessor.LogEventToDatabase(new Event(UserId, dbObj.Id, BizType, AyaEvent.Modified), ct); + //Update keywords Search.ProcessUpdatedObjectKeywords(ct, UserLocaleId, dbObj.Id, BizType, dbObj.Name, dbObj.Name); @@ -226,8 +225,8 @@ namespace AyaNova.Biz return false; //Log modification - EventLogProcessor.AddEntryToContextNoSave(new Event(UserId, dbObj.Id, BizType, AyaEvent.Modified), ct); - ct.SaveChanges(); + EventLogProcessor.LogEventToDatabase(new Event(UserId, dbObj.Id, BizType, AyaEvent.Modified), ct); + //Update keywords Search.ProcessUpdatedObjectKeywords(ct, UserLocaleId, dbObj.Id, BizType, dbObj.Name, dbObj.Name); diff --git a/server/AyaNova/biz/UserBiz.cs b/server/AyaNova/biz/UserBiz.cs index c6f60859..c4ec3b5f 100644 --- a/server/AyaNova/biz/UserBiz.cs +++ b/server/AyaNova/biz/UserBiz.cs @@ -72,9 +72,8 @@ namespace AyaNova.Biz //Handle child and associated items //Log event - EventLogProcessor.AddEntryToContextNoSave(new Event(UserId, outObj.Id, BizType, AyaEvent.Created), ct); - await ct.SaveChangesAsync(); - + EventLogProcessor.LogEventToDatabase(new Event(UserId, outObj.Id, BizType, AyaEvent.Created), ct); + //SEARCH INDEXING Search.ProcessNewObjectKeywords(ct, UserLocaleId, outObj.Id, BizType, outObj.Name, outObj.EmployeeNumber, outObj.Notes, outObj.Name); @@ -110,9 +109,8 @@ namespace AyaNova.Biz //Handle child and associated items //Log event - EventLogProcessor.AddEntryToContextNoSave(new Event(UserId, outObj.Id, BizType, AyaEvent.Created), TempContext); - //ct.SaveChanges(); - + EventLogProcessor.LogEventToDatabase(new Event(UserId, outObj.Id, BizType, AyaEvent.Created), TempContext); + //SEARCH INDEXING Search.ProcessNewObjectKeywords(TempContext, UserLocaleId, outObj.Id, BizType, outObj.Name, outObj.EmployeeNumber, outObj.Notes, outObj.Name); @@ -132,8 +130,7 @@ namespace AyaNova.Biz if (ret != null) { //Log - EventLogProcessor.AddEntryToContextNoSave(new Event(UserId, fetchId, BizType, AyaEvent.Retrieved), ct); - ct.SaveChanges(); + EventLogProcessor.LogEventToDatabase(new Event(UserId, fetchId, BizType, AyaEvent.Retrieved), ct); } return ret; } @@ -254,8 +251,7 @@ namespace AyaNova.Biz //Log modification - EventLogProcessor.AddEntryToContextNoSave(new Event(UserId, dbObj.Id, BizType, AyaEvent.Modified), ct); - ct.SaveChanges(); + EventLogProcessor.LogEventToDatabase(new Event(UserId, dbObj.Id, BizType, AyaEvent.Modified), ct); //Update keywords Search.ProcessUpdatedObjectKeywords(ct, UserLocaleId, dbObj.Id, BizType, dbObj.Name, dbObj.EmployeeNumber, dbObj.Notes, dbObj.Name); @@ -288,8 +284,8 @@ namespace AyaNova.Biz return false; //Log modification - EventLogProcessor.AddEntryToContextNoSave(new Event(UserId, dbObj.Id, BizType, AyaEvent.Modified), ct); - ct.SaveChanges(); + EventLogProcessor.LogEventToDatabase(new Event(UserId, dbObj.Id, BizType, AyaEvent.Modified), ct); + //Update keywords Search.ProcessUpdatedObjectKeywords(ct, UserLocaleId, dbObj.Id, BizType, dbObj.Name, dbObj.EmployeeNumber, dbObj.Notes, dbObj.Name); diff --git a/server/AyaNova/biz/UserOptionsBiz.cs b/server/AyaNova/biz/UserOptionsBiz.cs index 0b9740e6..8d8ecc3b 100644 --- a/server/AyaNova/biz/UserOptionsBiz.cs +++ b/server/AyaNova/biz/UserOptionsBiz.cs @@ -56,6 +56,9 @@ namespace AyaNova.Biz if (HasErrors) return false; + ct.SaveChanges(); + //Log + EventLogProcessor.LogEventToDatabase(new Event(UserId, dbObj.Id, AyaType.UserOptions, AyaEvent.Modified), ct); return true; } @@ -72,6 +75,10 @@ namespace AyaNova.Biz Validate(dbObj); if (HasErrors) return false; + + ct.SaveChanges(); + //Log + EventLogProcessor.LogEventToDatabase(new Event(UserId, dbObj.Id, AyaType.UserOptions, AyaEvent.Modified), ct); return true; } diff --git a/server/AyaNova/biz/WidgetBiz.cs b/server/AyaNova/biz/WidgetBiz.cs index 1a001d26..35d3596a 100644 --- a/server/AyaNova/biz/WidgetBiz.cs +++ b/server/AyaNova/biz/WidgetBiz.cs @@ -72,9 +72,8 @@ namespace AyaNova.Biz //Handle child and associated items: //EVENT LOG - EventLogProcessor.AddEntryToContextNoSave(new Event(UserId, outObj.Id, BizType, AyaEvent.Created), ct); - await ct.SaveChangesAsync(); - + EventLogProcessor.LogEventToDatabase(new Event(UserId, outObj.Id, BizType, AyaEvent.Created), ct); + //SEARCH INDEXING Search.ProcessNewObjectKeywords(ct, UserLocaleId, outObj.Id, BizType, outObj.Name, outObj.Notes, outObj.Name); @@ -101,7 +100,8 @@ namespace AyaNova.Biz //Handle child and associated items: //EVENT LOG - EventLogProcessor.AddEntryToContextNoSave(new Event(UserId, outObj.Id, BizType, AyaEvent.Created), TempContext); + EventLogProcessor.LogEventToDatabase(new Event(UserId, outObj.Id, BizType, AyaEvent.Created), TempContext); + //SEARCH INDEXING Search.ProcessNewObjectKeywords(TempContext, UserLocaleId, outObj.Id, BizType, outObj.Name, outObj.Notes, outObj.Name); @@ -121,8 +121,7 @@ namespace AyaNova.Biz if (ret != null) { //Log - EventLogProcessor.AddEntryToContextNoSave(new Event(UserId, fetchId, BizType, AyaEvent.Retrieved), ct); - ct.SaveChanges(); + EventLogProcessor.LogEventToDatabase(new Event(UserId, fetchId, BizType, AyaEvent.Retrieved), ct); } return ret; } @@ -217,8 +216,8 @@ namespace AyaNova.Biz return false; //Log modification - EventLogProcessor.AddEntryToContextNoSave(new Event(UserId, dbObj.Id, BizType, AyaEvent.Modified), ct); - ct.SaveChanges(); + EventLogProcessor.LogEventToDatabase(new Event(UserId, dbObj.Id, BizType, AyaEvent.Modified), ct); + //Update keywords Search.ProcessUpdatedObjectKeywords(ct, UserLocaleId, dbObj.Id, BizType, dbObj.Name, dbObj.Notes, dbObj.Name); @@ -239,8 +238,8 @@ namespace AyaNova.Biz return false; //Log modification - EventLogProcessor.AddEntryToContextNoSave(new Event(UserId, dbObj.Id, BizType, AyaEvent.Modified), ct); - ct.SaveChanges(); + EventLogProcessor.LogEventToDatabase(new Event(UserId, dbObj.Id, BizType, AyaEvent.Modified), ct); + //Update keywords Search.ProcessUpdatedObjectKeywords(ct, UserLocaleId, dbObj.Id, BizType, dbObj.Name, dbObj.Notes, dbObj.Name);