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 |   44 +++++++++++++++++++++++++++++++-------------
 1 files changed, 31 insertions(+), 13 deletions(-)

diff --git a/src/main/java/kr/wisestone/owl/domain/User.java b/src/main/java/kr/wisestone/owl/domain/User.java
index 326836d..dd8ccc7 100644
--- a/src/main/java/kr/wisestone/owl/domain/User.java
+++ b/src/main/java/kr/wisestone/owl/domain/User.java
@@ -19,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;
@@ -29,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<>();
@@ -64,10 +68,8 @@
     @JoinColumn(name="level_id")
     private UserLevel userLevel;
 
-    @ManyToOne(targetEntity = DepartmentManage.class, fetch = FetchType.LAZY)
-    @JoinColumn(name="department_id")
-    private DepartmentManage departmentManage;
-
+    @OneToMany(mappedBy = "user", cascade = {CascadeType.ALL}, orphanRemoval = true)
+    private Set<ApiToken> apiTokens = new HashSet<>();
 
     public User() {
     }
@@ -76,14 +78,6 @@
         this.id = id;
         this.name = name;
         this.account = account;
-    }
-
-    public DepartmentManage getDepartmentManage() {
-        return departmentManage;
-    }
-
-    public void setDepartmentManage(DepartmentManage departmentManage) {
-        this.departmentManage = departmentManage;
     }
 
     public UserLevel getUserLevel() {
@@ -169,6 +163,14 @@
         this.lastProjectId = lastProjectId;
     }
 
+    public Long getLastIssueTypeId() {
+        return lastIssueTypeId;
+    }
+
+    public void setLastIssueTypeId(Long lastIssueTypeId) {
+        this.lastIssueTypeId = lastIssueTypeId;
+    }
+
     public String getAwsKey() {
         return awsKey;
     }
@@ -212,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) {
@@ -322,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