[JN-1440] Workaround fix for DSM not returning tracking number for re…

…turnOnly kits (#1183)
broadinstitute · Nov 5, 2024 · 8efedd6 · 8efedd6
1 parent e9b0532
commit 8efedd6
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/core/src/main/java/bio/terra/pearl/core/service/kit/KitRequestService.java b/core/src/main/java/bio/terra/pearl/core/service/kit/KitRequestService.java
@@ -412,7 +412,9 @@ private void saveKitStatus(KitRequest kitRequest, PepperKit pepperKit, Instant p
             setKitDates(kitRequest, pepperKit);
             // for now just copy these over on each update, since there is currently no reason to make it conditional
             kitRequest.setTrackingNumber(pepperKit.getTrackingNumber());
-            kitRequest.setReturnTrackingNumber(pepperKit.getReturnTrackingNumber());
+            if(pepperKit.getReturnTrackingNumber() != null) {
+                kitRequest.setReturnTrackingNumber(pepperKit.getReturnTrackingNumber());
+            }
             kitRequest.setErrorMessage(pepperKit.getErrorMessage());
             dao.update(kitRequest);
         } catch (JsonProcessingException e) {