Display PDF even if beamline operator is missing (#9)

Author: gfrn

src/scaup/crud/pdf.py

@@ -110,20 +110,24 @@ class TrackingLabelPages(FPDF):
     def __init__(
         self,
         location: str,
-        local_contact: str,
+        local_contact: str | None,
         from_lines: List[str] | None = None,
         to_lines: List[str] | None = None,
     ):
         super().__init__()
         self.set_font("helvetica", size=14)
         self.location = location
-        self.local_contact = local_contact
         self.from_lines = from_lines
         self.to_lines = to_lines
 
-        # Only display two first local contacts, to save space
-        if len(lcs := local_contact.split(",")) > 2:
-            self.local_contact = f"{', '.join(lcs[:2])} + {len(lcs) - 2}"
+        if not local_contact:
+            self.local_contact = "Unknown"
+        else:
+            # Only display two first local contacts, to save space
+            if len(lcs := local_contact.split(",")) > 2:
+                self.local_contact = f"{', '.join(lcs[:2])} + {len(lcs) - 2}"
+            else:
+                self.local_contact = local_contact
 
         self.add_page()
 

tests/shipments/test_tracking_labels.py

@@ -1,15 +1,22 @@
+import pytest
 import responses
 
 from scaup.utils.config import Config
 
 SHIPMENT_REQUEST_CONTENTS = {"shipmentId": 1, "contact": {"a": "b", "c": "d"}}
-SHIPMENT_CONTENTS = {"consignee_address_line_1": "test", "consignee_email": "test@diamond.ac.uk"}
+SHIPMENT_CONTENTS = {
+    "consignee_address_line_1": "test",
+    "consignee_email": "test@diamond.ac.uk",
+}
 
 
 @responses.activate
 def test_get(client):
     """Should get tracking labels as a PDF"""
-    responses.get(f"{Config.shipping_service.backend_url}/api/shipment_requests/1/shipments/TO_FACILITY", status=404)
+    responses.get(
+        f"{Config.shipping_service.backend_url}/api/shipment_requests/1/shipments/TO_FACILITY",
+        status=404,
+    )
 
     resp = client.get("/shipments/117/tracking-labels")
 
@@ -32,6 +39,19 @@ def test_no_top_level_containers(client):
     assert resp.status_code == 404
 
 
+@pytest.mark.noregister
+@responses.activate
+def test_no_beamline_operator(client):
+    """Should return 200 even if beamline operator is missing"""
+    responses.get(
+        f"{Config.ispyb_api.url}/proposals/cm1/sessions/1",
+        json={"items": [{"beamLineName": "m01", "beamLineOperator": None}]},
+    )
+    resp = client.get("/shipments/118/tracking-labels")
+
+    assert resp.status_code == 404
+
+
 @responses.activate
 def test_user_address(client):
     """Should return include to/from address if these are available"""
@@ -40,7 +60,11 @@ def test_user_address(client):
         json=SHIPMENT_REQUEST_CONTENTS,
     )
 
-    responses.get(f"{Config.shipping_service.backend_url}/api/shipments/1", json=SHIPMENT_CONTENTS, status=200)
+    responses.get(
+        f"{Config.shipping_service.backend_url}/api/shipments/1",
+        json=SHIPMENT_CONTENTS,
+        status=200,
+    )
 
     resp = client.get("/shipments/117/tracking-labels")