Merge remote-tracking branch 'origin/dev' into dev

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

@@ -6,7 +6,6 @@ import io.swagger.annotations.ApiModelProperty;
 import ru.spcex.clearing.backendapi.domain.actions.IAction;
 import ru.spcex.clearing.backendapi.errors.BackEndError;
 import ru.spcex.clearing.platform.messaging.domain.ActionType;
-import ru.spcex.clearing.platform.messaging.domain.cud.reports.ReportWithPeriodRequest;
 import ru.spcex.clearing.platform.messaging.domain.cud.schedule.LauncherCommandRequest;
 import ru.spcex.platform.enumeration.Task;
 import ru.spcex.platform.utils.enumeration.EnumMessage;
@@ -31,18 +30,12 @@ public class LauncherNew implements IAction<Object> {
 
     @Override
     public Object toRequest() {
-        if (Task.createReport_GREP.equalsByKey(task)) {
+        LauncherCommandRequest taskRunnerCommandRequest = new LauncherCommandRequest();
-            ReportWithPeriodRequest reportCommand = new ReportWithPeriodRequest();
+        taskRunnerCommandRequest.setTaskName(task);
-            reportCommand.setReportId(task);
+        taskRunnerCommandRequest.setCompanyId(companyId);
-            return reportCommand;
+        taskRunnerCommandRequest.setSecurityId(securityId);
-        } else {
+        taskRunnerCommandRequest.setUserId(userId);
-            LauncherCommandRequest taskRunnerCommandRequest = new LauncherCommandRequest();
+        return taskRunnerCommandRequest;
-            taskRunnerCommandRequest.setTaskName(task);
-            taskRunnerCommandRequest.setCompanyId(companyId);
-            taskRunnerCommandRequest.setSecurityId(securityId);
-            taskRunnerCommandRequest.setUserId(userId);
-            return taskRunnerCommandRequest;
-        }
     }
 
     @Override

clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/ExecutionDepositComponent.java

@@ -21,7 +21,7 @@ import ru.spcex.clearing.imdg.IMDGDistributedNames;
 import ru.spcex.clearing.platform.messaging.domain.ActionType;
 import ru.spcex.clearing.platform.messaging.domain.BaseRequest;
 import ru.spcex.clearing.platform.messaging.domain.Consts;
-import ru.spcex.clearing.platform.messaging.domain.cud.registry.CoveredDealRegisterNewRequest;
+import ru.spcex.clearing.platform.messaging.domain.cud.registry.DealRegisterNewRequest;
 import ru.spcex.clearing.platform.messaging.domain.cud.securitites.MoneyMarketSecurityNewRequest;
 import ru.spcex.platform.enumeration.Allowed;
 import ru.spcex.platform.enumeration.Market;
@@ -85,8 +85,9 @@ public class ExecutionDepositComponent {
     /**
      * Сбрасывать каждый день в 01:00:01 "0 1 0 1 * ?"
      */
-    @Scheduled(cron = "${clearing-service.scheduler.check-s-trade}")
+    @Scheduled(cron = "0 1 0 1 * ?")
     public void resetTradingDay() {
+        log.trace("Recheck today trading day for search STrade. Current state: tradeNum={}, tradeDat={}", tradeNum, tradingDay);
         Instant today = TimeUtil.localDateToInstant(LocalDate.now());
         if (tradingDay == null || !tradingDay.equals(today)) {
             tradeNum = -1L;
@@ -95,8 +96,9 @@ public class ExecutionDepositComponent {
         log.info("Reset trading day for search STrade: tradeNum={}, tradeDat={}", tradeNum, tradingDay);
     }
 
+    @Scheduled(cron = "${clearing-service.scheduler.check-s-trade}")
     public void processNewTS() {
-        Long tradeNum = -1L; // todo уточнить как он обновляется
+        log.debug("Start check new S_TRADE. Start tradeNum={}", tradeNum);
         ImdgPredicateBuilder pb = sTradeImdg.predicateBuilder();
         ImdgPredicate sql = pb.and(pb.greater("tradeNum", tradeNum), pb.greatEqual("tradeDateTime", tradingDay));
         Collection<STrade> sTrades = sTradeImdg.getCollectionObjectsByPredicate(sql);
@@ -166,7 +168,7 @@ public class ExecutionDepositComponent {
 
 
         Long newMaxTradeNum = sTrades.stream().mapToLong(STrade::getTradeNum).max().orElseGet(() -> tradeNum);
-        log.debug("Next tradeNum is {}", newMaxTradeNum);
+        log.info("Process completed. Next tradeNum is {}", newMaxTradeNum);
     }
 
     protected void verification(ExecutionDeposit forED) throws ClearingException {
@@ -236,26 +238,13 @@ public class ExecutionDepositComponent {
     }
 
     protected void sendNotification(ExecutionDeposit forED) {
-        final String destination = Consts.REGISTRY_COVERED_DEAL_REGISTER_NEW;
+        final String destination = Consts.REGISTRY_DEAL_REGISTER_NEW;
-        CoveredDealRegisterNewRequest requestPayload = new CoveredDealRegisterNewRequest();
+        DealRegisterNewRequest requestPayload = new DealRegisterNewRequest();
         requestPayload.setExecutionId(forED.getId());
-// requestPayload.setCompanyFullName(forED.getCompanyFullName());
+        requestPayload.setClearingDate(forED.getClearingDate());
-        requestPayload.setTradingDate(forED.getTradingDate());
         requestPayload.setExchangeExecutionId(forED.getExchangeExecutionId());
         requestPayload.setExchangeExecutionTime(forED.getExchangeExecutionTime());
-        requestPayload.setSecuritySymbol(forED.getSecuritySymbol());
+//        requestPayload.setId(idGenerator.nextId());
-        requestPayload.setSecurityFullName(forED.getSecurityFullName());
-// requestPayload.setSellerFullName(forED.getSellerFullName());
-// requestPayload.setSellerClearingCode(forED.getSellerClearingCode());
-// String requestPayload.setSellerAccount(forED.getAccountId());
-// String requestPayload.setBuyerFullName(forED.getBuyerFullName());
-//  requestPayload.setBuyerClearingCode(forED.getBuyerClearingCode());
-// String requestPayload.setBuyerAccount(forED.getBuyerAccount());
-// BigDecimal requestPayload.setAmount(forED.getAmount());
-        requestPayload.setId(idGenerator.nextId());
-        requestPayload.setCreatedAt(forED.getCreated());
-        requestPayload.setUpdatedAt(forED.getUpdated());
-        requestPayload.setClearingDate(forED.getClearingDate());
 
         BaseRequest<Object> request = new BaseRequest<>();
         request.setId(idGenerator.nextId());

clearing-parent/clearing-service/src/main/resources/application.properties

@@ -20,4 +20,4 @@ clearing-service.kafka-producer.linger-ms=1
 clearing-service.kafka-producer.buffer-memory=33554432
 
 clearing-service.scheduler.check-payment-instruction=*/5 * * * * *
-clearing-service.scheduler.check-s-trade=0 1 0 1 * ?
+clearing-service.scheduler.check-s-trade=0 * 0 1 * ?

clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/QCommandExecutor.java

@@ -8,7 +8,7 @@ import org.springframework.beans.factory.InitializingBean;
 import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
 import ru.spcex.clearing.platform.messaging.domain.BaseRequest;
-import ru.spcex.clearing.platform.messaging.domain.cud.reports.ReportWithPeriodRequest;
+import ru.spcex.clearing.platform.messaging.domain.cud.schedule.LauncherCommandRequest;
 import ru.spcex.clearing.platform.messaging.service.QueueConsumer;
 import ru.spcex.clearing.reports.config.element.ReportsServiceSettings;
 import ru.spcex.platform.enumeration.Task;
@@ -40,20 +40,23 @@ public class QCommandExecutor extends QueueConsumer implements InitializingBean
     @Override
     public void afterPropertiesSet() {
         log.info("Init queue listener {}", getClass().getSimpleName());
-        callback(ReportWithPeriodRequest.class)
+        callback(LauncherCommandRequest.class)
                 .setConsumer(this::newReportWithPeriod)
                 .forDestination(Task.createReport_GREP.topic(), callbacks::put);
         init();
     }
 
-    private void newReportWithPeriod(BaseRequest<ReportWithPeriodRequest> reportRequest) {
+    private void newReportWithPeriod(BaseRequest<LauncherCommandRequest> reportRequest) {
-        ReportWithPeriodRequest request = reportRequest.getRequestPayload();
+        LauncherCommandRequest request = reportRequest.getRequestPayload();
         log.info("newReportWithPeriod request received: {}", request);
+        final String taskName = QUEUE_RUN_REPORT_COMMAND; //request.getTaskName();
 
-        if (StringUtils.isBlank(request.getReportId()))
+//        if (StringUtils.isBlank(request.getReportId()))
-            throw new IllegalStateException("ReportID is empty");
+//            throw new IllegalStateException("ReportID is empty");
-        LocalDate startDate = request.getStartDate();
+//        LocalDate startDate = request.getStartDate();
-        LocalDate endDate = request.getEndDate();
+//        LocalDate endDate = request.getEndDate();
+        LocalDate startDate = null;
+        LocalDate endDate = null;
         if (startDate == null && endDate == null) {
             endDate = LocalDate.now();
             startDate = LocalDate.of(endDate.getYear(), endDate.getMonth(), 1);
@@ -65,18 +68,18 @@ public class QCommandExecutor extends QueueConsumer implements InitializingBean
             throw new IllegalStateException("StartDate > EndDate");
 
         try {
-            if (QUEUE_RUN_REPORT_COMMAND.equals(request.getReportId())
+            if (QUEUE_RUN_REPORT_COMMAND.equals(taskName)
-            || QUEUE_RUN_DAILY_REPORT_COMMAND.equals(request.getReportId())) {
+            || QUEUE_RUN_DAILY_REPORT_COMMAND.equals(taskName)) {
-                log.info("Generate all report by command {}", request.getReportId());
+                log.info("Generate all report by command {}", taskName);
-                reportsServiceCommand.generateReportAll(request.getReportId(), startDate, endDate);
+                reportsServiceCommand.generateReportAll(taskName, startDate, endDate);
             } else {
-                log.info("Generate single report by command {}", request.getReportId());
+                log.info("Generate single report by command {}", taskName);
-                reportsServiceCommand.generateReportById(request.getReportId(), startDate, endDate);
+                reportsServiceCommand.generateReportById(taskName, startDate, endDate);
             }
 
             log.debug("successfully processed");
         } catch (IOException e) {
-            log.error("Error create report {}: {}", request.getReportId(), ExceptionUtils.getStackTrace(e));
+            log.error("Error create report {}: {}", taskName, ExceptionUtils.getStackTrace(e));
         }
     }
 

clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/ReportWithPeriodCollector.java

@@ -20,9 +20,9 @@ public abstract class ReportWithPeriodCollector<T extends AbstractReport> extend
                                                                                 LocalDate startDate,
                                                                                 LocalDate endDate) {
         ImdgPredicateBuilder pb = liabilitiesClaimsAssetsImdg.predicateBuilder();
-        Instant dateTimeLo = toInstantStartDay(startDate);
+//        Instant dateTimeLo = toInstantStartDay(startDate);
-        Instant dateTimeHi = toInstantStartDay(endDate);
+//        Instant dateTimeHi = toInstantEndDay(endDate);
-        ImdgPredicate p = pb.and(pb.greatEqual("refundDate", dateTimeLo), pb.lessEqual("refundDate", dateTimeHi));
+        ImdgPredicate p = pb.and(pb.greatEqual("refundDate", startDate), pb.lessEqual("refundDate", endDate));
         Collection<LiabilitiesClaimsAssets> liabilities = liabilitiesClaimsAssetsImdg.getCollectionObjectsByPredicate(p);
         return liabilities;
     }
@@ -31,9 +31,9 @@ public abstract class ReportWithPeriodCollector<T extends AbstractReport> extend
                                                                       LocalDate startDate, LocalDate endDate,
                                                                       Long allowClearingStatusId) {
         ImdgPredicateBuilder pb = liabilitiesClaimsAssetsImdg.predicateBuilder();
-        Instant dateTimeLo = toInstantStartDay(startDate);
+//        Instant dateTimeLo = toInstantStartDay(startDate);
-        Instant dateTimeHi = toInstantStartDay(endDate);
+//        Instant dateTimeHi = toInstantEndDay(endDate);
-        ImdgPredicate p = pb.and(pb.greatEqual("refundDate", dateTimeLo), pb.lessEqual("refundDate", dateTimeHi),
+        ImdgPredicate p = pb.and(pb.greatEqual("refundDate", startDate), pb.lessEqual("refundDate", endDate),
                 pb.equals("clearingStatus", allowClearingStatusId));
         Collection<LiabilitiesClaimsAssets> liabilities = liabilitiesClaimsAssetsImdg.getCollectionObjectsByPredicate(p);
         return liabilities;

clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/ReportBR_0420314_P2_Collector.java

@@ -45,7 +45,7 @@ public class ReportBR_0420314_P2_Collector extends ReportWithPeriodCollector<Rep
     Collection<PaymentInstruction> searchPaymentInstruction(LocalDate startDate, LocalDate endDate) {
         ImdgPredicateBuilder pb = paymentInstructionImdg.predicateBuilder();
         Instant dateTimeLo = toInstantStartDay(startDate);
-        Instant dateTimeHi = toInstantStartDay(endDate);
+        Instant dateTimeHi = toInstantEndDay(endDate);
         ImdgPredicate p = pb.and(pb.greatEqual("created", dateTimeLo), pb.lessEqual("created", dateTimeHi));
         Collection<PaymentInstruction> paymentInstructionsAll = paymentInstructionImdg.getCollectionObjectsByPredicate(p);
         return paymentInstructionsAll;

clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/ReportBR_0420317_Collector.java

@@ -35,7 +35,7 @@ public class ReportBR_0420317_Collector extends ReportWithPeriodCollector<Report
     Collection<Relation> searchRelation(LocalDate startDate, LocalDate endDate, String service) {
         ImdgPredicateBuilder pb = relationImdg.predicateBuilder();
         Instant dateTimeLo = toInstantStartDay(startDate);
-        Instant dateTimeHi = toInstantStartDay(endDate);
+        Instant dateTimeHi = toInstantEndDay(endDate);
         ImdgPredicate p = pb.and(pb.greatEqual("updated", dateTimeLo), pb.lessEqual("updated", dateTimeHi),
                 pb.equals("service", service));
         Collection<Relation> relations = relationImdg.getCollectionObjectsByPredicate(p);

clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/ReportPA_B_Collector.java

@@ -49,8 +49,8 @@ public class ReportPA_B_Collector extends ReportWithPeriodCollector<ReportPA_B>
 
         ImdgPredicateBuilder builder = liabilitiesClaimsAssetsImdg.predicateBuilder();
         ImdgPredicate refundDatePredicate = builder.and(
-                builder.greatEqual("refundDate", toInstantStartDay(startDate)),
+                builder.greatEqual("refundDate", (startDate)),
-                builder.lessEqual("refundDate", toInstantStartDay(endDate))
+                builder.lessEqual("refundDate", (endDate))
         );
         ImdgPredicate companyIdPredicates = builder.in("companyId", companyIds.toArray(new Comparable[0]));
         ImdgPredicate finalPredicate = builder.and(refundDatePredicate, companyIdPredicates);

clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/ReportPA_IV_Collector.java

@@ -55,8 +55,8 @@ public class ReportPA_IV_Collector extends ReportWithPeriodCollector<ReportPA_IV
 
         ImdgPredicateBuilder builder = liabilitiesClaimsAssetsImdg.predicateBuilder();
         ImdgPredicate refundDatePredicate = builder.and(
-                builder.greatEqual("refundDate", toInstantStartDay(startDate)),
+                builder.greatEqual("refundDate", (startDate)),
-                builder.lessEqual("refundDate", toInstantStartDay(endDate))
+                builder.lessEqual("refundDate", (endDate))
         );
         ImdgPredicate companyIdPredicates = builder.in("companyId", companyIds.toArray(new Comparable[0]));
         ImdgPredicate finalPredicate = builder.and(refundDatePredicate, companyIdPredicates);

clearing-parent/reports-service/src/test/java/ru/spcex/clearing/reports/services/AbstractReportCollectorTest.java

@@ -14,7 +14,7 @@ class AbstractReportCollectorTest extends AbstractReportCollector {
     @Test
     void testToString() {
         AbstractReportCollectorTest instance = new AbstractReportCollectorTest();
-        assertEquals(null, instance.toString((Long) null));
+        assertEquals("", instance.toString((Long) null));
         assertEquals("1", instance.toString((Long) 1L));
         assertEquals("1230", instance.toString((Long) 1230L));
 
@@ -23,7 +23,7 @@ class AbstractReportCollectorTest extends AbstractReportCollector {
     @Test
     void testToString1() {
         AbstractReportCollectorTest instance = new AbstractReportCollectorTest();
-        assertEquals(null, instance.toString((Instant) null));
+        assertEquals("", instance.toString((Instant) null));
         Instant val = Instant.ofEpochMilli(1672058774338L);
         assertEquals("26.12.2022T15:46:14", instance.toString(val)); // msk timezone
     }
@@ -38,7 +38,7 @@ class AbstractReportCollectorTest extends AbstractReportCollector {
     @Test
     void testToString3() {
         AbstractReportCollectorTest instance = new AbstractReportCollectorTest();
-        assertEquals(null, instance.toString((BigDecimal)null));
+        assertEquals("", instance.toString((BigDecimal)null));
         assertEquals("0.00", instance.toString(BigDecimal.ZERO));
         assertEquals("1.10", instance.toString(BigDecimal.valueOf(1.10)));
         assertEquals("100.12", instance.toString(BigDecimal.valueOf(100.12)));
@@ -49,7 +49,7 @@ class AbstractReportCollectorTest extends AbstractReportCollector {
     @Test
     void testToString4() {
         AbstractReportCollectorTest instance = new AbstractReportCollectorTest();
-        assertEquals(null, instance.toString((Double) null));
+        assertEquals("", instance.toString((Double) null));
         assertEquals("0.00", instance.toString(0.0));
         assertEquals("1.10", instance.toString(1.10));
         assertEquals("100.12", instance.toString(100.12));

clearing-parent/scheduler-service/src/main/java/ru/spcex/clearing/scheduler/service/LauncherSender.java

@@ -10,7 +10,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import ru.spcex.clearing.platform.messaging.domain.ActionType;
 import ru.spcex.clearing.platform.messaging.domain.BaseRequest;
-import ru.spcex.clearing.platform.messaging.domain.cud.reports.ReportWithPeriodRequest;
 import ru.spcex.clearing.platform.messaging.domain.cud.schedule.LauncherCommandRequest;
 import ru.spcex.platform.enumeration.Task;
 import ru.spcex.platform.imdg.api.ImdgId;
@@ -33,16 +32,10 @@ public class LauncherSender {
 
     protected BaseRequest<Object> makeCmdRequest(Task byTask, Long userId) {
         Object toRequest;
-        if (Task.createReport_GREP.equals(byTask)) { // см. ru.spcex.clearing.backendapi.controller.request.cud.schedule.LauncherNew#toRequest
+        LauncherCommandRequest taskRunnerCommandRequest = new LauncherCommandRequest();
-            ReportWithPeriodRequest reportCommand = new ReportWithPeriodRequest();
+        taskRunnerCommandRequest.setTaskName(byTask.getKey());
-            reportCommand.setReportId(byTask.getKey());
+        taskRunnerCommandRequest.setUserId(userId);
-            toRequest = reportCommand;
+        toRequest = taskRunnerCommandRequest;
-        } else {
-            LauncherCommandRequest taskRunnerCommandRequest = new LauncherCommandRequest();
-            taskRunnerCommandRequest.setTaskName(byTask.getKey());
-            taskRunnerCommandRequest.setUserId(userId);
-            toRequest = taskRunnerCommandRequest;
-        }
         BaseRequest<Object> request = new BaseRequest<>();
         request.setId(idGenerator.nextId());
         request.setActionType(ActionType.NEW);

clearing-parent/scheduler-service/src/main/java/ru/spcex/clearing/scheduler/service/LauncherService.java

@@ -58,7 +58,7 @@ public class LauncherService extends QueueConsumer implements InitializingBean {
         launcher.setUpdated(created);
         launcherMap.insert(launcher);
         log.debug("successfully processed, new id {}", launcher.getId());
-        kafkaProducer.send(new ProducerRecord<>("launcher-" + launcher.getTask(), req));
+        kafkaProducer.send(new ProducerRecord<>("launcher-" + launcher.getTask(), userRequest));
     }
 
 }

platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/Consts.java

@@ -57,6 +57,7 @@ public interface Consts {
 
     String REGISTRY_COVERED_DEAL_REGISTER_NEW = "registry-covered-deal-register-new";
     String REGISTRY_ADMITTED_DEAL_REGISTER_NEW = "registry-admitted-deal-register-new";
+    String REGISTRY_DEAL_REGISTER_NEW = "registry-deal-register-new";
 
     String REGISTRY_ORDER_REGISTER_NEW = "registry-order-register-new";
     String REGISTRY_CONTRACT_REGISTER_NEW = "registry-contract-register-new";

platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/registry/DealRegisterNewRequest.java

@@ -0,0 +1,67 @@
+package ru.spcex.clearing.platform.messaging.domain.cud.registry;
+
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+import java.math.BigDecimal;
+import java.time.Instant;
+import java.time.LocalDate;
+
+public class DealRegisterNewRequest {
+
+    @JsonProperty
+    public Long executionId;
+
+    @JsonProperty
+    public Long exchangeExecutionId;
+
+    @JsonProperty
+    public Instant exchangeExecutionTime;
+
+    @JsonProperty
+    public Long id;
+
+    @JsonProperty
+    public LocalDate clearingDate;
+
+
+    public Long getExecutionId() {
+        return executionId;
+    }
+
+    public void setExecutionId(Long executionId) {
+        this.executionId = executionId;
+    }
+
+    public Long getExchangeExecutionId() {
+        return exchangeExecutionId;
+    }
+
+    public void setExchangeExecutionId(Long exchangeExecutionId) {
+        this.exchangeExecutionId = exchangeExecutionId;
+    }
+
+    public Instant getExchangeExecutionTime() {
+        return exchangeExecutionTime;
+    }
+
+    public void setExchangeExecutionTime(Instant exchangeExecutionTime) {
+        this.exchangeExecutionTime = exchangeExecutionTime;
+    }
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public LocalDate getClearingDate() {
+        return clearingDate;
+    }
+
+    public void setClearingDate(LocalDate clearingDate) {
+        this.clearingDate = clearingDate;
+    }
+}