From ce13df31d4b8341baf363af167125785faa33642 Mon Sep 17 00:00:00 2001 From: PeeAyBee Date: Tue, 15 Oct 2024 12:05:26 +0300 Subject: [PATCH] EPMRPP-96070 || Add dynamic insert for default db values (#1042) * EPMRPP-96070 || Add dynamic insert for user object to use default database values * EPMRPP-96070 || Add dynamic insert for user object to use default database values --- .../com/epam/ta/reportportal/commons/ReportPortalUser.java | 2 +- src/main/java/com/epam/ta/reportportal/entity/user/User.java | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/epam/ta/reportportal/commons/ReportPortalUser.java b/src/main/java/com/epam/ta/reportportal/commons/ReportPortalUser.java index f0ead51a3..e6105e0e6 100644 --- a/src/main/java/com/epam/ta/reportportal/commons/ReportPortalUser.java +++ b/src/main/java/com/epam/ta/reportportal/commons/ReportPortalUser.java @@ -236,7 +236,7 @@ public ReportPortalUserBuilder withProjectDetails(Map pr } public ReportPortalUser fromUser(com.epam.ta.reportportal.entity.user.User user) { - this.active = user.isActive(); + this.active = user.getActive(); this.username = user.getLogin(); this.email = user.getPassword(); this.userId = user.getId(); diff --git a/src/main/java/com/epam/ta/reportportal/entity/user/User.java b/src/main/java/com/epam/ta/reportportal/entity/user/User.java index b360da4f6..b44506e84 100644 --- a/src/main/java/com/epam/ta/reportportal/entity/user/User.java +++ b/src/main/java/com/epam/ta/reportportal/entity/user/User.java @@ -36,6 +36,7 @@ import lombok.Getter; import lombok.NoArgsConstructor; import lombok.Setter; +import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.Type; import org.hibernate.annotations.TypeDef; @@ -48,6 +49,7 @@ @Entity @TypeDef(name = "meta", typeClass = Metadata.class) @Table(name = "users", schema = "public") +@DynamicInsert public class User implements Serializable { private static final long serialVersionUID = 923392981; @@ -64,7 +66,7 @@ public class User implements Serializable { private String externalId; @Column(name = "active") - private boolean active; + private Boolean active; @Column(name = "login") private String login;