diff --git a/src/main/java/com/fairy_pitt/recordary/common/entity/GroupEntity.java b/src/main/java/com/fairy_pitt/recordary/common/entity/GroupEntity.java index 93b2a50..5e9d382 100644 --- a/src/main/java/com/fairy_pitt/recordary/common/entity/GroupEntity.java +++ b/src/main/java/com/fairy_pitt/recordary/common/entity/GroupEntity.java @@ -25,7 +25,7 @@ public class GroupEntity extends BaseTimeEntity{ private UserEntity gMstUserFK; @Column(name = "GROUP_NM") - private String groupName; + private String groupNm; @Column(name = "GROUP_PB_ST" ) private Boolean groupState; @@ -50,23 +50,23 @@ public class GroupEntity extends BaseTimeEntity{ @Builder public GroupEntity(UserEntity gMstUserFK, - String groupName, + String groupNm, Boolean groupState, String groupPic, String groupEx) { this.gMstUserFK = gMstUserFK; - this.groupName = groupName; + this.groupNm = groupNm; this.groupState = groupState; this.groupPic = groupPic; this.groupEx = groupEx; } - public void updateGroupInfo(String groupName, + public void updateGroupInfo(String groupNm, Boolean groupState, String groupPic, String groupEx) { - this.groupName = groupName; + this.groupNm = groupNm; this.groupState = groupState; this.groupPic = groupPic; this.groupEx = groupEx; diff --git a/src/main/java/com/fairy_pitt/recordary/common/repository/GroupRepository.java b/src/main/java/com/fairy_pitt/recordary/common/repository/GroupRepository.java index 261ae70..31d7fa3 100644 --- a/src/main/java/com/fairy_pitt/recordary/common/repository/GroupRepository.java +++ b/src/main/java/com/fairy_pitt/recordary/common/repository/GroupRepository.java @@ -8,7 +8,7 @@ @Repository public interface GroupRepository extends JpaRepository { - List findByGroupNameLike(String gName);//findByContentLike + List findByGroupNmLike(String groupNm);//findByContentLike GroupEntity findByGroupCd(Long groupCd); List findAllByGroupState(boolean state); } diff --git a/src/main/java/com/fairy_pitt/recordary/endpoint/group/GroupController.java b/src/main/java/com/fairy_pitt/recordary/endpoint/group/GroupController.java index d48d1fe..117f476 100644 --- a/src/main/java/com/fairy_pitt/recordary/endpoint/group/GroupController.java +++ b/src/main/java/com/fairy_pitt/recordary/endpoint/group/GroupController.java @@ -63,9 +63,9 @@ public Long deleteGroup(@PathVariable Long groupCd) { return groupCd; } - @GetMapping("findGroup/{groupName}") - public List findAllGroup(@PathVariable String groupName) { - return groupService.findGroupByName(groupName); + @GetMapping("findGroup/{groupNm}") + public List findAllGroup(@PathVariable String groupNm) { + return groupService.findGroupByName(groupNm); } @GetMapping("{groupCd}") @@ -81,10 +81,10 @@ List findAllGroup() { } - @GetMapping("group/{userId}") - public List findUserGroup(@PathVariable Long userId) { + @GetMapping("group/{userCd}") + public List findUserGroup(@PathVariable Long userCd) { - return groupService.findUserGroups(userId); + return groupService.findUserGroups(userCd); } @GetMapping("member/{groupCd}") diff --git a/src/main/java/com/fairy_pitt/recordary/endpoint/group/dto/GroupApplyResponseDto.java b/src/main/java/com/fairy_pitt/recordary/endpoint/group/dto/GroupApplyResponseDto.java index e16eaea..efffe3a 100644 --- a/src/main/java/com/fairy_pitt/recordary/endpoint/group/dto/GroupApplyResponseDto.java +++ b/src/main/java/com/fairy_pitt/recordary/endpoint/group/dto/GroupApplyResponseDto.java @@ -27,6 +27,6 @@ public GroupApplyResponseDto(GroupApplyEntity entity) this.userNm = entity.getUserFK().getUserNm(); this.userId = entity.getUserFK().getUserId(); this.userPic= entity.getUserFK().getUserPic(); - this.groupNm = entity.getGroupFK().getGroupName(); + this.groupNm = entity.getGroupFK().getGroupNm(); } } diff --git a/src/main/java/com/fairy_pitt/recordary/endpoint/group/dto/GroupResponseDto.java b/src/main/java/com/fairy_pitt/recordary/endpoint/group/dto/GroupResponseDto.java index 03061c9..6fcaec0 100644 --- a/src/main/java/com/fairy_pitt/recordary/endpoint/group/dto/GroupResponseDto.java +++ b/src/main/java/com/fairy_pitt/recordary/endpoint/group/dto/GroupResponseDto.java @@ -21,7 +21,7 @@ public GroupResponseDto(GroupEntity entity) { this.groupCd = entity.getGroupCd(); this.userCd = entity.getGMstUserFK().getUserCd(); - this.groupNm = entity.getGroupName(); + this.groupNm = entity.getGroupNm(); this.groupState = entity.getGroupState(); this.groupEx = entity.getGroupEx(); this.groupPic = entity.getGroupPic(); @@ -32,7 +32,7 @@ public GroupResponseDto(GroupEntity entity, UserEntity user) { this.groupCd = entity.getGroupCd(); this.userCd = entity.getGMstUserFK().getUserCd(); - this.groupNm = entity.getGroupName(); + this.groupNm = entity.getGroupNm(); this.groupState = entity.getGroupState(); this.groupEx = entity.getGroupEx(); this.groupPic = entity.getGroupPic(); diff --git a/src/main/java/com/fairy_pitt/recordary/endpoint/group/dto/GroupSaveRequestDto.java b/src/main/java/com/fairy_pitt/recordary/endpoint/group/dto/GroupSaveRequestDto.java index d251a65..8f1e9c2 100644 --- a/src/main/java/com/fairy_pitt/recordary/endpoint/group/dto/GroupSaveRequestDto.java +++ b/src/main/java/com/fairy_pitt/recordary/endpoint/group/dto/GroupSaveRequestDto.java @@ -31,7 +31,7 @@ public GroupEntity toEntity(UserEntity user, String url){ return GroupEntity.builder() .gMstUserFK(user) .groupEx(groupEx) - .groupName(groupNm) + .groupNm(groupNm) .groupState(groupState) .groupPic(url) .build(); diff --git a/src/main/java/com/fairy_pitt/recordary/endpoint/group/service/GroupService.java b/src/main/java/com/fairy_pitt/recordary/endpoint/group/service/GroupService.java index d4db995..7aebbc9 100644 --- a/src/main/java/com/fairy_pitt/recordary/endpoint/group/service/GroupService.java +++ b/src/main/java/com/fairy_pitt/recordary/endpoint/group/service/GroupService.java @@ -54,11 +54,11 @@ public Long updateGroupInfo(Long id, @RequestBody GroupUpdateRequestDto groupDto } @Transactional - public Long changGroupMaster(Long UserId, Long groupCd) { + public Long changGroupMaster(Long userCd, Long groupCd) { GroupEntity groupEntity = groupRepository.findById(groupCd) .orElseThrow(() -> new IllegalArgumentException("해당 그룹이 없습니다. id=" + groupCd)); - UserEntity User = userService.findEntity(UserId); + UserEntity User = userService.findEntity(userCd); groupEntity.updateGroupMaster(User); return groupCd; @@ -90,7 +90,7 @@ public List findAllGroup(){ @Transactional(readOnly = true) public List findGroupByName(String groupName){ - return groupRepository.findByGroupNameLike("%"+groupName+"%").stream() + return groupRepository.findByGroupNmLike("%"+groupName+"%").stream() .map(GroupResponseDto::new) .collect(Collectors.toList()); } diff --git a/src/test/java/com/fairy_pitt/recordary/common/group/GroupRepositoryTest.java b/src/test/java/com/fairy_pitt/recordary/common/group/GroupRepositoryTest.java index 6b05a94..a8df5b4 100644 --- a/src/test/java/com/fairy_pitt/recordary/common/group/GroupRepositoryTest.java +++ b/src/test/java/com/fairy_pitt/recordary/common/group/GroupRepositoryTest.java @@ -39,7 +39,7 @@ public void cleanUp() groupRepository.save(GroupEntity.builder() .gMstUserFK(null) - .groupName(groupName) + .groupNm(groupName) .groupState(true) .groupPic(null) .groupEx(groupEx) @@ -51,7 +51,7 @@ public void cleanUp() //then GroupEntity groupEntity = groupList.get(0); assertThat(groupEntity.getGroupEx()).isEqualTo(groupEx); - assertThat(groupEntity.getGroupName()).isEqualTo(groupName); + assertThat(groupEntity.getGroupNm()).isEqualTo(groupName); } diff --git a/src/test/java/com/fairy_pitt/recordary/endpoint/group/GroupApplyControllerTest.java b/src/test/java/com/fairy_pitt/recordary/endpoint/group/GroupApplyControllerTest.java index c219efe..f1fd3ac 100644 --- a/src/test/java/com/fairy_pitt/recordary/endpoint/group/GroupApplyControllerTest.java +++ b/src/test/java/com/fairy_pitt/recordary/endpoint/group/GroupApplyControllerTest.java @@ -74,7 +74,7 @@ public void tearDown() throws Exception{ GroupEntity groupEntity = groupRepository.save( GroupEntity.builder() .gMstUserFK(saveUser) - .groupName(groupName) + .groupNm(groupName) .groupState(true) .groupPic(groupPic) .groupEx(groupEx) diff --git a/src/test/java/com/fairy_pitt/recordary/endpoint/group/GroupControllerTest.java b/src/test/java/com/fairy_pitt/recordary/endpoint/group/GroupControllerTest.java index af81c63..23ece49 100644 --- a/src/test/java/com/fairy_pitt/recordary/endpoint/group/GroupControllerTest.java +++ b/src/test/java/com/fairy_pitt/recordary/endpoint/group/GroupControllerTest.java @@ -93,7 +93,7 @@ public void tearDown() throws Exception{ List all = groupRepository.findAll(); assertThat(all.get(0).getGroupEx()).isEqualTo(groupEx); - assertThat(all.get(0).getGroupName()).isEqualTo(groupName); + assertThat(all.get(0).getGroupNm()).isEqualTo(groupName); } @@ -113,7 +113,7 @@ public void tearDown() throws Exception{ GroupEntity groupEntity = groupRepository.save( GroupEntity.builder() .gMstUserFK(saveUser) - .groupName(groupName) + .groupNm(groupName) .groupState(true) .groupPic(groupPic) .groupEx(groupEx) @@ -141,7 +141,7 @@ public void tearDown() throws Exception{ List all = groupRepository.findAll(); assertThat(all.get(0).getGroupEx()).isEqualTo(groupEx2); - assertThat(all.get(0).getGroupName()).isEqualTo(groupName); + assertThat(all.get(0).getGroupNm()).isEqualTo(groupName); } @Test @@ -160,13 +160,13 @@ public void tearDown() throws Exception{ GroupEntity groupEntity = groupRepository.save( GroupEntity.builder() .gMstUserFK(saveUser) - .groupName(groupName) + .groupNm(groupName) .groupState(true) .groupPic(groupPic) .groupEx(groupEx) .build()); - Long groupId = groupEntity.getGroupCd(); + Long groupCd = groupEntity.getGroupCd(); UserEntity changeUser = userRepository.save(UserEntity.builder() @@ -175,7 +175,7 @@ public void tearDown() throws Exception{ .userNm("테스트 유저222222") .build()); - String url = "http://localhost:" + port + "group/changeMaster/" + groupId; + String url = "http://localhost:" + port + "group/changeMaster/" + groupCd; Long userCd = changeUser.getUserCd(); //when ResponseEntity responseEntity = restTemplate.postForEntity(url,userCd,Long.class); @@ -186,7 +186,7 @@ public void tearDown() throws Exception{ List all = groupRepository.findAll(); assertThat(all.get(0).getGMstUserFK().getUserCd()).isEqualTo(changeUser.getUserCd()); - assertThat(all.get(0).getGroupName()).isEqualTo(groupName); + assertThat(all.get(0).getGroupNm()).isEqualTo(groupName); } @Test @@ -206,7 +206,7 @@ public void tearDown() throws Exception{ GroupEntity groupEntity = groupRepository.save(GroupEntity.builder() .gMstUserFK(saveUser) - .groupName(groupName) + .groupNm(groupName) .groupState(true) .groupPic(groupPic) .groupEx(groupEx) @@ -214,7 +214,7 @@ public void tearDown() throws Exception{ GroupEntity groupEntity2 = groupRepository.save(GroupEntity.builder() .gMstUserFK(saveUser) - .groupName(groupName) + .groupNm(groupName) .groupState(true) .groupPic(groupPic) .groupEx(groupEx) @@ -249,7 +249,7 @@ public void tearDown() throws Exception{ GroupEntity groupEntity = groupRepository.save(GroupEntity.builder() .gMstUserFK(saveUser) - .groupName(groupName) + .groupNm(groupName) .groupState(true) .groupPic(groupPic) .groupEx(groupEx) diff --git a/src/test/java/com/fairy_pitt/recordary/endpoint/group/GroupMemberControllerTest.java b/src/test/java/com/fairy_pitt/recordary/endpoint/group/GroupMemberControllerTest.java index 7edaa3b..3b957ea 100644 --- a/src/test/java/com/fairy_pitt/recordary/endpoint/group/GroupMemberControllerTest.java +++ b/src/test/java/com/fairy_pitt/recordary/endpoint/group/GroupMemberControllerTest.java @@ -73,7 +73,7 @@ public void tearDown() throws Exception { GroupEntity groupEntity = groupRepository.save(GroupEntity.builder() .gMstUserFK(saveUser) - .groupName(groupName) + .groupNm(groupName) .groupState(true) .groupPic(groupPic) .groupEx(groupEx)