bug fixes

.gitignore

@@ -363,4 +363,4 @@ MigrationBackup/
 FodyWeavers.xsd
 
 # Rider
-.idea
+.idea

external-services.yml

@@ -32,8 +32,8 @@ services:
     image: docker.elastic.co/elasticsearch/elasticsearch:7.9.2
     ports:
       - 9200:9200
-    volumes:
-      - elasticsearch-data:/usr/share/elasticsearch/data
+#    volumes:
+#      - elasticsearch-data:/usr/share/elasticsearch/data
     environment:
       - xpack.monitoring.enabled=true
       - xpack.watcher.enabled=false

internal-services.yml

@@ -39,6 +39,8 @@ services:
       dockerfile: src/Gateway/Gateway.WebAPI/Dockerfile
     environment:
       ASPNETCORE_ENVIRONMENT: Production
+    ports:
+      - 5043:80
     depends_on:
       - expiry_check_api
       - shortener_api

src/Buffer/Infrastructure/Queries/GetAllUrlsFromBufferQueryHandler.cs

@@ -33,7 +33,9 @@ public async Task<UrlEnumerableDto> Handle(GetAllUrlsFromBufferQuery request, Ca
                 logger.LogInformation($"Request was handled by {nameof(GetAllUrlsFromBufferQueryHandler)}");
                 var sql = @"SELECT ""Id"", ""LongUrl"", ""ShortPath"", ""CreatedDate"", ""LastRequestedDate"", ""RequestCounter"", ""ExpireDate"", ""IsPublic"" 
 FROM public.""Urls"" 
-WHERE  ""IsPublic"" = true;";
+WHERE  ""IsPublic"" = true
+ORDER BY ""CreatedDate"" DESC;
+";
                 var result = await connection.QueryAsync<UrlDto>(sql);
                 logger.LogInformation($"Executed Query:{Environment.NewLine}\t{sql}");
                 ArgumentNullException.ThrowIfNull(result);

src/Shortener/Infrastructure/Commands/ReachUrlCommandHandler.cs

@@ -30,12 +30,12 @@ public async Task<ReachUrlDto> Handle(ReachUrlCommand request, CancellationToken
             var url = await dbContext.Urls.FirstOrDefaultAsync(p => p.ShortPath == request.ShortPath);
             if (url == null)
             {
-                return new() { Message = "an error occurred" };
+                return new() { Message = string.Empty };
             }
             url.RequestCounter++;
             url.LastRequestedDate = DateTime.UtcNow;
             await dbContext.SaveChangesAsync();
-            return new() { Message = "it is okay" };
+            return new() { Message = url.LongUrl };
         }
     }
 }

src/Shortener/Infrastructure/Services/OutboxWorker.cs

@@ -63,7 +63,6 @@ private async Task PublishOutboxMessages(CancellationToken stoppingToken)
                     _logger.LogWarning(ex.ToJsonString());
                 }
             }
-
             await Task.Delay(TimeSpan.FromSeconds(5), stoppingToken);
         }
     }

src/Utils/Shared/Extensions/SharedExtensions.cs

@@ -1,9 +1,5 @@
 using System.Collections;
-using System.Reflection;
 using System.Text.Json;
-using Microsoft.Extensions.Configuration;
-using Serilog;
-using Serilog.Sinks.Elasticsearch;
 
 namespace Shared.Extensions
 {
@@ -29,35 +25,5 @@ public static string ToJsonString(this Exception ex)
             var jsonException = JsonSerializer.Serialize(exceptionDetails, new JsonSerializerOptions { WriteIndented = true });
             return jsonException;
         }
-
-        public static void ConfigureLogging()
-        {
-            var environment = Environment.GetEnvironmentVariable("ASPNETCORE_ENVIRONMENT");
-            var configuration = new ConfigurationBuilder()
-                .AddJsonFile("appsettings.json", optional: false, reloadOnChange: true)
-                .AddJsonFile(
-                    $"appsettings.{Environment.GetEnvironmentVariable("ASPNETCORE_ENVIRONMENT")}.json",
-                    optional: true)
-                .Build();
-
-            Log.Logger = new LoggerConfiguration()
-                .Enrich.FromLogContext()
-                .Enrich.WithMachineName()
-                .WriteTo.Debug()
-                .WriteTo.Console()
-                .WriteTo.Elasticsearch(ConfigureElasticSink(configuration, environment))
-                .Enrich.WithProperty("Environment", environment)
-                .ReadFrom.Configuration(configuration)
-                .CreateLogger();
-        }
-
-        private static ElasticsearchSinkOptions ConfigureElasticSink(IConfigurationRoot configuration, string environment)
-        {
-            return new ElasticsearchSinkOptions(new Uri(configuration["ElasticConfiguration:Uri"]))
-            {
-                AutoRegisterTemplate = true,
-                IndexFormat = $"{Assembly.GetExecutingAssembly().GetName().Name.ToLower().Replace(".", "-")}-{environment?.ToLower().Replace(".", "-")}-{DateTime.UtcNow:yyyy-MM}"
-            };
-        }
     }
 }

src/Utils/Shared/Shared.csproj

@@ -5,12 +5,5 @@
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
   </PropertyGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Serilog.AspNetCore" Version="7.0.0" />
-    <PackageReference Include="Serilog.Enrichers.Environment" Version="2.2.0" />
-    <PackageReference Include="Serilog.Sinks.Debug" Version="2.0.0" />
-    <PackageReference Include="Serilog.Sinks.Elasticsearch" Version="9.0.3" />
-  </ItemGroup>
-
+
 </Project>