This commit is contained in:
@@ -25,6 +25,8 @@ namespace AyaNova.Biz
|
|||||||
|
|
||||||
todo: Don't all *child items require a transaction to be passed for *any* crud op, i.e. including put and etc?
|
todo: Don't all *child items require a transaction to be passed for *any* crud op, i.e. including put and etc?
|
||||||
As they might be called from a parent transaction?
|
As they might be called from a parent transaction?
|
||||||
|
|
||||||
|
todo: search for singleordefaultasync to find any missed *GetAsync items using old direct fetch
|
||||||
|
|
||||||
*/
|
*/
|
||||||
|
|
||||||
@@ -2415,7 +2417,7 @@ namespace AyaNova.Biz
|
|||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
await EventLogProcessor.LogEventToDatabaseAsync(new Event(UserId, putObject.Id, putObject.AyaType, AyaEvent.Modified), ct);
|
await EventLogProcessor.LogEventToDatabaseAsync(new Event(UserId, putObject.Id, putObject.AyaType, AyaEvent.Modified), ct);
|
||||||
// await PartRequestSearchIndexAsync(putObject, false);
|
// await PartRequestSearchIndexAsync(putObject, false);
|
||||||
//await TagBiz.ProcessUpdateTagsInRepositoryAsync(ct, putObject.Tags, dbObject.Tags);
|
//await TagBiz.ProcessUpdateTagsInRepositoryAsync(ct, putObject.Tags, dbObject.Tags);
|
||||||
await PartRequestHandlePotentialNotificationEvent(AyaEvent.Modified, putObject, dbObject);
|
await PartRequestHandlePotentialNotificationEvent(AyaEvent.Modified, putObject, dbObject);
|
||||||
return putObject;
|
return putObject;
|
||||||
@@ -2426,19 +2428,19 @@ namespace AyaNova.Biz
|
|||||||
//
|
//
|
||||||
internal async Task<bool> PartRequestDeleteAsync(long id, Microsoft.EntityFrameworkCore.Storage.IDbContextTransaction parentTransaction = null)
|
internal async Task<bool> PartRequestDeleteAsync(long id, Microsoft.EntityFrameworkCore.Storage.IDbContextTransaction parentTransaction = null)
|
||||||
{
|
{
|
||||||
Microsoft.EntityFrameworkCore.Storage.IDbContextTransaction transaction = null;
|
Microsoft.EntityFrameworkCore.Storage.IDbContextTransaction transaction = null;
|
||||||
if (parentTransaction == null)
|
if (parentTransaction == null)
|
||||||
transaction = await ct.Database.BeginTransactionAsync();
|
transaction = await ct.Database.BeginTransactionAsync();
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
var dbObject = await PartRequestGetAsync(id,false);
|
var dbObject = await PartRequestGetAsync(id, false);
|
||||||
PartRequestValidateCanDelete(dbObject);
|
PartRequestValidateCanDelete(dbObject);
|
||||||
if (HasErrors)
|
if (HasErrors)
|
||||||
return false;
|
return false;
|
||||||
ct.WorkOrderItemPartRequest.Remove(dbObject);
|
ct.WorkOrderItemPartRequest.Remove(dbObject);
|
||||||
await ct.SaveChangesAsync();
|
await ct.SaveChangesAsync();
|
||||||
|
|
||||||
//Log event
|
//Log event
|
||||||
await EventLogProcessor.DeleteObjectLogAsync(UserId, dbObject.AyaType, dbObject.Id, "woitem:" + dbObject.WorkOrderItemId.ToString(), ct);//Fix??
|
await EventLogProcessor.DeleteObjectLogAsync(UserId, dbObject.AyaType, dbObject.Id, "woitem:" + dbObject.WorkOrderItemId.ToString(), ct);//Fix??
|
||||||
await Search.ProcessDeletedObjectKeywordsAsync(dbObject.Id, dbObject.AyaType, ct);
|
await Search.ProcessDeletedObjectKeywordsAsync(dbObject.Id, dbObject.AyaType, ct);
|
||||||
//await TagBiz.ProcessDeleteTagsInRepositoryAsync(ct, dbObject.Tags);
|
//await TagBiz.ProcessDeleteTagsInRepositoryAsync(ct, dbObject.Tags);
|
||||||
@@ -2577,7 +2579,7 @@ namespace AyaNova.Biz
|
|||||||
//newObject.CustomFields = JsonUtil.CompactJson(newObject.CustomFields);
|
//newObject.CustomFields = JsonUtil.CompactJson(newObject.CustomFields);
|
||||||
await ct.WorkOrderItemScheduledUser.AddAsync(newObject);
|
await ct.WorkOrderItemScheduledUser.AddAsync(newObject);
|
||||||
await ct.SaveChangesAsync();
|
await ct.SaveChangesAsync();
|
||||||
await EventLogProcessor.LogEventToDatabaseAsync(new Event(UserId, newObject.Id, AyaType.WorkOrderItemScheduledUser, AyaEvent.Created), ct);
|
await EventLogProcessor.LogEventToDatabaseAsync(new Event(UserId, newObject.Id, newObject.AyaType, AyaEvent.Created), ct);
|
||||||
//await ScheduledUserSearchIndexAsync(newObject, true);
|
//await ScheduledUserSearchIndexAsync(newObject, true);
|
||||||
//await TagBiz.ProcessUpdateTagsInRepositoryAsync(ct, newObject.Tags, null);
|
//await TagBiz.ProcessUpdateTagsInRepositoryAsync(ct, newObject.Tags, null);
|
||||||
await ScheduledUserHandlePotentialNotificationEvent(AyaEvent.Created, newObject);
|
await ScheduledUserHandlePotentialNotificationEvent(AyaEvent.Created, newObject);
|
||||||
@@ -2590,41 +2592,32 @@ namespace AyaNova.Biz
|
|||||||
//
|
//
|
||||||
internal async Task<WorkOrderItemScheduledUser> ScheduledUserGetAsync(long id, bool logTheGetEvent = true)
|
internal async Task<WorkOrderItemScheduledUser> ScheduledUserGetAsync(long id, bool logTheGetEvent = true)
|
||||||
{
|
{
|
||||||
//Note: there could be rules checking here in future, i.e. can only get own workorder or something
|
var ret = await ct.WorkOrderItemScheduledUser.AsNoTracking().SingleOrDefaultAsync(z => z.Id == id);
|
||||||
//if so, then need to implement AddError and in route handle Null return with Error check just like PUT route does now
|
|
||||||
|
|
||||||
//https://docs.microsoft.com/en-us/ef/core/querying/related-data
|
|
||||||
//docs say this will not query twice but will recognize the duplicate woitem bit which is required for multiple grandchild collections
|
|
||||||
var ret =
|
|
||||||
await ct.WorkOrderItemScheduledUser
|
|
||||||
.SingleOrDefaultAsync(z => z.Id == id);
|
|
||||||
if (logTheGetEvent && ret != null)
|
if (logTheGetEvent && ret != null)
|
||||||
await EventLogProcessor.LogEventToDatabaseAsync(new Event(UserId, id, AyaType.WorkOrderItemScheduledUser, AyaEvent.Retrieved), ct);
|
await EventLogProcessor.LogEventToDatabaseAsync(new Event(UserId, id, ret.AyaType, AyaEvent.Retrieved), ct);
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
////////////////////////////////////////////////////////////////////////////////////////////////
|
////////////////////////////////////////////////////////////////////////////////////////////////
|
||||||
//UPDATE
|
//UPDATE
|
||||||
//
|
//
|
||||||
internal async Task<WorkOrderItemScheduledUser> ScheduledUserPutAsync(WorkOrderItemScheduledUser dtPutObject)
|
internal async Task<WorkOrderItemScheduledUser> ScheduledUserPutAsync(WorkOrderItemScheduledUser putObject)
|
||||||
{
|
{
|
||||||
WorkOrderItemScheduledUser dbObject = await ct.WorkOrderItemScheduledUser.SingleOrDefaultAsync(z => z.Id == dtPutObject.Id);
|
WorkOrderItemScheduledUser dbObject = await ScheduledUserGetAsync(putObject.Id, false);
|
||||||
if (dbObject == null)
|
if (dbObject == null)
|
||||||
{
|
{
|
||||||
AddError(ApiErrorCode.NOT_FOUND, "id");
|
AddError(ApiErrorCode.NOT_FOUND, "id");
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
if (dbObject.Concurrency != putObject.Concurrency)
|
||||||
// make a snapshot of the original for validation but update the original to preserve workflow
|
{
|
||||||
WorkOrderItemScheduledUser SnapshotOfOriginalDBObj = new WorkOrderItemScheduledUser();
|
AddError(ApiErrorCode.CONCURRENCY_CONFLICT);
|
||||||
CopyObject.Copy(dbObject, SnapshotOfOriginalDBObj);
|
return null;
|
||||||
CopyObject.Copy(dtPutObject, dbObject, "Id");
|
}
|
||||||
|
|
||||||
//dbObject.Tags = TagBiz.NormalizeTags(dbObject.Tags);
|
//dbObject.Tags = TagBiz.NormalizeTags(dbObject.Tags);
|
||||||
// dbObject.CustomFields = JsonUtil.CompactJson(dbObject.CustomFields);
|
// dbObject.CustomFields = JsonUtil.CompactJson(dbObject.CustomFields);
|
||||||
|
await ScheduledUserValidateAsync(putObject, dbObject);
|
||||||
ct.Entry(dbObject).OriginalValues["Concurrency"] = dtPutObject.Concurrency;
|
|
||||||
await ScheduledUserValidateAsync(dbObject, SnapshotOfOriginalDBObj);
|
|
||||||
if (HasErrors) return null;
|
if (HasErrors) return null;
|
||||||
ct.Replace(dbObject, putObject);
|
ct.Replace(dbObject, putObject);
|
||||||
try
|
try
|
||||||
@@ -2633,37 +2626,50 @@ namespace AyaNova.Biz
|
|||||||
}
|
}
|
||||||
catch (DbUpdateConcurrencyException)
|
catch (DbUpdateConcurrencyException)
|
||||||
{
|
{
|
||||||
if (!await ScheduledUserExistsAsync(dtPutObject.Id))
|
if (!await ScheduledUserExistsAsync(putObject.Id))
|
||||||
AddError(ApiErrorCode.NOT_FOUND);
|
AddError(ApiErrorCode.NOT_FOUND);
|
||||||
else
|
else
|
||||||
AddError(ApiErrorCode.CONCURRENCY_CONFLICT);
|
AddError(ApiErrorCode.CONCURRENCY_CONFLICT);
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
await EventLogProcessor.LogEventToDatabaseAsync(new Event(UserId, dbObject.Id, AyaType.WorkOrderItemScheduledUser, AyaEvent.Modified), ct);
|
await EventLogProcessor.LogEventToDatabaseAsync(new Event(UserId, dbObject.Id, putObject.AyaType, AyaEvent.Modified), ct);
|
||||||
// await ScheduledUserSearchIndexAsync(dbObject, false);
|
// await ScheduledUserSearchIndexAsync(dbObject, false);
|
||||||
//await TagBiz.ProcessUpdateTagsInRepositoryAsync(ct, dbObject.Tags, SnapshotOfOriginalDBObj.Tags);
|
//await TagBiz.ProcessUpdateTagsInRepositoryAsync(ct, dbObject.Tags, SnapshotOfOriginalDBObj.Tags);
|
||||||
await ScheduledUserHandlePotentialNotificationEvent(AyaEvent.Modified, dbObject, SnapshotOfOriginalDBObj);
|
await ScheduledUserHandlePotentialNotificationEvent(AyaEvent.Modified, putObject, dbObject);
|
||||||
return dbObject;
|
return putObject;
|
||||||
}
|
}
|
||||||
|
|
||||||
////////////////////////////////////////////////////////////////////////////////////////////////
|
////////////////////////////////////////////////////////////////////////////////////////////////
|
||||||
//DELETE
|
//DELETE
|
||||||
//
|
//
|
||||||
internal async Task<bool> ScheduledUserDeleteAsync(long id)
|
internal async Task<bool> ScheduledUserDeleteAsync(long id, Microsoft.EntityFrameworkCore.Storage.IDbContextTransaction parentTransaction = null)
|
||||||
{
|
{
|
||||||
WorkOrderItemScheduledUser dbObject = await ct.WorkOrderItemScheduledUser.SingleOrDefaultAsync(z => z.Id == id);
|
Microsoft.EntityFrameworkCore.Storage.IDbContextTransaction transaction = null;
|
||||||
ScheduledUserValidateCanDelete(dbObject);
|
if (parentTransaction == null)
|
||||||
if (HasErrors)
|
transaction = await ct.Database.BeginTransactionAsync();
|
||||||
return false;
|
try
|
||||||
ct.WorkOrderItemScheduledUser.Remove(dbObject);
|
{
|
||||||
await ct.SaveChangesAsync();
|
var dbObject = await ct.WorkOrderItemScheduledUser.SingleOrDefaultAsync(z => z.Id == id);
|
||||||
|
ScheduledUserValidateCanDelete(dbObject);
|
||||||
|
if (HasErrors)
|
||||||
|
return false;
|
||||||
|
ct.WorkOrderItemScheduledUser.Remove(dbObject);
|
||||||
|
await ct.SaveChangesAsync();
|
||||||
|
|
||||||
//Log event
|
//Log event
|
||||||
await EventLogProcessor.DeleteObjectLogAsync(UserId, AyaType.WorkOrderItemScheduledUser, dbObject.Id, "woitem:" + dbObject.WorkOrderItemId.ToString(), ct);//FIX woitem text??
|
await EventLogProcessor.DeleteObjectLogAsync(UserId, dbObject.AyaType, dbObject.Id, "woitem:" + dbObject.WorkOrderItemId.ToString(), ct);//Fix??
|
||||||
await Search.ProcessDeletedObjectKeywordsAsync(dbObject.Id, AyaType.WorkOrderItemScheduledUser, ct);
|
await Search.ProcessDeletedObjectKeywordsAsync(dbObject.Id, dbObject.AyaType, ct);
|
||||||
//await TagBiz.ProcessDeleteTagsInRepositoryAsync(ct, dbObject.Tags);
|
//await TagBiz.ProcessDeleteTagsInRepositoryAsync(ct, dbObject.Tags);
|
||||||
//await FileUtil.DeleteAttachmentsForObjectAsync(BizType, dbObject.Id, ct);
|
//await FileUtil.DeleteAttachmentsForObjectAsync(dbObject.AyaType, dbObject.Id, ct);
|
||||||
await ScheduledUserHandlePotentialNotificationEvent(AyaEvent.Deleted, dbObject);
|
if (parentTransaction == null)
|
||||||
|
await transaction.CommitAsync();
|
||||||
|
await ScheduledUserHandlePotentialNotificationEvent(AyaEvent.Deleted, dbObject);
|
||||||
|
}
|
||||||
|
catch
|
||||||
|
{
|
||||||
|
//Just re-throw for now, let exception handler deal, but in future may want to deal with this more here
|
||||||
|
throw;
|
||||||
|
}
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -2672,6 +2678,9 @@ namespace AyaNova.Biz
|
|||||||
//
|
//
|
||||||
private async Task ScheduledUserValidateAsync(WorkOrderItemScheduledUser proposedObj, WorkOrderItemScheduledUser currentObj)
|
private async Task ScheduledUserValidateAsync(WorkOrderItemScheduledUser proposedObj, WorkOrderItemScheduledUser currentObj)
|
||||||
{
|
{
|
||||||
|
//skip validation if seeding
|
||||||
|
// if (ServerBootConfig.SEEDING) return;
|
||||||
|
|
||||||
//run validation and biz rules
|
//run validation and biz rules
|
||||||
bool isNew = currentObj == null;
|
bool isNew = currentObj == null;
|
||||||
|
|
||||||
@@ -2787,7 +2796,7 @@ namespace AyaNova.Biz
|
|||||||
//newObject.CustomFields = JsonUtil.CompactJson(newObject.CustomFields);
|
//newObject.CustomFields = JsonUtil.CompactJson(newObject.CustomFields);
|
||||||
await ct.WorkOrderItemTask.AddAsync(newObject);
|
await ct.WorkOrderItemTask.AddAsync(newObject);
|
||||||
await ct.SaveChangesAsync();
|
await ct.SaveChangesAsync();
|
||||||
await EventLogProcessor.LogEventToDatabaseAsync(new Event(UserId, newObject.Id, AyaType.WorkOrderItemTask, AyaEvent.Created), ct);
|
await EventLogProcessor.LogEventToDatabaseAsync(new Event(UserId, newObject.Id, newObject.AyaType, AyaEvent.Created), ct);
|
||||||
await TaskSearchIndexAsync(newObject, true);
|
await TaskSearchIndexAsync(newObject, true);
|
||||||
//await TagBiz.ProcessUpdateTagsInRepositoryAsync(ct, newObject.Tags, null);
|
//await TagBiz.ProcessUpdateTagsInRepositoryAsync(ct, newObject.Tags, null);
|
||||||
await TaskHandlePotentialNotificationEvent(AyaEvent.Created, newObject);
|
await TaskHandlePotentialNotificationEvent(AyaEvent.Created, newObject);
|
||||||
@@ -2800,41 +2809,31 @@ namespace AyaNova.Biz
|
|||||||
//
|
//
|
||||||
internal async Task<WorkOrderItemTask> TaskGetAsync(long id, bool logTheGetEvent = true)
|
internal async Task<WorkOrderItemTask> TaskGetAsync(long id, bool logTheGetEvent = true)
|
||||||
{
|
{
|
||||||
//Note: there could be rules checking here in future, i.e. can only get own workorder or something
|
var ret = await ct.WorkOrderItemTask.AsNoTracking().SingleOrDefaultAsync(z => z.Id == id);
|
||||||
//if so, then need to implement AddError and in route handle Null return with Error check just like PUT route does now
|
|
||||||
|
|
||||||
//https://docs.microsoft.com/en-us/ef/core/querying/related-data
|
|
||||||
//docs say this will not query twice but will recognize the duplicate woitem bit which is required for multiple grandchild collections
|
|
||||||
var ret =
|
|
||||||
await ct.WorkOrderItemTask
|
|
||||||
.SingleOrDefaultAsync(z => z.Id == id);//FIX asnotracking
|
|
||||||
if (logTheGetEvent && ret != null)
|
if (logTheGetEvent && ret != null)
|
||||||
await EventLogProcessor.LogEventToDatabaseAsync(new Event(UserId, id, AyaType.WorkOrderItemTask, AyaEvent.Retrieved), ct);
|
await EventLogProcessor.LogEventToDatabaseAsync(new Event(UserId, id, newObject.AyaType, AyaEvent.Retrieved), ct);
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
////////////////////////////////////////////////////////////////////////////////////////////////
|
////////////////////////////////////////////////////////////////////////////////////////////////
|
||||||
//UPDATE
|
//UPDATE
|
||||||
//
|
//
|
||||||
internal async Task<WorkOrderItemTask> TaskPutAsync(WorkOrderItemTask dtPutObject)
|
internal async Task<WorkOrderItemTask> TaskPutAsync(WorkOrderItemTask putObject)
|
||||||
{
|
{
|
||||||
WorkOrderItemTask dbObject = await ct.WorkOrderItemTask.SingleOrDefaultAsync(z => z.Id == dtPutObject.Id);
|
WorkOrderItemTask dbObject = await TaskGetAsync(putObject.Id, false);
|
||||||
if (dbObject == null)
|
if (dbObject == null)
|
||||||
{
|
{
|
||||||
AddError(ApiErrorCode.NOT_FOUND, "id");
|
AddError(ApiErrorCode.NOT_FOUND, "id");
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
if (dbObject.Concurrency != putObject.Concurrency)
|
||||||
// make a snapshot of the original for validation but update the original to preserve workflow
|
{
|
||||||
WorkOrderItemTask SnapshotOfOriginalDBObj = new WorkOrderItemTask();
|
AddError(ApiErrorCode.CONCURRENCY_CONFLICT);
|
||||||
CopyObject.Copy(dbObject, SnapshotOfOriginalDBObj);//FIX not using copyobject anymore
|
return null;
|
||||||
CopyObject.Copy(dtPutObject, dbObject, "Id");
|
}
|
||||||
|
|
||||||
//dbObject.Tags = TagBiz.NormalizeTags(dbObject.Tags);
|
//dbObject.Tags = TagBiz.NormalizeTags(dbObject.Tags);
|
||||||
//dbObject.CustomFields = JsonUtil.CompactJson(dbObject.CustomFields);
|
//dbObject.CustomFields = JsonUtil.CompactJson(dbObject.CustomFields);
|
||||||
|
await TaskValidateAsync(putObject, dbObject);
|
||||||
ct.Entry(dbObject).OriginalValues["Concurrency"] = dtPutObject.Concurrency;
|
|
||||||
await TaskValidateAsync(dbObject, SnapshotOfOriginalDBObj);
|
|
||||||
if (HasErrors) return null;
|
if (HasErrors) return null;
|
||||||
ct.Replace(dbObject, putObject);
|
ct.Replace(dbObject, putObject);
|
||||||
try
|
try
|
||||||
@@ -2843,45 +2842,85 @@ namespace AyaNova.Biz
|
|||||||
}
|
}
|
||||||
catch (DbUpdateConcurrencyException)
|
catch (DbUpdateConcurrencyException)
|
||||||
{
|
{
|
||||||
if (!await TaskExistsAsync(dtPutObject.Id))
|
if (!await TaskExistsAsync(putObject.Id))
|
||||||
AddError(ApiErrorCode.NOT_FOUND);
|
AddError(ApiErrorCode.NOT_FOUND);
|
||||||
else
|
else
|
||||||
AddError(ApiErrorCode.CONCURRENCY_CONFLICT);
|
AddError(ApiErrorCode.CONCURRENCY_CONFLICT);
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
await EventLogProcessor.LogEventToDatabaseAsync(new Event(UserId, dbObject.Id, AyaType.WorkOrderItemTask, AyaEvent.Modified), ct);
|
await EventLogProcessor.LogEventToDatabaseAsync(new Event(UserId, dbObject.Id, putObject.AyaType, AyaEvent.Modified), ct);
|
||||||
await TaskSearchIndexAsync(dbObject, false);
|
await TaskSearchIndexAsync(dbObject, false);
|
||||||
// await TagBiz.ProcessUpdateTagsInRepositoryAsync(ct, dbObject.Tags, SnapshotOfOriginalDBObj.Tags);
|
// await TagBiz.ProcessUpdateTagsInRepositoryAsync(ct, dbObject.Tags, SnapshotOfOriginalDBObj.Tags);
|
||||||
await TaskHandlePotentialNotificationEvent(AyaEvent.Modified, dbObject, SnapshotOfOriginalDBObj);
|
await TaskHandlePotentialNotificationEvent(AyaEvent.Modified, putObject, dbObject);
|
||||||
return dbObject;
|
return putObject;
|
||||||
}
|
}
|
||||||
|
|
||||||
////////////////////////////////////////////////////////////////////////////////////////////////
|
////////////////////////////////////////////////////////////////////////////////////////////////
|
||||||
//DELETE
|
//DELETE
|
||||||
//
|
//
|
||||||
internal async Task<bool> TaskDeleteAsync(long id)
|
internal async Task<bool> TaskDeleteAsync(long id, Microsoft.EntityFrameworkCore.Storage.IDbContextTransaction parentTransaction = null)
|
||||||
{
|
{
|
||||||
WorkOrderItemTask dbObject = await ct.WorkOrderItemTask.SingleOrDefaultAsync(z => z.Id == id);
|
Microsoft.EntityFrameworkCore.Storage.IDbContextTransaction transaction = null;
|
||||||
TaskValidateCanDelete(dbObject);
|
if (parentTransaction == null)
|
||||||
if (HasErrors)
|
transaction = await ct.Database.BeginTransactionAsync();
|
||||||
return false;
|
try
|
||||||
ct.WorkOrderItemTask.Remove(dbObject);
|
{
|
||||||
await ct.SaveChangesAsync();
|
var dbObject = await TaskGetAsync(id, false);
|
||||||
|
TaskValidateCanDelete(dbObject);
|
||||||
|
if (HasErrors)
|
||||||
|
return false;
|
||||||
|
ct.WorkOrderItemTask.Remove(dbObject);
|
||||||
|
await ct.SaveChangesAsync();
|
||||||
|
|
||||||
//Log event
|
//Log event
|
||||||
await EventLogProcessor.DeleteObjectLogAsync(UserId, AyaType.WorkOrderItemTask, dbObject.Id, "woitem:" + dbObject.WorkOrderItemId.ToString(), ct);
|
await EventLogProcessor.DeleteObjectLogAsync(UserId, dbObject.AyaType, dbObject.Id, "woitem:" + dbObject.WorkOrderItemId.ToString(), ct);//Fix??
|
||||||
await Search.ProcessDeletedObjectKeywordsAsync(dbObject.Id, AyaType.WorkOrderItemTask, ct);
|
await Search.ProcessDeletedObjectKeywordsAsync(dbObject.Id, dbObject.AyaType, ct);
|
||||||
//await TagBiz.ProcessDeleteTagsInRepositoryAsync(ct, dbObject.Tags);
|
//await TagBiz.ProcessDeleteTagsInRepositoryAsync(ct, dbObject.Tags);
|
||||||
//await FileUtil.DeleteAttachmentsForObjectAsync(BizType, dbObject.Id, ct);
|
//await FileUtil.DeleteAttachmentsForObjectAsync(dbObject.AyaType, dbObject.Id, ct);
|
||||||
await TaskHandlePotentialNotificationEvent(AyaEvent.Deleted, dbObject);
|
if (parentTransaction == null)
|
||||||
|
await transaction.CommitAsync();
|
||||||
|
await TaskHandlePotentialNotificationEvent(AyaEvent.Deleted, dbObject);
|
||||||
|
}
|
||||||
|
catch
|
||||||
|
{
|
||||||
|
//Just re-throw for now, let exception handler deal, but in future may want to deal with this more here
|
||||||
|
throw;
|
||||||
|
}
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
//////////////////////////////////////////////
|
||||||
|
//INDEXING
|
||||||
|
//
|
||||||
|
private async Task TaskSearchIndexAsync(WorkOrderItemTask obj, bool isNew)
|
||||||
|
{
|
||||||
|
//SEARCH INDEXING
|
||||||
|
var SearchParams = new Search.SearchIndexProcessObjectParameters(UserTranslationId, obj.Id, obj.AyaType);
|
||||||
|
SearchParams.AddText(obj.Task);//some are manually entered so this is worthwhile for that at least, also I guess predefined tasks that are more rare
|
||||||
|
|
||||||
|
if (isNew)
|
||||||
|
await Search.ProcessNewObjectKeywordsAsync(SearchParams);
|
||||||
|
else
|
||||||
|
await Search.ProcessUpdatedObjectKeywordsAsync(SearchParams);
|
||||||
|
}
|
||||||
|
|
||||||
|
public async Task<Search.SearchIndexProcessObjectParameters> TaskGetSearchResultSummary(long id)
|
||||||
|
{
|
||||||
|
var obj = await TaskGetAsync(id, false);
|
||||||
|
var SearchParams = new Search.SearchIndexProcessObjectParameters();
|
||||||
|
if (obj != null)
|
||||||
|
SearchParams.AddText(obj.Task);
|
||||||
|
return SearchParams;
|
||||||
|
}
|
||||||
|
|
||||||
////////////////////////////////////////////////////////////////////////////////////////////////
|
////////////////////////////////////////////////////////////////////////////////////////////////
|
||||||
//VALIDATION
|
//VALIDATION
|
||||||
//
|
//
|
||||||
private async Task TaskValidateAsync(WorkOrderItemTask proposedObj, WorkOrderItemTask currentObj)
|
private async Task TaskValidateAsync(WorkOrderItemTask proposedObj, WorkOrderItemTask currentObj)
|
||||||
{
|
{
|
||||||
|
//skip validation if seeding
|
||||||
|
// if (ServerBootConfig.SEEDING) return;
|
||||||
|
|
||||||
//run validation and biz rules
|
//run validation and biz rules
|
||||||
bool isNew = currentObj == null;
|
bool isNew = currentObj == null;
|
||||||
|
|
||||||
@@ -2924,31 +2963,6 @@ namespace AyaNova.Biz
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
//////////////////////////////////////////////
|
|
||||||
//INDEXING
|
|
||||||
//
|
|
||||||
private async Task TaskSearchIndexAsync(WorkOrderItemTask obj, bool isNew)
|
|
||||||
{
|
|
||||||
//SEARCH INDEXING
|
|
||||||
var SearchParams = new Search.SearchIndexProcessObjectParameters(UserTranslationId, obj.Id, AyaType.WorkOrderItemTask);
|
|
||||||
SearchParams.AddText(obj.Task);//some are manually entered so this is worthwhile for that at least, also I guess predefined tasks that are more rare
|
|
||||||
|
|
||||||
if (isNew)
|
|
||||||
await Search.ProcessNewObjectKeywordsAsync(SearchParams);
|
|
||||||
else
|
|
||||||
await Search.ProcessUpdatedObjectKeywordsAsync(SearchParams);
|
|
||||||
}
|
|
||||||
|
|
||||||
public async Task<Search.SearchIndexProcessObjectParameters> TaskGetSearchResultSummary(long id)
|
|
||||||
{
|
|
||||||
var obj = await ct.WorkOrderItemTask.SingleOrDefaultAsync(z => z.Id == id);
|
|
||||||
var SearchParams = new Search.SearchIndexProcessObjectParameters();
|
|
||||||
if (obj != null)
|
|
||||||
SearchParams.AddText(obj.Task);
|
|
||||||
return SearchParams;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
////////////////////////////////////////////////////////////////////////////////////////////////
|
////////////////////////////////////////////////////////////////////////////////////////////////
|
||||||
// NOTIFICATION PROCESSING
|
// NOTIFICATION PROCESSING
|
||||||
//
|
//
|
||||||
@@ -3020,7 +3034,7 @@ namespace AyaNova.Biz
|
|||||||
//newObject.CustomFields = JsonUtil.CompactJson(newObject.CustomFields);
|
//newObject.CustomFields = JsonUtil.CompactJson(newObject.CustomFields);
|
||||||
await ct.WorkOrderItemTravel.AddAsync(newObject);
|
await ct.WorkOrderItemTravel.AddAsync(newObject);
|
||||||
await ct.SaveChangesAsync();
|
await ct.SaveChangesAsync();
|
||||||
await EventLogProcessor.LogEventToDatabaseAsync(new Event(UserId, newObject.Id, AyaType.WorkOrderItemTravel, AyaEvent.Created), ct);
|
await EventLogProcessor.LogEventToDatabaseAsync(new Event(UserId, newObject.Id, newObject.AyaType, AyaEvent.Created), ct);
|
||||||
await TravelSearchIndexAsync(newObject, true);
|
await TravelSearchIndexAsync(newObject, true);
|
||||||
//await TagBiz.ProcessUpdateTagsInRepositoryAsync(ct, newObject.Tags, null);
|
//await TagBiz.ProcessUpdateTagsInRepositoryAsync(ct, newObject.Tags, null);
|
||||||
await TravelHandlePotentialNotificationEvent(AyaEvent.Created, newObject);
|
await TravelHandlePotentialNotificationEvent(AyaEvent.Created, newObject);
|
||||||
@@ -3033,41 +3047,32 @@ namespace AyaNova.Biz
|
|||||||
//
|
//
|
||||||
internal async Task<WorkOrderItemTravel> TravelGetAsync(long id, bool logTheGetEvent = true)
|
internal async Task<WorkOrderItemTravel> TravelGetAsync(long id, bool logTheGetEvent = true)
|
||||||
{
|
{
|
||||||
//Note: there could be rules checking here in future, i.e. can only get own workorder or something
|
var ret = await ct.WorkOrderItemTravel.AsNoTracking().SingleOrDefaultAsync(z => z.Id == id);
|
||||||
//if so, then need to implement AddError and in route handle Null return with Error check just like PUT route does now
|
|
||||||
|
|
||||||
//https://docs.microsoft.com/en-us/ef/core/querying/related-data
|
|
||||||
//docs say this will not query twice but will recognize the duplicate woitem bit which is required for multiple grandchild collections
|
|
||||||
var ret =
|
|
||||||
await ct.WorkOrderItemTravel
|
|
||||||
.SingleOrDefaultAsync(z => z.Id == id);//FIX asnotracking
|
|
||||||
if (logTheGetEvent && ret != null)
|
if (logTheGetEvent && ret != null)
|
||||||
await EventLogProcessor.LogEventToDatabaseAsync(new Event(UserId, id, AyaType.WorkOrderItemTravel, AyaEvent.Retrieved), ct);
|
await EventLogProcessor.LogEventToDatabaseAsync(new Event(UserId, id, ret.AyaType, AyaEvent.Retrieved), ct);
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
////////////////////////////////////////////////////////////////////////////////////////////////
|
////////////////////////////////////////////////////////////////////////////////////////////////
|
||||||
//UPDATE
|
//UPDATE
|
||||||
//
|
//
|
||||||
internal async Task<WorkOrderItemTravel> TravelPutAsync(WorkOrderItemTravel dtPutObject)
|
internal async Task<WorkOrderItemTravel> TravelPutAsync(WorkOrderItemTravel putObject)
|
||||||
{
|
{
|
||||||
WorkOrderItemTravel dbObject = await ct.WorkOrderItemTravel.SingleOrDefaultAsync(z => z.Id == dtPutObject.Id);
|
WorkOrderItemTravel dbObject = await TravelGetAsync(putObject.Id, false);
|
||||||
if (dbObject == null)
|
if (dbObject == null)
|
||||||
{
|
{
|
||||||
AddError(ApiErrorCode.NOT_FOUND, "id");
|
AddError(ApiErrorCode.NOT_FOUND, "id");
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
if (dbObject.Concurrency != putObject.Concurrency)
|
||||||
// make a snapshot of the original for validation but update the original to preserve workflow
|
{
|
||||||
WorkOrderItemTravel SnapshotOfOriginalDBObj = new WorkOrderItemTravel();
|
AddError(ApiErrorCode.CONCURRENCY_CONFLICT);
|
||||||
CopyObject.Copy(dbObject, SnapshotOfOriginalDBObj);
|
return null;
|
||||||
CopyObject.Copy(dtPutObject, dbObject, "Id");//FIX outdated method
|
}
|
||||||
|
|
||||||
//dbObject.Tags = TagBiz.NormalizeTags(dbObject.Tags);
|
//dbObject.Tags = TagBiz.NormalizeTags(dbObject.Tags);
|
||||||
// dbObject.CustomFields = JsonUtil.CompactJson(dbObject.CustomFields);
|
// dbObject.CustomFields = JsonUtil.CompactJson(dbObject.CustomFields);
|
||||||
|
await TravelValidateAsync(putObject, dbObject);
|
||||||
ct.Entry(dbObject).OriginalValues["Concurrency"] = dtPutObject.Concurrency;
|
|
||||||
await TravelValidateAsync(dbObject, SnapshotOfOriginalDBObj);
|
|
||||||
if (HasErrors) return null;
|
if (HasErrors) return null;
|
||||||
ct.Replace(dbObject, putObject);
|
ct.Replace(dbObject, putObject);
|
||||||
try
|
try
|
||||||
@@ -3076,45 +3081,87 @@ namespace AyaNova.Biz
|
|||||||
}
|
}
|
||||||
catch (DbUpdateConcurrencyException)
|
catch (DbUpdateConcurrencyException)
|
||||||
{
|
{
|
||||||
if (!await TravelExistsAsync(dtPutObject.Id))
|
if (!await TravelExistsAsync(putObject.Id))
|
||||||
AddError(ApiErrorCode.NOT_FOUND);
|
AddError(ApiErrorCode.NOT_FOUND);
|
||||||
else
|
else
|
||||||
AddError(ApiErrorCode.CONCURRENCY_CONFLICT);
|
AddError(ApiErrorCode.CONCURRENCY_CONFLICT);
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
await EventLogProcessor.LogEventToDatabaseAsync(new Event(UserId, dbObject.Id, AyaType.WorkOrderItemTravel, AyaEvent.Modified), ct);
|
await EventLogProcessor.LogEventToDatabaseAsync(new Event(UserId, dbObject.Id, putObject.AyaType, AyaEvent.Modified), ct);
|
||||||
await TravelSearchIndexAsync(dbObject, false);
|
await TravelSearchIndexAsync(putObject, false);
|
||||||
//await TagBiz.ProcessUpdateTagsInRepositoryAsync(ct, dbObject.Tags, SnapshotOfOriginalDBObj.Tags);
|
//await TagBiz.ProcessUpdateTagsInRepositoryAsync(ct, dbObject.Tags, SnapshotOfOriginalDBObj.Tags);
|
||||||
await TravelHandlePotentialNotificationEvent(AyaEvent.Modified, dbObject, SnapshotOfOriginalDBObj);
|
await TravelHandlePotentialNotificationEvent(AyaEvent.Modified, putObject, dbObject);
|
||||||
return dbObject;
|
return putObject;
|
||||||
}
|
}
|
||||||
|
|
||||||
////////////////////////////////////////////////////////////////////////////////////////////////
|
////////////////////////////////////////////////////////////////////////////////////////////////
|
||||||
//DELETE
|
//DELETE
|
||||||
//
|
//
|
||||||
internal async Task<bool> TravelDeleteAsync(long id)
|
internal async Task<bool> TravelDeleteAsync(long id, Microsoft.EntityFrameworkCore.Storage.IDbContextTransaction parentTransaction = null)
|
||||||
{
|
{
|
||||||
WorkOrderItemTravel dbObject = await ct.WorkOrderItemTravel.SingleOrDefaultAsync(z => z.Id == id);
|
Microsoft.EntityFrameworkCore.Storage.IDbContextTransaction transaction = null;
|
||||||
TravelValidateCanDelete(dbObject);
|
if (parentTransaction == null)
|
||||||
if (HasErrors)
|
transaction = await ct.Database.BeginTransactionAsync();
|
||||||
return false;
|
try
|
||||||
ct.WorkOrderItemTravel.Remove(dbObject);
|
{
|
||||||
await ct.SaveChangesAsync();
|
var dbObject = await TravelGetAsync(id, false);
|
||||||
|
TravelValidateCanDelete(dbObject);
|
||||||
|
if (HasErrors)
|
||||||
|
return false;
|
||||||
|
ct.WorkOrderItemTravel.Remove(dbObject);
|
||||||
|
await ct.SaveChangesAsync();
|
||||||
|
|
||||||
//Log event
|
//Log event
|
||||||
await EventLogProcessor.DeleteObjectLogAsync(UserId, AyaType.WorkOrderItemTravel, dbObject.Id, "woitem:" + dbObject.WorkOrderItemId.ToString(), ct);
|
await EventLogProcessor.DeleteObjectLogAsync(UserId, dbObject.AyaType, dbObject.Id, "woitem:" + dbObject.WorkOrderItemId.ToString(), ct);
|
||||||
await Search.ProcessDeletedObjectKeywordsAsync(dbObject.Id, AyaType.WorkOrderItemTravel, ct);
|
await Search.ProcessDeletedObjectKeywordsAsync(dbObject.Id, dbObject.AyaType, ct);
|
||||||
// await TagBiz.ProcessDeleteTagsInRepositoryAsync(ct, dbObject.Tags);
|
// await TagBiz.ProcessDeleteTagsInRepositoryAsync(ct, dbObject.Tags);
|
||||||
//await FileUtil.DeleteAttachmentsForObjectAsync(BizType, dbObject.Id, ct);
|
//await FileUtil.DeleteAttachmentsForObjectAsync(BizType, dbObject.Id, ct);
|
||||||
await TravelHandlePotentialNotificationEvent(AyaEvent.Deleted, dbObject);
|
if (parentTransaction == null)
|
||||||
|
await transaction.CommitAsync();
|
||||||
|
await TravelHandlePotentialNotificationEvent(AyaEvent.Deleted, dbObject);
|
||||||
|
}
|
||||||
|
catch
|
||||||
|
{
|
||||||
|
//Just re-throw for now, let exception handler deal, but in future may want to deal with this more here
|
||||||
|
throw;
|
||||||
|
}
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
//////////////////////////////////////////////
|
||||||
|
//INDEXING
|
||||||
|
//
|
||||||
|
private async Task TravelSearchIndexAsync(WorkOrderItemTravel obj, bool isNew)
|
||||||
|
{
|
||||||
|
//SEARCH INDEXING
|
||||||
|
var SearchParams = new Search.SearchIndexProcessObjectParameters(UserTranslationId, obj.Id, obj.AyaType);
|
||||||
|
SearchParams.AddText(obj.Notes).AddText(obj.TravelDetails);
|
||||||
|
|
||||||
|
if (isNew)
|
||||||
|
await Search.ProcessNewObjectKeywordsAsync(SearchParams);
|
||||||
|
else
|
||||||
|
await Search.ProcessUpdatedObjectKeywordsAsync(SearchParams);
|
||||||
|
}
|
||||||
|
|
||||||
|
public async Task<Search.SearchIndexProcessObjectParameters> TravelGetSearchResultSummary(long id)
|
||||||
|
{
|
||||||
|
var obj = await TravelGetAsync(id, false);
|
||||||
|
var SearchParams = new Search.SearchIndexProcessObjectParameters();
|
||||||
|
if (obj != null)
|
||||||
|
SearchParams.AddText(obj.Notes).AddText(obj.TravelDetails);
|
||||||
|
return SearchParams;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
////////////////////////////////////////////////////////////////////////////////////////////////
|
////////////////////////////////////////////////////////////////////////////////////////////////
|
||||||
//VALIDATION
|
//VALIDATION
|
||||||
//
|
//
|
||||||
private async Task TravelValidateAsync(WorkOrderItemTravel proposedObj, WorkOrderItemTravel currentObj)
|
private async Task TravelValidateAsync(WorkOrderItemTravel proposedObj, WorkOrderItemTravel currentObj)
|
||||||
{
|
{
|
||||||
|
//skip validation if seeding
|
||||||
|
// if (ServerBootConfig.SEEDING) return;
|
||||||
|
|
||||||
//run validation and biz rules
|
//run validation and biz rules
|
||||||
bool isNew = currentObj == null;
|
bool isNew = currentObj == null;
|
||||||
|
|
||||||
@@ -3157,30 +3204,6 @@ namespace AyaNova.Biz
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
//////////////////////////////////////////////
|
|
||||||
//INDEXING
|
|
||||||
//
|
|
||||||
private async Task TravelSearchIndexAsync(WorkOrderItemTravel obj, bool isNew)
|
|
||||||
{
|
|
||||||
//SEARCH INDEXING
|
|
||||||
var SearchParams = new Search.SearchIndexProcessObjectParameters(UserTranslationId, obj.Id, AyaType.WorkOrderItemTravel);
|
|
||||||
SearchParams.AddText(obj.Notes).AddText(obj.TravelDetails);
|
|
||||||
|
|
||||||
if (isNew)
|
|
||||||
await Search.ProcessNewObjectKeywordsAsync(SearchParams);
|
|
||||||
else
|
|
||||||
await Search.ProcessUpdatedObjectKeywordsAsync(SearchParams);
|
|
||||||
}
|
|
||||||
|
|
||||||
public async Task<Search.SearchIndexProcessObjectParameters> TravelGetSearchResultSummary(long id)
|
|
||||||
{
|
|
||||||
var obj = await ct.WorkOrderItemTravel.SingleOrDefaultAsync(z => z.Id == id);
|
|
||||||
var SearchParams = new Search.SearchIndexProcessObjectParameters();
|
|
||||||
if (obj != null)
|
|
||||||
SearchParams.AddText(obj.Notes).AddText(obj.TravelDetails);
|
|
||||||
return SearchParams;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
////////////////////////////////////////////////////////////////////////////////////////////////
|
////////////////////////////////////////////////////////////////////////////////////////////////
|
||||||
// NOTIFICATION PROCESSING
|
// NOTIFICATION PROCESSING
|
||||||
@@ -3219,7 +3242,7 @@ namespace AyaNova.Biz
|
|||||||
}//end of process notifications
|
}//end of process notifications
|
||||||
|
|
||||||
|
|
||||||
#endregion work order item LABOR level
|
#endregion work order item TRAVEL level
|
||||||
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
|||||||
Reference in New Issue
Block a user