From 5c93f133dd60e2da5de344a4b5c608eb3ab34277 Mon Sep 17 00:00:00 2001
From: AKurakin <akurakin@mfd.ru>
Date: Tue, 23 May 2023 11:58:38 +0300
Subject: [PATCH] =?UTF-8?q?trade-importer=20http://jira.mfd.msk:8088/brows?=
 =?UTF-8?q?e/CLS-276=20=D0=BF=D0=BE=D0=BF=D1=80=D0=B0=D0=B2=D0=B8=D0=BB=20?=
 =?UTF-8?q?=D0=BA=D0=BE=D0=BF=D0=B8=D1=80=D0=BE=D0=B2=D0=B0=D0=BD=D0=B8?=
 =?UTF-8?q?=D0=B5=20=D0=BE=D0=B1=D1=8A=D0=B5=D0=BA=D1=82=D0=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../importer/services/TradeImporterService.java      | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/clearing-parent/trade-importer/src/main/java/ru/spcex/clearing/trade/importer/services/TradeImporterService.java b/clearing-parent/trade-importer/src/main/java/ru/spcex/clearing/trade/importer/services/TradeImporterService.java
index 42a708c67..8fe3292ed 100644
--- a/clearing-parent/trade-importer/src/main/java/ru/spcex/clearing/trade/importer/services/TradeImporterService.java
+++ b/clearing-parent/trade-importer/src/main/java/ru/spcex/clearing/trade/importer/services/TradeImporterService.java
@@ -63,20 +63,30 @@ public class TradeImporterService {
         Instant currentInstant = Instant.now();
 
         log.debug("load from DB STrades: {}", tradesFromDB.size());
+        int created = 0;
+        int updated = 0;
         for (STrades tradesDb : tradesFromDB) {
             if (isValidTrades(tradesDb)) {
                 STrades sTrades = getSTradesFromImdg(tradesDb, sTradesImdg);
                 if (sTrades != null) {
+                    // Обновление всех полей объекта из БД
                     tradesDb.setId(sTrades.getId());
+                    tradesDb.setCreated(sTrades.getCreated());
                     tradesDb.setUpdated(currentInstant);
+                    sTradesImdg.update(tradesDb);
+                    updated++;
                 } else {
+                    // Создание объекта из БД
                     tradesDb.setCreated(currentInstant);
+                    tradesDb.setUpdated(currentInstant);
+                    sTradesImdg.insert(tradesDb);
+                    created++;
                 }
-                sTradesImdg.insert(tradesDb);
             } else {
                 log.warn(messageResolver.resolve(new EnumMessage(sTradesNotValid, tradesDb.getTradeNum())));
             }
         }
+        log.debug("Created {} new STrades, {} updated.", created, updated);
 
         if (byCommand) {
             log.debug("Successfully import STrades from DB by command. Send to kafka command, topic={}", S_TRADES_IMPORTED);