#361 - Add Middleware version to QueueItem entity

queue/src/fiskaltrust.Interface.Tagging/CaseConverterFactory.cs

@@ -19,7 +19,6 @@ public ICaseConverter CreateInstance(long ftReceiptCase)
                 0x4652000000000000 => new CaseConverterFR(),
                 _ => throw new Exception("The recieved code is not valid")
             };
-            ;
         }
     }
 }

queue/src/fiskaltrust.Middleware.Queue.AzureTableStorage/fiskaltrust.Middleware.Queue.AzureTableStorage.csproj

@@ -10,8 +10,7 @@
 
     <ItemGroup>
         <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="3.1.4" />
-        <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions"
-            Version="3.1.4" />
+        <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="3.1.4" />
         <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="3.1.4" />
         <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
         <PackageReference Include="System.Linq.Async" Version="4.1.1" />
@@ -35,21 +34,14 @@
     </ItemGroup>
 
     <ItemGroup>
-        <ProjectReference
-            Include="..\fiskaltrust.Middleware.Contracts\fiskaltrust.Middleware.Contracts.csproj"
-            PrivateAssets="all" />
-        <ProjectReference
-            Include="..\fiskaltrust.Middleware.Queue\fiskaltrust.Middleware.Queue.csproj"
-            PrivateAssets="all" />
-        <ProjectReference
-            Include="..\fiskaltrust.Middleware.Storage.AzureTableStorage\fiskaltrust.Middleware.Storage.AzureTableStorage.csproj"
-            PrivateAssets="all" />
+        <ProjectReference Include="..\fiskaltrust.Middleware.Contracts\fiskaltrust.Middleware.Contracts.csproj" PrivateAssets="all" />
+        <ProjectReference Include="..\fiskaltrust.Middleware.Queue\fiskaltrust.Middleware.Queue.csproj" PrivateAssets="all" />
+        <ProjectReference Include="..\fiskaltrust.Middleware.Storage.AzureTableStorage\fiskaltrust.Middleware.Storage.AzureTableStorage.csproj" PrivateAssets="all" />
     </ItemGroup>
 
     <Target DependsOnTargets="ResolveReferences" Name="CopyProjectReferencesToPackage">
         <ItemGroup>
-            <BuildOutputInPackage
-                Include="@(ReferenceCopyLocalPaths-&gt;WithMetadataValue('ReferenceSourceTarget', 'ProjectReference'))" />
+            <BuildOutputInPackage Include="@(ReferenceCopyLocalPaths-&gt;WithMetadataValue('ReferenceSourceTarget', 'ProjectReference'))" />
         </ItemGroup>
     </Target>
 
@@ -58,4 +50,8 @@
             <PackageCopyToOutput>true</PackageCopyToOutput>
         </Content>
     </ItemGroup>
+
+    <ItemGroup>
+      <PackageReference Update="fiskaltrust.storage" Version="1.3.66" />
+    </ItemGroup>
 </Project>

queue/src/fiskaltrust.Middleware.Queue.EF/fiskaltrust.Middleware.Queue.EF.csproj

@@ -51,4 +51,8 @@
         </Content>
     </ItemGroup>
 
+    <ItemGroup>
+      <PackageReference Update="fiskaltrust.storage" Version="1.3.66" />
+    </ItemGroup>
+
 </Project>

queue/src/fiskaltrust.Middleware.Queue.InMemory/fiskaltrust.Middleware.Queue.InMemory.csproj

@@ -37,6 +37,10 @@
         <ProjectReference Include="..\fiskaltrust.Middleware.Storage.InMemory\fiskaltrust.Middleware.Storage.InMemory.csproj" PrivateAssets="all" />
     </ItemGroup>
 
+    <ItemGroup>
+      <PackageReference Update="fiskaltrust.storage" Version="1.3.66" />
+    </ItemGroup>
+
     <Target DependsOnTargets="ResolveReferences" Name="CopyProjectReferencesToPackage">
         <ItemGroup>
             <BuildOutputInPackage Include="@(ReferenceCopyLocalPaths-&gt;WithMetadataValue('ReferenceSourceTarget', 'ProjectReference'))" />

