MaDgiK-CITE
/
argos
13
0
Fork 0
Code Issues Pull Requests Projects Releases 3 Wiki Activity

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

This commit is contained in:
Diamantis Tziotzios 2024-02-01 11:37:12 +02:00
parent 30902bbab8 4a3f002672
commit bd2a935606
8 changed files with 17 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
dmp-backend/core/src/main/java/eu/eudat/model/mapper/publicapi/DescriptionFieldToDatasetFieldMapper.java
View File

@ -1,9 +1,9 @@
package eu.eudat.model.mapper.publicapi; package eu.eudat.model.mapper.publicapi;
import eu.eudat.commons.types.descriptiontemplate.RuleEntity; import eu.eudat.commons.types.descriptiontemplate.RuleEntity;
import eu.eudat.commons.types.descriptiontemplate.todelete.DefaultValueEntity; import eu.eudat.model.publicapi.datasetwizard.DefaultValueEntity;
import eu.eudat.commons.types.descriptiontemplate.todelete.FieldDescriptionEntity; import eu.eudat.model.publicapi.datasetwizard.FieldDescriptionEntity;
import eu.eudat.commons.types.descriptiontemplate.todelete.VisibilityEntity; import eu.eudat.model.publicapi.datasetwizard.VisibilityEntity;
import eu.eudat.model.publicapi.datasetwizard.Field; import eu.eudat.model.publicapi.datasetwizard.Field;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;

5
dmp-backend/core/src/main/java/eu/eudat/model/publicapi/associatedprofile/AssociatedProfilePublicModel.java
View File

@ -3,6 +3,7 @@ package eu.eudat.model.publicapi.associatedprofile;
import eu.eudat.model.DmpDescriptionTemplate; import eu.eudat.model.DmpDescriptionTemplate;
import jakarta.xml.bind.annotation.*; import jakarta.xml.bind.annotation.*;
import java.util.HashMap;
import java.util.Map; import java.util.Map;
import java.util.UUID; import java.util.UUID;
@ -52,6 +53,10 @@ public class AssociatedProfilePublicModel {
public static AssociatedProfilePublicModel fromDmpDescriptionTemplate(DmpDescriptionTemplate dmpDescriptionTemplate) { public static AssociatedProfilePublicModel fromDmpDescriptionTemplate(DmpDescriptionTemplate dmpDescriptionTemplate) {
AssociatedProfilePublicModel model = new AssociatedProfilePublicModel(); 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; return model;
} }
} }

2
dmp-backend/core/src/main/java/eu/eudat/commons/types/descriptiontemplate/todelete/DefaultValueEntity.java → dmp-backend/core/src/main/java/eu/eudat/model/publicapi/datasetwizard/DefaultValueEntity.java
View File

@ -1,4 +1,4 @@
package eu.eudat.commons.types.descriptiontemplate.todelete; package eu.eudat.model.publicapi.datasetwizard;
public class DefaultValueEntity { public class DefaultValueEntity {
private String type; private String type;

3
dmp-backend/core/src/main/java/eu/eudat/model/publicapi/datasetwizard/Field.java
View File

@ -5,9 +5,6 @@ import com.fasterxml.jackson.databind.ObjectMapper;
import eu.eudat.commons.enums.FieldValidationType; import eu.eudat.commons.enums.FieldValidationType;
import eu.eudat.commons.types.descriptiontemplate.FieldEntity; import eu.eudat.commons.types.descriptiontemplate.FieldEntity;
import eu.eudat.commons.types.descriptiontemplate.MultiplicityEntity; 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.apache.commons.lang3.NotImplementedException;
import org.json.JSONException; import org.json.JSONException;
import org.slf4j.Logger; import org.slf4j.Logger;

2
dmp-backend/core/src/main/java/eu/eudat/commons/types/descriptiontemplate/todelete/FieldDescriptionEntity.java → dmp-backend/core/src/main/java/eu/eudat/model/publicapi/datasetwizard/FieldDescriptionEntity.java
View File

@ -1,4 +1,4 @@
package eu.eudat.commons.types.descriptiontemplate.todelete; package eu.eudat.model.publicapi.datasetwizard;
import eu.eudat.commons.enums.FieldType; import eu.eudat.commons.enums.FieldType;

2
dmp-backend/core/src/main/java/eu/eudat/commons/types/descriptiontemplate/todelete/VisibilityEntity.java → dmp-backend/core/src/main/java/eu/eudat/model/publicapi/datasetwizard/VisibilityEntity.java
View File

@ -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 eu.eudat.commons.types.descriptiontemplate.RuleEntity;
import jakarta.xml.bind.annotation.*; import jakarta.xml.bind.annotation.*;

6
dmp-backend/web/src/main/java/eu/eudat/models/data/admin/components/datasetprofile/Field.java
View File

@ -2,9 +2,9 @@ package eu.eudat.models.data.admin.components.datasetprofile;
import eu.eudat.commons.enums.FieldValidationType; import eu.eudat.commons.enums.FieldValidationType;
import eu.eudat.commons.types.common.DatabaseViewStyleDefinition; import eu.eudat.commons.types.common.DatabaseViewStyleDefinition;
import eu.eudat.commons.types.descriptiontemplate.todelete.DefaultValueEntity; import eu.eudat.model.publicapi.datasetwizard.DefaultValueEntity;
import eu.eudat.commons.types.descriptiontemplate.todelete.FieldDescriptionEntity; import eu.eudat.model.publicapi.datasetwizard.FieldDescriptionEntity;
import eu.eudat.commons.types.descriptiontemplate.todelete.VisibilityEntity; import eu.eudat.model.publicapi.datasetwizard.VisibilityEntity;
import eu.eudat.commons.types.descriptiontemplate.FieldEntity; import eu.eudat.commons.types.descriptiontemplate.FieldEntity;
import eu.eudat.logic.utilities.interfaces.ViewStyleDefinition; import eu.eudat.logic.utilities.interfaces.ViewStyleDefinition;
import org.apache.commons.lang3.NotImplementedException; import org.apache.commons.lang3.NotImplementedException;

6
dmp-backend/web/src/main/java/eu/eudat/models/data/user/components/datasetprofile/Field.java
View File

@ -3,10 +3,10 @@ package eu.eudat.models.data.user.components.datasetprofile;
import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.ObjectMapper;
import eu.eudat.commons.enums.FieldValidationType; 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.MultiplicityEntity;
import eu.eudat.commons.types.descriptiontemplate.todelete.FieldDescriptionEntity; import eu.eudat.model.publicapi.datasetwizard.FieldDescriptionEntity;
import eu.eudat.commons.types.descriptiontemplate.todelete.VisibilityEntity; import eu.eudat.model.publicapi.datasetwizard.VisibilityEntity;
import eu.eudat.commons.types.descriptiontemplate.FieldEntity; import eu.eudat.commons.types.descriptiontemplate.FieldEntity;
import eu.eudat.models.data.properties.PropertiesGenerator; import eu.eudat.models.data.properties.PropertiesGenerator;
import eu.eudat.models.data.user.composite.PropertiesModelBuilder; import eu.eudat.models.data.user.composite.PropertiesModelBuilder;