From bca9879cc920990bcc6992934a77f44e2fc8b424 Mon Sep 17 00:00:00 2001 From: AKurakin Date: Wed, 3 May 2023 15:04:44 +0300 Subject: [PATCH] =?UTF-8?q?company-service=20=D1=83=D0=B1=D1=80=D0=B0?= =?UTF-8?q?=D0=BB=20=D0=BF=D1=80=D0=BE=D0=B2=D0=B5=D1=80=D0=BA=D0=B8=20?= =?UTF-8?q?=D0=BF=D0=BE=20enum,=20=D0=BE=D1=81=D1=82=D0=B0=D0=B2=D0=B8?= =?UTF-8?q?=D0=BB=20=D0=BF=D0=BE=20dictionary?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../validation/common/rules/EnumPresentRule.java | 1 + .../ClearingMemberCategoryValidationConfig.java | 6 ------ .../config/validation/CompanyValidationConfig.java | 5 ----- .../config/validation/ContactValidationConfig.java | 11 ----------- .../validation/ProfileDocumentValidationConfig.java | 11 ----------- 5 files changed, 1 insertion(+), 33 deletions(-) diff --git a/clearing-parent/clearing-validation/src/main/java/ru/spcex/clearing/validation/common/rules/EnumPresentRule.java b/clearing-parent/clearing-validation/src/main/java/ru/spcex/clearing/validation/common/rules/EnumPresentRule.java index 5b503aedf..06df4e777 100644 --- a/clearing-parent/clearing-validation/src/main/java/ru/spcex/clearing/validation/common/rules/EnumPresentRule.java +++ b/clearing-parent/clearing-validation/src/main/java/ru/spcex/clearing/validation/common/rules/EnumPresentRule.java @@ -11,6 +11,7 @@ import java.util.function.Function; /** * Проверка поля со значением из множества (enum) + * Рекомендуется использовать не эту валидацию, а DictionaryPresentRule * @param Класс проверяемого объекта * @param Enum */ diff --git a/clearing-parent/company-service/src/main/java/ru/spcex/clearing/company/config/validation/ClearingMemberCategoryValidationConfig.java b/clearing-parent/company-service/src/main/java/ru/spcex/clearing/company/config/validation/ClearingMemberCategoryValidationConfig.java index 573a2793c..23270a5d8 100644 --- a/clearing-parent/company-service/src/main/java/ru/spcex/clearing/company/config/validation/ClearingMemberCategoryValidationConfig.java +++ b/clearing-parent/company-service/src/main/java/ru/spcex/clearing/company/config/validation/ClearingMemberCategoryValidationConfig.java @@ -81,12 +81,6 @@ public class ClearingMemberCategoryValidationConfig { return CompanyErrors.CompanyDisabled; return null; }), - EnumPresentRule.instance("clearingMemberCategory", - ClearingMemberCategoryUpdateRequest::getClearingMemberCategory, - ClearingCategory.values(), - false, - CompanyErrors.WrongFieldValue, - CompanyErrors.RequiredFieldEmpty), DictionaryPresentRule.instance("clearingMemberCategory", ClearingMemberCategoryUpdateRequest::getClearingMemberCategory, IMDGDistributedNames.Map_ClearingCategoryDictionary, diff --git a/clearing-parent/company-service/src/main/java/ru/spcex/clearing/company/config/validation/CompanyValidationConfig.java b/clearing-parent/company-service/src/main/java/ru/spcex/clearing/company/config/validation/CompanyValidationConfig.java index b31127875..5a890d5b1 100644 --- a/clearing-parent/company-service/src/main/java/ru/spcex/clearing/company/config/validation/CompanyValidationConfig.java +++ b/clearing-parent/company-service/src/main/java/ru/spcex/clearing/company/config/validation/CompanyValidationConfig.java @@ -49,11 +49,6 @@ public class CompanyValidationConfig { WorkflowStatusDictionary.class, CompanyErrors.RequiredFieldEmpty, CompanyErrors.WrongFieldValue), - EnumPresentRule.instance("companySymbol", - CompanyNewRequest::getCompanySymbol, - CompanySymbol.values(), - CompanyErrors.WrongFieldValue, - CompanyErrors.RequiredFieldEmpty), DictionaryPresentRule.instance("companySymbol", CompanyNewRequest::getCompanySymbol, IMDGDistributedNames.Map_CompanySymbolDictionary, diff --git a/clearing-parent/company-service/src/main/java/ru/spcex/clearing/company/config/validation/ContactValidationConfig.java b/clearing-parent/company-service/src/main/java/ru/spcex/clearing/company/config/validation/ContactValidationConfig.java index 3cb98b376..f92635d78 100644 --- a/clearing-parent/company-service/src/main/java/ru/spcex/clearing/company/config/validation/ContactValidationConfig.java +++ b/clearing-parent/company-service/src/main/java/ru/spcex/clearing/company/config/validation/ContactValidationConfig.java @@ -44,11 +44,6 @@ public class ContactValidationConfig { Company.class, CompanyErrors.RequiredFieldEmpty, CompanyErrors.CompanyNotFound), - EnumPresentRule.instance("contactType", - ContactNewRequest::getContactType, - ContactTypes.values(), - CompanyErrors.WrongFieldValue, - CompanyErrors.RequiredFieldEmpty), DictionaryPresentRule.instance("contactType", ContactNewRequest::getContactType, IMDGDistributedNames.Map_ContactTypeDictionary, @@ -86,12 +81,6 @@ public class ContactValidationConfig { } return null; }), - EnumPresentRule.instance("contactType", - ContactUpdateRequest::getContactType, - ContactTypes.values(), - false, - CompanyErrors.WrongFieldValue, - CompanyErrors.RequiredFieldEmpty), DictionaryPresentRule.instance("contactType", ContactUpdateRequest::getContactType, IMDGDistributedNames.Map_ContactTypeDictionary, diff --git a/clearing-parent/company-service/src/main/java/ru/spcex/clearing/company/config/validation/ProfileDocumentValidationConfig.java b/clearing-parent/company-service/src/main/java/ru/spcex/clearing/company/config/validation/ProfileDocumentValidationConfig.java index 098c6a550..9fe82a927 100644 --- a/clearing-parent/company-service/src/main/java/ru/spcex/clearing/company/config/validation/ProfileDocumentValidationConfig.java +++ b/clearing-parent/company-service/src/main/java/ru/spcex/clearing/company/config/validation/ProfileDocumentValidationConfig.java @@ -45,11 +45,6 @@ public class ProfileDocumentValidationConfig { CompanyErrors.RequiredFieldEmpty, CompanyErrors.CompanyNotFound, company -> WorkflowStatus.Active.getKey().equals(company.getWorkflowStatus()) ? null : CompanyErrors.CompanyDisabled), - EnumPresentRule.instance("documentType", - ProfileDocumentNewRequest::getDocumentType, - DocumentTypes.values(), - CompanyErrors.WrongFieldValue, - CompanyErrors.RequiredFieldEmpty), DictionaryPresentRule.instance("documentType", ProfileDocumentNewRequest::getDocumentType, IMDGDistributedNames.Map_DocumentTypeDictionary, @@ -109,12 +104,6 @@ public class ProfileDocumentValidationConfig { CompanyErrors.CompanyNotFound, false, company -> WorkflowStatus.Active.getKey().equals(company.getWorkflowStatus()) ? null : CompanyErrors.CompanyDisabled), - EnumPresentRule.instance("documentType", - ProfileDocumentUpdateRequest::getDocumentType, - DocumentTypes.values(), - false, - CompanyErrors.WrongFieldValue, - CompanyErrors.RequiredFieldEmpty), DictionaryPresentRule.instance("documentType", ProfileDocumentUpdateRequest::getDocumentType, IMDGDistributedNames.Map_DocumentTypeDictionary,