Return none when pre-session info does not exist

Author: gfrn

src/scaup/crud/pre_sessions.py

@@ -1,4 +1,3 @@
-from fastapi import HTTPException, status
 from fastapi.security import HTTPAuthorizationCredentials
 from lims_utils.auth import GenericUser
 from sqlalchemy import select
@@ -26,13 +25,10 @@ def create_pre_session_info(shipmentId: int, params: PreSessionIn):
 
 def get_pre_session_info(shipment_id: int, user: GenericUser, token: HTTPAuthorizationCredentials):
     pre_session_info = inner_db.session.scalar(select(PreSession).filter(PreSession.shipmentId == shipment_id))
-    if not pre_session_info:
-        raise HTTPException(
-            status.HTTP_404_NOT_FOUND,
-            "Shipment does not have a request assigned to it",
-        )
-
-    validated_model = PreSessionOut.model_validate(pre_session_info, from_attributes=True)
-    validated_model.isLocked = check_session_locked(shipment_id, user, token)
+
+    validated_model = PreSessionOut(
+        details=None if pre_session_info is None else pre_session_info.details,
+        isLocked=check_session_locked(shipment_id, user, token),
+    )
 
     return validated_model

src/scaup/models/pre_sessions.py

@@ -5,7 +5,6 @@
 
 class BasePreSession(BaseModel):
     details: Optional[dict[str, Any]] = None
-    isLocked: bool = False
 
 
 class PreSessionIn(BasePreSession):
@@ -17,4 +16,4 @@ class PreSessionOptional(BasePreSession):
 
 
 class PreSessionOut(BasePreSession):
-    pass
+    isLocked: bool = False

tests/shipments/pre_session/test_get.py

@@ -18,6 +18,19 @@ def test_get(mock_user, client):
     assert resp.json() == {"details": {"name": "previous"}, "isLocked": False}
 
 
+@freeze_time("2025-07-01T15:00:00")
+@responses.activate
+@pytest.mark.parametrize("mock_user", [user], indirect=True)
+def test_get_no_pre_session(mock_user, client):
+    """Should return null if no pre session information is available"""
+
+    resp = client.get("/shipments/1/preSession")
+
+    assert resp.status_code == 200
+
+    assert resp.json() == {"details": None, "isLocked": False}
+
+
 @freeze_time("2025-07-20T15:00:00")
 @responses.activate
 @pytest.mark.parametrize("mock_user", [user], indirect=True)