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 { - List findByGMstUserFK(Users GMstUserFK); +// List findByGMstUserFK(Users GMstUserFK); // List findByGNameLike(String s); // 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 resultGroupEntity = Optional.of(groupRepository.save(groupEntity)); @@ -30,8 +32,8 @@ public Boolean groupCreate(GroupEntity groupEntity){ // } // public List GroupRead(Users user){ - - return groupRepository.findByGMstUserFK(user); + return usersRepository.findByUserId(user.getUserId()) + .getGroups(); } // public List 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 groups; } \ No newline at end of file