EPMRPP-91776 implement organization users dao

reportportal · Jul 4, 2024 · 434a3e4 · 434a3e4
1 parent 1e6b66f
commit 434a3e4
Showing 1 changed file with 2 additions and 5 deletions.
diff --git a/src/main/java/com/epam/ta/reportportal/commons/querygen/FilterTarget.java b/src/main/java/com/epam/ta/reportportal/commons/querygen/FilterTarget.java
@@ -1605,10 +1605,7 @@ public QuerySupplier getQuery() {
 
     @Override
     protected Collection<? extends SelectField> selectFields() {
-      return Lists.newArrayList(
-          DSL.countDistinct(choose()
-              .when(ORGANIZATION_USER.ORGANIZATION_ID.eq(PROJECT_USER.PROJECT_ID), PROJECT.ID))
-              .as(PROJECTS_QUANTITY),
+      return Lists.newArrayList(DSL.countDistinct(PROJECT.ID).as(PROJECTS_QUANTITY),
           ORGANIZATION_USER.USER_ID,
           USERS.METADATA,
           USERS.EMAIL,
@@ -1630,7 +1627,7 @@ protected void addFrom(SelectQuery<? extends Record> query) {
     protected void joinTables(QuerySupplier query) {
       query.addJoin(USERS, JoinType.LEFT_OUTER_JOIN, USERS.ID.eq(ORGANIZATION_USER.USER_ID));
       query.addJoin(PROJECT_USER, JoinType.LEFT_OUTER_JOIN, PROJECT_USER.USER_ID.eq(ORGANIZATION_USER.USER_ID));
-      query.addJoin(PROJECT, JoinType.LEFT_OUTER_JOIN, PROJECT.ID.eq(PROJECT_USER.USER_ID)
+      query.addJoin(PROJECT, JoinType.LEFT_OUTER_JOIN, PROJECT.ID.eq(PROJECT_USER.PROJECT_ID)
           .and(PROJECT.ORGANIZATION_ID.eq(ORGANIZATION_USER.ORGANIZATION_ID)));
     }