admin/raven
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fleshing otu workorder

Browse Source
This commit is contained in:
John Cardinal
2020-05-03 23:23:36 +00:00
parent ff54daac8f
commit c9614e8124
2 changed files with 82 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
server/AyaNova/biz/BizObjectFactory.cs
View File

@@ -54,24 +54,20 @@ namespace AyaNova.Biz
return new PartBiz(dbcontext, userId, ServerBootConfig.AYANOVA_DEFAULT_TRANSLATION_ID, roles); return new PartBiz(dbcontext, userId, ServerBootConfig.AYANOVA_DEFAULT_TRANSLATION_ID, roles);
case AyaType.PM: case AyaType.PM:
return new PMBiz(dbcontext, userId, ServerBootConfig.AYANOVA_DEFAULT_TRANSLATION_ID, roles); return new PMBiz(dbcontext, userId, ServerBootConfig.AYANOVA_DEFAULT_TRANSLATION_ID, roles);
case AyaType.PMItem:
return new PMItemBiz(dbcontext, userId, ServerBootConfig.AYANOVA_DEFAULT_TRANSLATION_ID, roles);
case AyaType.PMTemplate: case AyaType.PMTemplate:
return new PMTemplateBiz(dbcontext, userId, ServerBootConfig.AYANOVA_DEFAULT_TRANSLATION_ID, roles); return new PMTemplateBiz(dbcontext, userId, ServerBootConfig.AYANOVA_DEFAULT_TRANSLATION_ID, roles);
case AyaType.PMTemplateItem:
return new PMTemplateItemBiz(dbcontext, userId, ServerBootConfig.AYANOVA_DEFAULT_TRANSLATION_ID, roles);
case AyaType.Project: case AyaType.Project:
return new ProjectBiz(dbcontext, userId, ServerBootConfig.AYANOVA_DEFAULT_TRANSLATION_ID, roles); return new ProjectBiz(dbcontext, userId, ServerBootConfig.AYANOVA_DEFAULT_TRANSLATION_ID, roles);
case AyaType.PurchaseOrder: case AyaType.PurchaseOrder:
return new PurchaseOrderBiz(dbcontext, userId, ServerBootConfig.AYANOVA_DEFAULT_TRANSLATION_ID, roles); return new PurchaseOrderBiz(dbcontext, userId, ServerBootConfig.AYANOVA_DEFAULT_TRANSLATION_ID, roles);
case AyaType.Quote: case AyaType.Quote:
return new QuoteBiz(dbcontext, userId, ServerBootConfig.AYANOVA_DEFAULT_TRANSLATION_ID, roles); return new QuoteBiz(dbcontext, userId, ServerBootConfig.AYANOVA_DEFAULT_TRANSLATION_ID, roles);
case AyaType.QuoteItem:
return new QuoteItemBiz(dbcontext, userId, ServerBootConfig.AYANOVA_DEFAULT_TRANSLATION_ID, roles);
case AyaType.QuoteTemplate: case AyaType.QuoteTemplate:
return new QuoteTemplateBiz(dbcontext, userId, ServerBootConfig.AYANOVA_DEFAULT_TRANSLATION_ID, roles); return new QuoteTemplateBiz(dbcontext, userId, ServerBootConfig.AYANOVA_DEFAULT_TRANSLATION_ID, roles);
case AyaType.QuoteTemplateItem:
return new QuoteTemplateItemBiz(dbcontext, userId, ServerBootConfig.AYANOVA_DEFAULT_TRANSLATION_ID, roles);
case AyaType.Unit: case AyaType.Unit:
return new UnitBiz(dbcontext, userId, ServerBootConfig.AYANOVA_DEFAULT_TRANSLATION_ID, roles); return new UnitBiz(dbcontext, userId, ServerBootConfig.AYANOVA_DEFAULT_TRANSLATION_ID, roles);
case AyaType.UnitModel: case AyaType.UnitModel:
@@ -80,12 +76,8 @@ namespace AyaNova.Biz
return new VendorBiz(dbcontext, userId, ServerBootConfig.AYANOVA_DEFAULT_TRANSLATION_ID, roles); return new VendorBiz(dbcontext, userId, ServerBootConfig.AYANOVA_DEFAULT_TRANSLATION_ID, roles);
case AyaType.WorkOrder: case AyaType.WorkOrder:
return new WorkOrderBiz(dbcontext, userId, ServerBootConfig.AYANOVA_DEFAULT_TRANSLATION_ID, roles); return new WorkOrderBiz(dbcontext, userId, ServerBootConfig.AYANOVA_DEFAULT_TRANSLATION_ID, roles);
case AyaType.WorkOrderItem:
return new WorkOrderItemBiz(dbcontext, userId, ServerBootConfig.AYANOVA_DEFAULT_TRANSLATION_ID, roles);
case AyaType.WorkOrderTemplate: case AyaType.WorkOrderTemplate:
return new WorkOrderTemplateBiz(dbcontext, userId, ServerBootConfig.AYANOVA_DEFAULT_TRANSLATION_ID, roles); return new WorkOrderTemplateBiz(dbcontext, userId, ServerBootConfig.AYANOVA_DEFAULT_TRANSLATION_ID, roles);
case AyaType.WorkOrderTemplateItem:
return new WorkOrderTemplateItemBiz(dbcontext, userId, ServerBootConfig.AYANOVA_DEFAULT_TRANSLATION_ID, roles);
default: default:

