[DUOS-2724][risk=no] Make file types not required and other minor fix…

…es (#2166)
DataBiosphere · Oct 19, 2023 · f43fda6 · f43fda6
1 parent 6ecb77b
commit f43fda6
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 7 deletions.
diff --git a/...ain/java/org/broadinstitute/consent/http/models/dataset_registration_v1/ConsentGroup.java b/...ain/java/org/broadinstitute/consent/http/models/dataset_registration_v1/ConsentGroup.java
@@ -539,10 +539,18 @@ public void setUrl(URI url) {
     this.url = url;
   }
 
+  /**
+   * # of Participants (Required)
+   */
+  @JsonProperty("numberOfParticipants")
   public Integer getNumberOfParticipants() {
     return numberOfParticipants;
   }
 
+  /**
+   * # of Participants (Required)
+   */
+  @JsonProperty("numberOfParticipants")
   public void setNumberOfParticipants(Integer numberOfParticipants) {
     this.numberOfParticipants = numberOfParticipants;
   }

diff --git a/...n/java/org/broadinstitute/consent/http/models/dataset_registration_v1/FileTypeObject.java b/...n/java/org/broadinstitute/consent/http/models/dataset_registration_v1/FileTypeObject.java
@@ -12,8 +12,7 @@
 @JsonInclude(JsonInclude.Include.NON_NULL)
 @JsonPropertyOrder({
     "fileType",
-    "functionalEquivalence",
-    "numberOfParticipants"
+    "functionalEquivalence"
 })
 public class FileTypeObject {
 

diff --git a/src/main/resources/dataset-registration-schema_v1.json b/src/main/resources/dataset-registration-schema_v1.json
@@ -450,7 +450,6 @@
       "type": "object",
       "required": [
         "consentGroupName",
-        "fileTypes",
         "numberOfParticipants"
       ],
       "allOf": [
@@ -681,7 +680,6 @@
         },
         "fileTypes": {
           "type": "array",
-          "minItems": 1,
           "items": {
             "$ref": "#/$defs/fileTypeObject"
           },

diff --git a/src/test/java/org/broadinstitute/consent/http/util/JsonSchemaUtilTest.java b/src/test/java/org/broadinstitute/consent/http/util/JsonSchemaUtilTest.java
@@ -530,7 +530,7 @@ void testParseValidateRegistrationObject_v1_consent_group_required() {
   }
 
   @Test
-  void testValidateDatasetRegistrationObject_v1_file_types_required() {
+  void testValidateDatasetRegistrationObject_v1_file_types_not_required() {
     String noFileTypes = """
         {
           "studyType": "Observational",
@@ -545,6 +545,7 @@ void testValidateDatasetRegistrationObject_v1_file_types_required() {
           "dataSubmitterUserId": 1,
           "nihAnvilUse": "I am not NHGRI funded and do not plan to store data in AnVIL",
           "consentGroups": [{
+            "numberOfParticipants": 1,
             "consentGroupName": "name",
             "generalResearchUse": true,
             "dataAccessCommitteeId": 1,
@@ -568,6 +569,7 @@ void testValidateDatasetRegistrationObject_v1_file_types_required() {
           "nihAnvilUse": "I am not NHGRI funded and do not plan to store data in AnVIL",
           "consentGroups": [{
             "fileTypes": [],
+            "numberOfParticipants": 1,
             "consentGroupName": "name",
             "generalResearchUse": true,
             "dataAccessCommitteeId": 1,
@@ -577,10 +579,10 @@ void testValidateDatasetRegistrationObject_v1_file_types_required() {
         """;
 
     Set<ValidationMessage> errors = schemaUtil.validateSchema_v1(noFileTypes);
-    assertFieldHasError(errors, "fileTypes");
+    assertNoErrors(errors);
 
     errors = schemaUtil.validateSchema_v1(emptyFileTypes);
-    assertFieldHasError(errors, "fileTypes");
+    assertNoErrors(errors);
   }