queue/src/fiskaltrust.Middleware.Queue.MySQL/fiskaltrust.Middleware.Queue.MySQL.csproj

@@ -47,6 +47,10 @@
         <ProjectReference Include="..\fiskaltrust.Middleware.Storage.MySQL\fiskaltrust.Middleware.Storage.MySQL.csproj" PrivateAssets="all" />
     </ItemGroup>
 
+    <ItemGroup>
+      <PackageReference Update="fiskaltrust.storage" Version="1.3.66" />
+    </ItemGroup>
+
     <Target DependsOnTargets="ResolveReferences" Name="CopyProjectReferencesToPackage">
         <ItemGroup>
             <BuildOutputInPackage Include="@(ReferenceCopyLocalPaths-&gt;WithMetadataValue('ReferenceSourceTarget', 'ProjectReference'))" />

queue/src/fiskaltrust.Middleware.Queue.PostgreSQL/fiskaltrust.Middleware.Queue.PostgreSQL.csproj

@@ -31,4 +31,8 @@
         </Content>
     </ItemGroup>
 
+    <ItemGroup>
+      <PackageReference Update="fiskaltrust.storage" Version="1.3.66" />
+    </ItemGroup>
+
 </Project>

queue/src/fiskaltrust.Middleware.Queue.SQLite/fiskaltrust.Middleware.Queue.SQLite.csproj

@@ -66,6 +66,10 @@
       </None>
     </ItemGroup>
 
+    <ItemGroup>
+      <PackageReference Update="fiskaltrust.storage" Version="1.3.66" />
+    </ItemGroup>
+
     <Target DependsOnTargets="ResolveReferences" Name="CopyProjectReferencesToPackage">
         <ItemGroup>
             <BuildOutputInPackage Include="@(ReferenceCopyLocalPaths-&gt;WithMetadataValue('ReferenceSourceTarget', 'ProjectReference'))" />

queue/src/fiskaltrust.Middleware.Storage.AzureTableStorage/Repositories/AzureTableStorageConfigurationRepository.cs

