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 index 58e75a9f8..8066a71ce 100644 --- a/src/main/java/com/epam/ta/reportportal/commons/querygen/FilterTarget.java +++ b/src/main/java/com/epam/ta/reportportal/commons/querygen/FilterTarget.java @@ -18,6 +18,7 @@ import static com.epam.ta.reportportal.commons.querygen.QueryBuilder.STATISTICS_KEY; import static com.epam.ta.reportportal.commons.querygen.constant.ActivityCriteriaConstant.CRITERIA_ACTION; +import static com.epam.ta.reportportal.commons.querygen.constant.ActivityCriteriaConstant.CRITERIA_ACTIVITY_PROJECT_NAME; import static com.epam.ta.reportportal.commons.querygen.constant.ActivityCriteriaConstant.CRITERIA_CREATED_AT; import static com.epam.ta.reportportal.commons.querygen.constant.ActivityCriteriaConstant.CRITERIA_EVENT_NAME; import static com.epam.ta.reportportal.commons.querygen.constant.ActivityCriteriaConstant.CRITERIA_OBJECT_ID; @@ -937,7 +938,8 @@ protected Field idField() { .get(), new CriteriaHolderBuilder().newBuilder(CRITERIA_SUBJECT_TYPE, ACTIVITY.SUBJECT_TYPE, String.class).get(), - new CriteriaHolderBuilder().newBuilder(CRITERIA_PROJECT_NAME, PROJECT.NAME, Long.class) + new CriteriaHolderBuilder().newBuilder(CRITERIA_ACTIVITY_PROJECT_NAME, PROJECT.NAME, + String.class) .withAggregateCriteria(DSL.max(PROJECT.NAME).toString()) .get(), new CriteriaHolderBuilder().newBuilder(CRITERIA_USER, USERS.LOGIN, String.class) diff --git a/src/main/java/com/epam/ta/reportportal/commons/querygen/constant/ActivityCriteriaConstant.java b/src/main/java/com/epam/ta/reportportal/commons/querygen/constant/ActivityCriteriaConstant.java index d85f86275..d3fab0421 100644 --- a/src/main/java/com/epam/ta/reportportal/commons/querygen/constant/ActivityCriteriaConstant.java +++ b/src/main/java/com/epam/ta/reportportal/commons/querygen/constant/ActivityCriteriaConstant.java @@ -33,6 +33,7 @@ public final class ActivityCriteriaConstant { public static final String CRITERIA_EVENT_NAME = "eventName"; public static final String CRITERIA_SUBJECT_ID = "subjectId"; public static final String CRITERIA_SUBJECT_NAME = "subjectName"; + public static final String CRITERIA_ACTIVITY_PROJECT_NAME = "projectName"; private ActivityCriteriaConstant() { //static only diff --git a/src/main/java/com/epam/ta/reportportal/dao/ActivityRepositoryCustomImpl.java b/src/main/java/com/epam/ta/reportportal/dao/ActivityRepositoryCustomImpl.java index 8db9304af..8b8e16e77 100644 --- a/src/main/java/com/epam/ta/reportportal/dao/ActivityRepositoryCustomImpl.java +++ b/src/main/java/com/epam/ta/reportportal/dao/ActivityRepositoryCustomImpl.java @@ -32,7 +32,7 @@ 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.data.support.PageableExecutionUtils; import org.springframework.stereotype.Repository; /** diff --git a/src/main/java/com/epam/ta/reportportal/dao/util/RecordMappers.java b/src/main/java/com/epam/ta/reportportal/dao/util/RecordMappers.java index ff8fd7a7c..79e2bf95d 100644 --- a/src/main/java/com/epam/ta/reportportal/dao/util/RecordMappers.java +++ b/src/main/java/com/epam/ta/reportportal/dao/util/RecordMappers.java @@ -408,6 +408,7 @@ public class RecordMappers { activity.setObjectName(r.get(ACTIVITY.OBJECT_NAME)); activity.setObjectType(EventObject.valueOf(r.get(ACTIVITY.OBJECT_TYPE))); activity.setProjectId(r.get(ACTIVITY.PROJECT_ID)); + activity.setProjectName(r.get(PROJECT.NAME)); String detailsJson = r.get(ACTIVITY.DETAILS, String.class); ofNullable(detailsJson).ifPresent(s -> { try { diff --git a/src/main/java/com/epam/ta/reportportal/entity/activity/Activity.java b/src/main/java/com/epam/ta/reportportal/entity/activity/Activity.java index 43d7fa445..983c80b74 100644 --- a/src/main/java/com/epam/ta/reportportal/entity/activity/Activity.java +++ b/src/main/java/com/epam/ta/reportportal/entity/activity/Activity.java @@ -27,6 +27,7 @@ import javax.persistence.GenerationType; import javax.persistence.Id; import javax.persistence.Table; +import javax.persistence.Transient; import org.hibernate.annotations.Type; import org.hibernate.annotations.TypeDef; @@ -72,6 +73,9 @@ public class Activity implements Serializable { @Column(name = "project_id") private Long projectId; + @Transient + private String projectName; + @Column(name = "details") @Type(type = "activityDetails") private ActivityDetails details; @@ -158,6 +162,14 @@ public void setProjectId(Long projectId) { this.projectId = projectId; } + public String getProjectName() { + return projectName; + } + + public void setProjectName(String projectName) { + this.projectName = projectName; + } + public ActivityDetails getDetails() { return details; }