company-service http://jira.mfd.msk:8088/browse/CLS-259 правки

clearing-parent/company-service/src/main/java/ru/spcex/clearing/company/config/validation/CompanySymbolValidationConfig.java

@@ -39,7 +39,7 @@ public class CompanySymbolValidationConfig {
             return new ValidatorImpl<>(context,
                     FieldRequiredRule.instance("companyId", CompanySymbolNewRequest::getCompanyId, CompanyErrors.RequiredFieldEmpty),
                     IdPresentRule.instance("companyId",
-                            CompanySymbolUpdateRequest::getCompanyId,
+                            CompanySymbolNewRequest::getCompanyId,
                             IMDGDistributedNames.Map_Company,
                             Company.class,
                             CompanyErrors.RequiredFieldEmpty,

clearing-parent/company-service/src/main/java/ru/spcex/clearing/company/config/validation/ProfileDocumentValidationConfig.java

@@ -56,12 +56,6 @@ public class ProfileDocumentValidationConfig {
                     FieldRequiredRule.instance("issuer",
                             ProfileDocumentNewRequest::getIssuer,
                             CompanyErrors.RequiredFieldEmpty),
-                    FieldRequiredRule.instance("name",
-                            ProfileDocumentNewRequest::getName,
-                            CompanyErrors.RequiredFieldEmpty),
-                    FieldRequiredRule.instance("number",
-                            ProfileDocumentNewRequest::getNumber,
-                            CompanyErrors.RequiredFieldEmpty),
                     FieldRequiredRule.instance("validToDate",
                             ProfileDocumentNewRequest::getValidToDate,
                             CompanyErrors.RequiredFieldEmpty),

clearing-parent/company-service/src/main/java/ru/spcex/clearing/company/config/validation/RelationValidationConfig.java

@@ -37,6 +37,7 @@ public class RelationValidationConfig {
             addImdg.accept(IMDGDistributedNames.Map_Company);
             addImdg.accept(IMDGDistributedNames.Map_ClearingCategoryDictionary);
             addImdg.accept(IMDGDistributedNames.Map_WorkflowStatusDictionary);
+            addImdg.accept(IMDGDistributedNames.Map_ServiceStatusDictionary);
             return new ValidatorImpl<>(context,
                     IdPresentRule.instance("companyId",
                             RelationNewRequest::getCompanyId,
@@ -72,6 +73,7 @@ public class RelationValidationConfig {
             addImdg.accept(IMDGDistributedNames.Map_Company);
 //            addImdg.accept(IMDGDistributedNames.Map_ClearingCategoryDictionary);
             addImdg.accept(IMDGDistributedNames.Map_WorkflowStatusDictionary);
+            addImdg.accept(IMDGDistributedNames.Map_ServiceStatusDictionary);
             return new ValidatorImpl<>(context,
                     IdPresentRule.instance("id",
                             RelationUpdateRequest::getId,

clearing-parent/company-service/src/main/java/ru/spcex/clearing/company/service/RelationService.java

@@ -323,6 +323,10 @@ public class RelationService extends QueueConsumer implements InitializingBean {
     protected void cancelingOfAgreementUpdateRelation(ImdgTransaction transaction, Long companyId) {
         Imdg<Relation> relationMap = transaction.getImdg(IMDGDistributedNames.Map_Relation, Relation.class);
         Relation relation = relationMap.getSingleObjectByFieldValues(Map.of("consumerId", companyId));
+        if (relation == null) {
+            log.warn("Relation with consumerId={} not found", companyId);
+            return;
+        }
         relation.setServiceStatus(Closed.getKey());
         relationMap.update(relation);
         log.debug("New Relation[{}]  updated.", relation.getId());

clearing-parent/company-service/src/test/java/ru/spcex/clearing/company/service/ClearingMemberCategoryServiceTest.java

@@ -13,8 +13,7 @@ import ru.clearing.classes.statics.data.company.ClearingMemberCategory;
 import ru.clearing.classes.statics.data.company.Company;
 import ru.clearing.platform.dictionary.ClearingCategoryDictionary;
 import ru.spcex.clearing.company.config.BeanConfiguration;
-import ru.spcex.clearing.company.config.validation.ClearingMemberCategoryValidationConfig;
+import ru.spcex.clearing.company.config.validation.*;
-import ru.spcex.clearing.company.config.validation.ValidationConfig;
 import ru.spcex.clearing.imdg.IMDGDistributedNames;
 import ru.spcex.clearing.platform.messaging.domain.BaseRequest;
 import ru.spcex.clearing.platform.messaging.domain.Consts;
@@ -42,6 +41,12 @@ import static ru.spcex.clearing.test.config.ImdgTestConfig.waitAvailableImdgProv
         ValidationConfig.class,
         ClearingMemberCategoryService.class,
         ClearingMemberCategoryValidationConfig.class,
+
+        CompanyService.class, CompanyValidationConfig.class,
+        CompanySymbolService.class, CompanySymbolValidationConfig.class,
+        AccountNotificationHelper.class,
+        RelationService.class, RelationValidationConfig.class,
+
         KafkaTestConfig.class,
         ImdgTestConfig.class})
 class ClearingMemberCategoryServiceTest {

clearing-parent/company-service/src/test/java/ru/spcex/clearing/company/service/ProfileDocumentServiceTest.java

@@ -13,8 +13,7 @@ import ru.clearing.classes.statics.data.company.Company;
 import ru.clearing.classes.statics.data.profile.ProfileDocument;
 import ru.clearing.platform.dictionary.DocumentTypeDictionary;
 import ru.spcex.clearing.company.config.BeanConfiguration;
-import ru.spcex.clearing.company.config.validation.ProfileDocumentValidationConfig;
+import ru.spcex.clearing.company.config.validation.*;
-import ru.spcex.clearing.company.config.validation.ValidationConfig;
 import ru.spcex.clearing.imdg.IMDGDistributedNames;
 import ru.spcex.clearing.platform.messaging.domain.BaseRequest;
 import ru.spcex.clearing.platform.messaging.domain.Consts;
@@ -45,6 +44,12 @@ import static ru.spcex.clearing.test.config.ImdgTestConfig.waitAvailableImdgProv
         ProfileDocumentService.class,
         AccountNotificationHelper.class,
         ProfileDocumentValidationConfig.class,
+
+        CompanyService.class, CompanyValidationConfig.class,
+        CompanySymbolService.class, CompanySymbolValidationConfig.class,
+        AccountNotificationHelper.class,
+        RelationService.class, RelationValidationConfig.class,
+
         KafkaTestConfig.class,
         ImdgTestConfig.class})
 class ProfileDocumentServiceTest {