Skip to content
This repository was archived by the owner on Oct 23, 2022. It is now read-only.
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,17 +3,19 @@
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;

import java.util.List;
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));
Expand All @@ -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){
Expand Down
5 changes: 5 additions & 0 deletions src/main/java/com/fairy_pitt/recordary/model/Users.java
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -23,4 +25,7 @@ public class Users {

@Column(name = "USER_EX")
private String userEx;

@OneToMany(fetch = FetchType.LAZY, mappedBy = "gMstUserFK")
private List<GroupEntity> groups;
}