From ebee084c295ed04c9f1bbb3a1ae64921a0f8e30d Mon Sep 17 00:00:00 2001 From: John Cardinal Date: Fri, 11 Jun 2021 23:29:53 +0000 Subject: [PATCH] --- server/AyaNova/biz/WorkOrderBiz.cs | 52 ++++++++++++++++++++++++++---- 1 file changed, 46 insertions(+), 6 deletions(-) diff --git a/server/AyaNova/biz/WorkOrderBiz.cs b/server/AyaNova/biz/WorkOrderBiz.cs index bf3ba12f..af8601d0 100644 --- a/server/AyaNova/biz/WorkOrderBiz.cs +++ b/server/AyaNova/biz/WorkOrderBiz.cs @@ -2074,9 +2074,15 @@ namespace AyaNova.Biz bool isNew = currentObj == null; if (proposedObj.WorkOrderItemId == 0) + { AddError(ApiErrorCode.VALIDATION_REQUIRED, "WorkOrderItemId"); + return;//this is a completely disqualifying error + } else if (!await ItemExistsAsync(proposedObj.WorkOrderItemId)) + { AddError(ApiErrorCode.VALIDATION_INVALID_VALUE, "WorkOrderItemId"); + return;//this is a completely disqualifying error + } //Check state if updatable right now if (!isNew) @@ -2553,10 +2559,14 @@ namespace AyaNova.Biz bool isNew = currentObj == null; if (proposedObj.WorkOrderItemId == 0) + { AddError(ApiErrorCode.VALIDATION_REQUIRED, "WorkOrderItemId"); + return;//this is a completely disqualifying error + } else if (!await ItemExistsAsync(proposedObj.WorkOrderItemId)) { AddError(ApiErrorCode.VALIDATION_INVALID_VALUE, "WorkOrderItemId"); + return;//this is a completely disqualifying error } //Check state if updatable right now if (!isNew) @@ -2920,10 +2930,14 @@ namespace AyaNova.Biz bool isNew = currentObj == null; if (proposedObj.WorkOrderItemId == 0) + { AddError(ApiErrorCode.VALIDATION_REQUIRED, "WorkOrderItemId"); + return;//this is a completely disqualifying error + } else if (!await ItemExistsAsync(proposedObj.WorkOrderItemId)) { AddError(ApiErrorCode.VALIDATION_INVALID_VALUE, "WorkOrderItemId"); + return;//this is a completely disqualifying error } //Check state if updatable right now if (!isNew) @@ -3223,10 +3237,14 @@ namespace AyaNova.Biz bool isNew = currentObj == null; if (proposedObj.WorkOrderItemId == 0) + { AddError(ApiErrorCode.VALIDATION_REQUIRED, "WorkOrderItemId"); + return;//this is a completely disqualifying error + } else if (!await ItemExistsAsync(proposedObj.WorkOrderItemId)) { AddError(ApiErrorCode.VALIDATION_INVALID_VALUE, "WorkOrderItemId"); + return;//this is a completely disqualifying error } //Check state if updatable right now if (!isNew) @@ -3949,10 +3967,14 @@ namespace AyaNova.Biz bool isNew = currentObj == null; if (proposedObj.WorkOrderItemId == 0) + { AddError(ApiErrorCode.VALIDATION_REQUIRED, "WorkOrderItemId"); + return;//this is a completely disqualifying error + } else if (!await ItemExistsAsync(proposedObj.WorkOrderItemId)) { AddError(ApiErrorCode.VALIDATION_INVALID_VALUE, "WorkOrderItemId"); + return;//this is a completely disqualifying error } //Check state if updatable right now if (!isNew) @@ -4197,10 +4219,14 @@ namespace AyaNova.Biz bool isNew = currentObj == null; if (proposedObj.WorkOrderItemId == 0) + { AddError(ApiErrorCode.VALIDATION_REQUIRED, "WorkOrderItemId"); + return;//this is a completely disqualifying error + } else if (!await ItemExistsAsync(proposedObj.WorkOrderItemId)) { AddError(ApiErrorCode.VALIDATION_INVALID_VALUE, "WorkOrderItemId"); + return;//this is a completely disqualifying error } //Check state if updatable right now if (!isNew) @@ -4424,17 +4450,21 @@ namespace AyaNova.Biz bool isNew = currentObj == null; if (proposedObj.WorkOrderItemId == 0) + { AddError(ApiErrorCode.VALIDATION_REQUIRED, "WorkOrderItemId"); + return;//this is a completely disqualifying error + } else if (!await ItemExistsAsync(proposedObj.WorkOrderItemId)) { AddError(ApiErrorCode.VALIDATION_INVALID_VALUE, "WorkOrderItemId"); + return;//this is a completely disqualifying error } - //TEST TEST TEST - if (proposedObj.EstimatedQuantity == 69) - { - AddError(ApiErrorCode.VALIDATION_INVALID_VALUE, $"EstimatedQuantity", "◈◈ TEST SAVE ERROR ◈◈"); - } + // //TEST TEST TEST + // if (proposedObj.EstimatedQuantity == 69) + // { + // AddError(ApiErrorCode.VALIDATION_INVALID_VALUE, $"EstimatedQuantity", "◈◈ TEST SAVE ERROR ◈◈"); + // } //Check state if updatable right now @@ -4812,10 +4842,14 @@ namespace AyaNova.Biz bool isNew = currentObj == null; if (proposedObj.WorkOrderItemId == 0) + { AddError(ApiErrorCode.VALIDATION_REQUIRED, "WorkOrderItemId"); + return;//this is a completely disqualifying error + } else if (!await ItemExistsAsync(proposedObj.WorkOrderItemId)) { AddError(ApiErrorCode.VALIDATION_INVALID_VALUE, "WorkOrderItemId"); + return;//this is a completely disqualifying error } //Check state if updatable right now if (!isNew) @@ -4828,9 +4862,15 @@ namespace AyaNova.Biz AddError(ApiErrorCode.VALIDATION_NOT_CHANGEABLE, "generalerror", await Translate("WorkOrderErrorLocked")); return;//this is a completely disqualifying error } - } + if (string.IsNullOrWhiteSpace(proposedObj.Task)) + AddError(ApiErrorCode.VALIDATION_REQUIRED, "Task"); + + //TEST TEST TEST ERROR + if (proposedObj.Sequence == 999) + AddError(ApiErrorCode.VALIDATION_INVALID_VALUE, "Sequence"); + //Any form customizations to validate? var FormCustomization = await ct.FormCustom.AsNoTracking().SingleOrDefaultAsync(z => z.FormKey == AyaType.WorkOrderItemTask.ToString()); if (FormCustomization != null)