@@ -54,8 +54,13 @@ public AzureTableStorageConfigurationRepository(QueueConfiguration queueConfig,
         public async Task InsertOrUpdateQueueATAsync(ftQueueAT queueAT) => await _queueATRepository.InsertOrUpdateAsync(queueAT).ConfigureAwait(false);
 
         public async Task<ftQueueDE> GetQueueDEAsync(Guid id) => await _queueDERepository.GetAsync(id).ConfigureAwait(false);
+        public Task<IEnumerable<ftQueueES>> GetQueueESListAsync() => throw new NotImplementedException();
+
+        public Task<ftQueueES> GetQueueESAsync(Guid queueESId) => throw new NotImplementedException();
+
         public async Task<IEnumerable<ftQueueDE>> GetQueueDEListAsync() => await _queueDERepository.GetAsync().ConfigureAwait(false);
         public async Task InsertOrUpdateQueueDEAsync(ftQueueDE queueDE) => await _queueDERepository.InsertOrUpdateAsync(queueDE).ConfigureAwait(false);
+        public Task InsertOrUpdateQueueESAsync(ftQueueES queue) => throw new NotImplementedException();
 
         public async Task<ftQueueFR> GetQueueFRAsync(Guid id) => await _queueFRRepository.GetAsync(id).ConfigureAwait(false);
         public async Task<IEnumerable<ftQueueFR>> GetQueueFRListAsync() => await _queueFRRepository.GetAsync().ConfigureAwait(false);
@@ -74,8 +79,13 @@ public AzureTableStorageConfigurationRepository(QueueConfiguration queueConfig,
         public async Task InsertOrUpdateSignaturCreationUnitATAsync(ftSignaturCreationUnitAT scu) => await _signaturCreationUnitATRepository.InsertOrUpdateAsync(scu).ConfigureAwait(false);
 
         public async Task<ftSignaturCreationUnitDE> GetSignaturCreationUnitDEAsync(Guid id) => await _signaturCreationUnitDERepository.GetAsync(id).ConfigureAwait(false);
+        public Task<IEnumerable<ftSignaturCreationUnitES>> GetSignaturCreationUnitESListAsync() => throw new NotImplementedException();
+
+        public Task<ftSignaturCreationUnitES> GetSignaturCreationUnitESAsync(Guid signaturCreationUnitESId) => throw new NotImplementedException();
+
         public async Task<IEnumerable<ftSignaturCreationUnitDE>> GetSignaturCreationUnitDEListAsync() => await _signaturCreationUnitDERepository.GetAsync().ConfigureAwait(false);
         public async Task InsertOrUpdateSignaturCreationUnitDEAsync(ftSignaturCreationUnitDE scu) => await _signaturCreationUnitDERepository.InsertOrUpdateAsync(scu).ConfigureAwait(false);
+        public Task InsertOrUpdateSignaturCreationUnitESAsync(ftSignaturCreationUnitES scu) => throw new NotImplementedException();
 
         public async Task<ftSignaturCreationUnitFR> GetSignaturCreationUnitFRAsync(Guid id) => await _signaturCreationUnitFRRepository.GetAsync(id).ConfigureAwait(false);
         public async Task<IEnumerable<ftSignaturCreationUnitFR>> GetSignaturCreationUnitFRListAsync() => await _signaturCreationUnitFRRepository.GetAsync().ConfigureAwait(false);

queue/src/fiskaltrust.Middleware.Storage.AzureTableStorage/Repositories/AzureTableStorageQueueItemRepository.cs

@@ -1,6 +1,5 @@
 using System;
 using System.Collections.Generic;
-using System.Drawing;
 using System.Linq;
 using System.Runtime.CompilerServices;
 using System.Text;
@@ -19,6 +18,7 @@ namespace fiskaltrust.Middleware.Storage.AzureTableStorage.Repositories
     public class AzureTableStorageQueueItemRepository : BaseAzureTableStorageRepository<Guid, TableEntity, ftQueueItem>, IMiddlewareQueueItemRepository, IMiddlewareRepository<ftQueueItem>
     {
         private readonly AzureTableStorageReceiptReferenceIndexRepository _receiptReferenceIndexRepository;
+
         public AzureTableStorageQueueItemRepository(QueueConfiguration queueConfig, TableServiceClient tableServiceClient, AzureTableStorageReceiptReferenceIndexRepository receiptReferenceIndexRepository)
             : base(queueConfig, tableServiceClient, TABLE_NAME)
         {
@@ -54,7 +54,8 @@ protected override TableEntity MapToAzureEntity(ftQueueItem src)
                 { nameof(ftQueueItem.ftQueueMoment), src.ftQueueMoment.ToUniversalTime() },
                 { nameof(ftQueueItem.ftQueueRow), src.ftQueueRow },
                 { nameof(ftQueueItem.ftQueueId), src.ftQueueId },
-                { nameof(ftQueueItem.TimeStamp), src.TimeStamp }
+                { nameof(ftQueueItem.TimeStamp), src.TimeStamp },
+                { nameof(ftQueueItem.ProcessingVersion), src.ProcessingVersion } 
             };
 
             entity.SetOversized(nameof(ftQueueItem.request), src.request);
@@ -88,7 +89,8 @@ protected override ftQueueItem MapToStorageEntity(TableEntity src)
                 ftQueueId = src.GetGuid(nameof(ftQueueItem.ftQueueId)).GetValueOrDefault(),
                 TimeStamp = src.GetInt64(nameof(ftQueueItem.TimeStamp)).GetValueOrDefault(),
                 request = src.GetOversized(nameof(ftQueueItem.request)),
-                response = src.GetOversized(nameof(ftQueueItem.response))
+                response = src.GetOversized(nameof(ftQueueItem.response)),
+                ProcessingVersion = src.GetString(nameof(ftQueueItem.ProcessingVersion)) 
             };
         }
 
@@ -103,6 +105,7 @@ public override async Task InsertAsync(ftQueueItem storageEntity)
         public async Task InsertOrUpdateAsync(ftQueueItem storageEntity)
         {
             EntityUpdated(storageEntity);
+            storageEntity.ProcessingVersion = "1.0.0";
             var entity = MapToAzureEntity(storageEntity);
             await _tableClient.UpsertEntityAsync(entity, TableUpdateMode.Replace);
             await _receiptReferenceIndexRepository.InsertOrUpdateAsync(new ReceiptReferenceIndex { cbReceiptReference = storageEntity.cbReceiptReference, ftQueueItemId = storageEntity.ftQueueItemId });
@@ -156,7 +159,7 @@ from queueItem in await GetAsync()
                     where
                     (fromIncl.HasValue ? queueItem.TimeStamp >= fromIncl.Value : true) &&
                     (toIncl.HasValue ? queueItem.TimeStamp <= toIncl.Value : true) &&
-                    (!string.IsNullOrEmpty(queueItem.response)) && JsonConvert.DeserializeObject<ReceiptRequest>(queueItem.request).IncludeInReferences()
+                    !string.IsNullOrEmpty(queueItem.response) && JsonConvert.DeserializeObject<ReceiptRequest>(queueItem.request).IncludeInReferences()
                     group queueItem by queueItem.cbReceiptReference into newGroup
                     orderby newGroup.Key
                     select newGroup.Key;
@@ -170,7 +173,7 @@ public async IAsyncEnumerable<ftQueueItem> GetQueueItemsForReceiptReferenceAsync
         {
             var queueItemsForReceiptReference =
                 from queueItem in GetByReceiptReferenceAsync(receiptReference).ToEnumerable()
-                where (!string.IsNullOrEmpty(queueItem.response)) && JsonConvert.DeserializeObject<ReceiptRequest>(queueItem.request).IncludeInReferences()
+                where !string.IsNullOrEmpty(queueItem.response) && JsonConvert.DeserializeObject<ReceiptRequest>(queueItem.request).IncludeInReferences()
                 orderby queueItem.TimeStamp
                 select queueItem;
             await foreach (var entry in queueItemsForReceiptReference.ToAsyncEnumerable())

queue/src/fiskaltrust.Middleware.Storage.AzureTableStorage/fiskaltrust.Middleware.Storage.AzureTableStorage.csproj

@@ -5,15 +5,17 @@
     <PackageReference Include="Azure.Identity" Version="1.8.0" />
     <PackageReference Include="Azure.Storage.Blobs" Version="12.14.1" />
     <PackageReference Include="System.Interactive.Async" Version="4.1.1" />
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions"
-      Version="3.1.4" />
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="3.1.4" />
     <PackageReference Include="System.Linq.Async" Version="4.1.1" />
     <PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="1.1.1" />
     <PackageReference Include="fiskaltrust.storage.encryption" Version="1.3.1" />
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference
-      Include="..\fiskaltrust.Middleware.Storage.Base\fiskaltrust.Middleware.Storage.Base.csproj" />
+    <ProjectReference Include="..\fiskaltrust.Middleware.Storage.Base\fiskaltrust.Middleware.Storage.Base.csproj" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Update="fiskaltrust.storage" Version="1.3.66" />
   </ItemGroup>
 </Project>

queue/src/fiskaltrust.Middleware.Storage.EF/MiddlewareDbContext.cs

@@ -6,6 +6,7 @@
 using fiskaltrust.Middleware.Contracts.Models.Transactions;
 using fiskaltrust.storage.V0;
 using fiskaltrust.storage.V0.MasterData;
+using ftJournalFRCopyPayload = fiskaltrust.Middleware.Contracts.Models.FR.ftJournalFRCopyPayload;
 
 namespace fiskaltrust.Middleware.Storage.EF
 {

queue/src/fiskaltrust.Middleware.Storage.EF/Migrations/202411271519262_FixProcessingVersionIndex.cs

@@ -0,0 +1,20 @@
+namespace fiskaltrust.Middleware.Storage.EF.Migrations
+{
+    using System;
+    using System.Data.Entity.Migrations;
+
+    public partial class FixProcessingVersionIndex : DbMigration
+    {
+        public override void Up()
+        {
+            AddColumn("dbo.ftQueueItem", "ProcessingVersion", c => c.String(maxLength: 450));
+            CreateIndex("dbo.ftQueueItem", "ProcessingVersion");
+        }
+
+        public override void Down()
+        {
+            DropIndex("dbo.ftQueueItem", new[] { "ProcessingVersion" });
+            DropColumn("dbo.ftQueueItem", "ProcessingVersion");
+        }
+    }
+}

queue/src/fiskaltrust.Middleware.Storage.EF/Repositories/EfConfigurationRepository.cs

@@ -53,8 +53,13 @@ public EfConfigurationRepository(MiddlewareDbContext dbContext)
         public async Task InsertOrUpdateQueueATAsync(ftQueueAT queueAT) => await _queueATRepository.InsertOrUpdateAsync(queueAT).ConfigureAwait(false);
 
         public async Task<ftQueueDE> GetQueueDEAsync(Guid id) => await _queueDERepository.GetAsync(id).ConfigureAwait(false);
+        public Task<IEnumerable<ftQueueES>> GetQueueESListAsync() => throw new NotImplementedException();
+
+        public Task<ftQueueES> GetQueueESAsync(Guid queueESId) => throw new NotImplementedException();
+
         public async Task<IEnumerable<ftQueueDE>> GetQueueDEListAsync() => await _queueDERepository.GetAsync().ConfigureAwait(false);
         public async Task InsertOrUpdateQueueDEAsync(ftQueueDE queueDE) => await _queueDERepository.InsertOrUpdateAsync(queueDE).ConfigureAwait(false);
+        public Task InsertOrUpdateQueueESAsync(ftQueueES queue) => throw new NotImplementedException();
 
         public async Task<ftQueueFR> GetQueueFRAsync(Guid id) => await _queueFRRepository.GetAsync(id).ConfigureAwait(false);
         public async Task<IEnumerable<ftQueueFR>> GetQueueFRListAsync() => await _queueFRRepository.GetAsync().ConfigureAwait(false);
@@ -73,8 +78,13 @@ public EfConfigurationRepository(MiddlewareDbContext dbContext)
         public async Task InsertOrUpdateSignaturCreationUnitATAsync(ftSignaturCreationUnitAT scu) => await _signaturCreationUnitATRepository.InsertOrUpdateAsync(scu).ConfigureAwait(false);
 
         public async Task<ftSignaturCreationUnitDE> GetSignaturCreationUnitDEAsync(Guid id) => await _signaturCreationUnitDERepository.GetAsync(id).ConfigureAwait(false);
+        public Task<IEnumerable<ftSignaturCreationUnitES>> GetSignaturCreationUnitESListAsync() => throw new NotImplementedException();
+
+        public Task<ftSignaturCreationUnitES> GetSignaturCreationUnitESAsync(Guid signaturCreationUnitESId) => throw new NotImplementedException();
+
         public async Task<IEnumerable<ftSignaturCreationUnitDE>> GetSignaturCreationUnitDEListAsync() => await _signaturCreationUnitDERepository.GetAsync().ConfigureAwait(false);
         public async Task InsertOrUpdateSignaturCreationUnitDEAsync(ftSignaturCreationUnitDE scu) => await _signaturCreationUnitDERepository.InsertOrUpdateAsync(scu).ConfigureAwait(false);
+        public Task InsertOrUpdateSignaturCreationUnitESAsync(ftSignaturCreationUnitES scu) => throw new NotImplementedException();
 
         public async Task<ftSignaturCreationUnitFR> GetSignaturCreationUnitFRAsync(Guid id) => await _signaturCreationUnitFRRepository.GetAsync(id).ConfigureAwait(false);
         public async Task<IEnumerable<ftSignaturCreationUnitFR>> GetSignaturCreationUnitFRListAsync() => await _signaturCreationUnitFRRepository.GetAsync().ConfigureAwait(false);

queue/src/fiskaltrust.Middleware.Storage.EF/fiskaltrust.Middleware.Storage.EF.csproj

@@ -16,6 +16,10 @@
     <ProjectReference Include="..\fiskaltrust.Middleware.Storage.Base\fiskaltrust.Middleware.Storage.Base.csproj" />
   </ItemGroup>
 
+  <ItemGroup>
+    <PackageReference Update="fiskaltrust.storage" Version="1.3.66" />
+  </ItemGroup>
+
   <PropertyGroup>
     <EmbeddedResourceUseDependentUponConvention>true</EmbeddedResourceUseDependentUponConvention>
   </PropertyGroup>