Refactoring

.github/workflows/dotnet.yml

@@ -29,9 +29,7 @@ jobs:
 
     - name: Test
       env:
-        hostname: ${{ secrets.HOSTNAME }}
-        port: ${{ secrets.PORT }}
-        username: ${{ secrets.USERNAME }}
-        password: ${{ secrets.PASSWORD }}
+        database: ${{ secrets.CONN_SQLSERVER }}
+        rabbitServer: ${{ secrets.CONN_RABBITMQ }}
       run: dotnet test --no-build --verbosity normal
       working-directory: ./src/GestioneSagre.Utility.IntegrationTest

src/GestioneSagre.Utility.BusinessLayer/MassTransit/ConfigureService.cs

@@ -2,7 +2,7 @@
 
 public static class ConfigureService
 {
-    public static void AddMassTransitService(this IServiceCollection services, IConfigurationSection rabbitConfig)
+    public static void AddMassTransitService(this IServiceCollection services, IConfigurationSection rabbitConfig, string serverRabbit)
     {
         services.AddMassTransit(x =>
         {
@@ -12,12 +12,11 @@ public static void AddMassTransitService(this IServiceCollection services, IConf
             x.SetKebabCaseEndpointNameFormatter();
             x.UsingRabbitMq((context, cfg) =>
             {
-                cfg.Host(rabbitConfig["Hostname"], rabbitConfig["VirtualHost"], h =>
+                cfg.Host(serverRabbit.Split("@")[1], rabbitConfig["VirtualHost"], h =>
                 {
-                    h.Username(rabbitConfig["Username"]);
-                    h.Password(rabbitConfig["Password"]);
+                    h.Username(serverRabbit.Split(":")[0]);
+                    h.Password(serverRabbit.Split(":")[1]);
                 });
-
                 cfg.ReceiveEndpoint(rabbitConfig["NameResponse-1"], e =>
                 {
                     e.Durable = Convert.ToBoolean(rabbitConfig["Durable"]);

src/GestioneSagre.Utility.IntegrationTest/IntegrationTest.cs

@@ -71,22 +71,14 @@ private static WebApplicationFactory<Startup> GenerateAppFactory()
             .AddUserSecrets<Startup>()
             .Build();
 
-        var hostname = config["ConnectionStrings:Hostname"];
-        var port = config["ConnectionStrings:Port"];
-        var username = config["ConnectionStrings:Username"];
-        var password = config["ConnectionStrings:Password"];
-
-        var database = $"Data Source={hostname},{port};Initial Catalog=GestioneSagre-Utility-Test;";
-        var profile = $"User ID={username};Password={password};Encrypt=False";
-        var connectionString = string.Concat(database, profile);
-
+        var database = config["ConnectionStrings:Default"];
         var application = new WebApplicationFactory<Startup>()
             .WithWebHostBuilder(builder =>
             {
                 builder.ConfigureTestServices(services =>
                 {
                     var options = new DbContextOptionsBuilder<UtilityDbContext>()
-                    .UseSqlServer(connectionString)
+                    .UseSqlServer(database)
                     .Options;
 
                     services.AddSingleton(options);

src/GestioneSagre.Utility/Startup.cs

@@ -1,4 +1,7 @@
-namespace GestioneSagre.Utility;
+using NET6CustomLibrary.MailKit.Options;
+using NET6CustomLibrary.RedisCache.Services;
+
+namespace GestioneSagre.Utility;
 
 public class Startup
 {
@@ -53,11 +56,25 @@ public void ConfigureServices(IServiceCollection services)
         services.AddTransient<IUtilityService, UtilityService>();
         services.AddHealthChecksUISQLServer<UtilityDbContext>("SQL Server", connectionString);
 
-        services.AddRedisCacheService(Configuration);
+        //services.AddRedisCacheService(Configuration);
+        var redisConfig = Configuration.GetSection("Redis");
+        var redisHost = redisConfig["Hostname"];
+
+        services.AddStackExchangeRedisCache(options =>
+        {
+            options.Configuration = redisHost;
+            options.InstanceName = redisConfig["InstanceName"];
+        });
+
+        services.AddTransient<ICacheService, CacheService>();
+        services.Configure<RedisOptions>(redisConfig);
+
         services.AddMediatR(cfg => cfg.RegisterServicesFromAssembly(typeof(GetScontrinoPagatoHandler).Assembly));
 
         var rabbitConfig = Configuration.GetSection("RabbitMQ");
-        services.AddMassTransitService(rabbitConfig);
+        var rabbitServer = $"{rabbitConfig["Username"]}:{rabbitConfig["Password"]}@{rabbitConfig["Hostname"]}";
+
+        services.AddMassTransitService(rabbitConfig, rabbitServer);
 
         services.Configure<KestrelServerOptions>(Configuration.GetSection("Kestrel"));
         services.Configure<RouteOptions>(options => options.LowercaseUrls = true);