From cbc73f1602981584f7f59fe1ef4c6e6203785a3b Mon Sep 17 00:00:00 2001 From: John Cardinal Date: Wed, 13 May 2020 19:24:18 +0000 Subject: [PATCH] Remove PATCH route and code --- devdocs/todo.txt | 7 +- .../AyaNova/Controllers/ContractController.cs | 2 +- .../AyaNova/Controllers/CustomerController.cs | 2 +- .../Controllers/DataListViewController.cs | 2 +- .../Controllers/FormCustomController.cs | 2 +- .../Controllers/HeadOfficeController.cs | 2 +- .../AyaNova/Controllers/LoanUnitController.cs | 2 +- .../Controllers/PMTemplateController.cs | 2 +- server/AyaNova/Controllers/PartController.cs | 2 +- .../AyaNova/Controllers/ProjectController.cs | 2 +- .../Controllers/PurchaseOrderController.cs | 2 +- .../Controllers/QuoteTemplateController.cs | 2 +- .../AyaNova/Controllers/SearchController.cs | 2 +- .../Controllers/TranslationController.cs | 2 +- server/AyaNova/Controllers/UnitController.cs | 2 +- .../Controllers/UnitModelController.cs | 2 +- server/AyaNova/Controllers/UserController.cs | 2 +- .../Controllers/UserOptionsController.cs | 2 +- .../AyaNova/Controllers/VendorController.cs | 2 +- .../AyaNova/Controllers/WidgetController.cs | 2 +- .../WorkOrderTemplateController.cs | 2 +- server/AyaNova/biz/BizObjectFactory.cs | 2 +- server/AyaNova/biz/ContractBiz.cs | 2 +- server/AyaNova/biz/CustomerBiz.cs | 2 +- server/AyaNova/biz/HeadOfficeBiz.cs | 2 +- server/AyaNova/biz/JobOperationsBiz.cs | 2 +- server/AyaNova/biz/LoanUnitBiz.cs | 2 +- server/AyaNova/biz/PMBiz.cs | 2 +- server/AyaNova/biz/PMTemplateBiz.cs | 2 +- server/AyaNova/biz/PartBiz.cs | 2 +- server/AyaNova/biz/ProjectBiz.cs | 2 +- server/AyaNova/biz/PurchaseOrderBiz.cs | 2 +- server/AyaNova/biz/QuoteBiz.cs | 2 +- server/AyaNova/biz/QuoteTemplateBiz.cs | 2 +- server/AyaNova/biz/UnitBiz.cs | 2 +- server/AyaNova/biz/UnitModelBiz.cs | 2 +- server/AyaNova/biz/UserBiz.cs | 2 +- server/AyaNova/biz/UserOptionsBiz.cs | 2 +- server/AyaNova/biz/ValidateJsonPatch.cs | 66 ------------------- server/AyaNova/biz/VendorBiz.cs | 2 +- server/AyaNova/biz/WidgetBiz.cs | 2 +- server/AyaNova/biz/WorkorderTemplateBiz.cs | 2 +- server/AyaNova/generator/CoreJobSweeper.cs | 2 +- 43 files changed, 42 insertions(+), 113 deletions(-) delete mode 100644 server/AyaNova/biz/ValidateJsonPatch.cs diff --git a/devdocs/todo.txt b/devdocs/todo.txt index 52e7fc0b..ce433f87 100644 --- a/devdocs/todo.txt +++ b/devdocs/todo.txt @@ -3,12 +3,7 @@ PRIORITY - ALWAYS Lowest level stuff first --- todo: API REFACTORING (note: workordercontroller / biz should be following all these rules so it's the template if need reference) -todo: consider and then get rid of PATCH in all routes - unless compelling reason to keep - Would there be a place in the UI where I would want to patch part of an object? - Because I already ditched that for the workorder which is the heaviest and most patchable object in the bunch - if I change a name would I patch it or just put the whole record? - supporting it only for the use of third party users is not a good idea +todo: get rid of PATCH in all routes todo: consider renaming ConcurrencyToken to a shorter string? todo: all api route parameters, post object sb "newObject", put="putObject" IN BIZ TOO diff --git a/server/AyaNova/Controllers/ContractController.cs b/server/AyaNova/Controllers/ContractController.cs index f1976bdd..8c8ab93f 100644 --- a/server/AyaNova/Controllers/ContractController.cs +++ b/server/AyaNova/Controllers/ContractController.cs @@ -3,7 +3,7 @@ using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Routing; using Microsoft.AspNetCore.Authorization; -using Microsoft.AspNetCore.JsonPatch; + using Microsoft.EntityFrameworkCore; using Microsoft.Extensions.Logging; using AyaNova.Models; diff --git a/server/AyaNova/Controllers/CustomerController.cs b/server/AyaNova/Controllers/CustomerController.cs index e6e37581..0c8c88dd 100644 --- a/server/AyaNova/Controllers/CustomerController.cs +++ b/server/AyaNova/Controllers/CustomerController.cs @@ -3,7 +3,7 @@ using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Routing; using Microsoft.AspNetCore.Authorization; -using Microsoft.AspNetCore.JsonPatch; + using Microsoft.EntityFrameworkCore; using Microsoft.Extensions.Logging; using AyaNova.Models; diff --git a/server/AyaNova/Controllers/DataListViewController.cs b/server/AyaNova/Controllers/DataListViewController.cs index 853cb8fa..f94ac8c9 100644 --- a/server/AyaNova/Controllers/DataListViewController.cs +++ b/server/AyaNova/Controllers/DataListViewController.cs @@ -4,7 +4,7 @@ using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Routing; using Microsoft.AspNetCore.Authorization; -using Microsoft.AspNetCore.JsonPatch; + using Microsoft.EntityFrameworkCore; using Microsoft.Extensions.Logging; diff --git a/server/AyaNova/Controllers/FormCustomController.cs b/server/AyaNova/Controllers/FormCustomController.cs index 34cd6640..307e28d3 100644 --- a/server/AyaNova/Controllers/FormCustomController.cs +++ b/server/AyaNova/Controllers/FormCustomController.cs @@ -4,7 +4,7 @@ using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Routing; using Microsoft.AspNetCore.Authorization; -using Microsoft.AspNetCore.JsonPatch; + using Microsoft.EntityFrameworkCore; using Microsoft.Extensions.Logging; diff --git a/server/AyaNova/Controllers/HeadOfficeController.cs b/server/AyaNova/Controllers/HeadOfficeController.cs index 206a3306..2349381b 100644 --- a/server/AyaNova/Controllers/HeadOfficeController.cs +++ b/server/AyaNova/Controllers/HeadOfficeController.cs @@ -3,7 +3,7 @@ using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Routing; using Microsoft.AspNetCore.Authorization; -using Microsoft.AspNetCore.JsonPatch; + using Microsoft.EntityFrameworkCore; using Microsoft.Extensions.Logging; using AyaNova.Models; diff --git a/server/AyaNova/Controllers/LoanUnitController.cs b/server/AyaNova/Controllers/LoanUnitController.cs index c9ee2e38..a32acccb 100644 --- a/server/AyaNova/Controllers/LoanUnitController.cs +++ b/server/AyaNova/Controllers/LoanUnitController.cs @@ -3,7 +3,7 @@ using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Routing; using Microsoft.AspNetCore.Authorization; -using Microsoft.AspNetCore.JsonPatch; + using Microsoft.EntityFrameworkCore; using Microsoft.Extensions.Logging; using AyaNova.Models; diff --git a/server/AyaNova/Controllers/PMTemplateController.cs b/server/AyaNova/Controllers/PMTemplateController.cs index 719ea525..4bed0125 100644 --- a/server/AyaNova/Controllers/PMTemplateController.cs +++ b/server/AyaNova/Controllers/PMTemplateController.cs @@ -3,7 +3,7 @@ using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Routing; using Microsoft.AspNetCore.Authorization; -using Microsoft.AspNetCore.JsonPatch; + using Microsoft.EntityFrameworkCore; using Microsoft.Extensions.Logging; using AyaNova.Models; diff --git a/server/AyaNova/Controllers/PartController.cs b/server/AyaNova/Controllers/PartController.cs index 9fcea807..863f7ceb 100644 --- a/server/AyaNova/Controllers/PartController.cs +++ b/server/AyaNova/Controllers/PartController.cs @@ -3,7 +3,7 @@ using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Routing; using Microsoft.AspNetCore.Authorization; -using Microsoft.AspNetCore.JsonPatch; + using Microsoft.EntityFrameworkCore; using Microsoft.Extensions.Logging; using AyaNova.Models; diff --git a/server/AyaNova/Controllers/ProjectController.cs b/server/AyaNova/Controllers/ProjectController.cs index 341c1b03..9593ee04 100644 --- a/server/AyaNova/Controllers/ProjectController.cs +++ b/server/AyaNova/Controllers/ProjectController.cs @@ -3,7 +3,7 @@ using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Routing; using Microsoft.AspNetCore.Authorization; -using Microsoft.AspNetCore.JsonPatch; + using Microsoft.EntityFrameworkCore; using Microsoft.Extensions.Logging; using AyaNova.Models; diff --git a/server/AyaNova/Controllers/PurchaseOrderController.cs b/server/AyaNova/Controllers/PurchaseOrderController.cs index b4f1c6e0..bfa8a27c 100644 --- a/server/AyaNova/Controllers/PurchaseOrderController.cs +++ b/server/AyaNova/Controllers/PurchaseOrderController.cs @@ -3,7 +3,7 @@ using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Routing; using Microsoft.AspNetCore.Authorization; -using Microsoft.AspNetCore.JsonPatch; + using Microsoft.EntityFrameworkCore; using Microsoft.Extensions.Logging; using AyaNova.Models; diff --git a/server/AyaNova/Controllers/QuoteTemplateController.cs b/server/AyaNova/Controllers/QuoteTemplateController.cs index 11e8bbc3..65064312 100644 --- a/server/AyaNova/Controllers/QuoteTemplateController.cs +++ b/server/AyaNova/Controllers/QuoteTemplateController.cs @@ -3,7 +3,7 @@ using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Routing; using Microsoft.AspNetCore.Authorization; -using Microsoft.AspNetCore.JsonPatch; + using Microsoft.EntityFrameworkCore; using Microsoft.Extensions.Logging; using AyaNova.Models; diff --git a/server/AyaNova/Controllers/SearchController.cs b/server/AyaNova/Controllers/SearchController.cs index 3066ec74..7ebcc1d0 100644 --- a/server/AyaNova/Controllers/SearchController.cs +++ b/server/AyaNova/Controllers/SearchController.cs @@ -4,7 +4,7 @@ using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Routing; using Microsoft.AspNetCore.Authorization; -using Microsoft.AspNetCore.JsonPatch; + using Microsoft.EntityFrameworkCore; using Microsoft.Extensions.Logging; diff --git a/server/AyaNova/Controllers/TranslationController.cs b/server/AyaNova/Controllers/TranslationController.cs index 155f107b..e6d15732 100644 --- a/server/AyaNova/Controllers/TranslationController.cs +++ b/server/AyaNova/Controllers/TranslationController.cs @@ -5,7 +5,7 @@ using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Routing; using Microsoft.AspNetCore.Authorization; -using Microsoft.AspNetCore.JsonPatch; + using Microsoft.EntityFrameworkCore; using Microsoft.Extensions.Logging; diff --git a/server/AyaNova/Controllers/UnitController.cs b/server/AyaNova/Controllers/UnitController.cs index f1c51c93..c1d9c796 100644 --- a/server/AyaNova/Controllers/UnitController.cs +++ b/server/AyaNova/Controllers/UnitController.cs @@ -3,7 +3,7 @@ using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Routing; using Microsoft.AspNetCore.Authorization; -using Microsoft.AspNetCore.JsonPatch; + using Microsoft.EntityFrameworkCore; using Microsoft.Extensions.Logging; using AyaNova.Models; diff --git a/server/AyaNova/Controllers/UnitModelController.cs b/server/AyaNova/Controllers/UnitModelController.cs index 31e2e6f4..9c0a6eb2 100644 --- a/server/AyaNova/Controllers/UnitModelController.cs +++ b/server/AyaNova/Controllers/UnitModelController.cs @@ -3,7 +3,7 @@ using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Routing; using Microsoft.AspNetCore.Authorization; -using Microsoft.AspNetCore.JsonPatch; + using Microsoft.EntityFrameworkCore; using Microsoft.Extensions.Logging; using AyaNova.Models; diff --git a/server/AyaNova/Controllers/UserController.cs b/server/AyaNova/Controllers/UserController.cs index dc653b67..83850165 100644 --- a/server/AyaNova/Controllers/UserController.cs +++ b/server/AyaNova/Controllers/UserController.cs @@ -4,7 +4,7 @@ using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Routing; using Microsoft.AspNetCore.Authorization; -using Microsoft.AspNetCore.JsonPatch; + using Microsoft.EntityFrameworkCore; using Microsoft.Extensions.Logging; diff --git a/server/AyaNova/Controllers/UserOptionsController.cs b/server/AyaNova/Controllers/UserOptionsController.cs index f91800f3..471ba750 100644 --- a/server/AyaNova/Controllers/UserOptionsController.cs +++ b/server/AyaNova/Controllers/UserOptionsController.cs @@ -4,7 +4,7 @@ using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Routing; using Microsoft.AspNetCore.Authorization; -using Microsoft.AspNetCore.JsonPatch; + using Microsoft.EntityFrameworkCore; using Microsoft.Extensions.Logging; diff --git a/server/AyaNova/Controllers/VendorController.cs b/server/AyaNova/Controllers/VendorController.cs index 743f420c..f703be51 100644 --- a/server/AyaNova/Controllers/VendorController.cs +++ b/server/AyaNova/Controllers/VendorController.cs @@ -3,7 +3,7 @@ using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Routing; using Microsoft.AspNetCore.Authorization; -using Microsoft.AspNetCore.JsonPatch; + using Microsoft.EntityFrameworkCore; using Microsoft.Extensions.Logging; using AyaNova.Models; diff --git a/server/AyaNova/Controllers/WidgetController.cs b/server/AyaNova/Controllers/WidgetController.cs index e40ec445..f0d7a2ee 100644 --- a/server/AyaNova/Controllers/WidgetController.cs +++ b/server/AyaNova/Controllers/WidgetController.cs @@ -3,7 +3,7 @@ using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Routing; using Microsoft.AspNetCore.Authorization; -using Microsoft.AspNetCore.JsonPatch; + using Microsoft.EntityFrameworkCore; using Microsoft.Extensions.Logging; diff --git a/server/AyaNova/Controllers/WorkOrderTemplateController.cs b/server/AyaNova/Controllers/WorkOrderTemplateController.cs index a5406587..d7a67ef6 100644 --- a/server/AyaNova/Controllers/WorkOrderTemplateController.cs +++ b/server/AyaNova/Controllers/WorkOrderTemplateController.cs @@ -3,7 +3,7 @@ using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Routing; using Microsoft.AspNetCore.Authorization; -using Microsoft.AspNetCore.JsonPatch; + using Microsoft.EntityFrameworkCore; using Microsoft.Extensions.Logging; using AyaNova.Models; diff --git a/server/AyaNova/biz/BizObjectFactory.cs b/server/AyaNova/biz/BizObjectFactory.cs index 85840591..6e980593 100644 --- a/server/AyaNova/biz/BizObjectFactory.cs +++ b/server/AyaNova/biz/BizObjectFactory.cs @@ -2,7 +2,7 @@ using System.Linq; using System.Threading.Tasks; using Microsoft.EntityFrameworkCore; using Microsoft.AspNetCore.Mvc; -using Microsoft.AspNetCore.JsonPatch; + using EnumsNET; using AyaNova.Util; using AyaNova.Api.ControllerHelpers; diff --git a/server/AyaNova/biz/ContractBiz.cs b/server/AyaNova/biz/ContractBiz.cs index 99f0740d..2efa1c91 100644 --- a/server/AyaNova/biz/ContractBiz.cs +++ b/server/AyaNova/biz/ContractBiz.cs @@ -1,6 +1,6 @@ using System.Threading.Tasks; using Microsoft.EntityFrameworkCore; -using Microsoft.AspNetCore.JsonPatch; + using AyaNova.Util; using AyaNova.Api.ControllerHelpers; using AyaNova.Models; diff --git a/server/AyaNova/biz/CustomerBiz.cs b/server/AyaNova/biz/CustomerBiz.cs index 8bd1d3e0..388e9f39 100644 --- a/server/AyaNova/biz/CustomerBiz.cs +++ b/server/AyaNova/biz/CustomerBiz.cs @@ -1,6 +1,6 @@ using System.Threading.Tasks; using Microsoft.EntityFrameworkCore; -using Microsoft.AspNetCore.JsonPatch; + using AyaNova.Util; using AyaNova.Api.ControllerHelpers; using AyaNova.Models; diff --git a/server/AyaNova/biz/HeadOfficeBiz.cs b/server/AyaNova/biz/HeadOfficeBiz.cs index 9d1849e4..069bffce 100644 --- a/server/AyaNova/biz/HeadOfficeBiz.cs +++ b/server/AyaNova/biz/HeadOfficeBiz.cs @@ -1,6 +1,6 @@ using System.Threading.Tasks; using Microsoft.EntityFrameworkCore; -using Microsoft.AspNetCore.JsonPatch; + using AyaNova.Util; using AyaNova.Api.ControllerHelpers; using AyaNova.Models; diff --git a/server/AyaNova/biz/JobOperationsBiz.cs b/server/AyaNova/biz/JobOperationsBiz.cs index 30417d65..3c8e5762 100644 --- a/server/AyaNova/biz/JobOperationsBiz.cs +++ b/server/AyaNova/biz/JobOperationsBiz.cs @@ -4,7 +4,7 @@ using System.Threading.Tasks; using System.Collections.Generic; using Microsoft.EntityFrameworkCore; using Microsoft.AspNetCore.Mvc; -using Microsoft.AspNetCore.JsonPatch; + using EnumsNET; using AyaNova.Util; using AyaNova.Api.ControllerHelpers; diff --git a/server/AyaNova/biz/LoanUnitBiz.cs b/server/AyaNova/biz/LoanUnitBiz.cs index 6cc4da3e..368c4ab0 100644 --- a/server/AyaNova/biz/LoanUnitBiz.cs +++ b/server/AyaNova/biz/LoanUnitBiz.cs @@ -1,6 +1,6 @@ using System.Threading.Tasks; using Microsoft.EntityFrameworkCore; -using Microsoft.AspNetCore.JsonPatch; + using AyaNova.Util; using AyaNova.Api.ControllerHelpers; using AyaNova.Models; diff --git a/server/AyaNova/biz/PMBiz.cs b/server/AyaNova/biz/PMBiz.cs index 03875004..5c1f1052 100644 --- a/server/AyaNova/biz/PMBiz.cs +++ b/server/AyaNova/biz/PMBiz.cs @@ -1,6 +1,6 @@ using System.Threading.Tasks; using Microsoft.EntityFrameworkCore; -using Microsoft.AspNetCore.JsonPatch; + using AyaNova.Util; using AyaNova.Api.ControllerHelpers; using AyaNova.Models; diff --git a/server/AyaNova/biz/PMTemplateBiz.cs b/server/AyaNova/biz/PMTemplateBiz.cs index 43f44e41..14e8f4e3 100644 --- a/server/AyaNova/biz/PMTemplateBiz.cs +++ b/server/AyaNova/biz/PMTemplateBiz.cs @@ -1,6 +1,6 @@ using System.Threading.Tasks; using Microsoft.EntityFrameworkCore; -using Microsoft.AspNetCore.JsonPatch; + using AyaNova.Util; using AyaNova.Api.ControllerHelpers; using AyaNova.Models; diff --git a/server/AyaNova/biz/PartBiz.cs b/server/AyaNova/biz/PartBiz.cs index 3e9189a1..5c86a1da 100644 --- a/server/AyaNova/biz/PartBiz.cs +++ b/server/AyaNova/biz/PartBiz.cs @@ -1,6 +1,6 @@ using System.Threading.Tasks; using Microsoft.EntityFrameworkCore; -using Microsoft.AspNetCore.JsonPatch; + using AyaNova.Util; using AyaNova.Api.ControllerHelpers; using AyaNova.Models; diff --git a/server/AyaNova/biz/ProjectBiz.cs b/server/AyaNova/biz/ProjectBiz.cs index c65e6d68..461a0673 100644 --- a/server/AyaNova/biz/ProjectBiz.cs +++ b/server/AyaNova/biz/ProjectBiz.cs @@ -1,6 +1,6 @@ using System.Threading.Tasks; using Microsoft.EntityFrameworkCore; -using Microsoft.AspNetCore.JsonPatch; + using AyaNova.Util; using AyaNova.Api.ControllerHelpers; using AyaNova.Models; diff --git a/server/AyaNova/biz/PurchaseOrderBiz.cs b/server/AyaNova/biz/PurchaseOrderBiz.cs index b458c670..4df7607c 100644 --- a/server/AyaNova/biz/PurchaseOrderBiz.cs +++ b/server/AyaNova/biz/PurchaseOrderBiz.cs @@ -1,6 +1,6 @@ using System.Threading.Tasks; using Microsoft.EntityFrameworkCore; -using Microsoft.AspNetCore.JsonPatch; + using AyaNova.Util; using AyaNova.Api.ControllerHelpers; using AyaNova.Models; diff --git a/server/AyaNova/biz/QuoteBiz.cs b/server/AyaNova/biz/QuoteBiz.cs index e63e845a..61827e35 100644 --- a/server/AyaNova/biz/QuoteBiz.cs +++ b/server/AyaNova/biz/QuoteBiz.cs @@ -1,6 +1,6 @@ using System.Threading.Tasks; using Microsoft.EntityFrameworkCore; -using Microsoft.AspNetCore.JsonPatch; + using AyaNova.Util; using AyaNova.Api.ControllerHelpers; using AyaNova.Models; diff --git a/server/AyaNova/biz/QuoteTemplateBiz.cs b/server/AyaNova/biz/QuoteTemplateBiz.cs index 6ce6be7c..538cb84a 100644 --- a/server/AyaNova/biz/QuoteTemplateBiz.cs +++ b/server/AyaNova/biz/QuoteTemplateBiz.cs @@ -1,6 +1,6 @@ using System.Threading.Tasks; using Microsoft.EntityFrameworkCore; -using Microsoft.AspNetCore.JsonPatch; + using AyaNova.Util; using AyaNova.Api.ControllerHelpers; using AyaNova.Models; diff --git a/server/AyaNova/biz/UnitBiz.cs b/server/AyaNova/biz/UnitBiz.cs index fa644bc9..12a82db5 100644 --- a/server/AyaNova/biz/UnitBiz.cs +++ b/server/AyaNova/biz/UnitBiz.cs @@ -1,6 +1,6 @@ using System.Threading.Tasks; using Microsoft.EntityFrameworkCore; -using Microsoft.AspNetCore.JsonPatch; + using AyaNova.Util; using AyaNova.Api.ControllerHelpers; using AyaNova.Models; diff --git a/server/AyaNova/biz/UnitModelBiz.cs b/server/AyaNova/biz/UnitModelBiz.cs index b2d6f32b..4ee46084 100644 --- a/server/AyaNova/biz/UnitModelBiz.cs +++ b/server/AyaNova/biz/UnitModelBiz.cs @@ -1,6 +1,6 @@ using System.Threading.Tasks; using Microsoft.EntityFrameworkCore; -using Microsoft.AspNetCore.JsonPatch; + using AyaNova.Util; using AyaNova.Api.ControllerHelpers; using AyaNova.Models; diff --git a/server/AyaNova/biz/UserBiz.cs b/server/AyaNova/biz/UserBiz.cs index dd0554d5..ba071657 100644 --- a/server/AyaNova/biz/UserBiz.cs +++ b/server/AyaNova/biz/UserBiz.cs @@ -1,7 +1,7 @@ using System.Linq; using System.Threading.Tasks; using Microsoft.EntityFrameworkCore; -using Microsoft.AspNetCore.JsonPatch; + using EnumsNET; using AyaNova.Util; using AyaNova.Api.ControllerHelpers; diff --git a/server/AyaNova/biz/UserOptionsBiz.cs b/server/AyaNova/biz/UserOptionsBiz.cs index ef4ebabb..03cc0eb5 100644 --- a/server/AyaNova/biz/UserOptionsBiz.cs +++ b/server/AyaNova/biz/UserOptionsBiz.cs @@ -2,7 +2,7 @@ using System.Linq; using System.Threading.Tasks; using Microsoft.EntityFrameworkCore; using Microsoft.AspNetCore.Mvc; -using Microsoft.AspNetCore.JsonPatch; + using EnumsNET; using AyaNova.Util; using AyaNova.Api.ControllerHelpers; diff --git a/server/AyaNova/biz/ValidateJsonPatch.cs b/server/AyaNova/biz/ValidateJsonPatch.cs deleted file mode 100644 index 6258c083..00000000 --- a/server/AyaNova/biz/ValidateJsonPatch.cs +++ /dev/null @@ -1,66 +0,0 @@ -using System.Linq; -using Microsoft.AspNetCore.JsonPatch; -using System; - -namespace AyaNova.Biz -{ - - - internal static class ValidateJsonPatch where T : class - { - - internal static bool Validate(BizObject biz, JsonPatchDocument objectPatch, string protectedProperties = "") - { - bool IsValid = true; - - string[] ProtectedProperties = null; - if (!string.IsNullOrEmpty(protectedProperties)) - { - protectedProperties = protectedProperties.Replace(", ", ",").Replace(" ,", ",").Trim(); - ProtectedProperties = protectedProperties.Split(new char[1] { ',' }, StringSplitOptions.RemoveEmptyEntries); - } - - if (ProtectedProperties != null) - foreach (string Property in ProtectedProperties) - { - if (objectPatch.Operations.Any(m => m.path == $"/{Property.ToLowerInvariant()}")) - { - biz.AddError(ApiErrorCode.VALIDATION_NOT_CHANGEABLE, Property); - IsValid = false; - } - } - - //check for in-valid patches - if (objectPatch.Operations.Any(m => m.path == "/id")) - { - biz.AddError(ApiErrorCode.VALIDATION_NOT_CHANGEABLE, "Id"); - IsValid = false; - } - - - if (objectPatch.Operations.Any(m => m.path == "/serial")) - { - biz.AddError(ApiErrorCode.VALIDATION_NOT_CHANGEABLE, "Serial"); - IsValid = false; - } - - if (objectPatch.Operations.Any(m => m.op == "add")) - { - biz.AddError(ApiErrorCode.INVALID_OPERATION, "add"); - IsValid = false; - } - - if (objectPatch.Operations.Any(m => m.op == "remove")) - { - biz.AddError(ApiErrorCode.INVALID_OPERATION, "remove"); - IsValid = false; - } - - return IsValid; - } - - - - }//eoc - -}//eons \ No newline at end of file diff --git a/server/AyaNova/biz/VendorBiz.cs b/server/AyaNova/biz/VendorBiz.cs index 42623b47..5b72a10d 100644 --- a/server/AyaNova/biz/VendorBiz.cs +++ b/server/AyaNova/biz/VendorBiz.cs @@ -1,6 +1,6 @@ using System.Threading.Tasks; using Microsoft.EntityFrameworkCore; -using Microsoft.AspNetCore.JsonPatch; + using AyaNova.Util; using AyaNova.Api.ControllerHelpers; using AyaNova.Models; diff --git a/server/AyaNova/biz/WidgetBiz.cs b/server/AyaNova/biz/WidgetBiz.cs index 16d73f05..e667fba5 100644 --- a/server/AyaNova/biz/WidgetBiz.cs +++ b/server/AyaNova/biz/WidgetBiz.cs @@ -1,6 +1,6 @@ using System.Threading.Tasks; using Microsoft.EntityFrameworkCore; -using Microsoft.AspNetCore.JsonPatch; + using EnumsNET; using AyaNova.Util; using AyaNova.Api.ControllerHelpers; diff --git a/server/AyaNova/biz/WorkorderTemplateBiz.cs b/server/AyaNova/biz/WorkorderTemplateBiz.cs index 3d395be3..b04164e3 100644 --- a/server/AyaNova/biz/WorkorderTemplateBiz.cs +++ b/server/AyaNova/biz/WorkorderTemplateBiz.cs @@ -1,6 +1,6 @@ using System.Threading.Tasks; using Microsoft.EntityFrameworkCore; -using Microsoft.AspNetCore.JsonPatch; + using AyaNova.Util; using AyaNova.Api.ControllerHelpers; using AyaNova.Models; diff --git a/server/AyaNova/generator/CoreJobSweeper.cs b/server/AyaNova/generator/CoreJobSweeper.cs index 52667347..681aabc3 100644 --- a/server/AyaNova/generator/CoreJobSweeper.cs +++ b/server/AyaNova/generator/CoreJobSweeper.cs @@ -4,7 +4,7 @@ using System.Threading.Tasks; using System.Collections.Generic; using Microsoft.EntityFrameworkCore; using Microsoft.AspNetCore.Mvc; -using Microsoft.AspNetCore.JsonPatch; + using Microsoft.Extensions.Logging; using EnumsNET; using AyaNova.Util;