addresses review comments

Author: GabrielBarberini

lib/controllers/flight.py

@@ -56,6 +56,7 @@ class FlightController:
     def __init__(
         self,
         flight: Flight,
+        *,
         rocket_option: RocketOptions,
         motor_kind: MotorKinds,
     ):
@@ -236,7 +237,7 @@ async def update_flight_by_id(
 
     @classmethod
     async def update_env_by_flight_id(
-        cls, flight_id: str, env: Env
+        cls, flight_id: str, *, env: Env
     ) -> Union[FlightUpdated, HTTPException]:
         """
         Update a models.Flight.env in the database.
@@ -281,7 +282,7 @@ async def update_env_by_flight_id(
 
     @classmethod
     async def update_rocket_by_flight_id(
-        cls, flight_id: str, rocket: Rocket, rocket_option, motor_kind
+        cls, flight_id: str, *, rocket: Rocket, rocket_option, motor_kind
     ) -> Union[FlightUpdated, HTTPException]:
         """
         Update a models.Flight.rocket in the database.

lib/controllers/motor.py

@@ -31,7 +31,7 @@ class MotorController:
         - Create a rocketpy.Motor object from a Motor model object.
     """
 
-    def __init__(self, motor: Motor, motor_kind: MotorKinds):
+    def __init__(self, *, motor: Motor, motor_kind: MotorKinds):
         self.guard(motor, motor_kind)
         self._motor = motor
         self._motor_kind = motor_kind

lib/controllers/rocket.py

@@ -1,4 +1,5 @@
 from typing import Union
+import os
 import ast
 import jsonpickle
 
@@ -49,7 +50,13 @@ class RocketController:
        - CRUD operations over models.Rocket on the database.
     """
 
-    def __init__(self, rocket: Rocket, rocket_option, motor_kind):
+    def __init__(
+        self,
+        *,
+        rocket: Rocket,
+        rocket_option: RocketOptions,
+        motor_kind: MotorKinds,
+    ):
         self._rocket = rocket
         self._rocket_option = rocket_option
         self._motor_kind = motor_kind
@@ -83,8 +90,16 @@ def get_rocketpy_rocket(cls, rocket: Rocket) -> RocketPyRocket:
             radius=rocket.radius,
             mass=rocket.mass,
             inertia=rocket.inertia,
-            power_off_drag=f"lib/data/{rocket.rocket_option.lower()}/powerOffDragCurve.csv",
-            power_on_drag=f"lib/data/{rocket.rocket_option.lower()}/powerOnDragCurve.csv",
+            power_off_drag=os.path.join(
+                "lib/data",
+                f"{rocket.rocket_option.lower()}",
+                "powerOffDragCurve.csv",
+            ),
+            power_on_drag=os.path.join(
+                "lib/data",
+                f"{rocket.rocket_option.lower()}",
+                "powerOnDragCurve.csv",
+            ),
             center_of_mass_without_motor=rocket.center_of_mass_without_motor,
             coordinate_system_orientation=rocket.coordinate_system_orientation,
         )

lib/repositories/environment.py

@@ -52,7 +52,7 @@ async def create_env(self):
         try:
             environment_to_dict = self.env.dict()
             environment_to_dict["env_id"] = self.env_id
-            await self.collection.insert_one(environment_to_dict)
+            await self.insert_env(environment_to_dict)
         except Exception as e:
             exc_str = parse_error(e)
             logger.error(f"repositories.environment.create_env: {exc_str}")
@@ -72,7 +72,7 @@ async def get_env_by_id(self, env_id: str) -> Union[Env, None]:
             models.Env
         """
         try:
-            read_env = await self.collection.find_one({"env_id": env_id})
+            read_env = await self.find_env(env_id)
             parsed_env = Env.parse_obj(read_env) if read_env else None
         except Exception as e:
             exc_str = parse_error(e)
@@ -93,7 +93,7 @@ async def delete_env_by_id(self, env_id: str):
             None
         """
         try:
-            await self.collection.delete_one({"env_id": env_id})
+            await self.delete_env(env_id)
         except Exception as e:
             exc_str = parse_error(e)
             logger.error(f"repositories.environment.delete_env: {exc_str}")
@@ -102,3 +102,14 @@ async def delete_env_by_id(self, env_id: str):
             logger.info(
                 f"Call to repositories.environment.delete_env completed for Env {env_id}"
             )
+
+    async def insert_env(self, env_data: dict):
+        await self.collection.insert_one(env_data)
+        return self
+
+    async def find_env(self, env_id: str):
+        return await self.collection.find_one({"env_id": env_id})
+
+    async def delete_env(self, env_id: str):
+        await self.collection.delete_one({"env_id": env_id})
+        return self

lib/repositories/flight.py

