CADC-14486 RAFT DIO (rdoi)

doi/README.md

@@ -27,6 +27,9 @@ The doi.properties configures the DataCite service used to register new DOIs.
 # VOSpace uri to the parent DOI folder.
 ca.nrc.cadc.doi.vospaceParentUri = {parent folder URI}
 
+# DOI Identifier Prefix
+ca.nrc.cadc.doi.doiIdentifierPrefix = {DOI Identifier Prefix}
+
 # Prefix to the DOI metadata file
 ca.nrc.cadc.doi.metaDataPrefix = {metadata file prefix}
 
@@ -47,13 +50,11 @@ ca.nrc.cadc.doi.datacite.password = {password}
 
 # DataCite account prefix
 ca.nrc.cadc.doi.datacite.accountPrefix = {account prefix}
-
-# (Optional) DOI Identifier Prefix
-ca.nrc.cadc.doi.doiIdentifierPrefix = {DOI Identifier Prefix}
 ```
-
 _parentUri_ is the URI to the DOI parent folder in the VOSpace service.
 
+_doiIdentifierPrefix_ is prefix to the DOI Identifier.
+
 _metaDataPrefix_ is the prefix prepended to the DOI name used to create the file for the DOI specific metadata stored in VOSpace.
 
 _groupPrefix_ is the prefix prepended to the DOI name to create the group name for the DOI.
@@ -68,23 +69,14 @@ _password_ is the DataCite account password.
 
 _accountPrefix_ is the registered prefix for a DataCite account.
 
-_doiIdentifierPrefix_ is prefix to the DOI Identifier.
-
 **For Alternative DOI Settings ONLY**
 ```
 # Publisher Group URI
 ca.nrc.cadc.doi.publisherGroupURI = {Publisher Group URI}
-
-# self Publish
-ca.nrc.cadc.doi.selfPublish = {true|false}
 ```
 
 _publisherGroupURI_ is the URI to the group which gives permission to Approve/Publish or Reject DOIs to the user associated with this group.
 
-_selfPublish_ is to give permission to Mint DOIs. If set to true, only DOI Owner can Mint his DOI. If set to false, only a user from publisher group can Mint all the DOIs.
-
-#### Note: If `publisherGroupURI` is configured, `selfPublish` has to be configured 'false'.
-
 **For developer testing only:**
 ```
 # (optional) Create a random DOI ID for testing

doi/build.gradle

