Merge branch 'feature/add-tests' into develop

Author: MirkoZETA

.github/workflows/gke-cd.yml

@@ -1,37 +1,60 @@
-name: Deploy FNS API to Cloud Run (Separated Jobs)
+name: Branch-Specific Deploy FNS API to Cloud Run
 
 on:
   push:
     branches:
       - master
+      - feature/*
+      - develop
   pull_request:
     branches:
       - master
+      - feature/*
+      - develop
 
 jobs:
+  test:
+    name: Run Backend Tests
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v2
+
+      - name: Set up Python 3.9
+        uses: actions/setup-python@v2
+        with:
+          python-version: 3.9
+
+      - name: Install dependencies
+        run: pip install -r requirements.txt
+
+      - name: Run tests
+        run: python -m unittest tests/test_backend.py
+
   build-and-push-image:
     name: Build and Push Docker Image
     runs-on: ubuntu-latest
+    needs: test
+    if: github.ref == 'refs/heads/master' # Condition: Only run on master branch
     steps:
       - name: Checkout code
         uses: actions/checkout@v2
 
-      - name: Google Cloud Auth # Authenticate gcloud CLI
+      - name: Google Cloud Auth
         uses: google-github-actions/auth@v2
         with:
           credentials_json: ${{ secrets.GOOGLE_APPLICATION_CREDENTIALS }}
 
-      - name: Set up Google Cloud CLI # Set up gcloud CLI and Docker
+      - name: Set up Google Cloud CLI
         uses: google-github-actions/setup-gcloud@v2
         with:
           version: latest
           project_id: ${{ secrets.GOOGLE_PROJECT }}
 
-      - name: Configure Docker to push to Artifact Registry # Configure docker auth
-        run: |
-          gcloud auth configure-docker us-central1-docker.pkg.dev
+      - name: Configure Docker to push to Artifact Registry
+        run: gcloud auth configure-docker us-central1-docker.pkg.dev
 
-      - name: Build and Push Docker image to Artifact Registry # Build and push image
+      - name: Build and Push Docker image to Artifact Registry
         env:
           GOOGLE_PROJECT: ${{ secrets.GOOGLE_PROJECT }}
           IMAGE_NAME: us-central1-docker.pkg.dev/${{ secrets.GOOGLE_PROJECT }}/flex-net-sim-repo/fns-api
@@ -43,20 +66,21 @@ jobs:
   deploy-to-cloud-run:
     name: Deploy to Cloud Run
     runs-on: ubuntu-latest
-    needs: build-and-push-image # Ensure this job runs after build-and-push-image
+    needs: build-and-push-image
+    if: github.ref == 'refs/heads/master' # Condition: Only run on master branch
     steps:
-      - name: Checkout code (again, if needed for deploy steps - optional)
+      - name: Checkout code (again, if needed)
         uses: actions/checkout@v2
 
-      - name: Google Cloud Auth # Authenticate gcloud CLI
+      - name: Google Cloud Auth
         uses: google-github-actions/auth@v2
         with:
           credentials_json: ${{ secrets.GOOGLE_APPLICATION_CREDENTIALS }}
 
       - name: Deploy to Cloud Run
         uses: google-github-actions/deploy-cloudrun@v1
         with:
-          image: us-central1-docker.pkg.dev/${{ secrets.GOOGLE_PROJECT }}/flex-net-sim-repo/fns-api:latest # Use the same image as built
+          image: us-central1-docker.pkg.dev/${{ secrets.GOOGLE_PROJECT }}/flex-net-sim-repo/fns-api:latest
           service: fns-api-cloud-run
           region: us-central1
           project_id: ${{ secrets.GOOGLE_PROJECT }}

backend.py

@@ -2,8 +2,7 @@
 from flask import Flask, request, jsonify
 import subprocess
 import os
-import logging # Import the logging module
-import json
+import logging
 
 # --- Flask Setup --- 
 app = Flask(__name__)
@@ -29,14 +28,23 @@ def compile_simulation():
     os.remove(SIMULATION_EXECUTABLE)
 
   logger.info("Compiling simulation...")
+
+  # Check if main.cpp exists
+  if not os.path.exists("./src/main.cpp"):
+    COMPILE_ERROR = {"error": "main.cpp not found", "details": "Ensure main.cpp is in the correct directory."}
+    logger.error(f"Compilation failed: {COMPILE_ERROR['error']} - Details: {COMPILE_ERROR['details']}")
+    return False
   compile_result = subprocess.run(["g++", "-O3", "-o", SIMULATION_EXECUTABLE, "./src/main.cpp"], capture_output=True, text=True)
 
+  # Check if compilation was successful
   if compile_result.returncode != 0:
     COMPILE_ERROR = {"error": "Compilation failed", "details": compile_result.stderr}
     logger.error(f"Compilation failed: {COMPILE_ERROR['error']} - Details: {COMPILE_ERROR['details']}") # Use logger.error for errors
     return False
 
+  COMPILE_ERROR = None
   logger.info("Simulation compiled successfully.")
+  
   return True
 
 # --- Run Simulation Endpoint ---
@@ -48,12 +56,10 @@ def run_simulation():
     return jsonify(COMPILE_ERROR), 500
 
   if not os.path.exists(SIMULATION_EXECUTABLE):
-    return jsonify({"error": "Simulation executable not found. Contact developer."}), 400
+    return jsonify({"error": "Simulation executable not found. Contact developer."}), 500
 
   try:
     data = request.get_json()
-    # if not data:
-    #  return jsonify({"error": "Missing JSON parameters in request body."}), 400
 
     # Parameters, use default values if not provided
     algorithm = data.get("algorithm", "FirstFit")