EPMRPP-95256 merge conflicts

src/main/java/com/epam/ta/reportportal/commons/ReportPortalUser.java

@@ -41,10 +41,6 @@
 import org.springframework.security.core.authority.SimpleGrantedAuthority;
 import org.springframework.security.core.userdetails.User;
 import org.springframework.security.core.userdetails.UserDetails;
-import org.springframework.security.core.GrantedAuthority;
-import org.springframework.security.core.authority.SimpleGrantedAuthority;
-import org.springframework.security.core.userdetails.User;
-import org.springframework.security.core.userdetails.UserDetails;
 
 /**
  * ReportPortal user representation
@@ -75,6 +71,17 @@ private ReportPortalUser(String username, String password,
     this.active = isActive;
   }
 
+  @Override
+  public boolean isEnabled() {
+    return active;
+  }
+
+  @Override
+  public boolean isAccountNonLocked() {
+    return active;
+  }
+
+
   public static ReportPortalUserBuilder userBuilder() {
     return new ReportPortalUserBuilder();
   }
@@ -95,19 +102,6 @@ public static class OrganizationDetails implements Serializable {
     private OrganizationRole orgRole;
 
     private Map<String, ProjectDetails> projectDetails;
-  @Override
-  public boolean isEnabled() {
-    return active;
-  }
-
-  @Override
-  public boolean isAccountNonLocked() {
-    return active;
-  }
-
-  public Long getUserId() {
-    return userId;
-  }
 
     public static OrganizationDetailsBuilder builder() {
       return new OrganizationDetailsBuilder();

src/main/java/com/epam/ta/reportportal/dao/util/ResultFetchers.java

@@ -424,7 +424,7 @@ private ResultFetchers() {
     if (!CollectionUtils.isEmpty(rows)) {
       ReportPortalUser user = ReportPortalUser.userBuilder()
           .withUserName(rows.get(0).get(USERS.LOGIN))
-          .withActive(records.get(0).get(USERS.ACTIVE))
+          .withActive(rows.get(0).get(USERS.ACTIVE))
           .withPassword(ofNullable(rows.get(0).get(USERS.PASSWORD)).orElse(""))
           .withAuthorities(Collections.emptyList())
           .withUserId(rows.get(0).get(USERS.ID))

src/main/java/com/epam/ta/reportportal/entity/user/User.java

@@ -51,9 +51,6 @@
 @Entity
 @TypeDef(name = "meta", typeClass = Metadata.class)
 @Table(name = "users", schema = "public")
-@Getter
-@Setter
-@NoArgsConstructor
 public class User implements Serializable {
 
   private static final long serialVersionUID = 923392981;