Fixed hide non public items in a register and fixed formats for itemp…

…roposed #138
ec-jrc · Jun 28, 2022 · 9f09a0f · 9f09a0f
1 parent 858d72e
commit 9f09a0f
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 10 deletions.
diff --git a/...ry2JavaAPI/src/main/java/eu/europa/ec/re3gistry2/javaapi/cache/supplier/ItemSupplier.java b/...ry2JavaAPI/src/main/java/eu/europa/ec/re3gistry2/javaapi/cache/supplier/ItemSupplier.java
@@ -1132,7 +1132,12 @@ private List<RegItemproposed> getDirectlyContainedItemsproposedOfRegister(RegIte
              List <RegItemproposed> proposedItemsfromList = regItemproposedManager.getAll(regItemRegItemClass.get(i));
 
              for(int y=0; y<proposedItemsfromList.size(); y++){
-                 regItemproposedList.add(proposedItemsfromList.get(y));
+                 RegItemproposed proposedItem = proposedItemsfromList.get(y);
+                 boolean isPublic = proposedItem.getRegStatus().getIspublic();
+
+                if (isPublic) {
+                   regItemproposedList.add(proposedItem); 
+                }   
              }      
         }
 

diff --git a/...PI/src/main/java/eu/europa/ec/re3gistry2/javaapi/cache/supplier/ItemproposedSupplier.java b/...PI/src/main/java/eu/europa/ec/re3gistry2/javaapi/cache/supplier/ItemproposedSupplier.java
@@ -83,6 +83,7 @@
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
 import javax.persistence.EntityManager;
+import org.apache.commons.collections.CollectionUtils;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 
@@ -202,12 +203,11 @@ private Item toItemProposed(RegItemproposed regItemproposed) throws Exception {
         Item item = new Item();
 
         setMainPropertiesForRegItemProposed(regItemproposed, item);
-
-//        setRegistryAndRegisterItemRefProposed(regIP, item);      
+        setRegistryAndRegisterItemRefProposed(regItemproposed, item);      
 //        setIsDefinedByFromRegItemProposed(regIP, item);     
 //        setContainedItemsFromRegItemProposed(regIP, item);  
 //        setContainedItemsFromRegItemProposedClassWithParent(regIP, item); 
-//        setTopConceptsFromRegItemProposed(regIP, item);    
+//        setTopConceptsFromRegItemProposed(regItemproposed, item);    
 //        setInSchemeAndTopConceptOfFromRegItemProposed(regIP, item); 
 //        setNarrowerFromRegItemProposed(regIP, item);  
 //        setBroaderFromRegItemProposed(regIP, item); 
@@ -216,7 +216,13 @@ private Item toItemProposed(RegItemproposed regItemproposed) throws Exception {
 
     protected ContainedItem toContainedItemProposed(RegItemproposed regItemproposed) throws Exception {
         ContainedItem containedItem = new ContainedItem();
-
+
+        boolean isPublic = regItemproposed.getRegStatus().getIspublic();
+
+        if (!isPublic) {
+            return null;
+        }
+
         setMainPropertiesForRegItemProposed(regItemproposed, containedItem);
         setRegistryAndRegisterItemRefProposed(regItemproposed, containedItem);
         setIsDefinedByFromRegItemProposed(regItemproposed, containedItem);
@@ -607,8 +613,14 @@ private void setIsDefinedByFromRegItemProposed(RegItemproposed regItemproposed,
 
     protected ItemRef toItemRefProposed(RegItemproposed regItemproposed) throws Exception {
 
-        RegItem regItem = regItemproposed.getRegItemReference();
-
+        RegItem regItem = null;
+
+        if(regItemproposed.getRegItemReference() != null){
+            regItem = regItemproposed.getRegItemReference(); 
+        }else{ 
+            regItem = regItemproposed.getRegAction().getRegItemRegister();
+        }
+
         String uri = ItemproposedHelper.getProposedURI(regItemproposed, regItem, hasCollection, regRelationproposedManager, regRelationManager);
 
         RegField labelField = getLabelField();
@@ -866,16 +878,16 @@ protected RegItemproposed getRelatedItemProposedBySubject(RegItemproposed regIte
         List<RegItemproposed> list = getRelatedItemsProposedBySubject(regItemproposed, predicate);
         if (list != null && !list.isEmpty()) {
             return list.stream().findAny().orElse(null);
+            }     
+            return null;
         }
-        return null;
-    }
 
     private List<RegItemproposed> getRelatedItemsProposedBySubject(RegItemproposed regItemproposed, RegRelationpredicate predicate) throws Exception {
 
         if (regRelationproposedManager != null && regItemproposed != null && predicate != null
                 && regRelationproposedManager.getAll(regItemproposed, predicate) != null) {
             return regRelationproposedManager.getAll(regItemproposed, predicate).stream()
-                    .map(rel -> rel.getRegItemproposedObject())
+                    .map(rel -> rel.getRegItemproposedSubject())
                     .collect(Collectors.toList());
         } else {
             return null;