From 9602b5e0955f0fc50c6d508b6c0988e83846eddb Mon Sep 17 00:00:00 2001 From: siarhei_hrabko Date: Tue, 17 Sep 2024 09:00:10 +0300 Subject: [PATCH 1/4] EPMRPP-93599 update user_creation_bid models --- project-properties.gradle | 2 +- .../com/epam/ta/reportportal/jooq/Keys.java | 2 - .../jooq/tables/JUserCreationBid.java | 38 +--- .../records/JUserCreationBidRecord.java | 200 +++--------------- 4 files changed, 32 insertions(+), 210 deletions(-) diff --git a/project-properties.gradle b/project-properties.gradle index 4fd512bdb..595f37b21 100755 --- a/project-properties.gradle +++ b/project-properties.gradle @@ -10,7 +10,7 @@ project.ext { releaseMode = project.hasProperty("releaseMode") hasDBSchema = project.hasProperty("DB_SCHEMA_POSTGRES") scriptsUrl = commonScriptsUrl + (releaseMode ? getProperty('scripts.version') : 'develop') - migrationsUrl = migrationsScriptsUrl + (releaseMode ? getProperty('migrations.version') : 'feature/orgs') + migrationsUrl = migrationsScriptsUrl + (releaseMode ? getProperty('migrations.version') : 'EPMRPP-93599-bid') //TODO refactor with archive download testScriptsSrc = [ (migrationsUrl + '/migrations/0_extensions.up.sql') : 'V001__extensions.sql', diff --git a/src/main/java/com/epam/ta/reportportal/jooq/Keys.java b/src/main/java/com/epam/ta/reportportal/jooq/Keys.java index 776b171c1..8c9eb9cd8 100644 --- a/src/main/java/com/epam/ta/reportportal/jooq/Keys.java +++ b/src/main/java/com/epam/ta/reportportal/jooq/Keys.java @@ -312,7 +312,6 @@ public class Keys { public static final ForeignKey TEST_ITEM__TEST_ITEM_LAUNCH_ID_FKEY = ForeignKeys0.TEST_ITEM__TEST_ITEM_LAUNCH_ID_FKEY; public static final ForeignKey TEST_ITEM_RESULTS__TEST_ITEM_RESULTS_RESULT_ID_FKEY = ForeignKeys0.TEST_ITEM_RESULTS__TEST_ITEM_RESULTS_RESULT_ID_FKEY; public static final ForeignKey USER_CREATION_BID__USER_CREATION_BID_INVITING_USER_ID_FKEY = ForeignKeys0.USER_CREATION_BID__USER_CREATION_BID_INVITING_USER_ID_FKEY; - public static final ForeignKey USER_CREATION_BID__USER_CREATION_BID_ORGANIZATION_ID_FKEY = ForeignKeys0.USER_CREATION_BID__USER_CREATION_BID_ORGANIZATION_ID_FKEY; public static final ForeignKey USER_PREFERENCE__USER_PREFERENCE_PROJECT_ID_FKEY = ForeignKeys0.USER_PREFERENCE__USER_PREFERENCE_PROJECT_ID_FKEY; public static final ForeignKey USER_PREFERENCE__USER_PREFERENCE_USER_ID_FKEY = ForeignKeys0.USER_PREFERENCE__USER_PREFERENCE_USER_ID_FKEY; public static final ForeignKey USER_PREFERENCE__USER_PREFERENCE_FILTER_ID_FKEY = ForeignKeys0.USER_PREFERENCE__USER_PREFERENCE_FILTER_ID_FKEY; @@ -492,7 +491,6 @@ private static class ForeignKeys0 { public static final ForeignKey TEST_ITEM__TEST_ITEM_LAUNCH_ID_FKEY = Internal.createForeignKey(com.epam.ta.reportportal.jooq.Keys.LAUNCH_PK, JTestItem.TEST_ITEM, "test_item__test_item_launch_id_fkey", JTestItem.TEST_ITEM.LAUNCH_ID); public static final ForeignKey TEST_ITEM_RESULTS__TEST_ITEM_RESULTS_RESULT_ID_FKEY = Internal.createForeignKey(com.epam.ta.reportportal.jooq.Keys.TEST_ITEM_PK, JTestItemResults.TEST_ITEM_RESULTS, "test_item_results__test_item_results_result_id_fkey", JTestItemResults.TEST_ITEM_RESULTS.RESULT_ID); public static final ForeignKey USER_CREATION_BID__USER_CREATION_BID_INVITING_USER_ID_FKEY = Internal.createForeignKey(com.epam.ta.reportportal.jooq.Keys.USERS_PK, JUserCreationBid.USER_CREATION_BID, "user_creation_bid__user_creation_bid_inviting_user_id_fkey", JUserCreationBid.USER_CREATION_BID.INVITING_USER_ID); - public static final ForeignKey USER_CREATION_BID__USER_CREATION_BID_ORGANIZATION_ID_FKEY = Internal.createForeignKey(com.epam.ta.reportportal.jooq.Keys.ORGANIZATION_PKEY, JUserCreationBid.USER_CREATION_BID, "user_creation_bid__user_creation_bid_organization_id_fkey", JUserCreationBid.USER_CREATION_BID.ORGANIZATION_ID); public static final ForeignKey USER_PREFERENCE__USER_PREFERENCE_PROJECT_ID_FKEY = Internal.createForeignKey(com.epam.ta.reportportal.jooq.Keys.PROJECT_PK, JUserPreference.USER_PREFERENCE, "user_preference__user_preference_project_id_fkey", JUserPreference.USER_PREFERENCE.PROJECT_ID); public static final ForeignKey USER_PREFERENCE__USER_PREFERENCE_USER_ID_FKEY = Internal.createForeignKey(com.epam.ta.reportportal.jooq.Keys.USERS_PK, JUserPreference.USER_PREFERENCE, "user_preference__user_preference_user_id_fkey", JUserPreference.USER_PREFERENCE.USER_ID); public static final ForeignKey USER_PREFERENCE__USER_PREFERENCE_FILTER_ID_FKEY = Internal.createForeignKey(com.epam.ta.reportportal.jooq.Keys.FILTER_PKEY, JUserPreference.USER_PREFERENCE, "user_preference__user_preference_filter_id_fkey", JUserPreference.USER_PREFERENCE.FILTER_ID); 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 2e5ad7124..26e16c509 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 @@ -8,8 +8,6 @@ import com.epam.ta.reportportal.jooq.Indexes; import com.epam.ta.reportportal.jooq.JPublic; import com.epam.ta.reportportal.jooq.Keys; -import com.epam.ta.reportportal.jooq.enums.JOrganizationRoleEnum; -import com.epam.ta.reportportal.jooq.enums.JProjectRoleEnum; import com.epam.ta.reportportal.jooq.tables.records.JUserCreationBidRecord; import java.time.Instant; @@ -24,7 +22,7 @@ import org.jooq.JSONB; import org.jooq.Name; import org.jooq.Record; -import org.jooq.Row9; +import org.jooq.Row5; import org.jooq.Schema; import org.jooq.Table; import org.jooq.TableField; @@ -46,7 +44,7 @@ @SuppressWarnings({ "all", "unchecked", "rawtypes" }) public class JUserCreationBid extends TableImpl { - private static final long serialVersionUID = 935947735; + private static final long serialVersionUID = 1724494870; /** * The reference instance of public.user_creation_bid @@ -76,36 +74,16 @@ 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).asEnumDataType(com.epam.ta.reportportal.jooq.enums.JProjectRoleEnum.class), this, ""); - /** * The column public.user_creation_bid.inviting_user_id. */ public final TableField INVITING_USER_ID = createField(DSL.name("inviting_user_id"), org.jooq.impl.SQLDataType.BIGINT, this, ""); - /** - * The column public.user_creation_bid.project_key. - */ - public final TableField PROJECT_KEY = createField(DSL.name("project_key"), org.jooq.impl.SQLDataType.VARCHAR.nullable(false), this, ""); - /** * The column public.user_creation_bid.metadata. */ public final TableField METADATA = createField(DSL.name("metadata"), org.jooq.impl.SQLDataType.JSONB, this, ""); - /** - * The column public.user_creation_bid.organization_id. - */ - public final TableField ORGANIZATION_ID = createField(DSL.name("organization_id"), org.jooq.impl.SQLDataType.BIGINT.nullable(false), this, ""); - - /** - * The column public.user_creation_bid.organization_role. - */ - public final TableField ORGANIZATION_ROLE = createField(DSL.name("organization_role"), org.jooq.impl.SQLDataType.VARCHAR.nullable(false).asEnumDataType(com.epam.ta.reportportal.jooq.enums.JOrganizationRoleEnum.class), this, ""); - /** * Create a public.user_creation_bid table reference */ @@ -161,17 +139,13 @@ public List> getKeys() { @Override public List> getReferences() { - return Arrays.>asList(Keys.USER_CREATION_BID__USER_CREATION_BID_INVITING_USER_ID_FKEY, Keys.USER_CREATION_BID__USER_CREATION_BID_ORGANIZATION_ID_FKEY); + return Arrays.>asList(Keys.USER_CREATION_BID__USER_CREATION_BID_INVITING_USER_ID_FKEY); } public JUsers users() { return new JUsers(this, Keys.USER_CREATION_BID__USER_CREATION_BID_INVITING_USER_ID_FKEY); } - public JOrganization organization() { - return new JOrganization(this, Keys.USER_CREATION_BID__USER_CREATION_BID_ORGANIZATION_ID_FKEY); - } - @Override public JUserCreationBid as(String alias) { return new JUserCreationBid(DSL.name(alias), this); @@ -199,11 +173,11 @@ public JUserCreationBid rename(Name name) { } // ------------------------------------------------------------------------- - // Row9 type methods + // Row5 type methods // ------------------------------------------------------------------------- @Override - public Row9 fieldsRow() { - return (Row9) super.fieldsRow(); + public Row5 fieldsRow() { + return (Row5) 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 e36d3ae30..884434689 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 @@ -4,8 +4,6 @@ package com.epam.ta.reportportal.jooq.tables.records; -import com.epam.ta.reportportal.jooq.enums.JOrganizationRoleEnum; -import com.epam.ta.reportportal.jooq.enums.JProjectRoleEnum; import com.epam.ta.reportportal.jooq.tables.JUserCreationBid; import java.time.Instant; @@ -15,8 +13,8 @@ import org.jooq.Field; import org.jooq.JSONB; import org.jooq.Record1; -import org.jooq.Record9; -import org.jooq.Row9; +import org.jooq.Record5; +import org.jooq.Row5; import org.jooq.impl.UpdatableRecordImpl; @@ -31,9 +29,9 @@ comments = "This class is generated by jOOQ" ) @SuppressWarnings({ "all", "unchecked", "rawtypes" }) -public class JUserCreationBidRecord extends UpdatableRecordImpl implements Record9 { +public class JUserCreationBidRecord extends UpdatableRecordImpl implements Record5 { - private static final long serialVersionUID = -849559566; + private static final long serialVersionUID = -1036772641; /** * Setter for public.user_creation_bid.uuid. @@ -77,88 +75,32 @@ public String getEmail() { return (String) get(2); } - /** - * Setter for public.user_creation_bid.role. - */ - public void setRole(JProjectRoleEnum value) { - set(3, value); - } - - /** - * Getter for public.user_creation_bid.role. - */ - public JProjectRoleEnum getRole() { - return (JProjectRoleEnum) get(3); - } - /** * Setter for public.user_creation_bid.inviting_user_id. */ public void setInvitingUserId(Long value) { - set(4, value); + set(3, value); } /** * Getter for public.user_creation_bid.inviting_user_id. */ public Long getInvitingUserId() { - return (Long) get(4); - } - - /** - * Setter for public.user_creation_bid.project_key. - */ - public void setProjectKey(String value) { - set(5, value); - } - - /** - * Getter for public.user_creation_bid.project_key. - */ - public String getProjectKey() { - return (String) get(5); + return (Long) get(3); } /** * Setter for public.user_creation_bid.metadata. */ public void setMetadata(JSONB value) { - set(6, value); + set(4, value); } /** * Getter for public.user_creation_bid.metadata. */ public JSONB getMetadata() { - return (JSONB) get(6); - } - - /** - * Setter for public.user_creation_bid.organization_id. - */ - public void setOrganizationId(Long value) { - set(7, value); - } - - /** - * Getter for public.user_creation_bid.organization_id. - */ - public Long getOrganizationId() { - return (Long) get(7); - } - - /** - * Setter for public.user_creation_bid.organization_role. - */ - public void setOrganizationRole(JOrganizationRoleEnum value) { - set(8, value); - } - - /** - * Getter for public.user_creation_bid.organization_role. - */ - public JOrganizationRoleEnum getOrganizationRole() { - return (JOrganizationRoleEnum) get(8); + return (JSONB) get(4); } // ------------------------------------------------------------------------- @@ -171,17 +113,17 @@ public Record1 key() { } // ------------------------------------------------------------------------- - // Record9 type implementation + // Record5 type implementation // ------------------------------------------------------------------------- @Override - public Row9 fieldsRow() { - return (Row9) super.fieldsRow(); + public Row5 fieldsRow() { + return (Row5) super.fieldsRow(); } @Override - public Row9 valuesRow() { - return (Row9) super.valuesRow(); + public Row5 valuesRow() { + return (Row5) super.valuesRow(); } @Override @@ -200,35 +142,15 @@ public Field field3() { } @Override - public Field field4() { - return JUserCreationBid.USER_CREATION_BID.ROLE; - } - - @Override - public Field field5() { + public Field field4() { return JUserCreationBid.USER_CREATION_BID.INVITING_USER_ID; } @Override - public Field field6() { - return JUserCreationBid.USER_CREATION_BID.PROJECT_KEY; - } - - @Override - public Field field7() { + public Field field5() { return JUserCreationBid.USER_CREATION_BID.METADATA; } - @Override - public Field field8() { - return JUserCreationBid.USER_CREATION_BID.ORGANIZATION_ID; - } - - @Override - public Field field9() { - return JUserCreationBid.USER_CREATION_BID.ORGANIZATION_ROLE; - } - @Override public String component1() { return getUuid(); @@ -245,35 +167,15 @@ public String component3() { } @Override - public JProjectRoleEnum component4() { - return getRole(); - } - - @Override - public Long component5() { + public Long component4() { return getInvitingUserId(); } @Override - public String component6() { - return getProjectKey(); - } - - @Override - public JSONB component7() { + public JSONB component5() { return getMetadata(); } - @Override - public Long component8() { - return getOrganizationId(); - } - - @Override - public JOrganizationRoleEnum component9() { - return getOrganizationRole(); - } - @Override public String value1() { return getUuid(); @@ -290,35 +192,15 @@ public String value3() { } @Override - public JProjectRoleEnum value4() { - return getRole(); - } - - @Override - public Long value5() { + public Long value4() { return getInvitingUserId(); } @Override - public String value6() { - return getProjectKey(); - } - - @Override - public JSONB value7() { + public JSONB value5() { return getMetadata(); } - @Override - public Long value8() { - return getOrganizationId(); - } - - @Override - public JOrganizationRoleEnum value9() { - return getOrganizationRole(); - } - @Override public JUserCreationBidRecord value1(String value) { setUuid(value); @@ -338,52 +220,24 @@ public JUserCreationBidRecord value3(String value) { } @Override - public JUserCreationBidRecord value4(JProjectRoleEnum value) { - setRole(value); - return this; - } - - @Override - public JUserCreationBidRecord value5(Long value) { + public JUserCreationBidRecord value4(Long value) { setInvitingUserId(value); return this; } @Override - public JUserCreationBidRecord value6(String value) { - setProjectKey(value); - return this; - } - - @Override - public JUserCreationBidRecord value7(JSONB value) { + public JUserCreationBidRecord value5(JSONB value) { setMetadata(value); return this; } @Override - public JUserCreationBidRecord value8(Long value) { - setOrganizationId(value); - return this; - } - - @Override - public JUserCreationBidRecord value9(JOrganizationRoleEnum value) { - setOrganizationRole(value); - return this; - } - - @Override - public JUserCreationBidRecord values(String value1, Instant value2, String value3, JProjectRoleEnum value4, Long value5, String value6, JSONB value7, Long value8, JOrganizationRoleEnum value9) { + public JUserCreationBidRecord values(String value1, Instant value2, String value3, Long value4, JSONB value5) { value1(value1); value2(value2); value3(value3); value4(value4); value5(value5); - value6(value6); - value7(value7); - value8(value8); - value9(value9); return this; } @@ -401,17 +255,13 @@ public JUserCreationBidRecord() { /** * Create a detached, initialised JUserCreationBidRecord */ - public JUserCreationBidRecord(String uuid, Instant lastModified, String email, JProjectRoleEnum role, Long invitingUserId, String projectKey, JSONB metadata, Long organizationId, JOrganizationRoleEnum organizationRole) { + public JUserCreationBidRecord(String uuid, Instant lastModified, String email, Long invitingUserId, JSONB metadata) { super(JUserCreationBid.USER_CREATION_BID); set(0, uuid); set(1, lastModified); set(2, email); - set(3, role); - set(4, invitingUserId); - set(5, projectKey); - set(6, metadata); - set(7, organizationId); - set(8, organizationRole); + set(3, invitingUserId); + set(4, metadata); } } From 180190a7186c4ab48d4c9bec834b4759fb982f90 Mon Sep 17 00:00:00 2001 From: siarhei_hrabko Date: Tue, 17 Sep 2024 09:35:35 +0300 Subject: [PATCH 2/4] EPMRPP-93599 update user_creation_bid models --- .../entity/user/UserCreationBid.java | 22 ------------------- 1 file changed, 22 deletions(-) diff --git a/src/main/java/com/epam/ta/reportportal/entity/user/UserCreationBid.java b/src/main/java/com/epam/ta/reportportal/entity/user/UserCreationBid.java index 096d9e761..3fc5a1afa 100644 --- a/src/main/java/com/epam/ta/reportportal/entity/user/UserCreationBid.java +++ b/src/main/java/com/epam/ta/reportportal/entity/user/UserCreationBid.java @@ -56,12 +56,6 @@ public class UserCreationBid implements Serializable, Modifiable { @Column(name = "email") private String email; - @Column(name = "project_name") - private String projectName; - - @Column(name = "role") - private String role; - @OneToOne(cascade = CascadeType.ALL) @JoinColumn(name = "inviting_user_id") private User invitingUser; @@ -86,22 +80,6 @@ public void setEmail(String email) { this.email = email; } - public String getProjectName() { - return projectName; - } - - public void setProjectName(String projectName) { - this.projectName = projectName; - } - - public String getRole() { - return role; - } - - public void setRole(String role) { - this.role = role; - } - @Override public Instant getLastModified() { return lastModified; From 37e6986acf189e22665a97bc1bb0879a954db441 Mon Sep 17 00:00:00 2001 From: siarhei_hrabko Date: Tue, 17 Sep 2024 11:20:01 +0300 Subject: [PATCH 3/4] EPMRPP-93599 update user_creation_bid models --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index a237272d8..3dc0183b5 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:7f23a5f' + implementation 'com.github.reportportal:commons:59af813d4' } implementation 'io.swagger.core.v3:swagger-annotations:2.2.9' From 772db6e718d7c00ef82475f01483eeb79597dfbb Mon Sep 17 00:00:00 2001 From: siarhei_hrabko Date: Tue, 17 Sep 2024 13:40:19 +0300 Subject: [PATCH 4/4] EPMRPP-93599 update user_creation_bid models --- project-properties.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project-properties.gradle b/project-properties.gradle index 595f37b21..4fd512bdb 100755 --- a/project-properties.gradle +++ b/project-properties.gradle @@ -10,7 +10,7 @@ project.ext { releaseMode = project.hasProperty("releaseMode") hasDBSchema = project.hasProperty("DB_SCHEMA_POSTGRES") scriptsUrl = commonScriptsUrl + (releaseMode ? getProperty('scripts.version') : 'develop') - migrationsUrl = migrationsScriptsUrl + (releaseMode ? getProperty('migrations.version') : 'EPMRPP-93599-bid') + migrationsUrl = migrationsScriptsUrl + (releaseMode ? getProperty('migrations.version') : 'feature/orgs') //TODO refactor with archive download testScriptsSrc = [ (migrationsUrl + '/migrations/0_extensions.up.sql') : 'V001__extensions.sql',