From dbaae84f90fcc5819023040a4684c8585f51a2fc Mon Sep 17 00:00:00 2001 From: siarhei_hrabko Date: Mon, 15 Apr 2024 21:37:11 +0300 Subject: [PATCH] EPMRPP-90242 merge conflicts --- build.gradle | 2 +- .../dao/ActivityRepositoryCustomImpl.java | 8 +- .../converter/OrganizationTypeConverter.java | 2 +- .../entity/organization/Organization.java | 6 +- .../entity/organization/OrganizationInfo.java | 87 ++----------------- 5 files changed, 18 insertions(+), 87 deletions(-) diff --git a/build.gradle b/build.gradle index faf2a3a31..3e93753af 100644 --- a/build.gradle +++ b/build.gradle @@ -35,7 +35,7 @@ dependencies { if (releaseMode) { compile 'com.epam.reportportal:commons' } else { - implementation 'com.github.reportportal:commons:d7f9bec' + implementation 'com.github.reportportal:commons:24dde95' } implementation 'org.springframework.security:spring-security-core' 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 9055a3503..adbf9e35c 100644 --- a/src/main/java/com/epam/ta/reportportal/dao/ActivityRepositoryCustomImpl.java +++ b/src/main/java/com/epam/ta/reportportal/dao/ActivityRepositoryCustomImpl.java @@ -16,6 +16,7 @@ package com.epam.ta.reportportal.dao; +import static com.epam.ta.reportportal.commons.EntityUtils.INSTANT_TO_TIMESTAMP; import static com.epam.ta.reportportal.dao.util.RecordMappers.ACTIVITY_MAPPER; import static com.epam.ta.reportportal.dao.util.ResultFetchers.ACTIVITY_FETCHER; import static com.epam.ta.reportportal.jooq.tables.JActivity.ACTIVITY; @@ -23,9 +24,8 @@ import com.epam.ta.reportportal.commons.querygen.QueryBuilder; import com.epam.ta.reportportal.commons.querygen.Queryable; import com.epam.ta.reportportal.entity.activity.Activity; -import java.sql.Timestamp; import java.time.Duration; -import java.time.LocalDateTime; +import java.time.Instant; import java.util.List; import org.jooq.DSLContext; import org.springframework.beans.factory.annotation.Autowired; @@ -50,9 +50,9 @@ public ActivityRepositoryCustomImpl(DSLContext dsl) { @Override public void deleteModifiedLaterAgo(Long projectId, Duration period) { - LocalDateTime bound = LocalDateTime.now().minus(period); + Instant bound = Instant.now().minus(period); dsl.delete(ACTIVITY).where(ACTIVITY.PROJECT_ID.eq(projectId)) - .and(ACTIVITY.CREATED_AT.lt(Timestamp.valueOf(bound))).execute(); + .and(ACTIVITY.CREATED_AT.lt(INSTANT_TO_TIMESTAMP.apply(bound))).execute(); } @Override diff --git a/src/main/java/com/epam/ta/reportportal/entity/enums/converter/OrganizationTypeConverter.java b/src/main/java/com/epam/ta/reportportal/entity/enums/converter/OrganizationTypeConverter.java index cecf519d4..e59a73d9c 100644 --- a/src/main/java/com/epam/ta/reportportal/entity/enums/converter/OrganizationTypeConverter.java +++ b/src/main/java/com/epam/ta/reportportal/entity/enums/converter/OrganizationTypeConverter.java @@ -16,8 +16,8 @@ package com.epam.ta.reportportal.entity.enums.converter; +import com.epam.reportportal.rules.exception.ReportPortalException; import com.epam.ta.reportportal.entity.enums.OrganizationType; -import com.epam.ta.reportportal.exception.ReportPortalException; import javax.persistence.AttributeConverter; import javax.persistence.Converter; diff --git a/src/main/java/com/epam/ta/reportportal/entity/organization/Organization.java b/src/main/java/com/epam/ta/reportportal/entity/organization/Organization.java index 4beeff8b7..4614fe7ee 100644 --- a/src/main/java/com/epam/ta/reportportal/entity/organization/Organization.java +++ b/src/main/java/com/epam/ta/reportportal/entity/organization/Organization.java @@ -18,7 +18,7 @@ import com.epam.ta.reportportal.entity.enums.OrganizationType; import java.io.Serializable; -import java.time.LocalDateTime; +import java.time.Instant; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.GeneratedValue; @@ -43,7 +43,7 @@ public class Organization implements Serializable { private Long id; @Column(name = "creation_date", nullable = false) - private LocalDateTime creationDate; + private Instant creationDate; @Column(name = "name") private String name; @@ -57,7 +57,7 @@ public class Organization implements Serializable { public Organization() { } - public Organization(Long id, LocalDateTime creationDate, String name, + public Organization(Long id, Instant creationDate, String name, OrganizationType organizationType, String slug) { this.id = id; this.creationDate = creationDate; diff --git a/src/main/java/com/epam/ta/reportportal/entity/organization/OrganizationInfo.java b/src/main/java/com/epam/ta/reportportal/entity/organization/OrganizationInfo.java index bb029b285..35289dca0 100644 --- a/src/main/java/com/epam/ta/reportportal/entity/organization/OrganizationInfo.java +++ b/src/main/java/com/epam/ta/reportportal/entity/organization/OrganizationInfo.java @@ -18,11 +18,17 @@ import com.epam.ta.reportportal.entity.enums.OrganizationType; import java.io.Serializable; -import java.time.LocalDateTime; +import java.time.Instant; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.Setter; /** * @author Siarhei Hrabko */ +@Getter +@Setter +@NoArgsConstructor public class OrganizationInfo implements Serializable { public static final String USERS_QUANTITY = "usersQuantity"; @@ -31,7 +37,7 @@ public class OrganizationInfo implements Serializable { public static final String LAST_RUN = "lastRun"; private Long id; - private LocalDateTime creationDate; + private Instant creationDate; private String name; private OrganizationType organizationType; private String slug; @@ -40,81 +46,6 @@ public class OrganizationInfo implements Serializable { private int projectsQuantity; private int launchesQuantity; - private LocalDateTime lastRun; - - public OrganizationInfo() { - } - - public Long getId() { - return id; - } - - public void setId(Long id) { - this.id = id; - } - - public LocalDateTime getCreationDate() { - return creationDate; - } - - public void setCreationDate(LocalDateTime creationDate) { - this.creationDate = creationDate; - } - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - public OrganizationType getOrganizationType() { - return organizationType; - } - - public void setOrganizationType(OrganizationType organizationType) { - this.organizationType = organizationType; - } - - public String getSlug() { - return slug; - } - - public void setSlug(String slug) { - this.slug = slug; - } - - public int getUsersQuantity() { - return usersQuantity; - } - - public void setUsersQuantity(int usersQuantity) { - this.usersQuantity = usersQuantity; - } - - public int getProjectsQuantity() { - return projectsQuantity; - } - - public void setProjectsQuantity(int projectsQuantity) { - this.projectsQuantity = projectsQuantity; - } - - public int getLaunchesQuantity() { - return launchesQuantity; - } - - public void setLaunchesQuantity(int launchesQuantity) { - this.launchesQuantity = launchesQuantity; - } - - public LocalDateTime getLastRun() { - return lastRun; - } - - public void setLastRun(LocalDateTime lastRun) { - this.lastRun = lastRun; - } + private Instant lastRun; }