Updated nuget package for projections

TransactionProcessor.DataGenerator/DataGenerator/Program.cs

@@ -99,7 +99,8 @@ static async Task Main(string[] args)
             Program.TransactionProcessorClient = new TransactionProcessorClient(baseAddressFunc, httpClient);
 
             // Set an estate
-            Guid estateId = Guid.Parse("435613ac-a468-47a3-ac4f-649d89764c22");
+            //Guid estateId = Guid.Parse("435613ac-a468-47a3-ac4f-649d89764c22");
+            Guid estateId = Guid.Parse("7c757c2c-4ec9-4d78-ac9b-3a7bfc6d5877");
 
             // Get a token
             await Program.GetToken(CancellationToken.None);
@@ -108,17 +109,17 @@ static async Task Main(string[] args)
             List<MerchantResponse> merchants = await Program.EstateClient.GetMerchants(Program.TokenResponse.AccessToken, estateId, CancellationToken.None);
 
             // Set the date range
-            DateTime startDate = new DateTime(2022,8,1); //27/7
-            DateTime endDate = new DateTime(2022,8,1);  // This is the date of te last generated transaction
+            DateTime startDate = new DateTime(2022,10,1); //27/7
+            DateTime endDate = new DateTime(2022,10,22);  // This is the date of te last generated transaction
             List<DateTime> dateRange = Program.GenerateDateRange(startDate, endDate);
 
             // Only use merchants that have a device
             merchants = merchants.Where(m => m.Devices != null && m.Devices.Any()).ToList();
 
             foreach (DateTime dateTime in dateRange)
             {
-                await Program.GenerateTransactions(merchants, dateTime, CancellationToken.None);
-                //await Program.GenerateFileUploads(merchants, dateTime, CancellationToken.None);
+                //await Program.GenerateTransactions(merchants, dateTime, CancellationToken.None);
+                await Program.GenerateFileUploads(merchants, dateTime, CancellationToken.None);
             }
 
             Console.WriteLine($"Process Complete");

TransactionProcessor.DataGenerator/DataGenerator/TransactionDataGenerator.csproj

@@ -2,14 +2,14 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="EstateManagement.Client" Version="1.0.10" />
+    <PackageReference Include="EstateManagement.Client" Version="1.1.5" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
     <PackageReference Include="SecurityService.Client" Version="1.0.6" />
-    <PackageReference Include="TransactionProcessor.Client" Version="1.0.12" />
+    <PackageReference Include="TransactionProcessor.Client" Version="1.1.11" />
   </ItemGroup>
 
 </Project>

TransactionProcessor.SystemSetupTool/Program.cs

@@ -37,6 +37,8 @@ class Program
 
         static async Task Main(string[] args)
         {
+
+
 
             IConfigurationBuilder builder = new ConfigurationBuilder().AddJsonFile("appsettings.json", optional: true, reloadOnChange: true);
             IConfigurationRoot configurationRoot = builder.Build();
@@ -61,14 +63,14 @@ static async Task Main(string[] args)
             EventStoreClientSettings settings = EventStoreClientSettings.Create(ConfigurationReader.GetValue("EventStoreAddress"));
             Program.ProjectionClient = new EventStoreProjectionManagementClient(settings);
             Program.PersistentSubscriptionsClient = new EventStorePersistentSubscriptionsClient(settings);
-
-            await Program.SetupIdentityServerFromConfig();
 
-            // Setup latest projections
-            await DeployProjections();
+            //await Program.SetupIdentityServerFromConfig();
+
+            //Setup latest projections
+            //await DeployProjections();
 
-            // Setup subcriptions
-            await SetupSubscriptions();
+            //Setup subcriptions
+            //await SetupSubscriptions();
 
             await Program.SetupEstatesFromConfig();            
         }
@@ -83,15 +85,23 @@ private static async Task SetupSubscriptions()
 
             EstateConfig estateConfiguration = JsonSerializer.Deserialize<EstateConfig>(estateJsonData);
 
