Fix more bugs

flights-domain/flights-information/src/tests/functional/flights_functional_test.py

@@ -37,7 +37,8 @@ def test_patch_flight(test_database, create_flight, flight_to_create):
     test_database.query(Flight).delete()
     created_flight = create_flight(flight_to_create)
     api_call_retrieved_flight = client.patch(
-        f"/flights/{created_flight.id}", data=json.dumps({"status": "on-boarding"})
+        f"/flights/{created_flight.id}",
+        data=json.dumps({"status": "on-boarding", "user_id": 1}),
     )
     assert api_call_retrieved_flight.status_code == 200
     api_call_retrieved_flight_data = api_call_retrieved_flight.json()

flights-domain/flights-information/src/tests/test_flights.py

@@ -15,6 +15,7 @@ mocked_flight = {
     "departure_time": "2023-10-10 10:00 AM",
     "arrival_time": "2023-10-10 12:00 PM",
     "gate": "A2",
+    "user_id": 1,
 }
 
 

gateway/src/api/config.py

@@ -3,4 +3,4 @@ API_FLIGHTS = "http://fids_flights_api:5000/flights"
 API_AUTH = "http://fids_usermanager_api:5000/auth"
 API_SUBSCRIPTIONS = "http://fids_subscriptions_api:5000/subscriptions"
 API_NOTIFICATIONS = "http://fids_subscriptions_api:5000/notifications"
-API_MESSAGES = "http://fids_subscriptions_api:5000/messages"
+API_MESSAGES = "http://fids_subscriptions_api:5000/messages"

gateway/src/api/routes/flights.py

@@ -3,7 +3,7 @@ from typing import Annotated, Optional
 from asyncreq import request
 from fastapi import APIRouter, Header, HTTPException
 
-from src.api.config import API_FLIGHTS, API_MESSAGES
+from src.api.config import API_FLIGHTS
 from src.api.routes.auth import status as checkAuth
 from src.api.schemas.flight import Flight, FlightCreate, FlightStatusUpdate
 

gateway/src/api/routes/notifications.py

@@ -16,4 +16,3 @@ async def receive_message(message: Message):
     if status < 200 or status > 204:
         raise HTTPException(status_code=status, detail=response)
     return response
-

gateway/src/api/routes/subscriptions.py

@@ -12,7 +12,7 @@ router = APIRouter()
 
 @router.post("")
 async def create_subscription(
-    subscription: Subscription, 
+    subscription: Subscription,
     authorization: Annotated[str | None, Header()] = None
 ):
     await checkAuth(authorization)
@@ -22,4 +22,3 @@ async def create_subscription(
     if status < 200 or status > 204:
         raise HTTPException(status_code=status, detail=response)
     return response
-

run.sh

@@ -40,6 +40,10 @@ if [ -n "$domain" ] && [ -n "$down" ]; then
             export CLIENT_IMAGE=$USER/browser-client:prod
             docker compose -f browser-domain/docker-compose.yml down
             ;;
+        'subscription')
+            export API_IMAGE=$USER/subs-manager:prod
+            docker compose -f subscription-domain/docker-compose.yml --env-file subscription-domain/.env.prod down
+            ;;
         *) exit 1 ;;
     esac
 elif [ -n "$domain" ] && [ -z "$down" ]; then
@@ -75,7 +79,21 @@ elif [ -n "$domain" ] && [ -z "$down" ]; then
                 docker compose -f flights-domain/docker-compose.yml --env-file flights-domain/.env.prod down
                 docker compose -f flights-domain/docker-compose.yml --env-file flights-domain/.env.prod up -d
             fi
+            ;;
+        'subscription')
+            export SUBSCRIPTION_MANAGER=subscription-domain/subscription-manager
+            docker build $SUBSCRIPTION_MANAGER -f $SUBSCRIPTION_MANAGER/Dockerfile.prod -t $USER/subs-manager:prod
 