156
server/AyaNova/biz/WorkOrderBiz.cs
View File

@@ -63,8 +63,7 @@ namespace AyaNova.Biz
internal async Task<WorkOrder> CreateAsync(long? workorderTemplateId, long? customerId, uint? serial) internal async Task<WorkOrder> CreateAsync(long? workorderTemplateId, long? customerId, uint? serial)
{ {
//Create and save to db a new workorder and return it //Create and save to db a new workorder and return it
//By default it should generate a unique id as the "name" field
//but need to support export to v8 plugin so need to be able to accept name already
// await ValidateAsync(inObj, null); // await ValidateAsync(inObj, null);
// if (HasErrors) // if (HasErrors)
@@ -72,21 +71,22 @@ namespace AyaNova.Biz
// else // else
// { // {
//do stuff with WorkOrder //do stuff with WorkOrder
WorkOrder outObj = new WorkOrder(); WorkOrder o = new WorkOrder();
outObj.Serial = serial ?? ServerBootConfig.WORKORDER_SERIAL.GetNext(); o.Serial = serial ?? ServerBootConfig.WORKORDER_SERIAL.GetNext();
//TODO: template
outObj.Tags = TagUtil.NormalizeTags(outObj.Tags); //TODO: CUSTOMER ID
outObj.CustomFields = JsonUtil.CompactJson(outObj.CustomFields);
//Save to db //Save to db
await ct.WorkOrder.AddAsync(outObj); await ct.WorkOrder.AddAsync(o);
await ct.SaveChangesAsync(); await ct.SaveChangesAsync();
//Handle child and associated items: //Handle child and associated items:
await EventLogProcessor.LogEventToDatabaseAsync(new Event(UserId, outObj.Id, BizType, AyaEvent.Created), ct); await EventLogProcessor.LogEventToDatabaseAsync(new Event(UserId, o.Id, BizType, AyaEvent.Created), ct);
await SearchIndexAsync(outObj, true); await SearchIndexAsync(o, true);
await TagUtil.ProcessUpdateTagsInRepositoryAsync(ct, outObj.Tags, null); // await TagUtil.ProcessUpdateTagsInRepositoryAsync(ct, o.Tags, null);
return outObj; return o;
//} //}
} }
@@ -100,33 +100,33 @@ namespace AyaNova.Biz
internal async Task<WorkOrder> DuplicateAsync(WorkOrder dbObj) internal async Task<WorkOrder> DuplicateAsync(WorkOrder dbObj)
{ {
throw new System.NotImplementedException("STUB: WORKORDER DUPLICATE"); throw new System.NotImplementedException("STUB: WORKORDER DUPLICATE");
WorkOrder outObj = new WorkOrder(); // WorkOrder outObj = new WorkOrder();
CopyObject.Copy(dbObj, outObj, "Wiki"); // CopyObject.Copy(dbObj, outObj, "Wiki");
// outObj.Name = Util.StringUtil.NameUniquify(outObj.Name, 255); // // outObj.Name = Util.StringUtil.NameUniquify(outObj.Name, 255);
//generate unique name // //generate unique name
string newUniqueName = string.Empty; // string newUniqueName = string.Empty;
bool NotUnique = true; // bool NotUnique = true;
long l = 1; // long l = 1;
do // do
{ // {
newUniqueName = Util.StringUtil.UniqueNameBuilder(dbObj.Name, l++, 255); // newUniqueName = Util.StringUtil.UniqueNameBuilder(dbObj.Name, l++, 255);
NotUnique = await ct.WorkOrder.AnyAsync(m => m.Name == newUniqueName); // NotUnique = await ct.WorkOrder.AnyAsync(m => m.Name == newUniqueName);
} while (NotUnique); // } while (NotUnique);
outObj.Name = newUniqueName; // outObj.Name = newUniqueName;
outObj.Id = 0; // outObj.Id = 0;
outObj.ConcurrencyToken = 0; // outObj.ConcurrencyToken = 0;
await ct.WorkOrder.AddAsync(outObj); // await ct.WorkOrder.AddAsync(outObj);
await ct.SaveChangesAsync(); // await ct.SaveChangesAsync();
//Handle child and associated items: // //Handle child and associated items:
await EventLogProcessor.LogEventToDatabaseAsync(new Event(UserId, outObj.Id, BizType, AyaEvent.Created), ct); // await EventLogProcessor.LogEventToDatabaseAsync(new Event(UserId, outObj.Id, BizType, AyaEvent.Created), ct);
await SearchIndexAsync(outObj, true); // await SearchIndexAsync(outObj, true);
await TagUtil.ProcessUpdateTagsInRepositoryAsync(ct, outObj.Tags, null); // await TagUtil.ProcessUpdateTagsInRepositoryAsync(ct, outObj.Tags, null);
return outObj; // return outObj;
} }
@@ -139,30 +139,30 @@ namespace AyaNova.Biz
{ {
throw new System.NotImplementedException("STUB: WORKORDER PUT"); throw new System.NotImplementedException("STUB: WORKORDER PUT");
//make a snapshot of the original for validation but update the original to preserve workflow //make a snapshot of the original for validation but update the original to preserve workflow
WorkOrder SnapshotOfOriginalDBObj = new WorkOrder(); // WorkOrder SnapshotOfOriginalDBObj = new WorkOrder();
CopyObject.Copy(dbObj, SnapshotOfOriginalDBObj); // CopyObject.Copy(dbObj, SnapshotOfOriginalDBObj);
//Replace the db object with the PUT object // //Replace the db object with the PUT object
CopyObject.Copy(inObj, dbObj, "Id"); // CopyObject.Copy(inObj, dbObj, "Id");
dbObj.Tags = TagUtil.NormalizeTags(dbObj.Tags); // dbObj.Tags = TagUtil.NormalizeTags(dbObj.Tags);
dbObj.CustomFields = JsonUtil.CompactJson(dbObj.CustomFields); // dbObj.CustomFields = JsonUtil.CompactJson(dbObj.CustomFields);
//Set "original" value of concurrency token to input token // //Set "original" value of concurrency token to input token
//this will allow EF to check it out // //this will allow EF to check it out
ct.Entry(dbObj).OriginalValues["ConcurrencyToken"] = inObj.ConcurrencyToken; // ct.Entry(dbObj).OriginalValues["ConcurrencyToken"] = inObj.ConcurrencyToken;
await ValidateAsync(dbObj, SnapshotOfOriginalDBObj); // await ValidateAsync(dbObj, SnapshotOfOriginalDBObj);
if (HasErrors) // if (HasErrors)
return false; // return false;
//Log event and save context // //Log event and save context
await EventLogProcessor.LogEventToDatabaseAsync(new Event(UserId, dbObj.Id, BizType, AyaEvent.Modified), ct); // await EventLogProcessor.LogEventToDatabaseAsync(new Event(UserId, dbObj.Id, BizType, AyaEvent.Modified), ct);
await SearchIndexAsync(dbObj, false); // await SearchIndexAsync(dbObj, false);
await TagUtil.ProcessUpdateTagsInRepositoryAsync(ct, dbObj.Tags, SnapshotOfOriginalDBObj.Tags); // await TagUtil.ProcessUpdateTagsInRepositoryAsync(ct, dbObj.Tags, SnapshotOfOriginalDBObj.Tags);
return true; // return true;
} }
@@ -171,7 +171,7 @@ namespace AyaNova.Biz
{ {
//SEARCH INDEXING //SEARCH INDEXING
var SearchParams = new Search.SearchIndexProcessObjectParameters(UserTranslationId, obj.Id, BizType); var SearchParams = new Search.SearchIndexProcessObjectParameters(UserTranslationId, obj.Id, BizType);
SearchParams.AddText(obj.Notes).AddText(obj.Name).AddText(obj.Wiki).AddText(obj.Tags).AddCustomFields(obj.CustomFields); SearchParams.AddText(obj.Notes).AddText(obj.Serial).AddText(obj.Wiki).AddText(obj.Tags).AddCustomFields(obj.CustomFields);
if (isNew) if (isNew)
await Search.ProcessNewObjectKeywordsAsync(SearchParams); await Search.ProcessNewObjectKeywordsAsync(SearchParams);
@@ -184,7 +184,7 @@ namespace AyaNova.Biz
var obj = await ct.WorkOrder.SingleOrDefaultAsync(m => m.Id == id); var obj = await ct.WorkOrder.SingleOrDefaultAsync(m => m.Id == id);
var SearchParams = new Search.SearchIndexProcessObjectParameters(); var SearchParams = new Search.SearchIndexProcessObjectParameters();
if (obj != null) if (obj != null)
SearchParams.AddText(obj.Notes).AddText(obj.Name).AddText(obj.Wiki).AddText(obj.Tags).AddCustomFields(obj.CustomFields); SearchParams.AddText(obj.Notes).AddText(obj.Serial).AddText(obj.Wiki).AddText(obj.Tags).AddCustomFields(obj.CustomFields);
return SearchParams; return SearchParams;
} }
@@ -198,16 +198,16 @@ namespace AyaNova.Biz
//Probably also in here deal with tags and associated search text etc //Probably also in here deal with tags and associated search text etc
//NOT REQUIRED NOW BUT IF IN FUTURE ValidateCanDelete(dbObj); //NOT REQUIRED NOW BUT IF IN FUTURE ValidateCanDelete(dbObj);
if (HasErrors) // if (HasErrors)
return false; // return false;
ct.WorkOrder.Remove(dbObj); // ct.WorkOrder.Remove(dbObj);
await ct.SaveChangesAsync(); // await ct.SaveChangesAsync();
//Log event // //Log event
await EventLogProcessor.DeleteObjectLogAsync(UserId, BizType, dbObj.Id, dbObj.Name, ct); // await EventLogProcessor.DeleteObjectLogAsync(UserId, BizType, dbObj.Id, dbObj.Serial.ToString(), ct);
await Search.ProcessDeletedObjectKeywordsAsync(dbObj.Id, BizType); // await Search.ProcessDeletedObjectKeywordsAsync(dbObj.Id, BizType);
await TagUtil.ProcessDeleteTagsInRepositoryAsync(ct, dbObj.Tags); // await TagUtil.ProcessDeleteTagsInRepositoryAsync(ct, dbObj.Tags);
return true; // return true;
} }
@@ -223,23 +223,23 @@ namespace AyaNova.Biz
//run validation and biz rules //run validation and biz rules
bool isNew = currentObj == null; bool isNew = currentObj == null;
//Name required // //Name required
if (string.IsNullOrWhiteSpace(proposedObj.Name)) // if (string.IsNullOrWhiteSpace(proposedObj.Name))
AddError(ApiErrorCode.VALIDATION_REQUIRED, "Name"); // AddError(ApiErrorCode.VALIDATION_REQUIRED, "Name");
//Name must be less than 255 characters // //Name must be less than 255 characters
if (proposedObj.Name.Length > 255) // if (proposedObj.Name.Length > 255)
AddError(ApiErrorCode.VALIDATION_LENGTH_EXCEEDED, "Name", "255 max"); // AddError(ApiErrorCode.VALIDATION_LENGTH_EXCEEDED, "Name", "255 max");
//If name is otherwise OK, check that name is unique // //If name is otherwise OK, check that name is unique
if (!PropertyHasErrors("Name")) // if (!PropertyHasErrors("Name"))
{ // {
//Use Any command is efficient way to check existance, it doesn't return the record, just a true or false // //Use Any command is efficient way to check existance, it doesn't return the record, just a true or false
if (await ct.WorkOrder.AnyAsync(m => m.Name == proposedObj.Name && m.Id != proposedObj.Id)) // if (await ct.WorkOrder.AnyAsync(m => m.Name == proposedObj.Name && m.Id != proposedObj.Id))
{ // {
AddError(ApiErrorCode.VALIDATION_NOT_UNIQUE, "Name"); // AddError(ApiErrorCode.VALIDATION_NOT_UNIQUE, "Name");
} // }
} // }
//Any form customizations to validate? //Any form customizations to validate?