Fix restore when access rights is null (#118)

Signed-off-by: Seddik Yengui <seddik.yengui@rte-france.com>
gridsuite · Mar 5, 2024 · ee232d8 · ee232d8
1 parent bb06425
commit ee232d8
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/src/main/java/org/gridsuite/directory/server/DirectoryService.java b/src/main/java/org/gridsuite/directory/server/DirectoryService.java
@@ -591,7 +591,8 @@ private List<DirectoryElementEntity> getEntitiesToRestore(List<DirectoryElementE
 
         return entities.stream()
                 .filter(entity -> {
-                    boolean isUpdatable = Objects.equals(userId, entity.getOwner()) || !entity.getIsPrivate();
+                    boolean isPublicElement = entity.getIsPrivate() == null && !getParentElement(entity.getId()).getAccessRights().isPrivate() || !entity.getIsPrivate();
+                    boolean isUpdatable = Objects.equals(userId, entity.getOwner()) || isPublicElement;
                     if (!isUpdatable) {
                         rejectedEntities.add(entity);
                     }
@@ -603,6 +604,9 @@ private List<DirectoryElementEntity> getEntitiesToRestore(List<DirectoryElementE
     public void restoreElements(List<UUID> elementsUuid, UUID parentUuid, String userId) {
         // Get parent directory
         ElementAttributes parent = getElement(parentUuid);
+        if (parent == null) {
+            throw new DirectoryException(NOT_FOUND, String.format("The directory '%s' not found !", parentUuid));
+        }
 
         // Get all updatable entities. Entities should be public or created by the user, so it can be restored
         List<DirectoryElementEntity> notUpdatableEntities = new ArrayList<>();

diff --git a/src/main/java/org/gridsuite/directory/server/repository/DirectoryElementRepository.java b/src/main/java/org/gridsuite/directory/server/repository/DirectoryElementRepository.java
@@ -72,7 +72,7 @@ interface SubDirectoryCount {
     @Query("SELECT e FROM DirectoryElementEntity e " +
             "WHERE e.id IN :uuids " +
             "AND e.stashed = :stashed " +
-            "AND (e.owner = :userId OR e.isPrivate = false)")
+            "AND (e.owner = :userId OR e.isPrivate = false OR (e.isPrivate IS NULL AND NOT EXISTS (SELECT 1 FROM DirectoryElementEntity parent WHERE parent.id = e.parentId AND parent.isPrivate = true)))")
     List<DirectoryElementEntity> findAllStashedElements(@Param("uuids") List<UUID> uuids,
                                                         @Param("stashed") boolean stashed,
                                                         @Param("userId") String userId);