Merge remote-tracking branch 'origin/develop' into feature/orgs

# Conflicts: # src/main/java/com/epam/ta/reportportal/entity/user/User.java
reportportal · Oct 22, 2024 · cdc86a3 · cdc86a3
2 parents 082d205 + ce13df3
commit cdc86a3
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 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
@@ -279,7 +279,7 @@ public ReportPortalUserBuilder withOrganizationDetails(Map<String, OrganizationD
     }
 
     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
@@ -37,7 +37,7 @@
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;
-import org.hibernate.annotations.CreationTimestamp;
+import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.Type;
 import org.hibernate.annotations.TypeDef;
 import org.hibernate.annotations.UpdateTimestamp;
@@ -51,6 +51,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;
@@ -67,7 +68,7 @@ public class User implements Serializable {
   private String externalId;
 
   @Column(name = "active")
-  private boolean active;
+  private Boolean active;
 
   @Column(name = "login")
   private String login;