feature/adjusted-daos-to filter null values (#23)

* feature/adjusted-daos-to filter null values * fix: reverted filter and improved dao functions * fix: format
onecx · Feb 15, 2024 · 961b530 · 961b530
1 parent 9d23737
commit 961b530
Showing 1 changed file with 6 additions and 11 deletions.
diff --git a/src/main/java/org/tkit/onecx/announcement/domain/daos/AnnouncementDAO.java b/src/main/java/org/tkit/onecx/announcement/domain/daos/AnnouncementDAO.java
@@ -5,7 +5,6 @@
 
 import jakarta.enterprise.context.ApplicationScoped;
 import jakarta.persistence.NoResultException;
-import jakarta.persistence.Tuple;
 import jakarta.persistence.criteria.*;
 
 import org.tkit.onecx.announcement.domain.criteria.AnnouncementSearchCriteria;
@@ -97,12 +96,10 @@ public PageResult<Announcement> loadAnnouncementByCriteria(AnnouncementSearchCri
     public List<String> findApplicationsWithAnnouncements() {
         try {
             CriteriaBuilder cb = getEntityManager().getCriteriaBuilder();
-            CriteriaQuery<Tuple> cq = cb.createTupleQuery();
+            CriteriaQuery<String> cq = cb.createQuery(String.class);
             Root<Announcement> root = cq.from(Announcement.class);
-            cq.multiselect(root.get(Announcement_.APP_ID));
-            cq.distinct(true);
-            List<Tuple> tupleResult = getEntityManager().createQuery(cq).getResultList();
-            return tupleResult.stream().map(t -> (String) t.get(0)).toList();
+            cq.select(root.get(Announcement_.APP_ID)).distinct(true);
+            return getEntityManager().createQuery(cq).getResultList();
         } catch (Exception ex) {
             throw new DAOException(ErrorKeys.ERROR_FIND_APPLICATIONS_WITH_ANNOUNCEMENTS, ex);
         }
@@ -111,12 +108,10 @@ public List<String> findApplicationsWithAnnouncements() {
     public List<String> findWorkspacesWithAnnouncements() {
         try {
             CriteriaBuilder cb = getEntityManager().getCriteriaBuilder();
-            CriteriaQuery<Tuple> cq = cb.createTupleQuery();
+            CriteriaQuery<String> cq = cb.createQuery(String.class);
             Root<Announcement> root = cq.from(Announcement.class);
-            cq.multiselect(root.get(Announcement_.WORKSPACE_NAME));
-            cq.distinct(true);
-            List<Tuple> tupleResult = getEntityManager().createQuery(cq).getResultList();
-            return tupleResult.stream().map(t -> (String) t.get(0)).toList();
+            cq.select(root.get(Announcement_.WORKSPACE_NAME)).distinct(true);
+            return getEntityManager().createQuery(cq).getResultList();
         } catch (Exception ex) {
             throw new DAOException(ErrorKeys.ERROR_FIND_WORKSPACES_WITH_ANNOUNCEMENTS, ex);
         }