Updated DOI service to support for RAFTS

doi/README.md

@@ -47,6 +47,9 @@ 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.
@@ -65,6 +68,23 @@ _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
@@ -126,7 +146,7 @@ At this point the metadata and the data sub-directory are available to the user
   - update metadata using the GUI
 
 ### Finalizing the DOI
-After all data files have been uploaded and the metadata have been updated, the user can finalize the DOI using the GUI. The process to finalize a DOI is a bit involved. Please refer to the status table below for the possible status transitions. Finalizing a DOI results in the following work to be performed.
+After all data files have been uploaded and the metadata have been updated, the user(The owner of the DOI OR a user from publisher group specified in doi.config) can finalize the DOI using the GUI. The process to finalize a DOI is a bit involved. Please refer to the status table below for the possible status transitions. Finalizing a DOI results in the following work to be performed.
   - change the following to read only and make them publicly accessible:
     - data sub-directory
     - all directories and their sub-directories, and data files contained in the data sub-directory
@@ -169,15 +189,15 @@ Among the supported the DOI metadata, the following are user editable:
 ## DOI Status
 A status is assigned to each DOI to indicate where it is in the service lifecycle. The following (incomplete) table associates the statuses with the service lifecylce.
 
- From Status        |  Action/Event  |  To Status
---------------------|----------------|--------------------
-  (start)           | create DOI     | in progress
- in progress        | update DOI     | in progress
- in progress        | mint   DOI     | locking data
- locking data       | error          | error locking data
- error locking data | mint   DOI     | locking data
- locking data       | success        | locked data
- locked data        | mint   DOI     | registering
- registering        | error          | error registering
- error registering  | mint   DOI     | registering
- registering        | success        | minted
+| From Status        | Action/Event | To Status          |
+|--------------------|--------------|--------------------|
+| (start)            | create DOI   | in progress        |
+| in progress        | update DOI   | in progress        |
+| in progress        | mint   DOI   | locking data       |
+| locking data       | error        | error locking data |
+| error locking data | mint   DOI   | locking data       |
+| locking data       | success      | locked data        |
+| locked data        | mint   DOI   | registering        |
+| registering        | error        | error registering  |
+| error registering  | mint   DOI   | registering        |
+| registering        | success      | minted             |

doi/build.gradle

@@ -1,8 +1,6 @@
 plugins {
     id 'java-test-fixtures'
     id 'war'
-    id 'maven'
-    id 'maven-publish'
     id 'checkstyle'
 }
 
@@ -19,7 +17,7 @@ group = 'ca.nrc.cadc'
 
 war {
     from(System.getenv('RPS') + '/resources/') {
-        include 'swagger-ui/'
+        include 'swagger-openapi/'
     }
     from('.') {
         include 'VERSION'
@@ -35,7 +33,7 @@ dependencies {
     implementation 'org.opencadc:cadc-vos:[2.0.7,3.0)'
     implementation 'org.opencadc:cadc-vos-client:[2.0.4,3.0)'
 
-    runtimeOnly 'org.opencadc:cadc-registry:[1.7.2,)'
+    runtimeOnly 'org.opencadc:cadc-registry:[1.8.0,)'
 
     testFixturesImplementation 'junit:junit:[4.0,5.0)'
     testFixturesImplementation 'org.jdom:jdom2:[2.0,3.0)'

doi/src/intTest/README.md

@@ -1,21 +1,29 @@
 # doi service integration tests
 
-The integration tests can run against a local `doi` service, and either a local or remote VOSpace service.
+The integration tests can run against two local `doi` service - one with basic configuration and one with alternate configuration, and either a local or remote VOSpace service.
 
 ## configuration
+While running both the basic and alternate configuration tests, _groupPrefix_ property can be set to `TEST.DOI-` to differentiate the test groups. 
+
 A file called `intTest.properties` can be in the classpath (in `src/intTest/resources`) to override properties.
 
 ### intTest.properties
 ```
 doiResourceID={resourceID of the doi service}
-vospaceParentUri={VOSURI to the DOI parent folder in the VOSpace service}
+doiVospaceParentUri={VOSURI to the DOI parent folder in the VOSpace service}
+doiAltResourceID={resourceID of the doi service with alternate configuration}
+doiAltVospaceParentUri={VOSURI to the Alt DOI parent folder in the VOSpace service}
+doiAltIdentifierPrefix={prefix for the DOI Identifier}
 ```
 
-**_vospaceParentUri_** must match `ca.nrc.cadc.doi.vospaceParentUri` configured in the doi service `doi.properties`.
+**_doiVospaceParentUri_** must match `ca.nrc.cadc.doi.vospaceParentUri` configured in the doi service `doi.properties`.
+**_doiAltVospaceParentUri_** must match `ca.nrc.cadc.doi.vospaceParentUri` configured in the Alternate doi service `doi.properties`.
+**_doiAltIdentifierPrefix_** must match `doiIdentifierPrefix` configured in the Alternate doi service `doi.properties`.
 
 ### certificates
 Client test certificates in the `$A/test-certificates/` directory are used to authenticate to the doi service.
 The following certificates are expected.
 - `doi-admin.pem` owns and has full permissions to the test DOI.
 - `doi-auth.pem` is a member of a group that has read-write permissions to the test DOI.
 - `doi-noauth.pem` is not a member of any group that has permissions to the test DOI, resulting in read-only permissions to the test DOI.
+- `doi-publisher.pem` is a member of a group that has publish permissions to the test DOI.