From 5cebacbc22a495acf96e63b050f5380cee40bd61 Mon Sep 17 00:00:00 2001 From: Andrei Piankouski Date: Wed, 24 Apr 2024 11:46:01 +0300 Subject: [PATCH 1/2] EPMRPP-90581 || Make 'All notifications' toggler is ON by default --- .../ta/reportportal/entity/enums/ProjectAttributeEnum.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/epam/ta/reportportal/entity/enums/ProjectAttributeEnum.java b/src/main/java/com/epam/ta/reportportal/entity/enums/ProjectAttributeEnum.java index 7c80ecc83..b791f7577 100644 --- a/src/main/java/com/epam/ta/reportportal/entity/enums/ProjectAttributeEnum.java +++ b/src/main/java/com/epam/ta/reportportal/entity/enums/ProjectAttributeEnum.java @@ -29,8 +29,8 @@ */ public enum ProjectAttributeEnum { - NOTIFICATIONS_ENABLED("notifications.enabled", String.valueOf(false)), - NOTIFICATIONS_EMAIL_ENABLED("notifications.email.enabled", String.valueOf(false)), + NOTIFICATIONS_ENABLED("notifications.enabled", String.valueOf(true)), + NOTIFICATIONS_EMAIL_ENABLED("notifications.email.enabled", String.valueOf(true)), INTERRUPT_JOB_TIME(Prefix.JOB + "interruptJobTime", String.valueOf(Duration.ofDays(1).toSeconds())), From 1df352ca0314d049ac30cd83910b7f740b6a82b0 Mon Sep 17 00:00:00 2001 From: Siarhei Hrabko <45555481+grabsefx@users.noreply.github.com> Date: Mon, 6 May 2024 09:35:24 +0300 Subject: [PATCH 2/2] EPMRPP-90302 remove onboarding service (#1007) * EPMRPP-90302 remove onboarding service --- .../dao/OnboardingRepository.java | 45 --- .../entity/onboarding/Onboarding.java | 56 ---- .../epam/ta/reportportal/jooq/Indexes.java | 3 - .../epam/ta/reportportal/jooq/JPublic.java | 8 - .../com/epam/ta/reportportal/jooq/Keys.java | 6 - .../epam/ta/reportportal/jooq/Sequences.java | 5 - .../com/epam/ta/reportportal/jooq/Tables.java | 6 - .../reportportal/jooq/tables/JOnboarding.java | 178 ------------ .../tables/records/JOnboardingRecord.java | 266 ------------------ .../dao/AttributeRepositoryTest.java | 4 +- .../dao/ProjectRepositoryTest.java | 2 +- 11 files changed, 3 insertions(+), 576 deletions(-) delete mode 100644 src/main/java/com/epam/ta/reportportal/dao/OnboardingRepository.java delete mode 100644 src/main/java/com/epam/ta/reportportal/entity/onboarding/Onboarding.java delete mode 100644 src/main/java/com/epam/ta/reportportal/jooq/tables/JOnboarding.java delete mode 100644 src/main/java/com/epam/ta/reportportal/jooq/tables/records/JOnboardingRecord.java diff --git a/src/main/java/com/epam/ta/reportportal/dao/OnboardingRepository.java b/src/main/java/com/epam/ta/reportportal/dao/OnboardingRepository.java deleted file mode 100644 index f10ae6eea..000000000 --- a/src/main/java/com/epam/ta/reportportal/dao/OnboardingRepository.java +++ /dev/null @@ -1,45 +0,0 @@ -/* - * Copyright 2021 EPAM Systems - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package com.epam.ta.reportportal.dao; - -import static com.epam.ta.reportportal.jooq.tables.JOnboarding.ONBOARDING; - -import com.epam.ta.reportportal.entity.onboarding.Onboarding; -import java.sql.Timestamp; -import java.time.Instant; -import org.jooq.DSLContext; -import org.springframework.stereotype.Repository; - -/** - * @author Antonov Maksim - */ -@Repository -public class OnboardingRepository { - - private final DSLContext dsl; - - public OnboardingRepository(DSLContext dsl) { - this.dsl = dsl; - } - - public Onboarding findAvailableOnboardingByPage(String page) { - return dsl.select(ONBOARDING.fields()) - .from(ONBOARDING) - .where(ONBOARDING.PAGE.eq(page)) - .and(ONBOARDING.AVAILABLE_TO.ge(Timestamp.from(Instant.now()))) - .fetchOneInto(Onboarding.class); - } -} diff --git a/src/main/java/com/epam/ta/reportportal/entity/onboarding/Onboarding.java b/src/main/java/com/epam/ta/reportportal/entity/onboarding/Onboarding.java deleted file mode 100644 index 430f6f09f..000000000 --- a/src/main/java/com/epam/ta/reportportal/entity/onboarding/Onboarding.java +++ /dev/null @@ -1,56 +0,0 @@ -package com.epam.ta.reportportal.entity.onboarding; - -import java.io.Serializable; -import java.time.Instant; - -/** - * @author Antonov Maksim - */ -public class Onboarding implements Serializable { - - private Long id; - private String page; - private String data; - private Instant availableFrom; - private Instant availableTo; - - public Long getId() { - return id; - } - - public void setId(Long id) { - this.id = id; - } - - public String getPage() { - return page; - } - - public void setPage(String page) { - this.page = page; - } - - public String getData() { - return data; - } - - public void setData(String data) { - this.data = data; - } - - public Instant getAvailableFrom() { - return availableFrom; - } - - public void setAvailableFrom(Instant availableFrom) { - this.availableFrom = availableFrom; - } - - public Instant getAvailableTo() { - return availableTo; - } - - public void setAvailableTo(Instant availableTo) { - this.availableTo = availableTo; - } -} 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..7cae6900d 100644 --- a/src/main/java/com/epam/ta/reportportal/jooq/Indexes.java +++ b/src/main/java/com/epam/ta/reportportal/jooq/Indexes.java @@ -33,7 +33,6 @@ import com.epam.ta.reportportal.jooq.tables.JOauthRegistration; 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.JOwnedEntity; import com.epam.ta.reportportal.jooq.tables.JParameter; import com.epam.ta.reportportal.jooq.tables.JPatternTemplate; @@ -153,7 +152,6 @@ public class Indexes { public static final Index OAUTH_REGISTRATION_RESTRICTION_UNIQUE = Indexes0.OAUTH_REGISTRATION_RESTRICTION_UNIQUE; 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 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; @@ -285,7 +283,6 @@ private static class Indexes0 { public static Index OAUTH_REGISTRATION_RESTRICTION_UNIQUE = Internal.createIndex("oauth_registration_restriction_unique", JOauthRegistrationRestriction.OAUTH_REGISTRATION_RESTRICTION, new OrderField[] { JOauthRegistrationRestriction.OAUTH_REGISTRATION_RESTRICTION.TYPE, JOauthRegistrationRestriction.OAUTH_REGISTRATION_RESTRICTION.VALUE, JOauthRegistrationRestriction.OAUTH_REGISTRATION_RESTRICTION.OAUTH_REGISTRATION_FK }, true); 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 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); 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..5f5e5f1a5 100644 --- a/src/main/java/com/epam/ta/reportportal/jooq/JPublic.java +++ b/src/main/java/com/epam/ta/reportportal/jooq/JPublic.java @@ -33,7 +33,6 @@ import com.epam.ta.reportportal.jooq.tables.JOauthRegistration; 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.JOwnedEntity; import com.epam.ta.reportportal.jooq.tables.JParameter; import com.epam.ta.reportportal.jooq.tables.JPatternTemplate; @@ -240,11 +239,6 @@ public class JPublic extends SchemaImpl { */ public final JOauthRegistrationScope OAUTH_REGISTRATION_SCOPE = com.epam.ta.reportportal.jooq.tables.JOauthRegistrationScope.OAUTH_REGISTRATION_SCOPE; - /** - * The table public.onboarding. - */ - public final JOnboarding ONBOARDING = com.epam.ta.reportportal.jooq.tables.JOnboarding.ONBOARDING; - /** * The table public.owned_entity. */ @@ -426,7 +420,6 @@ private final List> getSequences0() { Sequences.LOG_ID_SEQ, Sequences.OAUTH_REGISTRATION_RESTRICTION_ID_SEQ, Sequences.OAUTH_REGISTRATION_SCOPE_ID_SEQ, - Sequences.ONBOARDING_ID_SEQ, Sequences.PATTERN_TEMPLATE_ID_SEQ, Sequences.PROJECT_ATTRIBUTE_ATTRIBUTE_ID_SEQ, Sequences.PROJECT_ATTRIBUTE_PROJECT_ID_SEQ, @@ -482,7 +475,6 @@ private final List> getTables0() { JOauthRegistration.OAUTH_REGISTRATION, JOauthRegistrationRestriction.OAUTH_REGISTRATION_RESTRICTION, JOauthRegistrationScope.OAUTH_REGISTRATION_SCOPE, - JOnboarding.ONBOARDING, 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..a4fe7d3e0 100644 --- a/src/main/java/com/epam/ta/reportportal/jooq/Keys.java +++ b/src/main/java/com/epam/ta/reportportal/jooq/Keys.java @@ -33,7 +33,6 @@ import com.epam.ta.reportportal.jooq.tables.JOauthRegistration; 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.JOwnedEntity; import com.epam.ta.reportportal.jooq.tables.JParameter; import com.epam.ta.reportportal.jooq.tables.JPatternTemplate; @@ -86,7 +85,6 @@ import com.epam.ta.reportportal.jooq.tables.records.JOauthRegistrationRecord; 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.JOwnedEntityRecord; import com.epam.ta.reportportal.jooq.tables.records.JParameterRecord; import com.epam.ta.reportportal.jooq.tables.records.JPatternTemplateRecord; @@ -155,7 +153,6 @@ public class Keys { public static final Identity IDENTITY_LOG = Identities0.IDENTITY_LOG; 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_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; @@ -212,7 +209,6 @@ public class Keys { public static final UniqueKey OAUTH_REGISTRATION_RESTRICTION_UNIQUE = UniqueKeys0.OAUTH_REGISTRATION_RESTRICTION_UNIQUE; 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 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; @@ -330,7 +326,6 @@ private static class Identities0 { public static Identity IDENTITY_LOG = Internal.createIdentity(JLog.LOG, JLog.LOG.ID); 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_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); @@ -385,7 +380,6 @@ private static class UniqueKeys0 { public static final UniqueKey OAUTH_REGISTRATION_RESTRICTION_UNIQUE = Internal.createUniqueKey(JOauthRegistrationRestriction.OAUTH_REGISTRATION_RESTRICTION, "oauth_registration_restriction_unique", JOauthRegistrationRestriction.OAUTH_REGISTRATION_RESTRICTION.TYPE, JOauthRegistrationRestriction.OAUTH_REGISTRATION_RESTRICTION.VALUE, JOauthRegistrationRestriction.OAUTH_REGISTRATION_RESTRICTION.OAUTH_REGISTRATION_FK); 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 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); 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..7df1b21b3 100644 --- a/src/main/java/com/epam/ta/reportportal/jooq/Sequences.java +++ b/src/main/java/com/epam/ta/reportportal/jooq/Sequences.java @@ -113,11 +113,6 @@ public class Sequences { */ public static final Sequence OAUTH_REGISTRATION_SCOPE_ID_SEQ = new SequenceImpl("oauth_registration_scope_id_seq", JPublic.PUBLIC, org.jooq.impl.SQLDataType.INTEGER.nullable(false)); - /** - * The sequence public.onboarding_id_seq - */ - public static final Sequence ONBOARDING_ID_SEQ = new SequenceImpl("onboarding_id_seq", JPublic.PUBLIC, org.jooq.impl.SQLDataType.SMALLINT.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..e17f24f12 100644 --- a/src/main/java/com/epam/ta/reportportal/jooq/Tables.java +++ b/src/main/java/com/epam/ta/reportportal/jooq/Tables.java @@ -33,7 +33,6 @@ import com.epam.ta.reportportal.jooq.tables.JOauthRegistration; 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.JOwnedEntity; import com.epam.ta.reportportal.jooq.tables.JParameter; import com.epam.ta.reportportal.jooq.tables.JPatternTemplate; @@ -225,11 +224,6 @@ public class Tables { */ public static final JOauthRegistrationScope OAUTH_REGISTRATION_SCOPE = JOauthRegistrationScope.OAUTH_REGISTRATION_SCOPE; - /** - * The table public.onboarding. - */ - public static final JOnboarding ONBOARDING = JOnboarding.ONBOARDING; - /** * The table public.owned_entity. */ 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 deleted file mode 100644 index da8518405..000000000 --- a/src/main/java/com/epam/ta/reportportal/jooq/tables/JOnboarding.java +++ /dev/null @@ -1,178 +0,0 @@ -/* - * This file is generated by jOOQ. - */ -package com.epam.ta.reportportal.jooq.tables; - - -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.tables.records.JOnboardingRecord; - -import java.sql.Timestamp; -import java.util.Arrays; -import java.util.List; - -import javax.annotation.processing.Generated; - -import org.jooq.Field; -import org.jooq.ForeignKey; -import org.jooq.Identity; -import org.jooq.Index; -import org.jooq.Name; -import org.jooq.Record; -import org.jooq.Row5; -import org.jooq.Schema; -import org.jooq.Table; -import org.jooq.TableField; -import org.jooq.UniqueKey; -import org.jooq.impl.DSL; -import org.jooq.impl.TableImpl; - - -/** - * This class is generated by jOOQ. - */ -@Generated( - value = { - "http://www.jooq.org", - "jOOQ version:3.12.4" - }, - comments = "This class is generated by jOOQ" -) -@SuppressWarnings({ "all", "unchecked", "rawtypes" }) -public class JOnboarding extends TableImpl { - - private static final long serialVersionUID = -1798770038; - - /** - * The reference instance of public.onboarding - */ - public static final JOnboarding ONBOARDING = new JOnboarding(); - - /** - * The class holding records for this type - */ - @Override - public Class getRecordType() { - return JOnboardingRecord.class; - } - - /** - * The column public.onboarding.id. - */ - public final TableField ID = createField(DSL.name("id"), org.jooq.impl.SQLDataType.SMALLINT.nullable(false).defaultValue(org.jooq.impl.DSL.field("nextval('onboarding_id_seq'::regclass)", org.jooq.impl.SQLDataType.SMALLINT)), this, ""); - - /** - * The column public.onboarding.data. - */ - public final TableField DATA = createField(DSL.name("data"), org.jooq.impl.SQLDataType.CLOB, this, ""); - - /** - * The column public.onboarding.page. - */ - public final TableField PAGE = createField(DSL.name("page"), org.jooq.impl.SQLDataType.VARCHAR(50).nullable(false), this, ""); - - /** - * The column public.onboarding.available_from. - */ - public final TableField AVAILABLE_FROM = createField(DSL.name("available_from"), org.jooq.impl.SQLDataType.TIMESTAMP, this, ""); - - /** - * The column public.onboarding.available_to. - */ - public final TableField AVAILABLE_TO = createField(DSL.name("available_to"), org.jooq.impl.SQLDataType.TIMESTAMP, this, ""); - - /** - * Create a public.onboarding table reference - */ - public JOnboarding() { - this(DSL.name("onboarding"), null); - } - - /** - * Create an aliased public.onboarding table reference - */ - public JOnboarding(String alias) { - this(DSL.name(alias), ONBOARDING); - } - - /** - * Create an aliased public.onboarding table reference - */ - public JOnboarding(Name alias) { - this(alias, ONBOARDING); - } - - private JOnboarding(Name alias, Table aliased) { - this(alias, aliased, null); - } - - private JOnboarding(Name alias, Table aliased, Field[] parameters) { - super(alias, null, aliased, parameters, DSL.comment("")); - } - - public JOnboarding(Table child, ForeignKey key) { - super(child, key, ONBOARDING); - } - - @Override - public Schema getSchema() { - return JPublic.PUBLIC; - } - - @Override - public List getIndexes() { - return Arrays.asList(Indexes.ONBOARDING_PK); - } - - @Override - public Identity getIdentity() { - return Keys.IDENTITY_ONBOARDING; - } - - @Override - public UniqueKey getPrimaryKey() { - return Keys.ONBOARDING_PK; - } - - @Override - public List> getKeys() { - return Arrays.>asList(Keys.ONBOARDING_PK); - } - - @Override - public JOnboarding as(String alias) { - return new JOnboarding(DSL.name(alias), this); - } - - @Override - public JOnboarding as(Name alias) { - return new JOnboarding(alias, this); - } - - /** - * Rename this table - */ - @Override - public JOnboarding rename(String name) { - return new JOnboarding(DSL.name(name), null); - } - - /** - * Rename this table - */ - @Override - public JOnboarding rename(Name name) { - return new JOnboarding(name, null); - } - - // ------------------------------------------------------------------------- - // Row5 type methods - // ------------------------------------------------------------------------- - - @Override - public Row5 fieldsRow() { - return (Row5) super.fieldsRow(); - } -} diff --git a/src/main/java/com/epam/ta/reportportal/jooq/tables/records/JOnboardingRecord.java b/src/main/java/com/epam/ta/reportportal/jooq/tables/records/JOnboardingRecord.java deleted file mode 100644 index db749c19d..000000000 --- a/src/main/java/com/epam/ta/reportportal/jooq/tables/records/JOnboardingRecord.java +++ /dev/null @@ -1,266 +0,0 @@ -/* - * This file is generated by jOOQ. - */ -package com.epam.ta.reportportal.jooq.tables.records; - - -import com.epam.ta.reportportal.jooq.tables.JOnboarding; - -import java.sql.Timestamp; - -import javax.annotation.processing.Generated; - -import org.jooq.Field; -import org.jooq.Record1; -import org.jooq.Record5; -import org.jooq.Row5; -import org.jooq.impl.UpdatableRecordImpl; - - -/** - * This class is generated by jOOQ. - */ -@Generated( - value = { - "http://www.jooq.org", - "jOOQ version:3.12.4" - }, - comments = "This class is generated by jOOQ" -) -@SuppressWarnings({ "all", "unchecked", "rawtypes" }) -public class JOnboardingRecord extends UpdatableRecordImpl implements Record5 { - - private static final long serialVersionUID = -1405142552; - - /** - * Setter for public.onboarding.id. - */ - public void setId(Short value) { - set(0, value); - } - - /** - * Getter for public.onboarding.id. - */ - public Short getId() { - return (Short) get(0); - } - - /** - * Setter for public.onboarding.data. - */ - public void setData(String value) { - set(1, value); - } - - /** - * Getter for public.onboarding.data. - */ - public String getData() { - return (String) get(1); - } - - /** - * Setter for public.onboarding.page. - */ - public void setPage(String value) { - set(2, value); - } - - /** - * Getter for public.onboarding.page. - */ - public String getPage() { - return (String) get(2); - } - - /** - * Setter for public.onboarding.available_from. - */ - public void setAvailableFrom(Timestamp value) { - set(3, value); - } - - /** - * Getter for public.onboarding.available_from. - */ - public Timestamp getAvailableFrom() { - return (Timestamp) get(3); - } - - /** - * Setter for public.onboarding.available_to. - */ - public void setAvailableTo(Timestamp value) { - set(4, value); - } - - /** - * Getter for public.onboarding.available_to. - */ - public Timestamp getAvailableTo() { - return (Timestamp) get(4); - } - - // ------------------------------------------------------------------------- - // Primary key information - // ------------------------------------------------------------------------- - - @Override - public Record1 key() { - return (Record1) super.key(); - } - - // ------------------------------------------------------------------------- - // Record5 type implementation - // ------------------------------------------------------------------------- - - @Override - public Row5 fieldsRow() { - return (Row5) super.fieldsRow(); - } - - @Override - public Row5 valuesRow() { - return (Row5) super.valuesRow(); - } - - @Override - public Field field1() { - return JOnboarding.ONBOARDING.ID; - } - - @Override - public Field field2() { - return JOnboarding.ONBOARDING.DATA; - } - - @Override - public Field field3() { - return JOnboarding.ONBOARDING.PAGE; - } - - @Override - public Field field4() { - return JOnboarding.ONBOARDING.AVAILABLE_FROM; - } - - @Override - public Field field5() { - return JOnboarding.ONBOARDING.AVAILABLE_TO; - } - - @Override - public Short component1() { - return getId(); - } - - @Override - public String component2() { - return getData(); - } - - @Override - public String component3() { - return getPage(); - } - - @Override - public Timestamp component4() { - return getAvailableFrom(); - } - - @Override - public Timestamp component5() { - return getAvailableTo(); - } - - @Override - public Short value1() { - return getId(); - } - - @Override - public String value2() { - return getData(); - } - - @Override - public String value3() { - return getPage(); - } - - @Override - public Timestamp value4() { - return getAvailableFrom(); - } - - @Override - public Timestamp value5() { - return getAvailableTo(); - } - - @Override - public JOnboardingRecord value1(Short value) { - setId(value); - return this; - } - - @Override - public JOnboardingRecord value2(String value) { - setData(value); - return this; - } - - @Override - public JOnboardingRecord value3(String value) { - setPage(value); - return this; - } - - @Override - public JOnboardingRecord value4(Timestamp value) { - setAvailableFrom(value); - return this; - } - - @Override - public JOnboardingRecord value5(Timestamp value) { - setAvailableTo(value); - return this; - } - - @Override - public JOnboardingRecord values(Short value1, String value2, String value3, Timestamp value4, Timestamp value5) { - value1(value1); - value2(value2); - value3(value3); - value4(value4); - value5(value5); - return this; - } - - // ------------------------------------------------------------------------- - // Constructors - // ------------------------------------------------------------------------- - - /** - * Create a detached JOnboardingRecord - */ - public JOnboardingRecord() { - super(JOnboarding.ONBOARDING); - } - - /** - * Create a detached, initialised JOnboardingRecord - */ - public JOnboardingRecord(Short id, String data, String page, Timestamp availableFrom, Timestamp availableTo) { - super(JOnboarding.ONBOARDING); - - set(0, id); - set(1, data); - set(2, page); - set(3, availableFrom); - set(4, availableTo); - } -} 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()