From ee8ed26775dac375300a28ca1c7accbe28b44ad5 Mon Sep 17 00:00:00 2001 From: PeeAyBee Date: Mon, 16 Sep 2024 15:57:45 +0300 Subject: [PATCH] EPMRPP-89095 || Add new scim related fields (#1037) * EPMRPP-89105, EPMRPP-89100, EPMRPP-92451 || Add additional uer fields for scim * EPMRPP-89105, EPMRPP-89100, EPMRPP-92451 || Add active flag for user * EPMRPP-89105, EPMRPP-89100, EPMRPP-92451 || Add active flag for user * EPMRPP-89105, EPMRPP-89100, EPMRPP-92451 || Update user entity * EPMRPP-89105, EPMRPP-89100, EPMRPP-92451 || Update ReportPortalUser * EPMRPP-89105, EPMRPP-89100, EPMRPP-92451 || Add missed active fetcher * EPMRPP-89105, EPMRPP-89100, EPMRPP-92451 || Add fields to base select query * EPMRPP-89095 || Add db migration script * EPMRPP-89095 || Fix unit tests * EPMRPP-89095 || Fix unit tests --- project-properties.gradle | 1 + .../commons/ReportPortalUser.java | 40 ++++-- .../commons/querygen/FilterTarget.java | 12 +- .../constant/GeneralCriteriaConstant.java | 2 + .../constant/UserCriteriaConstant.java | 4 + .../dao/UserRepositoryCustomImpl.java | 11 +- .../reportportal/dao/util/RecordMappers.java | 1 + .../reportportal/dao/util/ResultFetchers.java | 1 + .../ta/reportportal/entity/user/User.java | 130 +++-------------- .../reportportal/jooq/tables/JActivity.java | 2 +- .../jooq/tables/JAnalyticsData.java | 2 +- .../ta/reportportal/jooq/tables/JApiKeys.java | 2 +- .../reportportal/jooq/tables/JAttachment.java | 2 +- .../jooq/tables/JAttachmentDeletion.java | 2 +- .../reportportal/jooq/tables/JDashboard.java | 2 +- .../jooq/tables/JIntegration.java | 2 +- .../jooq/tables/JIntegrationType.java | 2 +- .../ta/reportportal/jooq/tables/JLaunch.java | 2 +- .../ta/reportportal/jooq/tables/JLog.java | 2 +- .../reportportal/jooq/tables/JOnboarding.java | 2 +- .../ta/reportportal/jooq/tables/JProject.java | 2 +- .../jooq/tables/JRestorePasswordBid.java | 2 +- .../reportportal/jooq/tables/JShedlock.java | 2 +- .../jooq/tables/JStaleMaterializedView.java | 2 +- .../reportportal/jooq/tables/JTestItem.java | 2 +- .../jooq/tables/JTestItemResults.java | 2 +- .../ta/reportportal/jooq/tables/JTicket.java | 2 +- .../jooq/tables/JUserCreationBid.java | 14 +- .../ta/reportportal/jooq/tables/JUsers.java | 26 +++- .../records/JUserCreationBidRecord.java | 124 ++++++++-------- .../jooq/tables/records/JUsersRecord.java | 135 ++++++++++++++++-- .../reportportal/dao/UserRepositoryTest.java | 2 + .../migration/V001003__test_project_init.sql | 16 +-- 33 files changed, 316 insertions(+), 239 deletions(-) diff --git a/project-properties.gradle b/project-properties.gradle index 01c569094..893ceed4c 100755 --- a/project-properties.gradle +++ b/project-properties.gradle @@ -83,6 +83,7 @@ project.ext { (migrationsUrl + '/migrations/84_notication_update.up.sql') : 'V084__notication_update.sql', (migrationsUrl + '/migrations/86_add_retention_policy_launch.up.sql') : 'V086__add_retention_policy_launch.sql', (migrationsUrl + '/migrations/88_analytics_data_table.up.sql') : 'V088__analytics_data_table.sql', + (migrationsUrl + '/migrations/90_add_user_fields.up.sql') : 'V090__scim_user_fields.sql', ] excludeTests = [ diff --git a/src/main/java/com/epam/ta/reportportal/commons/ReportPortalUser.java b/src/main/java/com/epam/ta/reportportal/commons/ReportPortalUser.java index 96cec4818..f0ead51a3 100644 --- a/src/main/java/com/epam/ta/reportportal/commons/ReportPortalUser.java +++ b/src/main/java/com/epam/ta/reportportal/commons/ReportPortalUser.java @@ -16,23 +16,22 @@ package com.epam.ta.reportportal.commons; +import static java.util.Optional.ofNullable; + +import com.epam.reportportal.rules.exception.ErrorType; import com.epam.reportportal.rules.exception.ReportPortalException; import com.epam.ta.reportportal.entity.project.ProjectRole; import com.epam.ta.reportportal.entity.user.UserRole; -import com.epam.reportportal.rules.exception.ErrorType; import com.fasterxml.jackson.annotation.JsonProperty; -import org.springframework.security.core.GrantedAuthority; -import org.springframework.security.core.authority.SimpleGrantedAuthority; -import org.springframework.security.core.userdetails.User; -import org.springframework.security.core.userdetails.UserDetails; - import java.io.Serializable; import java.util.Collection; import java.util.Collections; import java.util.Map; import java.util.stream.Collectors; - -import static java.util.Optional.ofNullable; +import org.springframework.security.core.GrantedAuthority; +import org.springframework.security.core.authority.SimpleGrantedAuthority; +import org.springframework.security.core.userdetails.User; +import org.springframework.security.core.userdetails.UserDetails; /** * ReportPortal user representation @@ -41,6 +40,8 @@ */ public class ReportPortalUser extends User { + private boolean active; + private Long userId; private UserRole userRole; @@ -51,18 +52,29 @@ public class ReportPortalUser extends User { private ReportPortalUser(String username, String password, Collection authorities, Long userId, - UserRole role, Map projectDetails, String email) { + UserRole role, Map projectDetails, String email, boolean isActive) { super(username, password, authorities); this.userId = userId; this.userRole = role; this.projectDetails = projectDetails; this.email = email; + this.active = isActive; } public static ReportPortalUserBuilder userBuilder() { return new ReportPortalUserBuilder(); } + @Override + public boolean isEnabled() { + return active; + } + + @Override + public boolean isAccountNonLocked() { + return active; + } + public Long getUserId() { return userId; } @@ -161,6 +173,7 @@ public ProjectDetails build() { public static class ReportPortalUserBuilder { + private boolean active; private String username; private String password; private Long userId; @@ -173,6 +186,11 @@ private ReportPortalUserBuilder() { } + public ReportPortalUserBuilder withActive(boolean active) { + this.active = active; + return this; + } + public ReportPortalUserBuilder withUserName(String userName) { this.username = userName; return this; @@ -193,6 +211,7 @@ public ReportPortalUserBuilder withUserDetails(UserDetails userDetails) { this.username = userDetails.getUsername(); this.password = userDetails.getPassword(); this.authorities = userDetails.getAuthorities(); + this.active = userDetails.isEnabled(); return this; } @@ -217,6 +236,7 @@ public ReportPortalUserBuilder withProjectDetails(Map pr } public ReportPortalUser fromUser(com.epam.ta.reportportal.entity.user.User user) { + this.active = user.isActive(); this.username = user.getLogin(); this.email = user.getPassword(); this.userId = user.getId(); @@ -237,7 +257,7 @@ public ReportPortalUser fromUser(com.epam.ta.reportportal.entity.user.User user) public ReportPortalUser build() { return new ReportPortalUser(username, password, authorities, userId, userRole, projectDetails, - email); + email, active); } } } 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 ebd0f0088..476ac32d7 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 @@ -93,8 +93,10 @@ import static com.epam.ta.reportportal.commons.querygen.constant.TestItemCriteriaConstant.CRITERIA_UNIQUE_ID; import static com.epam.ta.reportportal.commons.querygen.constant.TestItemCriteriaConstant.CRITERIA_UUID; import static com.epam.ta.reportportal.commons.querygen.constant.TestItemCriteriaConstant.RETRY_PARENT; +import static com.epam.ta.reportportal.commons.querygen.constant.UserCriteriaConstant.CRITERIA_ACTIVE; import static com.epam.ta.reportportal.commons.querygen.constant.UserCriteriaConstant.CRITERIA_EMAIL; import static com.epam.ta.reportportal.commons.querygen.constant.UserCriteriaConstant.CRITERIA_EXPIRED; +import static com.epam.ta.reportportal.commons.querygen.constant.UserCriteriaConstant.CRITERIA_EXTERNAL_ID; import static com.epam.ta.reportportal.commons.querygen.constant.UserCriteriaConstant.CRITERIA_FULL_NAME; import static com.epam.ta.reportportal.commons.querygen.constant.UserCriteriaConstant.CRITERIA_LAST_LOGIN; import static com.epam.ta.reportportal.commons.querygen.constant.UserCriteriaConstant.CRITERIA_ROLE; @@ -143,7 +145,6 @@ import com.epam.ta.reportportal.commons.querygen.query.JoinEntity; import com.epam.ta.reportportal.commons.querygen.query.QuerySupplier; import com.epam.ta.reportportal.entity.activity.Activity; -import com.epam.ta.reportportal.entity.activity.EventSubject; import com.epam.ta.reportportal.entity.dashboard.Dashboard; import com.epam.ta.reportportal.entity.enums.LogLevel; import com.epam.ta.reportportal.entity.filter.UserFilter; @@ -166,6 +167,7 @@ import java.util.Collection; import java.util.List; import java.util.Optional; +import java.util.UUID; import java.util.stream.Collectors; import org.jooq.Field; import org.jooq.JoinType; @@ -345,6 +347,11 @@ protected Field idField() { USER_TARGET(User.class, Arrays.asList( new CriteriaHolderBuilder().newBuilder(CRITERIA_ID, USERS.ID, Long.class).get(), + new CriteriaHolderBuilder().newBuilder(CRITERIA_UUID, USERS.UUID, UUID.class).get(), + new CriteriaHolderBuilder().newBuilder(CRITERIA_EXTERNAL_ID, USERS.EXTERNAL_ID, String.class) + .get(), + new CriteriaHolderBuilder().newBuilder(CRITERIA_ACTIVE, USERS.ACTIVE, Boolean.class) + .get(), new CriteriaHolderBuilder().newBuilder(CRITERIA_USER, USERS.LOGIN, String.class).get(), new CriteriaHolderBuilder().newBuilder(CRITERIA_EMAIL, USERS.EMAIL, String.class).get(), new CriteriaHolderBuilder().newBuilder(CRITERIA_FULL_NAME, USERS.FULL_NAME, String.class) @@ -372,6 +379,9 @@ protected Field idField() { protected Collection selectFields() { return Lists.newArrayList(USERS.ID, USERS.LOGIN, + USERS.UUID, + USERS.EXTERNAL_ID, + USERS.ACTIVE, USERS.FULL_NAME, USERS.TYPE, USERS.ATTACHMENT, diff --git a/src/main/java/com/epam/ta/reportportal/commons/querygen/constant/GeneralCriteriaConstant.java b/src/main/java/com/epam/ta/reportportal/commons/querygen/constant/GeneralCriteriaConstant.java index d0ec9e4a9..33c0459d5 100644 --- a/src/main/java/com/epam/ta/reportportal/commons/querygen/constant/GeneralCriteriaConstant.java +++ b/src/main/java/com/epam/ta/reportportal/commons/querygen/constant/GeneralCriteriaConstant.java @@ -24,6 +24,8 @@ public final class GeneralCriteriaConstant { public static final String CRITERIA_ID = "id"; + + public static final String CRITERIA_UUID = "uuid"; public static final String CRITERIA_NAME = "name"; public static final String CRITERIA_SHARED = "shared"; public static final String CRITERIA_OWNER = "owner"; diff --git a/src/main/java/com/epam/ta/reportportal/commons/querygen/constant/UserCriteriaConstant.java b/src/main/java/com/epam/ta/reportportal/commons/querygen/constant/UserCriteriaConstant.java index f2b152924..5c4a6830d 100644 --- a/src/main/java/com/epam/ta/reportportal/commons/querygen/constant/UserCriteriaConstant.java +++ b/src/main/java/com/epam/ta/reportportal/commons/querygen/constant/UserCriteriaConstant.java @@ -21,6 +21,10 @@ */ public final class UserCriteriaConstant { + public static final String CRITERIA_EXTERNAL_ID = "externalId"; + + public static final String CRITERIA_ACTIVE = "active"; + public static final String CRITERIA_USER = "user"; public static final String CRITERIA_ROLE = "role"; public static final String CRITERIA_TYPE = "type"; diff --git a/src/main/java/com/epam/ta/reportportal/dao/UserRepositoryCustomImpl.java b/src/main/java/com/epam/ta/reportportal/dao/UserRepositoryCustomImpl.java index f618feb5d..ef52f2753 100644 --- a/src/main/java/com/epam/ta/reportportal/dao/UserRepositoryCustomImpl.java +++ b/src/main/java/com/epam/ta/reportportal/dao/UserRepositoryCustomImpl.java @@ -25,14 +25,13 @@ import static com.epam.ta.reportportal.jooq.tables.JProjectUser.PROJECT_USER; import static com.epam.ta.reportportal.jooq.tables.JUsers.USERS; +import com.epam.reportportal.rules.exception.ErrorType; +import com.epam.reportportal.rules.exception.ReportPortalException; import com.epam.ta.reportportal.commons.ReportPortalUser; import com.epam.ta.reportportal.commons.querygen.QueryBuilder; import com.epam.ta.reportportal.commons.querygen.Queryable; import com.epam.ta.reportportal.entity.project.ProjectRole; import com.epam.ta.reportportal.entity.user.User; -import com.epam.reportportal.rules.exception.ReportPortalException; - -import com.epam.reportportal.rules.exception.ErrorType; import java.util.List; import java.util.Map; import java.util.Optional; @@ -105,7 +104,7 @@ public Map findUsernamesWithProjectRolesByProjectId(Long pr @Override public Optional findUserDetails(String login) { return Optional.ofNullable(REPORTPORTAL_USER_FETCHER.apply( - dsl.select(USERS.ID, USERS.LOGIN, USERS.PASSWORD, USERS.ROLE, USERS.EMAIL, + dsl.select(USERS.ID, USERS.LOGIN, USERS.PASSWORD, USERS.ROLE, USERS.EMAIL, USERS.ACTIVE, PROJECT_USER.PROJECT_ID, PROJECT_USER.PROJECT_ROLE, PROJECT.NAME ).from(USERS).leftJoin(PROJECT_USER).on(USERS.ID.eq(PROJECT_USER.USER_ID)).leftJoin(PROJECT) .on(PROJECT_USER.PROJECT_ID.eq(PROJECT.ID)).where(USERS.LOGIN.eq(login)).fetch())); @@ -113,13 +112,13 @@ public Optional findUserDetails(String login) { @Override public Optional findReportPortalUser(String login) { - return dsl.select(USERS.ID, USERS.LOGIN, USERS.PASSWORD, USERS.ROLE, USERS.EMAIL).from(USERS) + return dsl.select(USERS.ID, USERS.LOGIN, USERS.PASSWORD, USERS.ROLE, USERS.EMAIL, USERS.ACTIVE).from(USERS) .where(USERS.LOGIN.eq(login)).fetchOptional(REPORT_PORTAL_USER_MAPPER); } @Override public Optional findReportPortalUser(Long userId) { - return dsl.select(USERS.ID, USERS.LOGIN, USERS.PASSWORD, USERS.ROLE, USERS.EMAIL).from(USERS) + return dsl.select(USERS.ID, USERS.LOGIN, USERS.PASSWORD, USERS.ROLE, USERS.EMAIL, USERS.ACTIVE).from(USERS) .where(USERS.ID.eq(userId)).fetchOptional(REPORT_PORTAL_USER_MAPPER); } } 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 aeae7905c..8a96b1988 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 @@ -359,6 +359,7 @@ public class RecordMappers { }; public static final RecordMapper REPORT_PORTAL_USER_MAPPER = r -> ReportPortalUser.userBuilder() + .withActive(r.get(USERS.ACTIVE)) .withUserName(r.get(USERS.LOGIN)) .withPassword(ofNullable(r.get(USERS.PASSWORD)).orElse("")) .withAuthorities(Collections.emptyList()) diff --git a/src/main/java/com/epam/ta/reportportal/dao/util/ResultFetchers.java b/src/main/java/com/epam/ta/reportportal/dao/util/ResultFetchers.java index 373fc6ce9..6b538c6e7 100644 --- a/src/main/java/com/epam/ta/reportportal/dao/util/ResultFetchers.java +++ b/src/main/java/com/epam/ta/reportportal/dao/util/ResultFetchers.java @@ -373,6 +373,7 @@ record -> users.computeIfAbsent(record.get(USERS.ID), key -> record.map(USER_MAP if (!CollectionUtils.isEmpty(records)) { ReportPortalUser user = ReportPortalUser.userBuilder() .withUserName(records.get(0).get(USERS.LOGIN)) + .withActive(records.get(0).get(USERS.ACTIVE)) .withPassword(ofNullable(records.get(0).get(USERS.PASSWORD)).orElse("")) .withAuthorities(Collections.emptyList()) .withUserId(records.get(0).get(USERS.ID)) diff --git a/src/main/java/com/epam/ta/reportportal/entity/user/User.java b/src/main/java/com/epam/ta/reportportal/entity/user/User.java index 2c3e2208a..b360da4f6 100644 --- a/src/main/java/com/epam/ta/reportportal/entity/user/User.java +++ b/src/main/java/com/epam/ta/reportportal/entity/user/User.java @@ -21,6 +21,7 @@ import java.io.Serializable; import java.util.Objects; import java.util.Set; +import java.util.UUID; import javax.persistence.CascadeType; import javax.persistence.Column; import javax.persistence.Entity; @@ -32,12 +33,18 @@ import javax.persistence.Id; import javax.persistence.OneToMany; import javax.persistence.Table; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.Setter; import org.hibernate.annotations.Type; import org.hibernate.annotations.TypeDef; /** * @author Andrei Varabyeu */ +@Getter +@Setter +@NoArgsConstructor @Entity @TypeDef(name = "meta", typeClass = Metadata.class) @Table(name = "users", schema = "public") @@ -50,6 +57,15 @@ public class User implements Serializable { @Column(name = "id", unique = true, nullable = false, precision = 64) private Long id; + @Column(name = "uuid") + private UUID uuid; + + @Column(name = "external_id") + private String externalId; + + @Column(name = "active") + private boolean active; + @Column(name = "login") private String login; @@ -86,105 +102,6 @@ public class User implements Serializable { CascadeType.MERGE, CascadeType.REFRESH}) private Set projects = Sets.newHashSet(); - public User() { - } - - public Long getId() { - return this.id; - } - - public void setId(Long id) { - this.id = id; - } - - public String getLogin() { - return this.login; - } - - public void setLogin(String login) { - this.login = login; - } - - public String getPassword() { - return this.password; - } - - public void setPassword(String password) { - this.password = password; - } - - public String getEmail() { - return this.email; - } - - public void setEmail(String email) { - this.email = email; - } - - public UserRole getRole() { - return role; - } - - public void setRole(UserRole role) { - this.role = role; - } - - public Set getProjects() { - return projects; - } - - public void setProjects(Set projects) { - this.projects = projects; - } - - public String getFullName() { - return this.fullName; - } - - public void setFullName(String fullName) { - this.fullName = fullName; - } - - public boolean isExpired() { - return isExpired; - } - - public void setExpired(boolean expired) { - isExpired = expired; - } - - public String getAttachment() { - return attachment; - } - - public void setAttachment(String attachment) { - this.attachment = attachment; - } - - public String getAttachmentThumbnail() { - return attachmentThumbnail; - } - - public void setAttachmentThumbnail(String attachmentThumbnail) { - this.attachmentThumbnail = attachmentThumbnail; - } - - public UserType getUserType() { - return userType; - } - - public void setUserType(UserType userType) { - this.userType = userType; - } - - public Metadata getMetadata() { - return metadata; - } - - public void setMetadata(Metadata metadata) { - this.metadata = metadata; - } - @Override public boolean equals(Object o) { if (this == o) { @@ -194,21 +111,12 @@ public boolean equals(Object o) { return false; } User user = (User) o; - return isExpired == user.isExpired && Objects.equals(id, user.id) && Objects.equals(login, - user.login) && Objects.equals(password, - user.password - ) && Objects.equals(email, user.email) && role == user.role && Objects.equals(fullName, - user.fullName) && Objects.equals(metadata, - user.metadata - ) && Objects.equals(attachment, user.attachment) && Objects.equals(attachmentThumbnail, - user.attachmentThumbnail) - && userType == user.userType; + return Objects.equals(id, user.id) && Objects.equals(uuid, user.uuid) + && Objects.equals(login, user.login) && Objects.equals(email, user.email); } @Override public int hashCode() { - return Objects.hash(id, login, password, email, role, fullName, isExpired, metadata, attachment, - attachmentThumbnail, userType); + return Objects.hash(id, uuid, login, email); } - } 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 index e631cc433..50d7d788d 100644 --- a/src/main/java/com/epam/ta/reportportal/jooq/tables/JActivity.java +++ b/src/main/java/com/epam/ta/reportportal/jooq/tables/JActivity.java @@ -45,7 +45,7 @@ @SuppressWarnings({ "all", "unchecked", "rawtypes" }) public class JActivity extends TableImpl { - private static final long serialVersionUID = 1836644654; + private static final long serialVersionUID = 946186659; /** * The reference instance of public.activity 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 index 5c7db06a8..72305f755 100644 --- a/src/main/java/com/epam/ta/reportportal/jooq/tables/JAnalyticsData.java +++ b/src/main/java/com/epam/ta/reportportal/jooq/tables/JAnalyticsData.java @@ -45,7 +45,7 @@ @SuppressWarnings({ "all", "unchecked", "rawtypes" }) public class JAnalyticsData extends TableImpl { - private static final long serialVersionUID = -1928480576; + private static final long serialVersionUID = 282420139; /** * The reference instance of public.analytics_data 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 index 19accc2d3..b088e630c 100644 --- a/src/main/java/com/epam/ta/reportportal/jooq/tables/JApiKeys.java +++ b/src/main/java/com/epam/ta/reportportal/jooq/tables/JApiKeys.java @@ -45,7 +45,7 @@ @SuppressWarnings({ "all", "unchecked", "rawtypes" }) public class JApiKeys extends TableImpl { - private static final long serialVersionUID = -1384819830; + private static final long serialVersionUID = -859604491; /** * The reference instance of public.api_keys 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 index a73f6715d..0ab47366d 100644 --- a/src/main/java/com/epam/ta/reportportal/jooq/tables/JAttachment.java +++ b/src/main/java/com/epam/ta/reportportal/jooq/tables/JAttachment.java @@ -44,7 +44,7 @@ @SuppressWarnings({ "all", "unchecked", "rawtypes" }) public class JAttachment extends TableImpl { - private static final long serialVersionUID = -2060499086; + private static final long serialVersionUID = 116419815; /** * The reference instance of public.attachment 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 index 577ddae94..e29fcf614 100644 --- a/src/main/java/com/epam/ta/reportportal/jooq/tables/JAttachmentDeletion.java +++ b/src/main/java/com/epam/ta/reportportal/jooq/tables/JAttachmentDeletion.java @@ -43,7 +43,7 @@ @SuppressWarnings({ "all", "unchecked", "rawtypes" }) public class JAttachmentDeletion extends TableImpl { - private static final long serialVersionUID = 466997915; + private static final long serialVersionUID = 2100753798; /** * The reference instance of public.attachment_deletion 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 index bd61f7b24..3220b56e3 100644 --- a/src/main/java/com/epam/ta/reportportal/jooq/tables/JDashboard.java +++ b/src/main/java/com/epam/ta/reportportal/jooq/tables/JDashboard.java @@ -43,7 +43,7 @@ @SuppressWarnings({ "all", "unchecked", "rawtypes" }) public class JDashboard extends TableImpl { - private static final long serialVersionUID = 1541902098; + private static final long serialVersionUID = 396879431; /** * The reference instance of public.dashboard 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 index 1314b8972..5c3c5ad5a 100644 --- a/src/main/java/com/epam/ta/reportportal/jooq/tables/JIntegration.java +++ b/src/main/java/com/epam/ta/reportportal/jooq/tables/JIntegration.java @@ -45,7 +45,7 @@ @SuppressWarnings({ "all", "unchecked", "rawtypes" }) public class JIntegration extends TableImpl { - private static final long serialVersionUID = 514650851; + private static final long serialVersionUID = -1251108530; /** * The reference instance of public.integration 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 index 6023b11b4..800259f6b 100644 --- a/src/main/java/com/epam/ta/reportportal/jooq/tables/JIntegrationType.java +++ b/src/main/java/com/epam/ta/reportportal/jooq/tables/JIntegrationType.java @@ -47,7 +47,7 @@ @SuppressWarnings({ "all", "unchecked", "rawtypes" }) public class JIntegrationType extends TableImpl { - private static final long serialVersionUID = 1851238148; + private static final long serialVersionUID = 884680057; /** * The reference instance of public.integration_type 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 index d110cb7f0..772dba983 100644 --- a/src/main/java/com/epam/ta/reportportal/jooq/tables/JLaunch.java +++ b/src/main/java/com/epam/ta/reportportal/jooq/tables/JLaunch.java @@ -47,7 +47,7 @@ @SuppressWarnings({ "all", "unchecked", "rawtypes" }) public class JLaunch extends TableImpl { - private static final long serialVersionUID = 1239960135; + private static final long serialVersionUID = -860672068; /** * The reference instance of public.launch 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 index af61fd317..de5e6009a 100644 --- a/src/main/java/com/epam/ta/reportportal/jooq/tables/JLog.java +++ b/src/main/java/com/epam/ta/reportportal/jooq/tables/JLog.java @@ -44,7 +44,7 @@ @SuppressWarnings({ "all", "unchecked", "rawtypes" }) public class JLog extends TableImpl { - private static final long serialVersionUID = -540189389; + private static final long serialVersionUID = 2006866472; /** * The reference instance of public.log diff --git a/src/main/java/com/epam/ta/reportportal/jooq/tables/JOnboarding.java b/src/main/java/com/epam/ta/reportportal/jooq/tables/JOnboarding.java index f53f8518c..ba416953b 100644 --- a/src/main/java/com/epam/ta/reportportal/jooq/tables/JOnboarding.java +++ b/src/main/java/com/epam/ta/reportportal/jooq/tables/JOnboarding.java @@ -44,7 +44,7 @@ @SuppressWarnings({ "all", "unchecked", "rawtypes" }) public class JOnboarding extends TableImpl { - private static final long serialVersionUID = -2033029058; + private static final long serialVersionUID = 1642783657; /** * The reference instance of public.onboarding 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 index 34b593aaf..a45f92e2a 100644 --- a/src/main/java/com/epam/ta/reportportal/jooq/tables/JProject.java +++ b/src/main/java/com/epam/ta/reportportal/jooq/tables/JProject.java @@ -45,7 +45,7 @@ @SuppressWarnings({ "all", "unchecked", "rawtypes" }) public class JProject extends TableImpl { - private static final long serialVersionUID = -1619671757; + private static final long serialVersionUID = 1861656734; /** * The reference instance of public.project 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 index e064cf1f1..34391445b 100644 --- a/src/main/java/com/epam/ta/reportportal/jooq/tables/JRestorePasswordBid.java +++ b/src/main/java/com/epam/ta/reportportal/jooq/tables/JRestorePasswordBid.java @@ -43,7 +43,7 @@ @SuppressWarnings({ "all", "unchecked", "rawtypes" }) public class JRestorePasswordBid extends TableImpl { - private static final long serialVersionUID = 422602805; + private static final long serialVersionUID = -1448430102; /** * The reference instance of public.restore_password_bid 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 index 0f336f1cb..dd933c549 100644 --- a/src/main/java/com/epam/ta/reportportal/jooq/tables/JShedlock.java +++ b/src/main/java/com/epam/ta/reportportal/jooq/tables/JShedlock.java @@ -43,7 +43,7 @@ @SuppressWarnings({ "all", "unchecked", "rawtypes" }) public class JShedlock extends TableImpl { - private static final long serialVersionUID = -2077089538; + private static final long serialVersionUID = -1932515469; /** * The reference instance of public.shedlock 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 index 5b4f45e1f..699a4693f 100644 --- a/src/main/java/com/epam/ta/reportportal/jooq/tables/JStaleMaterializedView.java +++ b/src/main/java/com/epam/ta/reportportal/jooq/tables/JStaleMaterializedView.java @@ -44,7 +44,7 @@ @SuppressWarnings({ "all", "unchecked", "rawtypes" }) public class JStaleMaterializedView extends TableImpl { - private static final long serialVersionUID = -70601346; + private static final long serialVersionUID = 581510835; /** * The reference instance of public.stale_materialized_view 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 index 110101644..23453aaf4 100644 --- a/src/main/java/com/epam/ta/reportportal/jooq/tables/JTestItem.java +++ b/src/main/java/com/epam/ta/reportportal/jooq/tables/JTestItem.java @@ -45,7 +45,7 @@ @SuppressWarnings({ "all", "unchecked", "rawtypes" }) public class JTestItem extends TableImpl { - private static final long serialVersionUID = 1074590849; + private static final long serialVersionUID = 767540278; /** * The reference instance of public.test_item 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 index 09b8e98c0..8f0c8bf7d 100644 --- a/src/main/java/com/epam/ta/reportportal/jooq/tables/JTestItemResults.java +++ b/src/main/java/com/epam/ta/reportportal/jooq/tables/JTestItemResults.java @@ -44,7 +44,7 @@ @SuppressWarnings({ "all", "unchecked", "rawtypes" }) public class JTestItemResults extends TableImpl { - private static final long serialVersionUID = -648299127; + private static final long serialVersionUID = -722704972; /** * The reference instance of public.test_item_results 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 index b6d38d01e..9d47ce94a 100644 --- a/src/main/java/com/epam/ta/reportportal/jooq/tables/JTicket.java +++ b/src/main/java/com/epam/ta/reportportal/jooq/tables/JTicket.java @@ -44,7 +44,7 @@ @SuppressWarnings({ "all", "unchecked", "rawtypes" }) public class JTicket extends TableImpl { - private static final long serialVersionUID = -914734476; + private static final long serialVersionUID = -1169544097; /** * The reference instance of public.ticket 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 index 189eb9623..9949b233b 100644 --- a/src/main/java/com/epam/ta/reportportal/jooq/tables/JUserCreationBid.java +++ b/src/main/java/com/epam/ta/reportportal/jooq/tables/JUserCreationBid.java @@ -44,7 +44,7 @@ @SuppressWarnings({ "all", "unchecked", "rawtypes" }) public class JUserCreationBid extends TableImpl { - private static final long serialVersionUID = -303475788; + private static final long serialVersionUID = -842162999; /** * The reference instance of public.user_creation_bid @@ -74,6 +74,11 @@ public Class getRecordType() { */ public final TableField EMAIL = createField(DSL.name("email"), org.jooq.impl.SQLDataType.VARCHAR.nullable(false), this, ""); + /** + * The column public.user_creation_bid.role. + */ + public final TableField ROLE = createField(DSL.name("role"), org.jooq.impl.SQLDataType.VARCHAR.nullable(false), this, ""); + /** * The column public.user_creation_bid.inviting_user_id. */ @@ -89,11 +94,6 @@ public Class getRecordType() { */ public final TableField METADATA = createField(DSL.name("metadata"), org.jooq.impl.SQLDataType.JSONB, this, ""); - /** - * The column public.user_creation_bid.role. - */ - public final TableField ROLE = createField(DSL.name("role"), org.jooq.impl.SQLDataType.VARCHAR.nullable(false), this, ""); - /** * Create a public.user_creation_bid table reference */ @@ -187,7 +187,7 @@ public JUserCreationBid rename(Name name) { // ------------------------------------------------------------------------- @Override - public Row7 fieldsRow() { + public Row7 fieldsRow() { return (Row7) super.fieldsRow(); } } diff --git a/src/main/java/com/epam/ta/reportportal/jooq/tables/JUsers.java b/src/main/java/com/epam/ta/reportportal/jooq/tables/JUsers.java index 64bfc9264..b3693cc30 100644 --- a/src/main/java/com/epam/ta/reportportal/jooq/tables/JUsers.java +++ b/src/main/java/com/epam/ta/reportportal/jooq/tables/JUsers.java @@ -11,6 +11,7 @@ import java.util.Arrays; import java.util.List; +import java.util.UUID; import javax.annotation.processing.Generated; @@ -21,7 +22,7 @@ import org.jooq.JSONB; import org.jooq.Name; import org.jooq.Record; -import org.jooq.Row11; +import org.jooq.Row14; import org.jooq.Schema; import org.jooq.Table; import org.jooq.TableField; @@ -43,7 +44,7 @@ @SuppressWarnings({ "all", "unchecked", "rawtypes" }) public class JUsers extends TableImpl { - private static final long serialVersionUID = 2058736098; + private static final long serialVersionUID = 541188090; /** * The reference instance of public.users @@ -113,6 +114,21 @@ public Class getRecordType() { */ public final TableField METADATA = createField(DSL.name("metadata"), org.jooq.impl.SQLDataType.JSONB, this, ""); + /** + * The column public.users.uuid. + */ + public final TableField UUID = createField(DSL.name("uuid"), org.jooq.impl.SQLDataType.UUID.nullable(false).defaultValue(org.jooq.impl.DSL.field("gen_random_uuid()", org.jooq.impl.SQLDataType.UUID)), this, ""); + + /** + * The column public.users.external_id. + */ + public final TableField EXTERNAL_ID = createField(DSL.name("external_id"), org.jooq.impl.SQLDataType.VARCHAR, this, ""); + + /** + * The column public.users.active. + */ + public final TableField ACTIVE = createField(DSL.name("active"), org.jooq.impl.SQLDataType.BOOLEAN.defaultValue(org.jooq.impl.DSL.field("true", org.jooq.impl.SQLDataType.BOOLEAN)), this, ""); + /** * Create a public.users table reference */ @@ -198,11 +214,11 @@ public JUsers rename(Name name) { } // ------------------------------------------------------------------------- - // Row11 type methods + // Row14 type methods // ------------------------------------------------------------------------- @Override - public Row11 fieldsRow() { - return (Row11) super.fieldsRow(); + public Row14 fieldsRow() { + return (Row14) super.fieldsRow(); } } diff --git a/src/main/java/com/epam/ta/reportportal/jooq/tables/records/JUserCreationBidRecord.java b/src/main/java/com/epam/ta/reportportal/jooq/tables/records/JUserCreationBidRecord.java index 1596be11d..c12dab998 100644 --- a/src/main/java/com/epam/ta/reportportal/jooq/tables/records/JUserCreationBidRecord.java +++ b/src/main/java/com/epam/ta/reportportal/jooq/tables/records/JUserCreationBidRecord.java @@ -29,9 +29,9 @@ comments = "This class is generated by jOOQ" ) @SuppressWarnings({ "all", "unchecked", "rawtypes" }) -public class JUserCreationBidRecord extends UpdatableRecordImpl implements Record7 { +public class JUserCreationBidRecord extends UpdatableRecordImpl implements Record7 { - private static final long serialVersionUID = -1051909294; + private static final long serialVersionUID = 333422022; /** * Setter for public.user_creation_bid.uuid. @@ -76,59 +76,59 @@ public String getEmail() { } /** - * Setter for public.user_creation_bid.inviting_user_id. + * Setter for public.user_creation_bid.role. */ - public void setInvitingUserId(Long value) { + public void setRole(String value) { set(3, value); } /** - * Getter for public.user_creation_bid.inviting_user_id. + * Getter for public.user_creation_bid.role. */ - public Long getInvitingUserId() { - return (Long) get(3); + public String getRole() { + return (String) get(3); } /** - * Setter for public.user_creation_bid.project_name. + * Setter for public.user_creation_bid.inviting_user_id. */ - public void setProjectName(String value) { + public void setInvitingUserId(Long value) { set(4, value); } /** - * Getter for public.user_creation_bid.project_name. + * Getter for public.user_creation_bid.inviting_user_id. */ - public String getProjectName() { - return (String) get(4); + public Long getInvitingUserId() { + return (Long) get(4); } /** - * Setter for public.user_creation_bid.metadata. + * Setter for public.user_creation_bid.project_name. */ - public void setMetadata(JSONB value) { + public void setProjectName(String value) { set(5, value); } /** - * Getter for public.user_creation_bid.metadata. + * Getter for public.user_creation_bid.project_name. */ - public JSONB getMetadata() { - return (JSONB) get(5); + public String getProjectName() { + return (String) get(5); } /** - * Setter for public.user_creation_bid.role. + * Setter for public.user_creation_bid.metadata. */ - public void setRole(String value) { + public void setMetadata(JSONB value) { set(6, value); } /** - * Getter for public.user_creation_bid.role. + * Getter for public.user_creation_bid.metadata. */ - public String getRole() { - return (String) get(6); + public JSONB getMetadata() { + return (JSONB) get(6); } // ------------------------------------------------------------------------- @@ -145,12 +145,12 @@ public Record1 key() { // ------------------------------------------------------------------------- @Override - public Row7 fieldsRow() { + public Row7 fieldsRow() { return (Row7) super.fieldsRow(); } @Override - public Row7 valuesRow() { + public Row7 valuesRow() { return (Row7) super.valuesRow(); } @@ -170,23 +170,23 @@ public Field field3() { } @Override - public Field field4() { - return JUserCreationBid.USER_CREATION_BID.INVITING_USER_ID; + public Field field4() { + return JUserCreationBid.USER_CREATION_BID.ROLE; } @Override - public Field field5() { - return JUserCreationBid.USER_CREATION_BID.PROJECT_NAME; + public Field field5() { + return JUserCreationBid.USER_CREATION_BID.INVITING_USER_ID; } @Override - public Field field6() { - return JUserCreationBid.USER_CREATION_BID.METADATA; + public Field field6() { + return JUserCreationBid.USER_CREATION_BID.PROJECT_NAME; } @Override - public Field field7() { - return JUserCreationBid.USER_CREATION_BID.ROLE; + public Field field7() { + return JUserCreationBid.USER_CREATION_BID.METADATA; } @Override @@ -205,23 +205,23 @@ public String component3() { } @Override - public Long component4() { - return getInvitingUserId(); + public String component4() { + return getRole(); } @Override - public String component5() { - return getProjectName(); + public Long component5() { + return getInvitingUserId(); } @Override - public JSONB component6() { - return getMetadata(); + public String component6() { + return getProjectName(); } @Override - public String component7() { - return getRole(); + public JSONB component7() { + return getMetadata(); } @Override @@ -240,23 +240,23 @@ public String value3() { } @Override - public Long value4() { - return getInvitingUserId(); + public String value4() { + return getRole(); } @Override - public String value5() { - return getProjectName(); + public Long value5() { + return getInvitingUserId(); } @Override - public JSONB value6() { - return getMetadata(); + public String value6() { + return getProjectName(); } @Override - public String value7() { - return getRole(); + public JSONB value7() { + return getMetadata(); } @Override @@ -278,31 +278,31 @@ public JUserCreationBidRecord value3(String value) { } @Override - public JUserCreationBidRecord value4(Long value) { - setInvitingUserId(value); + public JUserCreationBidRecord value4(String value) { + setRole(value); return this; } @Override - public JUserCreationBidRecord value5(String value) { - setProjectName(value); + public JUserCreationBidRecord value5(Long value) { + setInvitingUserId(value); return this; } @Override - public JUserCreationBidRecord value6(JSONB value) { - setMetadata(value); + public JUserCreationBidRecord value6(String value) { + setProjectName(value); return this; } @Override - public JUserCreationBidRecord value7(String value) { - setRole(value); + public JUserCreationBidRecord value7(JSONB value) { + setMetadata(value); return this; } @Override - public JUserCreationBidRecord values(String value1, Instant value2, String value3, Long value4, String value5, JSONB value6, String value7) { + public JUserCreationBidRecord values(String value1, Instant value2, String value3, String value4, Long value5, String value6, JSONB value7) { value1(value1); value2(value2); value3(value3); @@ -327,15 +327,15 @@ public JUserCreationBidRecord() { /** * Create a detached, initialised JUserCreationBidRecord */ - public JUserCreationBidRecord(String uuid, Instant lastModified, String email, Long invitingUserId, String projectName, JSONB metadata, String role) { + public JUserCreationBidRecord(String uuid, Instant lastModified, String email, String role, Long invitingUserId, String projectName, JSONB metadata) { super(JUserCreationBid.USER_CREATION_BID); set(0, uuid); set(1, lastModified); set(2, email); - set(3, invitingUserId); - set(4, projectName); - set(5, metadata); - set(6, role); + set(3, role); + set(4, invitingUserId); + set(5, projectName); + set(6, metadata); } } diff --git a/src/main/java/com/epam/ta/reportportal/jooq/tables/records/JUsersRecord.java b/src/main/java/com/epam/ta/reportportal/jooq/tables/records/JUsersRecord.java index 4dffd9558..67c72573c 100644 --- a/src/main/java/com/epam/ta/reportportal/jooq/tables/records/JUsersRecord.java +++ b/src/main/java/com/epam/ta/reportportal/jooq/tables/records/JUsersRecord.java @@ -6,13 +6,15 @@ import com.epam.ta.reportportal.jooq.tables.JUsers; +import java.util.UUID; + import javax.annotation.processing.Generated; import org.jooq.Field; import org.jooq.JSONB; import org.jooq.Record1; -import org.jooq.Record11; -import org.jooq.Row11; +import org.jooq.Record14; +import org.jooq.Row14; import org.jooq.impl.UpdatableRecordImpl; @@ -27,9 +29,9 @@ comments = "This class is generated by jOOQ" ) @SuppressWarnings({ "all", "unchecked", "rawtypes" }) -public class JUsersRecord extends UpdatableRecordImpl implements Record11 { +public class JUsersRecord extends UpdatableRecordImpl implements Record14 { - private static final long serialVersionUID = -329787849; + private static final long serialVersionUID = -549002462; /** * Setter for public.users.id. @@ -185,6 +187,48 @@ public JSONB getMetadata() { return (JSONB) get(10); } + /** + * Setter for public.users.uuid. + */ + public void setUuid(UUID value) { + set(11, value); + } + + /** + * Getter for public.users.uuid. + */ + public UUID getUuid() { + return (UUID) get(11); + } + + /** + * Setter for public.users.external_id. + */ + public void setExternalId(String value) { + set(12, value); + } + + /** + * Getter for public.users.external_id. + */ + public String getExternalId() { + return (String) get(12); + } + + /** + * Setter for public.users.active. + */ + public void setActive(Boolean value) { + set(13, value); + } + + /** + * Getter for public.users.active. + */ + public Boolean getActive() { + return (Boolean) get(13); + } + // ------------------------------------------------------------------------- // Primary key information // ------------------------------------------------------------------------- @@ -195,17 +239,17 @@ public Record1 key() { } // ------------------------------------------------------------------------- - // Record11 type implementation + // Record14 type implementation // ------------------------------------------------------------------------- @Override - public Row11 fieldsRow() { - return (Row11) super.fieldsRow(); + public Row14 fieldsRow() { + return (Row14) super.fieldsRow(); } @Override - public Row11 valuesRow() { - return (Row11) super.valuesRow(); + public Row14 valuesRow() { + return (Row14) super.valuesRow(); } @Override @@ -263,6 +307,21 @@ public Field field11() { return JUsers.USERS.METADATA; } + @Override + public Field field12() { + return JUsers.USERS.UUID; + } + + @Override + public Field field13() { + return JUsers.USERS.EXTERNAL_ID; + } + + @Override + public Field field14() { + return JUsers.USERS.ACTIVE; + } + @Override public Long component1() { return getId(); @@ -318,6 +377,21 @@ public JSONB component11() { return getMetadata(); } + @Override + public UUID component12() { + return getUuid(); + } + + @Override + public String component13() { + return getExternalId(); + } + + @Override + public Boolean component14() { + return getActive(); + } + @Override public Long value1() { return getId(); @@ -373,6 +447,21 @@ public JSONB value11() { return getMetadata(); } + @Override + public UUID value12() { + return getUuid(); + } + + @Override + public String value13() { + return getExternalId(); + } + + @Override + public Boolean value14() { + return getActive(); + } + @Override public JUsersRecord value1(Long value) { setId(value); @@ -440,7 +529,25 @@ public JUsersRecord value11(JSONB value) { } @Override - public JUsersRecord values(Long value1, String value2, String value3, String value4, String value5, String value6, String value7, String value8, Boolean value9, String value10, JSONB value11) { + public JUsersRecord value12(UUID value) { + setUuid(value); + return this; + } + + @Override + public JUsersRecord value13(String value) { + setExternalId(value); + return this; + } + + @Override + public JUsersRecord value14(Boolean value) { + setActive(value); + return this; + } + + @Override + public JUsersRecord values(Long value1, String value2, String value3, String value4, String value5, String value6, String value7, String value8, Boolean value9, String value10, JSONB value11, UUID value12, String value13, Boolean value14) { value1(value1); value2(value2); value3(value3); @@ -452,6 +559,9 @@ public JUsersRecord values(Long value1, String value2, String value3, String val value9(value9); value10(value10); value11(value11); + value12(value12); + value13(value13); + value14(value14); return this; } @@ -469,7 +579,7 @@ public JUsersRecord() { /** * Create a detached, initialised JUsersRecord */ - public JUsersRecord(Long id, String login, String password, String email, String attachment, String attachmentThumbnail, String role, String type, Boolean expired, String fullName, JSONB metadata) { + public JUsersRecord(Long id, String login, String password, String email, String attachment, String attachmentThumbnail, String role, String type, Boolean expired, String fullName, JSONB metadata, UUID uuid, String externalId, Boolean active) { super(JUsers.USERS); set(0, id); @@ -483,5 +593,8 @@ public JUsersRecord(Long id, String login, String password, String email, String set(8, expired); set(9, fullName); set(10, metadata); + set(11, uuid); + set(12, externalId); + set(13, active); } } diff --git a/src/test/java/com/epam/ta/reportportal/dao/UserRepositoryTest.java b/src/test/java/com/epam/ta/reportportal/dao/UserRepositoryTest.java index c3b3ffb8b..b4d14355b 100644 --- a/src/test/java/com/epam/ta/reportportal/dao/UserRepositoryTest.java +++ b/src/test/java/com/epam/ta/reportportal/dao/UserRepositoryTest.java @@ -50,6 +50,7 @@ import java.util.Map; import java.util.Optional; import java.util.Set; +import java.util.UUID; import org.assertj.core.util.Sets; import org.hamcrest.Matchers; import org.jooq.Operator; @@ -342,6 +343,7 @@ void createUserTest() { User reg = new User(); reg.setEmail("email.com"); + reg.setUuid(UUID.randomUUID()); reg.setFullName("test"); reg.setLogin("created"); reg.setPassword("new"); diff --git a/src/test/resources/db/migration/V001003__test_project_init.sql b/src/test/resources/db/migration/V001003__test_project_init.sql index 2c66ba0a2..2d9c54823 100644 --- a/src/test/resources/db/migration/V001003__test_project_init.sql +++ b/src/test/resources/db/migration/V001003__test_project_init.sql @@ -14,37 +14,37 @@ BEGIN VALUES ('millennium_falcon', 'INTERNAL', now()); falcon := (SELECT currval(pg_get_serial_sequence('project', 'id'))); - INSERT INTO users (login, password, email, role, type, full_name, expired, metadata) + INSERT INTO users (login, password, email, role, type, full_name, expired, metadata, uuid) VALUES ('han_solo', '3531f6f9b0538fd347f4c95bd2af9d01', 'han_solo@domain.com', 'ADMINISTRATOR', 'INTERNAL', 'Han Solo', FALSE, - '{"metadata": {"last_login": "1551187023768"}}'); + '{"metadata": {"last_login": "1551187023768"}}', gen_random_uuid()); han_solo := (SELECT currval(pg_get_serial_sequence('users', 'id'))); INSERT INTO project_user (user_id, project_id, project_role) VALUES (han_solo, falcon, 'PROJECT_MANAGER'); - INSERT INTO users (login, password, email, role, type, full_name, expired, metadata) + INSERT INTO users (login, password, email, role, type, full_name, expired, metadata, uuid) VALUES ('chubaka', '601c4731aeff3b84f76672ad024bb2a0', 'chybaka@domain.com', 'USER', 'INTERNAL', 'Chubaka', FALSE, - '{"metadata": {"last_login": "1551187023768"}}'); + '{"metadata": {"last_login": "1551187023768"}}', gen_random_uuid()); chubaka := (SELECT currval(pg_get_serial_sequence('users', 'id'))); INSERT INTO project_user (user_id, project_id, project_role) VALUES (chubaka, falcon, 'MEMBER'); - INSERT INTO users (login, password, email, role, type, full_name, expired, metadata) + INSERT INTO users (login, password, email, role, type, full_name, expired, metadata, uuid) VALUES ('fake_chubaka', '601c4731aeff3b84f76672ad024bb2a0', 'chybakafake@domain.com', 'USER', 'INTERNAL', 'Chubaka Fake', FALSE, - '{"metadata": {"last_login": "1551187023768"}}'); + '{"metadata": {"last_login": "1551187023768"}}', gen_random_uuid()); fake_chubaka := (SELECT currval(pg_get_serial_sequence('users', 'id'))); INSERT INTO project_user (user_id, project_id, project_role) VALUES (fake_chubaka, falcon, 'MEMBER'); - INSERT INTO users (login, password, email, role, type, full_name, expired, metadata) + INSERT INTO users (login, password, email, role, type, full_name, expired, metadata, uuid) VALUES ('ch_not_assigned', '601c4731aeff3b84f76672ad024bb2a0', 'ch_not_assigned@domain.com', 'USER', 'INTERNAL', 'Ch Not Assigned', FALSE, - '{"metadata": {"last_login": "1551187023768"}}'); + '{"metadata": {"last_login": "1551187023768"}}', gen_random_uuid()); INSERT INTO issue_type_project (project_id, issue_type_id) VALUES (falcon, 1),