From 709fecf1f19ef0fb0a869e8b60db913b44f837b7 Mon Sep 17 00:00:00 2001
From: sgiannopoulos <sgiannopoulos@cite.gr>
Date: Thu, 21 Mar 2024 10:16:55 +0200
Subject: [PATCH] add visibility to models

---
 dmp-backend/core/pom.xml                                  | 2 +-
 .../description/DescriptionCommonModelBuilder.java        | 8 +++++---
 .../eu/eudat/service/visibility/VisibilityService.java    | 4 ++++
 .../eudat/service/visibility/VisibilityServiceImpl.java   | 6 ++++++
 4 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/dmp-backend/core/pom.xml b/dmp-backend/core/pom.xml
index d176c6f75..7af53fb4c 100644
--- a/dmp-backend/core/pom.xml
+++ b/dmp-backend/core/pom.xml
@@ -50,7 +50,7 @@
         <dependency>
             <groupId>gr.cite.opendmp</groupId>
             <artifactId>common-models</artifactId>
-            <version>0.0.4</version>
+            <version>0.0.5</version>
         </dependency>
         <dependency>
             <groupId>gr.cite.opendmp</groupId>
diff --git a/dmp-backend/core/src/main/java/eu/eudat/model/builder/commonmodels/description/DescriptionCommonModelBuilder.java b/dmp-backend/core/src/main/java/eu/eudat/model/builder/commonmodels/description/DescriptionCommonModelBuilder.java
index d723833f4..b9bd932af 100644
--- a/dmp-backend/core/src/main/java/eu/eudat/model/builder/commonmodels/description/DescriptionCommonModelBuilder.java
+++ b/dmp-backend/core/src/main/java/eu/eudat/model/builder/commonmodels/description/DescriptionCommonModelBuilder.java
@@ -21,6 +21,7 @@ import eu.eudat.model.builder.commonmodels.CommonModelBuilderItemResponse;
 import eu.eudat.model.builder.commonmodels.dmp.DmpCommonModelBuilder;
 import eu.eudat.model.builder.commonmodels.descriptiontemplate.DescriptionTemplateCommonModelBuilder;
 import eu.eudat.query.*;
+import eu.eudat.service.visibility.VisibilityService;
 import eu.eudat.service.visibility.VisibilityServiceImpl;
 import gr.cite.tools.data.builder.BuilderFactory;
 import gr.cite.tools.data.query.QueryFactory;
@@ -101,10 +102,11 @@ public class DescriptionCommonModelBuilder extends BaseCommonModelBuilder<Descri
             if (dmpDescriptionTemplateSections != null && d.getDmpDescriptionTemplateId() != null && dmpDescriptionTemplateSections.containsKey(d.getDmpDescriptionTemplateId())) m.setSectionId(dmpDescriptionTemplateSections.get(d.getDmpDescriptionTemplateId()));
             if (descriptionTemplates != null && d.getDescriptionTemplateId() != null && descriptionTemplates.containsKey(d.getDescriptionTemplateId())) m.setDescriptionTemplate(descriptionTemplates.get(d.getDescriptionTemplateId()));
             if (d.getProperties() != null){
-                //TODO Update with the new logic of property definition 
                 PropertyDefinitionEntity propertyDefinition = this.jsonHandlingService.fromJsonSafe(PropertyDefinitionEntity.class, d.getProperties());
-                m.setProperties(this.builderFactory.builder(PropertyDefinitionCommonModelBuilder.class).useSharedStorage(useSharedStorage).withDefinition(definitionEntityMap != null ? definitionEntityMap.getOrDefault(d.getDescriptionTemplateId(), null) : null).authorize(this.authorize).build(propertyDefinition));
-                //VisibilityServiceImpl visibilityService = new VisibilityServiceImpl(propertyDefinition);
+                DefinitionEntity definition = definitionEntityMap != null ? definitionEntityMap.getOrDefault(d.getDescriptionTemplateId(), null) : null;
+                m.setProperties(this.builderFactory.builder(PropertyDefinitionCommonModelBuilder.class).useSharedStorage(useSharedStorage).withDefinition(definition).authorize(this.authorize).build(propertyDefinition));
+                VisibilityService visibilityService = new VisibilityServiceImpl(definition, propertyDefinition);
+                m.setVisibilityStates(this.builderFactory.builder(VisibilityStateModelBuilder.class).authorize(this.authorize).build(visibilityService.getVisibilityStates().entrySet().stream().toList()));
             }
             models.add(new CommonModelBuilderItemResponse<>(m, d));
         }
diff --git a/dmp-backend/core/src/main/java/eu/eudat/service/visibility/VisibilityService.java b/dmp-backend/core/src/main/java/eu/eudat/service/visibility/VisibilityService.java
index 81830cecd..a7f7a1d03 100644
--- a/dmp-backend/core/src/main/java/eu/eudat/service/visibility/VisibilityService.java
+++ b/dmp-backend/core/src/main/java/eu/eudat/service/visibility/VisibilityService.java
@@ -1,5 +1,9 @@
 package eu.eudat.service.visibility;
 
+import java.util.Map;
+
 public interface VisibilityService {
 	boolean isVisible(String id, Integer ordinal);
+
+	Map<FieldKey, Boolean> getVisibilityStates();
 }
diff --git a/dmp-backend/core/src/main/java/eu/eudat/service/visibility/VisibilityServiceImpl.java b/dmp-backend/core/src/main/java/eu/eudat/service/visibility/VisibilityServiceImpl.java
index 5267c14e3..c1289bdfc 100644
--- a/dmp-backend/core/src/main/java/eu/eudat/service/visibility/VisibilityServiceImpl.java
+++ b/dmp-backend/core/src/main/java/eu/eudat/service/visibility/VisibilityServiceImpl.java
@@ -45,6 +45,12 @@ public class VisibilityServiceImpl implements VisibilityService {
 		FieldKey fieldKey = new FieldKey(id, ordinal);
 		return this.visibility.getOrDefault(fieldKey, false);
 	}
+
+	@Override
+	public Map<FieldKey, Boolean> getVisibilityStates() {
+		this.calculateVisibility();
+		return visibility;
+	}
 	
 	private void calculateVisibility(){
 		if (visibility != null) return;