From 2b11d25ac2d4642b7f04f3c450b67597d9279d2e Mon Sep 17 00:00:00 2001
From: ialbert <ialbert@mfd.ru>
Date: Thu, 2 Feb 2023 16:44:19 +0300
Subject: [PATCH] http://jira.mfd.msk:8088/browse/CLS-189 added logging

---
 .../clearing/balance/service/AccountBalanceService.java   | 8 ++++++++
 .../spcex/clearing/balance/service/StatementService.java  | 6 +++++-
 .../clearing-service/src/main/resources/logback.xml       | 5 +++++
 3 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/clearing-parent/balance-service/src/main/java/ru/spcex/clearing/balance/service/AccountBalanceService.java b/clearing-parent/balance-service/src/main/java/ru/spcex/clearing/balance/service/AccountBalanceService.java
index 5be5d136b..cade521e2 100644
--- a/clearing-parent/balance-service/src/main/java/ru/spcex/clearing/balance/service/AccountBalanceService.java
+++ b/clearing-parent/balance-service/src/main/java/ru/spcex/clearing/balance/service/AccountBalanceService.java
@@ -1,5 +1,7 @@
 package ru.spcex.clearing.balance.service;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.stereotype.Component;
 import ru.clearing.classes.statics.data.account.Account;
@@ -28,6 +30,7 @@ import java.util.function.Function;
 
 @Component
 public class AccountBalanceService {
+    private final Logger log = LoggerFactory.getLogger(getClass());
     private final ImdgProvider imdgProvider;
     private final Imdg<AccountBalance> accountBalanceImdg;
     private final Function<AccountBalanceValidation, IValidator> validationFactory;
@@ -122,6 +125,7 @@ public class AccountBalanceService {
         accountBalance.setChangeBalanceAmount(previousChangeBalanceAmount.subtract(firstLegAmount));
         accountBalance.setBalanceAmount(previousBalanceAmount.subtract(firstLegAmount));
         accountBalance.setUpdated(Instant.now());
+        log.trace("updateAccountCategoryIClrn: {}", accountBalance.getId());
         accountBalanceImdg.update(accountBalance);
     }
 
@@ -130,6 +134,7 @@ public class AccountBalanceService {
         BigDecimal previousDebitAmount = accountBalance.getDebitAmount();
         accountBalance.setDebitAmount(previousDebitAmount.add(firstLegAmount.abs()));
         accountBalance.setUpdated(Instant.now());
+        log.trace("updateAccountCategoryITran: {}", accountBalance.getId());
         accountBalanceImdg.update(accountBalance);
     }
 
@@ -142,6 +147,7 @@ public class AccountBalanceService {
         accountBalance.setChangeBalanceAmount(changeBalanceAmount.subtract(firstLegAmount));
         accountBalance.setBalanceAmount(balanceAmount.subtract(firstLegAmount));
         accountBalance.setUpdated(Instant.now());
+        log.trace("updateAccountCategoryVInfo: {}", accountBalance.getId());
         accountBalanceImdg.update(accountBalance);
     }
 
@@ -154,6 +160,7 @@ public class AccountBalanceService {
         accountBalance.setChangeBalanceAmount(previousChangeBalanceAmount.subtract(firstLegAmount));
         accountBalance.setBalanceAmount(previousBalanceAmount.subtract(firstLegAmount));
         accountBalance.setUpdated(Instant.now());
+        log.trace("updateAccountCategoryVAnlt: {}", accountBalance.getId());
         accountBalanceImdg.update(accountBalance);
     }
 
@@ -162,6 +169,7 @@ public class AccountBalanceService {
         BigDecimal debitAmount = accountBalance.getDebitAmount();
         accountBalance.setDebitAmount(plus(debitAmount, firstLegAmount.abs()));
         accountBalance.setUpdated(Instant.now());
+        log.trace("updateAccountCategoryBClrn: {}", accountBalance.getId()");
         accountBalanceImdg.update(accountBalance);
     }
 
diff --git a/clearing-parent/balance-service/src/main/java/ru/spcex/clearing/balance/service/StatementService.java b/clearing-parent/balance-service/src/main/java/ru/spcex/clearing/balance/service/StatementService.java
index 71d790c18..8c44b9ce4 100644
--- a/clearing-parent/balance-service/src/main/java/ru/spcex/clearing/balance/service/StatementService.java
+++ b/clearing-parent/balance-service/src/main/java/ru/spcex/clearing/balance/service/StatementService.java
@@ -70,7 +70,11 @@ public class StatementService extends QueueConsumer implements InitializingBean
     }
 
     private void accountBalanceClearingUpdate(BaseRequest<AccountBalanceClearingRequest> updateAccBalanceReq) {
-        accountBalanceService.updateAccountBalanceByClearing(updateAccBalanceReq.getRequestPayload());
+        AccountBalanceClearingRequest payload = updateAccBalanceReq.getRequestPayload();
+        log.debug("updating account balance for clearing baseRequest.id = {}; accountId = {}, companyId = {}, firstLegAmount = {}", updateAccBalanceReq.getId()
+                payload.getAccountId(), payload.getCompanyId(), payload.getFirstLegAmount()
+        );
+        accountBalanceService.updateAccountBalanceByClearing(payload);
         CommonIdRequest commonIdRequest = new CommonIdRequest();
         commonIdRequest.setId(updateAccBalanceReq.getId());
         kafkaReqProducer.sendRequestToQueue(Consts.CONTINUE_CLEARING, commonIdRequest);
diff --git a/clearing-parent/clearing-service/src/main/resources/logback.xml b/clearing-parent/clearing-service/src/main/resources/logback.xml
index f96f82942..e2702c011 100644
--- a/clearing-parent/clearing-service/src/main/resources/logback.xml
+++ b/clearing-parent/clearing-service/src/main/resources/logback.xml
@@ -34,4 +34,9 @@
         <appender-ref ref="FILE"/>
         <appender-ref ref="CONSOLE"/>
     </logger>
+
+    <logger name="ru.spcex.clearing.service.Clearing" level="trace" additivity="false">
+        <appender-ref ref="FILE"/>
+        <appender-ref ref="CONSOLE"/>
+    </logger>
 </configuration>
\ No newline at end of file