accept json string for reference calls

Author: GabrielBarberini

src/models/flight.py

@@ -1,6 +1,7 @@
+import json
 from typing import Optional, Self, ClassVar, Literal
 
-from pydantic import BaseModel, Field
+from pydantic import BaseModel, Field, field_validator
 from src.models.interface import ApiBaseModel
 from src.models.rocket import RocketModel
 from src.models.environment import EnvironmentModel
@@ -112,3 +113,13 @@ class FlightWithReferencesRequest(BaseModel):
     environment_id: str
     rocket_id: str
     flight: FlightPartialModel
+
+    @field_validator('flight', mode='before')
+    @classmethod
+    def _coerce_flight(cls, value):
+        if isinstance(value, str):
+            try:
+                value = json.loads(value)
+            except json.JSONDecodeError as exc:
+                raise ValueError('Invalid JSON for flight payload') from exc
+        return value

src/models/rocket.py

@@ -1,6 +1,7 @@
+import json
 from typing import Optional, Tuple, List, Union, Self, ClassVar, Literal
 
-from pydantic import BaseModel, Field
+from pydantic import BaseModel, Field, field_validator
 from src.models.interface import ApiBaseModel
 from src.models.motor import MotorModel
 from src.models.sub.aerosurfaces import (
@@ -103,3 +104,13 @@ class RocketWithMotorReferenceRequest(BaseModel):
 
     motor_id: str
     rocket: RocketPartialModel
+
+    @field_validator('rocket', mode='before')
+    @classmethod
+    def _coerce_rocket(cls, value):
+        if isinstance(value, str):
+            try:
+                value = json.loads(value)
+            except json.JSONDecodeError as exc:
+                raise ValueError('Invalid JSON for rocket payload') from exc
+        return value

tests/unit/test_routes/test_flights_route.py

@@ -104,6 +104,21 @@ def test_create_flight_from_references(
     )
 
 
+def test_create_flight_from_references_with_string_payload(
+    stub_flight_reference_payload, mock_controller_instance
+):
+    payload = copy.deepcopy(stub_flight_reference_payload)
+    payload['flight'] = json.dumps(payload['flight'])
+    mock_controller_instance.create_flight_from_references = AsyncMock(
+        return_value=FlightCreated(flight_id='123')
+    )
+    response = client.post('/flights/from-references', json=payload)
+    assert response.status_code == 201
+    mock_controller_instance.create_flight_from_references.assert_called_once_with(
+        FlightWithReferencesRequest(**payload)
+    )
+
+
 def test_create_flight_from_references_not_found(
     stub_flight_reference_payload, mock_controller_instance
 ):
@@ -247,6 +262,21 @@ def test_update_flight_from_references(
     )
 
 
+def test_update_flight_from_references_with_string_payload(
+    stub_flight_reference_payload, mock_controller_instance
+):
+    payload = copy.deepcopy(stub_flight_reference_payload)
+    payload['flight'] = json.dumps(payload['flight'])
+    mock_controller_instance.update_flight_from_references = AsyncMock(
+        return_value=None
+    )
+    response = client.put('/flights/123/from-references', json=payload)
+    assert response.status_code == 204
+    mock_controller_instance.update_flight_from_references.assert_called_once_with(
+        '123', FlightWithReferencesRequest(**payload)
+    )
+
+
 def test_update_flight_from_references_not_found(
     stub_flight_reference_payload, mock_controller_instance
 ):

tests/unit/test_routes/test_rockets_route.py

@@ -129,6 +129,21 @@ def test_create_rocket_from_motor_reference(
     )
 
 
+def test_create_rocket_from_motor_reference_with_string_payload(
+    stub_rocket_reference_payload, mock_controller_instance
+):
+    payload = copy.deepcopy(stub_rocket_reference_payload)
+    payload['rocket'] = json.dumps(payload['rocket'])
+    mock_controller_instance.create_rocket_from_motor_reference = AsyncMock(
+        return_value=RocketCreated(rocket_id='123')
+    )
+    response = client.post('/rockets/from-motor-reference', json=payload)
+    assert response.status_code == 201
+    mock_controller_instance.create_rocket_from_motor_reference.assert_called_once_with(
+        RocketWithMotorReferenceRequest(**payload)
+    )
+
+
 def test_create_rocket_from_motor_reference_not_found(
     stub_rocket_reference_payload, mock_controller_instance
 ):
@@ -447,6 +462,21 @@ def test_update_rocket_from_motor_reference(
     )
 
 
+def test_update_rocket_from_motor_reference_with_string_payload(
+    stub_rocket_reference_payload, mock_controller_instance
+):
+    payload = copy.deepcopy(stub_rocket_reference_payload)
+    payload['rocket'] = json.dumps(payload['rocket'])
+    mock_controller_instance.update_rocket_from_motor_reference = AsyncMock(
+        return_value=None
+    )
+    response = client.put('/rockets/123/from-motor-reference', json=payload)
+    assert response.status_code == 204
+    mock_controller_instance.update_rocket_from_motor_reference.assert_called_once_with(
+        '123', RocketWithMotorReferenceRequest(**payload)
+    )
+
+
 def test_update_rocket_from_motor_reference_not_found(
     stub_rocket_reference_payload, mock_controller_instance
 ):