+
             foreach (var estate in estateConfiguration.Estates)
             {
-                PersistentSubscriptionSettings s = new PersistentSubscriptionSettings(resolveLinkTos:true, maxRetryCount:5);
+
                 // Setup the subscrtipions
-                await PersistentSubscriptionsClient.CreateAsync(estate.Name.Replace(" ", ""), "Reporting", s);
-                await PersistentSubscriptionsClient.CreateAsync($"FileProcessorSubscriptionStream_{estate.Name.Replace(" ", "")}", "File sProcessor", s);
-                await PersistentSubscriptionsClient.CreateAsync($"TransactionProcessorSubscriptionStream_{estate.Name.Replace(" ", "")}", "Transaction Processor", s);
-                await Program.PersistentSubscriptionsClient.CreateAsync($"EstateManagementSubscriptionStream_{estate.Name.Replace(" ", "")}", "Estate Management", s);
+                await PersistentSubscriptionsClient.CreateAsync(estate.Name.Replace(" ", ""), "Reporting", CreatePersistentSettings());
+                await PersistentSubscriptionsClient.CreateAsync($"FileProcessorSubscriptionStream_{estate.Name.Replace(" ", "")}", "File Processor", CreatePersistentSettings(2));
+                await Program.PersistentSubscriptionsClient.CreateAsync($"EstateManagementSubscriptionStream_{estate.Name.Replace(" ", "")}", "Estate Management", CreatePersistentSettings());
+                await PersistentSubscriptionsClient.CreateAsync($"TransactionProcessorSubscriptionStream_{estate.Name.Replace(" ", "")}", "Transaction Processor", CreatePersistentSettings(1));
             }
+
+            await PersistentSubscriptionsClient.CreateAsync($"$et-EstateCreatedEvent", "Transaction Processor - Ordered", CreatePersistentSettings(1));
+            await PersistentSubscriptionsClient.CreateAsync($"$ce-MerchantBalanceArchive", "Transaction Processor - Ordered", CreatePersistentSettings());
+        }
+
+        private static PersistentSubscriptionSettings CreatePersistentSettings(Int32 retryCount = 0) {
+            return new PersistentSubscriptionSettings(resolveLinkTos: true, maxRetryCount: retryCount);
         }
 
         private static async Task DeployProjections()
@@ -362,7 +372,9 @@ await Program.EstateClient.AddTransactionFeeForProductToContract(Program.TokenRe
                                                                                 ContactName = merchant.Contact.ContactName,
                                                                                 EmailAddress = merchant.Contact.EmailAddress
                                                                             },
-                                                                  SettlementSchedule = settlementSchedule
+                                                                  SettlementSchedule = settlementSchedule,
+                                                                  CreatedDateTime = merchant.CreateDate,
+                                                                  MerchantId = merchant.MerchantId,
                                                               };
                 var merchantResponse = await Program.EstateClient.CreateMerchant(Program.TokenResponse.AccessToken, estateResponse.EstateId, createMerchantRequest, cancellationToken);
 

TransactionProcessor.SystemSetupTool/TransactionProcessor.SystemSetupTool.csproj

@@ -10,15 +10,16 @@
   </ItemGroup>
 
   <ItemGroup>
-    <Content Include="setupconfig.json">
+<Content Include="setupconfig.json">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="EstateManagement.Client" Version="1.0.15-build77" />
+    <PackageReference Include="EstateManagement.Client" Version="1.1.5" />
     <PackageReference Include="EventStore.Client.Grpc.PersistentSubscriptions" Version="21.2.0" />
     <PackageReference Include="EventStore.Client.Grpc.ProjectionManagement" Version="21.2.0" />
+    <PackageReference Include="EventStoreProjections" Version="1.0.11" />
     <PackageReference Include="Microsoft.Extensions.Configuration" Version="5.0.0" />
     <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="5.0.0" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
@@ -27,37 +28,33 @@
   </ItemGroup>
 
   <ItemGroup>
