Compare commits
9 Commits
Author | SHA1 | Date |
---|---|---|
amentis | 0f3552b86f | |
amentis | 4a43659ccc | |
Efstratios Giannopoulos | ffc77189ec | |
Efstratios Giannopoulos | 72266047e5 | |
Efstratios Giannopoulos | 8986d9f9fc | |
amentis | ac6fd08fb7 | |
amentis | be252504aa | |
Efstratios Giannopoulos | 3ae2aa00d9 | |
Efstratios Giannopoulos | 89af3e4329 |
1
pom.xml
1
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>
|
||||
|
||||
|
|
|
@ -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);
|
||||
|
||||
|
|
|
@ -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;
|
||||
}
|
||||
}
|
||||
|
|
|
@ -4,6 +4,7 @@ public class FileEnvelopeModel {
|
|||
private String filename;
|
||||
private String fileRef;
|
||||
private String mimeType;
|
||||
|
||||
private byte[] file;
|
||||
|
||||
public String getFilename() {
|
||||
|
|
|
@ -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;
|
||||
}
|
||||
|
|
|
@ -11,6 +11,7 @@ public class FieldModel {
|
|||
private String id;
|
||||
private String textValue;
|
||||
private FileEnvelopeModel file;
|
||||
private Boolean booleanValue;
|
||||
|
||||
private List<String> textListValue;
|
||||
|
||||
|
@ -75,4 +76,12 @@ public class FieldModel {
|
|||
public void setFile(FileEnvelopeModel file) {
|
||||
this.file = file;
|
||||
}
|
||||
|
||||
public Boolean getBooleanValue() {
|
||||
return booleanValue;
|
||||
}
|
||||
|
||||
public void setBooleanValue(Boolean booleanValue) {
|
||||
this.booleanValue = booleanValue;
|
||||
}
|
||||
}
|
||||
|
|
|
@ -2,7 +2,7 @@ package org.opencdmp.commonmodels.models.descriptiotemplate;
|
|||
|
||||
import java.time.Instant;
|
||||
|
||||
public class DefaultValueEntity {
|
||||
public class DefaultValueModel {
|
||||
|
||||
private String textValue;
|
||||
|
|
@ -11,9 +11,9 @@ public class FieldModel {
|
|||
|
||||
private Integer ordinal;
|
||||
|
||||
private List<String> schematics;
|
||||
private List<String> semantics;
|
||||
|
||||
private DefaultValueEntity defaultValue;
|
||||
private DefaultValueModel defaultValue;
|
||||
|
||||
private List<FieldValidationType> validations;
|
||||
|
||||
|
@ -37,19 +37,19 @@ 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 DefaultValueEntity getDefaultValue() {
|
||||
public DefaultValueModel getDefaultValue() {
|
||||
return defaultValue;
|
||||
}
|
||||
|
||||
public void setDefaultValue(DefaultValueEntity defaultValue) {
|
||||
public void setDefaultValue(DefaultValueModel defaultValue) {
|
||||
this.defaultValue = defaultValue;
|
||||
}
|
||||
|
||||
|
|
|
@ -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;
|
||||
}
|
||||
}
|
||||
|
|
|
@ -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;
|
||||
}
|
||||
|
|
|
@ -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;
|
||||
}
|
||||
}
|
||||
|
|
|
@ -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;
|
||||
}
|
||||
}
|
||||
|
Loading…
Reference in New Issue