From d2c32a571774709f223262bb18ad3bc6f2f7c646 Mon Sep 17 00:00:00 2001
From: "jacobs.902207" <jacobs.902207@kakaopaycorp.com>
Date: Sat, 1 Feb 2020 17:48:54 +0900
Subject: [PATCH] =?UTF-8?q?=EC=A3=BC=EC=9D=80=20=EC=97=94=ED=8B=B0?=
 =?UTF-8?q?=ED=8B=B0=20=EC=9E=91=EC=97=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../recordary/group/domain/entity/GroupEntity.java   |  1 -
 .../recordary/group/repository/GroupRepository.java  |  2 +-
 .../recordary/group/service/GroupService.java        | 12 +++++++-----
 .../java/com/fairy_pitt/recordary/model/Users.java   |  5 +++++
 4 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/src/main/java/com/fairy_pitt/recordary/group/domain/entity/GroupEntity.java b/src/main/java/com/fairy_pitt/recordary/group/domain/entity/GroupEntity.java
index d47a3b2..5a71b0e 100644
--- a/src/main/java/com/fairy_pitt/recordary/group/domain/entity/GroupEntity.java
+++ b/src/main/java/com/fairy_pitt/recordary/group/domain/entity/GroupEntity.java
@@ -19,7 +19,6 @@ public class GroupEntity {
     private Long groupCd;
 
     @ManyToOne(fetch = FetchType.LAZY)
-    @JoinColumn(name = "USER_CD")
     private Users gMstUserFK;
 
     @Column(name = "GROUP_NM")
diff --git a/src/main/java/com/fairy_pitt/recordary/group/repository/GroupRepository.java b/src/main/java/com/fairy_pitt/recordary/group/repository/GroupRepository.java
index f6e19bf..a214769 100644
--- a/src/main/java/com/fairy_pitt/recordary/group/repository/GroupRepository.java
+++ b/src/main/java/com/fairy_pitt/recordary/group/repository/GroupRepository.java
@@ -13,7 +13,7 @@
 @Repository
 public interface GroupRepository extends JpaRepository<GroupEntity, Long> {
 
-    List<GroupEntity> findByGMstUserFK(Users GMstUserFK);
+//    List<GroupEntity> findByGMstUserFK(Users GMstUserFK);
 
     // List<GroupEntity> findByGNameLike(String s);
     //<GroupEntity> findByGroupCd(long id);
diff --git a/src/main/java/com/fairy_pitt/recordary/group/service/GroupService.java b/src/main/java/com/fairy_pitt/recordary/group/service/GroupService.java
index b481923..02c8624 100644
--- a/src/main/java/com/fairy_pitt/recordary/group/service/GroupService.java
+++ b/src/main/java/com/fairy_pitt/recordary/group/service/GroupService.java
@@ -3,6 +3,8 @@
 import com.fairy_pitt.recordary.group.domain.entity.GroupEntity;
 import com.fairy_pitt.recordary.group.repository.GroupRepository;
 import com.fairy_pitt.recordary.model.Users;
+import com.fairy_pitt.recordary.repository.UsersRepository;
+import lombok.RequiredArgsConstructor;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -10,10 +12,10 @@
 import java.util.Optional;
 
 @Service
+@RequiredArgsConstructor
 public class GroupService {
-
-    @Autowired
-    private GroupRepository groupRepository;
+    private final GroupRepository groupRepository;
+    private final UsersRepository usersRepository;
 
     public Boolean groupCreate(GroupEntity groupEntity){
         Optional<GroupEntity> resultGroupEntity = Optional.of(groupRepository.save(groupEntity));
@@ -30,8 +32,8 @@ public Boolean groupCreate(GroupEntity groupEntity){
 //    }
 //
     public List<GroupEntity> GroupRead(Users user){
-
-        return groupRepository.findByGMstUserFK(user);
+        return usersRepository.findByUserId(user.getUserId())
+                .getGroups();
     }
 
 //    public List<GroupEntity> groupSearch(String groupName){
diff --git a/src/main/java/com/fairy_pitt/recordary/model/Users.java b/src/main/java/com/fairy_pitt/recordary/model/Users.java
index 88ccf00..41ddb7e 100644
--- a/src/main/java/com/fairy_pitt/recordary/model/Users.java
+++ b/src/main/java/com/fairy_pitt/recordary/model/Users.java
@@ -1,7 +1,9 @@
 package com.fairy_pitt.recordary.model;
 
+import com.fairy_pitt.recordary.group.domain.entity.GroupEntity;
 import lombok.Data;
 import javax.persistence.*;
+import java.util.List;
 
 @Data
 @Entity
@@ -23,4 +25,7 @@ public class Users {
 
     @Column(name = "USER_EX")
     private String userEx;
+
+    @OneToMany(fetch = FetchType.LAZY, mappedBy = "gMstUserFK")
+    private List<GroupEntity> groups;
 }
\ No newline at end of file