@@ -28,10 +28,12 @@ dependencies {
     implementation 'org.opencadc:cadc-util:[1.11.2,)'
     implementation 'org.opencadc:cadc-log:[1.1.0,)'
     implementation 'org.opencadc:cadc-rest:[1.3.20,)'
+    implementation 'org.opencadc:cadc-access-control:[1.0,2.0)'
     implementation 'org.opencadc:cadc-access-control-identity:[1.1.0,)'
     implementation 'org.opencadc:cadc-vosi:[1.4.3,2.0)'
     implementation 'org.opencadc:cadc-vos:[2.0.7,3.0)'
     implementation 'org.opencadc:cadc-vos-client:[2.0.4,3.0)'
+    implementation "org.json:json:20240303"
 
     runtimeOnly 'org.opencadc:cadc-registry:[1.8.0,)'
 

doi/src/intTest/java/ca/nrc/cadc/doi/AltPermissionsTest.java

@@ -1,5 +1,7 @@
 package ca.nrc.cadc.doi;
 
+import ca.nrc.cadc.doi.datacite.Date;
+import ca.nrc.cadc.doi.datacite.DateType;
 import ca.nrc.cadc.doi.datacite.Resource;
 import ca.nrc.cadc.doi.io.DoiParsingException;
 import ca.nrc.cadc.doi.io.DoiXmlReader;
@@ -13,12 +15,17 @@
 import ca.nrc.cadc.util.Log4jInit;
 import java.io.InputStream;
 import java.io.InputStreamReader;
+import java.time.LocalDate;
+import java.time.ZoneId;
+import java.time.format.DateTimeFormatter;
+import java.util.ArrayList;
 import java.util.Arrays;
 import org.apache.log4j.Level;
 import org.apache.log4j.Logger;
 import org.json.JSONArray;
 import org.json.JSONObject;
 import org.junit.Assert;
+import org.junit.Ignore;
 import org.junit.Test;
 import org.opencadc.vospace.ContainerNode;
 
@@ -44,14 +51,27 @@ public class AltPermissionsTest extends LifecycleTest {
         Log4jInit.setLevel("ca.nrc.cadc.doi", Level.INFO);
     }
 
+    @Override
+    @Ignore
+    @Test
+    public void testLifecycle() throws Exception {
+        // skip re-running the lifecycle test
+    }
+
     /*
      * Test Case 1:
      *   cadc user:
      *       create a DOI - success
      *       Update it - success
-     *       Mint it - fail with 403 status
+     *       Mint it - fail with 403
+     *       - set status 'in review' - success
+     *       - search DOIStatus with 'status = in review' filter - success
+     *       - Mint it - fail with 403
+     *       - delete it - fail with 403
+     *       - set status 'in progress'
      *       get all DOI Statuses - should find the recently created DOI
      *       search DOIStatus with 'status = draft' filter - success
+     *       - delete it - success
      *   Publisher user:
      *       get DOI - success
      *       get all DOI Statuses - should find the recently created DOI
@@ -72,7 +92,7 @@ public void testDOILifecycleWithAlternateSettings() throws Exception {
         log.debug("Test DOI lifecycle with Alternate Settings");
 
         // Create a new DOI
-        Resource expected = getTestResource(true, true, true);
+        Resource expected = getTestResource(true, true);
 
         String doiSuffix = Subject.doAs(readWriteSubject, (PrivilegedExceptionAction<String>) () -> {
 
@@ -190,12 +210,15 @@ public void testDOILifecycleWithAlternateSettings() throws Exception {
     *  Test Case 2:
     *   cadc user:
     *       create a DOI - success
+    *       set status = 'in review'
+    *       delete it - 403
+    *       set status = 'in progress'
     *       delete it - success
     * */
     @Test // creator of DOI can delete it
     public void testDeleteDOIByDOIOwner() throws Exception {
         // Create a new DOI
-        Resource expected = getTestResource(true, true, true);
+        Resource expected = getTestResource(true, true);
 
         String doiId = Subject.doAs(readWriteSubject, (PrivilegedExceptionAction<String>) () -> {
 
@@ -216,12 +239,16 @@ public void testDeleteDOIByDOIOwner() throws Exception {
      *   cadc user:
      *       create a DOI - success
      *   publisher user:
-     *       delete it - success
+     *       delete it - 403
+     *   cadc user:
+     *       set status = 'in review'
+     *   publisher user:
+     *       delete it - 403
      * */
-    @Test // publisher can delete a DOI
+    @Test // publisher can delete their own DOI
     public void testDeleteDOIByPublisher() throws Exception {
         // Create a new DOI
-        Resource expected = getTestResource(true, true, true);
+        Resource expected = getTestResource(true, true);
 
         String doiId = Subject.doAs(readWriteSubject, (PrivilegedExceptionAction<String>) () -> {
             // create a new DOI
@@ -255,7 +282,7 @@ public void testDeleteDOIByPublisher() throws Exception {
      * */
     @Test // If publisher is the owner of a DOI, he can not mint it.
     public void testPublisherAsDOIOwnerForMintAction() throws PrivilegedActionException {
-        Resource expected = getTestResource(true, true, true);
+        Resource expected = getTestResource(true, true);
         String doiId = Subject.doAs(publisherSubject, (PrivilegedExceptionAction<String>) () -> {
             Resource actual = create(expected, DOISettingsType.ALT_DOI);
             String doiID = getDOISuffix(actual.getIdentifier().getValue());
@@ -309,7 +336,7 @@ public void testPublisherAsDOIOwnerForMintAction() throws PrivilegedActionExcept
 
     @Test
     public void testDOISearchEndpoint() throws PrivilegedActionException, DoiParsingException, IOException {
-        Resource expected = getTestResource(true, true, true);
+        Resource expected = getTestResource(true, true);
 
         String mintedDOIId = Subject.doAs(readWriteSubject, (PrivilegedExceptionAction<String>) () -> {