From 23c19888ca4cd9f44f7e04cf4c153f17d3ab23f5 Mon Sep 17 00:00:00 2001 From: Thomas Georgios Giannos Date: Thu, 1 Feb 2024 10:24:39 +0200 Subject: [PATCH 1/2] Added missing mapping for AssociatedProfilePublicModel on public api --- .../associatedprofile/AssociatedProfilePublicModel.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dmp-backend/core/src/main/java/eu/eudat/model/publicapi/associatedprofile/AssociatedProfilePublicModel.java b/dmp-backend/core/src/main/java/eu/eudat/model/publicapi/associatedprofile/AssociatedProfilePublicModel.java index 8b5ed6db2..8facb2a63 100644 --- a/dmp-backend/core/src/main/java/eu/eudat/model/publicapi/associatedprofile/AssociatedProfilePublicModel.java +++ b/dmp-backend/core/src/main/java/eu/eudat/model/publicapi/associatedprofile/AssociatedProfilePublicModel.java @@ -3,6 +3,7 @@ package eu.eudat.model.publicapi.associatedprofile; import eu.eudat.model.DmpDescriptionTemplate; import jakarta.xml.bind.annotation.*; +import java.util.HashMap; import java.util.Map; import java.util.UUID; @@ -52,6 +53,10 @@ public class AssociatedProfilePublicModel { public static AssociatedProfilePublicModel fromDmpDescriptionTemplate(DmpDescriptionTemplate dmpDescriptionTemplate) { AssociatedProfilePublicModel model = new AssociatedProfilePublicModel(); + model.setId(dmpDescriptionTemplate.getCurrentDescriptionTemplate().getId()); + model.setDescriptionTemplateId(dmpDescriptionTemplate.getCurrentDescriptionTemplate().getId()); + model.setLabel(dmpDescriptionTemplate.getCurrentDescriptionTemplate().getLabel()); + model.setData(new HashMap<>()); return model; } } From 4a3f002672053769e531f221680a84c89c9bc9e2 Mon Sep 17 00:00:00 2001 From: sgiannopoulos Date: Thu, 1 Feb 2024 11:13:07 +0200 Subject: [PATCH 2/2] move public api classes --- .../publicapi/DescriptionFieldToDatasetFieldMapper.java | 6 +++--- .../publicapi/datasetwizard}/DefaultValueEntity.java | 2 +- .../java/eu/eudat/model/publicapi/datasetwizard/Field.java | 3 --- .../publicapi/datasetwizard}/FieldDescriptionEntity.java | 2 +- .../publicapi/datasetwizard}/VisibilityEntity.java | 2 +- .../models/data/admin/components/datasetprofile/Field.java | 6 +++--- .../models/data/user/components/datasetprofile/Field.java | 6 +++--- 7 files changed, 12 insertions(+), 15 deletions(-) rename dmp-backend/core/src/main/java/eu/eudat/{commons/types/descriptiontemplate/todelete => model/publicapi/datasetwizard}/DefaultValueEntity.java (85%) rename dmp-backend/core/src/main/java/eu/eudat/{commons/types/descriptiontemplate/todelete => model/publicapi/datasetwizard}/FieldDescriptionEntity.java (88%) rename dmp-backend/core/src/main/java/eu/eudat/{commons/types/descriptiontemplate/todelete => model/publicapi/datasetwizard}/VisibilityEntity.java (91%) diff --git a/dmp-backend/core/src/main/java/eu/eudat/model/mapper/publicapi/DescriptionFieldToDatasetFieldMapper.java b/dmp-backend/core/src/main/java/eu/eudat/model/mapper/publicapi/DescriptionFieldToDatasetFieldMapper.java index eb2d8fb15..0c784c516 100644 --- a/dmp-backend/core/src/main/java/eu/eudat/model/mapper/publicapi/DescriptionFieldToDatasetFieldMapper.java +++ b/dmp-backend/core/src/main/java/eu/eudat/model/mapper/publicapi/DescriptionFieldToDatasetFieldMapper.java @@ -1,9 +1,9 @@ package eu.eudat.model.mapper.publicapi; import eu.eudat.commons.types.descriptiontemplate.RuleEntity; -import eu.eudat.commons.types.descriptiontemplate.todelete.DefaultValueEntity; -import eu.eudat.commons.types.descriptiontemplate.todelete.FieldDescriptionEntity; -import eu.eudat.commons.types.descriptiontemplate.todelete.VisibilityEntity; +import eu.eudat.model.publicapi.datasetwizard.DefaultValueEntity; +import eu.eudat.model.publicapi.datasetwizard.FieldDescriptionEntity; +import eu.eudat.model.publicapi.datasetwizard.VisibilityEntity; import eu.eudat.model.publicapi.datasetwizard.Field; import org.springframework.stereotype.Component; diff --git a/dmp-backend/core/src/main/java/eu/eudat/commons/types/descriptiontemplate/todelete/DefaultValueEntity.java b/dmp-backend/core/src/main/java/eu/eudat/model/publicapi/datasetwizard/DefaultValueEntity.java similarity index 85% rename from dmp-backend/core/src/main/java/eu/eudat/commons/types/descriptiontemplate/todelete/DefaultValueEntity.java rename to dmp-backend/core/src/main/java/eu/eudat/model/publicapi/datasetwizard/DefaultValueEntity.java index 044ce7b7c..c81dd41fd 100644 --- a/dmp-backend/core/src/main/java/eu/eudat/commons/types/descriptiontemplate/todelete/DefaultValueEntity.java +++ b/dmp-backend/core/src/main/java/eu/eudat/model/publicapi/datasetwizard/DefaultValueEntity.java @@ -1,4 +1,4 @@ -package eu.eudat.commons.types.descriptiontemplate.todelete; +package eu.eudat.model.publicapi.datasetwizard; public class DefaultValueEntity { private String type; diff --git a/dmp-backend/core/src/main/java/eu/eudat/model/publicapi/datasetwizard/Field.java b/dmp-backend/core/src/main/java/eu/eudat/model/publicapi/datasetwizard/Field.java index 598a0e83c..345f20158 100644 --- a/dmp-backend/core/src/main/java/eu/eudat/model/publicapi/datasetwizard/Field.java +++ b/dmp-backend/core/src/main/java/eu/eudat/model/publicapi/datasetwizard/Field.java @@ -5,9 +5,6 @@ import com.fasterxml.jackson.databind.ObjectMapper; import eu.eudat.commons.enums.FieldValidationType; import eu.eudat.commons.types.descriptiontemplate.FieldEntity; import eu.eudat.commons.types.descriptiontemplate.MultiplicityEntity; -import eu.eudat.commons.types.descriptiontemplate.todelete.DefaultValueEntity; -import eu.eudat.commons.types.descriptiontemplate.todelete.FieldDescriptionEntity; -import eu.eudat.commons.types.descriptiontemplate.todelete.VisibilityEntity; import org.apache.commons.lang3.NotImplementedException; import org.json.JSONException; import org.slf4j.Logger; diff --git a/dmp-backend/core/src/main/java/eu/eudat/commons/types/descriptiontemplate/todelete/FieldDescriptionEntity.java b/dmp-backend/core/src/main/java/eu/eudat/model/publicapi/datasetwizard/FieldDescriptionEntity.java similarity index 88% rename from dmp-backend/core/src/main/java/eu/eudat/commons/types/descriptiontemplate/todelete/FieldDescriptionEntity.java rename to dmp-backend/core/src/main/java/eu/eudat/model/publicapi/datasetwizard/FieldDescriptionEntity.java index 90aa7f566..4dee2cd84 100644 --- a/dmp-backend/core/src/main/java/eu/eudat/commons/types/descriptiontemplate/todelete/FieldDescriptionEntity.java +++ b/dmp-backend/core/src/main/java/eu/eudat/model/publicapi/datasetwizard/FieldDescriptionEntity.java @@ -1,4 +1,4 @@ -package eu.eudat.commons.types.descriptiontemplate.todelete; +package eu.eudat.model.publicapi.datasetwizard; import eu.eudat.commons.enums.FieldType; diff --git a/dmp-backend/core/src/main/java/eu/eudat/commons/types/descriptiontemplate/todelete/VisibilityEntity.java b/dmp-backend/core/src/main/java/eu/eudat/model/publicapi/datasetwizard/VisibilityEntity.java similarity index 91% rename from dmp-backend/core/src/main/java/eu/eudat/commons/types/descriptiontemplate/todelete/VisibilityEntity.java rename to dmp-backend/core/src/main/java/eu/eudat/model/publicapi/datasetwizard/VisibilityEntity.java index 12997c6e9..28a795ca6 100644 --- a/dmp-backend/core/src/main/java/eu/eudat/commons/types/descriptiontemplate/todelete/VisibilityEntity.java +++ b/dmp-backend/core/src/main/java/eu/eudat/model/publicapi/datasetwizard/VisibilityEntity.java @@ -1,4 +1,4 @@ -package eu.eudat.commons.types.descriptiontemplate.todelete; +package eu.eudat.model.publicapi.datasetwizard; import eu.eudat.commons.types.descriptiontemplate.RuleEntity; import jakarta.xml.bind.annotation.*; diff --git a/dmp-backend/web/src/main/java/eu/eudat/models/data/admin/components/datasetprofile/Field.java b/dmp-backend/web/src/main/java/eu/eudat/models/data/admin/components/datasetprofile/Field.java index e9c3b3e13..9ba2e6a78 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/models/data/admin/components/datasetprofile/Field.java +++ b/dmp-backend/web/src/main/java/eu/eudat/models/data/admin/components/datasetprofile/Field.java @@ -2,9 +2,9 @@ package eu.eudat.models.data.admin.components.datasetprofile; import eu.eudat.commons.enums.FieldValidationType; import eu.eudat.commons.types.common.DatabaseViewStyleDefinition; -import eu.eudat.commons.types.descriptiontemplate.todelete.DefaultValueEntity; -import eu.eudat.commons.types.descriptiontemplate.todelete.FieldDescriptionEntity; -import eu.eudat.commons.types.descriptiontemplate.todelete.VisibilityEntity; +import eu.eudat.model.publicapi.datasetwizard.DefaultValueEntity; +import eu.eudat.model.publicapi.datasetwizard.FieldDescriptionEntity; +import eu.eudat.model.publicapi.datasetwizard.VisibilityEntity; import eu.eudat.commons.types.descriptiontemplate.FieldEntity; import eu.eudat.logic.utilities.interfaces.ViewStyleDefinition; import org.apache.commons.lang3.NotImplementedException; diff --git a/dmp-backend/web/src/main/java/eu/eudat/models/data/user/components/datasetprofile/Field.java b/dmp-backend/web/src/main/java/eu/eudat/models/data/user/components/datasetprofile/Field.java index 1d8b3f4b8..c97a9cfbe 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/models/data/user/components/datasetprofile/Field.java +++ b/dmp-backend/web/src/main/java/eu/eudat/models/data/user/components/datasetprofile/Field.java @@ -3,10 +3,10 @@ package eu.eudat.models.data.user.components.datasetprofile; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; import eu.eudat.commons.enums.FieldValidationType; -import eu.eudat.commons.types.descriptiontemplate.todelete.DefaultValueEntity; +import eu.eudat.model.publicapi.datasetwizard.DefaultValueEntity; import eu.eudat.commons.types.descriptiontemplate.MultiplicityEntity; -import eu.eudat.commons.types.descriptiontemplate.todelete.FieldDescriptionEntity; -import eu.eudat.commons.types.descriptiontemplate.todelete.VisibilityEntity; +import eu.eudat.model.publicapi.datasetwizard.FieldDescriptionEntity; +import eu.eudat.model.publicapi.datasetwizard.VisibilityEntity; import eu.eudat.commons.types.descriptiontemplate.FieldEntity; import eu.eudat.models.data.properties.PropertiesGenerator; import eu.eudat.models.data.user.composite.PropertiesModelBuilder;