EPMRPP-93591 merge conflicts

reportportal · Aug 9, 2024 · 87e6c8a · 87e6c8a
1 parent 9cbed20
commit 87e6c8a
Show file tree

Hide file tree

Showing 28 changed files with 136 additions and 147 deletions.
diff --git a/src/main/java/com/epam/ta/reportportal/dao/ProjectRepositoryCustomImpl.java b/src/main/java/com/epam/ta/reportportal/dao/ProjectRepositoryCustomImpl.java
@@ -32,7 +32,6 @@
 import com.epam.ta.reportportal.commons.querygen.Queryable;
 import com.epam.ta.reportportal.entity.project.Project;
 import com.epam.ta.reportportal.entity.project.ProjectInfo;
-import java.time.Instant;
 import java.util.List;
 import java.util.Optional;
 import org.jooq.DSLContext;
@@ -132,19 +131,4 @@ public Page<Project> findAllIdsAndProjectAttributes(Pageable pageable) {
     );
   }
 
-  @Override
-  public int deleteByTypeAndLastLaunchRunBefore(ProjectType projectType, Instant bound,
-      int limit) {
-    return dsl.deleteFrom(PROJECT)
-        .where(PROJECT.ID.in(dsl.select(PROJECT.ID)
-            .from(PROJECT)
-            .join(LAUNCH)
-            .onKey()
-            .where(PROJECT.PROJECT_TYPE.eq(projectType.name()))
-            .groupBy(PROJECT.ID)
-            .having(DSL.max(LAUNCH.START_TIME).le(bound))
-            .limit(limit)))
-        .execute();
-  }
-
 }
diff --git a/src/main/java/com/epam/ta/reportportal/jooq/JPublic.java b/src/main/java/com/epam/ta/reportportal/jooq/JPublic.java
diff --git a/src/main/java/com/epam/ta/reportportal/jooq/tables/JActivity.java b/src/main/java/com/epam/ta/reportportal/jooq/tables/JActivity.java
diff --git a/src/main/java/com/epam/ta/reportportal/jooq/tables/JAnalyticsData.java b/src/main/java/com/epam/ta/reportportal/jooq/tables/JAnalyticsData.java
diff --git a/src/main/java/com/epam/ta/reportportal/jooq/tables/JApiKeys.java b/src/main/java/com/epam/ta/reportportal/jooq/tables/JApiKeys.java
diff --git a/src/main/java/com/epam/ta/reportportal/jooq/tables/JAttachment.java b/src/main/java/com/epam/ta/reportportal/jooq/tables/JAttachment.java
diff --git a/src/main/java/com/epam/ta/reportportal/jooq/tables/JAttachmentDeletion.java b/src/main/java/com/epam/ta/reportportal/jooq/tables/JAttachmentDeletion.java
diff --git a/src/main/java/com/epam/ta/reportportal/jooq/tables/JDashboard.java b/src/main/java/com/epam/ta/reportportal/jooq/tables/JDashboard.java
diff --git a/src/main/java/com/epam/ta/reportportal/jooq/tables/JIntegration.java b/src/main/java/com/epam/ta/reportportal/jooq/tables/JIntegration.java
diff --git a/src/main/java/com/epam/ta/reportportal/jooq/tables/JIntegrationType.java b/src/main/java/com/epam/ta/reportportal/jooq/tables/JIntegrationType.java
diff --git a/src/main/java/com/epam/ta/reportportal/jooq/tables/JLaunch.java b/src/main/java/com/epam/ta/reportportal/jooq/tables/JLaunch.java
diff --git a/src/main/java/com/epam/ta/reportportal/jooq/tables/JLog.java b/src/main/java/com/epam/ta/reportportal/jooq/tables/JLog.java
diff --git a/src/main/java/com/epam/ta/reportportal/jooq/tables/JOrganization.java b/src/main/java/com/epam/ta/reportportal/jooq/tables/JOrganization.java
diff --git a/src/main/java/com/epam/ta/reportportal/jooq/tables/JOrganizationUser.java b/src/main/java/com/epam/ta/reportportal/jooq/tables/JOrganizationUser.java
diff --git a/src/main/java/com/epam/ta/reportportal/jooq/tables/JProject.java b/src/main/java/com/epam/ta/reportportal/jooq/tables/JProject.java
diff --git a/src/main/java/com/epam/ta/reportportal/jooq/tables/JRestorePasswordBid.java b/src/main/java/com/epam/ta/reportportal/jooq/tables/JRestorePasswordBid.java
diff --git a/src/main/java/com/epam/ta/reportportal/jooq/tables/JShedlock.java b/src/main/java/com/epam/ta/reportportal/jooq/tables/JShedlock.java
diff --git a/src/main/java/com/epam/ta/reportportal/jooq/tables/JStaleMaterializedView.java b/src/main/java/com/epam/ta/reportportal/jooq/tables/JStaleMaterializedView.java
diff --git a/src/main/java/com/epam/ta/reportportal/jooq/tables/JTestItem.java b/src/main/java/com/epam/ta/reportportal/jooq/tables/JTestItem.java
diff --git a/src/main/java/com/epam/ta/reportportal/jooq/tables/JTestItemResults.java b/src/main/java/com/epam/ta/reportportal/jooq/tables/JTestItemResults.java
diff --git a/src/main/java/com/epam/ta/reportportal/jooq/tables/JTicket.java b/src/main/java/com/epam/ta/reportportal/jooq/tables/JTicket.java
diff --git a/src/main/java/com/epam/ta/reportportal/jooq/tables/JUserCreationBid.java b/src/main/java/com/epam/ta/reportportal/jooq/tables/JUserCreationBid.java