Set DepositStatus to "accepted" if RepositoryCopy link added (#19)

* Set Deposit status to accepted when there is a RepositoryCopy
* Bump version to 1.2.4 for release

entrez-pmid-lookup/pom.xml

@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.dataconservancy.pass</groupId>
     <artifactId>pass-nihms-submission-etl</artifactId>
-    <version>1.2.3</version>
+    <version>1.2.4</version>
   </parent>
 
   <artifactId>entrez-pmid-lookup</artifactId>

nihms-data-harvest-cli/pom.xml

@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.dataconservancy.pass</groupId>
     <artifactId>pass-nihms-submission-etl</artifactId>
-    <version>1.2.3</version>
+    <version>1.2.4</version>
   </parent>
   <artifactId>nihms-data-harvest-cli</artifactId>
   <packaging>jar</packaging>

nihms-data-harvest/pom.xml

@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.dataconservancy.pass</groupId>
     <artifactId>pass-nihms-submission-etl</artifactId>
-    <version>1.2.3</version>
+    <version>1.2.4</version>
   </parent>
 
   <artifactId>nihms-data-harvest</artifactId>

nihms-data-transform-load-cli/pom.xml

@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.dataconservancy.pass</groupId>
     <artifactId>pass-nihms-submission-etl</artifactId>
-    <version>1.2.3</version>
+    <version>1.2.4</version>
   </parent>
   <artifactId>nihms-data-transform-load-cli</artifactId>
   <name>NIHMS Data Transform/Load Command Line Interface</name>

nihms-data-transform-load/pom.xml

@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.dataconservancy.pass</groupId>
     <artifactId>pass-nihms-submission-etl</artifactId>
-    <version>1.2.3</version>
+    <version>1.2.4</version>
   </parent>
   <artifactId>nihms-data-transform-load</artifactId>
   <name>NIHMS Data Transform/Load</name>

nihms-data-transform-load/src/main/java/org/dataconservancy/pass/loader/nihms/SubmissionLoader.java

@@ -19,14 +19,15 @@
 
 import org.dataconservancy.pass.client.nihms.NihmsPassClientService;
 import org.dataconservancy.pass.model.Deposit;
+import org.dataconservancy.pass.model.Deposit.DepositStatus;
 import org.dataconservancy.pass.model.Publication;
 import org.dataconservancy.pass.model.RepositoryCopy;
 import org.dataconservancy.pass.model.Submission;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 /**
- *
+ * Creates / updates the Submission, RepositoryCopy, Publication, and Deposit in the database as needed 
  * @author Karen Hanson
  */
 public class SubmissionLoader {
@@ -98,6 +99,7 @@ public void load(SubmissionDTO dto) {
             Deposit deposit = clientService.findNihmsDepositForSubmission(submission.getId());
             if (deposit!=null && deposit.getRepositoryCopy()==null) {
                 deposit.setRepositoryCopy(repositoryCopyUri);
+                deposit.setDepositStatus(DepositStatus.ACCEPTED);
                 clientService.updateDeposit(deposit);
             } else if (deposit!=null && !deposit.getRepositoryCopy().equals(repositoryCopyUri)) {
                 //this shouldn't happen in principle, but if it does it should be checked.

nihms-data-transform-load/src/test/java/org/dataconservancy/pass/loader/nihms/SubmissionLoaderTest.java

@@ -267,7 +267,7 @@ public void testLoadExistingPubExistingSubmissionNewRepoCopy() throws Exception
 
         Deposit deposit = new Deposit();
         deposit.setId(new URI(sDepositUri));
-        deposit.setDepositStatus(DepositStatus.ACCEPTED);
+        deposit.setDepositStatus(DepositStatus.SUBMITTED);
         deposit.setRepository(repositoryCopy.getRepository());
 
         SubmissionDTO dto = new SubmissionDTO();
@@ -295,6 +295,7 @@ public void testLoadExistingPubExistingSubmissionNewRepoCopy() throws Exception
         ArgumentCaptor<Deposit> depositCaptor = ArgumentCaptor.forClass(Deposit.class);
         verify(clientServiceMock).updateDeposit(depositCaptor.capture()); 
         deposit.setRepositoryCopy(repositoryCopyUri);
+        deposit.setDepositStatus(DepositStatus.ACCEPTED);
         assertEquals(deposit, depositCaptor.getValue());
 
     }

nihms-etl-integration/pom.xml

@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.dataconservancy.pass</groupId>
     <artifactId>pass-nihms-submission-etl</artifactId>
-    <version>1.2.3</version>
+    <version>1.2.4</version>
   </parent>
   <artifactId>nihms-etl-integration</artifactId>
   <name>NIHMS ELT Integration Tests</name>

nihms-etl-integration/src/test/java/org/dataconservancy/pass/loader/nihms/integration/TransformAndLoadCompliantIT.java

@@ -396,7 +396,7 @@ public void testCompliantPublicationExistingSubmissionAndDeposit() throws Except
 
         //check repository copy link added, but status did not change... status managed by deposit service
         Deposit deposit = client.readResource(preexistingDepositUri, Deposit.class);
-        assertEquals(preexistingDeposit.getDepositStatus(), deposit.getDepositStatus());
+        assertEquals(DepositStatus.ACCEPTED, deposit.getDepositStatus());
         assertEquals(repocopyUri, deposit.getRepositoryCopy());
 
     }

nihms-etl-integration/src/test/java/org/dataconservancy/pass/loader/nihms/integration/TransformAndLoadInProcess.java

@@ -196,7 +196,7 @@ public void testInProcessExistingSubmissionDeposit() throws Exception {
 
         //check repository copy link added, but status did not change... status managed by deposit service
         Deposit deposit = client.readResource(preexistingDepositUri, Deposit.class);
-        assertEquals(preexistingDeposit.getDepositStatus(), deposit.getDepositStatus());
+        assertEquals(DepositStatus.ACCEPTED, deposit.getDepositStatus());
         assertEquals(repocopyUri, deposit.getRepositoryCopy());
 
     }

nihms-etl-integration/src/test/java/org/dataconservancy/pass/loader/nihms/integration/TransformAndLoadNonCompliant.java

@@ -196,7 +196,7 @@ public void testStalledPublicationExistingSubmissionAndDeposit() throws Exceptio
 
         //check repository copy link added, but status did not change... status managed by deposit service
         Deposit deposit = client.readResource(preexistingDepositUri, Deposit.class);
-        assertEquals(preexistingDeposit.getDepositStatus(), deposit.getDepositStatus());
+        assertEquals(DepositStatus.ACCEPTED, deposit.getDepositStatus());
         assertEquals(repocopyUri, deposit.getRepositoryCopy());
 
     }

nihms-etl-model/pom.xml

@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.dataconservancy.pass</groupId>
     <artifactId>pass-nihms-submission-etl</artifactId>
-    <version>1.2.3</version>
+    <version>1.2.4</version>
   </parent>
 
   <artifactId>nihms-etl-model</artifactId>

nihms-etl-util/pom.xml

@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.dataconservancy.pass</groupId>
     <artifactId>pass-nihms-submission-etl</artifactId>
-    <version>1.2.3</version>
+    <version>1.2.4</version>
   </parent>
   <artifactId>nihms-etl-util</artifactId>
   <name>NIHMS ETL Utilities</name>

nihms-pass-client/pom.xml

@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.dataconservancy.pass</groupId>
     <artifactId>pass-nihms-submission-etl</artifactId>
-    <version>1.2.3</version>
+    <version>1.2.4</version>
   </parent>
 
   <artifactId>nihms-pass-client</artifactId>

pom.xml

@@ -4,7 +4,7 @@
 
   <groupId>org.dataconservancy.pass</groupId>
   <artifactId>pass-nihms-submission-etl</artifactId>
-  <version>1.2.3</version>
+  <version>1.2.4</version>
   <packaging>pom</packaging>
 
   <name>PASS NIHMS Submission Extract-Transform-Load</name>