Remove legacy backend files and update microservices config

- Delete ARCHITECTURE.md and old services directory - Add sensor-service
and data-ingestion-service to Docker Compose - Comment out unused
services in docker-compose.yml - Update deploy.sh to use `docker
compose` command - Extend API gateway to proxy sensor-service routes and
WebSocket - Refactor health checks and service dependencies

microservices/docker-compose.yml

@@ -1,4 +1,4 @@
-version: '3.8'
+version: "3.8"
 
 services:
   # Database Services
@@ -41,17 +41,19 @@ services:
       - MONGO_URL=mongodb://admin:password123@mongodb:27017/energy_dashboard?authSource=admin
       - REDIS_URL=redis://redis:6379
       - TOKEN_SERVICE_URL=http://token-service:8001
+      - SENSOR_SERVICE_URL=http://sensor-service:8007
       - BATTERY_SERVICE_URL=http://battery-service:8002
       - DEMAND_RESPONSE_SERVICE_URL=http://demand-response-service:8003
       - P2P_TRADING_SERVICE_URL=http://p2p-trading-service:8004
       - FORECASTING_SERVICE_URL=http://forecasting-service:8005
       - IOT_CONTROL_SERVICE_URL=http://iot-control-service:8006
+      - DATA_INGESTION_SERVICE_URL=http://data-ingestion-service:8008
     depends_on:
       - mongodb
       - redis
       - token-service
-      - battery-service
-      - demand-response-service
+      # - battery-service
+      # - demand-response-service
     networks:
       - energy-network
 
@@ -73,92 +75,134 @@ services:
       - energy-network
 
   # Battery Management Service
-  battery-service:
-    build:
-      context: ./battery-service
-      dockerfile: Dockerfile
-    container_name: energy-battery-service
-    restart: unless-stopped
-    ports:
-      - "8002:8002"
-    environment:
-      - MONGO_URL=mongodb://admin:password123@mongodb:27017/energy_dashboard_batteries?authSource=admin
-      - REDIS_URL=redis://redis:6379
-    depends_on:
-      - mongodb
-      - redis
-    networks:
-      - energy-network
+  # battery-service:
+  #   build:
+  #     context: ./battery-service
+  #     dockerfile: Dockerfile
+  #   container_name: energy-battery-service
+  #   restart: unless-stopped
+  #   ports:
+  #     - "8002:8002"
+  #   environment:
+  #     - MONGO_URL=mongodb://admin:password123@mongodb:27017/energy_dashboard_batteries?authSource=admin
+  #     - REDIS_URL=redis://redis:6379
+  #   depends_on:
+  #     - mongodb
+  #     - redis
+  #   networks:
+  #     - energy-network
 
   # Demand Response Service
-  demand-response-service:
-    build:
-      context: ./demand-response-service
-      dockerfile: Dockerfile
-    container_name: energy-demand-response-service
-    restart: unless-stopped
-    ports:
-      - "8003:8003"
-    environment:
-      - MONGO_URL=mongodb://admin:password123@mongodb:27017/energy_dashboard_demand_response?authSource=admin
-      - REDIS_URL=redis://redis:6379
-      - IOT_CONTROL_SERVICE_URL=http://iot-control-service:8006
-    depends_on:
-      - mongodb
-      - redis
-    networks:
-      - energy-network
+  # demand-response-service:
+  #   build:
+  #     context: ./demand-response-service
+  #     dockerfile: Dockerfile
+  #   container_name: energy-demand-response-service
+  #   restart: unless-stopped
+  #   ports:
+  #     - "8003:8003"
+  #   environment:
+  #     - MONGO_URL=mongodb://admin:password123@mongodb:27017/energy_dashboard_demand_response?authSource=admin
+  #     - REDIS_URL=redis://redis:6379
+  #     - IOT_CONTROL_SERVICE_URL=http://iot-control-service:8006
+  #   depends_on:
+  #     - mongodb
+  #     - redis
+  #   networks:
+  #     - energy-network
 
   # P2P Trading Service
