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

http://jira.mfd.msk:8088/browse/CLS-497 rename property

Browse source
This commit is contained in:
akulikov 2023-10-04 18:37:41 +03:00
parent a9ef98f4da
commit 98523cf528
8 changed files with 13 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/builders/bp/ExecutedDealReportBuilder_INFTYPE_1.java
View file

@ -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]))
)
);
}

2
clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/builders/bp/ExecutedDealReportBuilder_INFTYPE_2.java
View file

@ -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]))
)
);
}

2
clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/builders/bp/ExecutedDealReportBuilder_INFTYPE_3.java
View file

@ -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]))
)
);
}

2
clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/builders/bp/ExecutedDealReportBuilder_INFTYPE_4.java
View file

@ -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]))
)
);
}

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

@ -67,7 +67,7 @@ public class UnfulfilledDealReportBuilder extends CSVReportBuilder<SessionIdPara
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]))
);
Collection<ExecutionFond> executionFonds = executionFondImdg.getCollectionObjectsByPredicate(predicate);
log.debug("Found {} ExecutionFond by query: {}", executionFonds.size(), predicate);

12
clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/config/settings/ReportsServiceSettings.java
View file

@ -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<String> bfxClassCodes;
@Value("#{'${reports-service.reports.pfx-class-codes}'.split('\\s*,\\s*')}")
private List<String> pfxClassCodes;
public HazelcastClientParams getHazelcast() {
@ -64,11 +64,11 @@ public class ReportsServiceSettings {
this.notificationsStore = notificationsStore;
}
public List<String> getBfxClassCodes() {
return bfxClassCodes;
public List<String> getPfxClassCodes() {
return pfxClassCodes;
}
public void setBfxClassCodes(List<String> bfxClassCodes) {
this.bfxClassCodes = bfxClassCodes;
public void setPfxClassCodes(List<String> pfxClassCodes) {
this.pfxClassCodes = pfxClassCodes;
}
}

2
clearing-parent/reports-service/src/main/resources/application.properties
View file

@ -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

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

@ -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);