From 7158fdb6c3e1060e0526682b059bb5bb73f5cfa0 Mon Sep 17 00:00:00 2001 From: sgiannopoulos Date: Fri, 3 May 2024 11:50:06 +0300 Subject: [PATCH] update common model --- backend/core/pom.xml | 6 +- .../description/FieldCommonModelBuilder.java | 4 +- .../DefaultValueCommonModelBuilder.java | 55 +++++++++++++++++++ .../FieldCommonModelBuilder.java | 2 +- 4 files changed, 60 insertions(+), 7 deletions(-) create mode 100644 backend/core/src/main/java/org/opencdmp/model/builder/commonmodels/descriptiontemplate/DefaultValueCommonModelBuilder.java diff --git a/backend/core/pom.xml b/backend/core/pom.xml index 23a32a3f6..bdba39df7 100644 --- a/backend/core/pom.xml +++ b/backend/core/pom.xml @@ -51,17 +51,17 @@ org.opencdmp repositorydepositbase - 2.0.8 + 2.0.11 org.opencdmp common-models - 0.0.11 + 0.0.14 org.opencdmp file-transformer-base - 0.0.15 + 0.0.18 gr.cite diff --git a/backend/core/src/main/java/org/opencdmp/model/builder/commonmodels/description/FieldCommonModelBuilder.java b/backend/core/src/main/java/org/opencdmp/model/builder/commonmodels/description/FieldCommonModelBuilder.java index 189994610..c5443a5e8 100644 --- a/backend/core/src/main/java/org/opencdmp/model/builder/commonmodels/description/FieldCommonModelBuilder.java +++ b/backend/core/src/main/java/org/opencdmp/model/builder/commonmodels/description/FieldCommonModelBuilder.java @@ -32,7 +32,6 @@ import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.config.ConfigurableBeanFactory; import org.springframework.context.annotation.Scope; -import org.springframework.stereotype.Component; import java.io.IOException; import java.net.URLConnection; @@ -40,7 +39,6 @@ import java.time.Duration; import java.util.*; import java.util.stream.Collectors; -@Component("commonmodels.description") @Scope(ConfigurableBeanFactory.SCOPE_PROTOTYPE) public class FieldCommonModelBuilder extends BaseCommonModelBuilder { private final BuilderFactory builderFactory; @@ -93,7 +91,7 @@ public class FieldCommonModelBuilder extends BaseCommonModelBuilder { + private EnumSet authorize = EnumSet.of(AuthorizationFlags.None); + @Autowired + public DefaultValueCommonModelBuilder( + ConventionService conventionService) { + super(conventionService, new LoggerService(LoggerFactory.getLogger(DefaultValueCommonModelBuilder.class))); + } + + public DefaultValueCommonModelBuilder authorize(EnumSet values) { + this.authorize = values; + return this; + } + @Override + protected List> buildInternal(List data) throws MyApplicationException { + this.logger.debug("building for {}", Optional.ofNullable(data).map(List::size).orElse(0)); + if (data == null || data.isEmpty()) return new ArrayList<>(); + + + List> models = new ArrayList<>(); + for (DefaultValueEntity d : data) { + DefaultValueModel m = new DefaultValueModel(); + m.setDateValue(d.getDateValue()); + m.setBooleanValue(d.getBooleanValue()); + m.setTextValue(d.getTextValue()); + + models.add(new CommonModelBuilderItemResponse<>(m, d)); + } + + this.logger.debug("build {} items", Optional.of(models).map(List::size).orElse(0)); + + return models; + } + +} diff --git a/backend/core/src/main/java/org/opencdmp/model/builder/commonmodels/descriptiontemplate/FieldCommonModelBuilder.java b/backend/core/src/main/java/org/opencdmp/model/builder/commonmodels/descriptiontemplate/FieldCommonModelBuilder.java index 79ee92bd3..a871ab31a 100644 --- a/backend/core/src/main/java/org/opencdmp/model/builder/commonmodels/descriptiontemplate/FieldCommonModelBuilder.java +++ b/backend/core/src/main/java/org/opencdmp/model/builder/commonmodels/descriptiontemplate/FieldCommonModelBuilder.java @@ -54,7 +54,7 @@ public class FieldCommonModelBuilder extends BaseCommonModelBuilder());