EPMRPP-90460 implement Organization Project DAO

reportportal · Jun 5, 2024 · 7e5a048 · 7e5a048
1 parent 110536c
commit 7e5a048
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 8 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
@@ -1563,7 +1563,8 @@ protected Field<Long> idField() {
               .get(),
           new CriteriaHolderBuilder().newBuilder(PROJECT_USER.USER_ID.getName(), PROJECT_USER.USER_ID, Long.class)
               .get(),
-          new CriteriaHolderBuilder().newBuilder(CRITERIA_NAME, PROJECT.NAME, String.class).get()
+          new CriteriaHolderBuilder().newBuilder(CRITERIA_NAME, PROJECT.NAME, String.class).get(),
+          new CriteriaHolderBuilder().newBuilder(CRITERIA_NAME, PROJECT.SLUG, String.class).get()
       )
   ) {
     @Override

diff --git a/src/main/java/com/epam/ta/reportportal/util/OffsetUtils.java b/src/main/java/com/epam/ta/reportportal/util/OffsetUtils.java
@@ -12,22 +12,20 @@ public class OffsetUtils {
   private OffsetUtils() {
   }
 
-  public static Offset withOffsetData(Offset offsetObject, Page page) {
-    return offsetObject
+  public static <T extends Offset> T withOffsetData(T offsetObject, Page page) {
+    return (T) offsetObject
         .offset((int) page.getPageable().getOffset())
         .limit(page.getPageable().getPageSize())
         .totalCount((int) page.getTotalElements())
         .sort(getSortFields(page.getPageable()))
         .order(getOrderEnum(page.getPageable()));
-
-
   }
 
   private static String getSortFields(Pageable pageable) {
     return pageable.getSort().stream()
-            .map(Order::getProperty)
-            .reduce((s1, s2) -> s1 + ", " + s2)
-            .orElse("");
+        .map(Order::getProperty)
+        .reduce((s1, s2) -> s1 + ", " + s2)
+        .orElse("");
   }
 
   private static OrderEnum getOrderEnum(Pageable pageable) {