unify mail service and user service (#3)

* reorganize mail service and user service under unified

* bridge services

* enable service to run as one

* minor fixes

* Move start.sh

Author: techpixel

docker-compose.yml

@@ -11,8 +11,7 @@ services:
       - midnight-network
     depends_on:
       - lark-ui
-      - user-service
-      - mail-service
+      - unified-service
 
   # Frontend UI - SvelteKit Application
   lark-ui:
@@ -28,35 +27,21 @@ services:
     expose:
       - "5173"
 
-  # User Service - NestJS API
-  user-service:
+  # Unified Service - NestJS API
+  unified-service:
     build:
       context: .
-      dockerfile: ./owl-api/user-service/Dockerfile
+      dockerfile: ./owl-api/unified-service/Dockerfile
     environment:
       - NODE_ENV=production
       - PORT=3002
-      - MAIL_SERVICE_URL=http://mail-service:3003
+      - MAIL_SERVICE_URL=http://unified-service:3002
     restart: unless-stopped
     networks:
       - midnight-network
     expose:
       - "3002"
 
-  # Mail Service - NestJS API
-  mail-service:
-    build:
-      context: .
-      dockerfile: ./owl-api/mail-service/Dockerfile
-    environment:
-      - NODE_ENV=production
-      - MAIL_SERVICE_PORT=3003
-    restart: unless-stopped
-    networks:
-      - midnight-network
-    expose:
-      - "3003"
-
 networks:
   midnight-network:
     driver: bridge

gateway/Dockerfile

@@ -18,8 +18,8 @@ FROM base AS runner
 WORKDIR /app
 ENV NODE_ENV=production
 ENV PORT=3000
-ENV USER_SERVICE_URL=http://user-service:3002
-ENV MAIL_SERVICE_URL=http://mail-service:3003
+ENV USER_SERVICE_URL=http://unified-service:3002
+ENV MAIL_SERVICE_URL=http://unified-service:3002
 ENV UI_SERVICE_URL=http://lark-ui:5173
 
 RUN addgroup --system --gid 1001 nodejs

gateway/src/main.ts

@@ -11,7 +11,7 @@ if (process.env.NODE_ENV !== 'production') {
 const app = express();
 const PORT = process.env.PORT || 3000;
 const USER_SERVICE_URL = process.env.USER_SERVICE_URL || 'http://localhost:3002';
-const MAIL_SERVICE_URL = process.env.MAIL_SERVICE_URL || 'http://localhost:3003';
+const MAIL_SERVICE_URL = process.env.MAIL_SERVICE_URL || 'http://localhost:3002';
 const UI_SERVICE_URL = process.env.UI_SERVICE_URL || 'http://localhost:5173';
 
 app.use(cors());
@@ -73,7 +73,7 @@ app.use('/', createProxyMiddleware({
 app.listen(PORT, () => {
   console.log(`🌙 Gateway ready at http://localhost:${PORT}`);
   console.log(`   /           → UI (${UI_SERVICE_URL})`);
-  console.log(`   /api/user/* → User Service (${USER_SERVICE_URL})`);
+  console.log(`   /api/* → Unified Service (${USER_SERVICE_URL})`);
   console.log(`   Mail Service (${MAIL_SERVICE_URL}) - Internal only`);
 });