add dataset properties in deposit model, files in deposit are representing by FileEnvelope

src/main/java/eu/eudat/depositinterface/models/DMPDepositModel.java

@@ -1,8 +1,7 @@
 package eu.eudat.depositinterface.models;
 
-import org.springframework.http.ResponseEntity;
-
 import java.io.File;
+import java.util.List;
 import java.util.Set;
 import java.util.UUID;
 
@@ -12,13 +11,13 @@ public class DMPDepositModel {
     private String label;
     private String description;
     private boolean isPublic;
+    private List<DatasetDepositModel> datasets;
     private Set<UserDMPDepositModel> users;
     private Set<OrganisationDepositModel> organisations;
     private Set<ResearcherDepositModel> researchers;
     private GrantDepositModel grant;
-    private File pdfFile;
-    private String pdfFileName;
-    private ResponseEntity<byte[]> rdaJson;
+    private FileEnvelope pdfFile;
+    private FileEnvelope rdaJsonFile;
     private File supportingFilesZip;
     private String previousDOI;
     private String extraProperties;
@@ -58,6 +57,13 @@ public class DMPDepositModel {
         isPublic = aPublic;
     }
 
+    public List<DatasetDepositModel> getDatasets() {
+        return datasets;
+    }
+    public void setDatasets(List<DatasetDepositModel> datasets) {
+        this.datasets = datasets;
+    }
+
     public Set<UserDMPDepositModel> getUsers() {
         return users;
     }
@@ -86,25 +92,18 @@ public class DMPDepositModel {
         this.grant = grant;
     }
 
-    public File getPdfFile() {
+    public FileEnvelope getPdfFile() {
         return pdfFile;
     }
-    public void setPdfFile(File pdfFile) {
+    public void setPdfFile(FileEnvelope pdfFile) {
         this.pdfFile = pdfFile;
     }
 
-    public String getPdfFileName() {
-        return pdfFileName;
+    public FileEnvelope getRdaJsonFile() {
+        return rdaJsonFile;
     }
-    public void setPdfFileName(String pdfFileName) {
-        this.pdfFileName = pdfFileName;
-    }
-
-    public ResponseEntity<byte[]> getRdaJson() {
-        return rdaJson;
-    }
-    public void setRdaJson(ResponseEntity<byte[]> rdaJson) {
-        this.rdaJson = rdaJson;
+    public void setRdaJsonFile(FileEnvelope rdaJsonFile) {
+        this.rdaJsonFile = rdaJsonFile;
     }
 
     public File getSupportingFilesZip() {

src/main/java/eu/eudat/depositinterface/models/DatasetDepositModel.java

@@ -0,0 +1,46 @@
+package eu.eudat.depositinterface.models;
+
+import java.util.List;
+
+public class DatasetDepositModel {
+    private String label;
+    private String description;
+    private String profileDefinition;
+    private String properties;
+    private List<DatasetFieldsDepositModel> fields;
+
+    public String getLabel() {
+        return label;
+    }
+    public void setLabel(String label) {
+        this.label = label;
+    }
+
+    public String getDescription() {
+        return description;
+    }
+    public void setDescription(String description) {
+        this.description = description;
+    }
+
+    public String getProfileDefinition() {
+        return profileDefinition;
+    }
+    public void setProfileDefinition(String profileDefinition) {
+        this.profileDefinition = profileDefinition;
+    }
+
+    public String getProperties() {
+        return properties;
+    }
+    public void setProperties(String properties) {
+        this.properties = properties;
+    }
+
+    public List<DatasetFieldsDepositModel> getFields() {
+        return fields;
+    }
+    public void setFields(List<DatasetFieldsDepositModel> fields) {
+        this.fields = fields;
+    }
+}

src/main/java/eu/eudat/depositinterface/models/DatasetFieldsDepositModel.java

@@ -0,0 +1,22 @@
+package eu.eudat.depositinterface.models;
+
+import java.util.List;
+
+public class DatasetFieldsDepositModel {
+    private List<String> schematics;
+    private String value;
+
+    public List<String> getSchematics() {
+        return schematics;
+    }
+    public void setSchematics(List<String> schematics) {
+        this.schematics = schematics;
+    }
+
+    public String getValue() {
+        return value;
+    }
+    public void setValue(String value) {
+        this.value = value;
+    }
+}

src/main/java/eu/eudat/depositinterface/models/FileEnvelope.java

@@ -0,0 +1,22 @@
+package eu.eudat.depositinterface.models;
+
+import java.io.File;
+
+public class FileEnvelope {
+    private String filename;
+    private File file;
+
+    public String getFilename() {
+        return filename;
+    }
+    public void setFilename(String filename) {
+        this.filename = filename;
+    }
+
+    public File getFile() {
+        return file;
+    }
+    public void setFile(File file) {
+        this.file = file;
+    }
+}