Merge pull request #333 from fiskaltrust/#497-Add-migration-receipt-t…

…o-German-Middleware #497 Fix Migration-Receipt on mw with no migration impl
fiskaltrust · Aug 26, 2024 · 5e3686a · 5e3686a
2 parents 3c8d7cb + d857d32
commit 5e3686a
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 2 deletions.
diff --git a/queue/src/fiskaltrust.Middleware.Localization.QueueDE/Helpers/MigrationHelper.cs b/queue/src/fiskaltrust.Middleware.Localization.QueueDE/Helpers/MigrationHelper.cs
@@ -1,4 +1,5 @@
 using System;
+using System.Linq;
 using System.Threading.Tasks;
 using fiskaltrust.ifPOS.v1;
 using fiskaltrust.Middleware.Contracts.Repositories;
@@ -44,7 +45,7 @@ public static async Task FinishMigrationAync(ftQueue queue, ftQueueItem queueIte
             await actionJournalRepository.InsertAsync(actionJournal).ConfigureAwait(false);
         }
 
-        public static bool IsMigrationInProgress(IMiddlewareQueueItemRepository queueItemRepository)
+        public static bool IsMigrationInProgress(IMiddlewareQueueItemRepository queueItemRepository, IMiddlewareActionJournalRepository actionJournalRepository)
         {
             var queueItem = queueItemRepository.GetLastQueueItemAsync().Result;
             if(queueItem == null)
@@ -54,6 +55,12 @@ public static bool IsMigrationInProgress(IMiddlewareQueueItemRepository queueIte
             var request = JsonConvert.DeserializeObject<ReceiptRequest>(queueItem.request);
             if ((request.ftReceiptCase & 0xFFFF) == 0x0019)
             {
+                var actionJournal = actionJournalRepository.GetByQueueItemId(queueItem.ftQueueItemId).FirstOrDefaultAsync().Result;
+
+                if(actionJournal == null)
+                {
+                    return false;
+                }
                 return true;
             }
             return false;

diff --git a/queue/src/fiskaltrust.Middleware.Localization.QueueDE/SignProcessorDE.cs b/queue/src/fiskaltrust.Middleware.Localization.QueueDE/SignProcessorDE.cs
@@ -28,6 +28,7 @@ public SignProcessorDE(
             IConfigurationRepository configurationRepository,
             IMiddlewareJournalDERepository journalDERepository,
             IMiddlewareQueueItemRepository queueItemRepository,
+            IMiddlewareActionJournalRepository actionJournalRepository,
             ITransactionPayloadFactory transactionPayloadFactory,
             IRequestCommandFactory requestCommandFactory,
             ILogger<SignProcessorDE> logger)
@@ -37,7 +38,7 @@ public SignProcessorDE(
             _transactionPayloadFactory = transactionPayloadFactory;
             _requestCommandFactory = requestCommandFactory;
             _logger = logger;
-            _migrationDone = MigrationHelper.IsMigrationInProgress(queueItemRepository);
+            _migrationDone = MigrationHelper.IsMigrationInProgress(queueItemRepository, actionJournalRepository);
         }
 
         public async Task<(ReceiptResponse receiptResponse, List<ftActionJournal> actionJournals)> ProcessAsync(ReceiptRequest request, ftQueue queue, ftQueueItem queueItem)

diff --git a/...ation.QueueDE.IntegrationTest/SignProcessorDETests/Helpers/RequestCommandFactoryHelper.cs b/...ation.QueueDE.IntegrationTest/SignProcessorDETests/Helpers/RequestCommandFactoryHelper.cs
@@ -74,6 +74,7 @@ public static SignProcessorDE ConstructSignProcessor(
                 configurationRepository,
                 journalDERepository,
                 queueItemRepository,
+                actionJournalRepository,
                 transactionPayloadFactory,
                 new RequestCommandFactory(services.BuildServiceProvider()),
                 logger