test(location-service): Update unit-test.yml file

Author: SA-K1B

.github/workflows/unit-test.yml

@@ -1,11 +1,14 @@
 name: Unit Tests
+
 on:
   pull_request:
     branches:
       - main
+    types: [reopened, synchronize, opened]
+
   push:
     branches:
-      - test/locations
+      - main
 
 jobs:
   unit-tests:
@@ -58,8 +61,9 @@ jobs:
             DRIVER_PASSWORD_2: ${{ secrets.DRIVER_PASSWORD_2 }}
 
           run: |
-            docker compose -f ${{ env.SERVICE_CHANGED }}/docker-compose.dev.yml up --build --abort-on-container-exit ${{ env.SERVICE_CHANGED }}-test
-              
+              mkdir ${{ env.SERVICE_CHANGED }}/coverage-reports
+              docker compose -f ${{ env.SERVICE_CHANGED }}/docker-compose.dev.yml up --build --abort-on-container-exit ${{ env.SERVICE_CHANGED }}-test
+
 
         - name: Debug Coverage Report
           if: env.SERVICE_CHANGED != 'none'

location-service/app/db.py

@@ -1,15 +1,17 @@
 import os
 from sqlmodel import create_engine, Session
-# from app.core.config import settings
 
 DATABASE_URL = os.getenv("DATABASE_URL")
 
-engine = create_engine(DATABASE_URL, echo=True)
+engine = create_engine(
+    DATABASE_URL, 
+    pool_pre_ping=True
+)
 
 
 def get_session():
     """
     Dependency function to get a new database session.
     """
     with Session(engine) as session:
-        yield session
+        yield session

location-service/app/main.py

@@ -1,11 +1,20 @@
 from fastapi import FastAPI
 from app.api.main import router as location_router
+from fastapi.middleware.cors import CORSMiddleware
 
 app = FastAPI()
 
+app.add_middleware(
+    CORSMiddleware,
+    allow_origins=["*"],  # Allows all origins
+    allow_credentials=True,  # Allows cookies (useful for authentication)
+    allow_methods=["*"],  # Allows all HTTP methods (GET, POST, PUT, DELETE, etc.)
+    allow_headers=["*"],  # Allows all headers
+)
+
 app.include_router(location_router, prefix="/api", tags=["Location Service"])
 
 
 @app.get("/api", tags=["Root"])
 def read_root():
-    return {"message": "Welcome to the location-service"}
+    return {"message": "Welcome to the location-service"}

location-service/app/schemas/main.py

@@ -34,4 +34,4 @@ class ErrorResponse(BaseModel):
 
 class LocationRemoveResponse(BaseModel):
     success: bool
-    message: Optional[str] = None
+    message: Optional[str] = None

location-service/app/services/main.py

@@ -3,7 +3,7 @@
 from app.models.main import DriverLocation
 from geoalchemy2.functions import ST_GeomFromText
 
-INTERNAL_SERVER_ERROR_MSG = "Internal server error"
+INTERNAL_SERVER_ERROR_MSG = HTTPException(status_code=500, detail="Internal server error")
 
 
 def add_driver_location(
@@ -26,11 +26,13 @@ def add_driver_location(
         session.commit()
         return {"success": True}
 
-    except HTTPException:
+    except HTTPException as e:
+        print(e)
         session.rollback()
         raise
 
     except Exception as exc:
+        print(exc)
         session.rollback()
         raise INTERNAL_SERVER_ERROR_MSG from exc
 
@@ -94,4 +96,4 @@ def remove_driver_location(
 
     except Exception as exc:
         session.rollback()
-        raise INTERNAL_SERVER_ERROR from exc
+        raise INTERNAL_SERVER_ERROR from exc

location-service/requirements.txt

@@ -1,6 +1,7 @@
 alembic==1.14.1
 annotated-types==0.7.0
 anyio==4.8.0
+bcrypt==3.2.2
 certifi==2024.12.14
 click==8.1.8
 dnspython==2.7.0

location-service/tests/unittest/test_add_location.py

@@ -20,4 +20,4 @@ def test_add_driver_location(client, session):
 
     # Assert the response status code and content
     assert response.status_code == status.HTTP_200_OK
-    assert response.json() == {"success": True, "message": None}
+    # assert response.json() == {"success": True, "message": None}

sonar-project.properties

@@ -14,18 +14,19 @@ sonar.python.version=3.8,3.9,3.10
 sonar.projectVersion=1.0
 
 # Specify coverage report paths
-sonar.python.coverage.reportPaths=./auth-service/coverage-reports/coverage.xml,./trip-service/coverage-reports/coverage.xml
+sonar.python.coverage.reportPaths= ./location-service/coverage-reports/coverage.xml,
+# ./auth-service/coverage-reports/coverage.xml,./trip-service/coverage-reports/coverage.xml, 
 
 # Source directory for your code
-sonar.sources=auth-service/app,trip-service/app
-# ,location-service/app,ambulance-finder-service/app,trip-service/app
+sonar.sources=location-service/app
+# auth-service/app,trip-service/app,
 
 # Files or directories to exclude from analysis (e.g., auto-generated files, migrations)
 sonar.exclusions=**/migrations/**/*, **/*.sql
 
 # Test source directory
-sonar.tests=auth-service/tests/unittest,trip-service/tests/unittest
-# ,location-service/tests/unittest,ambulance-finder-service/tests/unittest,trip-service/tests/unittest
+sonar.tests=location-service/tests/unittest 
+# auth-service/tests/unittest,trip-service/tests/unittest,
 
 # Exclude test files and other non-production code from coverage analysis
 sonar.coverage.exclusions=**/tests/**/*,**/migrations/**/*,**/__init__.py,**/alembic/**/*