PEPPER-841 PR comments applied, renamed setupJuniperInstance to setup…

…JuniperInstanceAndSettings in JuniperSetupUtil, fixed the return of error true in times of success in NonPepperKitCreationService and fixed url for KIT_STATUS_PARTICIPANT_ID
broadinstitute · Aug 22, 2023 · 0f525b0 · 0f525b0
1 parent 0f66b07
commit 0f525b0
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 5 deletions.
diff --git a/.../src/main/java/org/broadinstitute/dsm/model/nonpepperkit/NonPepperKitCreationService.java b/.../src/main/java/org/broadinstitute/dsm/model/nonpepperkit/NonPepperKitCreationService.java
@@ -73,7 +73,7 @@ public KitResponse createNonPepperKit(JuniperKitRequest juniperKitRequest, Strin
         }
 
         log.info(juniperKitRequest.getJuniperKitId() + " " + ddpInstance.getName() + " " + kitTypeName + " kit created");
-        return KitResponse.makeKitResponseError(null, juniperKitRequest.getJuniperKitId(), null);
+        return KitResponse.makeKitStatusResponse(null);
     }
 
 

diff --git a/pepper-apis/dsm-core/src/main/java/org/broadinstitute/dsm/statics/RoutePath.java b/pepper-apis/dsm-core/src/main/java/org/broadinstitute/dsm/statics/RoutePath.java
@@ -38,7 +38,7 @@ public class RoutePath {
     public static final String KIT_STATUS_JUNIPER_KIT_ID = "/kitstatus/juniperKit";
     public static final String KIT_STATUS_ENDPOINT_KIT_IDS = "/kitstatus/kits";
     public static final String KIT_STATUS_ENDPOINT_PARTICIPANT_ID = "/kitstatus/participant/:participantId";
-    public static final String KIT_STATUS_PARTICIPANT_ID = "/kitstatus/participantId";
+    public static final String KIT_STATUS_PARTICIPANT_ID = "/kitstatus/participant";
     //Drug list endpoint route
     public static final String DRUG_LIST_REQUEST = "/drugs"; // display names only (for survey display)
     public static final String CANCER_LIST_REQUEST = "/cancers";

diff --git a/...pis/dsm-core/src/test/java/org/broadinstitute/dsm/juniperkits/JuniperKitCreationTest.java b/...pis/dsm-core/src/test/java/org/broadinstitute/dsm/juniperkits/JuniperKitCreationTest.java
@@ -49,7 +49,7 @@ public class JuniperKitCreationTest extends DbTxnBaseTest {
     public static void setupJuniperBefore() {
         JuniperSetupUtil juniperSetupUtil = new JuniperSetupUtil(instanceName, instanceGuid, "Juniper-Test", bspPrefix);
         ;
-        juniperSetupUtil.setupJuniperInstance();
+        juniperSetupUtil.setupJuniperInstanceAndSettings();
         ddpInstance = DDPInstance.getDDPInstanceWithRoleByStudyGuid(instanceGuid, DBConstants.JUNIPER_STUDY_INSTANCE_ROLE);
     }
 

diff --git a/...-apis/dsm-core/src/test/java/org/broadinstitute/dsm/juniperkits/JuniperKitStatusTest.java b/...-apis/dsm-core/src/test/java/org/broadinstitute/dsm/juniperkits/JuniperKitStatusTest.java
@@ -50,7 +50,7 @@ public class JuniperKitStatusTest extends DbTxnBaseTest {
     public static void setupJuniperBefore() {
         JuniperSetupUtil juniperSetupUtil = new JuniperSetupUtil(instanceName, instanceGuid, "Juniper-Test", "JuniperTestProject");
         ;
-        juniperSetupUtil.setupJuniperInstance();
+        juniperSetupUtil.setupJuniperInstanceAndSettings();
         ddpInstance = DDPInstance.getDDPInstanceWithRoleByStudyGuid(instanceGuid, DBConstants.JUNIPER_STUDY_INSTANCE_ROLE);
         when(mockEasyPostUtil.checkAddress(any(), anyString())).thenReturn(true);
     }

diff --git a/pepper-apis/dsm-core/src/test/java/org/broadinstitute/dsm/juniperkits/JuniperSetupUtil.java b/pepper-apis/dsm-core/src/test/java/org/broadinstitute/dsm/juniperkits/JuniperSetupUtil.java
@@ -163,7 +163,7 @@ private static String getPrimaryKey(ResultSet rs, String table) throws SQLExcept
         }
     }
 
-    public void setupJuniperInstance() {
+    public void setupJuniperInstanceAndSettings() {
 
         //everything should get inserted in one transaction
         SimpleResult results = inTransaction((conn) -> {