Merge branch 'dmp-refactoring' of https://code-repo.d4science.org/MaDgiK-CITE/argos into dmp-refactoring

dmp-backend/core/src/main/java/eu/eudat/data/DmpEntity.java

@@ -4,7 +4,6 @@ import eu.eudat.commons.enums.DmpAccessType;
 import eu.eudat.commons.enums.DmpStatus;
 import eu.eudat.commons.enums.DmpVersionStatus;
 import eu.eudat.commons.enums.IsActive;
-import eu.eudat.data.converters.DateToUTCConverter;
 import eu.eudat.data.converters.enums.DmpAccessTypeConverter;
 import eu.eudat.data.converters.enums.DmpStatusConverter;
 import eu.eudat.data.converters.enums.IsActiveConverter;
@@ -63,13 +62,11 @@ public class DmpEntity implements DataEntity<DmpEntity, UUID> {
     public static final String _description = "description";
 
     @Column(name = "created_at")
-    @Convert(converter = DateToUTCConverter.class)
     private Instant createdAt;
 
     public static final String _createdAt = "createdAt";
 
     @Column(name = "updated_at")
-    @Convert(converter = DateToUTCConverter.class)
     private Instant updatedAt;
 
     public static final String _updatedAt = "updatedAt";

dmp-migration-tool/web/src/main/java/eu/old/eudat/publicapi/migration/MigrationController.java

@@ -68,7 +68,7 @@ public class MigrationController {
             dmpEntity.setDescription(dataManagementPlan.getDescription());
             dmpEntity.setAccessType(dataManagementPlan.getPublic() ? DmpAccessType.Public : DmpAccessType.Restricted);
             if (dataManagementPlan.getCreator() != null)
-                dmpEntity.setCreator(dataManagementPlan.getCreator().getId());
+                dmpEntity.setCreatorId(dataManagementPlan.getCreator().getId());
             dmpEntity.setGroupId(dataManagementPlan.getGroupId());
             dmpEntity.setVersion((short) dataManagementPlan.getVersion());
             dmpEntity.setVersionStatus(DmpVersionStatus.of((short) dataManagementPlan.getVersionStatus()));
@@ -78,7 +78,7 @@ public class MigrationController {
                 dmpEntity.setUpdatedAt(dataManagementPlan.getModified().toInstant());
             if (dataManagementPlan.getFinalized() != null)
                 dmpEntity.setFinalizedAt(dataManagementPlan.getFinalized().toInstant());
-            dmpEntity.setBlueprint(dataManagementPlan.getProfile().getId());
+            dmpEntity.setBlueprintId(dataManagementPlan.getProfile().getId());
             if (dataManagementPlan.getExtraProperties().containsKey("language") && dataManagementPlan.getExtraProperties().get("language") != null)
                 dmpEntity.setLanguage((String) dataManagementPlan.getExtraProperties().get("language"));
             if (dataManagementPlan.getStatus() == 99) {