5.8.0 || Release (#882)

* EPMRPP-80383 || Notifications. AND/OR attribute option

* EPMRPP-80383 || Notifications. AND/OR attribute option

* EPMRPP-80383 || Notifications. AND/OR attribute option

* EPMRPP-81052 || Most failed test-cases table (TOP-20). Increase the amount of items to be displayed on widget from 20 to 50 or 100

* Update migrationsUrl

* Merge master to 5.7.5 (#879)

* EPMRPP-79211 || Change minio to Jcloud S3 Provider

* EPMRPP-79211 || Return minio dependency

* EPMRPP-79211 || Added api version

* EPMRPP-79211 || Changed retrieving s3 location and changed provider to aws-s3

* EPMRPP-79211 || Added aws-s3 provider dependency

* EPMRPP-79211 || Add logging for jcloud

* EPMRPP-79211 || Adding multipart tu PutOptions

* EPMRPP-79211 || Change bucketToRegion implementation to use custom location

* EPMRPP-79211 || Remove logging module and add minio configuration

* EPMRPP-79211 || Add documentation for custom module

* EPMRPP-79211 || Remove multipart options

* EPMRPP-80865 || Update bom and other versions

* [Gradle Release Plugin] - new version commit:  '5.7.5'.

---------

Co-authored-by: miracle8484 <76156909+miracle8484@users.noreply.github.com>
Co-authored-by: reportportal.io <support@reportportal.io>

* Merge 23.1 (#880)

* EPMRPP-81052 || Most failed test-cases table (TOP-20). Increase the amount of items to be displayed on widget from 20 to 50 or 100

* EPMRPP-81233 || Move ACL tasks from RP-23.3 to RP-23.1 (#868)

* EPMRPP-81233 || Move ACL tasks from RP-23.3 to RP-23.1

* EPMRPP-72320 || Update model version

* EPMRPP-72320 || Remove share flag from DashboardWidget

* EPMRPP-81233 || Move ACL tasks from RP-23.3 to RP-23.1

* EPMRPP-81233 || decrease branch test limit

---------

Co-authored-by: Pavel Bortnik <pavel_bortnik@epam.com>
Co-authored-by: Andrei Piankouski <andrei_piankouski@epam.com>

* EPMRPP-82300 Update dependency for common-models (#872)

* EPMRPP-82300-dependency-update update commons-model dependency

* EPMRPP-82300-dependency-update update commons-model dependency

---------

Co-authored-by: Andrei Piankouski <andrei_piankouski@epam.com>
Co-authored-by: Pavel Bortnik <pavel_bortnik@epam.com>
Co-authored-by: rkukharenka <125865748+rkukharenka@users.noreply.github.com>

* Update version

* EPMRPP-83280 || Update bom

---------

Co-authored-by: Andrei Piankouski <andrei_piankouski@epam.com>
Co-authored-by: miracle8484 <76156909+miracle8484@users.noreply.github.com>
Co-authored-by: Ivan_Kustau <Ivan_Kustau@epam.com>
Co-authored-by: Ivan Kustau <86599591+IvanKustau@users.noreply.github.com>
Co-authored-by: reportportal.io <support@reportportal.io>
Co-authored-by: Pavel Bortnik <pavel_bortnik@epam.com>
Co-authored-by: rkukharenka <125865748+rkukharenka@users.noreply.github.com>

.github/workflows/release.yml

@@ -12,9 +12,9 @@ on:
 env:
   GH_USER_NAME: github.actor
   SCRIPTS_VERSION: 5.7.0
-  BOM_VERSION: 5.7.4
+  BOM_VERSION: 5.7.5
   MIGRATIONS_VERSION: 5.7.3
-  RELEASE_VERSION: 5.7.4
+  RELEASE_VERSION: 5.8.0
 
 jobs:
   release:

build.gradle

@@ -50,7 +50,7 @@ repositories {
 
 dependencyManagement {
     imports {
-        mavenBom(releaseMode ? 'com.epam.reportportal:commons-bom:' + getProperty('bom.version') : 'com.github.reportportal:commons-bom:f0b6bb6b')
+        mavenBom(releaseMode ? 'com.epam.reportportal:commons-bom:' + getProperty('bom.version') : 'com.github.reportportal:commons-bom:2014aa5')
         mavenBom('io.zonky.test.postgres:embedded-postgres-binaries-bom:12.9.0')
     }
 }
@@ -63,7 +63,7 @@ dependencies {
     } else {
         compile 'com.github.reportportal:commons:def053af'
         compile 'com.github.reportportal:commons-rules:5.3.0'
-        compile 'com.github.reportportal:commons-model:a0479c55'
+        compile 'com.github.reportportal:commons-model:a046458'
     }
 
     //https://nvd.nist.gov/vuln/detail/CVE-2020-10683 (dom4j 2.1.3 version dependency) AND https://nvd.nist.gov/vuln/detail/CVE-2019-14900

gradle.properties

@@ -1 +1 @@
-version=5.7.5
+version=5.8.0

project-properties.gradle

@@ -9,7 +9,7 @@ project.ext {
     dependencyRepos = ["commons", "commons-rules", "commons-model", "commons-bom"]
     releaseMode = project.hasProperty("releaseMode")
     scriptsUrl = commonScriptsUrl + (releaseMode ? getProperty('scripts.version') : 'master')
-    migrationsUrl = migrationsScriptsUrl + (releaseMode ? getProperty('migrations.version') : 'develop')
+    migrationsUrl = migrationsScriptsUrl + (releaseMode ? getProperty('migrations.version') : 'hotfix/5.7.5')
     //TODO refactor with archive download
     testScriptsSrc = [
             (migrationsUrl + '/migrations/0_extensions.up.sql')                        : 'V001__extensions.sql',
@@ -65,6 +65,9 @@ project.ext {
             (migrationsUrl + '/migrations/54_analyzer_unique_error_attribute.up.sql')  : 'V054__analyzer_unique_error_attribute.sql',
             (migrationsUrl + '/migrations/58_alter_ticket.up.sql')                     : 'V058__alter_ticket.sql',
             (migrationsUrl + '/migrations/59_stale_materialized_view.up.sql')          : 'V059__stale_materialized_view.sql',
+            (migrationsUrl + '/migrations/60_sender_case_operator.up.sql')             : 'V060__sender_case_operator.sql',
+            (migrationsUrl + '/migrations/61_remove_acl.up.sql')                       : 'V061__remove_acl.sql',
+            (migrationsUrl + '/migrations/62_remove_dashboard_cascade_drop.up.sql')    : 'V062_remove_dashboard_cascade_drop.sql',
 
     ]
     excludeTests = [
@@ -80,7 +83,7 @@ project.ext {
     ]
     limits = [
             'instruction': 70,
-            'branch'     : 36,
+            'branch'     : 34,
             'line'       : 60,
             'complexity' : 49,
             'method'     : 55,

src/main/java/com/epam/ta/reportportal/commons/querygen/FilterTarget.java

@@ -900,14 +900,11 @@ protected Field<Long> idField() {
 
 			new CriteriaHolderBuilder().newBuilder(CRITERIA_ID, DASHBOARD.ID, Long.class).get(),
 			new CriteriaHolderBuilder().newBuilder(CRITERIA_NAME, DASHBOARD.NAME, String.class).get(),
-			new CriteriaHolderBuilder().newBuilder(CRITERIA_SHARED, SHAREABLE_ENTITY.SHARED, Boolean.class)
-					.withAggregateCriteria(DSL.boolAnd(SHAREABLE_ENTITY.SHARED).toString())
+			new CriteriaHolderBuilder().newBuilder(CRITERIA_PROJECT_ID, OWNED_ENTITY.PROJECT_ID, Long.class)
+					.withAggregateCriteria(DSL.max(OWNED_ENTITY.PROJECT_ID).toString())
 					.get(),
-			new CriteriaHolderBuilder().newBuilder(CRITERIA_PROJECT_ID, SHAREABLE_ENTITY.PROJECT_ID, Long.class)
-					.withAggregateCriteria(DSL.max(SHAREABLE_ENTITY.PROJECT_ID).toString())
-					.get(),
-			new CriteriaHolderBuilder().newBuilder(CRITERIA_OWNER, SHAREABLE_ENTITY.OWNER, String.class)
-					.withAggregateCriteria(DSL.max(SHAREABLE_ENTITY.OWNER).toString())
+			new CriteriaHolderBuilder().newBuilder(CRITERIA_OWNER, OWNED_ENTITY.OWNER, String.class)
+					.withAggregateCriteria(DSL.max(OWNED_ENTITY.OWNER).toString())
 					.get()
 	)) {
 		@Override
@@ -926,10 +923,8 @@ protected Collection<? extends SelectField> selectFields() {
 					DASHBOARD_WIDGET.WIDGET_POSITION_X,
 					DASHBOARD_WIDGET.WIDGET_POSITION_Y,
 					WIDGET.WIDGET_OPTIONS,
-					DASHBOARD_WIDGET.SHARE,
-					SHAREABLE_ENTITY.SHARED,
-					SHAREABLE_ENTITY.PROJECT_ID,
-					SHAREABLE_ENTITY.OWNER
+					OWNED_ENTITY.PROJECT_ID,
+					OWNED_ENTITY.OWNER
 			);
 		}
 
@@ -942,10 +937,7 @@ protected void addFrom(SelectQuery<? extends Record> query) {
 		protected void joinTables(QuerySupplier query) {
 			query.addJoin(DASHBOARD_WIDGET, JoinType.LEFT_OUTER_JOIN, DASHBOARD.ID.eq(DASHBOARD_WIDGET.DASHBOARD_ID));
 			query.addJoin(WIDGET, JoinType.LEFT_OUTER_JOIN, DASHBOARD_WIDGET.WIDGET_ID.eq(WIDGET.ID));
-			query.addJoin(SHAREABLE_ENTITY, JoinType.JOIN, DASHBOARD.ID.eq(SHAREABLE_ENTITY.ID));
-			query.addJoin(ACL_OBJECT_IDENTITY, JoinType.JOIN, DASHBOARD.ID.cast(String.class).eq(ACL_OBJECT_IDENTITY.OBJECT_ID_IDENTITY));
-			query.addJoin(ACL_CLASS, JoinType.JOIN, ACL_CLASS.ID.eq(ACL_OBJECT_IDENTITY.OBJECT_ID_CLASS));
-			query.addJoin(ACL_ENTRY, JoinType.JOIN, ACL_ENTRY.ACL_OBJECT_IDENTITY.eq(ACL_OBJECT_IDENTITY.ID));
+			query.addJoin(OWNED_ENTITY, JoinType.JOIN, DASHBOARD.ID.eq(OWNED_ENTITY.ID));
 		}
 
 		@Override
@@ -961,12 +953,9 @@ protected Field<Long> idField() {
 					.withAggregateCriteria(DSL.max(WIDGET.NAME).toString())
 					.get(),
 			new CriteriaHolderBuilder().newBuilder(CRITERIA_DESCRIPTION, WIDGET.DESCRIPTION, String.class).get(),
-			new CriteriaHolderBuilder().newBuilder(CRITERIA_SHARED, SHAREABLE_ENTITY.SHARED, Boolean.class)
-					.withAggregateCriteria(DSL.boolAnd(SHAREABLE_ENTITY.SHARED).toString())
-					.get(),
-			new CriteriaHolderBuilder().newBuilder(CRITERIA_PROJECT_ID, SHAREABLE_ENTITY.PROJECT_ID, Long.class).get(),
-			new CriteriaHolderBuilder().newBuilder(CRITERIA_OWNER, SHAREABLE_ENTITY.OWNER, String.class)
-					.withAggregateCriteria(DSL.max(SHAREABLE_ENTITY.OWNER).toString())
+			new CriteriaHolderBuilder().newBuilder(CRITERIA_PROJECT_ID, OWNED_ENTITY.PROJECT_ID, Long.class).get(),
+			new CriteriaHolderBuilder().newBuilder(CRITERIA_OWNER, OWNED_ENTITY.OWNER, String.class)
+					.withAggregateCriteria(DSL.max(OWNED_ENTITY.OWNER).toString())
 					.get()
 
 	)) {
@@ -977,9 +966,8 @@ protected Collection<? extends SelectField> selectFields() {
 					WIDGET.WIDGET_TYPE,
 					WIDGET.DESCRIPTION,
 					WIDGET.ITEMS_COUNT,
-					SHAREABLE_ENTITY.PROJECT_ID,
-					SHAREABLE_ENTITY.SHARED,
-					SHAREABLE_ENTITY.OWNER
+					OWNED_ENTITY.PROJECT_ID,
+					OWNED_ENTITY.OWNER
 			);
 		}
 
@@ -990,10 +978,7 @@ protected void addFrom(SelectQuery<? extends Record> query) {
 
 		@Override
 		protected void joinTables(QuerySupplier query) {
-			query.addJoin(SHAREABLE_ENTITY, JoinType.JOIN, WIDGET.ID.eq(SHAREABLE_ENTITY.ID));
-			query.addJoin(ACL_OBJECT_IDENTITY, JoinType.JOIN, WIDGET.ID.cast(String.class).eq(ACL_OBJECT_IDENTITY.OBJECT_ID_IDENTITY));
-			query.addJoin(ACL_CLASS, JoinType.JOIN, ACL_CLASS.ID.eq(ACL_OBJECT_IDENTITY.OBJECT_ID_CLASS));
-			query.addJoin(ACL_ENTRY, JoinType.JOIN, ACL_ENTRY.ACL_OBJECT_IDENTITY.eq(ACL_OBJECT_IDENTITY.ID));
+			query.addJoin(OWNED_ENTITY, JoinType.JOIN, WIDGET.ID.eq(OWNED_ENTITY.ID));
 		}
 
 		@Override
@@ -1005,16 +990,13 @@ protected Field<Long> idField() {
 	USER_FILTER_TARGET(UserFilter.class,
 			Arrays.asList(new CriteriaHolderBuilder().newBuilder(CRITERIA_ID, FILTER.ID, Long.class).get(),
 					new CriteriaHolderBuilder().newBuilder(CRITERIA_NAME, FILTER.NAME, String.class).get(),
-					new CriteriaHolderBuilder().newBuilder(CRITERIA_SHARED, SHAREABLE_ENTITY.SHARED, Boolean.class)
-							.withAggregateCriteria(DSL.boolAnd(SHAREABLE_ENTITY.SHARED).toString())
-							.get(),
 
-					new CriteriaHolderBuilder().newBuilder(CRITERIA_PROJECT_ID, SHAREABLE_ENTITY.PROJECT_ID, Long.class)
-							.withAggregateCriteria(DSL.max(SHAREABLE_ENTITY.PROJECT_ID).toString())
+					new CriteriaHolderBuilder().newBuilder(CRITERIA_PROJECT_ID, OWNED_ENTITY.PROJECT_ID, Long.class)
+							.withAggregateCriteria(DSL.max(OWNED_ENTITY.PROJECT_ID).toString())
 							.get(),
 
-					new CriteriaHolderBuilder().newBuilder(CRITERIA_OWNER, SHAREABLE_ENTITY.OWNER, String.class)
-							.withAggregateCriteria(DSL.max(SHAREABLE_ENTITY.OWNER).toString())
+					new CriteriaHolderBuilder().newBuilder(CRITERIA_OWNER, OWNED_ENTITY.OWNER, String.class)
+							.withAggregateCriteria(DSL.max(OWNED_ENTITY.OWNER).toString())
 							.get()
 			)
 	) {
@@ -1030,9 +1012,8 @@ protected Collection<? extends SelectField> selectFields() {
 					FILTER_CONDITION.NEGATIVE,
 					FILTER_SORT.FIELD,
 					FILTER_SORT.DIRECTION,
-					SHAREABLE_ENTITY.SHARED,
-					SHAREABLE_ENTITY.PROJECT_ID,
-					SHAREABLE_ENTITY.OWNER
+					OWNED_ENTITY.PROJECT_ID,
+					OWNED_ENTITY.OWNER
 			);
 		}
 
@@ -1043,12 +1024,9 @@ protected void addFrom(SelectQuery<? extends Record> query) {
 
 		@Override
 		protected void joinTables(QuerySupplier query) {
-			query.addJoin(SHAREABLE_ENTITY, JoinType.JOIN, FILTER.ID.eq(SHAREABLE_ENTITY.ID));
+			query.addJoin(OWNED_ENTITY, JoinType.JOIN, FILTER.ID.eq(OWNED_ENTITY.ID));
 			query.addJoin(FILTER_CONDITION, JoinType.LEFT_OUTER_JOIN, FILTER.ID.eq(FILTER_CONDITION.FILTER_ID));
 			query.addJoin(FILTER_SORT, JoinType.LEFT_OUTER_JOIN, FILTER.ID.eq(FILTER_SORT.FILTER_ID));
-			query.addJoin(ACL_OBJECT_IDENTITY, JoinType.JOIN, FILTER.ID.cast(String.class).eq(ACL_OBJECT_IDENTITY.OBJECT_ID_IDENTITY));
-			query.addJoin(ACL_CLASS, JoinType.JOIN, ACL_CLASS.ID.eq(ACL_OBJECT_IDENTITY.OBJECT_ID_CLASS));
-			query.addJoin(ACL_ENTRY, JoinType.JOIN, ACL_ENTRY.ACL_OBJECT_IDENTITY.eq(ACL_OBJECT_IDENTITY.ID));
 		}
 
 		@Override

src/main/java/com/epam/ta/reportportal/dao/DashboardRepositoryCustom.java

@@ -21,5 +21,5 @@
 /**
  * @author <a href="mailto:pavel_bortnik@epam.com">Pavel Bortnik</a>
  */
-public interface DashboardRepositoryCustom extends ShareableRepository<Dashboard> {
+public interface DashboardRepositoryCustom extends FilterableRepository<Dashboard> {
 }

src/main/java/com/epam/ta/reportportal/dao/DashboardRepositoryCustomImpl.java

@@ -16,32 +16,66 @@
 
 package com.epam.ta.reportportal.dao;
 
-import com.epam.ta.reportportal.commons.querygen.ProjectFilter;
+import com.epam.ta.reportportal.commons.querygen.ConvertibleCondition;
+import com.epam.ta.reportportal.commons.querygen.FilterCondition;
+import com.epam.ta.reportportal.commons.querygen.QueryBuilder;
+import com.epam.ta.reportportal.commons.querygen.Queryable;
 import com.epam.ta.reportportal.entity.dashboard.Dashboard;
+import org.jooq.DSLContext;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
+import org.springframework.data.domain.Sort;
+import org.springframework.data.repository.support.PageableExecutionUtils;
 import org.springframework.stereotype.Repository;
 
+import java.util.Collection;
+import java.util.List;
+import java.util.Set;
+import java.util.stream.Collectors;
+
 import static com.epam.ta.reportportal.dao.util.ResultFetchers.DASHBOARD_FETCHER;
 
 /**
  * @author <a href="mailto:pavel_bortnik@epam.com">Pavel Bortnik</a>
  */
 @Repository
-public class DashboardRepositoryCustomImpl extends AbstractShareableRepositoryImpl<Dashboard> implements DashboardRepositoryCustom {
+public class DashboardRepositoryCustomImpl implements DashboardRepositoryCustom {
 
-	@Override
-	public Page<Dashboard> getPermitted(ProjectFilter filter, Pageable pageable, String userName) {
-		return getPermitted(DASHBOARD_FETCHER, filter, pageable, userName);
+	private DSLContext dsl;
+
+	@Autowired
+	public void setDsl(DSLContext dsl) {
+		this.dsl = dsl;
 	}
 
 	@Override
-	public Page<Dashboard> getOwn(ProjectFilter filter, Pageable pageable, String userName) {
-		return getOwn(DASHBOARD_FETCHER, filter, pageable, userName);
+	public List<Dashboard> findByFilter(Queryable filter) {
+		return DASHBOARD_FETCHER.apply(dsl.fetch(QueryBuilder.newBuilder(
+				filter,
+				filter.getFilterConditions()
+						.stream()
+						.map(ConvertibleCondition::getAllConditions)
+						.flatMap(Collection::stream)
+						.map(FilterCondition::getSearchCriteria)
+						.collect(Collectors.toSet())
+		).wrap().build()));
 	}
 
 	@Override
-	public Page<Dashboard> getShared(ProjectFilter filter, Pageable pageable, String userName) {
-		return getShared(DASHBOARD_FETCHER, filter, pageable, userName);
+	public Page<Dashboard> findByFilter(Queryable filter, Pageable pageable) {
+		Set<String> fields = filter.getFilterConditions()
+				.stream()
+				.map(ConvertibleCondition::getAllConditions)
+				.flatMap(Collection::stream)
+				.map(FilterCondition::getSearchCriteria)
+				.collect(Collectors.toSet());
+		fields.addAll(pageable.getSort().get().map(Sort.Order::getProperty).collect(Collectors.toSet()));
+
+		return PageableExecutionUtils.getPage(DASHBOARD_FETCHER.apply(dsl.fetch(QueryBuilder.newBuilder(filter, fields)
+				.with(pageable)
+				.wrap()
+				.withWrapperSort(pageable.getSort())
+				.build())), pageable, () -> dsl.fetchCount(QueryBuilder.newBuilder(filter, fields).build()));
 	}
 }