Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[DSM] PEPPER-947 changes from RC #2618

Merged
merged 7 commits into from
Aug 4, 2023
Merged

[DSM] PEPPER-947 changes from RC #2618

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
4fed4ed
PEPPER-947 changes from RC
pegahtah Jul 5, 2023
a4dc819
Merge branch 'develop' into PEPPER-947
pegahtah Jul 5, 2023
8c1bc33
Merge branch 'develop' into PEPPER-947
pegahtah Jul 31, 2023
ea44b0f
Merge branch 'develop' into PEPPER-947
pegahtah Aug 1, 2023
c25f895
Merge branch 'develop' into PEPPER-947
pegahtah Aug 3, 2023
590a8c0
Merge branch 'develop' into PEPPER-947
pegahtah Aug 3, 2023
7a20378
Merge branch 'develop' into PEPPER-947
pegahtah Aug 4, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions pepper-apis/dsm-core/src/main/java/org/broadinstitute/dsm/db/dao/kit/KitDaoImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -198,6 +198,7 @@ public Optional<ScanError> 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);
Expand Down
2 changes: 1 addition & 1 deletion pepper-apis/dsm-core/src/main/java/org/broadinstitute/dsm/model/kit/BaseKitUseCase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ public List<ScanError> get() {
public List<ScanError> getRGPFinalScan() {
List<ScanError> 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;
}
Expand Down
Loading