diff --git a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/builders/bp/ExecutedDealReportBuilder_INFTYPE_1.java b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/builders/bp/ExecutedDealReportBuilder_INFTYPE_1.java index 6683d6656..c38c71119 100644 --- a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/builders/bp/ExecutedDealReportBuilder_INFTYPE_1.java +++ b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/builders/bp/ExecutedDealReportBuilder_INFTYPE_1.java @@ -45,7 +45,7 @@ public class ExecutedDealReportBuilder_INFTYPE_1 extends ExecutedDealReportBuild pb.equals("side", MoneyFlowSide.SELL.getKey()) ), pb.equals("coverageStatus", CoverageStatus.ALWD), - pb.in("market", reportsServiceSettings.getBfxClassCodes().toArray(new String[0])) + pb.in("market", reportsServiceSettings.getPfxClassCodes().toArray(new String[0])) ) ); } diff --git a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/builders/bp/ExecutedDealReportBuilder_INFTYPE_2.java b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/builders/bp/ExecutedDealReportBuilder_INFTYPE_2.java index 18a61c9f6..35e633720 100644 --- a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/builders/bp/ExecutedDealReportBuilder_INFTYPE_2.java +++ b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/builders/bp/ExecutedDealReportBuilder_INFTYPE_2.java @@ -45,7 +45,7 @@ public class ExecutedDealReportBuilder_INFTYPE_2 extends ExecutedDealReportBuild pb.equals("side", MoneyFlowSide.SELL.getKey()) ), pb.equals("coverageStatus", CoverageStatus.ALWD), - pb.in("market", reportsServiceSettings.getBfxClassCodes().toArray(new String[0])) + pb.in("market", reportsServiceSettings.getPfxClassCodes().toArray(new String[0])) ) ); } diff --git a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/builders/bp/ExecutedDealReportBuilder_INFTYPE_3.java b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/builders/bp/ExecutedDealReportBuilder_INFTYPE_3.java index 353ed7aac..b4303b21d 100644 --- a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/builders/bp/ExecutedDealReportBuilder_INFTYPE_3.java +++ b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/builders/bp/ExecutedDealReportBuilder_INFTYPE_3.java @@ -41,7 +41,7 @@ public class ExecutedDealReportBuilder_INFTYPE_3 extends ExecutedDealReportBuild pb.equals("side", Side.SELL.getKey()), pb.equals("side", MoneyFlowSide.SELL.getKey()) ), - pb.in("market", reportsServiceSettings.getBfxClassCodes().toArray(new String[0])) + pb.in("market", reportsServiceSettings.getPfxClassCodes().toArray(new String[0])) ) ); } diff --git a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/builders/bp/ExecutedDealReportBuilder_INFTYPE_4.java b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/builders/bp/ExecutedDealReportBuilder_INFTYPE_4.java index 708879772..2d270e0f2 100644 --- a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/builders/bp/ExecutedDealReportBuilder_INFTYPE_4.java +++ b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/builders/bp/ExecutedDealReportBuilder_INFTYPE_4.java @@ -43,7 +43,7 @@ public class ExecutedDealReportBuilder_INFTYPE_4 extends ExecutedDealReportBuild pb.equals("side", Side.SELL.getKey()), pb.equals("side", MoneyFlowSide.SELL.getKey()) ), - pb.in("market", reportsServiceSettings.getBfxClassCodes().toArray(new String[0])) + pb.in("market", reportsServiceSettings.getPfxClassCodes().toArray(new String[0])) ) ); } diff --git a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/builders/bp/UnfulfilledDealReportBuilder.java b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/builders/bp/UnfulfilledDealReportBuilder.java index d7a2dac33..ce17130d2 100644 --- a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/builders/bp/UnfulfilledDealReportBuilder.java +++ b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/builders/bp/UnfulfilledDealReportBuilder.java @@ -67,7 +67,7 @@ public class UnfulfilledDealReportBuilder extends CSVReportBuilder executionFonds = executionFondImdg.getCollectionObjectsByPredicate(predicate); log.debug("Found {} ExecutionFond by query: {}", executionFonds.size(), predicate); diff --git a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/config/settings/ReportsServiceSettings.java b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/config/settings/ReportsServiceSettings.java index 2414d091c..160a3f9ae 100644 --- a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/config/settings/ReportsServiceSettings.java +++ b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/config/settings/ReportsServiceSettings.java @@ -20,8 +20,8 @@ public class ReportsServiceSettings { private Store reportsStore; private Store notificationsStore; - @Value("#{'${reports-service.reports.bfx-class-codes}'.split('\\s*,\\s*')}") - private List bfxClassCodes; + @Value("#{'${reports-service.reports.pfx-class-codes}'.split('\\s*,\\s*')}") + private List pfxClassCodes; public HazelcastClientParams getHazelcast() { @@ -64,11 +64,11 @@ public class ReportsServiceSettings { this.notificationsStore = notificationsStore; } - public List getBfxClassCodes() { - return bfxClassCodes; + public List getPfxClassCodes() { + return pfxClassCodes; } - public void setBfxClassCodes(List bfxClassCodes) { - this.bfxClassCodes = bfxClassCodes; + public void setPfxClassCodes(List pfxClassCodes) { + this.pfxClassCodes = pfxClassCodes; } } diff --git a/clearing-parent/reports-service/src/main/resources/application.properties b/clearing-parent/reports-service/src/main/resources/application.properties index 1cc28acc5..75eab238c 100644 --- a/clearing-parent/reports-service/src/main/resources/application.properties +++ b/clearing-parent/reports-service/src/main/resources/application.properties @@ -33,4 +33,4 @@ reports-service.notifications-store.server-ip=10.230.238.53 reports-service.notifications-store.server-port=2222 reports-service.notifications-store.delete-after-send=true -reports-service.reports.bfx-class-codes=BKVC,SKVC,UKVC,NKVC,DKVC,BMVC,SMVC,UMVC,DMVC,MMVC,BMFC,SMFC,UMFC,DMFC,MMFC,BMMC,SMMC,UMMC,DMMC,MMMC,BMIC,SMIC,UMIC,DMIC,MMIC +reports-service.reports.pfx-class-codes=BKVC,SKVC,UKVC,NKVC,DKVC,BMVC,SMVC,UMVC,DMVC,MMVC,BMFC,SMFC,UMFC,DMFC,MMFC,BMMC,SMMC,UMMC,DMMC,MMMC,BMIC,SMIC,UMIC,DMIC,MMIC 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 f7b2f046c..bb242d6dc 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 @@ -477,7 +477,7 @@ public class ReportServiceTest_BP { private void init() { ImdgTestConfig.waitAvailableImdgProviderAndAddAdminWithDefaultId(); - reportsServiceSettings.setBfxClassCodes(List.of("BKVC", "SKVC", "UKVC", "NKVC", "DKVC")); + reportsServiceSettings.setPfxClassCodes(List.of("BKVC", "SKVC", "UKVC", "NKVC", "DKVC")); Long TEST_EXECUTION_FOND_ID = 888L; testExecutionFond.setId(TEST_EXECUTION_FOND_ID);