From 70f0e4b9e5db20652cad96d943caae787201a736 Mon Sep 17 00:00:00 2001 From: etreschenkov Date: Wed, 9 Jul 2025 17:18:01 +0300 Subject: [PATCH] fix unit session --- .gitlab-ci.yml | 2 +- ...entAndObligationCreationCompoundAction.java | 18 +++--------------- 2 files changed, 4 insertions(+), 16 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 4687ced73..78311f2f4 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -17,7 +17,7 @@ preflight: stage: preflight script: - pwd - - git clone -b only_9.0_unit "http://gitlab-ci-token:$ACCESS_TOKEN@git.mfd.msk/mfd/clearing_test.git" + - git clone -b successful_set_export_fixed "http://gitlab-ci-token:$ACCESS_TOKEN@git.mfd.msk/mfd/clearing_test.git" artifacts: name: "$CI_COMMIT_REF_NAME" expire_in: 1 day diff --git a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/state/action/RequirementAndObligationCreationCompoundAction.java b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/state/action/RequirementAndObligationCreationCompoundAction.java index fe01e3ffb..e410ee60d 100644 --- a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/state/action/RequirementAndObligationCreationCompoundAction.java +++ b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/state/action/RequirementAndObligationCreationCompoundAction.java @@ -59,21 +59,9 @@ public class RequirementAndObligationCreationCompoundAction extends RequirementA ); if (pair == null) continue; log.info("Pair is not null with execType: {}", pair.getFirst().type()); - if (pair.getFirst().type().equals(ExecutionType.ExecutionFond)) { - log.info("Match ExecutionFond; index before: {}", ief[0]); - ief[0] += 2; - log.info("index after: {}", ief[0]); - } - if (pair.getFirst().type().equals(ExecutionType.ExecutionDeposit)) { - log.info("Match ExecutionDeposit; index before: {}", ied[0]); - ied[0] += 2; - log.info("index after: {}", ied[0]); - } - if (pair.getFirst().type().equals(ExecutionType.ExecutionCurrency)) { - log.info("Match ExecutionCurrency; index before: {}", iec[0]); - iec[0] += 2; - log.info("index after: {}", iec[0]); - } + if (pair.getFirst().type().equals(ExecutionType.ExecutionFond)) ief[0] += 2; + if (pair.getFirst().type().equals(ExecutionType.ExecutionDeposit)) ied[0] += 2; + if (pair.getFirst().type().equals(ExecutionType.ExecutionCurrency)) iec[0] += 2; pair.map(f -> tmpList.set(0, f), s -> tmpList.set(1, s)); createRegisters(tmpList, sessionId, newRgss); }