rollback test set

.gitlab-ci.yml

@@ -17,7 +17,7 @@ preflight:
   stage: preflight
   script:
     - pwd
-    - git clone -b for_state_machine "http://gitlab-ci-token:$ACCESS_TOKEN@git.mfd.msk/mfd/clearing_test.git"
+    - git clone -b successful_set "http://gitlab-ci-token:$ACCESS_TOKEN@git.mfd.msk/mfd/clearing_test.git"
   artifacts:
     name: "$CI_COMMIT_REF_NAME"
     expire_in: 1 day
@@ -63,8 +63,8 @@ test:
     - ls -al
     - docker run --rm -v clr_test_logs_volume:/logs alpine tar -C /logs -cf - . | tar -C artifacts/logs -xf -
     - ls -la artifacts/logs
-#    - echo "Cleaning up log volume"
+    - echo "Cleaning up log volume"
-#    - docker volume rm clr_test_logs_volume
+    - docker volume rm clr_test_logs_volume
   artifacts:
     expire_in: 1 day
     when: always

clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/payment/PaymentInstructionOutboundService.java

@@ -183,9 +183,9 @@ public class PaymentInstructionOutboundService {
         log.debug("PIClearingOutbondActionNewRequest.id={} a__f asset id={}",
             req.getId(),
             assets.map(AssetTrio::a__f).map(Registry::getId).orElse(null));
-        if (assets.isEmpty() || balanceChecker.insufficientBalance(assets.get().a__f(),
+        if (assets.isEmpty() || balanceChecker.insufficientBalance2(assets.get().a__f(),
             tcr.getId(), //never null because validation
-            accCred.getCurrency(),
+            currency,
             amount)) {
             pmt.setTransactionStatus(TransactionStatus.cher.getKey());
             pmt.setUpdated(now);

clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/registry/BalanceChecker.java

@@ -12,6 +12,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
+import ru.clearing.classes.statics.data.misc.Currency;
 import ru.clearing.classes.statics.data.registry.Registry;
 import ru.clearing.classes.statics.data.security.CurrencyPairSecurity;
 import ru.clearing.classes.statics.data.security.Rates;
@@ -21,7 +22,9 @@ import ru.spcex.clearing.imdg.IMDGDistributedNames;
 import static ru.spcex.clearing.util.NumberUtils.safeCast;
 import ru.spcex.platform.classes.base.SpcexObjectBase;
 import ru.spcex.platform.enumeration.RegistryStatus;
+import ru.spcex.platform.enumeration.RegistryTradingParams;
 import static ru.spcex.platform.enumeration.RegistryTradingParams.OM_T;
+import static ru.spcex.platform.enumeration.RegistryTradingParams.TM_T;
 import ru.spcex.platform.enumeration.WorkflowStatus;
 import ru.spcex.platform.imdg.api.Imdg;
 import ru.spcex.platform.imdg.api.ImdgProvider;
@@ -53,6 +56,73 @@ public class BalanceChecker {
         this.balanceCheckOmts = settings.isBalanceCheckOmt();
     }
 
+    public boolean insufficientBalance2(Registry a__f,
+                                        Long tcrId,
+                                        Currency currency,
+                                        BigDecimal amount) {
+        if (!balanceCheckOmts || currency == null) {
+            if (currency == null) {
+                log.error("{}#id={}#balance={} check for amount {}; currency is null",
+                    a__f.getRegistryCode(), a__f.getId(), a__f.getBalance(), amount);
+                return false;
+            } else {
+                log.info("{}#id={}#balance={}#currency={} check for amount {}; OM*T/TM*T checks disabled",
+                    a__f.getRegistryCode(), a__f.getId(), a__f.getBalance(), currency.getCurrencyCode(), amount);
+            }
+            return safeBD(a__f.getBalance()).compareTo(safeBD(amount)) < 0;
+        }
+        log.info("{}#id={}#balance={}#currency={} check for amount {}; OM*T/TM*T checks enabled",
+            a__f.getRegistryCode(), a__f.getId(), a__f.getBalance(), currency.getCurrencyCode(), amount);
+        LocalDate today = LocalDate.now();
+        ImdgPredicateBuilder rgsPb = rgsImdg.predicateBuilder();
+
+        //для поиска ОМ*Т по tcrId, статусу И предикату
+        BiFunction<ImdgPredicate, RegistryTradingParams, ImdgPredicate> rgsAnd = (p, rgsCde) -> rgsPb.and(
+            rgsPb.sql(RegistryCodeSqlBuilder.getInstance(rgsCde).build()),
+            rgsPb.equals("tradingClearingRegistryId", tcrId),
+            rgsPb.or(
+                rgsPb.equals("registryStatus", RegistryStatus.PROC.getKey()),
+                rgsPb.equals("registryStatus", RegistryStatus.MNG.getKey())
+            ),
+            rgsPb.equals("securityId", currency.getId()),
+            p
+        );
+
+        Collection<Registry> tmtToday;
+        {
+            ImdgPredicate tmtPrdct = rgsAnd.apply(
+                rgsPb.equals("settlementDate", today), TM_T
+            );
+            log.debug("searching tmt registries: {}", tmtPrdct);
+            tmtToday = rgsImdg.getCollectionObjectsByPredicate(tmtPrdct);
+        }
+        Collection<Registry> omtsNotToday;
+        {
+            ImdgPredicate omtPrdct = rgsAnd.apply(
+                rgsPb.not(rgsPb.equals("settlementDate", today)), OM_T
+            );
+            log.debug("searching omt registries: {}", omtPrdct);
+            omtsNotToday = rgsImdg.getCollectionObjectsByPredicate(omtPrdct);
+        }
+        log.debug("a__f.id={} balance checking; tmt today: {}, omt !today: {}",
+            a__f.getId(), tmtToday.size(), omtsNotToday.size());
+
+        BigDecimal tmtSum = tmtToday
+            .stream()
+            .map(tmt -> safeBD(tmt.getBalance()))
+            .reduce(BigDecimal.ZERO, BigDecimal::add);
+        BigDecimal omtSum = omtsNotToday
+            .stream()
+            .map(omt -> safeBD(omt.getBalance()))
+            .reduce(BigDecimal.ZERO, BigDecimal::add);
+        BigDecimal a__fBalance = safeBD(a__f.getBalance());
+        BigDecimal compareValue = tmtSum.subtract(omtSum).add(a__fBalance).max(a__fBalance);
+        log.info("{}#id={}#balance={} check; tmt sum: {}; omt sum {}; withdrawal amount: {}; check amount: {}",
+            a__f.getRegistryCode(), a__f.getId(), a__f.getBalance(), tmtSum, omtSum, amount, compareValue
+        );
+        return safeBD(amount).compareTo(compareValue) <= 0;
+    }
+
     public boolean insufficientBalance(Registry a__f,
                                        Long tcrId,
                                        String accCurrency,

clr_test/clearing-all/Dockerfile

@@ -32,6 +32,9 @@ RUN mkdir -p $CLEARING_HOME/files/xml/importer/in
 RUN mkdir -p $CLEARING_HOME/files/xml/importer/out
 RUN mkdir -p $CLEARING_HOME/files/xml/importer/error
 RUN mkdir -p $CLEARING_HOME/files/xml/exporter
+#ARG CLR_TEST_NAME
+#RUN mkdir -p $CLEARING_HOME_BIN/log/$CLR_TEST_NAME
+RUN mkdir -p $CLEARING_HOME_BIN/log_artifacts
 
 WORKDIR $CLEARING_HOME
 RUN sed -i 's/\r$//' $CLEARING_HOME/*.sh

clr_test/clearing-all/launch_and_test.sh

@@ -16,6 +16,18 @@ sleep 30
 echo Run clearing-tester
 sh ./clearing_testing_utils/clearing-tester/clearing-tester.sh
 
+if [ -n "$CLR_TEST_NAME" ] && [ -d "./bin/log" ]; then
+    echo "Copying logs to ./bin/log_artifacts/${CLR_TEST_NAME}"
+    # Copy all contents from ./bin/log to tmp dir
+    mkdir -p "./bin/tmp_log_artifact"
+    cp -a ./bin/log/. "./bin/tmp_log_artifact/"
+     # Move the copied logs into the artifact location
+    mkdir -p "./bin/log_artifacts/${CLR_TEST_NAME}"
+    mv ./bin/tmp_log_artifact/* "./bin/log_artifacts/${CLR_TEST_NAME}"
+else
+    echo "CLR_TEST_NAME is not set or ./bin/log does not exist. Skipping log copy."
+fi
+
 if [ $? -eq 0 ]
 then
   echo "Tests passed successfully"

clr_test/docker-compose.yml

@@ -19,7 +19,12 @@ services:
       retries: 100
 
   clearing_system:
-    build: ./clearing-all
+    build:
+      context: ./clearing-all
+      args:
+        CLR_TEST_NAME: ${CLR_TEST_NAME}
+    environment:
+      - CLR_TEST_NAME=${CLR_TEST_NAME}
     depends_on:
       db:
         condition: service_healthy
@@ -35,7 +40,7 @@ services:
       - "8080:8080"
     volumes:
       - ./mnt/results:/opt/clearing/clearing_testing_utils/store/results
-      - logs_volume:/opt/clearing/bin/log
+      - logs_volume:/opt/clearing/bin/log_artifacts
       - ./mnt/logs/tester:/opt/clearing/clearing_testing_utils/clearing-tester/logs
       - ./mnt/logs/converter:/opt/clearing/clearing_testing_utils/clearing-converter/logs
 #      - ./mnt/dbfout:/opt/clearing/files/dbf/exporter/

clr_test/run_test_docker_containers.py

@@ -17,6 +17,7 @@ RESULT_FILES_DIR = os.environ['RESULT_FILES_DIR']
 
 def run_docker(folder_name):
     logging.info(f"Running docker-compose for {folder_name}")
+    os.environ['CLR_TEST_NAME'] = folder_name
     os.chdir("clr_test")
     subprocess.call('docker rm -f $(docker ps --all -q --filter ancestor=clr_test-db)', shell=True)
     subprocess.call('docker rm -f $(docker ps --all -q --filter ancestor=clr_test-clearing_system)', shell=True)
@@ -107,6 +108,9 @@ def main():
         change_date(folder)
         run_docker(folder)
 
+    os.chdir("clr_test")
+    subprocess.call('docker compose down', shell=True)
+    os.chdir("..")
 
 if __name__=='__main__':
     main()