From 4fed4ed64710c10cf32b97516964765686457f0c Mon Sep 17 00:00:00 2001 From: ptaheri Date: Wed, 5 Jul 2023 14:58:26 -0400 Subject: [PATCH] PEPPER-947 changes from RC --- .../main/java/org/broadinstitute/dsm/db/dao/kit/KitDaoImpl.java | 1 + .../java/org/broadinstitute/dsm/model/kit/BaseKitUseCase.java | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/pepper-apis/dsm-core/src/main/java/org/broadinstitute/dsm/db/dao/kit/KitDaoImpl.java b/pepper-apis/dsm-core/src/main/java/org/broadinstitute/dsm/db/dao/kit/KitDaoImpl.java index 62bcfa11a9..c94dbceddb 100644 --- a/pepper-apis/dsm-core/src/main/java/org/broadinstitute/dsm/db/dao/kit/KitDaoImpl.java +++ b/pepper-apis/dsm-core/src/main/java/org/broadinstitute/dsm/db/dao/kit/KitDaoImpl.java @@ -198,6 +198,7 @@ public Optional updateKitRequest(KitRequestShipping kitRequestShippin } } } catch (Exception ex) { + logger.error("Not able to update the kit for ddpLabel " + kitRequestShipping.getDdpLabel(), ex); dbVals.resultValue = new ScanError(kitRequestShipping.getDdpLabel(), "Kit Label \"" + kitRequestShipping.getDdpLabel() + "\" was already scanned.\n" + UserErrorMessages.IF_QUESTIONS_CONTACT_DEVELOPER); diff --git a/pepper-apis/dsm-core/src/main/java/org/broadinstitute/dsm/model/kit/BaseKitUseCase.java b/pepper-apis/dsm-core/src/main/java/org/broadinstitute/dsm/model/kit/BaseKitUseCase.java index 07c492dfa6..1740866233 100644 --- a/pepper-apis/dsm-core/src/main/java/org/broadinstitute/dsm/model/kit/BaseKitUseCase.java +++ b/pepper-apis/dsm-core/src/main/java/org/broadinstitute/dsm/model/kit/BaseKitUseCase.java @@ -37,7 +37,7 @@ public List get() { public List getRGPFinalScan() { List result = new ArrayList<>(); for (ScanPayload scanPayload : kitPayload.getScanPayloads()) { - process(scanPayload).ifPresentOrElse(maybeScanError -> result.add(maybeScanError), () -> result.add(null)); + processRGPFinalScan(scanPayload).ifPresentOrElse(maybeScanError -> result.add(maybeScanError), () -> result.add(null)); } return result; }