@@ -60,7 +60,7 @@ async def create_flight(
             flight_to_dict["flight_id"] = self.flight_id
             flight_to_dict["rocket"]["rocket_option"] = rocket_option
             flight_to_dict["rocket"]["motor"]["motor_kind"] = motor_kind
-            await self.collection.insert_one(flight_to_dict)
+            await self.insert_flight(flight_to_dict)
         except Exception as e:
             exc_str = parse_error(e)
             logger.error(f"repositories.flight.create_flight: {exc_str}")
@@ -80,9 +80,7 @@ async def get_flight_by_id(self, flight_id: str) -> Union[Flight, None]:
             models.Flight
         """
         try:
-            read_flight = await self.collection.find_one(
-                {"flight_id": flight_id}
-            )
+            read_flight = await self.find_flight(flight_id)
             parsed_flight = (
                 Flight.parse_obj(read_flight) if read_flight else None
             )
@@ -105,7 +103,7 @@ async def delete_flight_by_id(self, flight_id: str):
             None
         """
         try:
-            await self.collection.delete_one({"flight_id": flight_id})
+            await self.delete_flight(flight_id)
         except Exception as e:
             exc_str = parse_error(e)
             logger.error(f"repositories.flight.delete_flight: {exc_str}")
@@ -114,3 +112,13 @@ async def delete_flight_by_id(self, flight_id: str):
             logger.info(
                 f"Call to repositories.flight.delete_flight completed for Flight {flight_id}"
             )
+
+    async def insert_flight(self, flight_data: dict):
+        await self.collection.insert_one(flight_data)
+
+    async def find_flight(self, flight_id: str):
+        return await self.collection.find_one({"flight_id": flight_id})
+
+    async def delete_flight(self, flight_id: str):
+        await self.collection.delete_one({"flight_id": flight_id})
+        return self

lib/repositories/motor.py

@@ -56,7 +56,7 @@ async def create_motor(self, motor_kind: str = "SOLID"):
             motor_to_dict = self.motor.dict()
             motor_to_dict["motor_id"] = self.motor_id
             motor_to_dict["motor_kind"] = motor_kind
-            await self.collection.insert_one(motor_to_dict)
+            await self.insert_motor(motor_to_dict)
         except Exception as e:
             exc_str = parse_error(e)
             logger.error(f"repositories.motor.create_motor: {exc_str}")
@@ -76,7 +76,7 @@ async def get_motor_by_id(self, motor_id: str) -> Union[motor, None]:
             models.Motor
         """
         try:
-            read_motor = await self.collection.find_one({"motor_id": motor_id})
+            read_motor = await self.find_motor(motor_id)
             parsed_motor = Motor.parse_obj(read_motor) if read_motor else None
         except Exception as e:
             exc_str = parse_error(e)
@@ -97,7 +97,7 @@ async def delete_motor_by_id(self, motor_id: str):
             None
         """
         try:
-            await self.collection.delete_one({"motor_id": motor_id})
+            await self.delete_motor(motor_id)
         except Exception as e:
             exc_str = parse_error(e)
             logger.error(f"repositories.motor.delete_motor: {exc_str}")
@@ -106,3 +106,14 @@ async def delete_motor_by_id(self, motor_id: str):
             logger.info(
                 f"Call to repositories.motor.delete_motor completed for Motor {motor_id}"
             )
+
+    async def insert_motor(self, motor_data: dict):
+        await self.collection.insert_one(motor_data)
+        return self
+
+    async def find_motor(self, motor_id: str):
+        return await self.collection.find_one({"motor_id": motor_id})
+
+    async def delete_motor(self, motor_id: str):
+        await self.collection.delete_one({"motor_id": motor_id})
+        return self

lib/repositories/repo.py

@@ -21,18 +21,24 @@ def __new__(cls):
 
     def __init__(self, collection: str):
         if not self._initialized:
-            self._connection_string = Secrets.get_secret(
-                "MONGODB_CONNECTION_STRING"
-            )
-            self._client = AsyncIOMotorClient(
-                self.connection_string,
-                server_api=ServerApi("1"),
-                maxIdleTimeMS=5000,
-                connectTimeoutMS=5000,
-                serverSelectionTimeoutMS=30000,
-            )
-            self._collection = self.client.rocketpy[collection]
-            self._initialized = True  # Mark as initialized
+            try:
+                self._connection_string = Secrets.get_secret(
+                    "MONGODB_CONNECTION_STRING"
+                )
+                self._client = AsyncIOMotorClient(
+                    self.connection_string,
+                    server_api=ServerApi("1"),
+                    maxIdleTimeMS=5000,
+                    connectTimeoutMS=5000,
+                    serverSelectionTimeoutMS=30000,
+                )
+                self._collection = self.client.rocketpy[collection]
+                self._initialized = True  # Mark as initialized
+            except Exception as e:
+                logging.error(f"Failed to initialize MongoDB client: {e}")
+                raise ConnectionError(
+                    "Could not establish a connection with MongoDB."
+                ) from e
 
     @property
     def connection_string(self):

lib/repositories/rocket.py

@@ -60,7 +60,7 @@ async def create_rocket(
             rocket_to_dict["rocket_id"] = self.rocket_id
             rocket_to_dict["rocket_option"] = rocket_option
             rocket_to_dict["motor"]["motor_kind"] = motor_kind
-            await self.collection.insert_one(rocket_to_dict)
+            await self.insert_rocket(rocket_to_dict)
         except Exception as e:
             exc_str = parse_error(e)
             logger.error(f"repositories.rocket.create_rocket: {exc_str}")
@@ -80,9 +80,7 @@ async def get_rocket_by_id(self, rocket_id: str) -> Union[Rocket, None]:
             models.Rocket
         """
         try:
-            read_rocket = await self.collection.find_one(
-                {"rocket_id": rocket_id}
-            )
+            read_rocket = await self.find_rocket(rocket_id)
             parsed_rocket = (
                 Rocket.parse_obj(read_rocket) if read_rocket else None
             )
@@ -105,7 +103,7 @@ async def delete_rocket_by_id(self, rocket_id: str):
             None
         """
         try:
-            await self.collection.delete_one({"rocket_id": rocket_id})
+            await self.delete_rocket(rocket_id)
         except Exception as e:
             exc_str = parse_error(e)
             logger.error(f"repositories.rocket.delete_rocket: {exc_str}")
@@ -114,3 +112,14 @@ async def delete_rocket_by_id(self, rocket_id: str):
             logger.info(
                 f"Call to repositories.rocket.delete_rocket completed for Rocket {rocket_id}"
             )
+
+    async def insert_rocket(self, rocket_data: dict):
+        await self.collection.insert_one(rocket_data)
+        return self
+
+    async def find_rocket(self, rocket_id: str):
+        return await self.collection.find_one({"rocket_id": rocket_id})
+
+    async def delete_rocket(self, rocket_id: str):
+        await self.collection.delete_one({"rocket_id": rocket_id})
+        return self

lib/routes/flight.py

@@ -39,7 +39,7 @@ async def create_flight(
     ``` Flight object as JSON ```
     """
     return await FlightController(
-        flight, rocket_option, motor_kind
+        flight, rocket_option=rocket_option, motor_kind=motor_kind
     ).create_flight()
 
 
@@ -76,7 +76,7 @@ async def update_flight_env(flight_id: str, env: Env) -> FlightUpdated:
         env: env object as JSON
     ```
     """
-    return await FlightController.update_env_by_flight_id(flight_id, env)
+    return await FlightController.update_env_by_flight_id(flight_id, env=env)
 
 
 @router.put("/{flight_id}/rocket")
@@ -96,7 +96,10 @@ async def update_flight_rocket(
     ```
     """
     return await FlightController.update_rocket_by_flight_id(
-        flight_id, rocket, rocket_option, motor_kind
+        flight_id,
+        rocket=rocket,
+        rocket_option=rocket_option,
+        motor_kind=motor_kind,
     )
 
 
@@ -117,7 +120,7 @@ async def update_flight(
     ```
     """
     return await FlightController(
-        flight, rocket_option, motor_kind
+        flight, rocket_option=rocket_option, motor_kind=motor_kind
     ).update_flight_by_id(flight_id)
 
 

lib/routes/motor.py

@@ -33,7 +33,9 @@ async def create_motor(motor: Motor, motor_kind: MotorKinds) -> MotorCreated:
     ## Args
     ``` Motor object as a JSON ```
     """
-    return await MotorController(motor, motor_kind).create_motor()
+    return await MotorController(
+        motor=motor, motor_kind=motor_kind
+    ).create_motor()
 
 
 @router.get("/{motor_id}")
@@ -60,9 +62,9 @@ async def update_motor(
         motor: Motor object as JSON
     ```
     """
-    return await MotorController(motor, motor_kind).update_motor_by_id(
-        motor_id
-    )
+    return await MotorController(
+        motor=motor, motor_kind=motor_kind
+    ).update_motor_by_id(motor_id)
 
 
 @router.delete("/{motor_id}")

lib/routes/rocket.py

@@ -37,7 +37,7 @@ async def create_rocket(
     ``` Rocket object as a JSON ```
     """
     return await RocketController(
-        rocket, rocket_option, motor_kind
+        rocket=rocket, rocket_option=rocket_option, motor_kind=motor_kind
     ).create_rocket()
 
 
@@ -69,7 +69,7 @@ async def update_rocket(
     ```
     """
     return await RocketController(
-        rocket, rocket_option, motor_kind
+        rocket=rocket, rocket_option=rocket_option, motor_kind=motor_kind
     ).update_rocket_by_id(rocket_id)