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/deploy.sh

@@ -36,30 +36,30 @@ print_error() {
 # Function to check if Docker and Docker Compose are installed
 check_dependencies() {
     print_status "Checking dependencies..."
-    
+
     if ! command -v docker &> /dev/null; then
         print_error "Docker is not installed. Please install Docker first."
         exit 1
     fi
-    
-    if ! command -v docker-compose &> /dev/null; then
+
+    if ! command -v docker compose &> /dev/null; then
         print_error "Docker Compose is not installed. Please install Docker Compose first."
         exit 1
     fi
-    
+
     print_success "Dependencies check passed"
 }
 
 # Function to create necessary directories and files
 setup_environment() {
     print_status "Setting up environment..."
-    
+
     # Create nginx configuration directory
     mkdir -p nginx/ssl
-    
+
     # Create init-mongo directory for database initialization
     mkdir -p init-mongo
-    
+
     # Create a simple nginx configuration if it doesn't exist
     if [ ! -f "nginx/nginx.conf" ]; then
         cat > nginx/nginx.conf << 'EOF'
@@ -71,10 +71,10 @@ http {
     upstream api_gateway {
         server api-gateway:8000;
     }
-    
+
     server {
         listen 80;
-        
+
         location / {
             proxy_pass http://api_gateway;
             proxy_set_header Host $host;
@@ -82,7 +82,7 @@ http {
             proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
             proxy_set_header X-Forwarded-Proto $scheme;
         }
-        
+
         location /ws {
             proxy_pass http://api_gateway;
             proxy_http_version 1.1;
@@ -95,7 +95,7 @@ http {
 EOF
         print_success "Created nginx configuration"
     fi
-    
+
     # Create MongoDB initialization script if it doesn't exist
     if [ ! -f "init-mongo/init.js" ]; then
         cat > init-mongo/init.js << 'EOF'
@@ -124,16 +124,16 @@ print("MongoDB initialization completed");
 EOF
         print_success "Created MongoDB initialization script"
     fi
-    
+
     print_success "Environment setup completed"
 }
 
 # Function to build all services
 build_services() {
     print_status "Building all microservices..."
-    
-    docker-compose -f $COMPOSE_FILE build
-    
+
+    docker compose -f $COMPOSE_FILE build
+
     if [ $? -eq 0 ]; then
         print_success "All services built successfully"
     else
@@ -145,9 +145,9 @@ build_services() {
 # Function to start all services
 start_services() {
     print_status "Starting all services..."
-    
-    docker-compose -f $COMPOSE_FILE up -d
-    
+
+    docker compose -f $COMPOSE_FILE up -d
+
     if [ $? -eq 0 ]; then
         print_success "All services started successfully"
     else
@@ -159,9 +159,9 @@ start_services() {
 # Function to stop all services
 stop_services() {
     print_status "Stopping all services..."
-    
-    docker-compose -f $COMPOSE_FILE down
-    
+
+    docker compose -f $COMPOSE_FILE down
+
     print_success "All services stopped"
 }
 
@@ -174,19 +174,19 @@ restart_services() {
 # Function to show service status
 show_status() {
     print_status "Service status:"
-    docker-compose -f $COMPOSE_FILE ps
-    
+    docker compose -f $COMPOSE_FILE ps
+
     print_status "Service health checks:"
-    
+
     # Wait a moment for services to start
     sleep 5
-    
-    services=("api-gateway:8000" "token-service:8001" "battery-service:8002" "demand-response-service:8003")
-    
+
+    # services=("api-gateway:8000" "token-service:8001" "battery-service:8002" "demand-response-service:8003")
+    services=("api-gateway:8000" "token-service:8001")
     for service in "${services[@]}"; do
         name="${service%:*}"
         port="${service#*:}"
-        
+
         if curl -f -s "http://localhost:$port/health" > /dev/null; then
             print_success "$name is healthy"
         else
@@ -199,10 +199,10 @@ show_status() {
 view_logs() {
     if [ -z "$2" ]; then
         print_status "Showing logs for all services..."
-        docker-compose -f $COMPOSE_FILE logs -f
+        docker compose -f $COMPOSE_FILE logs -f
     else
         print_status "Showing logs for $2..."
-        docker-compose -f $COMPOSE_FILE logs -f $2
+        docker compose -f $COMPOSE_FILE logs -f $2
     fi
 }
 
@@ -212,7 +212,7 @@ cleanup() {
     read -r response
     if [[ "$response" =~ ^([yY][eE][sS]|[yY])$ ]]; then
         print_status "Cleaning up everything..."
-        docker-compose -f $COMPOSE_FILE down -v --rmi all
+        docker compose -f $COMPOSE_FILE down -v --rmi all
         docker system prune -f
         print_success "Cleanup completed"
     else
@@ -223,11 +223,11 @@ cleanup() {
 # Function to run database migrations or setup
 setup_database() {
     print_status "Setting up databases..."
-    
+
     # Wait for MongoDB to be ready
     print_status "Waiting for MongoDB to be ready..."
     sleep 10
-    
+
     # Run any additional setup scripts here
     print_success "Database setup completed"
 }
@@ -306,4 +306,4 @@ case "${1:-help}" in
         show_help
         exit 1
         ;;
-esac
+esac