-    <None Update="appsettings.json">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
-    <None Update="identityserverconfig.json">
+    <Content Update="C:\Users\stuar\.nuget\packages\eventstoreprojections\1.0.11\contentFiles\any\net6.0\projections\continuous\CallbackHandlerEnricher.js">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
-    <None Update="projections\continuous\CallbackHandlerEnricher.js">
+    </Content>
+    <Content Update="C:\Users\stuar\.nuget\packages\eventstoreprojections\1.0.11\contentFiles\any\net6.0\projections\continuous\EstateAggregator.js">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
-    <None Update="projections\continuous\EstateAggregator.js">
+    </Content>
+    <Content Update="C:\Users\stuar\.nuget\packages\eventstoreprojections\1.0.11\contentFiles\any\net6.0\projections\continuous\EstateManagementSubscriptionStreamBuilder.js">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
-    <None Update="projections\continuous\FileProcessorSubscriptionStreamBuilder.js">
+    </Content>
+    <Content Update="C:\Users\stuar\.nuget\packages\eventstoreprojections\1.0.11\contentFiles\any\net6.0\projections\continuous\FileProcessorSubscriptionStreamBuilder.js">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
-    <None Update="projections\continuous\MerchantAggregator.js">
+    </Content>
+    <Content Update="C:\Users\stuar\.nuget\packages\eventstoreprojections\1.0.11\contentFiles\any\net6.0\projections\continuous\MerchantAggregator.js">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
-    <None Update="projections\continuous\MerchantBalanceCalculator.js">
+    </Content>
+    <Content Update="C:\Users\stuar\.nuget\packages\eventstoreprojections\1.0.11\contentFiles\any\net6.0\projections\continuous\TransactionProcessorSubscriptionStreamBuilder.js">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
-    <None Update="projections\continuous\TransactionEnricher.js">
+    </Content>
+  </ItemGroup>
+
+  <ItemGroup>
+    <None Update="appsettings.json">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
-    <None Update="projections\continuous\TransactionProcessorSubscriptionStreamBuilder.js">
+    <None Update="identityserverconfig.json">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
   </ItemGroup>
 
-  <ItemGroup>
-    <Folder Include="projections\continuous\" />
-  </ItemGroup>
-
 </Project>

TransactionProcessor.SystemSetupTool/appsettings.json

@@ -1,13 +1,13 @@
 {
   "AppSettings": {
     // Local (Docker)
-    "EstateManagementUri": "http://127.0.0.1:5000",
-    "SecurityServiceUri": "https://127.0.0.1:5001",
-    "EventStoreAddress": "esdb://admin:changeit@127.0.0.1:4113?tls=false&tlsVerifyCert=false"
+    //"EstateManagementUri": "http://127.0.0.1:5000",
+    //"SecurityServiceUri": "https://127.0.0.1:5001",
+    //"EventStoreAddress": "esdb://admin:changeit@127.0.0.1:4113?tls=false&tlsVerifyCert=false"
 
     // Staging
-    //"EstateManagementUri": "http://192.168.0.133:5000",
-    //"SecurityServiceUri": "https://192.168.0.133:5001",
-    //"EventStoreAddress": "esdb://admin:changeit@192.168.0.133:2113?tls=false&tlsVerifyCert=false"
+    "EstateManagementUri": "http://192.168.0.133:5000",
+    "SecurityServiceUri": "https://192.168.0.133:5001",
+    "EventStoreAddress": "esdb://admin:changeit@192.168.0.133:2113?tls=false&tlsVerifyCert=false"
   }
 }

TransactionProcessor.SystemSetupTool/estateconfig/Merchant.cs

@@ -5,6 +5,12 @@
 
     public class Merchant
     {
+        [JsonPropertyName("merchant_id")]
+        public Guid MerchantId { get; set; }
+
+        [JsonPropertyName("createdate")]
+        public DateTime CreateDate { get; set; }
+
         [JsonPropertyName("name")]
         public String Name { get; set; }