Skip to content

Commit 4bc1ed1

Browse files
authored
PEPPER-1627 Allow for blank kit statuses
1 parent 3dd7c71 commit 4bc1ed1

File tree

2 files changed

+6
-1
lines changed

2 files changed

+6
-1
lines changed

pepper-apis/dsm-core/src/main/java/org/broadinstitute/dsm/db/dao/kit/KitCurrentStatus.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,9 @@ public enum KitCurrentStatus {
99
RECEIVED("Received"),
1010
SENT("Sent"),
1111
KIT_WITHOUT_LABEL("Kit Without Label"),
12-
DEACTIVATED("Deactivated");
12+
DEACTIVATED("Deactivated"),
13+
UNKNOWN("Unknown");
14+
1315
private final String value;
1416

1517
KitCurrentStatus(String name) {

pepper-apis/dsm-core/src/main/java/org/broadinstitute/dsm/db/dao/kit/KitStatusDao.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -130,6 +130,9 @@ public List<NonPepperKitStatusDto> getKitsByKitIdArray(String[] kitIdsArray, Map
130130

131131
private static class BuildNonPepperKitStatusDto {
132132
private static KitCurrentStatus calculateCurrentStatus(ResultSet foundKitResults) {
133+
if (foundKitResults == null) {
134+
return KitCurrentStatus.UNKNOWN;
135+
}
133136
try {
134137
if (isDeactivatedKit(foundKitResults)) {
135138
return KitCurrentStatus.DEACTIVATED;

0 commit comments

Comments
 (0)