Perform manufacturer serial number check when creating dewars

Author: gfrn

src/scaup/crud/top_level_containers.py

@@ -60,6 +60,15 @@ def _check_fields(
         )
 
         if code_response.status_code == 200:
+            registry_json: dict[str, Any] = code_response.json()
+            msn = registry_json.get("manufacturerSerialNumber")
+            if isinstance(params, TopLevelContainerIn) and msn is not None:
+                app_logger.error(f"{msn}, {params.manufacturerSerialNumber}")
+                if msn != params.manufacturerSerialNumber:
+                    raise HTTPException(
+                        status_code=status.HTTP_404_NOT_FOUND,
+                        detail="Manufacturer serial number does not match the provided facility code",
+                    )
             return
 
     raise HTTPException(
@@ -114,7 +123,7 @@ def create_top_level_container(shipmentId: int | None, params: TopLevelContainer
                 url=f"/proposals/{proposal.reference}/dewar-registry",
                 json={
                     "facilityCode": new_code,
-                    "manufacturerSerialNumber": (None if params.code.lower().strip() == "n/a" else params.code),
+                    "manufacturerSerialNumber": params.manufacturerSerialNumber,
                 },
             )
 

src/scaup/models/top_level_containers.py

@@ -24,17 +24,17 @@ class BaseTopLevelContainer(BaseModel):
             "by the container index is used"
         ),
     )
+    code: str | None = None
 
 
 class TopLevelContainerIn(BaseTopLevelContainer):
     type: str
-    code: str = "n/a"
+    manufacturerSerialNumber: str | None = None
     isInternal: bool = False
 
 
 class OptionalTopLevelContainer(BaseTopLevelContainer):
     type: Optional[str] = None
-    code: Optional[str] = None
     barCode: Optional[str] = None
 
 

tests/shipments/test_create_item.py

@@ -21,10 +21,7 @@
         ),
         pytest.param(
             "topLevelContainers",
-            {
-                "type": "dewar",
-                "code": "DLS-EM-0001",
-            },
+            {"type": "dewar", "code": "DLS-EM-0001", "manufacturerSerialNumber": "serial123"},
             TopLevelContainer,
             id="topLevelContainers",
         ),

tests/shipments/top_level_containers/test_create.py

@@ -29,10 +29,7 @@ def test_create_no_name(client):
 
     resp = client.post(
         "/shipments/1/topLevelContainers",
-        json={
-            "type": "dewar",
-            "code": "DLS-EM-0001",
-        },
+        json={"type": "dewar", "code": "DLS-EM-0001", "manufacturerSerialNumber": "serial123"},
     )
 
     assert resp.status_code == 201
@@ -48,10 +45,7 @@ def test_create_auto_barcode_no_instrument(client):
 
     resp = client.post(
         "/shipments/1/topLevelContainers",
-        json={
-            "type": "dewar",
-            "code": "DLS-EM-0001",
-        },
+        json={"type": "dewar", "code": "DLS-EM-0001", "manufacturerSerialNumber": "serial123"},
     )
 
     assert resp.status_code == 201
@@ -122,10 +116,7 @@ def test_create_duplicate_name(client):
 
     resp = client.post(
         "/shipments/1/topLevelContainers",
-        json={
-            "type": "dewar",
-            "code": "DLS-EM-0000",
-        },
+        json={"type": "dewar", "code": "DLS-EM-0000", "manufacturerSerialNumber": "serial123"},
     )
 
     assert resp.status_code == 409
@@ -162,9 +153,30 @@ def test_create_no_code(client):
     )
 
 
+@responses.activate
+def test_create_invalid_serial(client):
+    """Should raise error if invalid manufacturer serial code is provided for registered dewar"""
+    responses.get(
+        f"{Config.ispyb_api.url}/proposals/cm1/dewar-registry/DLS-EM-0001",
+        status=200,
+        json={"manufacturerSerialNumber": "different123"},
+    )
+
+    resp = client.post(
+        "/shipments/1/topLevelContainers",
+        json={
+            "type": "dewar",
+            "code": "DLS-EM-0001",
+            "manufacturerSerialNumber": "test123",
+        },
+    )
+
+    assert resp.status_code == 404
+
+
 @responses.activate
 def test_create_with_serial(client):
-    """Should automatically generate code if serial code is provided"""
+    """Should automatically create dewar registry entry with serial code if serial code is provided"""
     creation_response = responses.post(
         f"{Config.ispyb_api.url}/proposals/cm1/dewar-registry",
         status=201,
@@ -181,7 +193,8 @@ def test_create_with_serial(client):
         "/shipments/1/topLevelContainers",
         json={
             "type": "dewar",
-            "code": "test123",
+            "code": None,
+            "manufacturerSerialNumber": "serial123",
         },
     )
 
@@ -193,7 +206,7 @@ def test_create_with_serial(client):
 
     assert json.loads(creation_response.calls[0].request.body.decode()) == {
         "facilityCode": "DLS-BI-5672",
-        "manufacturerSerialNumber": "test123",
+        "manufacturerSerialNumber": "serial123",
     }