implements motor route tests

Author: GabrielBarberini

Makefile

@@ -9,8 +9,8 @@ flake8:
 	flake8 --ignore E501,E402,F401,W503,C0414 ./tests || true
 
 pylint:
-	pylint --extension-pkg-whitelist='pydantic' ./lib || true
-	pylint --extension-pkg-whitelist='pydantic' --disable=E0401,W0621 ./tests || true
+	pylint ./lib || true
+	pylint --disable=E0401,W0621 ./tests || true
 
 ruff:
 	ruff check --fix ./lib || true

lib/controllers/motor.py

@@ -26,18 +26,6 @@ class MotorController:
         - Create a rocketpy.Motor object from a Motor model object.
     """
 
-    def __init__(self, motor: Motor):
-        self.guard(motor)
-        self._motor = motor
-
-    @property
-    def motor(self) -> Motor:
-        return self._motor
-
-    @motor.setter
-    def motor(self, motor: Motor):
-        self._motor = motor
-
     @staticmethod
     def guard(motor: Motor):
         if (
@@ -51,15 +39,19 @@ def guard(motor: Motor):
 
         # TODO: extend guard to check motor kinds and tank kinds specifics
 
-    async def create_motor(self) -> Union[MotorCreated, HTTPException]:
+    @classmethod
+    async def create_motor(
+        cls, motor: Motor
+    ) -> Union[MotorCreated, HTTPException]:
         """
         Create a models.Motor in the database.
 
         Returns:
             views.MotorCreated
         """
         try:
-            async with MotorRepository(self.motor) as motor_repo:
+            cls.guard(motor)
+            async with MotorRepository(motor) as motor_repo:
                 await motor_repo.create_motor()
         except PyMongoError as e:
             logger.error(f"controllers.motor.create_motor: PyMongoError {e}")
@@ -173,8 +165,9 @@ async def get_rocketpy_motor_binary(
                 f"Call to controllers.motor.get_rocketpy_motor_binary completed for Motor {motor_id}"
             )
 
+    @classmethod
     async def update_motor_by_id(
-        self, motor_id: str
+        cls, motor_id: str, motor: Motor
     ) -> Union[MotorUpdated, HTTPException]:
         """
         Update a motor in the database.
@@ -189,7 +182,8 @@ async def update_motor_by_id(
             HTTP 404 Not Found: If the motor is not found in the database.
         """
         try:
-            async with MotorRepository(self.motor) as motor_repo:
+            cls.guard(motor)
+            async with MotorRepository(motor) as motor_repo:
                 await motor_repo.update_motor_by_id(motor_id)
         except PyMongoError as e:
             logger.error(f"controllers.motor.update_motor: PyMongoError {e}")

lib/routes/motor.py

@@ -38,7 +38,7 @@ async def create_motor(motor: Motor, motor_kind: MotorKinds) -> MotorCreated:
     """
     with tracer.start_as_current_span("create_motor"):
         motor.set_motor_kind(motor_kind)
-        return await MotorController(motor).create_motor()
+        return await MotorController.create_motor(motor)
 
 
 @router.get("/{motor_id}")
@@ -68,11 +68,11 @@ async def update_motor(
     """
     with tracer.start_as_current_span("update_motor"):
         motor.set_motor_kind(motor_kind)
-        return await MotorController(motor).update_motor_by_id(motor_id)
+        return await MotorController.update_motor_by_id(motor_id, motor)
 
 
 @router.get(
-    "/rocketpy/{motor_id}",
+    "/{motor_id}/rocketpy",
     responses={
         203: {
             "description": "Binary file download",

lib/views/environment.py

@@ -1,6 +1,6 @@
 from typing import Optional, Any
 from datetime import datetime, timedelta
-from pydantic import BaseModel
+from pydantic import BaseModel, ConfigDict
 from lib.models.environment import AtmosphericModelTypes
 from lib.utils import to_python_primitive
 
@@ -49,8 +49,9 @@ class EnvSummary(BaseModel):
     geodesic_to_utm: Optional[Any] = None
     utm_to_geodesic: Optional[Any] = None
 
-    class Config:
-        json_encoders = {Any: to_python_primitive}
+    model_config = ConfigDict(
+        json_encoders={Any: to_python_primitive}
+    )
 
 
 class EnvCreated(BaseModel):

lib/views/flight.py

@@ -1,5 +1,5 @@
 from typing import Optional, Any
-from pydantic import BaseModel
+from pydantic import BaseModel, ConfigDict
 from lib.models.flight import Flight
 from lib.views.rocket import RocketView, RocketSummary
 from lib.views.environment import EnvSummary
@@ -151,8 +151,9 @@ class FlightSummary(RocketSummary, EnvSummary):
     z_impact: Optional[Any] = None
     flight_phases: Optional[Any] = None
 
-    class Config:
-        json_encoders = {Any: to_python_primitive}
+    model_config = ConfigDict(
+        json_encoders={Any: to_python_primitive}
+    )
 
 
 class FlightCreated(BaseModel):

lib/views/motor.py

@@ -1,5 +1,5 @@
 from typing import List, Any, Optional
-from pydantic import BaseModel
+from pydantic import BaseModel, ConfigDict
 from lib.models.motor import Motor, MotorKinds, CoordinateSystemOrientation
 from lib.utils import to_python_primitive
 
@@ -69,8 +69,9 @@ class MotorSummary(BaseModel):
     total_mass_flow_rate: Optional[Any] = None
     thrust: Optional[Any] = None
 
-    class Config:
-        json_encoders = {Any: to_python_primitive}
+    model_config = ConfigDict(
+        json_encoders={Any: to_python_primitive}
+    )
 
 
 class MotorCreated(BaseModel):

lib/views/rocket.py

@@ -1,5 +1,5 @@
 from typing import Any, Optional
-from pydantic import BaseModel
+from pydantic import BaseModel, ConfigDict
 from lib.models.rocket import Rocket, CoordinateSystemOrientation
 from lib.views.motor import MotorView, MotorSummary
 from lib.utils import to_python_primitive
@@ -38,8 +38,9 @@ class RocketSummary(MotorSummary):
     thrust_to_weight: Optional[Any] = None
     total_lift_coeff_der: Optional[Any] = None
 
-    class Config:
-        json_encoders = {Any: to_python_primitive}
+    model_config = ConfigDict(
+        json_encoders={Any: to_python_primitive}
+    )
 
 
 class RocketCreated(BaseModel):