From 6a72a3edec87cca9996c7ab3be3fd48479881945 Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 목, 02 12월 2021 21:55:28 +0900
Subject: [PATCH] 충돌 수정

---
 src/main/java/kr/wisestone/owl/domain/User.java |   53 +++++++++++++++++++++++++++++++++++------------------
 1 files changed, 35 insertions(+), 18 deletions(-)

diff --git a/src/main/java/kr/wisestone/owl/domain/User.java b/src/main/java/kr/wisestone/owl/domain/User.java
index 29b8f96..dd8ccc7 100644
--- a/src/main/java/kr/wisestone/owl/domain/User.java
+++ b/src/main/java/kr/wisestone/owl/domain/User.java
@@ -1,7 +1,6 @@
 package kr.wisestone.owl.domain;
 
 import kr.wisestone.owl.domain.enumType.SocialType;
-import kr.wisestone.owl.util.CommonUtil;
 import org.springframework.security.core.GrantedAuthority;
 import org.springframework.security.core.userdetails.UserDetails;
 import javax.persistence.*;
@@ -20,6 +19,9 @@
     public static final String DEFAULT_RESERVATION_NOTIFY_TIME = "09:00";    //  湲곕낯 �씠硫붿씪 �븣由� �삁�젙 �떆媛�
     public static final String DEFAULT_LANGUAGE = "ko"; //  湲곕낯 �뼵�뼱
 
+    public static final String INSERT_TYPE_NORMAL = "N";    // 異붽� ���엯(�씪諛�)
+    public static final String INSERT_TYPE_API = "A";       // 異붽� ���엯(API)
+
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     private Long id;
@@ -30,15 +32,16 @@
     private String phone;
     private String profile;
     private String awsKey;
-//    private Long departmentId;
     @Enumerated(EnumType.STRING)
     private SocialType socialType;
     private Long lastWorkspaceId;
     private Long lastProjectId;
+    private Long lastIssueTypeId;
     private Date lastLoginDate;
     private String reservationNotifyTime;   //  �씠硫붿씪 �븣由� �떆媛� �삁�젙
     private String language;
     private String licensekey;
+    private String insertType = User.INSERT_TYPE_NORMAL;
 
     @OneToMany(mappedBy = "user", cascade = {CascadeType.ALL}, orphanRemoval = true)
     private Set<SystemRoleUser> systemRoleUsers = new HashSet<>();
@@ -65,10 +68,8 @@
     @JoinColumn(name="level_id")
     private UserLevel userLevel;
 
-    @ManyToOne(targetEntity = DepartmentManagement.class, fetch = FetchType.LAZY)
-    @JoinColumn(name="department_id")
-    private DepartmentManagement departmentManagement;
-
+    @OneToMany(mappedBy = "user", cascade = {CascadeType.ALL}, orphanRemoval = true)
+    private Set<ApiToken> apiTokens = new HashSet<>();
 
     public User() {
     }
@@ -77,14 +78,6 @@
         this.id = id;
         this.name = name;
         this.account = account;
-    }
-
-    public DepartmentManagement getDepartmentId() {
-        return departmentManagement;
-    }
-
-    public void setDepartmentId(DepartmentManagement department) {
-        this.departmentManagement = department;
     }
 
     public UserLevel getUserLevel() {
@@ -170,6 +163,14 @@
         this.lastProjectId = lastProjectId;
     }
 
+    public Long getLastIssueTypeId() {
+        return lastIssueTypeId;
+    }
+
+    public void setLastIssueTypeId(Long lastIssueTypeId) {
+        this.lastIssueTypeId = lastIssueTypeId;
+    }
+
     public String getAwsKey() {
         return awsKey;
     }
@@ -213,6 +214,14 @@
 
     public void setProjectRoleUsers(Set<ProjectRoleUser> projectRoleUsers) {
         this.projectRoleUsers = projectRoleUsers;
+    }
+
+    public String getInsertType() {
+        return insertType;
+    }
+
+    public void setInsertType(String insertType) {
+        this.insertType = insertType;
     }
 
     public void addProjectRole(ProjectRole projectRole) {
@@ -310,10 +319,10 @@
         return this.userLevel.getPermission();
     }
 
-    // TEST
-    //public void setPermission(Integer permission) {
-    //    this.userLevel.setPermission(permission);
-    //}
+    // wyu - TEST
+//    public void setPermission(Integer permission) {
+//        this.userLevel.setPermission(permission);
+//    }
 
     public String getLicensekey() {
         return licensekey;
@@ -323,6 +332,14 @@
         this.licensekey = licensekey;
     }
 
+    public Set<ApiToken> getApiTokens() {
+        return apiTokens;
+    }
+
+    public void setApiTokens(Set<ApiToken> apiTokens) {
+        this.apiTokens = apiTokens;
+    }
+
     @Override
     public Collection<? extends GrantedAuthority> getAuthorities() {
         // TODO Auto-generated method stub

--
Gitblit v1.8.0