Skip to content
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
7 changes: 6 additions & 1 deletion src/main/java/tavebalak/OTTify/genre/dto/GenreDTO.java
Original file line number Diff line number Diff line change
@@ -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;

Expand All @@ -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;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -149,4 +150,11 @@ public BaseResponse<CommunityListWithSliceInfoDTO> 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<UserRoleDto> getUserRole() {
return BaseResponse.success(userService.getUserRole());
}
}
16 changes: 16 additions & 0 deletions src/main/java/tavebalak/OTTify/user/dto/Response/UserRoleDto.java
Original file line number Diff line number Diff line change
@@ -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;
}
}
3 changes: 3 additions & 0 deletions src/main/java/tavebalak/OTTify/user/service/UserService.java
Original file line number Diff line number Diff line change
Expand Up @@ -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 {

Expand All @@ -30,4 +31,6 @@ public interface UserService {
CommunityListWithSliceInfoDTO getHostedDiscussion(Pageable pageable);

CommunityListWithSliceInfoDTO getParticipatedDiscussion(Pageable pageable);

UserRoleDto getUserRole();
}
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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));
Expand Down