+            if [ -n "$tests" ]; then
+                docker build $SUBSCRIPTION_MANAGER -f $SUBSCRIPTION_MANAGER/Dockerfile.test --build-arg "BASE_IMAGE=$USER/subs-manager:prod" -t $USER/subs-manager:test
+                export API_IMAGE=$USER/subs-manager:test
+                docker compose -f subscription-domain/docker-compose.yml --env-file subscription-domain/.env.dev down
+                docker compose -f subscription-domain/docker-compose.yml --env-file subscription-domain/.env.dev up --abort-on-container-exit
+            else
+                export API_IMAGE=$USER/subs-manager:prod
+                docker compose -f subscription-domain/docker-compose.yml --env-file subscription-domain/.env.prod down
+                docker compose -f subscription-domain/docker-compose.yml --env-file subscription-domain/.env.prod up -d
+            fi
             ;;
         'gateway')
             docker build gateway -f gateway/Dockerfile.prod -t $USER/gateway:prod

subscription-domain/subscription-manager/src/api/config.py

@@ -1 +1 @@
-API_FLIGHTS = "http://fids_flights_api:5000/flights"
+API_FLIGHTS = "http://fids_flights_api:5000/flights"

subscription-domain/subscription-manager/src/api/routes/notifications.py

@@ -10,7 +10,7 @@ from src.api.cruds import subscription as subs_crud
 from src.api.db import get_db
 from src.api.schemas.chat import Chat, Update
 from src.api.utils import telegram
-from src.api.utils.messages import get_flight_message
+from src.api.utils.messages import get_flight_message, get_invalid_message
 
 router = APIRouter()
 
@@ -18,16 +18,20 @@ msg_options = re.compile(r'^/(flight \d+|stop|start)$')
 
 
 @router.post("")
-async def create_chat(chat: Update, background_tasks: BackgroundTasks, db: Session = Depends(get_db)):
+async def create_chat(
+    chat: Update,
+    background_tasks: BackgroundTasks,
+    db: Session = Depends(get_db)
+):
     print(chat.model_dump())
     message = chat.message
     text = message["text"]
     if not msg_options.match(text):
-        msg=f"You sent an invalid option. Sorry!"
+        msg = get_invalid_message()
         chat_id = str(message["chat"]["id"])
         background_tasks.add_task(telegram.send_message, chat_id, msg)
         return Response(status_code=204)
-    
+
     action = text.partition(' ')[0]
     if action == '/start':
         user_id = int(message["text"].partition(' ')[2])
@@ -41,21 +45,10 @@ async def create_chat(chat: Update, background_tasks: BackgroundTasks, db: Sessi
     elif action == '/flight':
         chat_id = str(message["chat"]["id"])
         flight_id = int(message["text"].partition(' ')[2])
-        print(flight_id)
         (response, status, _) = await request(f"{API_FLIGHTS}/{flight_id}", "GET")
-        print(response)
         if status < 200 or status > 204:
-            msg=f"Could not get flight '{flight_id}'. Sorry!"
+            msg = f"Could not get flight '{flight_id}'. Sorry!"
         msg = get_flight_message(response)
-        print(msg)
         background_tasks.add_task(telegram.send_message, chat_id, msg)
 
     return Response(status_code=204)
-
-
-# @router.put("/{user_id}")
-# async def send_notification(user_id: int, data: FlightData, db: Session = Depends(get_db)):
-#     chat_id = notif_crud.get_chat_id(db=db, user_id=user_id)
-#     if chat_id is None:
-#         raise HTTPException()
-#     telegram.send_message(chat_id=chat_id, message=data.model_dump())

subscription-domain/subscription-manager/src/api/utils/messages.py

@@ -25,3 +25,12 @@ def get_flight_message(flight: dict):
         f"\nGate: {flight['gate'] if flight['gate'] else 'Not available'}"
         f"\n\nThank you for using our flight update service!"
     )
+
+
+def get_invalid_message():
+    return (
+        "Invalid option!\nPlease use:\n"
+        "\n/flights NUMBER (e.g., /flights 1) for flight details"
+        "\n/start to start receiving messages"
+        "\n/stop to manage updates."
+    )

subscription-domain/subscription-manager/src/api/utils/telegram.py

@@ -8,6 +8,7 @@ TOKEN = os.getenv("TOKEN")
 async def send_message(chat_id, message):
     msg = {"chat_id": chat_id, "text": message}
     url = f"https://api.telegram.org/bot{TOKEN}/sendMessage"
-    response = await request(url, method="POST", json=msg)
+    await request(url, method="POST", json=msg)
+    # response = await request(url, method="POST", json=msg)
     # if response is None or response['ok'] == 'True':
     #     raise 'Could not send message'