From 6181e0f91ccc19b44c5efa3e85a38ef8a050c9d3 Mon Sep 17 00:00:00 2001 From: siarhei_hrabko Date: Wed, 22 May 2024 14:22:54 +0300 Subject: [PATCH] EPMRPP-89510 || revert onboarding table || update jooq classes --- .../epam/ta/reportportal/jooq/Indexes.java | 22 ++- .../epam/ta/reportportal/jooq/JPublic.java | 18 ++- .../com/epam/ta/reportportal/jooq/Keys.java | 24 ++++ .../epam/ta/reportportal/jooq/Sequences.java | 10 ++ .../com/epam/ta/reportportal/jooq/Tables.java | 12 ++ .../jooq/enums/JIntegrationGroupEnum.java | 4 +- .../ta/reportportal/jooq/tables/JLog.java | 4 +- .../ta/reportportal/jooq/tables/JProject.java | 29 +++- .../jooq/tables/JUserCreationBid.java | 14 +- .../jooq/tables/records/JProjectRecord.java | 133 ++++++++++++++++-- .../records/JUserCreationBidRecord.java | 124 ++++++++-------- .../dao/AttributeRepositoryTest.java | 4 +- .../dao/ProjectRepositoryTest.java | 2 +- 13 files changed, 304 insertions(+), 96 deletions(-) diff --git a/src/main/java/com/epam/ta/reportportal/jooq/Indexes.java b/src/main/java/com/epam/ta/reportportal/jooq/Indexes.java index 91e1d8c42..d6ca58f49 100644 --- a/src/main/java/com/epam/ta/reportportal/jooq/Indexes.java +++ b/src/main/java/com/epam/ta/reportportal/jooq/Indexes.java @@ -34,6 +34,8 @@ import com.epam.ta.reportportal.jooq.tables.JOauthRegistrationRestriction; import com.epam.ta.reportportal.jooq.tables.JOauthRegistrationScope; import com.epam.ta.reportportal.jooq.tables.JOnboarding; +import com.epam.ta.reportportal.jooq.tables.JOrganization; +import com.epam.ta.reportportal.jooq.tables.JOrganizationUser; import com.epam.ta.reportportal.jooq.tables.JOwnedEntity; import com.epam.ta.reportportal.jooq.tables.JParameter; import com.epam.ta.reportportal.jooq.tables.JPatternTemplate; @@ -57,7 +59,9 @@ import com.epam.ta.reportportal.jooq.tables.JUsers; import com.epam.ta.reportportal.jooq.tables.JWidget; import com.epam.ta.reportportal.jooq.tables.JWidgetFilter; + import javax.annotation.processing.Generated; + import org.jooq.Index; import org.jooq.OrderField; import org.jooq.impl.Internal; @@ -142,7 +146,6 @@ public class Indexes { public static final Index LOG_ATTACH_ID_IDX = Indexes0.LOG_ATTACH_ID_IDX; public static final Index LOG_CLUSTER_IDX = Indexes0.LOG_CLUSTER_IDX; public static final Index LOG_LAUNCH_ID_IDX = Indexes0.LOG_LAUNCH_ID_IDX; - public static final Index LOG_MESSAGE_TRGM_IDX = Indexes0.LOG_MESSAGE_TRGM_IDX; public static final Index LOG_PK = Indexes0.LOG_PK; public static final Index LOG_PROJECT_ID_LOG_TIME_IDX = Indexes0.LOG_PROJECT_ID_LOG_TIME_IDX; public static final Index LOG_PROJECT_IDX = Indexes0.LOG_PROJECT_IDX; @@ -154,6 +157,12 @@ public class Indexes { public static final Index OAUTH_REGISTRATION_SCOPE_PK = Indexes0.OAUTH_REGISTRATION_SCOPE_PK; public static final Index OAUTH_REGISTRATION_SCOPE_UNIQUE = Indexes0.OAUTH_REGISTRATION_SCOPE_UNIQUE; public static final Index ONBOARDING_PK = Indexes0.ONBOARDING_PK; + public static final Index ORGANIZATION_EXTERNAL_ID_KEY = Indexes0.ORGANIZATION_EXTERNAL_ID_KEY; + public static final Index ORGANIZATION_NAME_KEY = Indexes0.ORGANIZATION_NAME_KEY; + public static final Index ORGANIZATION_PKEY = Indexes0.ORGANIZATION_PKEY; + public static final Index ORGANIZATION_SLUG_IDX = Indexes0.ORGANIZATION_SLUG_IDX; + public static final Index ORGANIZATION_SLUG_KEY = Indexes0.ORGANIZATION_SLUG_KEY; + public static final Index ORGANIZATION_USER_PK = Indexes0.ORGANIZATION_USER_PK; public static final Index SHAREABLE_PK = Indexes0.SHAREABLE_PK; public static final Index SHARED_ENTITY_OWNERX = Indexes0.SHARED_ENTITY_OWNERX; public static final Index SHARED_ENTITY_PROJECT_IDX = Indexes0.SHARED_ENTITY_PROJECT_IDX; @@ -162,6 +171,8 @@ public class Indexes { public static final Index UNQ_NAME_PROJECTID = Indexes0.UNQ_NAME_PROJECTID; public static final Index PATTERN_ITEM_ITEM_ID_IDX = Indexes0.PATTERN_ITEM_ITEM_ID_IDX; public static final Index PATTERN_ITEM_UNQ = Indexes0.PATTERN_ITEM_UNQ; + public static final Index PROJECT_KEY_IDX = Indexes0.PROJECT_KEY_IDX; + public static final Index PROJECT_KEY_KEY = Indexes0.PROJECT_KEY_KEY; public static final Index PROJECT_NAME_KEY = Indexes0.PROJECT_NAME_KEY; public static final Index PROJECT_PK = Indexes0.PROJECT_PK; public static final Index UNIQUE_ATTRIBUTE_PER_PROJECT = Indexes0.UNIQUE_ATTRIBUTE_PER_PROJECT; @@ -274,7 +285,6 @@ private static class Indexes0 { public static Index LOG_ATTACH_ID_IDX = Internal.createIndex("log_attach_id_idx", JLog.LOG, new OrderField[] { JLog.LOG.ATTACHMENT_ID }, false); public static Index LOG_CLUSTER_IDX = Internal.createIndex("log_cluster_idx", JLog.LOG, new OrderField[] { JLog.LOG.CLUSTER_ID }, false); public static Index LOG_LAUNCH_ID_IDX = Internal.createIndex("log_launch_id_idx", JLog.LOG, new OrderField[] { JLog.LOG.LAUNCH_ID }, false); - public static Index LOG_MESSAGE_TRGM_IDX = Internal.createIndex("log_message_trgm_idx", JLog.LOG, new OrderField[] { JLog.LOG.LOG_MESSAGE }, false); public static Index LOG_PK = Internal.createIndex("log_pk", JLog.LOG, new OrderField[] { JLog.LOG.ID }, true); public static Index LOG_PROJECT_ID_LOG_TIME_IDX = Internal.createIndex("log_project_id_log_time_idx", JLog.LOG, new OrderField[] { JLog.LOG.PROJECT_ID, JLog.LOG.LOG_TIME }, false); public static Index LOG_PROJECT_IDX = Internal.createIndex("log_project_idx", JLog.LOG, new OrderField[] { JLog.LOG.PROJECT_ID }, false); @@ -286,6 +296,12 @@ private static class Indexes0 { public static Index OAUTH_REGISTRATION_SCOPE_PK = Internal.createIndex("oauth_registration_scope_pk", JOauthRegistrationScope.OAUTH_REGISTRATION_SCOPE, new OrderField[] { JOauthRegistrationScope.OAUTH_REGISTRATION_SCOPE.ID }, true); public static Index OAUTH_REGISTRATION_SCOPE_UNIQUE = Internal.createIndex("oauth_registration_scope_unique", JOauthRegistrationScope.OAUTH_REGISTRATION_SCOPE, new OrderField[] { JOauthRegistrationScope.OAUTH_REGISTRATION_SCOPE.SCOPE, JOauthRegistrationScope.OAUTH_REGISTRATION_SCOPE.OAUTH_REGISTRATION_FK }, true); public static Index ONBOARDING_PK = Internal.createIndex("onboarding_pk", JOnboarding.ONBOARDING, new OrderField[] { JOnboarding.ONBOARDING.ID }, true); + public static Index ORGANIZATION_EXTERNAL_ID_KEY = Internal.createIndex("organization_external_id_key", JOrganization.ORGANIZATION, new OrderField[] { JOrganization.ORGANIZATION.EXTERNAL_ID }, true); + public static Index ORGANIZATION_NAME_KEY = Internal.createIndex("organization_name_key", JOrganization.ORGANIZATION, new OrderField[] { JOrganization.ORGANIZATION.NAME }, true); + public static Index ORGANIZATION_PKEY = Internal.createIndex("organization_pkey", JOrganization.ORGANIZATION, new OrderField[] { JOrganization.ORGANIZATION.ID }, true); + public static Index ORGANIZATION_SLUG_IDX = Internal.createIndex("organization_slug_idx", JOrganization.ORGANIZATION, new OrderField[] { JOrganization.ORGANIZATION.SLUG }, false); + public static Index ORGANIZATION_SLUG_KEY = Internal.createIndex("organization_slug_key", JOrganization.ORGANIZATION, new OrderField[] { JOrganization.ORGANIZATION.SLUG }, true); + public static Index ORGANIZATION_USER_PK = Internal.createIndex("organization_user_pk", JOrganizationUser.ORGANIZATION_USER, new OrderField[] { JOrganizationUser.ORGANIZATION_USER.USER_ID, JOrganizationUser.ORGANIZATION_USER.ORGANIZATION_ID }, true); public static Index SHAREABLE_PK = Internal.createIndex("shareable_pk", JOwnedEntity.OWNED_ENTITY, new OrderField[] { JOwnedEntity.OWNED_ENTITY.ID }, true); public static Index SHARED_ENTITY_OWNERX = Internal.createIndex("shared_entity_ownerx", JOwnedEntity.OWNED_ENTITY, new OrderField[] { JOwnedEntity.OWNED_ENTITY.OWNER }, false); public static Index SHARED_ENTITY_PROJECT_IDX = Internal.createIndex("shared_entity_project_idx", JOwnedEntity.OWNED_ENTITY, new OrderField[] { JOwnedEntity.OWNED_ENTITY.PROJECT_ID }, false); @@ -294,6 +310,8 @@ private static class Indexes0 { public static Index UNQ_NAME_PROJECTID = Internal.createIndex("unq_name_projectid", JPatternTemplate.PATTERN_TEMPLATE, new OrderField[] { JPatternTemplate.PATTERN_TEMPLATE.NAME, JPatternTemplate.PATTERN_TEMPLATE.PROJECT_ID }, true); public static Index PATTERN_ITEM_ITEM_ID_IDX = Internal.createIndex("pattern_item_item_id_idx", JPatternTemplateTestItem.PATTERN_TEMPLATE_TEST_ITEM, new OrderField[] { JPatternTemplateTestItem.PATTERN_TEMPLATE_TEST_ITEM.ITEM_ID }, false); public static Index PATTERN_ITEM_UNQ = Internal.createIndex("pattern_item_unq", JPatternTemplateTestItem.PATTERN_TEMPLATE_TEST_ITEM, new OrderField[] { JPatternTemplateTestItem.PATTERN_TEMPLATE_TEST_ITEM.PATTERN_ID, JPatternTemplateTestItem.PATTERN_TEMPLATE_TEST_ITEM.ITEM_ID }, true); + public static Index PROJECT_KEY_IDX = Internal.createIndex("project_key_idx", JProject.PROJECT, new OrderField[] { JProject.PROJECT.KEY }, false); + public static Index PROJECT_KEY_KEY = Internal.createIndex("project_key_key", JProject.PROJECT, new OrderField[] { JProject.PROJECT.KEY }, true); public static Index PROJECT_NAME_KEY = Internal.createIndex("project_name_key", JProject.PROJECT, new OrderField[] { JProject.PROJECT.NAME }, true); public static Index PROJECT_PK = Internal.createIndex("project_pk", JProject.PROJECT, new OrderField[] { JProject.PROJECT.ID }, true); public static Index UNIQUE_ATTRIBUTE_PER_PROJECT = Internal.createIndex("unique_attribute_per_project", JProjectAttribute.PROJECT_ATTRIBUTE, new OrderField[] { JProjectAttribute.PROJECT_ATTRIBUTE.ATTRIBUTE_ID, JProjectAttribute.PROJECT_ATTRIBUTE.PROJECT_ID }, true); diff --git a/src/main/java/com/epam/ta/reportportal/jooq/JPublic.java b/src/main/java/com/epam/ta/reportportal/jooq/JPublic.java index 8ec2de1f5..ac71b3270 100644 --- a/src/main/java/com/epam/ta/reportportal/jooq/JPublic.java +++ b/src/main/java/com/epam/ta/reportportal/jooq/JPublic.java @@ -34,6 +34,8 @@ import com.epam.ta.reportportal.jooq.tables.JOauthRegistrationRestriction; import com.epam.ta.reportportal.jooq.tables.JOauthRegistrationScope; import com.epam.ta.reportportal.jooq.tables.JOnboarding; +import com.epam.ta.reportportal.jooq.tables.JOrganization; +import com.epam.ta.reportportal.jooq.tables.JOrganizationUser; import com.epam.ta.reportportal.jooq.tables.JOwnedEntity; import com.epam.ta.reportportal.jooq.tables.JParameter; import com.epam.ta.reportportal.jooq.tables.JPatternTemplate; @@ -88,7 +90,7 @@ @SuppressWarnings({ "all", "unchecked", "rawtypes" }) public class JPublic extends SchemaImpl { - private static final long serialVersionUID = -1176761935; + private static final long serialVersionUID = 286849201; /** * The reference instance of public @@ -245,6 +247,16 @@ public class JPublic extends SchemaImpl { */ public final JOnboarding ONBOARDING = com.epam.ta.reportportal.jooq.tables.JOnboarding.ONBOARDING; + /** + * The table public.organization. + */ + public final JOrganization ORGANIZATION = com.epam.ta.reportportal.jooq.tables.JOrganization.ORGANIZATION; + + /** + * The table public.organization_user. + */ + public final JOrganizationUser ORGANIZATION_USER = com.epam.ta.reportportal.jooq.tables.JOrganizationUser.ORGANIZATION_USER; + /** * The table public.owned_entity. */ @@ -427,6 +439,8 @@ private final List> getSequences0() { Sequences.OAUTH_REGISTRATION_RESTRICTION_ID_SEQ, Sequences.OAUTH_REGISTRATION_SCOPE_ID_SEQ, Sequences.ONBOARDING_ID_SEQ, + Sequences.ORGANIZATION_ID_SEQ, + Sequences.ORGANIZATION_USER_USER_ID_SEQ, Sequences.PATTERN_TEMPLATE_ID_SEQ, Sequences.PROJECT_ATTRIBUTE_ATTRIBUTE_ID_SEQ, Sequences.PROJECT_ATTRIBUTE_PROJECT_ID_SEQ, @@ -483,6 +497,8 @@ private final List> getTables0() { JOauthRegistrationRestriction.OAUTH_REGISTRATION_RESTRICTION, JOauthRegistrationScope.OAUTH_REGISTRATION_SCOPE, JOnboarding.ONBOARDING, + JOrganization.ORGANIZATION, + JOrganizationUser.ORGANIZATION_USER, JOwnedEntity.OWNED_ENTITY, JParameter.PARAMETER, JPatternTemplate.PATTERN_TEMPLATE, 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 266024928..c7c1a0fe8 100644 --- a/src/main/java/com/epam/ta/reportportal/jooq/Keys.java +++ b/src/main/java/com/epam/ta/reportportal/jooq/Keys.java @@ -34,6 +34,8 @@ import com.epam.ta.reportportal.jooq.tables.JOauthRegistrationRestriction; import com.epam.ta.reportportal.jooq.tables.JOauthRegistrationScope; import com.epam.ta.reportportal.jooq.tables.JOnboarding; +import com.epam.ta.reportportal.jooq.tables.JOrganization; +import com.epam.ta.reportportal.jooq.tables.JOrganizationUser; import com.epam.ta.reportportal.jooq.tables.JOwnedEntity; import com.epam.ta.reportportal.jooq.tables.JParameter; import com.epam.ta.reportportal.jooq.tables.JPatternTemplate; @@ -87,6 +89,8 @@ import com.epam.ta.reportportal.jooq.tables.records.JOauthRegistrationRestrictionRecord; import com.epam.ta.reportportal.jooq.tables.records.JOauthRegistrationScopeRecord; import com.epam.ta.reportportal.jooq.tables.records.JOnboardingRecord; +import com.epam.ta.reportportal.jooq.tables.records.JOrganizationRecord; +import com.epam.ta.reportportal.jooq.tables.records.JOrganizationUserRecord; import com.epam.ta.reportportal.jooq.tables.records.JOwnedEntityRecord; import com.epam.ta.reportportal.jooq.tables.records.JParameterRecord; import com.epam.ta.reportportal.jooq.tables.records.JPatternTemplateRecord; @@ -156,6 +160,8 @@ public class Keys { public static final Identity IDENTITY_OAUTH_REGISTRATION_RESTRICTION = Identities0.IDENTITY_OAUTH_REGISTRATION_RESTRICTION; public static final Identity IDENTITY_OAUTH_REGISTRATION_SCOPE = Identities0.IDENTITY_OAUTH_REGISTRATION_SCOPE; public static final Identity IDENTITY_ONBOARDING = Identities0.IDENTITY_ONBOARDING; + public static final Identity IDENTITY_ORGANIZATION = Identities0.IDENTITY_ORGANIZATION; + public static final Identity IDENTITY_ORGANIZATION_USER = Identities0.IDENTITY_ORGANIZATION_USER; public static final Identity IDENTITY_OWNED_ENTITY = Identities0.IDENTITY_OWNED_ENTITY; public static final Identity IDENTITY_PATTERN_TEMPLATE = Identities0.IDENTITY_PATTERN_TEMPLATE; public static final Identity IDENTITY_PROJECT = Identities0.IDENTITY_PROJECT; @@ -213,12 +219,18 @@ public class Keys { public static final UniqueKey OAUTH_REGISTRATION_SCOPE_PK = UniqueKeys0.OAUTH_REGISTRATION_SCOPE_PK; public static final UniqueKey OAUTH_REGISTRATION_SCOPE_UNIQUE = UniqueKeys0.OAUTH_REGISTRATION_SCOPE_UNIQUE; public static final UniqueKey ONBOARDING_PK = UniqueKeys0.ONBOARDING_PK; + public static final UniqueKey ORGANIZATION_PKEY = UniqueKeys0.ORGANIZATION_PKEY; + public static final UniqueKey ORGANIZATION_NAME_KEY = UniqueKeys0.ORGANIZATION_NAME_KEY; + public static final UniqueKey ORGANIZATION_EXTERNAL_ID_KEY = UniqueKeys0.ORGANIZATION_EXTERNAL_ID_KEY; + public static final UniqueKey ORGANIZATION_SLUG_KEY = UniqueKeys0.ORGANIZATION_SLUG_KEY; + public static final UniqueKey ORGANIZATION_USER_PK = UniqueKeys0.ORGANIZATION_USER_PK; public static final UniqueKey SHAREABLE_PK = UniqueKeys0.SHAREABLE_PK; public static final UniqueKey PATTERN_TEMPLATE_PK = UniqueKeys0.PATTERN_TEMPLATE_PK; public static final UniqueKey UNQ_NAME_PROJECTID = UniqueKeys0.UNQ_NAME_PROJECTID; public static final UniqueKey PATTERN_ITEM_UNQ = UniqueKeys0.PATTERN_ITEM_UNQ; public static final UniqueKey PROJECT_PK = UniqueKeys0.PROJECT_PK; public static final UniqueKey PROJECT_NAME_KEY = UniqueKeys0.PROJECT_NAME_KEY; + public static final UniqueKey PROJECT_KEY_KEY = UniqueKeys0.PROJECT_KEY_KEY; public static final UniqueKey UNIQUE_ATTRIBUTE_PER_PROJECT = UniqueKeys0.UNIQUE_ATTRIBUTE_PER_PROJECT; public static final UniqueKey USERS_PROJECT_PK = UniqueKeys0.USERS_PROJECT_PK; public static final UniqueKey RESTORE_PASSWORD_BID_PK = UniqueKeys0.RESTORE_PASSWORD_BID_PK; @@ -281,6 +293,8 @@ public class Keys { public static final ForeignKey LOG__LOG_ATTACHMENT_ID_FKEY = ForeignKeys0.LOG__LOG_ATTACHMENT_ID_FKEY; public static final ForeignKey OAUTH_REGISTRATION_RESTRICTION__OAUTH_REGISTRATION_RESTRICTION_OAUTH_REGISTRATION_FK_FKEY = ForeignKeys0.OAUTH_REGISTRATION_RESTRICTION__OAUTH_REGISTRATION_RESTRICTION_OAUTH_REGISTRATION_FK_FKEY; public static final ForeignKey OAUTH_REGISTRATION_SCOPE__OAUTH_REGISTRATION_SCOPE_OAUTH_REGISTRATION_FK_FKEY = ForeignKeys0.OAUTH_REGISTRATION_SCOPE__OAUTH_REGISTRATION_SCOPE_OAUTH_REGISTRATION_FK_FKEY; + public static final ForeignKey ORGANIZATION_USER__ORGANIZATION_USER_USER_ID_FKEY = ForeignKeys0.ORGANIZATION_USER__ORGANIZATION_USER_USER_ID_FKEY; + public static final ForeignKey ORGANIZATION_USER__ORGANIZATION_USER_ORGANIZATION_ID_FKEY = ForeignKeys0.ORGANIZATION_USER__ORGANIZATION_USER_ORGANIZATION_ID_FKEY; public static final ForeignKey OWNED_ENTITY__SHAREABLE_ENTITY_PROJECT_ID_FKEY = ForeignKeys0.OWNED_ENTITY__SHAREABLE_ENTITY_PROJECT_ID_FKEY; public static final ForeignKey PARAMETER__PARAMETER_ITEM_ID_FKEY = ForeignKeys0.PARAMETER__PARAMETER_ITEM_ID_FKEY; public static final ForeignKey PATTERN_TEMPLATE__PATTERN_TEMPLATE_PROJECT_ID_FKEY = ForeignKeys0.PATTERN_TEMPLATE__PATTERN_TEMPLATE_PROJECT_ID_FKEY; @@ -331,6 +345,8 @@ private static class Identities0 { public static Identity IDENTITY_OAUTH_REGISTRATION_RESTRICTION = Internal.createIdentity(JOauthRegistrationRestriction.OAUTH_REGISTRATION_RESTRICTION, JOauthRegistrationRestriction.OAUTH_REGISTRATION_RESTRICTION.ID); public static Identity IDENTITY_OAUTH_REGISTRATION_SCOPE = Internal.createIdentity(JOauthRegistrationScope.OAUTH_REGISTRATION_SCOPE, JOauthRegistrationScope.OAUTH_REGISTRATION_SCOPE.ID); public static Identity IDENTITY_ONBOARDING = Internal.createIdentity(JOnboarding.ONBOARDING, JOnboarding.ONBOARDING.ID); + public static Identity IDENTITY_ORGANIZATION = Internal.createIdentity(JOrganization.ORGANIZATION, JOrganization.ORGANIZATION.ID); + public static Identity IDENTITY_ORGANIZATION_USER = Internal.createIdentity(JOrganizationUser.ORGANIZATION_USER, JOrganizationUser.ORGANIZATION_USER.USER_ID); public static Identity IDENTITY_OWNED_ENTITY = Internal.createIdentity(JOwnedEntity.OWNED_ENTITY, JOwnedEntity.OWNED_ENTITY.ID); public static Identity IDENTITY_PATTERN_TEMPLATE = Internal.createIdentity(JPatternTemplate.PATTERN_TEMPLATE, JPatternTemplate.PATTERN_TEMPLATE.ID); public static Identity IDENTITY_PROJECT = Internal.createIdentity(JProject.PROJECT, JProject.PROJECT.ID); @@ -386,12 +402,18 @@ private static class UniqueKeys0 { public static final UniqueKey OAUTH_REGISTRATION_SCOPE_PK = Internal.createUniqueKey(JOauthRegistrationScope.OAUTH_REGISTRATION_SCOPE, "oauth_registration_scope_pk", JOauthRegistrationScope.OAUTH_REGISTRATION_SCOPE.ID); public static final UniqueKey OAUTH_REGISTRATION_SCOPE_UNIQUE = Internal.createUniqueKey(JOauthRegistrationScope.OAUTH_REGISTRATION_SCOPE, "oauth_registration_scope_unique", JOauthRegistrationScope.OAUTH_REGISTRATION_SCOPE.SCOPE, JOauthRegistrationScope.OAUTH_REGISTRATION_SCOPE.OAUTH_REGISTRATION_FK); public static final UniqueKey ONBOARDING_PK = Internal.createUniqueKey(JOnboarding.ONBOARDING, "onboarding_pk", JOnboarding.ONBOARDING.ID); + public static final UniqueKey ORGANIZATION_PKEY = Internal.createUniqueKey(JOrganization.ORGANIZATION, "organization_pkey", JOrganization.ORGANIZATION.ID); + public static final UniqueKey ORGANIZATION_NAME_KEY = Internal.createUniqueKey(JOrganization.ORGANIZATION, "organization_name_key", JOrganization.ORGANIZATION.NAME); + public static final UniqueKey ORGANIZATION_EXTERNAL_ID_KEY = Internal.createUniqueKey(JOrganization.ORGANIZATION, "organization_external_id_key", JOrganization.ORGANIZATION.EXTERNAL_ID); + public static final UniqueKey ORGANIZATION_SLUG_KEY = Internal.createUniqueKey(JOrganization.ORGANIZATION, "organization_slug_key", JOrganization.ORGANIZATION.SLUG); + public static final UniqueKey ORGANIZATION_USER_PK = Internal.createUniqueKey(JOrganizationUser.ORGANIZATION_USER, "organization_user_pk", JOrganizationUser.ORGANIZATION_USER.USER_ID, JOrganizationUser.ORGANIZATION_USER.ORGANIZATION_ID); public static final UniqueKey SHAREABLE_PK = Internal.createUniqueKey(JOwnedEntity.OWNED_ENTITY, "shareable_pk", JOwnedEntity.OWNED_ENTITY.ID); public static final UniqueKey PATTERN_TEMPLATE_PK = Internal.createUniqueKey(JPatternTemplate.PATTERN_TEMPLATE, "pattern_template_pk", JPatternTemplate.PATTERN_TEMPLATE.ID); public static final UniqueKey UNQ_NAME_PROJECTID = Internal.createUniqueKey(JPatternTemplate.PATTERN_TEMPLATE, "unq_name_projectid", JPatternTemplate.PATTERN_TEMPLATE.NAME, JPatternTemplate.PATTERN_TEMPLATE.PROJECT_ID); public static final UniqueKey PATTERN_ITEM_UNQ = Internal.createUniqueKey(JPatternTemplateTestItem.PATTERN_TEMPLATE_TEST_ITEM, "pattern_item_unq", JPatternTemplateTestItem.PATTERN_TEMPLATE_TEST_ITEM.PATTERN_ID, JPatternTemplateTestItem.PATTERN_TEMPLATE_TEST_ITEM.ITEM_ID); public static final UniqueKey PROJECT_PK = Internal.createUniqueKey(JProject.PROJECT, "project_pk", JProject.PROJECT.ID); public static final UniqueKey PROJECT_NAME_KEY = Internal.createUniqueKey(JProject.PROJECT, "project_name_key", JProject.PROJECT.NAME); + public static final UniqueKey PROJECT_KEY_KEY = Internal.createUniqueKey(JProject.PROJECT, "project_key_key", JProject.PROJECT.KEY); public static final UniqueKey UNIQUE_ATTRIBUTE_PER_PROJECT = Internal.createUniqueKey(JProjectAttribute.PROJECT_ATTRIBUTE, "unique_attribute_per_project", JProjectAttribute.PROJECT_ATTRIBUTE.ATTRIBUTE_ID, JProjectAttribute.PROJECT_ATTRIBUTE.PROJECT_ID); public static final UniqueKey USERS_PROJECT_PK = Internal.createUniqueKey(JProjectUser.PROJECT_USER, "users_project_pk", JProjectUser.PROJECT_USER.USER_ID, JProjectUser.PROJECT_USER.PROJECT_ID); public static final UniqueKey RESTORE_PASSWORD_BID_PK = Internal.createUniqueKey(JRestorePasswordBid.RESTORE_PASSWORD_BID, "restore_password_bid_pk", JRestorePasswordBid.RESTORE_PASSWORD_BID.UUID); @@ -452,6 +474,8 @@ private static class ForeignKeys0 { public static final ForeignKey LOG__LOG_ATTACHMENT_ID_FKEY = Internal.createForeignKey(com.epam.ta.reportportal.jooq.Keys.ATTACHMENT_PK, JLog.LOG, "log__log_attachment_id_fkey", JLog.LOG.ATTACHMENT_ID); public static final ForeignKey OAUTH_REGISTRATION_RESTRICTION__OAUTH_REGISTRATION_RESTRICTION_OAUTH_REGISTRATION_FK_FKEY = Internal.createForeignKey(com.epam.ta.reportportal.jooq.Keys.OAUTH_REGISTRATION_PKEY, JOauthRegistrationRestriction.OAUTH_REGISTRATION_RESTRICTION, "oauth_registration_restriction__oauth_registration_restriction_oauth_registration_fk_fkey", JOauthRegistrationRestriction.OAUTH_REGISTRATION_RESTRICTION.OAUTH_REGISTRATION_FK); public static final ForeignKey OAUTH_REGISTRATION_SCOPE__OAUTH_REGISTRATION_SCOPE_OAUTH_REGISTRATION_FK_FKEY = Internal.createForeignKey(com.epam.ta.reportportal.jooq.Keys.OAUTH_REGISTRATION_PKEY, JOauthRegistrationScope.OAUTH_REGISTRATION_SCOPE, "oauth_registration_scope__oauth_registration_scope_oauth_registration_fk_fkey", JOauthRegistrationScope.OAUTH_REGISTRATION_SCOPE.OAUTH_REGISTRATION_FK); + public static final ForeignKey ORGANIZATION_USER__ORGANIZATION_USER_USER_ID_FKEY = Internal.createForeignKey(com.epam.ta.reportportal.jooq.Keys.USERS_PK, JOrganizationUser.ORGANIZATION_USER, "organization_user__organization_user_user_id_fkey", JOrganizationUser.ORGANIZATION_USER.USER_ID); + public static final ForeignKey ORGANIZATION_USER__ORGANIZATION_USER_ORGANIZATION_ID_FKEY = Internal.createForeignKey(com.epam.ta.reportportal.jooq.Keys.ORGANIZATION_PKEY, JOrganizationUser.ORGANIZATION_USER, "organization_user__organization_user_organization_id_fkey", JOrganizationUser.ORGANIZATION_USER.ORGANIZATION_ID); public static final ForeignKey OWNED_ENTITY__SHAREABLE_ENTITY_PROJECT_ID_FKEY = Internal.createForeignKey(com.epam.ta.reportportal.jooq.Keys.PROJECT_PK, JOwnedEntity.OWNED_ENTITY, "owned_entity__shareable_entity_project_id_fkey", JOwnedEntity.OWNED_ENTITY.PROJECT_ID); public static final ForeignKey PARAMETER__PARAMETER_ITEM_ID_FKEY = Internal.createForeignKey(com.epam.ta.reportportal.jooq.Keys.TEST_ITEM_PK, JParameter.PARAMETER, "parameter__parameter_item_id_fkey", JParameter.PARAMETER.ITEM_ID); public static final ForeignKey PATTERN_TEMPLATE__PATTERN_TEMPLATE_PROJECT_ID_FKEY = Internal.createForeignKey(com.epam.ta.reportportal.jooq.Keys.PROJECT_PK, JPatternTemplate.PATTERN_TEMPLATE, "pattern_template__pattern_template_project_id_fkey", JPatternTemplate.PATTERN_TEMPLATE.PROJECT_ID); diff --git a/src/main/java/com/epam/ta/reportportal/jooq/Sequences.java b/src/main/java/com/epam/ta/reportportal/jooq/Sequences.java index b1c0fc0aa..6eb9a445b 100644 --- a/src/main/java/com/epam/ta/reportportal/jooq/Sequences.java +++ b/src/main/java/com/epam/ta/reportportal/jooq/Sequences.java @@ -118,6 +118,16 @@ public class Sequences { */ public static final Sequence ONBOARDING_ID_SEQ = new SequenceImpl("onboarding_id_seq", JPublic.PUBLIC, org.jooq.impl.SQLDataType.SMALLINT.nullable(false)); + /** + * The sequence public.organization_id_seq + */ + public static final Sequence ORGANIZATION_ID_SEQ = new SequenceImpl("organization_id_seq", JPublic.PUBLIC, org.jooq.impl.SQLDataType.BIGINT.nullable(false)); + + /** + * The sequence public.organization_user_user_id_seq + */ + public static final Sequence ORGANIZATION_USER_USER_ID_SEQ = new SequenceImpl("organization_user_user_id_seq", JPublic.PUBLIC, org.jooq.impl.SQLDataType.BIGINT.nullable(false)); + /** * The sequence public.pattern_template_id_seq */ diff --git a/src/main/java/com/epam/ta/reportportal/jooq/Tables.java b/src/main/java/com/epam/ta/reportportal/jooq/Tables.java index ab133d143..1c247af11 100644 --- a/src/main/java/com/epam/ta/reportportal/jooq/Tables.java +++ b/src/main/java/com/epam/ta/reportportal/jooq/Tables.java @@ -34,6 +34,8 @@ import com.epam.ta.reportportal.jooq.tables.JOauthRegistrationRestriction; import com.epam.ta.reportportal.jooq.tables.JOauthRegistrationScope; import com.epam.ta.reportportal.jooq.tables.JOnboarding; +import com.epam.ta.reportportal.jooq.tables.JOrganization; +import com.epam.ta.reportportal.jooq.tables.JOrganizationUser; import com.epam.ta.reportportal.jooq.tables.JOwnedEntity; import com.epam.ta.reportportal.jooq.tables.JParameter; import com.epam.ta.reportportal.jooq.tables.JPatternTemplate; @@ -230,6 +232,16 @@ public class Tables { */ public static final JOnboarding ONBOARDING = JOnboarding.ONBOARDING; + /** + * The table public.organization. + */ + public static final JOrganization ORGANIZATION = JOrganization.ORGANIZATION; + + /** + * The table public.organization_user. + */ + public static final JOrganizationUser ORGANIZATION_USER = JOrganizationUser.ORGANIZATION_USER; + /** * The table public.owned_entity. */ diff --git a/src/main/java/com/epam/ta/reportportal/jooq/enums/JIntegrationGroupEnum.java b/src/main/java/com/epam/ta/reportportal/jooq/enums/JIntegrationGroupEnum.java index cfc69d36b..14cdb4685 100644 --- a/src/main/java/com/epam/ta/reportportal/jooq/enums/JIntegrationGroupEnum.java +++ b/src/main/java/com/epam/ta/reportportal/jooq/enums/JIntegrationGroupEnum.java @@ -32,7 +32,9 @@ public enum JIntegrationGroupEnum implements EnumType { AUTH("AUTH"), - OTHER("OTHER"); + OTHER("OTHER"), + + IMPORT("IMPORT"); private final String literal; 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 023f79df7..04ebbd871 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 @@ -43,7 +43,7 @@ @SuppressWarnings({ "all", "unchecked", "rawtypes" }) public class JLog extends TableImpl { - private static final long serialVersionUID = -198837446; + private static final long serialVersionUID = 231270563; /** * The reference instance of public.log @@ -153,7 +153,7 @@ public Schema getSchema() { @Override public List getIndexes() { - return Arrays.asList(Indexes.LOG_ATTACH_ID_IDX, Indexes.LOG_CLUSTER_IDX, Indexes.LOG_LAUNCH_ID_IDX, Indexes.LOG_MESSAGE_TRGM_IDX, Indexes.LOG_PK, Indexes.LOG_PROJECT_ID_LOG_TIME_IDX, Indexes.LOG_PROJECT_IDX, Indexes.LOG_TI_IDX); + return Arrays.asList(Indexes.LOG_ATTACH_ID_IDX, Indexes.LOG_CLUSTER_IDX, Indexes.LOG_LAUNCH_ID_IDX, Indexes.LOG_PK, Indexes.LOG_PROJECT_ID_LOG_TIME_IDX, Indexes.LOG_PROJECT_IDX, Indexes.LOG_TI_IDX); } @Override 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 4f07f222f..6543c5db6 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 @@ -22,7 +22,7 @@ import org.jooq.JSONB; import org.jooq.Name; import org.jooq.Record; -import org.jooq.Row7; +import org.jooq.Row10; import org.jooq.Schema; import org.jooq.Table; import org.jooq.TableField; @@ -44,7 +44,7 @@ @SuppressWarnings({ "all", "unchecked", "rawtypes" }) public class JProject extends TableImpl { - private static final long serialVersionUID = 1584335243; + private static final long serialVersionUID = 1291621622; /** * The reference instance of public.project @@ -94,6 +94,21 @@ public Class getRecordType() { */ public final TableField ALLOCATED_STORAGE = createField(DSL.name("allocated_storage"), org.jooq.impl.SQLDataType.BIGINT.nullable(false).defaultValue(org.jooq.impl.DSL.field("0", org.jooq.impl.SQLDataType.BIGINT)), this, ""); + /** + * The column public.project.organization_id. + */ + public final TableField ORGANIZATION_ID = createField(DSL.name("organization_id"), org.jooq.impl.SQLDataType.BIGINT, this, ""); + + /** + * The column public.project.slug. + */ + public final TableField SLUG = createField(DSL.name("slug"), org.jooq.impl.SQLDataType.CLOB, this, ""); + + /** + * The column public.project.key. + */ + public final TableField KEY = createField(DSL.name("key"), org.jooq.impl.SQLDataType.CLOB, this, ""); + /** * Create a public.project table reference */ @@ -134,7 +149,7 @@ public Schema getSchema() { @Override public List getIndexes() { - return Arrays.asList(Indexes.PROJECT_NAME_KEY, Indexes.PROJECT_PK); + return Arrays.asList(Indexes.PROJECT_KEY_IDX, Indexes.PROJECT_KEY_KEY, Indexes.PROJECT_NAME_KEY, Indexes.PROJECT_PK); } @Override @@ -149,7 +164,7 @@ public UniqueKey getPrimaryKey() { @Override public List> getKeys() { - return Arrays.>asList(Keys.PROJECT_PK, Keys.PROJECT_NAME_KEY); + return Arrays.>asList(Keys.PROJECT_PK, Keys.PROJECT_NAME_KEY, Keys.PROJECT_KEY_KEY); } @Override @@ -179,11 +194,11 @@ public JProject rename(Name name) { } // ------------------------------------------------------------------------- - // Row7 type methods + // Row10 type methods // ------------------------------------------------------------------------- @Override - public Row7 fieldsRow() { - return (Row7) super.fieldsRow(); + public Row10 fieldsRow() { + return (Row10) super.fieldsRow(); } } 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 9bf7a40d1..2d675f65f 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 @@ -43,7 +43,7 @@ @SuppressWarnings({ "all", "unchecked", "rawtypes" }) public class JUserCreationBid extends TableImpl { - private static final long serialVersionUID = 1009841154; + private static final long serialVersionUID = -600823528; /** * The reference instance of public.user_creation_bid @@ -73,11 +73,6 @@ 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. */ @@ -93,6 +88,11 @@ 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 */ @@ -186,7 +186,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/records/JProjectRecord.java b/src/main/java/com/epam/ta/reportportal/jooq/tables/records/JProjectRecord.java index 164b64e73..6a21631ee 100644 --- a/src/main/java/com/epam/ta/reportportal/jooq/tables/records/JProjectRecord.java +++ b/src/main/java/com/epam/ta/reportportal/jooq/tables/records/JProjectRecord.java @@ -13,8 +13,8 @@ import org.jooq.Field; import org.jooq.JSONB; import org.jooq.Record1; -import org.jooq.Record7; -import org.jooq.Row7; +import org.jooq.Record10; +import org.jooq.Row10; import org.jooq.impl.UpdatableRecordImpl; @@ -29,9 +29,9 @@ comments = "This class is generated by jOOQ" ) @SuppressWarnings({ "all", "unchecked", "rawtypes" }) -public class JProjectRecord extends UpdatableRecordImpl implements Record7 { +public class JProjectRecord extends UpdatableRecordImpl implements Record10 { - private static final long serialVersionUID = 832057346; + private static final long serialVersionUID = 2145940380; /** * Setter for public.project.id. @@ -131,6 +131,48 @@ public Long getAllocatedStorage() { return (Long) get(6); } + /** + * Setter for public.project.organization_id. + */ + public void setOrganizationId(Long value) { + set(7, value); + } + + /** + * Getter for public.project.organization_id. + */ + public Long getOrganizationId() { + return (Long) get(7); + } + + /** + * Setter for public.project.slug. + */ + public void setSlug(String value) { + set(8, value); + } + + /** + * Getter for public.project.slug. + */ + public String getSlug() { + return (String) get(8); + } + + /** + * Setter for public.project.key. + */ + public void setKey(String value) { + set(9, value); + } + + /** + * Getter for public.project.key. + */ + public String getKey() { + return (String) get(9); + } + // ------------------------------------------------------------------------- // Primary key information // ------------------------------------------------------------------------- @@ -141,17 +183,17 @@ public Record1 key() { } // ------------------------------------------------------------------------- - // Record7 type implementation + // Record10 type implementation // ------------------------------------------------------------------------- @Override - public Row7 fieldsRow() { - return (Row7) super.fieldsRow(); + public Row10 fieldsRow() { + return (Row10) super.fieldsRow(); } @Override - public Row7 valuesRow() { - return (Row7) super.valuesRow(); + public Row10 valuesRow() { + return (Row10) super.valuesRow(); } @Override @@ -189,6 +231,21 @@ public Field field7() { return JProject.PROJECT.ALLOCATED_STORAGE; } + @Override + public Field field8() { + return JProject.PROJECT.ORGANIZATION_ID; + } + + @Override + public Field field9() { + return JProject.PROJECT.SLUG; + } + + @Override + public Field field10() { + return JProject.PROJECT.KEY; + } + @Override public Long component1() { return getId(); @@ -224,6 +281,21 @@ public Long component7() { return getAllocatedStorage(); } + @Override + public Long component8() { + return getOrganizationId(); + } + + @Override + public String component9() { + return getSlug(); + } + + @Override + public String component10() { + return getKey(); + } + @Override public Long value1() { return getId(); @@ -259,6 +331,21 @@ public Long value7() { return getAllocatedStorage(); } + @Override + public Long value8() { + return getOrganizationId(); + } + + @Override + public String value9() { + return getSlug(); + } + + @Override + public String value10() { + return getKey(); + } + @Override public JProjectRecord value1(Long value) { setId(value); @@ -302,7 +389,25 @@ public JProjectRecord value7(Long value) { } @Override - public JProjectRecord values(Long value1, String value2, String value3, String value4, Timestamp value5, JSONB value6, Long value7) { + public JProjectRecord value8(Long value) { + setOrganizationId(value); + return this; + } + + @Override + public JProjectRecord value9(String value) { + setSlug(value); + return this; + } + + @Override + public JProjectRecord value10(String value) { + setKey(value); + return this; + } + + @Override + public JProjectRecord values(Long value1, String value2, String value3, String value4, Timestamp value5, JSONB value6, Long value7, Long value8, String value9, String value10) { value1(value1); value2(value2); value3(value3); @@ -310,6 +415,9 @@ public JProjectRecord values(Long value1, String value2, String value3, String v value5(value5); value6(value6); value7(value7); + value8(value8); + value9(value9); + value10(value10); return this; } @@ -327,7 +435,7 @@ public JProjectRecord() { /** * Create a detached, initialised JProjectRecord */ - public JProjectRecord(Long id, String name, String projectType, String organization, Timestamp creationDate, JSONB metadata, Long allocatedStorage) { + public JProjectRecord(Long id, String name, String projectType, String organization, Timestamp creationDate, JSONB metadata, Long allocatedStorage, Long organizationId, String slug, String key) { super(JProject.PROJECT); set(0, id); @@ -337,5 +445,8 @@ public JProjectRecord(Long id, String name, String projectType, String organizat set(4, creationDate); set(5, metadata); set(6, allocatedStorage); + set(7, organizationId); + set(8, slug); + set(9, key); } } 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 4e588ac7e..2b3b1b783 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 = -997614482; + private static final long serialVersionUID = -1403163142; /** * Setter for public.user_creation_bid.uuid. @@ -75,60 +75,60 @@ public String getEmail() { return (String) get(2); } - /** - * Setter for public.user_creation_bid.role. - */ - public void setRole(String value) { - set(3, value); - } - - /** - * Getter for public.user_creation_bid.role. - */ - public String getRole() { - return (String) 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); + return (Long) get(3); } /** * Setter for public.user_creation_bid.project_name. */ public void setProjectName(String value) { - set(5, value); + set(4, value); } /** * Getter for public.user_creation_bid.project_name. */ public String getProjectName() { - return (String) get(5); + return (String) get(4); } /** * Setter for public.user_creation_bid.metadata. */ public void setMetadata(JSONB value) { - set(6, value); + set(5, value); } /** * Getter for public.user_creation_bid.metadata. */ public JSONB getMetadata() { - return (JSONB) get(6); + return (JSONB) get(5); + } + + /** + * Setter for public.user_creation_bid.role. + */ + public void setRole(String value) { + set(6, value); + } + + /** + * Getter for public.user_creation_bid.role. + */ + public String getRole() { + return (String) 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,25 +170,25 @@ 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() { + public Field field5() { return JUserCreationBid.USER_CREATION_BID.PROJECT_NAME; } @Override - public Field field7() { + public Field field6() { return JUserCreationBid.USER_CREATION_BID.METADATA; } + @Override + public Field field7() { + return JUserCreationBid.USER_CREATION_BID.ROLE; + } + @Override public String component1() { return getUuid(); @@ -205,25 +205,25 @@ public String component3() { } @Override - public String component4() { - return getRole(); - } - - @Override - public Long component5() { + public Long component4() { return getInvitingUserId(); } @Override - public String component6() { + public String component5() { return getProjectName(); } @Override - public JSONB component7() { + public JSONB component6() { return getMetadata(); } + @Override + public String component7() { + return getRole(); + } + @Override public String value1() { return getUuid(); @@ -240,25 +240,25 @@ public String value3() { } @Override - public String value4() { - return getRole(); - } - - @Override - public Long value5() { + public Long value4() { return getInvitingUserId(); } @Override - public String value6() { + public String value5() { return getProjectName(); } @Override - public JSONB value7() { + public JSONB value6() { return getMetadata(); } + @Override + public String value7() { + return getRole(); + } + @Override public JUserCreationBidRecord value1(String value) { setUuid(value); @@ -278,31 +278,31 @@ public JUserCreationBidRecord value3(String value) { } @Override - public JUserCreationBidRecord value4(String value) { - setRole(value); + public JUserCreationBidRecord value4(Long value) { + setInvitingUserId(value); return this; } @Override - public JUserCreationBidRecord value5(Long value) { - setInvitingUserId(value); + public JUserCreationBidRecord value5(String value) { + setProjectName(value); return this; } @Override - public JUserCreationBidRecord value6(String value) { - setProjectName(value); + public JUserCreationBidRecord value6(JSONB value) { + setMetadata(value); return this; } @Override - public JUserCreationBidRecord value7(JSONB value) { - setMetadata(value); + public JUserCreationBidRecord value7(String value) { + setRole(value); return this; } @Override - public JUserCreationBidRecord values(String value1, Timestamp value2, String value3, String value4, Long value5, String value6, JSONB value7) { + public JUserCreationBidRecord values(String value1, Timestamp value2, String value3, Long value4, String value5, JSONB value6, String value7) { value1(value1); value2(value2); value3(value3); @@ -327,15 +327,15 @@ public JUserCreationBidRecord() { /** * Create a detached, initialised JUserCreationBidRecord */ - public JUserCreationBidRecord(String uuid, Timestamp lastModified, String email, String role, Long invitingUserId, String projectName, JSONB metadata) { + public JUserCreationBidRecord(String uuid, Timestamp lastModified, String email, Long invitingUserId, String projectName, JSONB metadata, String role) { super(JUserCreationBid.USER_CREATION_BID); set(0, uuid); set(1, lastModified); set(2, email); - set(3, role); - set(4, invitingUserId); - set(5, projectName); - set(6, metadata); + set(3, invitingUserId); + set(4, projectName); + set(5, metadata); + set(6, role); } } diff --git a/src/test/java/com/epam/ta/reportportal/dao/AttributeRepositoryTest.java b/src/test/java/com/epam/ta/reportportal/dao/AttributeRepositoryTest.java index f789b2ea9..ae6fbe5dc 100644 --- a/src/test/java/com/epam/ta/reportportal/dao/AttributeRepositoryTest.java +++ b/src/test/java/com/epam/ta/reportportal/dao/AttributeRepositoryTest.java @@ -87,6 +87,6 @@ void findById() { void deleteById() { final Long attrId = 100L; attributeRepository.deleteById(attrId); - assertEquals(15, attributeRepository.findAll().size()); + assertEquals(16, attributeRepository.findAll().size()); } -} \ No newline at end of file +} diff --git a/src/test/java/com/epam/ta/reportportal/dao/ProjectRepositoryTest.java b/src/test/java/com/epam/ta/reportportal/dao/ProjectRepositoryTest.java index 9ab47824d..d7222ba52 100644 --- a/src/test/java/com/epam/ta/reportportal/dao/ProjectRepositoryTest.java +++ b/src/test/java/com/epam/ta/reportportal/dao/ProjectRepositoryTest.java @@ -62,7 +62,7 @@ void findAllIdsAndProjectAttributesTest() { projects.getContent().forEach(project -> { assertNotNull(project.getId()); assertTrue(CollectionUtils.isNotEmpty(project.getProjectAttributes())); - assertEquals(15, project.getProjectAttributes().size()); + assertEquals(16, project.getProjectAttributes().size()); assertTrue(project.getProjectAttributes() .stream() .anyMatch(pa -> ofNullable(pa.getValue()).isPresent() && pa.getAttribute()