From f37e296fdd930d17b5d11f51117d7744bd0a0992 Mon Sep 17 00:00:00 2001
From: Can Bulut Bayburt <1103552+cbbayburt@users.noreply.github.com>
Date: Thu, 2 Nov 2023 16:16:32 +0100
Subject: [PATCH] Fix filter ID comparison when attaching filters to a CLM
 project (bsc#1215949) (#22928)

---
 .../contentmanagement/handlers/FilterApiController.java   | 8 +++-----
 java/spacewalk-java.changes.cbbayburt.bsc1215949          | 1 +
 2 files changed, 4 insertions(+), 5 deletions(-)
 create mode 100644 java/spacewalk-java.changes.cbbayburt.bsc1215949

diff --git a/java/code/src/com/suse/manager/webui/controllers/contentmanagement/handlers/FilterApiController.java b/java/code/src/com/suse/manager/webui/controllers/contentmanagement/handlers/FilterApiController.java
index 27aba1343806..e019dad32167 100644
--- a/java/code/src/com/suse/manager/webui/controllers/contentmanagement/handlers/FilterApiController.java
+++ b/java/code/src/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
new file mode 100644
index 000000000000..e59718224993
--- /dev/null
+++ b/java/spacewalk-java.changes.cbbayburt.bsc1215949
@@ -0,0 +1 @@
+- Fix filter ID comparison when attaching filters to a CLM project (bsc#1215949)