treshenkov/clearing
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

refactoring: enum name

Browse source
This commit is contained in:
etreschenkov 2023-07-07 13:07:58 +03:00
parent 93a3df9bfb
commit d1378a4cf4
28 changed files with 189 additions and 178 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/service/GatewayService.java
View file

@ -244,6 +244,17 @@ public class GatewayService extends QueueConsumer implements InitializingBean {
String paramName = null; String paramName = null;
switch (reportKeys) { switch (reportKeys) {
case KS_BR_PFX64_INFTYPE_1 -> paramName = "inftype_1"; 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) { if (paramName != null) {
content.put(paramName, reportPart.getFileName()); content.put(paramName, reportPart.getFileName());

106
clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/config/ReportBuildersConfig.java
View file

@ -6,7 +6,7 @@ import org.springframework.context.annotation.Configuration;
import ru.spcex.clearing.reports.reports.*; import ru.spcex.clearing.reports.reports.*;
import ru.spcex.clearing.reports.reports.bp.*; import ru.spcex.clearing.reports.reports.bp.*;
import ru.spcex.clearing.reports.reports.ks.*; 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.HashMap;
import java.util.List; import java.util.List;
@ -16,7 +16,7 @@ import java.util.Map;
@ComponentScan(basePackages = "ru.spcex.clearing.reports.reports") @ComponentScan(basePackages = "ru.spcex.clearing.reports.reports")
public class ReportBuildersConfig { public class ReportBuildersConfig {
@Bean("reportBuildersWithoutParams") @Bean("reportBuildersWithoutParams")
public Map<ReportType, List<CSVReportBuilder<EmptyParams>>> reportBuildersWithoutParams( public Map<ReportBuilderType, List<CSVReportBuilder<EmptyParams>>> reportBuildersWithoutParams(
SummaryLiabilitiesClaimsReportBuilder summaryLiabilitiesClaimsReportBuilder, SummaryLiabilitiesClaimsReportBuilder summaryLiabilitiesClaimsReportBuilder,
SummaryMoneyChangeReportBuilder summaryMoneyChangeReportBuilder, SummaryMoneyChangeReportBuilder summaryMoneyChangeReportBuilder,
KSRepCashRegistersReportBuilder ksRepCashRegistersReportBuilder, KSRepCashRegistersReportBuilder ksRepCashRegistersReportBuilder,
@ -26,20 +26,20 @@ public class ReportBuildersConfig {
KSRepTradesReportBuilder ksRepTradesReportBuilder, KSRepTradesReportBuilder ksRepTradesReportBuilder,
KSRepFirmDetailsReportBuilder ksRepFirmDetailsReportBuilder KSRepFirmDetailsReportBuilder ksRepFirmDetailsReportBuilder
) { ) {
Map<ReportType, List<CSVReportBuilder<EmptyParams>>> resultMap = new HashMap<>(); Map<ReportBuilderType, List<CSVReportBuilder<EmptyParams>>> resultMap = new HashMap<>();
resultMap.put(ReportType.SUMMARY_LIABILITIES_CLAIMS, List.of(summaryLiabilitiesClaimsReportBuilder)); resultMap.put(ReportBuilderType.SUMMARY_LIABILITIES_CLAIMS, List.of(summaryLiabilitiesClaimsReportBuilder));
resultMap.put(ReportType.SUMMARY_MONEY_CHANGE, List.of(summaryMoneyChangeReportBuilder)); resultMap.put(ReportBuilderType.SUMMARY_MONEY_CHANGE, List.of(summaryMoneyChangeReportBuilder));
resultMap.put(ReportType.KS_REP_CASH_REGISTERS, List.of(ksRepCashRegistersReportBuilder)); resultMap.put(ReportBuilderType.KS_REP_CASH_REGISTERS, List.of(ksRepCashRegistersReportBuilder));
resultMap.put(ReportType.KS_REP_CASH_REGISTER_SUMS, List.of(ksRepCashRegisterSumsReportBuilder)); resultMap.put(ReportBuilderType.KS_REP_CASH_REGISTER_SUMS, List.of(ksRepCashRegisterSumsReportBuilder));
resultMap.put(ReportType.KS_REP_DEPO_REGISTERS, List.of(ksRepDepoRegistersReportBuilder)); resultMap.put(ReportBuilderType.KS_REP_DEPO_REGISTERS, List.of(ksRepDepoRegistersReportBuilder));
resultMap.put(ReportType.KS_REP_DEPO_REGISTER_QUANTITIES, List.of(ksRepDepoRegisterQuantitiesReportBuilder)); resultMap.put(ReportBuilderType.KS_REP_DEPO_REGISTER_QUANTITIES, List.of(ksRepDepoRegisterQuantitiesReportBuilder));
resultMap.put(ReportType.KS_REP_TRADES, List.of(ksRepTradesReportBuilder)); resultMap.put(ReportBuilderType.KS_REP_TRADES, List.of(ksRepTradesReportBuilder));
resultMap.put(ReportType.KS_REP_FIRM_DETAILS, List.of(ksRepFirmDetailsReportBuilder)); resultMap.put(ReportBuilderType.KS_REP_FIRM_DETAILS, List.of(ksRepFirmDetailsReportBuilder));
return resultMap; return resultMap;
} }
@Bean("reportBuildersWithSessionIdParam") @Bean("reportBuildersWithSessionIdParam")
public Map<ReportType, List<CSVReportBuilder<SessionIdParam>>> reportBuildersWithSessionIdParam( public Map<ReportBuilderType, List<CSVReportBuilder<SessionIdParam>>> reportBuildersWithSessionIdParam(
OperationalLiabilitiesClaimsReportBuilder operationalLiabilitiesClaimsReportBuilder, OperationalLiabilitiesClaimsReportBuilder operationalLiabilitiesClaimsReportBuilder,
OperationalMoneyChangeReportBuilder operationalMoneyChangeReportBuilder, OperationalMoneyChangeReportBuilder operationalMoneyChangeReportBuilder,
ExecutedDealReportBuilder_INFTYPE_1 executedDealReportBuilder_inftype_1, ExecutedDealReportBuilder_INFTYPE_1 executedDealReportBuilder_inftype_1,
@ -50,10 +50,10 @@ public class ReportBuildersConfig {
KSRepCashNettoReportBuilder ksRepCashNettoReportBuilder, KSRepCashNettoReportBuilder ksRepCashNettoReportBuilder,
KSRepDepoNettoReportBuilder ksRepDepoNettoReportBuilder KSRepDepoNettoReportBuilder ksRepDepoNettoReportBuilder
) { ) {
Map<ReportType, List<CSVReportBuilder<SessionIdParam>>> resultMap = new HashMap<>(); Map<ReportBuilderType, List<CSVReportBuilder<SessionIdParam>>> resultMap = new HashMap<>();
resultMap.put(ReportType.OPERATIONAL_LIABILITIES_CLAIMS, List.of(operationalLiabilitiesClaimsReportBuilder)); resultMap.put(ReportBuilderType.OPERATIONAL_LIABILITIES_CLAIMS, List.of(operationalLiabilitiesClaimsReportBuilder));
resultMap.put(ReportType.OPERATIONAL_MONEY_CHANGE, List.of(operationalMoneyChangeReportBuilder)); resultMap.put(ReportBuilderType.OPERATIONAL_MONEY_CHANGE, List.of(operationalMoneyChangeReportBuilder));
resultMap.put(ReportType.EXECUTED_DEAL_REPORT, resultMap.put(ReportBuilderType.EXECUTED_DEAL_REPORT,
List.of( List.of(
executedDealReportBuilder_inftype_1, executedDealReportBuilder_inftype_1,
executedDealReportBuilder_inftype_2, executedDealReportBuilder_inftype_2,
@ -61,32 +61,32 @@ public class ReportBuildersConfig {
executedDealReportBuilder_inftype_4 executedDealReportBuilder_inftype_4
) )
); );
resultMap.put(ReportType.UNFULFILLED_DEAL_REPORT, List.of(unfulfilledDealReportBuilder)); resultMap.put(ReportBuilderType.UNFULFILLED_DEAL_REPORT, List.of(unfulfilledDealReportBuilder));
resultMap.put(ReportType.KS_REP_CASH_NETTO, List.of(ksRepCashNettoReportBuilder)); resultMap.put(ReportBuilderType.KS_REP_CASH_NETTO, List.of(ksRepCashNettoReportBuilder));
resultMap.put(ReportType.KS_REP_DEPO_NETTO, List.of(ksRepDepoNettoReportBuilder)); resultMap.put(ReportBuilderType.KS_REP_DEPO_NETTO, List.of(ksRepDepoNettoReportBuilder));
return resultMap; return resultMap;
} }
@Bean("reportBuildersWithSessionIdListParam") @Bean("reportBuildersWithSessionIdListParam")
public Map<ReportType, List<CSVReportBuilder<SessionIdListParams>>> reportBuildersWithSessionIdListParams( public Map<ReportBuilderType, List<CSVReportBuilder<SessionIdListParams>>> reportBuildersWithSessionIdListParams(
PeriodLiabilitiesClaimsReportBuilder periodLiabilitiesClaimsReportBuilder PeriodLiabilitiesClaimsReportBuilder periodLiabilitiesClaimsReportBuilder
) { ) {
Map<ReportType, List<CSVReportBuilder<SessionIdListParams>>> resultMap = new HashMap<>(); Map<ReportBuilderType, List<CSVReportBuilder<SessionIdListParams>>> resultMap = new HashMap<>();
resultMap.put(ReportType.PERIOD_LIABILITIES_CLAIMS, List.of(periodLiabilitiesClaimsReportBuilder)); resultMap.put(ReportBuilderType.PERIOD_LIABILITIES_CLAIMS, List.of(periodLiabilitiesClaimsReportBuilder));
return resultMap; return resultMap;
} }
@Bean("reportBuildersWithPeriodParams") @Bean("reportBuildersWithPeriodParams")
public Map<ReportType, List<CSVReportBuilder<PeriodParams>>> reportBuildersWithPeriodParams( public Map<ReportBuilderType, List<CSVReportBuilder<PeriodParams>>> reportBuildersWithPeriodParams(
PeriodMoneyChangeReportBuilder periodMoneyChangeReportBuilder PeriodMoneyChangeReportBuilder periodMoneyChangeReportBuilder
) { ) {
Map<ReportType, List<CSVReportBuilder<PeriodParams>>> resultMap = new HashMap<>(); Map<ReportBuilderType, List<CSVReportBuilder<PeriodParams>>> resultMap = new HashMap<>();
resultMap.put(ReportType.PERIOD_MONEY_CHANGE, List.of(periodMoneyChangeReportBuilder)); resultMap.put(ReportBuilderType.PERIOD_MONEY_CHANGE, List.of(periodMoneyChangeReportBuilder));
return resultMap; return resultMap;
} }
@Bean("reportBuildersForGREP") @Bean("reportBuildersForGREP")
public Map<ReportType, List<CSVReportBuilder<?>>> reportBuildersForGREP( public Map<ReportBuilderType, List<CSVReportBuilder<?>>> reportBuildersForGREP(
SummaryLiabilitiesClaimsReportBuilder summaryLiabilitiesClaimsReportBuilder, SummaryLiabilitiesClaimsReportBuilder summaryLiabilitiesClaimsReportBuilder,
SummaryMoneyChangeReportBuilder summaryMoneyChangeReportBuilder, SummaryMoneyChangeReportBuilder summaryMoneyChangeReportBuilder,
KSRepCashRegistersReportBuilder ksRepCashRegistersReportBuilder, KSRepCashRegistersReportBuilder ksRepCashRegistersReportBuilder,
@ -100,24 +100,24 @@ public class ReportBuildersConfig {
PeriodLiabilitiesClaimsReportBuilder periodLiabilitiesClaimsReportBuilder, PeriodLiabilitiesClaimsReportBuilder periodLiabilitiesClaimsReportBuilder,
PeriodMoneyChangeReportBuilder periodMoneyChangeReportBuilder PeriodMoneyChangeReportBuilder periodMoneyChangeReportBuilder
) { ) {
Map<ReportType, List<CSVReportBuilder<?>>> resultMap = new HashMap<>(); Map<ReportBuilderType, List<CSVReportBuilder<?>>> resultMap = new HashMap<>();
resultMap.put(ReportType.SUMMARY_LIABILITIES_CLAIMS, List.of(summaryLiabilitiesClaimsReportBuilder)); resultMap.put(ReportBuilderType.SUMMARY_LIABILITIES_CLAIMS, List.of(summaryLiabilitiesClaimsReportBuilder));
resultMap.put(ReportType.SUMMARY_MONEY_CHANGE, List.of(summaryMoneyChangeReportBuilder)); resultMap.put(ReportBuilderType.SUMMARY_MONEY_CHANGE, List.of(summaryMoneyChangeReportBuilder));
resultMap.put(ReportType.KS_REP_CASH_REGISTERS, List.of(ksRepCashRegistersReportBuilder)); resultMap.put(ReportBuilderType.KS_REP_CASH_REGISTERS, List.of(ksRepCashRegistersReportBuilder));
resultMap.put(ReportType.KS_REP_CASH_REGISTER_SUMS, List.of(ksRepCashRegisterSumsReportBuilder)); resultMap.put(ReportBuilderType.KS_REP_CASH_REGISTER_SUMS, List.of(ksRepCashRegisterSumsReportBuilder));
resultMap.put(ReportType.KS_REP_DEPO_REGISTERS, List.of(ksRepDepoRegistersReportBuilder)); resultMap.put(ReportBuilderType.KS_REP_DEPO_REGISTERS, List.of(ksRepDepoRegistersReportBuilder));
resultMap.put(ReportType.KS_REP_DEPO_REGISTER_QUANTITIES, List.of(ksRepDepoRegisterQuantitiesReportBuilder)); resultMap.put(ReportBuilderType.KS_REP_DEPO_REGISTER_QUANTITIES, List.of(ksRepDepoRegisterQuantitiesReportBuilder));
resultMap.put(ReportType.KS_REP_TRADES, List.of(ksRepTradesReportBuilder)); resultMap.put(ReportBuilderType.KS_REP_TRADES, List.of(ksRepTradesReportBuilder));
resultMap.put(ReportType.KS_REP_FIRM_DETAILS, List.of(ksRepFirmDetailsReportBuilder)); resultMap.put(ReportBuilderType.KS_REP_FIRM_DETAILS, List.of(ksRepFirmDetailsReportBuilder));
resultMap.put(ReportType.KS_REP_CASH_NETTO, List.of(ksRepCashNettoReportBuilder)); resultMap.put(ReportBuilderType.KS_REP_CASH_NETTO, List.of(ksRepCashNettoReportBuilder));
resultMap.put(ReportType.KS_REP_DEPO_NETTO, List.of(ksRepDepoNettoReportBuilder)); resultMap.put(ReportBuilderType.KS_REP_DEPO_NETTO, List.of(ksRepDepoNettoReportBuilder));
resultMap.put(ReportType.PERIOD_LIABILITIES_CLAIMS, List.of(periodLiabilitiesClaimsReportBuilder)); resultMap.put(ReportBuilderType.PERIOD_LIABILITIES_CLAIMS, List.of(periodLiabilitiesClaimsReportBuilder));
resultMap.put(ReportType.PERIOD_MONEY_CHANGE, List.of(periodMoneyChangeReportBuilder)); resultMap.put(ReportBuilderType.PERIOD_MONEY_CHANGE, List.of(periodMoneyChangeReportBuilder));
return resultMap; return resultMap;
} }
@Bean("reportBuildersForGREF") @Bean("reportBuildersForGREF")
public Map<ReportType, List<CSVReportBuilder<?>>> reportBuildersForGREF( public Map<ReportBuilderType, List<CSVReportBuilder<?>>> reportBuildersForGREF(
KSRepCashRegistersReportBuilder ksRepCashRegistersReportBuilder, KSRepCashRegistersReportBuilder ksRepCashRegistersReportBuilder,
KSRepCashRegisterSumsReportBuilder ksRepCashRegisterSumsReportBuilder, KSRepCashRegisterSumsReportBuilder ksRepCashRegisterSumsReportBuilder,
KSRepDepoRegistersReportBuilder ksRepDepoRegistersReportBuilder, KSRepDepoRegistersReportBuilder ksRepDepoRegistersReportBuilder,
@ -127,28 +127,28 @@ public class ReportBuildersConfig {
KSRepCashNettoReportBuilder ksRepCashNettoReportBuilder, KSRepCashNettoReportBuilder ksRepCashNettoReportBuilder,
KSRepDepoNettoReportBuilder ksRepDepoNettoReportBuilder KSRepDepoNettoReportBuilder ksRepDepoNettoReportBuilder
) { ) {
Map<ReportType, List<CSVReportBuilder<?>>> resultMap = new HashMap<>(); Map<ReportBuilderType, List<CSVReportBuilder<?>>> resultMap = new HashMap<>();
resultMap.put(ReportType.KS_REP_CASH_REGISTERS, List.of(ksRepCashRegistersReportBuilder)); resultMap.put(ReportBuilderType.KS_REP_CASH_REGISTERS, List.of(ksRepCashRegistersReportBuilder));
resultMap.put(ReportType.KS_REP_CASH_REGISTER_SUMS, List.of(ksRepCashRegisterSumsReportBuilder)); resultMap.put(ReportBuilderType.KS_REP_CASH_REGISTER_SUMS, List.of(ksRepCashRegisterSumsReportBuilder));
resultMap.put(ReportType.KS_REP_DEPO_REGISTERS, List.of(ksRepDepoRegistersReportBuilder)); resultMap.put(ReportBuilderType.KS_REP_DEPO_REGISTERS, List.of(ksRepDepoRegistersReportBuilder));
resultMap.put(ReportType.KS_REP_DEPO_REGISTER_QUANTITIES, List.of(ksRepDepoRegisterQuantitiesReportBuilder)); resultMap.put(ReportBuilderType.KS_REP_DEPO_REGISTER_QUANTITIES, List.of(ksRepDepoRegisterQuantitiesReportBuilder));
resultMap.put(ReportType.KS_REP_TRADES, List.of(ksRepTradesReportBuilder)); resultMap.put(ReportBuilderType.KS_REP_TRADES, List.of(ksRepTradesReportBuilder));
resultMap.put(ReportType.KS_REP_FIRM_DETAILS, List.of(ksRepFirmDetailsReportBuilder)); resultMap.put(ReportBuilderType.KS_REP_FIRM_DETAILS, List.of(ksRepFirmDetailsReportBuilder));
resultMap.put(ReportType.KS_REP_CASH_NETTO, List.of(ksRepCashNettoReportBuilder)); resultMap.put(ReportBuilderType.KS_REP_CASH_NETTO, List.of(ksRepCashNettoReportBuilder));
resultMap.put(ReportType.KS_REP_DEPO_NETTO, List.of(ksRepDepoNettoReportBuilder)); resultMap.put(ReportBuilderType.KS_REP_DEPO_NETTO, List.of(ksRepDepoNettoReportBuilder));
return resultMap; return resultMap;
} }
@Bean("reportBuildersForGRET") @Bean("reportBuildersForGRET")
public Map<ReportType, List<CSVReportBuilder<?>>> reportBuildersForGRET( public Map<ReportBuilderType, List<CSVReportBuilder<?>>> reportBuildersForGRET(
ExecutedDealReportBuilder_INFTYPE_1 executedDealReportBuilder_inftype_1, ExecutedDealReportBuilder_INFTYPE_1 executedDealReportBuilder_inftype_1,
ExecutedDealReportBuilder_INFTYPE_2 executedDealReportBuilder_inftype_2, ExecutedDealReportBuilder_INFTYPE_2 executedDealReportBuilder_inftype_2,
ExecutedDealReportBuilder_INFTYPE_3 executedDealReportBuilder_inftype_3, ExecutedDealReportBuilder_INFTYPE_3 executedDealReportBuilder_inftype_3,
ExecutedDealReportBuilder_INFTYPE_4 executedDealReportBuilder_inftype_4, ExecutedDealReportBuilder_INFTYPE_4 executedDealReportBuilder_inftype_4,
UnfulfilledDealReportBuilder unfulfilledDealReportBuilder UnfulfilledDealReportBuilder unfulfilledDealReportBuilder
) { ) {
Map<ReportType, List<CSVReportBuilder<?>>> resultMap = new HashMap<>(); Map<ReportBuilderType, List<CSVReportBuilder<?>>> resultMap = new HashMap<>();
resultMap.put(ReportType.EXECUTED_DEAL_REPORT, resultMap.put(ReportBuilderType.EXECUTED_DEAL_REPORT,
List.of( List.of(
executedDealReportBuilder_inftype_1, executedDealReportBuilder_inftype_1,
executedDealReportBuilder_inftype_2, executedDealReportBuilder_inftype_2,
@ -156,7 +156,7 @@ public class ReportBuildersConfig {
executedDealReportBuilder_inftype_4 executedDealReportBuilder_inftype_4
) )
); );
resultMap.put(ReportType.UNFULFILLED_DEAL_REPORT, List.of(unfulfilledDealReportBuilder)); resultMap.put(ReportBuilderType.UNFULFILLED_DEAL_REPORT, List.of(unfulfilledDealReportBuilder));
return resultMap; return resultMap;
} }

34
clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/config/validation/ValidationConfig.java
View file

@ -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.EnumPresentRule;
import ru.spcex.clearing.validation.common.rules.FieldRequiredRule; import ru.spcex.clearing.validation.common.rules.FieldRequiredRule;
import ru.spcex.platform.classes.base.SpcexObjectBase; 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.Imdg;
import ru.spcex.platform.imdg.api.ImdgProvider; import ru.spcex.platform.imdg.api.ImdgProvider;
import ru.spcex.platform.imdg.validation.ImdgValidationContext; import ru.spcex.platform.imdg.validation.ImdgValidationContext;
@ -59,14 +59,14 @@ public class ValidationConfig {
EnumPresentRule.instance("reportId", EnumPresentRule.instance("reportId",
ReportRequest::getReportId, ReportRequest::getReportId,
new IEnumKey[]{ new IEnumKey[]{
ReportType.SUMMARY_LIABILITIES_CLAIMS, ReportBuilderType.SUMMARY_LIABILITIES_CLAIMS,
ReportType.SUMMARY_MONEY_CHANGE, ReportBuilderType.SUMMARY_MONEY_CHANGE,
ReportType.KS_REP_CASH_REGISTERS, ReportBuilderType.KS_REP_CASH_REGISTERS,
ReportType.KS_REP_CASH_REGISTER_SUMS, ReportBuilderType.KS_REP_CASH_REGISTER_SUMS,
ReportType.KS_REP_DEPO_REGISTERS, ReportBuilderType.KS_REP_DEPO_REGISTERS,
ReportType.KS_REP_DEPO_REGISTER_QUANTITIES, ReportBuilderType.KS_REP_DEPO_REGISTER_QUANTITIES,
ReportType.KS_REP_TRADES, ReportBuilderType.KS_REP_TRADES,
ReportType.KS_REP_FIRM_DETAILS ReportBuilderType.KS_REP_FIRM_DETAILS
}, },
ReportError.WrongFieldValue, ReportError.WrongFieldValue,
ReportError.RequiredFieldEmpty) ReportError.RequiredFieldEmpty)
@ -85,12 +85,12 @@ public class ValidationConfig {
EnumPresentRule.instance("reportId", EnumPresentRule.instance("reportId",
ReportRequestWithSessionId::getReportId, ReportRequestWithSessionId::getReportId,
new IEnumKey[]{ new IEnumKey[]{
ReportType.OPERATIONAL_LIABILITIES_CLAIMS, ReportBuilderType.OPERATIONAL_LIABILITIES_CLAIMS,
ReportType.OPERATIONAL_MONEY_CHANGE, ReportBuilderType.OPERATIONAL_MONEY_CHANGE,
ReportType.EXECUTED_DEAL_REPORT, ReportBuilderType.EXECUTED_DEAL_REPORT,
ReportType.UNFULFILLED_DEAL_REPORT, ReportBuilderType.UNFULFILLED_DEAL_REPORT,
ReportType.KS_REP_CASH_NETTO, ReportBuilderType.KS_REP_CASH_NETTO,
ReportType.KS_REP_DEPO_NETTO, ReportBuilderType.KS_REP_DEPO_NETTO,
}, },
ReportError.WrongFieldValue, ReportError.WrongFieldValue,
ReportError.RequiredFieldEmpty), ReportError.RequiredFieldEmpty),
@ -113,7 +113,7 @@ public class ValidationConfig {
EnumPresentRule.instance("reportId", EnumPresentRule.instance("reportId",
ReportRequestWithSessionIdList::getReportId, ReportRequestWithSessionIdList::getReportId,
new IEnumKey[]{ new IEnumKey[]{
ReportType.PERIOD_LIABILITIES_CLAIMS ReportBuilderType.PERIOD_LIABILITIES_CLAIMS
}, },
ReportError.WrongFieldValue, ReportError.WrongFieldValue,
ReportError.RequiredFieldEmpty), ReportError.RequiredFieldEmpty),
@ -140,7 +140,7 @@ public class ValidationConfig {
EnumPresentRule.instance("reportId", EnumPresentRule.instance("reportId",
ReportRequestWithPeriod::getReportId, ReportRequestWithPeriod::getReportId,
new IEnumKey[]{ new IEnumKey[]{
ReportType.PERIOD_MONEY_CHANGE, ReportBuilderType.PERIOD_MONEY_CHANGE,
}, },
ReportError.WrongFieldValue, ReportError.WrongFieldValue,
ReportError.RequiredFieldEmpty), ReportError.RequiredFieldEmpty),

6
clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/CSVReportBuilder.java
View file

@ -5,7 +5,7 @@ import com.opencsv.ICSVWriter;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.format.datetime.standard.InstantFormatter; 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.File;
import java.io.FileWriter; import java.io.FileWriter;
@ -49,9 +49,9 @@ public abstract class CSVReportBuilder<P> {
protected abstract String getReportFilename(P params); protected abstract String getReportFilename(P params);
/** /**
* Тип отчета по {@link ReportType} * Тип отчета по {@link ReportBuilderType}
*/ */
public abstract ReportType getReportType(); public abstract ReportBuilderType getReportType();
/** /**
* Тип параметров для построения отчетов * Тип параметров для построения отчетов

6
clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/CSVReportBuilder_.java
View file

@ -7,7 +7,7 @@ import com.opencsv.bean.StatefulBeanToCsv;
import com.opencsv.bean.StatefulBeanToCsvBuilder; import com.opencsv.bean.StatefulBeanToCsvBuilder;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import ru.spcex.platform.enumeration.ReportType; import ru.spcex.platform.enumeration.ReportBuilderType;
import java.io.File; import java.io.File;
import java.io.FileWriter; import java.io.FileWriter;
@ -37,9 +37,9 @@ public abstract class CSVReportBuilder_<P, R> {
protected abstract String getReportFilename(P params); protected abstract String getReportFilename(P params);
/** /**
* Тип отчета по {@link ReportType} * Тип отчета по {@link ReportBuilderType}
*/ */
public abstract ReportType getReportType(); public abstract ReportBuilderType getReportType();
/** /**
* Тип параметров для построения отчетов * Тип параметров для построения отчетов

6
clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bp/ExecutedDealReportBuilderCommon.java
View file

@ -5,7 +5,7 @@ import ru.clearing.classes.statics.data.execution.ExecutionFond;
import ru.clearing.classes.statics.data.misc.STrades; import ru.clearing.classes.statics.data.misc.STrades;
import ru.spcex.clearing.imdg.IMDGDistributedNames; import ru.spcex.clearing.imdg.IMDGDistributedNames;
import ru.spcex.clearing.reports.reports.CSVReportBuilder; 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.enumeration.WorkflowStatus;
import ru.spcex.platform.imdg.api.Imdg; import ru.spcex.platform.imdg.api.Imdg;
import ru.spcex.platform.imdg.api.ImdgProvider; import ru.spcex.platform.imdg.api.ImdgProvider;
@ -48,8 +48,8 @@ public abstract class ExecutedDealReportBuilderCommon<T> extends CSVReportBuilde
} }
@Override @Override
public ReportType getReportType() { public ReportBuilderType getReportType() {
return ReportType.EXECUTED_DEAL_REPORT; return ReportBuilderType.EXECUTED_DEAL_REPORT;
} }
protected abstract Collection<ExecutionFond> getExecutionFondsForReport(T params); protected abstract Collection<ExecutionFond> getExecutionFondsForReport(T params);

6
clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bp/OperationalLiabilitiesClaimsReportBuilder.java
View file

@ -6,7 +6,7 @@ import org.springframework.stereotype.Component;
import ru.clearing.classes.statics.data.execution.ExecutionDeposit; import ru.clearing.classes.statics.data.execution.ExecutionDeposit;
import ru.clearing.classes.statics.data.execution.ExecutionFond; import ru.clearing.classes.statics.data.execution.ExecutionFond;
import ru.spcex.clearing.reports.reports.SessionIdParam; 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 ru.spcex.platform.imdg.api.ImdgProvider;
import java.time.LocalDateTime; import java.time.LocalDateTime;
@ -42,8 +42,8 @@ public class OperationalLiabilitiesClaimsReportBuilder extends LiabilitiesClaims
} }
@Override @Override
public ReportType getReportType() { public ReportBuilderType getReportType() {
return ReportType.OPERATIONAL_LIABILITIES_CLAIMS; return ReportBuilderType.OPERATIONAL_LIABILITIES_CLAIMS;
} }
@Override @Override

6
clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bp/OperationalMoneyChangeReportBuilder.java
View file

@ -5,7 +5,7 @@ import org.springframework.context.annotation.Scope;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import ru.clearing.classes.statics.data.registry.Registry; import ru.clearing.classes.statics.data.registry.Registry;
import ru.spcex.clearing.reports.reports.SessionIdParam; 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 ru.spcex.platform.imdg.api.ImdgProvider;
import java.time.LocalDateTime; import java.time.LocalDateTime;
@ -32,8 +32,8 @@ public class OperationalMoneyChangeReportBuilder extends MoneyChangeReportBuilde
} }
@Override @Override
public ReportType getReportType() { public ReportBuilderType getReportType() {
return ReportType.OPERATIONAL_MONEY_CHANGE; return ReportBuilderType.OPERATIONAL_MONEY_CHANGE;
} }
@Override @Override

6
clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bp/PeriodLiabilitiesClaimsReportBuilder.java
View file

@ -6,7 +6,7 @@ import org.springframework.stereotype.Component;
import ru.clearing.classes.statics.data.execution.ExecutionDeposit; import ru.clearing.classes.statics.data.execution.ExecutionDeposit;
import ru.clearing.classes.statics.data.execution.ExecutionFond; import ru.clearing.classes.statics.data.execution.ExecutionFond;
import ru.spcex.clearing.reports.reports.SessionIdListParams; 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.ImdgProvider;
import ru.spcex.platform.imdg.api.predicate.ImdgPredicate; import ru.spcex.platform.imdg.api.predicate.ImdgPredicate;
import ru.spcex.platform.imdg.api.predicate.ImdgPredicateBuilder; import ru.spcex.platform.imdg.api.predicate.ImdgPredicateBuilder;
@ -30,8 +30,8 @@ public class PeriodLiabilitiesClaimsReportBuilder extends LiabilitiesClaimsRepor
} }
@Override @Override
public ReportType getReportType() { public ReportBuilderType getReportType() {
return ReportType.PERIOD_LIABILITIES_CLAIMS; return ReportBuilderType.PERIOD_LIABILITIES_CLAIMS;
} }
@Override @Override

6
clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bp/PeriodMoneyChangeReportBuilder.java
View file

@ -6,7 +6,7 @@ import org.springframework.stereotype.Component;
import ru.clearing.classes.statics.data.registry.Registry; import ru.clearing.classes.statics.data.registry.Registry;
import ru.spcex.clearing.reports.reports.PeriodParams; import ru.spcex.clearing.reports.reports.PeriodParams;
import ru.spcex.platform.enumeration.RegistryTradingParams; 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.ImdgProvider;
import ru.spcex.platform.imdg.api.predicate.ImdgPredicateBuilder; import ru.spcex.platform.imdg.api.predicate.ImdgPredicateBuilder;
import ru.spcex.platform.imdg.api.predicate.specific.RegistryCodeSqlBuilder; import ru.spcex.platform.imdg.api.predicate.specific.RegistryCodeSqlBuilder;
@ -45,8 +45,8 @@ public class PeriodMoneyChangeReportBuilder extends MoneyChangeReportBuilder<Per
} }
@Override @Override
public ReportType getReportType() { public ReportBuilderType getReportType() {
return ReportType.PERIOD_MONEY_CHANGE; return ReportBuilderType.PERIOD_MONEY_CHANGE;
} }
@Override @Override

6
clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bp/SummaryLiabilitiesClaimsReportBuilder.java
View file

@ -6,7 +6,7 @@ import org.springframework.stereotype.Component;
import ru.clearing.classes.statics.data.execution.ExecutionDeposit; import ru.clearing.classes.statics.data.execution.ExecutionDeposit;
import ru.clearing.classes.statics.data.execution.ExecutionFond; import ru.clearing.classes.statics.data.execution.ExecutionFond;
import ru.spcex.clearing.reports.reports.EmptyParams; import ru.spcex.clearing.reports.reports.EmptyParams;
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.ImdgProvider;
import ru.spcex.platform.imdg.api.predicate.ImdgPredicateBuilder; import ru.spcex.platform.imdg.api.predicate.ImdgPredicateBuilder;
@ -43,8 +43,8 @@ public class SummaryLiabilitiesClaimsReportBuilder extends LiabilitiesClaimsRepo
} }
@Override @Override
public ReportType getReportType() { public ReportBuilderType getReportType() {
return ReportType.SUMMARY_LIABILITIES_CLAIMS; return ReportBuilderType.SUMMARY_LIABILITIES_CLAIMS;
} }
@Override @Override

6
clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bp/SummaryMoneyChangeReportBuilder.java
View file

@ -6,7 +6,7 @@ import org.springframework.stereotype.Component;
import ru.clearing.classes.statics.data.registry.Registry; import ru.clearing.classes.statics.data.registry.Registry;
import ru.spcex.clearing.reports.reports.EmptyParams; import ru.spcex.clearing.reports.reports.EmptyParams;
import ru.spcex.platform.enumeration.RegistryTradingParams; 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.ImdgProvider;
import ru.spcex.platform.imdg.api.predicate.ImdgPredicateBuilder; import ru.spcex.platform.imdg.api.predicate.ImdgPredicateBuilder;
import ru.spcex.platform.imdg.api.predicate.specific.RegistryCodeSqlBuilder; import ru.spcex.platform.imdg.api.predicate.specific.RegistryCodeSqlBuilder;
@ -44,8 +44,8 @@ public class SummaryMoneyChangeReportBuilder extends MoneyChangeReportBuilder<Em
} }
@Override @Override
public ReportType getReportType() { public ReportBuilderType getReportType() {
return ReportType.SUMMARY_MONEY_CHANGE; return ReportBuilderType.SUMMARY_MONEY_CHANGE;
} }
@Override @Override

6
clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bp/UnfulfilledDealReportBuilder.java
View file

@ -10,7 +10,7 @@ import ru.spcex.clearing.imdg.IMDGDistributedNames;
import ru.spcex.clearing.reports.reports.CSVReportBuilder; import ru.spcex.clearing.reports.reports.CSVReportBuilder;
import ru.spcex.clearing.reports.reports.SessionIdParam; import ru.spcex.clearing.reports.reports.SessionIdParam;
import ru.spcex.platform.enumeration.Allowed; import ru.spcex.platform.enumeration.Allowed;
import ru.spcex.platform.enumeration.ReportType; import ru.spcex.platform.enumeration.ReportBuilderType;
import ru.spcex.platform.enumeration.WorkflowStatus; import ru.spcex.platform.enumeration.WorkflowStatus;
import ru.spcex.platform.imdg.api.Imdg; import ru.spcex.platform.imdg.api.Imdg;
import ru.spcex.platform.imdg.api.ImdgProvider; import ru.spcex.platform.imdg.api.ImdgProvider;
@ -53,8 +53,8 @@ public class UnfulfilledDealReportBuilder extends CSVReportBuilder<SessionIdPara
} }
@Override @Override
public ReportType getReportType() { public ReportBuilderType getReportType() {
return ReportType.UNFULFILLED_DEAL_REPORT; return ReportBuilderType.UNFULFILLED_DEAL_REPORT;
} }
@Override @Override

6
clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bp/UnfulfilledDealReportBuilder_.java
View file

@ -11,7 +11,7 @@ import ru.spcex.clearing.reports.reports.CSVReportBuilder_;
import ru.spcex.clearing.reports.reports.SessionIdParam; import ru.spcex.clearing.reports.reports.SessionIdParam;
import ru.spcex.clearing.reports.reports.bean.UnfulfilledDealReport; import ru.spcex.clearing.reports.reports.bean.UnfulfilledDealReport;
import ru.spcex.platform.enumeration.Allowed; import ru.spcex.platform.enumeration.Allowed;
import ru.spcex.platform.enumeration.ReportType; import ru.spcex.platform.enumeration.ReportBuilderType;
import ru.spcex.platform.enumeration.WorkflowStatus; import ru.spcex.platform.enumeration.WorkflowStatus;
import ru.spcex.platform.imdg.api.Imdg; import ru.spcex.platform.imdg.api.Imdg;
import ru.spcex.platform.imdg.api.ImdgProvider; import ru.spcex.platform.imdg.api.ImdgProvider;
@ -48,8 +48,8 @@ public class UnfulfilledDealReportBuilder_ extends CSVReportBuilder_<SessionIdPa
} }
@Override @Override
public ReportType getReportType() { public ReportBuilderType getReportType() {
return ReportType.UNFULFILLED_DEAL_REPORT; return ReportBuilderType.UNFULFILLED_DEAL_REPORT;
} }
@Override @Override

6
clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/ks/KSRepCashNettoReportBuilder.java
View file

@ -12,7 +12,7 @@ import ru.spcex.clearing.reports.reports.SessionIdParam;
import ru.spcex.platform.enumeration.AccountType; import ru.spcex.platform.enumeration.AccountType;
import ru.spcex.platform.enumeration.RegistryDesignation; import ru.spcex.platform.enumeration.RegistryDesignation;
import ru.spcex.platform.enumeration.RegistryTradingParams; import ru.spcex.platform.enumeration.RegistryTradingParams;
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.Imdg;
import ru.spcex.platform.imdg.api.ImdgProvider; import ru.spcex.platform.imdg.api.ImdgProvider;
import ru.spcex.platform.imdg.api.predicate.ImdgPredicate; import ru.spcex.platform.imdg.api.predicate.ImdgPredicate;
@ -58,8 +58,8 @@ public class KSRepCashNettoReportBuilder extends CSVReportBuilder<SessionIdParam
} }
@Override @Override
public ReportType getReportType() { public ReportBuilderType getReportType() {
return ReportType.KS_REP_CASH_NETTO; return ReportBuilderType.KS_REP_CASH_NETTO;
} }
@Override @Override

6
clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/ks/KSRepCashRegisterSumsReportBuilder.java
View file

@ -10,7 +10,7 @@ import ru.spcex.clearing.reports.reports.CSVReportBuilder;
import ru.spcex.clearing.reports.reports.EmptyParams; import ru.spcex.clearing.reports.reports.EmptyParams;
import ru.spcex.platform.enumeration.AccountType; import ru.spcex.platform.enumeration.AccountType;
import ru.spcex.platform.enumeration.RegistryTradingParams; import ru.spcex.platform.enumeration.RegistryTradingParams;
import ru.spcex.platform.enumeration.ReportType; import ru.spcex.platform.enumeration.ReportBuilderType;
import ru.spcex.platform.enumeration.WorkflowStatus; import ru.spcex.platform.enumeration.WorkflowStatus;
import ru.spcex.platform.imdg.api.Imdg; import ru.spcex.platform.imdg.api.Imdg;
import ru.spcex.platform.imdg.api.ImdgProvider; import ru.spcex.platform.imdg.api.ImdgProvider;
@ -58,8 +58,8 @@ public class KSRepCashRegisterSumsReportBuilder extends CSVReportBuilder<EmptyPa
} }
@Override @Override
public ReportType getReportType() { public ReportBuilderType getReportType() {
return ReportType.KS_REP_CASH_REGISTER_SUMS; return ReportBuilderType.KS_REP_CASH_REGISTER_SUMS;
} }
@Override @Override

6
clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/ks/KSRepCashRegistersReportBuilder.java
View file

@ -11,7 +11,7 @@ import ru.spcex.clearing.reports.reports.CSVReportBuilder;
import ru.spcex.clearing.reports.reports.EmptyParams; import ru.spcex.clearing.reports.reports.EmptyParams;
import ru.spcex.platform.enumeration.AccountType; import ru.spcex.platform.enumeration.AccountType;
import ru.spcex.platform.enumeration.RegistryTradingParams; import ru.spcex.platform.enumeration.RegistryTradingParams;
import ru.spcex.platform.enumeration.ReportType; import ru.spcex.platform.enumeration.ReportBuilderType;
import ru.spcex.platform.enumeration.WorkflowStatus; import ru.spcex.platform.enumeration.WorkflowStatus;
import ru.spcex.platform.imdg.api.Imdg; import ru.spcex.platform.imdg.api.Imdg;
import ru.spcex.platform.imdg.api.ImdgProvider; import ru.spcex.platform.imdg.api.ImdgProvider;
@ -62,8 +62,8 @@ public class KSRepCashRegistersReportBuilder extends CSVReportBuilder<EmptyParam
} }
@Override @Override
public ReportType getReportType() { public ReportBuilderType getReportType() {
return ReportType.KS_REP_CASH_REGISTERS; return ReportBuilderType.KS_REP_CASH_REGISTERS;
} }
@Override @Override

6
clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/ks/KSRepDepoNettoReportBuilder.java
View file

@ -12,7 +12,7 @@ import ru.spcex.clearing.reports.reports.SessionIdParam;
import ru.spcex.platform.enumeration.AccountType; import ru.spcex.platform.enumeration.AccountType;
import ru.spcex.platform.enumeration.RegistryDesignation; import ru.spcex.platform.enumeration.RegistryDesignation;
import ru.spcex.platform.enumeration.RegistryTradingParams; import ru.spcex.platform.enumeration.RegistryTradingParams;
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.Imdg;
import ru.spcex.platform.imdg.api.ImdgProvider; import ru.spcex.platform.imdg.api.ImdgProvider;
import ru.spcex.platform.imdg.api.predicate.ImdgPredicate; import ru.spcex.platform.imdg.api.predicate.ImdgPredicate;
@ -58,8 +58,8 @@ public class KSRepDepoNettoReportBuilder extends CSVReportBuilder<SessionIdParam
} }
@Override @Override
public ReportType getReportType() { public ReportBuilderType getReportType() {
return ReportType.KS_REP_DEPO_NETTO; return ReportBuilderType.KS_REP_DEPO_NETTO;
} }
@Override @Override

6
clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/ks/KSRepDepoRegisterQuantitiesReportBuilder.java
View file

@ -10,7 +10,7 @@ import ru.spcex.clearing.reports.reports.CSVReportBuilder;
import ru.spcex.clearing.reports.reports.EmptyParams; import ru.spcex.clearing.reports.reports.EmptyParams;
import ru.spcex.platform.enumeration.AccountType; import ru.spcex.platform.enumeration.AccountType;
import ru.spcex.platform.enumeration.RegistryTradingParams; import ru.spcex.platform.enumeration.RegistryTradingParams;
import ru.spcex.platform.enumeration.ReportType; import ru.spcex.platform.enumeration.ReportBuilderType;
import ru.spcex.platform.enumeration.WorkflowStatus; import ru.spcex.platform.enumeration.WorkflowStatus;
import ru.spcex.platform.imdg.api.Imdg; import ru.spcex.platform.imdg.api.Imdg;
import ru.spcex.platform.imdg.api.ImdgProvider; import ru.spcex.platform.imdg.api.ImdgProvider;
@ -58,8 +58,8 @@ public class KSRepDepoRegisterQuantitiesReportBuilder extends CSVReportBuilder<E
} }
@Override @Override
public ReportType getReportType() { public ReportBuilderType getReportType() {
return ReportType.KS_REP_DEPO_REGISTER_QUANTITIES; return ReportBuilderType.KS_REP_DEPO_REGISTER_QUANTITIES;
} }
@Override @Override

6
clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/ks/KSRepDepoRegistersReportBuilder.java
View file

@ -11,7 +11,7 @@ import ru.spcex.clearing.reports.reports.CSVReportBuilder;
import ru.spcex.clearing.reports.reports.EmptyParams; import ru.spcex.clearing.reports.reports.EmptyParams;
import ru.spcex.platform.enumeration.AccountType; import ru.spcex.platform.enumeration.AccountType;
import ru.spcex.platform.enumeration.RegistryTradingParams; import ru.spcex.platform.enumeration.RegistryTradingParams;
import ru.spcex.platform.enumeration.ReportType; import ru.spcex.platform.enumeration.ReportBuilderType;
import ru.spcex.platform.enumeration.WorkflowStatus; import ru.spcex.platform.enumeration.WorkflowStatus;
import ru.spcex.platform.imdg.api.Imdg; import ru.spcex.platform.imdg.api.Imdg;
import ru.spcex.platform.imdg.api.ImdgProvider; import ru.spcex.platform.imdg.api.ImdgProvider;
@ -62,8 +62,8 @@ public class KSRepDepoRegistersReportBuilder extends CSVReportBuilder<EmptyParam
} }
@Override @Override
public ReportType getReportType() { public ReportBuilderType getReportType() {
return ReportType.KS_REP_DEPO_REGISTERS; return ReportBuilderType.KS_REP_DEPO_REGISTERS;
} }
@Override @Override

6
clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/ks/KSRepFirmDetailsReportBuilder.java
View file

@ -11,7 +11,7 @@ import ru.spcex.clearing.reports.reports.CSVReportBuilder;
import ru.spcex.clearing.reports.reports.EmptyParams; import ru.spcex.clearing.reports.reports.EmptyParams;
import ru.spcex.platform.enumeration.CompanySymbol; import ru.spcex.platform.enumeration.CompanySymbol;
import ru.spcex.platform.enumeration.DocumentTypes; import ru.spcex.platform.enumeration.DocumentTypes;
import ru.spcex.platform.enumeration.ReportType; import ru.spcex.platform.enumeration.ReportBuilderType;
import ru.spcex.platform.enumeration.WorkflowStatus; import ru.spcex.platform.enumeration.WorkflowStatus;
import ru.spcex.platform.imdg.api.Imdg; import ru.spcex.platform.imdg.api.Imdg;
import ru.spcex.platform.imdg.api.ImdgProvider; import ru.spcex.platform.imdg.api.ImdgProvider;
@ -56,8 +56,8 @@ public class KSRepFirmDetailsReportBuilder extends CSVReportBuilder<EmptyParams>
} }
@Override @Override
public ReportType getReportType() { public ReportBuilderType getReportType() {
return ReportType.KS_REP_FIRM_DETAILS; return ReportBuilderType.KS_REP_FIRM_DETAILS;
} }
@Override @Override

4
clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/ks/KSRepTradesReportBuilder.java
View file

@ -63,8 +63,8 @@ public class KSRepTradesReportBuilder extends CSVReportBuilder<EmptyParams> {
} }
@Override @Override
public ReportType getReportType() { public ReportBuilderType getReportType() {
return ReportType.KS_REP_TRADES; return ReportBuilderType.KS_REP_TRADES;
} }
@Override @Override

52
clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/ReportService.java
View file

@ -23,7 +23,7 @@ import ru.spcex.clearing.reports.config.element.ReportsServiceSettings;
import ru.spcex.clearing.reports.reports.*; import ru.spcex.clearing.reports.reports.*;
import ru.spcex.clearing.util.security.UserRoleVerification; import ru.spcex.clearing.util.security.UserRoleVerification;
import ru.spcex.clearing.validation.common.ValidationHelper; 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.enumeration.Task;
import ru.spcex.platform.utils.enumeration.IEnumKey; import ru.spcex.platform.utils.enumeration.IEnumKey;
import ru.spcex.platform.utils.validation.IValidator; import ru.spcex.platform.utils.validation.IValidator;
@ -48,13 +48,13 @@ public class ReportService extends QueueConsumer implements InitializingBean {
private final Function<LauncherCommandRequest, IValidator> reportRequestGRETValidator; private final Function<LauncherCommandRequest, IValidator> reportRequestGRETValidator;
private final Function<LauncherCommandRequest, IValidator> reportRequestGREFValidator; private final Function<LauncherCommandRequest, IValidator> reportRequestGREFValidator;
private final Map<ReportType, List<CSVReportBuilder<EmptyParams>>> reportBuildersWithoutParams; private final Map<ReportBuilderType, List<CSVReportBuilder<EmptyParams>>> reportBuildersWithoutParams;
private final Map<ReportType, List<CSVReportBuilder<SessionIdParam>>> reportBuildersWithSessionIdParam; private final Map<ReportBuilderType, List<CSVReportBuilder<SessionIdParam>>> reportBuildersWithSessionIdParam;
private final Map<ReportType, List<CSVReportBuilder<SessionIdListParams>>> reportBuildersWithSessionIdListParam; private final Map<ReportBuilderType, List<CSVReportBuilder<SessionIdListParams>>> reportBuildersWithSessionIdListParam;
private final Map<ReportType, List<CSVReportBuilder<PeriodParams>>> reportBuildersWithPeriodParams; private final Map<ReportBuilderType, List<CSVReportBuilder<PeriodParams>>> reportBuildersWithPeriodParams;
private final Map<ReportType, List<CSVReportBuilder<?>>> reportBuildersForGREP; private final Map<ReportBuilderType, List<CSVReportBuilder<?>>> reportBuildersForGREP;
private final Map<ReportType, List<CSVReportBuilder<?>>> reportBuildersForGREF; private final Map<ReportBuilderType, List<CSVReportBuilder<?>>> reportBuildersForGREF;
private final Map<ReportType, List<CSVReportBuilder<?>>> reportBuildersForGRET; private final Map<ReportBuilderType, List<CSVReportBuilder<?>>> reportBuildersForGRET;
private final File outFolder; private final File outFolder;
@ -66,20 +66,20 @@ public class ReportService extends QueueConsumer implements InitializingBean {
ReportsServiceSettings reportsServiceSettings, ReportsServiceSettings reportsServiceSettings,
@Qualifier("reportBuildersWithoutParams") @Qualifier("reportBuildersWithoutParams")
Map<ReportType, List<CSVReportBuilder<EmptyParams>>> reportBuildersWithoutParams, Map<ReportBuilderType, List<CSVReportBuilder<EmptyParams>>> reportBuildersWithoutParams,
@Qualifier("reportBuildersWithSessionIdParam") @Qualifier("reportBuildersWithSessionIdParam")
Map<ReportType, List<CSVReportBuilder<SessionIdParam>>> reportBuildersWithSessionIdParam, Map<ReportBuilderType, List<CSVReportBuilder<SessionIdParam>>> reportBuildersWithSessionIdParam,
@Qualifier("reportBuildersWithSessionIdListParam") @Qualifier("reportBuildersWithSessionIdListParam")
Map<ReportType, List<CSVReportBuilder<SessionIdListParams>>> reportBuildersWithSessionIdListParam, Map<ReportBuilderType, List<CSVReportBuilder<SessionIdListParams>>> reportBuildersWithSessionIdListParam,
@Qualifier("reportBuildersWithPeriodParams") @Qualifier("reportBuildersWithPeriodParams")
Map<ReportType, List<CSVReportBuilder<PeriodParams>>> reportBuildersWithPeriodParams, Map<ReportBuilderType, List<CSVReportBuilder<PeriodParams>>> reportBuildersWithPeriodParams,
@Qualifier("reportBuildersForGREP") @Qualifier("reportBuildersForGREP")
Map<ReportType, List<CSVReportBuilder<?>>> reportBuildersForGREP, Map<ReportBuilderType, List<CSVReportBuilder<?>>> reportBuildersForGREP,
@Qualifier("reportBuildersForGREF") @Qualifier("reportBuildersForGREF")
Map<ReportType, List<CSVReportBuilder<?>>> reportBuildersForGREF, Map<ReportBuilderType, List<CSVReportBuilder<?>>> reportBuildersForGREF,
@Qualifier("reportBuildersForGRET") @Qualifier("reportBuildersForGRET")
Map<ReportType, List<CSVReportBuilder<?>>> reportBuildersForGRET, Map<ReportBuilderType, List<CSVReportBuilder<?>>> reportBuildersForGRET,
@Qualifier("reportRequestValidator") @Qualifier("reportRequestValidator")
Function<ReportRequest, IValidator> reportRequestValidator, Function<ReportRequest, IValidator> reportRequestValidator,
@ -161,7 +161,7 @@ public class ReportService extends QueueConsumer implements InitializingBean {
log.debug("Create report type {}...", req.getReportId()); log.debug("Create report type {}...", req.getReportId());
List<CSVReportBuilder<EmptyParams>> builders = reportBuildersWithoutParams.get( List<CSVReportBuilder<EmptyParams>> builders = reportBuildersWithoutParams.get(
IEnumKey.getEnumByKey(ReportType.class, req.getReportId()) IEnumKey.getEnumByKey(ReportBuilderType.class, req.getReportId())
); );
List<String> outFilenames = new ArrayList<>(); List<String> outFilenames = new ArrayList<>();
for (CSVReportBuilder<EmptyParams> builder : builders) { for (CSVReportBuilder<EmptyParams> builder : builders) {
@ -196,7 +196,7 @@ public class ReportService extends QueueConsumer implements InitializingBean {
log.debug("Create report type {}...", req.getReportId()); log.debug("Create report type {}...", req.getReportId());
List<CSVReportBuilder<SessionIdParam>> builders = reportBuildersWithSessionIdParam.get( List<CSVReportBuilder<SessionIdParam>> builders = reportBuildersWithSessionIdParam.get(
IEnumKey.getEnumByKey(ReportType.class, req.getReportId()) IEnumKey.getEnumByKey(ReportBuilderType.class, req.getReportId())
); );
List<String> outFilenames = new ArrayList<>(); List<String> outFilenames = new ArrayList<>();
for (CSVReportBuilder<SessionIdParam> builder : builders) { for (CSVReportBuilder<SessionIdParam> builder : builders) {
@ -233,7 +233,7 @@ public class ReportService extends QueueConsumer implements InitializingBean {
log.debug("Create report type {}...", req.getReportId()); log.debug("Create report type {}...", req.getReportId());
List<CSVReportBuilder<SessionIdListParams>> builders = reportBuildersWithSessionIdListParam.get( List<CSVReportBuilder<SessionIdListParams>> builders = reportBuildersWithSessionIdListParam.get(
IEnumKey.getEnumByKey(ReportType.class, req.getReportId()) IEnumKey.getEnumByKey(ReportBuilderType.class, req.getReportId())
); );
List<String> outFilenames = new ArrayList<>(); List<String> outFilenames = new ArrayList<>();
for (CSVReportBuilder<SessionIdListParams> builder : builders) { for (CSVReportBuilder<SessionIdListParams> builder : builders) {
@ -270,7 +270,7 @@ public class ReportService extends QueueConsumer implements InitializingBean {
log.debug("Create report type {}...", req.getReportId()); log.debug("Create report type {}...", req.getReportId());
List<CSVReportBuilder<PeriodParams>> builders = reportBuildersWithPeriodParams.get( List<CSVReportBuilder<PeriodParams>> builders = reportBuildersWithPeriodParams.get(
IEnumKey.getEnumByKey(ReportType.class, req.getReportId()) IEnumKey.getEnumByKey(ReportBuilderType.class, req.getReportId())
); );
List<String> outFilenames = new ArrayList<>(); List<String> outFilenames = new ArrayList<>();
for (CSVReportBuilder<PeriodParams> builder : builders) { for (CSVReportBuilder<PeriodParams> builder : builders) {
@ -303,7 +303,7 @@ public class ReportService extends QueueConsumer implements InitializingBean {
logUnknownProperties(userRequest); logUnknownProperties(userRequest);
Long sessionId = userRequest.getRequestPayload().getSessionId(); Long sessionId = userRequest.getRequestPayload().getSessionId();
Map<String, ReportType> outFilenames = createReportsForTask(sessionId, reportBuildersForGREP.values()); Map<String, ReportBuilderType> outFilenames = createReportsForTask(sessionId, reportBuildersForGREP.values());
sendReportsToGateway(sessionId, outFilenames, "REPORT_KS_TMP"); sendReportsToGateway(sessionId, outFilenames, "REPORT_KS_TMP");
return null; return null;
@ -319,7 +319,7 @@ public class ReportService extends QueueConsumer implements InitializingBean {
logUnknownProperties(userRequest); logUnknownProperties(userRequest);
Long sessionId = userRequest.getRequestPayload().getSessionId(); Long sessionId = userRequest.getRequestPayload().getSessionId();
Map<String, ReportType> outFilenames = createReportsForTask(sessionId, reportBuildersForGRET.values()); Map<String, ReportBuilderType> outFilenames = createReportsForTask(sessionId, reportBuildersForGRET.values());
sendReportsToGateway(sessionId, outFilenames, null); sendReportsToGateway(sessionId, outFilenames, null);
return null; return null;
@ -335,14 +335,14 @@ public class ReportService extends QueueConsumer implements InitializingBean {
logUnknownProperties(userRequest); logUnknownProperties(userRequest);
Long sessionId = userRequest.getRequestPayload().getSessionId(); Long sessionId = userRequest.getRequestPayload().getSessionId();
Map<String, ReportType> outFilenames = createReportsForTask(sessionId, reportBuildersForGREF.values()); Map<String, ReportBuilderType> outFilenames = createReportsForTask(sessionId, reportBuildersForGREF.values());
sendReportsToGateway(sessionId, outFilenames, "REPORT_KS_FINAL"); sendReportsToGateway(sessionId, outFilenames, "REPORT_KS_FINAL");
return null; return null;
} }
private Map<String, ReportType> createReportsForTask(Long sessionId, Collection<List<CSVReportBuilder<?>>> buildersForTask) { private Map<String, ReportBuilderType> createReportsForTask(Long sessionId, Collection<List<CSVReportBuilder<?>>> buildersForTask) {
Map<String, ReportType> outFilenames = new HashMap<>(); Map<String, ReportBuilderType> outFilenames = new HashMap<>();
int cntErrors = 0; int cntErrors = 0;
LocalDate now = LocalDate.now(); LocalDate now = LocalDate.now();
for (List<CSVReportBuilder<?>> builders : buildersForTask) { for (List<CSVReportBuilder<?>> builders : buildersForTask) {
@ -395,12 +395,12 @@ public class ReportService extends QueueConsumer implements InitializingBean {
return outFilenames; return outFilenames;
} }
private void sendReportsToGateway(Long sessionId, Map<String, ReportType> reportsWithReportType, String type) { private void sendReportsToGateway(Long sessionId, Map<String, ReportBuilderType> reportsWithReportType, String type) {
SendReportRequest sendReportRequest = new SendReportRequest(); SendReportRequest sendReportRequest = new SendReportRequest();
sendReportRequest.setSessionId(sessionId); sendReportRequest.setSessionId(sessionId);
sendReportRequest.setType(type); sendReportRequest.setType(type);
List<ReportPart> reports = new ArrayList<>(reportsWithReportType.size()); List<ReportPart> reports = new ArrayList<>(reportsWithReportType.size());
for (Map.Entry<String, ReportType> entry : reportsWithReportType.entrySet()) { for (Map.Entry<String, ReportBuilderType> entry : reportsWithReportType.entrySet()) {
ReportPart reportPart = new ReportPart(); ReportPart reportPart = new ReportPart();
reportPart.setReportType(entry.getValue().getKey()); reportPart.setReportType(entry.getValue().getKey());
reportPart.setFileName(entry.getKey()); reportPart.setFileName(entry.getKey());

22
clearing-parent/reports-service/src/test/java/ru/spcex/clearing/reports/services/ReportServiceTest_BP.java
View file

@ -182,7 +182,7 @@ public class ReportServiceTest_BP {
final Long oldSessionIdFond = testExecutionFond.getSessionId(); final Long oldSessionIdFond = testExecutionFond.getSessionId();
ReportRequestWithSessionId reportRequestWithSessionId = new ReportRequestWithSessionId(); ReportRequestWithSessionId reportRequestWithSessionId = new ReportRequestWithSessionId();
reportRequestWithSessionId.setReportId(ReportType.OPERATIONAL_LIABILITIES_CLAIMS.getKey()); reportRequestWithSessionId.setReportId(ReportBuilderType.OPERATIONAL_LIABILITIES_CLAIMS.getKey());
reportRequestWithSessionId.setSessionId(TEST_SESSION_ID_1); reportRequestWithSessionId.setSessionId(TEST_SESSION_ID_1);
testExecutionDeposit.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 { public void createReportTest_PERIOD_LIABILITIES_CLAIMS() throws CsvValidationException, IOException {
clearTestDir(); clearTestDir();
ReportRequestWithSessionIdList reportRequestWithPeriod = new ReportRequestWithSessionIdList(); 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())); reportRequestWithPeriod.setSessionIdList(Arrays.asList(testExecutionDeposit.getSessionId(), testExecutionFond.getSessionId()));
String jsonString = TestUtils.getJsonStringForSystem(reportRequestWithPeriod, 0L); String jsonString = TestUtils.getJsonStringForSystem(reportRequestWithPeriod, 0L);
@ -242,7 +242,7 @@ public class ReportServiceTest_BP {
public void createReportTest_SUMMARY_LIABILITIES_CLAIMS() throws CsvValidationException, IOException { public void createReportTest_SUMMARY_LIABILITIES_CLAIMS() throws CsvValidationException, IOException {
clearTestDir(); clearTestDir();
ReportRequest reportRequest = new ReportRequest(); ReportRequest reportRequest = new ReportRequest();
reportRequest.setReportId(ReportType.SUMMARY_LIABILITIES_CLAIMS.getKey()); reportRequest.setReportId(ReportBuilderType.SUMMARY_LIABILITIES_CLAIMS.getKey());
String jsonString = TestUtils.getJsonStringForSystem(reportRequest, 0L); String jsonString = TestUtils.getJsonStringForSystem(reportRequest, 0L);
TestUtils.addRecordToKafka((MockConsumer) reportService.getConsumer(), TestUtils.addRecordToKafka((MockConsumer) reportService.getConsumer(),
@ -272,7 +272,7 @@ public class ReportServiceTest_BP {
registryImdg.update(testRegistry_2); registryImdg.update(testRegistry_2);
ReportRequestWithSessionId reportRequest = new ReportRequestWithSessionId(); ReportRequestWithSessionId reportRequest = new ReportRequestWithSessionId();
reportRequest.setReportId(ReportType.OPERATIONAL_MONEY_CHANGE.getKey()); reportRequest.setReportId(ReportBuilderType.OPERATIONAL_MONEY_CHANGE.getKey());
reportRequest.setSessionId(TEST_SESSION_ID_3); reportRequest.setSessionId(TEST_SESSION_ID_3);
String jsonString = TestUtils.getJsonStringForSystem(reportRequest, 0L); String jsonString = TestUtils.getJsonStringForSystem(reportRequest, 0L);
@ -301,7 +301,7 @@ public class ReportServiceTest_BP {
public void createReportTest_PERIOD_MONEY_CHANGE() throws CsvValidationException, IOException { public void createReportTest_PERIOD_MONEY_CHANGE() throws CsvValidationException, IOException {
clearTestDir(); clearTestDir();
ReportRequestWithPeriod reportRequest = new ReportRequestWithPeriod(); 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.setStartDate(TEST_START_CLEARING_DATE);
reportRequest.setEndDate(TEST_END_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 { public void createReportTest_SUMMARY_MONEY_CHANGE() throws CsvValidationException, IOException {
clearTestDir(); clearTestDir();
ReportRequest reportRequest = new ReportRequest(); ReportRequest reportRequest = new ReportRequest();
reportRequest.setReportId(ReportType.SUMMARY_MONEY_CHANGE.getKey()); reportRequest.setReportId(ReportBuilderType.SUMMARY_MONEY_CHANGE.getKey());
TestUtils.clearAllInImdg(registryImdg); TestUtils.clearAllInImdg(registryImdg);
registryImdg.insert(testRegistry_1); registryImdg.insert(testRegistry_1);
registryImdg.insert(testRegistry_2); 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()); File expectedEmptyFile = new File(getClass().getClassLoader().getResource("expected_reports_csv/bp/KS_BR_PFX64_empty_expected.csv").getFile());
ReportRequestWithSessionId reportRequest = new ReportRequestWithSessionId(); ReportRequestWithSessionId reportRequest = new ReportRequestWithSessionId();
reportRequest.setReportId(ReportType.EXECUTED_DEAL_REPORT.getKey()); reportRequest.setReportId(ReportBuilderType.EXECUTED_DEAL_REPORT.getKey());
reportRequest.setSessionId(TEST_SESSION_ID_3); reportRequest.setSessionId(TEST_SESSION_ID_3);
final Long oldExecutionFondSessionId = testExecutionFond.getSessionId(); 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()); File expectedEmptyFile = new File(getClass().getClassLoader().getResource("expected_reports_csv/bp/KS_BR_PFX64_empty_expected.csv").getFile());
ReportRequestWithSessionId reportRequest = new ReportRequestWithSessionId(); ReportRequestWithSessionId reportRequest = new ReportRequestWithSessionId();
reportRequest.setReportId(ReportType.EXECUTED_DEAL_REPORT.getKey()); reportRequest.setReportId(ReportBuilderType.EXECUTED_DEAL_REPORT.getKey());
reportRequest.setSessionId(TEST_SESSION_ID_3); reportRequest.setSessionId(TEST_SESSION_ID_3);
final Long oldExecutionFondSessionId = testExecutionFond.getSessionId(); 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()); File expectedEmptyFile = new File(getClass().getClassLoader().getResource("expected_reports_csv/bp/KS_BR_PFX64_empty_expected.csv").getFile());
ReportRequestWithSessionId reportRequest = new ReportRequestWithSessionId(); ReportRequestWithSessionId reportRequest = new ReportRequestWithSessionId();
reportRequest.setReportId(ReportType.EXECUTED_DEAL_REPORT.getKey()); reportRequest.setReportId(ReportBuilderType.EXECUTED_DEAL_REPORT.getKey());
reportRequest.setSessionId(TEST_SESSION_ID_3); reportRequest.setSessionId(TEST_SESSION_ID_3);
final Long oldExecutionFondSessionId = testExecutionFond.getSessionId(); 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()); File expectedEmptyFile = new File(getClass().getClassLoader().getResource("expected_reports_csv/bp/KS_BR_PFX64_empty_expected.csv").getFile());
ReportRequestWithSessionId reportRequest = new ReportRequestWithSessionId(); ReportRequestWithSessionId reportRequest = new ReportRequestWithSessionId();
reportRequest.setReportId(ReportType.EXECUTED_DEAL_REPORT.getKey()); reportRequest.setReportId(ReportBuilderType.EXECUTED_DEAL_REPORT.getKey());
reportRequest.setSessionId(TEST_SESSION_ID_3); reportRequest.setSessionId(TEST_SESSION_ID_3);
final Long oldExecutionFondSessionId = testExecutionFond.getSessionId(); final Long oldExecutionFondSessionId = testExecutionFond.getSessionId();
@ -570,7 +570,7 @@ public class ReportServiceTest_BP {
clearTestDir(); clearTestDir();
ReportRequestWithSessionId reportRequest = new ReportRequestWithSessionId(); ReportRequestWithSessionId reportRequest = new ReportRequestWithSessionId();
reportRequest.setReportId(ReportType.UNFULFILLED_DEAL_REPORT.getKey()); reportRequest.setReportId(ReportBuilderType.UNFULFILLED_DEAL_REPORT.getKey());
reportRequest.setSessionId(TEST_SESSION_ID_3); reportRequest.setSessionId(TEST_SESSION_ID_3);
final Long oldExecutionFondSessionId = testExecutionFond.getSessionId(); final Long oldExecutionFondSessionId = testExecutionFond.getSessionId();

16
clearing-parent/reports-service/src/test/java/ru/spcex/clearing/reports/services/ReportServiceTest_KS.java
View file

@ -118,7 +118,7 @@ public class ReportServiceTest_KS {
clearTestDir(); clearTestDir();
ReportRequest reportRequest = new ReportRequest(); 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 registryCodeDictionary = new RegistryCodeDictionary();
registryCodeDictionary.setCode("AM_T"); registryCodeDictionary.setCode("AM_T");
@ -167,7 +167,7 @@ public class ReportServiceTest_KS {
clearTestDir(); clearTestDir();
ReportRequest reportRequest = new ReportRequest(); 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 registry_1 = new Registry();
registry_1.setCompanyId(COMPANY_ID); registry_1.setCompanyId(COMPANY_ID);
@ -205,7 +205,7 @@ public class ReportServiceTest_KS {
clearTestDir(); clearTestDir();
ReportRequest reportRequest = new ReportRequest(); 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 registryCodeDictionary = new RegistryCodeDictionary();
registryCodeDictionary.setCode("AS_T"); registryCodeDictionary.setCode("AS_T");
@ -254,7 +254,7 @@ public class ReportServiceTest_KS {
clearTestDir(); clearTestDir();
ReportRequest reportRequest = new ReportRequest(); 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 registry_1 = new Registry();
registry_1.setCompanyId(COMPANY_ID); registry_1.setCompanyId(COMPANY_ID);
@ -293,7 +293,7 @@ public class ReportServiceTest_KS {
clearTestDir(); clearTestDir();
ReportRequest reportRequest = new ReportRequest(); ReportRequest reportRequest = new ReportRequest();
reportRequest.setReportId(ReportType.KS_REP_TRADES.getKey()); reportRequest.setReportId(ReportBuilderType.KS_REP_TRADES.getKey());
Session session_1 = new Session(); Session session_1 = new Session();
session_1.setCreated(Instant.ofEpochMilli(LocalDateTime.of(2023, 6, 30, 0, 0, 0).toEpochSecond(ZoneOffset.UTC))); 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); Long sessionId = sessionImdg.insert(session);
ReportRequestWithSessionId reportRequest = new ReportRequestWithSessionId(); ReportRequestWithSessionId reportRequest = new ReportRequestWithSessionId();
reportRequest.setReportId(ReportType.KS_REP_CASH_NETTO.getKey()); reportRequest.setReportId(ReportBuilderType.KS_REP_CASH_NETTO.getKey());
reportRequest.setSessionId(sessionId); reportRequest.setSessionId(sessionId);
Registry registry_1 = new Registry(); Registry registry_1 = new Registry();
@ -431,7 +431,7 @@ public class ReportServiceTest_KS {
Long sessionId = sessionImdg.insert(session); Long sessionId = sessionImdg.insert(session);
ReportRequestWithSessionId reportRequest = new ReportRequestWithSessionId(); ReportRequestWithSessionId reportRequest = new ReportRequestWithSessionId();
reportRequest.setReportId(ReportType.KS_REP_DEPO_NETTO.getKey()); reportRequest.setReportId(ReportBuilderType.KS_REP_DEPO_NETTO.getKey());
reportRequest.setSessionId(sessionId); reportRequest.setSessionId(sessionId);
Registry registry_1 = new Registry(); Registry registry_1 = new Registry();
@ -491,7 +491,7 @@ public class ReportServiceTest_KS {
clearTestDir(); clearTestDir();
ReportRequest reportRequest = new ReportRequest(); ReportRequest reportRequest = new ReportRequest();
reportRequest.setReportId(ReportType.KS_REP_FIRM_DETAILS.getKey()); reportRequest.setReportId(ReportBuilderType.KS_REP_FIRM_DETAILS.getKey());
Collection<Company> oldCompanies = companyImdg.getAllValues(); Collection<Company> oldCompanies = companyImdg.getAllValues();
for (Company company : oldCompanies) { for (Company company : oldCompanies) {

4
platform-parent/platform-enum/src/main/java/ru/spcex/platform/enumeration/ReportType.java → platform-parent/platform-enum/src/main/java/ru/spcex/platform/enumeration/ReportBuilderType.java
View file

@ -6,7 +6,7 @@ import ru.spcex.platform.utils.enumeration.IEnumKey;
* Идентификатор отчета * Идентификатор отчета
* todo сделать для них dictionary * todo сделать для них dictionary
*/ */
public enum ReportType implements IEnumKey { public enum ReportBuilderType implements IEnumKey {
OPERATIONAL_LIABILITIES_CLAIMS("operational-liabilities-claims"), OPERATIONAL_LIABILITIES_CLAIMS("operational-liabilities-claims"),
OPERATIONAL_MONEY_CHANGE("operational-money-change"), OPERATIONAL_MONEY_CHANGE("operational-money-change"),
SUMMARY_LIABILITIES_CLAIMS("summary-liabilities-claims"), SUMMARY_LIABILITIES_CLAIMS("summary-liabilities-claims"),
@ -29,7 +29,7 @@ public enum ReportType implements IEnumKey {
private final String key; private final String key;
ReportType(String key) { ReportBuilderType(String key) {
this.key = key; this.key = key;
} }

6
platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/gateway/SendReportRequest.java
View file

@ -6,13 +6,13 @@ import java.util.List;
public class SendReportRequest { public class SendReportRequest {
@JsonProperty @JsonProperty
public Long sessionId; private Long sessionId;
@JsonProperty @JsonProperty
public String type; private String type;
@JsonProperty @JsonProperty
public List<ReportPart> reports; private List<ReportPart> reports;
public Long getSessionId() { public Long getSessionId() {
return sessionId; return sessionId;

4
platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/reports/ReportRequest.java
View file

@ -1,7 +1,7 @@
package ru.spcex.clearing.platform.messaging.domain.cud.reports; package ru.spcex.clearing.platform.messaging.domain.cud.reports;
import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonProperty;
import ru.spcex.platform.enumeration.ReportType; import ru.spcex.platform.enumeration.ReportBuilderType;
/** /**
* Запрос отчёта (без параметров) report-service * Запрос отчёта (без параметров) report-service
@ -9,7 +9,7 @@ import ru.spcex.platform.enumeration.ReportType;
public class ReportRequest { public class ReportRequest {
/** /**
* Идентификатор отчёта * Идентификатор отчёта
* см. {@link ReportType} * см. {@link ReportBuilderType}
*/ */
@JsonProperty @JsonProperty
public String reportId; public String reportId;