REFACTOR data service

docker-compose.yml

@@ -18,7 +18,8 @@ volumes:
   auth_db_data:
   training_db_data:
   forecasting_db_data:
-  data_db_data:
+  sales_db_data:
+  external_db_data:
   tenant_db_data:
   notification_db_data:
   redis_data:
@@ -153,23 +154,44 @@ services:
       timeout: 5s
       retries: 5
 
-  data-db:
+  sales-db:
     image: postgres:15-alpine
-    container_name: bakery-data-db
+    container_name: bakery-sales-db
     restart: unless-stopped
     environment:
-      - POSTGRES_DB=${DATA_DB_NAME}
-      - POSTGRES_USER=${DATA_DB_USER}
-      - POSTGRES_PASSWORD=${DATA_DB_PASSWORD}
+      - POSTGRES_DB=${SALES_DB_NAME}
+      - POSTGRES_USER=${SALES_DB_USER}
+      - POSTGRES_PASSWORD=${SALES_DB_PASSWORD}
       - POSTGRES_INITDB_ARGS=${POSTGRES_INITDB_ARGS}
       - PGDATA=/var/lib/postgresql/data/pgdata
     volumes:
-      - data_db_data:/var/lib/postgresql/data
+      - sales_db_data:/var/lib/postgresql/data
     networks:
       bakery-network:
         ipv4_address: 172.20.0.23
     healthcheck:
-      test: ["CMD-SHELL", "pg_isready -U ${DATA_DB_USER} -d ${DATA_DB_NAME}"]
+      test: ["CMD-SHELL", "pg_isready -U ${SALES_DB_USER} -d ${SALES_DB_NAME}"]
+      interval: 10s
+      timeout: 5s
+      retries: 5
+
+  external-db:
+    image: postgres:15-alpine
+    container_name: bakery-external-db
+    restart: unless-stopped
+    environment:
+      - POSTGRES_DB=${EXTERNAL_DB_NAME}
+      - POSTGRES_USER=${EXTERNAL_DB_USER}
+      - POSTGRES_PASSWORD=${EXTERNAL_DB_PASSWORD}
+      - POSTGRES_INITDB_ARGS=${POSTGRES_INITDB_ARGS}
+      - PGDATA=/var/lib/postgresql/data/pgdata
+    volumes:
+      - external_db_data:/var/lib/postgresql/data
+    networks:
+      bakery-network:
+        ipv4_address: 172.20.0.26
+    healthcheck:
+      test: ["CMD-SHELL", "pg_isready -U ${EXTERNAL_DB_USER} -d ${EXTERNAL_DB_NAME}"]
       interval: 10s
       timeout: 5s
       retries: 5
@@ -409,7 +431,9 @@ services:
         condition: service_healthy
       auth-service:
         condition: service_healthy
-      data-service:
+      sales-service:
+        condition: service_healthy
+      external-service:
         condition: service_healthy
     networks:
       bakery-network:
@@ -468,21 +492,21 @@ services:
       timeout: 10s
       retries: 3
 
-  data-service:
+  sales-service:
     build:
       context: .
-      dockerfile: ./services/data/Dockerfile
+      dockerfile: ./services/sales/Dockerfile
       args:
         - ENVIRONMENT=${ENVIRONMENT}
         - BUILD_DATE=${BUILD_DATE}
-    image: bakery/data-service:${IMAGE_TAG}
-    container_name: bakery-data-service
+    image: bakery/sales-service:${IMAGE_TAG}
+    container_name: bakery-sales-service
     restart: unless-stopped
     env_file: .env
     ports:
-      - "${DATA_SERVICE_PORT}:8000"
+      - "${SALES_SERVICE_PORT}:8000"
     depends_on:
-      data-db:
+      sales-db:
         condition: service_healthy
       redis:
         condition: service_healthy
@@ -495,7 +519,42 @@ services:
         ipv4_address: 172.20.0.104
     volumes:
       - log_storage:/app/logs
-      - ./services/data:/app
+      - ./services/sales:/app
+      - ./shared:/app/shared
+    healthcheck:
+      test: ["CMD", "python", "-c", "import urllib.request; urllib.request.urlopen('http://localhost:8000/health').read()"]
+      interval: 30s
+      timeout: 10s
+      retries: 3
+
+  external-service:
+    build:
+      context: .
+      dockerfile: ./services/external/Dockerfile
+      args:
+        - ENVIRONMENT=${ENVIRONMENT}
+        - BUILD_DATE=${BUILD_DATE}
+    image: bakery/external-service:${IMAGE_TAG}
+    container_name: bakery-external-service
+    restart: unless-stopped
+    env_file: .env
+    ports:
+      - "${EXTERNAL_SERVICE_PORT}:8000"
+    depends_on:
+      external-db:
+        condition: service_healthy
+      redis:
+        condition: service_healthy
+      rabbitmq:
+        condition: service_healthy
+      auth-service:
+        condition: service_healthy
+    networks:
+      bakery-network:
+        ipv4_address: 172.20.0.107
+    volumes:
+      - log_storage:/app/logs
+      - ./services/external:/app
       - ./shared:/app/shared
     healthcheck:
       test: ["CMD", "curl", "-f", "http://localhost:8000/health"]