Filter templates in service class instead of DTO getter method

kitodo · Apr 17, 2023 · ae834af · ae834af
1 parent 35181c8
commit ae834af
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/Kitodo/src/main/java/org/kitodo/production/dto/ProjectDTO.java b/Kitodo/src/main/java/org/kitodo/production/dto/ProjectDTO.java
@@ -229,7 +229,7 @@ public void setClient(ClientDTO client) {
      * @return list of active templates as TemplateDTO
      */
     public List<TemplateDTO> getTemplates() {
-        return templates.stream().filter(TemplateDTO::isActive).collect(Collectors.toList());
+        return templates;
     }
 
     /**

diff --git a/Kitodo/src/main/java/org/kitodo/production/services/data/ProjectService.java b/Kitodo/src/main/java/org/kitodo/production/services/data/ProjectService.java
@@ -137,7 +137,7 @@ public Long countDatabaseRows() throws DAOException {
     public Long countNotIndexedDatabaseRows() throws DAOException {
         return countDatabaseRows("SELECT COUNT(*) FROM Project WHERE indexAction = 'INDEX' OR indexAction IS NULL");
     }
-    
+
     @Override
     public Long countResults(Map filters) throws DataException {
         return countDocuments(getProjectsForCurrentUserQuery());
@@ -224,14 +224,14 @@ private List<TemplateDTO> getTemplatesForProjectDTO(Map<String, Object> jsonObje
             templateDTO.setTitle(TemplateTypeField.TITLE.getStringValue(singleObject));
             templateDTOS.add(templateDTO);
         }
-        return templateDTOS;
+        return templateDTOS.stream().filter(TemplateDTO::isActive).collect(Collectors.toList());
     }
 
     private void convertRelatedJSONObjects(Map<String, Object> jsonObject, ProjectDTO projectDTO) throws DataException {
         // TODO: not clear if project lists will need it
         projectDTO.setUsers(new ArrayList<>());
         projectDTO.setTemplates(convertRelatedJSONObjectToDTO(jsonObject, ProjectTypeField.TEMPLATES.getKey(),
-            ServiceManager.getTemplateService()));
+            ServiceManager.getTemplateService()).stream().filter(TemplateDTO::isActive).collect(Collectors.toList()));
     }
 
     /**