diff --git a/src/main/java/com/bookmile/backend/domain/group/controller/GroupController.java b/src/main/java/com/bookmile/backend/domain/group/controller/GroupController.java index 03b2c11..bd30e54 100644 --- a/src/main/java/com/bookmile/backend/domain/group/controller/GroupController.java +++ b/src/main/java/com/bookmile/backend/domain/group/controller/GroupController.java @@ -6,7 +6,6 @@ import com.bookmile.backend.domain.group.service.GroupService; import com.bookmile.backend.domain.group.service.Impl.GroupMemberServiceImpl; import com.bookmile.backend.global.common.CommonResponse; -import com.bookmile.backend.domain.user.entity.User; import io.swagger.v3.oas.annotations.Operation; import jakarta.validation.Valid; import lombok.RequiredArgsConstructor; @@ -120,9 +119,11 @@ public ResponseEntity getGroupDetail(@PathVariable Long @Operation(summary = "그룹 공개/비공개 전환", description = "그룹장은 그룹 공개여부를 변경할 수 있습니다.") public ResponseEntity> updateGroupVisibility( @PathVariable Long groupId, - @RequestBody @Valid GroupPrivateRequestDto requestDto + @RequestBody @Valid GroupPrivateRequestDto requestDto, + @AuthenticationPrincipal UserDetails userDetails ) { - groupService.updateGroupPrivate(groupId, requestDto.getIsOpen(), requestDto.getUserId()); + String userEmail = userDetails.getUsername(); + groupService.updateGroupPrivate(groupId, requestDto.getIsOpen(), userEmail); return ResponseEntity.ok(CommonResponse.from(GROUP_PRIVATE_UPDATE.getMessage())); } } diff --git a/src/main/java/com/bookmile/backend/domain/group/dto/req/GroupPrivateRequestDto.java b/src/main/java/com/bookmile/backend/domain/group/dto/req/GroupPrivateRequestDto.java index 10d978f..a5f5d5d 100644 --- a/src/main/java/com/bookmile/backend/domain/group/dto/req/GroupPrivateRequestDto.java +++ b/src/main/java/com/bookmile/backend/domain/group/dto/req/GroupPrivateRequestDto.java @@ -6,6 +6,5 @@ @Getter @NoArgsConstructor public class GroupPrivateRequestDto { - private Long userId; private Boolean isOpen; } \ No newline at end of file diff --git a/src/main/java/com/bookmile/backend/domain/group/service/GroupService.java b/src/main/java/com/bookmile/backend/domain/group/service/GroupService.java index c06242c..4b5a5fa 100644 --- a/src/main/java/com/bookmile/backend/domain/group/service/GroupService.java +++ b/src/main/java/com/bookmile/backend/domain/group/service/GroupService.java @@ -21,5 +21,5 @@ public interface GroupService { GroupDetailResponseDto getGroupDetail(Long groupId); - void updateGroupPrivate(Long groupId, Boolean isOpen, Long userId); + void updateGroupPrivate(Long groupId, Boolean isOpen, String userEmail); } diff --git a/src/main/java/com/bookmile/backend/domain/group/service/Impl/GroupServiceImpl.java b/src/main/java/com/bookmile/backend/domain/group/service/Impl/GroupServiceImpl.java index bd60af2..ca9fff1 100644 --- a/src/main/java/com/bookmile/backend/domain/group/service/Impl/GroupServiceImpl.java +++ b/src/main/java/com/bookmile/backend/domain/group/service/Impl/GroupServiceImpl.java @@ -135,10 +135,11 @@ public GroupDetailResponseDto getGroupDetail(Long groupId) { @Override @Transactional - public void updateGroupPrivate(Long groupId, Boolean isOpen, Long userId) { + public void updateGroupPrivate(Long groupId, Boolean isOpen, String userEmail) { + User user = validateUserByEmail(userEmail); Group group = findGroupById(groupId); - UserGroup userGroup = findUserGroupById(userId, groupId); + UserGroup userGroup = findUserGroupById(user.getId(), groupId); validateGroupMaster(userGroup); group.setIsOpen(isOpen);