diff --git a/src/main/java/tavebalak/OTTify/genre/dto/GenreDTO.java b/src/main/java/tavebalak/OTTify/genre/dto/GenreDTO.java index 1773eb17..f9509873 100644 --- a/src/main/java/tavebalak/OTTify/genre/dto/GenreDTO.java +++ b/src/main/java/tavebalak/OTTify/genre/dto/GenreDTO.java @@ -1,12 +1,12 @@ package tavebalak.OTTify.genre.dto; import io.swagger.annotations.ApiModelProperty; -import lombok.Builder; import lombok.Getter; import tavebalak.OTTify.genre.entity.UserGenre; @Getter public class GenreDTO { + @ApiModelProperty(value = "장르 id") private Long id; @@ -17,4 +17,9 @@ public GenreDTO(UserGenre ug) { this.id = ug.getGenre().getId(); this.name = ug.getGenre().getName(); } + + public GenreDTO(Long id, String name) { + this.id = id; + this.name = name; + } } diff --git a/src/main/java/tavebalak/OTTify/user/controller/UserController.java b/src/main/java/tavebalak/OTTify/user/controller/UserController.java index 5eb78996..eef13ec4 100644 --- a/src/main/java/tavebalak/OTTify/user/controller/UserController.java +++ b/src/main/java/tavebalak/OTTify/user/controller/UserController.java @@ -29,6 +29,7 @@ import tavebalak.OTTify.user.dto.Response.ReviewListWithSliceInfoDTO; import tavebalak.OTTify.user.dto.Response.UserOttListDTO; import tavebalak.OTTify.user.dto.Response.UserProfileDTO; +import tavebalak.OTTify.user.dto.Response.UserRoleDto; import tavebalak.OTTify.user.service.UserService; @RestController @@ -149,4 +150,11 @@ public BaseResponse getParticipatedDiscussion(@Pa page = 0) Pageable pageable) { return BaseResponse.success(userService.getParticipatedDiscussion(pageable)); } + + @ApiOperation(value = "Role 조회 api", notes = "유저의 ROLE을 조회합니다.") + @GetMapping("/role") + @ResponseStatus(HttpStatus.OK) + public BaseResponse getUserRole() { + return BaseResponse.success(userService.getUserRole()); + } } diff --git a/src/main/java/tavebalak/OTTify/user/dto/Response/UserRoleDto.java b/src/main/java/tavebalak/OTTify/user/dto/Response/UserRoleDto.java new file mode 100644 index 00000000..f8d0d4ed --- /dev/null +++ b/src/main/java/tavebalak/OTTify/user/dto/Response/UserRoleDto.java @@ -0,0 +1,16 @@ +package tavebalak.OTTify.user.dto.Response; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Getter; +import tavebalak.OTTify.common.constant.Role; + +@Getter +public class UserRoleDto { + + @ApiModelProperty(value = "Role") + private Role role; + + public UserRoleDto(Role role) { + this.role = role; + } +} diff --git a/src/main/java/tavebalak/OTTify/user/service/UserService.java b/src/main/java/tavebalak/OTTify/user/service/UserService.java index 932cee27..62fe5503 100644 --- a/src/main/java/tavebalak/OTTify/user/service/UserService.java +++ b/src/main/java/tavebalak/OTTify/user/service/UserService.java @@ -8,6 +8,7 @@ import tavebalak.OTTify.user.dto.Response.ReviewListWithSliceInfoDTO; import tavebalak.OTTify.user.dto.Response.UserOttListDTO; import tavebalak.OTTify.user.dto.Response.UserProfileDTO; +import tavebalak.OTTify.user.dto.Response.UserRoleDto; public interface UserService { @@ -30,4 +31,6 @@ public interface UserService { CommunityListWithSliceInfoDTO getHostedDiscussion(Pageable pageable); CommunityListWithSliceInfoDTO getParticipatedDiscussion(Pageable pageable); + + UserRoleDto getUserRole(); } diff --git a/src/main/java/tavebalak/OTTify/user/service/UserServiceImpl.java b/src/main/java/tavebalak/OTTify/user/service/UserServiceImpl.java index 4b0655af..b74b128b 100644 --- a/src/main/java/tavebalak/OTTify/user/service/UserServiceImpl.java +++ b/src/main/java/tavebalak/OTTify/user/service/UserServiceImpl.java @@ -45,6 +45,7 @@ import tavebalak.OTTify.user.dto.Response.UserOttDTO; import tavebalak.OTTify.user.dto.Response.UserOttListDTO; import tavebalak.OTTify.user.dto.Response.UserProfileDTO; +import tavebalak.OTTify.user.dto.Response.UserRoleDto; import tavebalak.OTTify.user.entity.User; import tavebalak.OTTify.user.entity.UserSubscribingOTT; import tavebalak.OTTify.user.repository.LikedCommunityRepository; @@ -389,6 +390,12 @@ private MyReviewDto createReviewDto(Review r) { .build(); } + @Override + public UserRoleDto getUserRole() { + User user = getUser(); + return new UserRoleDto(user.getRole()); + } + private User getUser() { return userRepository.findByEmail(SecurityUtil.getCurrentEmail().get()) .orElseThrow(() -> new UnauthorizedException(ErrorCode.UNAUTHORIZED));