diff --git a/entrez-pmid-lookup/pom.xml b/entrez-pmid-lookup/pom.xml
index 6b322af..cd78c16 100644
--- a/entrez-pmid-lookup/pom.xml
+++ b/entrez-pmid-lookup/pom.xml
@@ -5,7 +5,7 @@
org.dataconservancy.pass
pass-nihms-submission-etl
- 1.2.3
+ 1.2.4
entrez-pmid-lookup
diff --git a/nihms-data-harvest-cli/pom.xml b/nihms-data-harvest-cli/pom.xml
index b87cb79..8051631 100644
--- a/nihms-data-harvest-cli/pom.xml
+++ b/nihms-data-harvest-cli/pom.xml
@@ -5,7 +5,7 @@
org.dataconservancy.pass
pass-nihms-submission-etl
- 1.2.3
+ 1.2.4
nihms-data-harvest-cli
jar
diff --git a/nihms-data-harvest/pom.xml b/nihms-data-harvest/pom.xml
index 3a42f16..3fc06ea 100644
--- a/nihms-data-harvest/pom.xml
+++ b/nihms-data-harvest/pom.xml
@@ -5,7 +5,7 @@
org.dataconservancy.pass
pass-nihms-submission-etl
- 1.2.3
+ 1.2.4
nihms-data-harvest
diff --git a/nihms-data-transform-load-cli/pom.xml b/nihms-data-transform-load-cli/pom.xml
index 5bc1236..854f0d4 100644
--- a/nihms-data-transform-load-cli/pom.xml
+++ b/nihms-data-transform-load-cli/pom.xml
@@ -5,7 +5,7 @@
org.dataconservancy.pass
pass-nihms-submission-etl
- 1.2.3
+ 1.2.4
nihms-data-transform-load-cli
NIHMS Data Transform/Load Command Line Interface
diff --git a/nihms-data-transform-load/pom.xml b/nihms-data-transform-load/pom.xml
index 0fb8b98..d9ff4c4 100644
--- a/nihms-data-transform-load/pom.xml
+++ b/nihms-data-transform-load/pom.xml
@@ -5,7 +5,7 @@
org.dataconservancy.pass
pass-nihms-submission-etl
- 1.2.3
+ 1.2.4
nihms-data-transform-load
NIHMS Data Transform/Load
diff --git a/nihms-data-transform-load/src/main/java/org/dataconservancy/pass/loader/nihms/SubmissionLoader.java b/nihms-data-transform-load/src/main/java/org/dataconservancy/pass/loader/nihms/SubmissionLoader.java
index 997be56..ba04e19 100644
--- a/nihms-data-transform-load/src/main/java/org/dataconservancy/pass/loader/nihms/SubmissionLoader.java
+++ b/nihms-data-transform-load/src/main/java/org/dataconservancy/pass/loader/nihms/SubmissionLoader.java
@@ -19,6 +19,7 @@
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;
@@ -26,7 +27,7 @@
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.
diff --git a/nihms-data-transform-load/src/test/java/org/dataconservancy/pass/loader/nihms/SubmissionLoaderTest.java b/nihms-data-transform-load/src/test/java/org/dataconservancy/pass/loader/nihms/SubmissionLoaderTest.java
index 62d6d61..a7301c6 100644
--- a/nihms-data-transform-load/src/test/java/org/dataconservancy/pass/loader/nihms/SubmissionLoaderTest.java
+++ b/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 depositCaptor = ArgumentCaptor.forClass(Deposit.class);
verify(clientServiceMock).updateDeposit(depositCaptor.capture());
deposit.setRepositoryCopy(repositoryCopyUri);
+ deposit.setDepositStatus(DepositStatus.ACCEPTED);
assertEquals(deposit, depositCaptor.getValue());
}
diff --git a/nihms-etl-integration/pom.xml b/nihms-etl-integration/pom.xml
index f8e8157..64c207c 100644
--- a/nihms-etl-integration/pom.xml
+++ b/nihms-etl-integration/pom.xml
@@ -5,7 +5,7 @@
org.dataconservancy.pass
pass-nihms-submission-etl
- 1.2.3
+ 1.2.4
nihms-etl-integration
NIHMS ELT Integration Tests
diff --git a/nihms-etl-integration/src/test/java/org/dataconservancy/pass/loader/nihms/integration/TransformAndLoadCompliantIT.java b/nihms-etl-integration/src/test/java/org/dataconservancy/pass/loader/nihms/integration/TransformAndLoadCompliantIT.java
index c6bf475..12405ec 100644
--- a/nihms-etl-integration/src/test/java/org/dataconservancy/pass/loader/nihms/integration/TransformAndLoadCompliantIT.java
+++ b/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());
}
diff --git a/nihms-etl-integration/src/test/java/org/dataconservancy/pass/loader/nihms/integration/TransformAndLoadInProcess.java b/nihms-etl-integration/src/test/java/org/dataconservancy/pass/loader/nihms/integration/TransformAndLoadInProcess.java
index e5d62aa..bb1bdb9 100644
--- a/nihms-etl-integration/src/test/java/org/dataconservancy/pass/loader/nihms/integration/TransformAndLoadInProcess.java
+++ b/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());
}
diff --git a/nihms-etl-integration/src/test/java/org/dataconservancy/pass/loader/nihms/integration/TransformAndLoadNonCompliant.java b/nihms-etl-integration/src/test/java/org/dataconservancy/pass/loader/nihms/integration/TransformAndLoadNonCompliant.java
index b1ef84c..ddff900 100644
--- a/nihms-etl-integration/src/test/java/org/dataconservancy/pass/loader/nihms/integration/TransformAndLoadNonCompliant.java
+++ b/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());
}
diff --git a/nihms-etl-model/pom.xml b/nihms-etl-model/pom.xml
index beefdac..fc4e597 100644
--- a/nihms-etl-model/pom.xml
+++ b/nihms-etl-model/pom.xml
@@ -5,7 +5,7 @@
org.dataconservancy.pass
pass-nihms-submission-etl
- 1.2.3
+ 1.2.4
nihms-etl-model
diff --git a/nihms-etl-util/pom.xml b/nihms-etl-util/pom.xml
index b74f9da..81b04c0 100644
--- a/nihms-etl-util/pom.xml
+++ b/nihms-etl-util/pom.xml
@@ -5,7 +5,7 @@
org.dataconservancy.pass
pass-nihms-submission-etl
- 1.2.3
+ 1.2.4
nihms-etl-util
NIHMS ETL Utilities
diff --git a/nihms-pass-client/pom.xml b/nihms-pass-client/pom.xml
index 891d938..bc312ac 100644
--- a/nihms-pass-client/pom.xml
+++ b/nihms-pass-client/pom.xml
@@ -5,7 +5,7 @@
org.dataconservancy.pass
pass-nihms-submission-etl
- 1.2.3
+ 1.2.4
nihms-pass-client
diff --git a/pom.xml b/pom.xml
index d656b8f..4284f44 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
org.dataconservancy.pass
pass-nihms-submission-etl
- 1.2.3
+ 1.2.4
pom
PASS NIHMS Submission Extract-Transform-Load