Fix filter ID comparison when attaching filters to a CLM project (bsc…

…#1215949) (#22928)
uyuni-project · Nov 2, 2023 · f37e296 · f37e296
1 parent b7062ad
commit f37e296
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/...rc/com/suse/manager/webui/controllers/contentmanagement/handlers/FilterApiController.java b/...rc/com/suse/manager/webui/controllers/contentmanagement/handlers/FilterApiController.java
@@ -111,7 +111,7 @@ public static String updateFiltersOfProject(Request req, Response res, User user
 
         List<Long> filterIdsToDetach = dbContentProject.getProjectFilters()
                 .stream()
-                .map(filter -> filter.getFilter().getId())
+                .map(pf -> pf.getFilter().getId())
                 .filter(filterId -> !filtersIdToUpdate.contains(filterId))
                 .collect(Collectors.toList());
         filterIdsToDetach.forEach(filterId -> CONTENT_MGR.detachFilter(
@@ -123,11 +123,9 @@ public static String updateFiltersOfProject(Request req, Response res, User user
         List<Long> filterIdsToAttach = filtersIdToUpdate
                 .stream()
                 .filter(filterId ->
-                        !dbContentProject.getProjectFilters()
+                        dbContentProject.getProjectFilters()
                                 .stream()
-                                .filter(filter -> filter.getId() == filterId)
-                                .findFirst()
-                                .isPresent()
+                                .noneMatch(pf -> pf.getFilter().getId() == filterId)
                 )
                 .collect(Collectors.toList());
         filterIdsToAttach

diff --git a/java/spacewalk-java.changes.cbbayburt.bsc1215949 b/java/spacewalk-java.changes.cbbayburt.bsc1215949
@@ -0,0 +1 @@
+- Fix filter ID comparison when attaching filters to a CLM project (bsc#1215949)