-  p2p-trading-service:
-    build:
-      context: ./p2p-trading-service
-      dockerfile: Dockerfile
-    container_name: energy-p2p-trading-service
-    restart: unless-stopped
-    ports:
-      - "8004:8004"
-    environment:
-      - MONGO_URL=mongodb://admin:password123@mongodb:27017/energy_dashboard_p2p?authSource=admin
-      - REDIS_URL=redis://redis:6379
-    depends_on:
-      - mongodb
-      - redis
-    networks:
-      - energy-network
+  # p2p-trading-service:
+  #   build:
+  #     context: ./p2p-trading-service
+  #     dockerfile: Dockerfile
+  #   container_name: energy-p2p-trading-service
+  #   restart: unless-stopped
+  #   ports:
+  #     - "8004:8004"
+  #   environment:
+  #     - MONGO_URL=mongodb://admin:password123@mongodb:27017/energy_dashboard_p2p?authSource=admin
+  #     - REDIS_URL=redis://redis:6379
+  #   depends_on:
+  #     - mongodb
+  #     - redis
+  #   networks:
+  #     - energy-network
 
   # Forecasting Service
-  forecasting-service:
+  # forecasting-service:
+  #   build:
+  #     context: ./forecasting-service
+  #     dockerfile: Dockerfile
+  #   container_name: energy-forecasting-service
+  #   restart: unless-stopped
+  #   ports:
+  #     - "8005:8005"
+  #   environment:
+  #     - MONGO_URL=mongodb://admin:password123@mongodb:27017/energy_dashboard_forecasting?authSource=admin
+  #     - REDIS_URL=redis://redis:6379
+  #   depends_on:
+  #     - mongodb
+  #     - redis
+  #   networks:
+  #     - energy-network
+
+  # IoT Control Service
+  # iot-control-service:
+  #   build:
+  #     context: ./iot-control-service
+  #     dockerfile: Dockerfile
+  #   container_name: energy-iot-control-service
+  #   restart: unless-stopped
+  #   ports:
+  #     - "8006:8006"
+  #   environment:
+  #     - MONGO_URL=mongodb://admin:password123@mongodb:27017/energy_dashboard_iot?authSource=admin
+  #     - REDIS_URL=redis://redis:6379
+  #     - BATTERY_SERVICE_URL=http://battery-service:8002
+  #     - DEMAND_RESPONSE_SERVICE_URL=http://demand-response-service:8003
+  #   depends_on:
+  #     - mongodb
+  #     - redis
+  #   networks:
+  #     - energy-network
+
+  # Data Ingestion Service (FTP Monitoring & SA4CPS Integration)
+  data-ingestion-service:
     build:
-      context: ./forecasting-service
+      context: ./data-ingestion-service
       dockerfile: Dockerfile
-    container_name: energy-forecasting-service
+    container_name: energy-data-ingestion-service
     restart: unless-stopped
     ports:
-      - "8005:8005"
+      - "8008:8008"
     environment:
-      - MONGO_URL=mongodb://admin:password123@mongodb:27017/energy_dashboard_forecasting?authSource=admin
+      - MONGO_URL=mongodb://admin:password123@mongodb:27017/energy_dashboard_ingestion?authSource=admin
       - REDIS_URL=redis://redis:6379
+      - FTP_SA4CPS_HOST=ftp.sa4cps.pt
+      - FTP_SA4CPS_PORT=21
+      - FTP_SA4CPS_USERNAME=anonymous
+      - FTP_SA4CPS_PASSWORD=
+      - FTP_SA4CPS_REMOTE_PATH=/
     depends_on:
       - mongodb
       - redis
     networks:
       - energy-network
 
-  # IoT Control Service
-  iot-control-service:
+  # Sensor Management Service (Original Dashboard Functionality)
+  sensor-service:
     build:
-      context: ./iot-control-service
+      context: ./sensor-service
       dockerfile: Dockerfile
-    container_name: energy-iot-control-service
+    container_name: energy-sensor-service
     restart: unless-stopped
     ports:
-      - "8006:8006"
+      - "8007:8007"
     environment:
-      - MONGO_URL=mongodb://admin:password123@mongodb:27017/energy_dashboard_iot?authSource=admin
+      - MONGO_URL=mongodb://admin:password123@mongodb:27017/energy_dashboard_sensors?authSource=admin
       - REDIS_URL=redis://redis:6379
-      - BATTERY_SERVICE_URL=http://battery-service:8002
-      - DEMAND_RESPONSE_SERVICE_URL=http://demand-response-service:8003
+      - TOKEN_SERVICE_URL=http://token-service:8001
     depends_on:
       - mongodb
       - redis
@@ -190,4 +234,4 @@ volumes:
   mongodb_data:
     name: energy-mongodb-data
   redis_data:
-    name: energy-redis-data
+    name: energy-redis-data