Skip to content

Commit 173a41c

Browse files
committed
Fix dewar prefix
1 parent fe5c177 commit 173a41c

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

src/scaup/crud/top_level_containers.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
from ..utils.external import ExternalRequest
1717
from ..utils.session import retry_if_exists
1818

19-
DEWAR_PREFIX = "DLS-BI-"
19+
DEWAR_PREFIX = "DLS-BI-1"
2020

2121

2222
def _check_fields(
@@ -82,7 +82,7 @@ def create_top_level_container(shipmentId: int | None, params: TopLevelContainer
8282
last_dewar = int(ext_get.json()["items"][0]["facilityCode"].split("-")[2])
8383
dewar_number = 1000 if last_dewar < 1000 else last_dewar + 1
8484

85-
new_code = f"{DEWAR_PREFIX}{dewar_number:04}"
85+
new_code = f"DLS-BI-{dewar_number:04}"
8686

8787
proposal_reference = inner_db.session.scalar(
8888
select(func.concat(Shipment.proposalCode, Shipment.proposalNumber)).filter(Shipment.id == shipmentId)

tests/shipments/top_level_containers/test_create.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ def test_create_no_code(client):
6666
)
6767

6868
responses.get(
69-
f"{Config.ispyb_api.url}/dewar-registry?search=DLS-BI-&limit=1",
69+
f"{Config.ispyb_api.url}/dewar-registry?search=DLS-BI-1&limit=1",
7070
status=200,
7171
json={"items": [{"facilityCode": "DLS-BI-5671"}]},
7272
)
@@ -90,7 +90,7 @@ def test_create_no_code(client):
9090
def test_no_items_in_ispyb(client):
9191
"""Should set generated code index to 1000 if Expeye returns no dewar registry items"""
9292
responses.get(
93-
f"{Config.ispyb_api.url}/dewar-registry?search=DLS-BI-&limit=1",
93+
f"{Config.ispyb_api.url}/dewar-registry?search=DLS-BI-1&limit=1",
9494
status=200,
9595
json={"items": []},
9696
)
@@ -120,7 +120,7 @@ def test_no_items_in_ispyb(client):
120120
def test_create_no_code_expeye_out_of_range(client):
121121
"""Should set generated code index to 1000 if Expeye returns a code which is out of eBIC's range"""
122122
responses.get(
123-
f"{Config.ispyb_api.url}/dewar-registry?search=DLS-BI-&limit=1",
123+
f"{Config.ispyb_api.url}/dewar-registry?search=DLS-BI-1&limit=1",
124124
status=200,
125125
json={"items": [{"facilityCode": "DLS-BI-0008"}]},
126126
)
@@ -158,7 +158,7 @@ def test_create_no_code_expeye_out_of_range(client):
158158
def test_upstream_failure(client, status_get, status_post):
159159
"""Should raise exception if request fails upstream"""
160160
responses.get(
161-
f"{Config.ispyb_api.url}/dewar-registry?search=DLS-BI-&limit=1",
161+
f"{Config.ispyb_api.url}/dewar-registry?search=DLS-BI-1&limit=1",
162162
status=status_get,
163163
json={"items": [{"facilityCode": "DLS-BI-5671"}]},
164164
)

0 commit comments

Comments
 (0)