http://jira.mfd.msk:8088/browse/CLS-259

---
Добавил обработку удаления информации о контактах
Поправил добавление информации о реквизитах

clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/request/cud/company/CompanySymbolNewAction.java

@@ -4,9 +4,9 @@ import com.fasterxml.jackson.annotation.JsonProperty;
 import io.swagger.annotations.ApiModelProperty;
 import ru.spcex.clearing.backendapi.domain.actions.IAction;
 import ru.spcex.clearing.platform.messaging.domain.ActionType;
-import ru.spcex.clearing.platform.messaging.domain.cud.company.CompanySymbolUpdateRequest;
+import ru.spcex.clearing.platform.messaging.domain.cud.company.CompanySymbolNewRequest;
 
-public class CompanySymbolNewAction implements IAction<CompanySymbolUpdateRequest> {
+public class CompanySymbolNewAction implements IAction<CompanySymbolNewRequest> {
     @ApiModelProperty(value = "Идентификатор Компании", example = "1234")
     @JsonProperty
     private Long companyId;
@@ -18,8 +18,8 @@ public class CompanySymbolNewAction implements IAction<CompanySymbolUpdateReques
     private String companySymbolValue;
 
     @Override
-    public CompanySymbolUpdateRequest toRequest() {
+    public CompanySymbolNewRequest toRequest() {
-        CompanySymbolUpdateRequest request = new CompanySymbolUpdateRequest();
+        CompanySymbolNewRequest request = new CompanySymbolNewRequest();
         request.setCompanyId(this.companyId);
         request.setCompanySymbol(this.companySymbol);
         request.setCompanySymbolValue(this.companySymbolValue);

clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/request/cud/company/ListingNewAction.java

@@ -4,7 +4,6 @@ import com.fasterxml.jackson.annotation.JsonProperty;
 import io.swagger.annotations.ApiModelProperty;
 import ru.spcex.clearing.backendapi.domain.actions.IAction;
 import ru.spcex.clearing.platform.messaging.domain.ActionType;
-import ru.spcex.clearing.platform.messaging.domain.cud.company.CompanySymbolUpdateRequest;
 import ru.spcex.clearing.platform.messaging.domain.cud.securitites.ListingNewRequest;
 
 import java.math.BigDecimal;

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

@@ -4,22 +4,17 @@ import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import ru.clearing.classes.statics.data.company.Company;
 import ru.clearing.classes.statics.data.company.CompanySymbols;
-import ru.clearing.platform.dictionary.*;
+import ru.clearing.platform.dictionary.CompanySymbolDictionary;
 import ru.spcex.clearing.company.error.CompanyErrors;
-import ru.spcex.clearing.company.validation.CompanySymbolNotExistRule;
 import ru.spcex.clearing.company.validation.CompanySymbolOfSymbolNewRequestNotExistRule;
 import ru.spcex.clearing.imdg.IMDGDistributedNames;
 import ru.spcex.clearing.platform.messaging.domain.cud.common.CommonDeleteRequest;
-import ru.spcex.clearing.platform.messaging.domain.cud.company.CompanyInfoUpdateRequest;
+import ru.spcex.clearing.platform.messaging.domain.cud.company.CompanySymbolNewRequest;
-import ru.spcex.clearing.platform.messaging.domain.cud.company.CompanyNewRequest;
 import ru.spcex.clearing.platform.messaging.domain.cud.company.CompanySymbolUpdateRequest;
 import ru.spcex.clearing.validation.common.rules.DictionaryPresentRule;
-import ru.spcex.clearing.validation.common.rules.EnumPresentRule;
 import ru.spcex.clearing.validation.common.rules.FieldRequiredRule;
 import ru.spcex.clearing.validation.common.rules.IdPresentRule;
 import ru.spcex.platform.classes.base.SpcexObjectBase;
-import ru.spcex.platform.enumeration.CompanySymbol;
-import ru.spcex.platform.enumeration.WorkflowStatus;
 import ru.spcex.platform.imdg.api.Imdg;
 import ru.spcex.platform.imdg.validation.ImdgValidationContext;
 import ru.spcex.platform.utils.validation.IValidator;
@@ -33,16 +28,16 @@ import java.util.function.Function;
 public class CompanySymbolValidationConfig {
 
     @Bean("companySymbolNewRequestValidator")
-    public Function<CompanySymbolUpdateRequest, IValidator> companySymbolNewRequestValidator(Map<String, Imdg<? extends SpcexObjectBase>> imdgForValidation) {
+    public Function<CompanySymbolNewRequest, IValidator> companySymbolNewRequestValidator(Map<String, Imdg<? extends SpcexObjectBase>> imdgForValidation) {
-        return companySymbolUpdateRequest -> {
+        return companySymbolNewRequest -> {
-            ImdgValidationContext<CompanySymbolUpdateRequest> context = new ImdgValidationContext<>();
+            ImdgValidationContext<CompanySymbolNewRequest> context = new ImdgValidationContext<>();
-            context.setValidatedObject(companySymbolUpdateRequest);
+            context.setValidatedObject(companySymbolNewRequest);
             Consumer<String> addImdg = (s) -> context.addImdg(s, imdgForValidation.get(s));
             addImdg.accept(IMDGDistributedNames.Map_CompanySymbols);
             addImdg.accept(IMDGDistributedNames.Map_CompanySymbolDictionary);
             addImdg.accept(IMDGDistributedNames.Map_Company);
             return new ValidatorImpl<>(context,
-                    FieldRequiredRule.instance("companyId", CompanySymbolUpdateRequest::getCompanyId, CompanyErrors.RequiredFieldEmpty),
+                    FieldRequiredRule.instance("companyId", CompanySymbolNewRequest::getCompanyId, CompanyErrors.RequiredFieldEmpty),
                     IdPresentRule.instance("companyId",
                             CompanySymbolUpdateRequest::getCompanyId,
                             IMDGDistributedNames.Map_Company,
@@ -52,7 +47,7 @@ public class CompanySymbolValidationConfig {
 //                    FieldRequiredRule.instance("companySymbol", CompanySymbolUpdateRequest::getCompanySymbol, CompanyErrors.RequiredFieldEmpty),
 //                    FieldRequiredRule.instance("companySymbolValue", CompanySymbolUpdateRequest::getCompanySymbolValue, CompanyErrors.RequiredFieldEmpty),
                     DictionaryPresentRule.instance("companySymbol",
-                            CompanySymbolUpdateRequest::getCompanySymbol,
+                            CompanySymbolNewRequest::getCompanySymbol,
                             IMDGDistributedNames.Map_CompanySymbolDictionary,
                             CompanySymbolDictionary.class,
                             CompanyErrors.RequiredFieldEmpty,
@@ -104,4 +99,35 @@ public class CompanySymbolValidationConfig {
             );
         };
     }
+
+
+    @Bean("companySymbolDeleteRequestValidator")
+    public Function<CommonDeleteRequest, IValidator> companySymbolDeleteRequestValidator(
+            Map<String, Imdg<? extends SpcexObjectBase>> imdgForValidation
+    ) {
+        return companySymbolDeleteRequest -> {
+            ImdgValidationContext<CommonDeleteRequest> context = new ImdgValidationContext<>();
+            context.setValidatedObject(companySymbolDeleteRequest);
+            Consumer<String> addImdg = (s) -> context.addImdg(s, imdgForValidation.get(s));
+            addImdg.accept(IMDGDistributedNames.Map_Company);
+            addImdg.accept(IMDGDistributedNames.Map_DocumentTypeDictionary);
+            addImdg.accept(IMDGDistributedNames.Map_CompanySymbols);
+            return new ValidatorImpl<>(context,
+                    IdPresentRule.instance("id",
+                            CommonDeleteRequest::getId,
+                            IMDGDistributedNames.Map_CompanySymbols,
+                            CompanySymbols.class,
+                            CompanyErrors.RequiredFieldEmpty,
+                            CompanyErrors.RecordNotFound,
+                            companySymbol -> {
+                                Imdg<Company> companyImdg = context.obtainMap(IMDGDistributedNames.Map_Company, Company.class);
+                                Company company = companyImdg.getSingleObjectByID(companySymbol.getCompanyId());
+                                if (company == null) {
+                                    return CompanyErrors.CompanyNotFound;
+                                }
+                                return null;
+                            })
+            );
+        };
+    }
 }

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

@@ -11,7 +11,6 @@ import org.springframework.stereotype.Service;
 import ru.clearing.classes.statics.data.company.Company;
 import ru.clearing.classes.statics.data.company.CompanySymbols;
 import ru.spcex.clearing.company.error.CompanyErrors;
-import ru.spcex.clearing.util.services.RequestHelper;
 import ru.spcex.clearing.imdg.IMDGDistributedNames;
 import ru.spcex.clearing.platform.messaging.domain.BaseRequest;
 import ru.spcex.clearing.platform.messaging.domain.Consts;
@@ -20,6 +19,7 @@ import ru.spcex.clearing.platform.messaging.domain.cud.company.CompanyNewRequest
 import ru.spcex.clearing.platform.messaging.service.QueueConsumer;
 import ru.spcex.clearing.platform.messaging.service.RequestInfoUpdate;
 import ru.spcex.clearing.util.security.UserRoleVerification;
+import ru.spcex.clearing.util.services.RequestHelper;
 import ru.spcex.clearing.validation.common.ValidationHelper;
 import ru.spcex.platform.enumeration.CompanySymbol;
 import ru.spcex.platform.enumeration.UserRole;
@@ -46,15 +46,13 @@ public class CompanyService extends QueueConsumer implements InitializingBean {
     private final ImdgId idSequence;
     private final Imdg<Company> companyIMap;
     protected UserRoleVerification userRoleVerification;
-
-    private ValidationHelper validationHelper;
-    private Function<CompanyNewRequest, IValidator> companyNewRequestValidator;
-    private Function<CompanyNewRequest, IValidator> companyUpdateRequestValidator;
-    private Function<CommonDeleteRequest, IValidator> companyDeleteRequestValidator;
-
     protected CompanySymbolService companySymbolService;
     protected AccountNotificationHelper accountNotification;
     protected RelationService relationService;
+    private final ValidationHelper validationHelper;
+    private final Function<CompanyNewRequest, IValidator> companyNewRequestValidator;
+    private final Function<CompanyNewRequest, IValidator> companyUpdateRequestValidator;
+    private final Function<CommonDeleteRequest, IValidator> companyDeleteRequestValidator;
 
     @Autowired
     public CompanyService(Consumer<String, Object> kafkaQueue, Producer<String, Object> kafkaProducer,
@@ -134,7 +132,7 @@ public class CompanyService extends QueueConsumer implements InitializingBean {
         try {
             if (req.getCompanySymbol() != null) {
                 CompanySymbols newSymbol = companySymbolService.createCompanySymbol(transaction, company.getId(), req.getCompanySymbol(), req.getCompanySymbolValue());
-                updateCompanyBySymbol(company, newSymbol);
+                updateCompanyBySymbol(company, newSymbol, false);
             }
 
             company.setWorkflowStatus(req.getWorkflowStatus());
@@ -215,20 +213,26 @@ public class CompanyService extends QueueConsumer implements InitializingBean {
         return null;
     }
 
-    protected void updateCompanyBySymbol(Company company, CompanySymbols companySymbol) {
+    protected void updateCompanyBySymbol(Company company, CompanySymbols companySymbol, boolean shouldBeDeleted) {
         assert company.getId().equals(companySymbol.getCompanyId());
+        String companySymbolValue = companySymbol.getCompanySymbolValue();
+        String setUpValue = shouldBeDeletedOrSet(companySymbolValue, shouldBeDeleted);
         if (CompanySymbol.TRDC.equalsByKey(companySymbol.getCompanySymbol())) {
-            company.setTradingCode(companySymbol.getCompanySymbolValue());
+            company.setTradingCode(setUpValue);
         }
         if (CompanySymbol.CLRC.equalsByKey(companySymbol.getCompanySymbol())) {
-            company.setClearingCode(companySymbol.getCompanySymbolValue());
+            company.setClearingCode(setUpValue);
         }
         if (CompanySymbol.RGRC.equalsByKey(companySymbol.getCompanySymbol())) {
-            company.setRegistrationCode(companySymbol.getCompanySymbolValue());
+            company.setRegistrationCode(setUpValue);
         }
     }
 
-    public synchronized void updateCompanyBySymbol(ImdgTransaction transaction, CompanySymbols companySymbol) throws ClearingBaseException {
+    private String shouldBeDeletedOrSet(String companySymbol, boolean shouldBeDeleted) {
+        return shouldBeDeleted ? "" : companySymbol;
+    }
+
+    public synchronized void updateCompanyBySymbol(ImdgTransaction transaction, CompanySymbols companySymbol, boolean shouldBeDeleted) throws ClearingBaseException {
         if (companySymbol.getCompanyId() == null) {
             throw new IllegalArgumentException("Required companySymbol.companyId");
         }
@@ -241,7 +245,7 @@ public class CompanyService extends QueueConsumer implements InitializingBean {
             if (company == null) {
                 throw new ClearingBaseException(new EnumMessage(CompanyErrors.CompanyNotFound, companySymbol.getCompanyId()));
             }
-            updateCompanyBySymbol(company, companySymbol);
+            updateCompanyBySymbol(company, companySymbol, shouldBeDeleted);
             company.setUpdated(Instant.now());
             companyMap.update(company);
             log.debug("Company {} updated by change CompanySymbols {} ({})",

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

@@ -10,20 +10,24 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.stereotype.Service;
 import ru.clearing.classes.statics.data.company.CompanySymbols;
-import ru.spcex.clearing.util.services.RequestHelper;
+import ru.spcex.clearing.company.error.CompanyErrors;
 import ru.spcex.clearing.imdg.IMDGDistributedNames;
 import ru.spcex.clearing.platform.messaging.domain.BaseRequest;
 import ru.spcex.clearing.platform.messaging.domain.Consts;
+import ru.spcex.clearing.platform.messaging.domain.cud.common.CommonDeleteRequest;
+import ru.spcex.clearing.platform.messaging.domain.cud.company.CompanySymbolNewRequest;
 import ru.spcex.clearing.platform.messaging.domain.cud.company.CompanySymbolUpdateRequest;
 import ru.spcex.clearing.platform.messaging.service.QueueConsumer;
 import ru.spcex.clearing.platform.messaging.service.RequestInfoUpdate;
 import ru.spcex.clearing.util.security.UserRoleVerification;
+import ru.spcex.clearing.util.services.RequestHelper;
 import ru.spcex.clearing.validation.common.ValidationHelper;
 import ru.spcex.platform.enumeration.UserRole;
 import ru.spcex.platform.imdg.api.Imdg;
 import ru.spcex.platform.imdg.api.ImdgId;
 import ru.spcex.platform.imdg.api.ImdgProvider;
 import ru.spcex.platform.imdg.api.ImdgTransaction;
+import ru.spcex.platform.utils.enumeration.EnumMessage;
 import ru.spcex.platform.utils.error.ClearingBaseException;
 import ru.spcex.platform.utils.validation.IValidator;
 
@@ -35,13 +39,13 @@ public class CompanySymbolService extends QueueConsumer implements InitializingB
     private final Logger log = LoggerFactory.getLogger(getClass());
     private final ImdgProvider imdgProvider;
     private final ImdgId idSequence;
-    protected CompanyService companyService;
-
     private final RequestHelper requestHelper;
+    protected CompanyService companyService;
     protected ValidationHelper validationHelper;
     protected UserRoleVerification userRoleVerification;
-    protected Function<CompanySymbolUpdateRequest, IValidator> companySymbolNewRequestValidator;
+    protected Function<CompanySymbolNewRequest, IValidator> companySymbolNewRequestValidator;
     protected Function<CompanySymbolUpdateRequest, IValidator> companySymbolUpdateRequestValidator;
+    protected Function<CommonDeleteRequest, IValidator> companySymbolDeleteRequestValidator;
 
     @Autowired
     public CompanySymbolService(Consumer<String, Object> kafkaQueue, Producer<String, Object> kafkaProducer,
@@ -50,7 +54,9 @@ public class CompanySymbolService extends QueueConsumer implements InitializingB
                                 ValidationHelper validationHelper,
                                 UserRoleVerification userRoleVerification,
                                 @Qualifier("companySymbolNewRequestValidator")
-                                        Function<CompanySymbolUpdateRequest, IValidator> companySymbolNewRequestValidator,
+                                        Function<CompanySymbolNewRequest, IValidator> companySymbolNewRequestValidator,
+                                @Qualifier("companySymbolDeleteRequestValidator")
+                                        Function<CommonDeleteRequest, IValidator> companySymbolDeleteRequestValidator,
                                 @Qualifier("companySymbolUpdateRequestValidator")
                                         Function<CompanySymbolUpdateRequest, IValidator> companySymbolUpdateRequestValidator
     ) {
@@ -64,16 +70,20 @@ public class CompanySymbolService extends QueueConsumer implements InitializingB
         userRoleVerification.setRoleForVerification(UserRole.Admin);
         this.companySymbolNewRequestValidator = companySymbolNewRequestValidator;
         this.companySymbolUpdateRequestValidator = companySymbolUpdateRequestValidator;
+        this.companySymbolDeleteRequestValidator = companySymbolDeleteRequestValidator;
     }
 
     @Override
     public void afterPropertiesSet() {
-        callback(CompanySymbolUpdateRequest.class)
+        callback(CompanySymbolNewRequest.class)
                 .setFunction(this::companySymbolNew)
                 .forDestination(Consts.DESTINATION_COMPANY_SYMBOL_NEW, callbacks::put);
         callback(CompanySymbolUpdateRequest.class)
                 .setFunction(this::companySymbolUpdate)
                 .forDestination(Consts.DESTINATION_COMPANY_SYMBOL_UPDATE, callbacks::put);
+        callback(CommonDeleteRequest.class)
+                .setFunction(this::companySymbolDelete)
+                .forDestination(Consts.DESTINATION_COMPANY_SYMBOL_DELETE, callbacks::put);
         init();
     }
 
@@ -82,8 +92,8 @@ public class CompanySymbolService extends QueueConsumer implements InitializingB
     }
 
 
-    public RequestInfoUpdate companySymbolNew(BaseRequest<CompanySymbolUpdateRequest> symbolRequest) {
+    public RequestInfoUpdate companySymbolNew(BaseRequest<CompanySymbolNewRequest> symbolRequest) {
-        CompanySymbolUpdateRequest req = symbolRequest.getRequestPayload();
+        CompanySymbolNewRequest req = symbolRequest.getRequestPayload();
         log.debug("CompanySymbolNewRequest received, id={}", symbolRequest.getId());
         { // validate
             RequestInfoUpdate requestInfoUpdate = userRoleVerification.validateRoleAndGetResult(symbolRequest);
@@ -107,7 +117,7 @@ public class CompanySymbolService extends QueueConsumer implements InitializingB
             Imdg<CompanySymbols> companySymbolsTMap = transaction.getImdg(IMDGDistributedNames.Map_CompanySymbols, CompanySymbols.class);
             companySymbolsTMap.update(companySymbols);
             try {
-                companyService.updateCompanyBySymbol(transaction, companySymbols);
+                companyService.updateCompanyBySymbol(transaction, companySymbols, false);
             } catch (ClearingBaseException e) {
                 return requestHelper.makeErrorResponse(symbolRequest, e.getEnumMsg());
             }
@@ -141,15 +151,18 @@ public class CompanySymbolService extends QueueConsumer implements InitializingB
         try {
             Imdg<CompanySymbols> companySymbolsTMap = transaction.getImdg(IMDGDistributedNames.Map_CompanySymbols, CompanySymbols.class);
             companySymbols = companySymbolsTMap.getSingleObjectByID(req.getId());
-//        companySymbols.setCompanySymbol(req.getCompanySymbol()); по ТЗ не должен менятся при обновлении
+            if (companySymbols == null) {
+                throw new ClearingBaseException(new EnumMessage(CompanyErrors.CompanyInfoNotFound, req.getId()));
+            }
+            if (!companySymbols.getCompanySymbol().equalsIgnoreCase(req.getCompanySymbolValue())) {
+                throw new ClearingBaseException(new EnumMessage(CompanyErrors.EditCompanySymbols, req.getId()));
+            }
             companySymbols.setCompanySymbolValue(req.getCompanySymbolValue());
             companySymbolsTMap.update(companySymbols);
-            try {
+            companyService.updateCompanyBySymbol(transaction, companySymbols, false);
-                companyService.updateCompanyBySymbol(transaction, companySymbols);
-            } catch (ClearingBaseException e) {
-                return requestHelper.makeErrorResponse(symbolRequest, e.getEnumMsg());
-            }
             txOk = true;
+        } catch (ClearingBaseException e) {
+            return requestHelper.makeErrorResponse(symbolRequest, e.getEnumMsg());
         } finally {
             if (txOk)
                 transaction.commitTransaction();
@@ -161,6 +174,42 @@ public class CompanySymbolService extends QueueConsumer implements InitializingB
         return null;
     }
 
+    public RequestInfoUpdate companySymbolDelete(BaseRequest<CommonDeleteRequest> symbolRequest) {
+        CommonDeleteRequest req = symbolRequest.getRequestPayload();
+        log.debug("CommonDeleteRequest for CompanySymbol received, id={}", symbolRequest.getId());
+
+        { // validate
+            RequestInfoUpdate requestInfoUpdate = userRoleVerification.validateRoleAndGetResult(symbolRequest);
+            if (requestInfoUpdate != null) return requestInfoUpdate;
+
+            requestInfoUpdate = validationHelper.validateTillFirstError(symbolRequest, companySymbolDeleteRequestValidator);
+            if (requestInfoUpdate != null) return requestInfoUpdate;
+        }
+        CompanySymbols companySymbols;
+        ImdgTransaction transaction = imdgProvider.newTransaction();
+        transaction.beginTransaction();
+        boolean txOk = false;
+        try {
+            Imdg<CompanySymbols> companySymbolsTMap = transaction.getImdg(IMDGDistributedNames.Map_CompanySymbols, CompanySymbols.class);
+            companySymbols = companySymbolsTMap.getSingleObjectByID(req.getId());
+            if (companySymbols == null) {
+                throw new ClearingBaseException(new EnumMessage(CompanyErrors.CompanyInfoNotFound, req.getId()));
+            }
+            companySymbolsTMap.delete(companySymbols);
+            companyService.updateCompanyBySymbol(transaction, companySymbols, true);
+            txOk = true;
+        } catch (ClearingBaseException e) {
+            return requestHelper.makeErrorResponse(symbolRequest, e.getEnumMsg());
+        } finally {
+            if (txOk)
+                transaction.commitTransaction();
+            else
+                transaction.rollbackTransaction();
+        }
+
+        log.debug("successfully processed, id {}", companySymbols.getId());
+        return null;
+    }
 
     public CompanySymbols createCompanySymbol(ImdgTransaction transaction, Long companyId, String companySymbol, String companySymbolValue) {
         Objects.requireNonNull(companyId);

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

@@ -3,17 +3,12 @@ package ru.spcex.clearing.company.validation;
 import ru.clearing.classes.statics.data.company.CompanySymbols;
 import ru.spcex.clearing.company.error.CompanyErrors;
 import ru.spcex.clearing.imdg.IMDGDistributedNames;
-import ru.spcex.clearing.platform.messaging.domain.cud.company.CompanyNewRequest;
+import ru.spcex.clearing.platform.messaging.domain.cud.company.CompanySymbolNewRequest;
-import ru.spcex.clearing.platform.messaging.domain.cud.company.CompanySymbolUpdateRequest;
-import ru.spcex.platform.enumeration.CompanySymbol;
 import ru.spcex.platform.imdg.api.Imdg;
-import ru.spcex.platform.imdg.api.predicate.ImdgPredicate;
-import ru.spcex.platform.imdg.api.predicate.ImdgPredicateBuilder;
 import ru.spcex.platform.imdg.validation.ImdgValidationContext;
 import ru.spcex.platform.utils.enumeration.EnumMessage;
 import ru.spcex.platform.utils.validation.IValidationRule;
 
-import java.util.Arrays;
 import java.util.Collection;
 import java.util.Map;
 import java.util.Optional;
@@ -21,10 +16,10 @@ import java.util.Optional;
 /**
  * Проверка наличия CompanySymbols с переданными в запросе companySymbol и companyId
  */
-public class CompanySymbolOfSymbolNewRequestNotExistRule implements IValidationRule<ImdgValidationContext<CompanySymbolUpdateRequest>> {
+public class CompanySymbolOfSymbolNewRequestNotExistRule implements IValidationRule<ImdgValidationContext<CompanySymbolNewRequest>> {
     @Override
-    public Optional<EnumMessage> validate(ImdgValidationContext<CompanySymbolUpdateRequest> context) {
+    public Optional<EnumMessage> validate(ImdgValidationContext<CompanySymbolNewRequest> context) {
-        CompanySymbolUpdateRequest request = context.getValidatedObject();
+        CompanySymbolNewRequest request = context.getValidatedObject();
 
         Imdg<CompanySymbols> companySymbolsImdg = context.obtainMap(IMDGDistributedNames.Map_CompanySymbols, CompanySymbols.class);
 

platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/company/CompanySymbolNewRequest.java

@@ -0,0 +1,37 @@
+package ru.spcex.clearing.platform.messaging.domain.cud.company;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+public class CompanySymbolNewRequest {
+    @JsonProperty
+    public Long companyId;
+
+    @JsonProperty
+    private String companySymbol;
+
+    @JsonProperty
+    private String companySymbolValue;
+
+    public Long getCompanyId() {
+        return companyId;
+    }
+
+    public void setCompanyId(Long companyId) {
+        this.companyId = companyId;
+    }
+
+    public String getCompanySymbol() {
+        return companySymbol;
+    }
+
+    public void setCompanySymbol(String companySymbol) {
+        this.companySymbol = companySymbol;
+    }
+
+    public String getCompanySymbolValue() {
+        return companySymbolValue;
+    }
+    public void setCompanySymbolValue(String companySymbolValue) {
+        this.companySymbolValue = companySymbolValue;
+    }
+}