From d1378a4cf443b2c0435cff09e7f9e8fb4ebf88b9 Mon Sep 17 00:00:00 2001 From: etreschenkov Date: Fri, 7 Jul 2023 13:07:58 +0300 Subject: [PATCH] refactoring: enum name --- .../gatewayapi/service/GatewayService.java | 11 ++ .../reports/config/ReportBuildersConfig.java | 106 +++++++++--------- .../config/validation/ValidationConfig.java | 34 +++--- .../reports/reports/CSVReportBuilder.java | 6 +- .../reports/reports/CSVReportBuilder_.java | 6 +- .../bp/ExecutedDealReportBuilderCommon.java | 6 +- ...ationalLiabilitiesClaimsReportBuilder.java | 6 +- .../OperationalMoneyChangeReportBuilder.java | 6 +- .../PeriodLiabilitiesClaimsReportBuilder.java | 6 +- .../bp/PeriodMoneyChangeReportBuilder.java | 6 +- ...SummaryLiabilitiesClaimsReportBuilder.java | 6 +- .../bp/SummaryMoneyChangeReportBuilder.java | 6 +- .../bp/UnfulfilledDealReportBuilder.java | 6 +- .../bp/UnfulfilledDealReportBuilder_.java | 6 +- .../ks/KSRepCashNettoReportBuilder.java | 6 +- .../KSRepCashRegisterSumsReportBuilder.java | 6 +- .../ks/KSRepCashRegistersReportBuilder.java | 6 +- .../ks/KSRepDepoNettoReportBuilder.java | 6 +- ...epDepoRegisterQuantitiesReportBuilder.java | 6 +- .../ks/KSRepDepoRegistersReportBuilder.java | 6 +- .../ks/KSRepFirmDetailsReportBuilder.java | 6 +- .../reports/ks/KSRepTradesReportBuilder.java | 4 +- .../reports/services/ReportService.java | 52 ++++----- .../services/ReportServiceTest_BP.java | 22 ++-- .../services/ReportServiceTest_KS.java | 16 +-- ...ReportType.java => ReportBuilderType.java} | 4 +- .../domain/cud/gateway/SendReportRequest.java | 6 +- .../domain/cud/reports/ReportRequest.java | 4 +- 28 files changed, 189 insertions(+), 178 deletions(-) rename platform-parent/platform-enum/src/main/java/ru/spcex/platform/enumeration/{ReportType.java => ReportBuilderType.java} (93%) diff --git a/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/service/GatewayService.java b/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/service/GatewayService.java index 8507f874c..3b7404fd2 100644 --- a/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/service/GatewayService.java +++ b/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/service/GatewayService.java @@ -244,6 +244,17 @@ public class GatewayService extends QueueConsumer implements InitializingBean { String paramName = null; switch (reportKeys) { case KS_BR_PFX64_INFTYPE_1 -> paramName = "inftype_1"; + case KS_BR_PFX64_INFTYPE_2 -> paramName = "inftype_2"; + case KS_BR_PFX64_INFTYPE_3 -> paramName = "inftype_3"; + case KS_BR_PFX64_INFTYPE_4 -> paramName = "inftype_4"; + case KS_BR_PFX65_DEALS -> paramName = "file"; + case KS_REP_CASH_REGISTERS -> paramName = "ks_rep_cash_registers"; + case KS_REP_CASH_REGISTER_SUMS -> paramName = "ks_rep_cash_register_sums"; + case KS_REP_DEPO_REGISTERS -> paramName = "ks_rep_depo_registers"; + case KS_REP_DEPO_REGISTER_QUANTITIES -> paramName = "KS_REP_DEPO_REGISTER_QUANTITIES"; + case KS_REP_TRADES -> paramName = "ks_rep_trades"; + case KS_REP_CASH_NETTO -> paramName = "ks_rep_cash_netto"; + case KS_REP_DEPO_NETTO -> paramName = "ks_rep_depo_netto"; } if (paramName != null) { content.put(paramName, reportPart.getFileName()); diff --git a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/config/ReportBuildersConfig.java b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/config/ReportBuildersConfig.java index b6eb8dd60..aed401c44 100644 --- a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/config/ReportBuildersConfig.java +++ b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/config/ReportBuildersConfig.java @@ -6,7 +6,7 @@ import org.springframework.context.annotation.Configuration; import ru.spcex.clearing.reports.reports.*; import ru.spcex.clearing.reports.reports.bp.*; import ru.spcex.clearing.reports.reports.ks.*; -import ru.spcex.platform.enumeration.ReportType; +import ru.spcex.platform.enumeration.ReportBuilderType; import java.util.HashMap; import java.util.List; @@ -16,7 +16,7 @@ import java.util.Map; @ComponentScan(basePackages = "ru.spcex.clearing.reports.reports") public class ReportBuildersConfig { @Bean("reportBuildersWithoutParams") - public Map>> reportBuildersWithoutParams( + public Map>> reportBuildersWithoutParams( SummaryLiabilitiesClaimsReportBuilder summaryLiabilitiesClaimsReportBuilder, SummaryMoneyChangeReportBuilder summaryMoneyChangeReportBuilder, KSRepCashRegistersReportBuilder ksRepCashRegistersReportBuilder, @@ -26,20 +26,20 @@ public class ReportBuildersConfig { KSRepTradesReportBuilder ksRepTradesReportBuilder, KSRepFirmDetailsReportBuilder ksRepFirmDetailsReportBuilder ) { - Map>> resultMap = new HashMap<>(); - resultMap.put(ReportType.SUMMARY_LIABILITIES_CLAIMS, List.of(summaryLiabilitiesClaimsReportBuilder)); - resultMap.put(ReportType.SUMMARY_MONEY_CHANGE, List.of(summaryMoneyChangeReportBuilder)); - resultMap.put(ReportType.KS_REP_CASH_REGISTERS, List.of(ksRepCashRegistersReportBuilder)); - resultMap.put(ReportType.KS_REP_CASH_REGISTER_SUMS, List.of(ksRepCashRegisterSumsReportBuilder)); - resultMap.put(ReportType.KS_REP_DEPO_REGISTERS, List.of(ksRepDepoRegistersReportBuilder)); - resultMap.put(ReportType.KS_REP_DEPO_REGISTER_QUANTITIES, List.of(ksRepDepoRegisterQuantitiesReportBuilder)); - resultMap.put(ReportType.KS_REP_TRADES, List.of(ksRepTradesReportBuilder)); - resultMap.put(ReportType.KS_REP_FIRM_DETAILS, List.of(ksRepFirmDetailsReportBuilder)); + Map>> resultMap = new HashMap<>(); + resultMap.put(ReportBuilderType.SUMMARY_LIABILITIES_CLAIMS, List.of(summaryLiabilitiesClaimsReportBuilder)); + resultMap.put(ReportBuilderType.SUMMARY_MONEY_CHANGE, List.of(summaryMoneyChangeReportBuilder)); + resultMap.put(ReportBuilderType.KS_REP_CASH_REGISTERS, List.of(ksRepCashRegistersReportBuilder)); + resultMap.put(ReportBuilderType.KS_REP_CASH_REGISTER_SUMS, List.of(ksRepCashRegisterSumsReportBuilder)); + resultMap.put(ReportBuilderType.KS_REP_DEPO_REGISTERS, List.of(ksRepDepoRegistersReportBuilder)); + resultMap.put(ReportBuilderType.KS_REP_DEPO_REGISTER_QUANTITIES, List.of(ksRepDepoRegisterQuantitiesReportBuilder)); + resultMap.put(ReportBuilderType.KS_REP_TRADES, List.of(ksRepTradesReportBuilder)); + resultMap.put(ReportBuilderType.KS_REP_FIRM_DETAILS, List.of(ksRepFirmDetailsReportBuilder)); return resultMap; } @Bean("reportBuildersWithSessionIdParam") - public Map>> reportBuildersWithSessionIdParam( + public Map>> reportBuildersWithSessionIdParam( OperationalLiabilitiesClaimsReportBuilder operationalLiabilitiesClaimsReportBuilder, OperationalMoneyChangeReportBuilder operationalMoneyChangeReportBuilder, ExecutedDealReportBuilder_INFTYPE_1 executedDealReportBuilder_inftype_1, @@ -50,10 +50,10 @@ public class ReportBuildersConfig { KSRepCashNettoReportBuilder ksRepCashNettoReportBuilder, KSRepDepoNettoReportBuilder ksRepDepoNettoReportBuilder ) { - Map>> resultMap = new HashMap<>(); - resultMap.put(ReportType.OPERATIONAL_LIABILITIES_CLAIMS, List.of(operationalLiabilitiesClaimsReportBuilder)); - resultMap.put(ReportType.OPERATIONAL_MONEY_CHANGE, List.of(operationalMoneyChangeReportBuilder)); - resultMap.put(ReportType.EXECUTED_DEAL_REPORT, + Map>> resultMap = new HashMap<>(); + resultMap.put(ReportBuilderType.OPERATIONAL_LIABILITIES_CLAIMS, List.of(operationalLiabilitiesClaimsReportBuilder)); + resultMap.put(ReportBuilderType.OPERATIONAL_MONEY_CHANGE, List.of(operationalMoneyChangeReportBuilder)); + resultMap.put(ReportBuilderType.EXECUTED_DEAL_REPORT, List.of( executedDealReportBuilder_inftype_1, executedDealReportBuilder_inftype_2, @@ -61,32 +61,32 @@ public class ReportBuildersConfig { executedDealReportBuilder_inftype_4 ) ); - resultMap.put(ReportType.UNFULFILLED_DEAL_REPORT, List.of(unfulfilledDealReportBuilder)); - resultMap.put(ReportType.KS_REP_CASH_NETTO, List.of(ksRepCashNettoReportBuilder)); - resultMap.put(ReportType.KS_REP_DEPO_NETTO, List.of(ksRepDepoNettoReportBuilder)); + resultMap.put(ReportBuilderType.UNFULFILLED_DEAL_REPORT, List.of(unfulfilledDealReportBuilder)); + resultMap.put(ReportBuilderType.KS_REP_CASH_NETTO, List.of(ksRepCashNettoReportBuilder)); + resultMap.put(ReportBuilderType.KS_REP_DEPO_NETTO, List.of(ksRepDepoNettoReportBuilder)); return resultMap; } @Bean("reportBuildersWithSessionIdListParam") - public Map>> reportBuildersWithSessionIdListParams( + public Map>> reportBuildersWithSessionIdListParams( PeriodLiabilitiesClaimsReportBuilder periodLiabilitiesClaimsReportBuilder ) { - Map>> resultMap = new HashMap<>(); - resultMap.put(ReportType.PERIOD_LIABILITIES_CLAIMS, List.of(periodLiabilitiesClaimsReportBuilder)); + Map>> resultMap = new HashMap<>(); + resultMap.put(ReportBuilderType.PERIOD_LIABILITIES_CLAIMS, List.of(periodLiabilitiesClaimsReportBuilder)); return resultMap; } @Bean("reportBuildersWithPeriodParams") - public Map>> reportBuildersWithPeriodParams( + public Map>> reportBuildersWithPeriodParams( PeriodMoneyChangeReportBuilder periodMoneyChangeReportBuilder ) { - Map>> resultMap = new HashMap<>(); - resultMap.put(ReportType.PERIOD_MONEY_CHANGE, List.of(periodMoneyChangeReportBuilder)); + Map>> resultMap = new HashMap<>(); + resultMap.put(ReportBuilderType.PERIOD_MONEY_CHANGE, List.of(periodMoneyChangeReportBuilder)); return resultMap; } @Bean("reportBuildersForGREP") - public Map>> reportBuildersForGREP( + public Map>> reportBuildersForGREP( SummaryLiabilitiesClaimsReportBuilder summaryLiabilitiesClaimsReportBuilder, SummaryMoneyChangeReportBuilder summaryMoneyChangeReportBuilder, KSRepCashRegistersReportBuilder ksRepCashRegistersReportBuilder, @@ -100,24 +100,24 @@ public class ReportBuildersConfig { PeriodLiabilitiesClaimsReportBuilder periodLiabilitiesClaimsReportBuilder, PeriodMoneyChangeReportBuilder periodMoneyChangeReportBuilder ) { - Map>> resultMap = new HashMap<>(); - resultMap.put(ReportType.SUMMARY_LIABILITIES_CLAIMS, List.of(summaryLiabilitiesClaimsReportBuilder)); - resultMap.put(ReportType.SUMMARY_MONEY_CHANGE, List.of(summaryMoneyChangeReportBuilder)); - resultMap.put(ReportType.KS_REP_CASH_REGISTERS, List.of(ksRepCashRegistersReportBuilder)); - resultMap.put(ReportType.KS_REP_CASH_REGISTER_SUMS, List.of(ksRepCashRegisterSumsReportBuilder)); - resultMap.put(ReportType.KS_REP_DEPO_REGISTERS, List.of(ksRepDepoRegistersReportBuilder)); - resultMap.put(ReportType.KS_REP_DEPO_REGISTER_QUANTITIES, List.of(ksRepDepoRegisterQuantitiesReportBuilder)); - resultMap.put(ReportType.KS_REP_TRADES, List.of(ksRepTradesReportBuilder)); - resultMap.put(ReportType.KS_REP_FIRM_DETAILS, List.of(ksRepFirmDetailsReportBuilder)); - resultMap.put(ReportType.KS_REP_CASH_NETTO, List.of(ksRepCashNettoReportBuilder)); - resultMap.put(ReportType.KS_REP_DEPO_NETTO, List.of(ksRepDepoNettoReportBuilder)); - resultMap.put(ReportType.PERIOD_LIABILITIES_CLAIMS, List.of(periodLiabilitiesClaimsReportBuilder)); - resultMap.put(ReportType.PERIOD_MONEY_CHANGE, List.of(periodMoneyChangeReportBuilder)); + Map>> resultMap = new HashMap<>(); + resultMap.put(ReportBuilderType.SUMMARY_LIABILITIES_CLAIMS, List.of(summaryLiabilitiesClaimsReportBuilder)); + resultMap.put(ReportBuilderType.SUMMARY_MONEY_CHANGE, List.of(summaryMoneyChangeReportBuilder)); + resultMap.put(ReportBuilderType.KS_REP_CASH_REGISTERS, List.of(ksRepCashRegistersReportBuilder)); + resultMap.put(ReportBuilderType.KS_REP_CASH_REGISTER_SUMS, List.of(ksRepCashRegisterSumsReportBuilder)); + resultMap.put(ReportBuilderType.KS_REP_DEPO_REGISTERS, List.of(ksRepDepoRegistersReportBuilder)); + resultMap.put(ReportBuilderType.KS_REP_DEPO_REGISTER_QUANTITIES, List.of(ksRepDepoRegisterQuantitiesReportBuilder)); + resultMap.put(ReportBuilderType.KS_REP_TRADES, List.of(ksRepTradesReportBuilder)); + resultMap.put(ReportBuilderType.KS_REP_FIRM_DETAILS, List.of(ksRepFirmDetailsReportBuilder)); + resultMap.put(ReportBuilderType.KS_REP_CASH_NETTO, List.of(ksRepCashNettoReportBuilder)); + resultMap.put(ReportBuilderType.KS_REP_DEPO_NETTO, List.of(ksRepDepoNettoReportBuilder)); + resultMap.put(ReportBuilderType.PERIOD_LIABILITIES_CLAIMS, List.of(periodLiabilitiesClaimsReportBuilder)); + resultMap.put(ReportBuilderType.PERIOD_MONEY_CHANGE, List.of(periodMoneyChangeReportBuilder)); return resultMap; } @Bean("reportBuildersForGREF") - public Map>> reportBuildersForGREF( + public Map>> reportBuildersForGREF( KSRepCashRegistersReportBuilder ksRepCashRegistersReportBuilder, KSRepCashRegisterSumsReportBuilder ksRepCashRegisterSumsReportBuilder, KSRepDepoRegistersReportBuilder ksRepDepoRegistersReportBuilder, @@ -127,28 +127,28 @@ public class ReportBuildersConfig { KSRepCashNettoReportBuilder ksRepCashNettoReportBuilder, KSRepDepoNettoReportBuilder ksRepDepoNettoReportBuilder ) { - Map>> resultMap = new HashMap<>(); - resultMap.put(ReportType.KS_REP_CASH_REGISTERS, List.of(ksRepCashRegistersReportBuilder)); - resultMap.put(ReportType.KS_REP_CASH_REGISTER_SUMS, List.of(ksRepCashRegisterSumsReportBuilder)); - resultMap.put(ReportType.KS_REP_DEPO_REGISTERS, List.of(ksRepDepoRegistersReportBuilder)); - resultMap.put(ReportType.KS_REP_DEPO_REGISTER_QUANTITIES, List.of(ksRepDepoRegisterQuantitiesReportBuilder)); - resultMap.put(ReportType.KS_REP_TRADES, List.of(ksRepTradesReportBuilder)); - resultMap.put(ReportType.KS_REP_FIRM_DETAILS, List.of(ksRepFirmDetailsReportBuilder)); - resultMap.put(ReportType.KS_REP_CASH_NETTO, List.of(ksRepCashNettoReportBuilder)); - resultMap.put(ReportType.KS_REP_DEPO_NETTO, List.of(ksRepDepoNettoReportBuilder)); + Map>> resultMap = new HashMap<>(); + resultMap.put(ReportBuilderType.KS_REP_CASH_REGISTERS, List.of(ksRepCashRegistersReportBuilder)); + resultMap.put(ReportBuilderType.KS_REP_CASH_REGISTER_SUMS, List.of(ksRepCashRegisterSumsReportBuilder)); + resultMap.put(ReportBuilderType.KS_REP_DEPO_REGISTERS, List.of(ksRepDepoRegistersReportBuilder)); + resultMap.put(ReportBuilderType.KS_REP_DEPO_REGISTER_QUANTITIES, List.of(ksRepDepoRegisterQuantitiesReportBuilder)); + resultMap.put(ReportBuilderType.KS_REP_TRADES, List.of(ksRepTradesReportBuilder)); + resultMap.put(ReportBuilderType.KS_REP_FIRM_DETAILS, List.of(ksRepFirmDetailsReportBuilder)); + resultMap.put(ReportBuilderType.KS_REP_CASH_NETTO, List.of(ksRepCashNettoReportBuilder)); + resultMap.put(ReportBuilderType.KS_REP_DEPO_NETTO, List.of(ksRepDepoNettoReportBuilder)); return resultMap; } @Bean("reportBuildersForGRET") - public Map>> reportBuildersForGRET( + public Map>> reportBuildersForGRET( ExecutedDealReportBuilder_INFTYPE_1 executedDealReportBuilder_inftype_1, ExecutedDealReportBuilder_INFTYPE_2 executedDealReportBuilder_inftype_2, ExecutedDealReportBuilder_INFTYPE_3 executedDealReportBuilder_inftype_3, ExecutedDealReportBuilder_INFTYPE_4 executedDealReportBuilder_inftype_4, UnfulfilledDealReportBuilder unfulfilledDealReportBuilder ) { - Map>> resultMap = new HashMap<>(); - resultMap.put(ReportType.EXECUTED_DEAL_REPORT, + Map>> resultMap = new HashMap<>(); + resultMap.put(ReportBuilderType.EXECUTED_DEAL_REPORT, List.of( executedDealReportBuilder_inftype_1, executedDealReportBuilder_inftype_2, @@ -156,7 +156,7 @@ public class ReportBuildersConfig { executedDealReportBuilder_inftype_4 ) ); - resultMap.put(ReportType.UNFULFILLED_DEAL_REPORT, List.of(unfulfilledDealReportBuilder)); + resultMap.put(ReportBuilderType.UNFULFILLED_DEAL_REPORT, List.of(unfulfilledDealReportBuilder)); return resultMap; } diff --git a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/config/validation/ValidationConfig.java b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/config/validation/ValidationConfig.java index 8b978a55d..00dd77545 100644 --- a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/config/validation/ValidationConfig.java +++ b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/config/validation/ValidationConfig.java @@ -16,7 +16,7 @@ import ru.spcex.clearing.validation.common.rules.EndDtAfterStartDtRule; import ru.spcex.clearing.validation.common.rules.EnumPresentRule; import ru.spcex.clearing.validation.common.rules.FieldRequiredRule; import ru.spcex.platform.classes.base.SpcexObjectBase; -import ru.spcex.platform.enumeration.ReportType; +import ru.spcex.platform.enumeration.ReportBuilderType; import ru.spcex.platform.imdg.api.Imdg; import ru.spcex.platform.imdg.api.ImdgProvider; import ru.spcex.platform.imdg.validation.ImdgValidationContext; @@ -59,14 +59,14 @@ public class ValidationConfig { EnumPresentRule.instance("reportId", ReportRequest::getReportId, new IEnumKey[]{ - ReportType.SUMMARY_LIABILITIES_CLAIMS, - ReportType.SUMMARY_MONEY_CHANGE, - ReportType.KS_REP_CASH_REGISTERS, - ReportType.KS_REP_CASH_REGISTER_SUMS, - ReportType.KS_REP_DEPO_REGISTERS, - ReportType.KS_REP_DEPO_REGISTER_QUANTITIES, - ReportType.KS_REP_TRADES, - ReportType.KS_REP_FIRM_DETAILS + ReportBuilderType.SUMMARY_LIABILITIES_CLAIMS, + ReportBuilderType.SUMMARY_MONEY_CHANGE, + ReportBuilderType.KS_REP_CASH_REGISTERS, + ReportBuilderType.KS_REP_CASH_REGISTER_SUMS, + ReportBuilderType.KS_REP_DEPO_REGISTERS, + ReportBuilderType.KS_REP_DEPO_REGISTER_QUANTITIES, + ReportBuilderType.KS_REP_TRADES, + ReportBuilderType.KS_REP_FIRM_DETAILS }, ReportError.WrongFieldValue, ReportError.RequiredFieldEmpty) @@ -85,12 +85,12 @@ public class ValidationConfig { EnumPresentRule.instance("reportId", ReportRequestWithSessionId::getReportId, new IEnumKey[]{ - ReportType.OPERATIONAL_LIABILITIES_CLAIMS, - ReportType.OPERATIONAL_MONEY_CHANGE, - ReportType.EXECUTED_DEAL_REPORT, - ReportType.UNFULFILLED_DEAL_REPORT, - ReportType.KS_REP_CASH_NETTO, - ReportType.KS_REP_DEPO_NETTO, + ReportBuilderType.OPERATIONAL_LIABILITIES_CLAIMS, + ReportBuilderType.OPERATIONAL_MONEY_CHANGE, + ReportBuilderType.EXECUTED_DEAL_REPORT, + ReportBuilderType.UNFULFILLED_DEAL_REPORT, + ReportBuilderType.KS_REP_CASH_NETTO, + ReportBuilderType.KS_REP_DEPO_NETTO, }, ReportError.WrongFieldValue, ReportError.RequiredFieldEmpty), @@ -113,7 +113,7 @@ public class ValidationConfig { EnumPresentRule.instance("reportId", ReportRequestWithSessionIdList::getReportId, new IEnumKey[]{ - ReportType.PERIOD_LIABILITIES_CLAIMS + ReportBuilderType.PERIOD_LIABILITIES_CLAIMS }, ReportError.WrongFieldValue, ReportError.RequiredFieldEmpty), @@ -140,7 +140,7 @@ public class ValidationConfig { EnumPresentRule.instance("reportId", ReportRequestWithPeriod::getReportId, new IEnumKey[]{ - ReportType.PERIOD_MONEY_CHANGE, + ReportBuilderType.PERIOD_MONEY_CHANGE, }, ReportError.WrongFieldValue, ReportError.RequiredFieldEmpty), diff --git a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/CSVReportBuilder.java b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/CSVReportBuilder.java index a80df3a60..08d5dc502 100644 --- a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/CSVReportBuilder.java +++ b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/CSVReportBuilder.java @@ -5,7 +5,7 @@ import com.opencsv.ICSVWriter; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.format.datetime.standard.InstantFormatter; -import ru.spcex.platform.enumeration.ReportType; +import ru.spcex.platform.enumeration.ReportBuilderType; import java.io.File; import java.io.FileWriter; @@ -49,9 +49,9 @@ public abstract class CSVReportBuilder

{ protected abstract String getReportFilename(P params); /** - * Тип отчета по {@link ReportType} + * Тип отчета по {@link ReportBuilderType} */ - public abstract ReportType getReportType(); + public abstract ReportBuilderType getReportType(); /** * Тип параметров для построения отчетов diff --git a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/CSVReportBuilder_.java b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/CSVReportBuilder_.java index fc106b873..ba084f0b3 100644 --- a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/CSVReportBuilder_.java +++ b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/CSVReportBuilder_.java @@ -7,7 +7,7 @@ import com.opencsv.bean.StatefulBeanToCsv; import com.opencsv.bean.StatefulBeanToCsvBuilder; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import ru.spcex.platform.enumeration.ReportType; +import ru.spcex.platform.enumeration.ReportBuilderType; import java.io.File; import java.io.FileWriter; @@ -37,9 +37,9 @@ public abstract class CSVReportBuilder_ { protected abstract String getReportFilename(P params); /** - * Тип отчета по {@link ReportType} + * Тип отчета по {@link ReportBuilderType} */ - public abstract ReportType getReportType(); + public abstract ReportBuilderType getReportType(); /** * Тип параметров для построения отчетов diff --git a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bp/ExecutedDealReportBuilderCommon.java b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bp/ExecutedDealReportBuilderCommon.java index 9d3a9f263..cf140fdf0 100644 --- a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bp/ExecutedDealReportBuilderCommon.java +++ b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bp/ExecutedDealReportBuilderCommon.java @@ -5,7 +5,7 @@ import ru.clearing.classes.statics.data.execution.ExecutionFond; import ru.clearing.classes.statics.data.misc.STrades; import ru.spcex.clearing.imdg.IMDGDistributedNames; import ru.spcex.clearing.reports.reports.CSVReportBuilder; -import ru.spcex.platform.enumeration.ReportType; +import ru.spcex.platform.enumeration.ReportBuilderType; import ru.spcex.platform.enumeration.WorkflowStatus; import ru.spcex.platform.imdg.api.Imdg; import ru.spcex.platform.imdg.api.ImdgProvider; @@ -48,8 +48,8 @@ public abstract class ExecutedDealReportBuilderCommon extends CSVReportBuilde } @Override - public ReportType getReportType() { - return ReportType.EXECUTED_DEAL_REPORT; + public ReportBuilderType getReportType() { + return ReportBuilderType.EXECUTED_DEAL_REPORT; } protected abstract Collection getExecutionFondsForReport(T params); diff --git a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bp/OperationalLiabilitiesClaimsReportBuilder.java b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bp/OperationalLiabilitiesClaimsReportBuilder.java index af350ca84..379278bbd 100644 --- a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bp/OperationalLiabilitiesClaimsReportBuilder.java +++ b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bp/OperationalLiabilitiesClaimsReportBuilder.java @@ -6,7 +6,7 @@ import org.springframework.stereotype.Component; import ru.clearing.classes.statics.data.execution.ExecutionDeposit; import ru.clearing.classes.statics.data.execution.ExecutionFond; import ru.spcex.clearing.reports.reports.SessionIdParam; -import ru.spcex.platform.enumeration.ReportType; +import ru.spcex.platform.enumeration.ReportBuilderType; import ru.spcex.platform.imdg.api.ImdgProvider; import java.time.LocalDateTime; @@ -42,8 +42,8 @@ public class OperationalLiabilitiesClaimsReportBuilder extends LiabilitiesClaims } @Override - public ReportType getReportType() { - return ReportType.OPERATIONAL_LIABILITIES_CLAIMS; + public ReportBuilderType getReportType() { + return ReportBuilderType.OPERATIONAL_LIABILITIES_CLAIMS; } @Override diff --git a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bp/OperationalMoneyChangeReportBuilder.java b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bp/OperationalMoneyChangeReportBuilder.java index cb11e4571..6c9dd7964 100644 --- a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bp/OperationalMoneyChangeReportBuilder.java +++ b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bp/OperationalMoneyChangeReportBuilder.java @@ -5,7 +5,7 @@ import org.springframework.context.annotation.Scope; import org.springframework.stereotype.Component; import ru.clearing.classes.statics.data.registry.Registry; import ru.spcex.clearing.reports.reports.SessionIdParam; -import ru.spcex.platform.enumeration.ReportType; +import ru.spcex.platform.enumeration.ReportBuilderType; import ru.spcex.platform.imdg.api.ImdgProvider; import java.time.LocalDateTime; @@ -32,8 +32,8 @@ public class OperationalMoneyChangeReportBuilder extends MoneyChangeReportBuilde } @Override - public ReportType getReportType() { - return ReportType.OPERATIONAL_MONEY_CHANGE; + public ReportBuilderType getReportType() { + return ReportBuilderType.OPERATIONAL_MONEY_CHANGE; } @Override diff --git a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bp/PeriodLiabilitiesClaimsReportBuilder.java b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bp/PeriodLiabilitiesClaimsReportBuilder.java index 784cfdca4..7e6df61fb 100644 --- a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bp/PeriodLiabilitiesClaimsReportBuilder.java +++ b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bp/PeriodLiabilitiesClaimsReportBuilder.java @@ -6,7 +6,7 @@ import org.springframework.stereotype.Component; import ru.clearing.classes.statics.data.execution.ExecutionDeposit; import ru.clearing.classes.statics.data.execution.ExecutionFond; import ru.spcex.clearing.reports.reports.SessionIdListParams; -import ru.spcex.platform.enumeration.ReportType; +import ru.spcex.platform.enumeration.ReportBuilderType; import ru.spcex.platform.imdg.api.ImdgProvider; import ru.spcex.platform.imdg.api.predicate.ImdgPredicate; import ru.spcex.platform.imdg.api.predicate.ImdgPredicateBuilder; @@ -30,8 +30,8 @@ public class PeriodLiabilitiesClaimsReportBuilder extends LiabilitiesClaimsRepor } @Override - public ReportType getReportType() { - return ReportType.PERIOD_LIABILITIES_CLAIMS; + public ReportBuilderType getReportType() { + return ReportBuilderType.PERIOD_LIABILITIES_CLAIMS; } @Override diff --git a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bp/PeriodMoneyChangeReportBuilder.java b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bp/PeriodMoneyChangeReportBuilder.java index 3e8ce9c02..ecc463cd3 100644 --- a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bp/PeriodMoneyChangeReportBuilder.java +++ b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bp/PeriodMoneyChangeReportBuilder.java @@ -6,7 +6,7 @@ import org.springframework.stereotype.Component; import ru.clearing.classes.statics.data.registry.Registry; import ru.spcex.clearing.reports.reports.PeriodParams; import ru.spcex.platform.enumeration.RegistryTradingParams; -import ru.spcex.platform.enumeration.ReportType; +import ru.spcex.platform.enumeration.ReportBuilderType; import ru.spcex.platform.imdg.api.ImdgProvider; import ru.spcex.platform.imdg.api.predicate.ImdgPredicateBuilder; import ru.spcex.platform.imdg.api.predicate.specific.RegistryCodeSqlBuilder; @@ -45,8 +45,8 @@ public class PeriodMoneyChangeReportBuilder extends MoneyChangeReportBuilder } @Override - public ReportType getReportType() { - return ReportType.KS_REP_FIRM_DETAILS; + public ReportBuilderType getReportType() { + return ReportBuilderType.KS_REP_FIRM_DETAILS; } @Override diff --git a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/ks/KSRepTradesReportBuilder.java b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/ks/KSRepTradesReportBuilder.java index ba9ff8730..7b949bcc3 100644 --- a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/ks/KSRepTradesReportBuilder.java +++ b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/ks/KSRepTradesReportBuilder.java @@ -63,8 +63,8 @@ public class KSRepTradesReportBuilder extends CSVReportBuilder { } @Override - public ReportType getReportType() { - return ReportType.KS_REP_TRADES; + public ReportBuilderType getReportType() { + return ReportBuilderType.KS_REP_TRADES; } @Override diff --git a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/ReportService.java b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/ReportService.java index fa4682674..58c1ed985 100644 --- a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/ReportService.java +++ b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/ReportService.java @@ -23,7 +23,7 @@ import ru.spcex.clearing.reports.config.element.ReportsServiceSettings; import ru.spcex.clearing.reports.reports.*; import ru.spcex.clearing.util.security.UserRoleVerification; import ru.spcex.clearing.validation.common.ValidationHelper; -import ru.spcex.platform.enumeration.ReportType; +import ru.spcex.platform.enumeration.ReportBuilderType; import ru.spcex.platform.enumeration.Task; import ru.spcex.platform.utils.enumeration.IEnumKey; import ru.spcex.platform.utils.validation.IValidator; @@ -48,13 +48,13 @@ public class ReportService extends QueueConsumer implements InitializingBean { private final Function reportRequestGRETValidator; private final Function reportRequestGREFValidator; - private final Map>> reportBuildersWithoutParams; - private final Map>> reportBuildersWithSessionIdParam; - private final Map>> reportBuildersWithSessionIdListParam; - private final Map>> reportBuildersWithPeriodParams; - private final Map>> reportBuildersForGREP; - private final Map>> reportBuildersForGREF; - private final Map>> reportBuildersForGRET; + private final Map>> reportBuildersWithoutParams; + private final Map>> reportBuildersWithSessionIdParam; + private final Map>> reportBuildersWithSessionIdListParam; + private final Map>> reportBuildersWithPeriodParams; + private final Map>> reportBuildersForGREP; + private final Map>> reportBuildersForGREF; + private final Map>> reportBuildersForGRET; private final File outFolder; @@ -66,20 +66,20 @@ public class ReportService extends QueueConsumer implements InitializingBean { ReportsServiceSettings reportsServiceSettings, @Qualifier("reportBuildersWithoutParams") - Map>> reportBuildersWithoutParams, + Map>> reportBuildersWithoutParams, @Qualifier("reportBuildersWithSessionIdParam") - Map>> reportBuildersWithSessionIdParam, + Map>> reportBuildersWithSessionIdParam, @Qualifier("reportBuildersWithSessionIdListParam") - Map>> reportBuildersWithSessionIdListParam, + Map>> reportBuildersWithSessionIdListParam, @Qualifier("reportBuildersWithPeriodParams") - Map>> reportBuildersWithPeriodParams, + Map>> reportBuildersWithPeriodParams, @Qualifier("reportBuildersForGREP") - Map>> reportBuildersForGREP, + Map>> reportBuildersForGREP, @Qualifier("reportBuildersForGREF") - Map>> reportBuildersForGREF, + Map>> reportBuildersForGREF, @Qualifier("reportBuildersForGRET") - Map>> reportBuildersForGRET, + Map>> reportBuildersForGRET, @Qualifier("reportRequestValidator") Function reportRequestValidator, @@ -161,7 +161,7 @@ public class ReportService extends QueueConsumer implements InitializingBean { log.debug("Create report type {}...", req.getReportId()); List> builders = reportBuildersWithoutParams.get( - IEnumKey.getEnumByKey(ReportType.class, req.getReportId()) + IEnumKey.getEnumByKey(ReportBuilderType.class, req.getReportId()) ); List outFilenames = new ArrayList<>(); for (CSVReportBuilder builder : builders) { @@ -196,7 +196,7 @@ public class ReportService extends QueueConsumer implements InitializingBean { log.debug("Create report type {}...", req.getReportId()); List> builders = reportBuildersWithSessionIdParam.get( - IEnumKey.getEnumByKey(ReportType.class, req.getReportId()) + IEnumKey.getEnumByKey(ReportBuilderType.class, req.getReportId()) ); List outFilenames = new ArrayList<>(); for (CSVReportBuilder builder : builders) { @@ -233,7 +233,7 @@ public class ReportService extends QueueConsumer implements InitializingBean { log.debug("Create report type {}...", req.getReportId()); List> builders = reportBuildersWithSessionIdListParam.get( - IEnumKey.getEnumByKey(ReportType.class, req.getReportId()) + IEnumKey.getEnumByKey(ReportBuilderType.class, req.getReportId()) ); List outFilenames = new ArrayList<>(); for (CSVReportBuilder builder : builders) { @@ -270,7 +270,7 @@ public class ReportService extends QueueConsumer implements InitializingBean { log.debug("Create report type {}...", req.getReportId()); List> builders = reportBuildersWithPeriodParams.get( - IEnumKey.getEnumByKey(ReportType.class, req.getReportId()) + IEnumKey.getEnumByKey(ReportBuilderType.class, req.getReportId()) ); List outFilenames = new ArrayList<>(); for (CSVReportBuilder builder : builders) { @@ -303,7 +303,7 @@ public class ReportService extends QueueConsumer implements InitializingBean { logUnknownProperties(userRequest); Long sessionId = userRequest.getRequestPayload().getSessionId(); - Map outFilenames = createReportsForTask(sessionId, reportBuildersForGREP.values()); + Map outFilenames = createReportsForTask(sessionId, reportBuildersForGREP.values()); sendReportsToGateway(sessionId, outFilenames, "REPORT_KS_TMP"); return null; @@ -319,7 +319,7 @@ public class ReportService extends QueueConsumer implements InitializingBean { logUnknownProperties(userRequest); Long sessionId = userRequest.getRequestPayload().getSessionId(); - Map outFilenames = createReportsForTask(sessionId, reportBuildersForGRET.values()); + Map outFilenames = createReportsForTask(sessionId, reportBuildersForGRET.values()); sendReportsToGateway(sessionId, outFilenames, null); return null; @@ -335,14 +335,14 @@ public class ReportService extends QueueConsumer implements InitializingBean { logUnknownProperties(userRequest); Long sessionId = userRequest.getRequestPayload().getSessionId(); - Map outFilenames = createReportsForTask(sessionId, reportBuildersForGREF.values()); + Map outFilenames = createReportsForTask(sessionId, reportBuildersForGREF.values()); sendReportsToGateway(sessionId, outFilenames, "REPORT_KS_FINAL"); return null; } - private Map createReportsForTask(Long sessionId, Collection>> buildersForTask) { - Map outFilenames = new HashMap<>(); + private Map createReportsForTask(Long sessionId, Collection>> buildersForTask) { + Map outFilenames = new HashMap<>(); int cntErrors = 0; LocalDate now = LocalDate.now(); for (List> builders : buildersForTask) { @@ -395,12 +395,12 @@ public class ReportService extends QueueConsumer implements InitializingBean { return outFilenames; } - private void sendReportsToGateway(Long sessionId, Map reportsWithReportType, String type) { + private void sendReportsToGateway(Long sessionId, Map reportsWithReportType, String type) { SendReportRequest sendReportRequest = new SendReportRequest(); sendReportRequest.setSessionId(sessionId); sendReportRequest.setType(type); List reports = new ArrayList<>(reportsWithReportType.size()); - for (Map.Entry entry : reportsWithReportType.entrySet()) { + for (Map.Entry entry : reportsWithReportType.entrySet()) { ReportPart reportPart = new ReportPart(); reportPart.setReportType(entry.getValue().getKey()); reportPart.setFileName(entry.getKey()); diff --git a/clearing-parent/reports-service/src/test/java/ru/spcex/clearing/reports/services/ReportServiceTest_BP.java b/clearing-parent/reports-service/src/test/java/ru/spcex/clearing/reports/services/ReportServiceTest_BP.java index 2e174aade..bdb596c85 100644 --- a/clearing-parent/reports-service/src/test/java/ru/spcex/clearing/reports/services/ReportServiceTest_BP.java +++ b/clearing-parent/reports-service/src/test/java/ru/spcex/clearing/reports/services/ReportServiceTest_BP.java @@ -182,7 +182,7 @@ public class ReportServiceTest_BP { final Long oldSessionIdFond = testExecutionFond.getSessionId(); ReportRequestWithSessionId reportRequestWithSessionId = new ReportRequestWithSessionId(); - reportRequestWithSessionId.setReportId(ReportType.OPERATIONAL_LIABILITIES_CLAIMS.getKey()); + reportRequestWithSessionId.setReportId(ReportBuilderType.OPERATIONAL_LIABILITIES_CLAIMS.getKey()); reportRequestWithSessionId.setSessionId(TEST_SESSION_ID_1); testExecutionDeposit.setSessionId(TEST_SESSION_ID_1); @@ -217,7 +217,7 @@ public class ReportServiceTest_BP { public void createReportTest_PERIOD_LIABILITIES_CLAIMS() throws CsvValidationException, IOException { clearTestDir(); ReportRequestWithSessionIdList reportRequestWithPeriod = new ReportRequestWithSessionIdList(); - reportRequestWithPeriod.setReportId(ReportType.PERIOD_LIABILITIES_CLAIMS.getKey()); + reportRequestWithPeriod.setReportId(ReportBuilderType.PERIOD_LIABILITIES_CLAIMS.getKey()); reportRequestWithPeriod.setSessionIdList(Arrays.asList(testExecutionDeposit.getSessionId(), testExecutionFond.getSessionId())); String jsonString = TestUtils.getJsonStringForSystem(reportRequestWithPeriod, 0L); @@ -242,7 +242,7 @@ public class ReportServiceTest_BP { public void createReportTest_SUMMARY_LIABILITIES_CLAIMS() throws CsvValidationException, IOException { clearTestDir(); ReportRequest reportRequest = new ReportRequest(); - reportRequest.setReportId(ReportType.SUMMARY_LIABILITIES_CLAIMS.getKey()); + reportRequest.setReportId(ReportBuilderType.SUMMARY_LIABILITIES_CLAIMS.getKey()); String jsonString = TestUtils.getJsonStringForSystem(reportRequest, 0L); TestUtils.addRecordToKafka((MockConsumer) reportService.getConsumer(), @@ -272,7 +272,7 @@ public class ReportServiceTest_BP { registryImdg.update(testRegistry_2); ReportRequestWithSessionId reportRequest = new ReportRequestWithSessionId(); - reportRequest.setReportId(ReportType.OPERATIONAL_MONEY_CHANGE.getKey()); + reportRequest.setReportId(ReportBuilderType.OPERATIONAL_MONEY_CHANGE.getKey()); reportRequest.setSessionId(TEST_SESSION_ID_3); String jsonString = TestUtils.getJsonStringForSystem(reportRequest, 0L); @@ -301,7 +301,7 @@ public class ReportServiceTest_BP { public void createReportTest_PERIOD_MONEY_CHANGE() throws CsvValidationException, IOException { clearTestDir(); ReportRequestWithPeriod reportRequest = new ReportRequestWithPeriod(); - reportRequest.setReportId(ReportType.PERIOD_MONEY_CHANGE.getKey()); + reportRequest.setReportId(ReportBuilderType.PERIOD_MONEY_CHANGE.getKey()); reportRequest.setStartDate(TEST_START_CLEARING_DATE); reportRequest.setEndDate(TEST_END_CLEARING_DATE); @@ -327,7 +327,7 @@ public class ReportServiceTest_BP { public void createReportTest_SUMMARY_MONEY_CHANGE() throws CsvValidationException, IOException { clearTestDir(); ReportRequest reportRequest = new ReportRequest(); - reportRequest.setReportId(ReportType.SUMMARY_MONEY_CHANGE.getKey()); + reportRequest.setReportId(ReportBuilderType.SUMMARY_MONEY_CHANGE.getKey()); TestUtils.clearAllInImdg(registryImdg); registryImdg.insert(testRegistry_1); registryImdg.insert(testRegistry_2); @@ -368,7 +368,7 @@ public class ReportServiceTest_BP { File expectedEmptyFile = new File(getClass().getClassLoader().getResource("expected_reports_csv/bp/KS_BR_PFX64_empty_expected.csv").getFile()); ReportRequestWithSessionId reportRequest = new ReportRequestWithSessionId(); - reportRequest.setReportId(ReportType.EXECUTED_DEAL_REPORT.getKey()); + reportRequest.setReportId(ReportBuilderType.EXECUTED_DEAL_REPORT.getKey()); reportRequest.setSessionId(TEST_SESSION_ID_3); final Long oldExecutionFondSessionId = testExecutionFond.getSessionId(); @@ -420,7 +420,7 @@ public class ReportServiceTest_BP { File expectedEmptyFile = new File(getClass().getClassLoader().getResource("expected_reports_csv/bp/KS_BR_PFX64_empty_expected.csv").getFile()); ReportRequestWithSessionId reportRequest = new ReportRequestWithSessionId(); - reportRequest.setReportId(ReportType.EXECUTED_DEAL_REPORT.getKey()); + reportRequest.setReportId(ReportBuilderType.EXECUTED_DEAL_REPORT.getKey()); reportRequest.setSessionId(TEST_SESSION_ID_3); final Long oldExecutionFondSessionId = testExecutionFond.getSessionId(); @@ -472,7 +472,7 @@ public class ReportServiceTest_BP { File expectedEmptyFile = new File(getClass().getClassLoader().getResource("expected_reports_csv/bp/KS_BR_PFX64_empty_expected.csv").getFile()); ReportRequestWithSessionId reportRequest = new ReportRequestWithSessionId(); - reportRequest.setReportId(ReportType.EXECUTED_DEAL_REPORT.getKey()); + reportRequest.setReportId(ReportBuilderType.EXECUTED_DEAL_REPORT.getKey()); reportRequest.setSessionId(TEST_SESSION_ID_3); final Long oldExecutionFondSessionId = testExecutionFond.getSessionId(); @@ -521,7 +521,7 @@ public class ReportServiceTest_BP { File expectedEmptyFile = new File(getClass().getClassLoader().getResource("expected_reports_csv/bp/KS_BR_PFX64_empty_expected.csv").getFile()); ReportRequestWithSessionId reportRequest = new ReportRequestWithSessionId(); - reportRequest.setReportId(ReportType.EXECUTED_DEAL_REPORT.getKey()); + reportRequest.setReportId(ReportBuilderType.EXECUTED_DEAL_REPORT.getKey()); reportRequest.setSessionId(TEST_SESSION_ID_3); final Long oldExecutionFondSessionId = testExecutionFond.getSessionId(); @@ -570,7 +570,7 @@ public class ReportServiceTest_BP { clearTestDir(); ReportRequestWithSessionId reportRequest = new ReportRequestWithSessionId(); - reportRequest.setReportId(ReportType.UNFULFILLED_DEAL_REPORT.getKey()); + reportRequest.setReportId(ReportBuilderType.UNFULFILLED_DEAL_REPORT.getKey()); reportRequest.setSessionId(TEST_SESSION_ID_3); final Long oldExecutionFondSessionId = testExecutionFond.getSessionId(); diff --git a/clearing-parent/reports-service/src/test/java/ru/spcex/clearing/reports/services/ReportServiceTest_KS.java b/clearing-parent/reports-service/src/test/java/ru/spcex/clearing/reports/services/ReportServiceTest_KS.java index 8940e0117..dd62a35e0 100644 --- a/clearing-parent/reports-service/src/test/java/ru/spcex/clearing/reports/services/ReportServiceTest_KS.java +++ b/clearing-parent/reports-service/src/test/java/ru/spcex/clearing/reports/services/ReportServiceTest_KS.java @@ -118,7 +118,7 @@ public class ReportServiceTest_KS { clearTestDir(); ReportRequest reportRequest = new ReportRequest(); - reportRequest.setReportId(ReportType.KS_REP_CASH_REGISTERS.getKey()); + reportRequest.setReportId(ReportBuilderType.KS_REP_CASH_REGISTERS.getKey()); RegistryCodeDictionary registryCodeDictionary = new RegistryCodeDictionary(); registryCodeDictionary.setCode("AM_T"); @@ -167,7 +167,7 @@ public class ReportServiceTest_KS { clearTestDir(); ReportRequest reportRequest = new ReportRequest(); - reportRequest.setReportId(ReportType.KS_REP_CASH_REGISTER_SUMS.getKey()); + reportRequest.setReportId(ReportBuilderType.KS_REP_CASH_REGISTER_SUMS.getKey()); Registry registry_1 = new Registry(); registry_1.setCompanyId(COMPANY_ID); @@ -205,7 +205,7 @@ public class ReportServiceTest_KS { clearTestDir(); ReportRequest reportRequest = new ReportRequest(); - reportRequest.setReportId(ReportType.KS_REP_DEPO_REGISTERS.getKey()); + reportRequest.setReportId(ReportBuilderType.KS_REP_DEPO_REGISTERS.getKey()); RegistryCodeDictionary registryCodeDictionary = new RegistryCodeDictionary(); registryCodeDictionary.setCode("AS_T"); @@ -254,7 +254,7 @@ public class ReportServiceTest_KS { clearTestDir(); ReportRequest reportRequest = new ReportRequest(); - reportRequest.setReportId(ReportType.KS_REP_DEPO_REGISTER_QUANTITIES.getKey()); + reportRequest.setReportId(ReportBuilderType.KS_REP_DEPO_REGISTER_QUANTITIES.getKey()); Registry registry_1 = new Registry(); registry_1.setCompanyId(COMPANY_ID); @@ -293,7 +293,7 @@ public class ReportServiceTest_KS { clearTestDir(); ReportRequest reportRequest = new ReportRequest(); - reportRequest.setReportId(ReportType.KS_REP_TRADES.getKey()); + reportRequest.setReportId(ReportBuilderType.KS_REP_TRADES.getKey()); Session session_1 = new Session(); session_1.setCreated(Instant.ofEpochMilli(LocalDateTime.of(2023, 6, 30, 0, 0, 0).toEpochSecond(ZoneOffset.UTC))); @@ -369,7 +369,7 @@ public class ReportServiceTest_KS { Long sessionId = sessionImdg.insert(session); ReportRequestWithSessionId reportRequest = new ReportRequestWithSessionId(); - reportRequest.setReportId(ReportType.KS_REP_CASH_NETTO.getKey()); + reportRequest.setReportId(ReportBuilderType.KS_REP_CASH_NETTO.getKey()); reportRequest.setSessionId(sessionId); Registry registry_1 = new Registry(); @@ -431,7 +431,7 @@ public class ReportServiceTest_KS { Long sessionId = sessionImdg.insert(session); ReportRequestWithSessionId reportRequest = new ReportRequestWithSessionId(); - reportRequest.setReportId(ReportType.KS_REP_DEPO_NETTO.getKey()); + reportRequest.setReportId(ReportBuilderType.KS_REP_DEPO_NETTO.getKey()); reportRequest.setSessionId(sessionId); Registry registry_1 = new Registry(); @@ -491,7 +491,7 @@ public class ReportServiceTest_KS { clearTestDir(); ReportRequest reportRequest = new ReportRequest(); - reportRequest.setReportId(ReportType.KS_REP_FIRM_DETAILS.getKey()); + reportRequest.setReportId(ReportBuilderType.KS_REP_FIRM_DETAILS.getKey()); Collection oldCompanies = companyImdg.getAllValues(); for (Company company : oldCompanies) { diff --git a/platform-parent/platform-enum/src/main/java/ru/spcex/platform/enumeration/ReportType.java b/platform-parent/platform-enum/src/main/java/ru/spcex/platform/enumeration/ReportBuilderType.java similarity index 93% rename from platform-parent/platform-enum/src/main/java/ru/spcex/platform/enumeration/ReportType.java rename to platform-parent/platform-enum/src/main/java/ru/spcex/platform/enumeration/ReportBuilderType.java index 16dfdc33f..3b551b4f0 100644 --- a/platform-parent/platform-enum/src/main/java/ru/spcex/platform/enumeration/ReportType.java +++ b/platform-parent/platform-enum/src/main/java/ru/spcex/platform/enumeration/ReportBuilderType.java @@ -6,7 +6,7 @@ import ru.spcex.platform.utils.enumeration.IEnumKey; * Идентификатор отчета * todo сделать для них dictionary */ -public enum ReportType implements IEnumKey { +public enum ReportBuilderType implements IEnumKey { OPERATIONAL_LIABILITIES_CLAIMS("operational-liabilities-claims"), OPERATIONAL_MONEY_CHANGE("operational-money-change"), SUMMARY_LIABILITIES_CLAIMS("summary-liabilities-claims"), @@ -29,7 +29,7 @@ public enum ReportType implements IEnumKey { private final String key; - ReportType(String key) { + ReportBuilderType(String key) { this.key = key; } diff --git a/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/gateway/SendReportRequest.java b/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/gateway/SendReportRequest.java index 07708f1e9..6494cfe71 100644 --- a/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/gateway/SendReportRequest.java +++ b/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/gateway/SendReportRequest.java @@ -6,13 +6,13 @@ import java.util.List; public class SendReportRequest { @JsonProperty - public Long sessionId; + private Long sessionId; @JsonProperty - public String type; + private String type; @JsonProperty - public List reports; + private List reports; public Long getSessionId() { return sessionId; diff --git a/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/reports/ReportRequest.java b/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/reports/ReportRequest.java index 3cd4c9aca..78ed940e9 100644 --- a/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/reports/ReportRequest.java +++ b/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/reports/ReportRequest.java @@ -1,7 +1,7 @@ package ru.spcex.clearing.platform.messaging.domain.cud.reports; import com.fasterxml.jackson.annotation.JsonProperty; -import ru.spcex.platform.enumeration.ReportType; +import ru.spcex.platform.enumeration.ReportBuilderType; /** * Запрос отчёта (без параметров) report-service @@ -9,7 +9,7 @@ import ru.spcex.platform.enumeration.ReportType; public class ReportRequest { /** * Идентификатор отчёта - * см. {@link ReportType} + * см. {@link ReportBuilderType} */ @JsonProperty public String reportId;