common model updates

pom.xml

@@ -41,7 +41,6 @@
 			<groupId>com.fasterxml.jackson.core</groupId>
 			<artifactId>jackson-annotations</artifactId>
 			<version>2.17.0</version>
-			<scope>compile</scope>
 		</dependency>
 	</dependencies>
 

src/main/java/org/opencdmp/commonmodels/enums/DmpUserRole.java

@@ -7,7 +7,7 @@ import java.util.Map;
 public enum DmpUserRole implements EnumValueProvider<Short> {
 
     Owner((short) 0),
-    User((short) 1),
+    Viewer((short) 1),
     DescriptionContributor((short) 2),
     Reviewer((short) 3);
 

src/main/java/org/opencdmp/commonmodels/models/DmpUserModel.java

@@ -2,9 +2,12 @@ package org.opencdmp.commonmodels.models;
 
 import org.opencdmp.commonmodels.enums.DmpUserRole;
 
+import java.util.UUID;
+
 public class DmpUserModel {
     private UserModel user;
     private DmpUserRole role;
+    private UUID sectionId;
 
     public UserModel getUser() {
         return user;
@@ -21,4 +24,12 @@ public class DmpUserModel {
     public void setRole(DmpUserRole role) {
         this.role = role;
     }
+
+    public UUID getSectionId() {
+        return sectionId;
+    }
+
+    public void setSectionId(UUID sectionId) {
+        this.sectionId = sectionId;
+    }
 }

src/main/java/org/opencdmp/commonmodels/models/FileEnvelopeModel.java

@@ -4,6 +4,7 @@ public class FileEnvelopeModel {
     private String filename;
     private String fileRef;
     private String mimeType;
+    
     private byte[] file;
 
     public String getFilename() {

src/main/java/org/opencdmp/commonmodels/models/description/DescriptionModel.java

@@ -13,6 +13,7 @@ public class DescriptionModel {
     private UUID id;
     private String label;
     private String description;
+    private List<String> tags;
     private DescriptionStatus status;
     private DescriptionTemplateModel descriptionTemplate;
     private DmpModel dmp;
@@ -47,6 +48,14 @@ public class DescriptionModel {
         this.description = description;
     }
 
+    public List<String> getTags() {
+        return tags;
+    }
+
+    public void setTags(List<String> tags) {
+        this.tags = tags;
+    }
+
     public PropertyDefinitionModel getProperties() {
         return properties;
     }

src/main/java/org/opencdmp/commonmodels/models/descriptiotemplate/FieldModel.java

@@ -11,7 +11,7 @@ public class FieldModel {
 
 	private Integer ordinal;
 
-	private List<String> schematics;
+	private List<String> semantics;
 
 	private DefaultValueModel defaultValue;
 
@@ -37,12 +37,12 @@ public class FieldModel {
 		this.ordinal = ordinal;
 	}
 
-	public List<String> getSchematics() {
-		return schematics;
+	public List<String> getSemantics() {
+		return semantics;
 	}
 
-	public void setSchematics(List<String> schematics) {
-		this.schematics = schematics;
+	public void setSemantics(List<String> semantics) {
+		this.semantics = semantics;
 	}
 
 	public DefaultValueModel getDefaultValue() {

src/main/java/org/opencdmp/commonmodels/models/dmp/DmpBlueprintValueModel.java

@@ -1,5 +1,6 @@
 package org.opencdmp.commonmodels.models.dmp;
 
+import java.time.Instant;
 import java.util.UUID;
 
 public class DmpBlueprintValueModel {
@@ -8,6 +9,10 @@ public class DmpBlueprintValueModel {
 
 	private String value;
 
+	private Instant dateValue;
+
+	private Double numberValue;
+
 	public UUID getFieldId() {
 		return fieldId;
 	}
@@ -24,4 +29,19 @@ public class DmpBlueprintValueModel {
 		this.value = value;
 	}
 
+	public Instant getDateValue() {
+		return dateValue;
+	}
+
+	public void setDateValue(Instant dateValue) {
+		this.dateValue = dateValue;
+	}
+
+	public Double getNumberValue() {
+		return numberValue;
+	}
+
+	public void setNumberValue(Double numberValue) {
+		this.numberValue = numberValue;
+	}
 }

src/main/java/org/opencdmp/commonmodels/models/dmp/DmpContactModel.java

@@ -1,25 +1,14 @@
 package org.opencdmp.commonmodels.models.dmp;
 
-import org.opencdmp.commonmodels.models.UserModel;
 
 public class DmpContactModel {
 
-	private UserModel user;
-
 	private String firstName;
 
 	private String lastName;
 
 	private String email;
 
-	public UserModel getUser() {
-		return user;
-	}
-
-	public void setUser(UserModel user) {
-		this.user = user;
-	}
-
 	public String getFirstName() {
 		return firstName;
 	}

src/main/java/org/opencdmp/commonmodels/models/dmp/DmpModel.java

@@ -8,6 +8,7 @@ import org.opencdmp.commonmodels.models.FileEnvelopeModel;
 import org.opencdmp.commonmodels.models.UserModel;
 import org.opencdmp.commonmodels.models.description.DescriptionModel;
 import org.opencdmp.commonmodels.models.dmpblueprint.DmpBlueprintModel;
+import org.opencdmp.commonmodels.models.dmpdescriptiontemplate.DmpDescriptionTemplateModel;
 import org.opencdmp.commonmodels.models.dmpreference.DmpReferenceModel;
 
 import java.time.Instant;
@@ -28,6 +29,7 @@ public class DmpModel {
     private List<DescriptionModel> descriptions;
     private List<DmpUserModel> users;
     private List<DmpReferenceModel> references;
+    private List<DmpDescriptionTemplateModel> descriptionTemplates;
     private FileEnvelopeModel pdfFile;
     private FileEnvelopeModel rdaJsonFile;
     private FileEnvelopeModel supportingFilesZip;
@@ -213,4 +215,12 @@ public class DmpModel {
     public void setLanguage(String language) {
         this.language = language;
     }
+
+    public List<DmpDescriptionTemplateModel> getDescriptionTemplates() {
+        return descriptionTemplates;
+    }
+
+    public void setDescriptionTemplates(List<DmpDescriptionTemplateModel> descriptionTemplates) {
+        this.descriptionTemplates = descriptionTemplates;
+    }
 }

src/main/java/org/opencdmp/commonmodels/models/dmpdescriptiontemplate/DmpDescriptionTemplateModel.java

@@ -0,0 +1,25 @@
+package org.opencdmp.commonmodels.models.dmpdescriptiontemplate;
+
+import java.util.UUID;
+
+public class DmpDescriptionTemplateModel {
+	private UUID descriptionTemplateGroupId;
+	private UUID sectionId;
+
+	public UUID getDescriptionTemplateGroupId() {
+		return descriptionTemplateGroupId;
+	}
+
+	public void setDescriptionTemplateGroupId(UUID descriptionTemplateGroupId) {
+		this.descriptionTemplateGroupId = descriptionTemplateGroupId;
+	}
+
+	public UUID getSectionId() {
+		return sectionId;
+	}
+
+	public void setSectionId(UUID sectionId) {
+		this.sectionId = sectionId;
+	}
+}
+