chore: some renamings and clean-up

nmshd · Nov 11, 2024 · 6f21e7c · 6f21e7c
1 parent 652d8ea
commit 6f21e7c
Show file tree

Hide file tree

Showing 18 changed files with 36 additions and 59 deletions.
diff --git a/....Performance.SnapshotCreator.Tests/Readers/PerformanceTestConfigurationJsonReaderTests.cs b/....Performance.SnapshotCreator.Tests/Readers/PerformanceTestConfigurationJsonReaderTests.cs
@@ -3,7 +3,7 @@
 
 namespace Backbone.ConsumerApi.Tests.Performance.SnapshotCreator.Tests.Readers;
 
-public class PerformanceTestConfigurationJsonReaderTests : SnapshotCreatorTestsBase
+public class PoolConfigurationJsonReaderTests : SnapshotCreatorTestsBase
 {
     #region Deserialize From Json Tests
 
@@ -16,7 +16,7 @@ public async Task Read_InputPoolConfigJson_ReturnsPoolConfiguration(string poolC
         // Arrange
         var poolConfigJsonFile = Path.Combine(TestDataFolder, poolConfigJsonFilename);
         var expectedPoolConfig = await GetExpectedPoolConfiguration(expectedPoolConfigJsonFilename);
-        var sut = new PerformanceTestConfigurationJsonReader();
+        var sut = new PoolConfigurationJsonReader();
 
         // Act
         var actualPoolConfig = await sut.Read(poolConfigJsonFile);

diff --git a/...manceTestConfigurationExcelReaderTests.cs → ...ders/PoolConfigurationExcelReaderTests.cs b/...manceTestConfigurationExcelReaderTests.cs → ...ders/PoolConfigurationExcelReaderTests.cs
@@ -3,7 +3,7 @@
 
 namespace Backbone.ConsumerApi.Tests.Performance.SnapshotCreator.Tests.Readers;
 
-public class PerformanceTestConfigurationExcelReaderTests : SnapshotCreatorTestsBase
+public class PoolConfigurationExcelReaderTests : SnapshotCreatorTestsBase
 {
     #region Verify Json Pool Config
 
@@ -17,7 +17,7 @@ public async Task Read_InputPerformanceTestDataExcel_ReturnsPoolConfiguration(st
         var poolConfigExcelFile = Path.Combine(TestDataFolder, excelFile);
         var expectedPoolConfig = await GetExpectedPoolConfiguration(expectedPoolConfigJsonFilename);
         expectedPoolConfig.RelationshipAndMessages.Clear(); //Note: Excel reader does only read the pool config, not the relationships and messages
-        var sut = new PerformanceTestConfigurationExcelReader();
+        var sut = new PoolConfigurationExcelReader();
 
         // Act
         var actualPoolConfig = await sut.Read(poolConfigExcelFile, loadTestTag);

diff --git a/...ConsumerApi.Tests.Performance/tools/snapshot-creator-v2/Features/Create/CreateSnapshot.cs b/...ConsumerApi.Tests.Performance/tools/snapshot-creator-v2/Features/Create/CreateSnapshot.cs
@@ -1,5 +1,4 @@
-using System;
-using Backbone.ConsumerApi.Sdk.Authentication;
+using Backbone.ConsumerApi.Sdk.Authentication;
 using Backbone.ConsumerApi.Tests.Performance.SnapshotCreator.V2.Features.Shared.Interfaces;
 using Backbone.ConsumerApi.Tests.Performance.SnapshotCreator.V2.Features.Shared.Models;
 using MediatR;
@@ -17,7 +16,7 @@ public record Command(
 
     public record CommandHandler(
         ILogger<CommandHandler> Logger,
-        IPerformanceTestConfigurationJsonReader PerformanceTestConfigurationJsonReader,
+        IPoolConfigurationJsonReader PoolConfigurationJsonReader,
         IMediator Mediator)
         : IRequestHandler<Command, StatusMessage>
     {
@@ -27,7 +26,7 @@ public async Task<StatusMessage> Handle(Command request, CancellationToken cance
             {
                 Logger.LogInformation("Creating pool configuration with relationships and messages ...");
 
-                var poolConfig = await PerformanceTestConfigurationJsonReader.Read(request.JsonFilePath);
+                var poolConfig = await PoolConfigurationJsonReader.Read(request.JsonFilePath);
                 var clientCredentials = new ClientCredentials(request.ClientId, request.ClientSecret);
 
                 var identities = await Mediator.Send(new CreateIdentities.Command(poolConfig.IdentityPoolConfigurations, request.BaseAddress, clientCredentials), cancellationToken);

diff --git a/...nsumerApi.Tests.Performance/tools/snapshot-creator-v2/Features/Generate/GenerateConfig.cs b/...nsumerApi.Tests.Performance/tools/snapshot-creator-v2/Features/Generate/GenerateConfig.cs
@@ -9,7 +9,7 @@ public record GenerateConfig
     public record Command(string ExcelFilePath, string WorkSheetName) : IRequest<StatusMessage>;
 
     public class CommandHandler(
-        IPerformanceTestConfigurationExcelReader performanceTestConfigurationExcelReader,
+        IPoolConfigurationExcelReader poolConfigurationExcelReader,
         IRelationshipAndMessagesGenerator relationshipAndMessagesGenerator,
         IPoolConfigurationJsonWriter poolConfigurationJsonWriter)
         : IRequestHandler<Command, StatusMessage>
@@ -19,7 +19,7 @@ public async Task<StatusMessage> Handle(Command request, CancellationToken cance
             StatusMessage result;
             try
             {
-                var poolConfigFromExcel = await performanceTestConfigurationExcelReader.Read(request.ExcelFilePath, request.WorkSheetName);
+                var poolConfigFromExcel = await poolConfigurationExcelReader.Read(request.ExcelFilePath, request.WorkSheetName);
 
                 var relationshipAndMessages = relationshipAndMessagesGenerator.Generate(poolConfigFromExcel);
 
@@ -37,7 +37,7 @@ public async Task<StatusMessage> Handle(Command request, CancellationToken cance
 
                 Directory.CreateDirectory(snapshotFolder);
 
-                var poolConfigJsonFilePath = Path.Combine(snapshotFolder!, $"{POOL_CONFIG_JSON_WITH_RELATIONSHIP_AND_MESSAGES}.{request.WorkSheetName}.{JSON_FILE_EXT}");
+                var poolConfigJsonFilePath = Path.Combine(snapshotFolder!, $"pool-config.{request.WorkSheetName}.json");
                 result = await poolConfigurationJsonWriter.Write(poolConfigFromExcel, poolConfigJsonFilePath);
             }
             catch (Exception e)

diff --git a/...s.Performance/tools/snapshot-creator-v2/Features/Generate/IPoolConfigurationJsonWriter.cs b/...s.Performance/tools/snapshot-creator-v2/Features/Generate/IPoolConfigurationJsonWriter.cs
@@ -4,5 +4,5 @@ namespace Backbone.ConsumerApi.Tests.Performance.SnapshotCreator.V2.Features.Gen
 
 public interface IPoolConfigurationJsonWriter
 {
-    Task<StatusMessage> Write(PerformanceTestConfiguration poolConfigFromExcel, string filePath);
+    Task<StatusMessage> Write(PerformanceTestConfiguration poolConfiguration, string filePath);
 }
diff --git a/...formance/tools/snapshot-creator-v2/Features/Generate/IRelationshipAndMessagesGenerator.cs b/...formance/tools/snapshot-creator-v2/Features/Generate/IRelationshipAndMessagesGenerator.cs
@@ -4,5 +4,5 @@ namespace Backbone.ConsumerApi.Tests.Performance.SnapshotCreator.V2.Features.Gen
 
 public interface IRelationshipAndMessagesGenerator
 {
-    RelationshipAndMessages[] Generate(PerformanceTestConfiguration performanceTestConfiguration);
+    RelationshipAndMessages[] Generate(PerformanceTestConfiguration poolConfiguration);
 }
diff --git a/...ts.Performance/tools/snapshot-creator-v2/Features/Generate/PoolConfigurationJsonWriter.cs b/...ts.Performance/tools/snapshot-creator-v2/Features/Generate/PoolConfigurationJsonWriter.cs
@@ -5,11 +5,11 @@ namespace Backbone.ConsumerApi.Tests.Performance.SnapshotCreator.V2.Features.Gen
 
 public class PoolConfigurationJsonWriter : IPoolConfigurationJsonWriter
 {
-    public async Task<StatusMessage> Write(PerformanceTestConfiguration poolConfigFromExcel, string filePath)
+    public async Task<StatusMessage> Write(PerformanceTestConfiguration poolConfiguration, string filePath)
     {
         try
         {
-            var poolConfigJson = JsonSerializer.Serialize(poolConfigFromExcel, new JsonSerializerOptions { WriteIndented = true });
+            var poolConfigJson = JsonSerializer.Serialize(poolConfiguration, new JsonSerializerOptions { WriteIndented = true });
             await File.WriteAllTextAsync(filePath, poolConfigJson);
         }
         catch (Exception e)

diff --git a/...rformance/tools/snapshot-creator-v2/Features/Generate/RelationshipAndMessagesGenerator.cs b/...rformance/tools/snapshot-creator-v2/Features/Generate/RelationshipAndMessagesGenerator.cs
@@ -5,11 +5,11 @@ namespace Backbone.ConsumerApi.Tests.Performance.SnapshotCreator.V2.Features.Gen
 
 public class RelationshipAndMessagesGenerator : IRelationshipAndMessagesGenerator
 {
-    public RelationshipAndMessages[] Generate(PerformanceTestConfiguration performanceTestConfiguration)
+    public RelationshipAndMessages[] Generate(PerformanceTestConfiguration poolConfiguration)
     {
-        if (!performanceTestConfiguration.IsIdentityPoolConfigurationCreated) throw new InvalidOperationException(IDENTITY_POOL_CONFIGURATION_NOT_CREATED);
+        if (!poolConfiguration.IsIdentityPoolConfigurationCreated) throw new InvalidOperationException(IDENTITY_POOL_CONFIGURATION_NOT_CREATED);
 
-        var identityPools = performanceTestConfiguration.IdentityPoolConfigurations;
+        var identityPools = poolConfiguration.IdentityPoolConfigurations;
 
         var appIdentityPools = identityPools.Where(ip => ip.Type == IdentityPoolType.App).ToList();
         var connectorIdentityPools = identityPools.Where(ip => ip.Type == IdentityPoolType.Connector).ToList();
@@ -103,13 +103,13 @@ public RelationshipAndMessages[] Generate(PerformanceTestConfiguration performan
 
         var relationShipCount = relationshipAndMessagesList.Length / 2; // Note: Div by 2 because a pair of relationships (forward/reverse) is equal to 1 relationship
 
-        if (relationShipCount != performanceTestConfiguration.VerificationConfiguration.TotalNumberOfRelationships)
+        if (relationShipCount != poolConfiguration.VerificationConfiguration.TotalNumberOfRelationships)
         {
-            throw new InvalidOperationException(string.Format(RELATIONSHIP_COUNT_MISMATCH, performanceTestConfiguration.VerificationConfiguration.TotalNumberOfRelationships, relationShipCount));
+            throw new InvalidOperationException(string.Format(RELATIONSHIP_COUNT_MISMATCH, poolConfiguration.VerificationConfiguration.TotalNumberOfRelationships, relationShipCount));
         }
 
-        VerifyNumberOfSentMessages(relationshipAndMessagesList, IdentityPoolType.Connector, performanceTestConfiguration.VerificationConfiguration.TotalAppSentMessages);
-        VerifyNumberOfSentMessages(relationshipAndMessagesList, IdentityPoolType.App, performanceTestConfiguration.VerificationConfiguration.TotalConnectorSentMessages);
+        VerifyNumberOfSentMessages(relationshipAndMessagesList, IdentityPoolType.Connector, poolConfiguration.VerificationConfiguration.TotalAppSentMessages);
+        VerifyNumberOfSentMessages(relationshipAndMessagesList, IdentityPoolType.App, poolConfiguration.VerificationConfiguration.TotalConnectorSentMessages);
 
 
         return relationshipAndMessagesList;

diff --git a/...merApi.Tests.Performance/tools/snapshot-creator-v2/Features/Shared/Constants/Resources.cs b/...merApi.Tests.Performance/tools/snapshot-creator-v2/Features/Shared/Constants/Resources.cs
@@ -7,32 +7,9 @@ public static class Resources
     public const string POOL_TYPE_CONNECTOR = "connector";
     public const string POOL_TYPE_UNKNOWN = "Invalid identity pool type";
 
-    public const string POOL_NAME_NEVER = "NeverUse";
-    public const string POOL_NAME_APP_LIGHT = "AppLight";
-    public const string POOL_NAME_APP_MEDIUM = "AppMedium";
-    public const string POOL_NAME_APP_HEAVY = "AppHeavy";
-    public const string POOL_NAME_CONNECTOR_LIGHT = "ConnectorLight";
-    public const string POOL_NAME_CONNECTOR_MEDIUM = "ConnectorMedium";
-    public const string POOL_NAME_CONNECTOR_HEAVY = "ConnectorHeavy";
-
-    public const string POOL_ALIAS_NEVER = "e";
-    public const string POOL_ALIAS_APP_LIGHT = "a1";
-    public const string POOL_ALIAS_APP_MEDIUM = "a2";
-    public const string POOL_ALIAS_APP_HEAVY = "a3";
-    public const string POOL_ALIAS_CONNECTOR_LIGHT = "c1";
-    public const string POOL_ALIAS_CONNECTOR_MEDIUM = "c2";
-    public const string POOL_ALIAS_CONNECTOR_HEAVY = "c3";
-
     public const string PERFORMANCE_TEST_CONFIGURATION_EXCEL_FILE_EMPTY = "Excel file is empty";
     public const string PERFORMANCE_TEST_CONFIGURATION_FIRST_ROW_MISMATCH = "First row is not of type";
 
-    public const string POOL_CONFIG_JSON_WITH_RELATIONSHIP_AND_MESSAGES = "pool-config-relationships";
-    public const string JSON_FILE_EXT = "json";
-
-    public const string WORKBOOK_SHEET_TEST_LOAD = "test";
-    public const string WORKBOOK_SHEET_LIGHT_LOAD = "light";
-    public const string WORKBOOK_SHEET_HEAVY_LOAD = "heavy";
-
     public const string TOTAL_NUMBER_OF_RELATIONSHIPS = "App.TotalNumberOfRelationships";
     public const string APP_TOTAL_NUMBER_OF_SENT_MESSAGES = "App.TotalNumberOfSentMessages";
     public const string CONNECTOR_TOTAL_NUMBER_OF_SENT_MESSAGES = "Connector.TotalNumberOfSentMessages";

diff --git a/...erformanceTestConfigurationExcelReader.cs → ...terfaces/IPoolConfigurationExcelReader.cs b/...erformanceTestConfigurationExcelReader.cs → ...terfaces/IPoolConfigurationExcelReader.cs
@@ -2,7 +2,7 @@
 
 namespace Backbone.ConsumerApi.Tests.Performance.SnapshotCreator.V2.Features.Shared.Interfaces;
 
-public interface IPerformanceTestConfigurationExcelReader
+public interface IPoolConfigurationExcelReader
 {
     Task<PerformanceTestConfiguration> Read(string filePath, string workSheet);
 }
diff --git a/...es/IPerformanceTestConfigurationReader.cs → ...ed/Interfaces/IPoolConfigurationReader.cs b/...es/IPerformanceTestConfigurationReader.cs → ...ed/Interfaces/IPoolConfigurationReader.cs
@@ -2,7 +2,7 @@
 
 namespace Backbone.ConsumerApi.Tests.Performance.SnapshotCreator.V2.Features.Shared.Interfaces;
 
-public interface IPerformanceTestConfigurationJsonReader
+public interface IPoolConfigurationJsonReader
 {
     Task<PerformanceTestConfiguration> Read(string filePath);
 }
diff --git a/...PerformanceTestConfigurationReaderBase.cs → ...aders/Base/PoolConfigurationReaderBase.cs b/...PerformanceTestConfigurationReaderBase.cs → ...aders/Base/PoolConfigurationReaderBase.cs
@@ -1,6 +1,6 @@
 namespace Backbone.ConsumerApi.Tests.Performance.SnapshotCreator.V2.Features.Shared.Readers.Base;
 
-public abstract class PerformanceTestConfigurationReaderBase
+public abstract class PoolConfigurationReaderBase
 {
     protected abstract string[] ValidExtensions { get; }
 

diff --git a/...erformanceTestConfigurationExcelReader.cs → ...d/Readers/PoolConfigurationExcelReader.cs b/...erformanceTestConfigurationExcelReader.cs → ...d/Readers/PoolConfigurationExcelReader.cs
@@ -5,7 +5,7 @@
 
 namespace Backbone.ConsumerApi.Tests.Performance.SnapshotCreator.V2.Features.Shared.Readers;
 
-public class PerformanceTestConfigurationExcelReader : PerformanceTestConfigurationReaderBase, IPerformanceTestConfigurationExcelReader
+public class PoolConfigurationExcelReader : PoolConfigurationReaderBase, IPoolConfigurationExcelReader
 {
     protected override string[] ValidExtensions { get; } = [".xlsx", ".xls"];
 

diff --git a/...PerformanceTestConfigurationJsonReader.cs → ...ed/Readers/PoolConfigurationJsonReader.cs b/...PerformanceTestConfigurationJsonReader.cs → ...ed/Readers/PoolConfigurationJsonReader.cs
@@ -5,7 +5,7 @@
 
 namespace Backbone.ConsumerApi.Tests.Performance.SnapshotCreator.V2.Features.Shared.Readers;
 
-public class PerformanceTestConfigurationJsonReader : PerformanceTestConfigurationReaderBase, IPerformanceTestConfigurationJsonReader
+public class PoolConfigurationJsonReader : PoolConfigurationReaderBase, IPoolConfigurationJsonReader
 {
     protected override string[] ValidExtensions { get; } = [".json"];
 

diff --git a/....Performance/tools/snapshot-creator-v2/Features/Verify/IPoolConfigurationJsonValidator.cs b/....Performance/tools/snapshot-creator-v2/Features/Verify/IPoolConfigurationJsonValidator.cs
@@ -4,5 +4,5 @@ namespace Backbone.ConsumerApi.Tests.Performance.SnapshotCreator.V2.Features.Ver
 
 public interface IPoolConfigurationJsonValidator
 {
-    Task<bool> Validate(PerformanceTestConfiguration poolConfigJsonFile, PerformanceTestConfiguration poolConfigFromExcel);
+    Task<bool> Validate(PerformanceTestConfiguration poolConfigurationFromJson, PerformanceTestConfiguration poolConfigurationFromExcel);
 }
diff --git a/...s.Performance/tools/snapshot-creator-v2/Features/Verify/PoolConfigurationJsonValidator.cs b/...s.Performance/tools/snapshot-creator-v2/Features/Verify/PoolConfigurationJsonValidator.cs
@@ -4,9 +4,9 @@ namespace Backbone.ConsumerApi.Tests.Performance.SnapshotCreator.V2.Features.Ver
 
 public class PoolConfigurationJsonValidator : IPoolConfigurationJsonValidator
 {
-    public Task<bool> Validate(PerformanceTestConfiguration poolConfigJsonFile, PerformanceTestConfiguration poolConfigFromExcel)
+    public Task<bool> Validate(PerformanceTestConfiguration poolConfigurationFromJson, PerformanceTestConfiguration poolConfigurationFromExcel)
     {
-        var result = poolConfigJsonFile.Equals(poolConfigFromExcel);
+        var result = poolConfigurationFromJson.Equals(poolConfigurationFromExcel);
         return Task.FromResult(result);
     }
 }
diff --git a/...t/ConsumerApi.Tests.Performance/tools/snapshot-creator-v2/Features/Verify/VerifyConfig.cs b/...t/ConsumerApi.Tests.Performance/tools/snapshot-creator-v2/Features/Verify/VerifyConfig.cs
@@ -9,20 +9,20 @@ public record VerifyConfig
     public record Command(string ExcelFilePath, string WorkSheetName, string JsonFilePath) : IRequest<bool>;
 
     public record CommandHandler(
-        IPerformanceTestConfigurationExcelReader PerformanceTestConfigurationExcelReader,
-        IPerformanceTestConfigurationJsonReader PerformanceTestConfigurationJsonReader,
+        IPoolConfigurationExcelReader PoolConfigurationExcelReader,
+        IPoolConfigurationJsonReader PoolConfigurationJsonReader,
         IRelationshipAndMessagesGenerator RelationshipAndMessagesGenerator,
         IPoolConfigurationJsonValidator PoolConfigurationJsonValidator) : IRequestHandler<Command, bool>
     {
         public async Task<bool> Handle(Command request, CancellationToken cancellationToken)
         {
-            var poolConfigFromExcel = await PerformanceTestConfigurationExcelReader.Read(request.ExcelFilePath, request.WorkSheetName);
+            var poolConfigFromExcel = await PoolConfigurationExcelReader.Read(request.ExcelFilePath, request.WorkSheetName);
 
             var relationshipAndMessages = RelationshipAndMessagesGenerator.Generate(poolConfigFromExcel);
             poolConfigFromExcel.RelationshipAndMessages.Clear();
             poolConfigFromExcel.RelationshipAndMessages.AddRange(relationshipAndMessages);
 
-            var poolConfigFromJson = await PerformanceTestConfigurationJsonReader.Read(request.JsonFilePath);
+            var poolConfigFromJson = await PoolConfigurationJsonReader.Read(request.JsonFilePath);
 
             var result = await PoolConfigurationJsonValidator.Validate(poolConfigFromJson, poolConfigFromExcel);
 

diff --git a/...tions/ConsumerApi/test/ConsumerApi.Tests.Performance/tools/snapshot-creator-v2/Program.cs b/...tions/ConsumerApi/test/ConsumerApi.Tests.Performance/tools/snapshot-creator-v2/Program.cs
@@ -19,10 +19,11 @@ private static Task<int> Main(string[] args)
             {
                 services.AddMediatR(configuration => configuration.RegisterServicesFromAssemblyContaining<Program>());
 
-                services.AddSingleton<IPerformanceTestConfigurationExcelReader, PerformanceTestConfigurationExcelReader>();
+                services.AddSingleton<IPoolConfigurationExcelReader, PoolConfigurationExcelReader>();
                 services.AddSingleton<IPoolConfigurationJsonWriter, PoolConfigurationJsonWriter>();
-                services.AddSingleton<IPerformanceTestConfigurationJsonReader, PerformanceTestConfigurationJsonReader>();
+                services.AddSingleton<IPoolConfigurationJsonReader, PoolConfigurationJsonReader>();
                 services.AddSingleton<IPoolConfigurationJsonValidator, PoolConfigurationJsonValidator>();
+
                 services.AddSingleton<IRelationshipAndMessagesGenerator, RelationshipAndMessagesGenerator>();
             })
             .RunCommandLineApplicationAsync(args, app =>