Skip to content

LIMS-2281: Simplify code between Synchweb and Shipping Service - #1090

Merged
ndg63276 merged 2 commits into
pre-release/2026-R4.2from
improvement/LIMS-2281/simplify-shipping-service-requests
Sep 7, 2026
Merged

LIMS-2281: Simplify code between Synchweb and Shipping Service#1090
ndg63276 merged 2 commits into
pre-release/2026-R4.2from
improvement/LIMS-2281/simplify-shipping-service-requests

Conversation

@ndg63276

Copy link
Copy Markdown
Collaborator

JIRA ticket: LIMS-2281

Summary:

Remove the option to use the shipping service without redirection, so we can send the shipping service the external_id of null. This will get rid of the error when the same external_id gets reused for incoming and outgoing.

Changes:

  • Remove config variables for redirecting to shipping service (assume true if shipping service in use)
  • Remove else clauses that are no longer in use
  • Remove _dispatch_dewar_in_shipping_service and _book_shipment_in_shipping_service functions that are no longer accessible
  • Remove no longer used functions from ShippingService.php
  • Send external_id of null to the shipping service, now it is no longer retrieved
  • Remove unnecessary apostrophes in dispatch warnings

To test:

  • Enable the shipping service in config
$use_shipping_service = True;
$use_shipping_service_incoming_shipments = True;
$shipping_service_app_url = "https://sample-shipping-test.diamond.ac.uk";
  • Go to any proposal (eg mx23694), go to /shipments/add and create a UDC shipment using a UK lab contact, and clicking "Use Facility Account"

  • Click Create DHL Air Waybill, then Proceed, then complete the shipping service form

  • Check the AWB number ends up in ISPyB, and the dewar status goes to "awb created" or "pickup booked"

  • Click "Dispatch" and then "Proceed", then complete the shipping service form

  • Check the return AWB number ends up in ISPyB, and the dewar status goes to "dispatch-booked"

  • Disable the shipping service in config

$use_shipping_service = False;
$use_shipping_service_incoming_shipments = False;
  • Repeat the test, except this time it will be a Synchweb form rather than the shipping service

@ndg63276
ndg63276 changed the base branch from master to pre-release/2026-R4.2 September 7, 2026 16:24
@ndg63276
ndg63276 merged commit 8d3762d into pre-release/2026-R4.2 Sep 7, 2026
2 checks passed
@ndg63276
ndg63276 deleted the improvement/LIMS-2281/simplify-shipping-service-requests branch September 7, 2026 16:32
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants