Merge pull request #265 from KPMP/develop

Release v3.1
KPMP · May 23, 2023 · e66c3f5 · e66c3f5
2 parents 4aaf719 + d636383
commit e66c3f5
Show file tree

Hide file tree

Showing 2 changed files with 56 additions and 16 deletions.
diff --git a/src/main/java/org/kpmp/dmd/DluPackageInventory.java b/src/main/java/org/kpmp/dmd/DluPackageInventory.java
@@ -15,11 +15,11 @@ public class DluPackageInventory {
     private Boolean dluLfu;
     private String knownSpecimen;
     private String redcapId;
-    private Boolean userPackageReady;
+    private String userPackageReady;
     private Boolean dvcValidationComplete;
     private String packageValidated;
-    private String readyToPromoteDlu;
-    private Boolean globusDluFailed;
+    private String readyToMoveFromGlobus;
+    private String globusDluStatus;
     private String removedFromGlobus;
     private String promotionStatus;
     private String notes;
@@ -32,11 +32,15 @@ public DluPackageInventory(Package myPackage) {
         setDluPackageType(myPackage.getPackageType());
         setDluSubjectId(myPackage.getSubjectId());
         setDluError(false);
+        setUserPackageReady(!myPackage.getLargeFilesChecked());
         setDluLfu(myPackage.getLargeFilesChecked());
-        setGlobusDluFailed(false);
+        if (myPackage.getLargeFilesChecked()) {
+            setGlobusDluStatus("waiting");
+        } else {
+            setGlobusDluStatus("N/A");
+        }
     }
 
-
     public DluPackageInventory() {
     }
 
@@ -120,11 +124,18 @@ public void setRedcapId(String redcapId) {
         this.redcapId = redcapId;
     }
 
-    public Boolean getUserPackageReady() {
+    public String getUserPackageReady() {
         return userPackageReady;
     }
 
     public void setUserPackageReady(Boolean userPackageReady) {
+        if (userPackageReady) {
+            this.userPackageReady = "Y";
+        } else {
+            this.userPackageReady = "N";
+        }
+    }
+    public void setUserPackageReady(String userPackageReady) {
         this.userPackageReady = userPackageReady;
     }
 
@@ -144,20 +155,20 @@ public void setPackageValidated(String packageValidated) {
         this.packageValidated = packageValidated;
     }
 
-    public String getReadyToPromoteDlu() {
-        return readyToPromoteDlu;
+    public String getReadyToMoveFromGlobus() {
+        return readyToMoveFromGlobus;
     }
 
-    public void setReadyToPromoteDlu(String readyToPromoteDlu) {
-        this.readyToPromoteDlu = readyToPromoteDlu;
+    public void setReadyToMoveFromGlobus(String readyToMoveFromGlobus) {
+        this.readyToMoveFromGlobus = readyToMoveFromGlobus;
     }
 
-    public Boolean getGlobusDluFailed() {
-        return globusDluFailed;
+    public String getGlobusDluStatus() {
+        return globusDluStatus;
     }
 
-    public void setGlobusDluFailed(Boolean globusDluFailed) {
-        this.globusDluFailed = globusDluFailed;
+    public void setGlobusDluStatus(String globusDluStatus) {
+        this.globusDluStatus = globusDluStatus;
     }
 
     public String getRemovedFromGlobus() {

diff --git a/src/test/java/org/kpmp/dmd/DluPackageInventoryTest.java b/src/test/java/org/kpmp/dmd/DluPackageInventoryTest.java
@@ -9,7 +9,7 @@
 
 import java.util.Date;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.*;
 
 public class DluPackageInventoryTest {
 
@@ -26,7 +26,7 @@ public void tearDown() throws Exception {
     }
 
     @Test
-    public void testConstructor() {
+    public void testConstructorDluTrue() {
         Date now = new Date();
         User user = new User();
         user.setDisplayName("name");
@@ -37,13 +37,42 @@ public void testConstructor() {
         myPackage.setCreatedAt(now);
         myPackage.setSubmitter(user);
         myPackage.setSubjectId("subjid");
+        myPackage.setLargeFilesChecked(true);
         DluPackageInventory dluPackageInventory = new DluPackageInventory(myPackage);
         assertEquals("123", dluPackageInventory.getDluPackageId());
         assertEquals("name", dluPackageInventory.getDluSubmitter());
         assertEquals("type", dluPackageInventory.getDluPackageType());
         assertEquals("tis", dluPackageInventory.getDluTis());
         assertEquals(user.getDisplayName(), dluPackageInventory.getDluSubmitter());
         assertEquals("subjid", dluPackageInventory.getDluSubjectId());
+        assertTrue(dluPackageInventory.getDluLfu());
+        assertEquals("waiting", dluPackageInventory.getGlobusDluStatus());
+        assertEquals("N", dluPackageInventory.getUserPackageReady());
+    }
+
+    @Test
+    public void testConstructorDluFalse() {
+        Date now = new Date();
+        User user = new User();
+        user.setDisplayName("name");
+        Package myPackage = new Package();
+        myPackage.setPackageId("123");
+        myPackage.setPackageType("type");
+        myPackage.setTisName("tis");
+        myPackage.setCreatedAt(now);
+        myPackage.setSubmitter(user);
+        myPackage.setSubjectId("subjid");
+        myPackage.setLargeFilesChecked(false);
+        DluPackageInventory dluPackageInventory = new DluPackageInventory(myPackage);
+        assertEquals("123", dluPackageInventory.getDluPackageId());
+        assertEquals("name", dluPackageInventory.getDluSubmitter());
+        assertEquals("type", dluPackageInventory.getDluPackageType());
+        assertEquals("tis", dluPackageInventory.getDluTis());
+        assertEquals(user.getDisplayName(), dluPackageInventory.getDluSubmitter());
+        assertEquals("subjid", dluPackageInventory.getDluSubjectId());
+        assertFalse(dluPackageInventory.getDluLfu());
+        assertEquals("N/A", dluPackageInventory.getGlobusDluStatus());
+        assertEquals("Y", dluPackageInventory.getUserPackageReady());
     }
 
 }