Refactor configuration management and remove unused development settings

Author: sentemon

backend/src/AuthService/AuthService.Api/Program.cs

@@ -1,10 +1,14 @@
 using AuthService.Application;
+using AuthService.Domain.Constants;
 using AuthService.Infrastructure;
 using AuthService.Persistence;
 using Microsoft.EntityFrameworkCore;
 
 var builder = WebApplication.CreateBuilder(args);
-builder.WebHost.UseUrls("http://0.0.0.0:8082");
+
+var hostingUrl = builder.Configuration[AppSettingsConstants.WebHostUrl];
+
+builder.WebHost.UseUrls(hostingUrl ?? throw new ArgumentNullException(nameof(hostingUrl), "Hosting URL is not configured."));
 
 builder.Services
     .AddPersistenceServices(builder.Configuration)

backend/src/AuthService/AuthService.Api/appsettings.Development.json

@@ -5,5 +5,9 @@
       "Microsoft.AspNetCore": "Warning"
     }
   },
-  "AllowedHosts": "*"
+  "AllowedHosts": "*",
+  "ConnectionStrings": {
+    "DefaultConnection": "Host=localhost;Port=5432;Username=postgres;Password=mysecretpasswordfordevelopment;Database=AuthDb"
+  },
+  "WebHostUrl": "http://0.0.0.0:8082"
 }

backend/src/AuthService/AuthService.Api/appsettings.json

@@ -0,0 +1,6 @@
+namespace AuthService.Domain.Constants;
+
+public static class AppSettingsConstants
+{
+    public const string WebHostUrl = "WebHostUrl";
+}

backend/src/AuthService/AuthService.Domain/Constants/AppSettingsConstants.cs

@@ -13,7 +13,6 @@ public class User
 
     public User(string externalId, string firstName, string lastName, string username, string email, string imageUrl)
     {
-        Id = Guid.NewGuid();
         ExternalId = externalId;
         FirstName = firstName;
         LastName = lastName;

backend/src/AuthService/AuthService.Domain/Entities/User.cs

@@ -6,7 +6,7 @@ ARG ASPNETCORE_ENVIRONMENT
 ARG DB_CONNECTION_STRING
 
 ENV ASPNETCORE_ENVIRONMENT=${ASPNETCORE_ENVIRONMENT:-Docker}
-ENV ConnectionStrings__DefaultConnection=${DB_CONNECTION_STRING:-Host=postgres-posts;Port=5432;Username=postgres;Password=mysecretpasswordfordevelopment;Database=posts-db}
+ENV ConnectionStrings__DefaultConnection=${DB_CONNECTION_STRING:-Host=postgres;Port=5432;Username=postgres;Password=mysecretpasswordfordevelopment;Database=PostsDb}
 
 RUN apt-get update && apt-get install -y curl && apt-get clean
 

backend/src/PostService/Dockerfile

@@ -2,11 +2,15 @@
 using PostService.Api.GraphQL.Mutations;
 using PostService.Api.GraphQL.Queries;
 using PostService.Application;
+using PostService.Domain.Constants;
 using PostService.Infrastructure;
 using PostService.Persistence;
 
 var builder = WebApplication.CreateBuilder(args);
-builder.WebHost.UseUrls("http://0.0.0.0:8081");
+
+var hostingUrl = builder.Configuration[AppSettingsConstants.WebHostUrl];
+
+builder.WebHost.UseUrls(hostingUrl ?? throw new ArgumentNullException(nameof(hostingUrl), "Hosting URL is not configured."));
 
 builder.Services
     .AddPersistenceServices(builder.Configuration)

backend/src/PostService/PostService.Api/Program.cs

@@ -5,5 +5,9 @@
       "Microsoft.AspNetCore": "Warning"
     }
   },
-  "AllowedHosts": "*"
+  "AllowedHosts": "*",
+  "ConnectionStrings": {
+    "DefaultConnection": "Host=localhost;Port=5432;Username=postgres;Password=mysecretpasswordfordevelopment;Database=PostsDb"
+  },
+  "WebHostUrl": "http://0.0.0.0:8081"
 }

backend/src/PostService/PostService.Api/appsettings.Development.json

@@ -0,0 +1,6 @@
+namespace PostService.Domain.Constants;
+
+public static class AppSettingsConstants
+{
+    public const string WebHostUrl = "WebHostUrl";
+}

backend/src/PostService/PostService.Api/appsettings.json

@@ -31,7 +31,6 @@ public Comment(Guid postId, Guid userId, string username, string content)
             throw new ArgumentException("Content cannot be empty or whitespace.", nameof(content));
         }
 
-        Id = Guid.NewGuid();
         PostId = postId;
         UserId = userId;
         Username = username;

backend/src/PostService/PostService.Domain/Constants/AppSettingsConstants.cs

@@ -19,7 +19,6 @@ public Like(Guid postId, Guid userId)
             throw new ArgumentException("UserId cannot be empty.", nameof(userId));
         }
 
-        Id = Guid.NewGuid();
         PostId = postId;
         UserId = userId;
         CreatedAt = DateTime.UtcNow;

backend/src/PostService/PostService.Domain/Entities/Comment.cs

@@ -23,7 +23,6 @@ private Post(Guid userId, string title, string description, string contentUrl, C
 
         ValidateContent(contentType, title, description, contentUrl);
 
-        Id = Guid.NewGuid();
         UserId = userId;
         Title = title;
         Description = description;

backend/src/PostService/PostService.Domain/Entities/Like.cs

@@ -24,7 +24,7 @@ services:
     ports:
       - "8081:8081"
     depends_on:
-      postgres-posts:
+      postgres:
         condition: service_healthy
     healthcheck:
       test: [ "CMD-SHELL", "curl -f http://post-service:8081/health || exit 1" ]
@@ -34,43 +34,22 @@ services:
     networks:
       - microservices
 
-  postgres-auth:
-    container_name: postgres-auth
+  postgres:
+    container_name: postgres
     image: postgres:15-alpine
     environment:
       POSTGRES_USER: postgres
       POSTGRES_PASSWORD: mysecretpasswordfordevelopment
-      POSTGRES_DB: auth-db
     ports:
-      - "5433:5432"
+      - "5432:5432"
     restart: always
     healthcheck:
       test: [ "CMD-SHELL", "pg_isready -U postgres" ]
       interval: 10s
       timeout: 5s
       retries: 5
     volumes:
-      - auth-service-data:/var/lib/postgresql/data
-    networks:
-      - microservices
-  
-  postgres-posts:
-    container_name: postgres-posts
-    image: postgres:15-alpine
-    environment:
-      POSTGRES_USER: postgres
-      POSTGRES_PASSWORD: mysecretpasswordfordevelopment
-      POSTGRES_DB: posts-db
-    ports:
-      - "5434:5432"
-    restart: always
-    healthcheck:
-      test: [ "CMD-SHELL", "pg_isready -U postgres" ]
-      interval: 10s
-      timeout: 5s
-      retries: 5
-    volumes:
-      - post-service-data:/var/lib/postgresql/data
+      - postgres-data:/var/lib/postgresql/data
     networks:
       - microservices
 
@@ -90,5 +69,4 @@ services:
       - microservices
 
 volumes:
-  auth-service-data:
-  post-service-data:
+  postgres-data: