Merge pull request #101 from jyjyjy25/feature/#99-ott-id

src/main/java/tavebalak/OTTify/genre/controller/GenreShowSavedController.java

@@ -19,12 +19,10 @@ public class GenreShowSavedController {
 
     private final GenreShowSavedService genreShowSavedService;
 
-    @ApiOperation(value = "저장된 장르 리스트들을 보여줍니다", notes = "장르 저장시 사용하면 됩니다")
+    @ApiOperation(value = "저장된 장르 리스트들을 보여줍니다", notes = "장르 조회 시 사용하시면 됩니다.")
     @GetMapping("/api/v1/show/saved/genre")
     @ResponseStatus(HttpStatus.OK)
     public BaseResponse<GenreShowSavedListDto> showGenreSavedList() {
         return BaseResponse.success(genreShowSavedService.showGenreList());
     }
-
-
 }

src/main/java/tavebalak/OTTify/genre/dto/GenreDTO.java

@@ -1,12 +1,16 @@
 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;
+
+    @ApiModelProperty(value = "장르 이름")
     private String name;
 
     public GenreDTO(UserGenre ug) {

src/main/java/tavebalak/OTTify/program/controller/OttSavedController.java

@@ -0,0 +1,31 @@
+package tavebalak.OTTify.program.controller;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiResponse;
+import lombok.RequiredArgsConstructor;
+import org.springframework.http.HttpStatus;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseStatus;
+import org.springframework.web.bind.annotation.RestController;
+import tavebalak.OTTify.common.BaseResponse;
+import tavebalak.OTTify.program.dto.response.OttListDTO;
+import tavebalak.OTTify.program.service.OttService;
+
+@RestController
+@RequiredArgsConstructor
+@RequestMapping("/api/v1/saved/ott")
+@Api(tags = {"OTT 컨트롤러"})
+public class OttSavedController {
+
+    private final OttService ottService;
+
+    @ApiOperation(value = "저장된 OTT 리스트 조회", notes = "저장된 모든 OTT의 아이디와 이름을 조회합니다.")
+    @ApiResponse(code = 200, message = "성공적으로 저장된 OTT 리스트를 조회하였습니다.")
+    @GetMapping("")
+    @ResponseStatus(HttpStatus.OK)
+    public BaseResponse<OttListDTO> getOttList() {
+        return BaseResponse.success(ottService.getOttList());
+    }
+}

src/main/java/tavebalak/OTTify/program/dto/response/OttDTO.java

@@ -0,0 +1,21 @@
+package tavebalak.OTTify.program.dto.response;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import tavebalak.OTTify.program.entity.Ott;
+
+@Getter
+@NoArgsConstructor
+public class OttDTO {
+    @ApiModelProperty(value = "OTT id")
+    private Long id;
+
+    @ApiModelProperty(value = "OTT 이름")
+    private String name;
+
+    public OttDTO(Ott ott) {
+        this.id = ott.getId();
+        this.name = ott.getName();
+    }
+}

src/main/java/tavebalak/OTTify/program/dto/response/OttListDTO.java

@@ -0,0 +1,17 @@
+package tavebalak.OTTify.program.dto.response;
+
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@Getter
+@NoArgsConstructor
+public class OttListDTO {
+    List<OttDTO> ottList = new ArrayList<>();
+
+    public OttListDTO(List<OttDTO> ottList) {
+        this.ottList = ottList;
+    }
+}

src/main/java/tavebalak/OTTify/program/service/OttService.java

@@ -0,0 +1,7 @@
+package tavebalak.OTTify.program.service;
+
+import tavebalak.OTTify.program.dto.response.OttListDTO;
+
+public interface OttService {
+    OttListDTO getOttList();
+}

src/main/java/tavebalak/OTTify/program/service/OttServiceImpl.java

@@ -0,0 +1,28 @@
+package tavebalak.OTTify.program.service;
+
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import tavebalak.OTTify.program.dto.response.OttDTO;
+import tavebalak.OTTify.program.dto.response.OttListDTO;
+import tavebalak.OTTify.program.repository.OttRepository;
+
+import java.util.List;
+import java.util.stream.Collectors;
+
+@Service
+@Transactional(readOnly = true)
+@RequiredArgsConstructor
+public class OttServiceImpl implements OttService {
+
+    private final OttRepository ottRepository;
+
+    @Override
+    public OttListDTO getOttList() {
+        List<OttDTO> ottDTOList = ottRepository.findAll().stream()
+                .map(OttDTO::new)
+                .collect(Collectors.toList());
+
+        return new OttListDTO(ottDTOList);
+    }
+}

src/main/java/tavebalak/OTTify/review/dto/UserReviewRatingListDTO.java

@@ -1,5 +1,6 @@
 package tavebalak.OTTify.review.dto;
 
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Builder;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
@@ -8,16 +9,37 @@
 @NoArgsConstructor
 public class UserReviewRatingListDTO {
 
+    @ApiModelProperty(value = "총 리뷰 수")
     private int totalCnt;
+
+    @ApiModelProperty(value = "0.5점 리뷰 수")
     private int pointFiveCnt;
+
+    @ApiModelProperty(value = "1점 리뷰 수")
     private int oneCnt;
+
+    @ApiModelProperty(value = "1.5점 리뷰 수")
     private int oneDotFiveCnt;
+
+    @ApiModelProperty(value = "2점 리뷰 수")
     private int twoCnt;
+
+    @ApiModelProperty(value = "2.5점 리뷰 수")
     private int twoDotFiveCnt;
+
+    @ApiModelProperty(value = "3점 리뷰 수")
     private int threeCnt;
+
+    @ApiModelProperty(value = "3.5점 리뷰 수")
     private int threeDotFiveCnt;
+
+    @ApiModelProperty(value = "4점 리뷰 수")
     private int fourCnt;
+
+    @ApiModelProperty(value = "4.5점 리뷰 수")
     private int fourDotFiveCnt;
+
+    @ApiModelProperty(value = "5점 리뷰 수")
     private int fiveCnt;
 
     @Builder

src/main/java/tavebalak/OTTify/review/repository/ReviewRepository.java

@@ -13,14 +13,12 @@
 import tavebalak.OTTify.user.entity.User;
 
 public interface ReviewRepository extends JpaRepository<Review, Long> {
-
-    Slice<Review> findByUserIdOrderByCreatedAt(@Param("userId") Long userId, Pageable pageable);
+    Slice<Review> findByUserIdOrderByCreatedAt(Long userId, Pageable pageable);
 
     boolean existsByProgramAndUser(Program program, User user);
 
     Optional<Review> findByProgramAndUser(Program program, User user);
 
-
     List<Review> findTop4ByProgramOrderByLikeCountsDesc(Program program);
 
     // Slice 로 전체 리뷰 가져오기

src/main/java/tavebalak/OTTify/user/controller/UserController.java

@@ -51,7 +51,8 @@ public BaseResponse<UserOttListDTO> getUserOTT(@PathVariable("userId") Long user
     @ApiResponse(code = 200, message = "성공적으로 프로필이 업데이트 되었습니다.")
     @PatchMapping("/{userId}/profile")
     @ResponseStatus(HttpStatus.OK)
-    public BaseResponse updateUserProfile(@PathVariable("userId") Long userId, @Validated @RequestBody UserProfileUpdateDTO updateRequestDTO) {
+    public BaseResponse updateUserProfile(@PathVariable("userId") Long userId,
+        @Validated @RequestBody UserProfileUpdateDTO updateRequestDTO) {
         userService.updateUserProfile(userId, updateRequestDTO);
         return BaseResponse.success("성공적으로 프로필이 업데이트 되었습니다.");
     }
@@ -61,7 +62,8 @@ public BaseResponse updateUserProfile(@PathVariable("userId") Long userId, @Vali
     @ApiResponse(code = 200, message = "성공적으로 구독 중인 OTT가 업데이트 되었습니다.")
     @PatchMapping("/{userId}/otts")
     @ResponseStatus(HttpStatus.OK)
-    public BaseResponse updateUserOTT(@PathVariable("userId") Long userId, @RequestBody UserOttUpdateDTO updateRequestDTO) {
+    public BaseResponse updateUserOTT(@PathVariable("userId") Long userId,
+        @RequestBody UserOttUpdateDTO updateRequestDTO) {
         userService.updateUserOTT(userId, updateRequestDTO);
         return BaseResponse.success("성공적으로 구독 중인 OTT가 업데이트 되었습니다.");
     }
@@ -71,7 +73,8 @@ public BaseResponse updateUserOTT(@PathVariable("userId") Long userId, @RequestB
     @ApiResponse(code = 200, message = "성공적으로 1순위 장르가 업데이트 되었습니다.")
     @PatchMapping("/{userId}/1stGenre")
     @ResponseStatus(HttpStatus.OK)
-    public BaseResponse update1stLikedGenre(@PathVariable("userId") Long userId, @Validated @RequestBody GenreUpdateDTO updateRequestDto) {
+    public BaseResponse update1stLikedGenre(@PathVariable("userId") Long userId,
+        @Validated @RequestBody GenreUpdateDTO updateRequestDto) {
         userService.update1stGenre(userId, updateRequestDto);
         return BaseResponse.success("성공적으로 1순위 장르가 업데이트 되었습니다.");
     }
@@ -81,22 +84,24 @@ public BaseResponse update1stLikedGenre(@PathVariable("userId") Long userId, @Va
     @ApiResponse(code = 200, message = "성공적으로 2순위 장르가 업데이트 되었습니다.")
     @PatchMapping("/{userId}/2ndGenre")
     @ResponseStatus(HttpStatus.OK)
-    public BaseResponse update2ndLikedGenre(@PathVariable("userId") Long userId, @Validated @RequestBody GenreUpdateDTO updateRequestDTO) {
+    public BaseResponse update2ndLikedGenre(@PathVariable("userId") Long userId,
+        @Validated @RequestBody GenreUpdateDTO updateRequestDTO) {
         userService.update2ndGenre(userId, updateRequestDTO);
         return BaseResponse.success("성공적으로 2순위 장르가 업데이트 되었습니다.");
     }
 
     @ApiOperation(value = "작성 리뷰 조회 api", notes = "유저가 작성한 리뷰를 조회합니다.")
     @ApiImplicitParams({
-            @ApiImplicitParam(name = "userId", dataType = "long", value = "유저 id", required = true, paramType = "path"),
-            @ApiImplicitParam(name = "page", dataType = "int", value = "페이지 번호(0부터 시작)", required = false, paramType = "path"),
-            @ApiImplicitParam(name = "direction", dataType = "String", value = "내림차순과 오름차순", required = false, paramType = "path"),
-            @ApiImplicitParam(name = "sort", dataType = "String", value = "정렬기준(createdAt, updatedAt)", required = false, paramType = "path"),
-            @ApiImplicitParam(name = "size", dataType = "int", value = "페이지당 아이템 갯수", required = false, paramType = "path")
+        @ApiImplicitParam(name = "userId", dataType = "long", value = "유저 id", required = true, paramType = "path"),
+        @ApiImplicitParam(name = "page", dataType = "int", value = "페이지 번호(0부터 시작)", paramType = "query"),
+        @ApiImplicitParam(name = "direction", dataType = "String", value = "내림차순과 오름차순", paramType = "query"),
+        @ApiImplicitParam(name = "sort", dataType = "String", value = "정렬기준(createdAt, updatedAt)", paramType = "query"),
+        @ApiImplicitParam(name = "size", dataType = "int", value = "페이지당 아이템 갯수", paramType = "query")
     })
     @GetMapping("/{userId}/reviews")
     @ResponseStatus(HttpStatus.OK)
-    public BaseResponse<List<MyReviewDto>> getMyReview(@PathVariable("userId") Long userId, @PageableDefault(
+    public BaseResponse<List<MyReviewDto>> getMyReview(@PathVariable("userId") Long userId,
+        @PageableDefault(
             size = 5,
             sort = "createdAt",
             direction = Sort.Direction.DESC,
@@ -106,47 +111,50 @@ public BaseResponse<List<MyReviewDto>> getMyReview(@PathVariable("userId") Long
 
     @ApiOperation(value = "좋아요한 리뷰 조회 api", notes = "유저가 좋아요한 리뷰를 조회합니다.")
     @ApiImplicitParams({
-            @ApiImplicitParam(name = "userId", dataType = "long", value = "유저 id", required = true, paramType = "path"),
-            @ApiImplicitParam(name = "page", dataType = "int", value = "페이지 번호(0부터 시작)", required = false, paramType = "path"),
-            @ApiImplicitParam(name = "size", dataType = "int", value = "페이지당 아이템 갯수", required = false, paramType = "path")
+        @ApiImplicitParam(name = "userId", dataType = "long", value = "유저 id", required = true, paramType = "path"),
+        @ApiImplicitParam(name = "page", dataType = "int", value = "페이지 번호(0부터 시작)", paramType = "query"),
+        @ApiImplicitParam(name = "size", dataType = "int", value = "페이지당 아이템 갯수", paramType = "query")
     })
     @GetMapping("/{userId}/likedReviews")
     @ResponseStatus(HttpStatus.OK)
-    public BaseResponse<List<MyReviewDto>> getLikedReview(@PathVariable("userId") Long userId, @PageableDefault(
+    public BaseResponse<List<MyReviewDto>> getLikedReview(@PathVariable("userId") Long userId,
+        @PageableDefault(
             size = 5,
             page = 0) Pageable pageable) {
         return BaseResponse.success(userService.getLikedReview(userId, pageable));
     }
 
     @ApiOperation(value = "주최한 토론 조회 api", notes = "유저가 주최한 토론을 조회합니다.")
     @ApiImplicitParams({
-            @ApiImplicitParam(name = "userId", dataType = "long", value = "유저 id", required = true, paramType = "path"),
-            @ApiImplicitParam(name = "page", dataType = "int", value = "페이지 번호(0부터 시작)", required = false, paramType = "path"),
-            @ApiImplicitParam(name = "direction", dataType = "String", value = "내림차순과 오름차순", required = false, paramType = "path"),
-            @ApiImplicitParam(name = "sort", dataType = "String", value = "정렬기준(createdAt, updatedAt)", required = false, paramType = "path"),
-            @ApiImplicitParam(name = "size", dataType = "int", value = "페이지당 아이템 갯수", required = false, paramType = "path")
+        @ApiImplicitParam(name = "userId", dataType = "long", value = "유저 id", required = true, paramType = "path"),
+        @ApiImplicitParam(name = "page", dataType = "int", value = "페이지 번호(0부터 시작)", paramType = "query"),
+        @ApiImplicitParam(name = "direction", dataType = "String", value = "내림차순과 오름차순", paramType = "query"),
+        @ApiImplicitParam(name = "sort", dataType = "String", value = "정렬기준(createdAt, updatedAt)", paramType = "query"),
+        @ApiImplicitParam(name = "size", dataType = "int", value = "페이지당 아이템 갯수", paramType = "query")
     })
     @GetMapping("/{userId}/discussion/hosting")
     @ResponseStatus(HttpStatus.OK)
-    public BaseResponse<List<MyDiscussionDto>> getHostedDiscussion(@PathVariable("userId") Long userId, @PageableDefault(
-            size = 5,
-            sort = "createdAt",
-            direction = Sort.Direction.DESC,
-            page = 0) Pageable pageable) {
+    public BaseResponse<List<MyDiscussionDto>> getHostedDiscussion(
+        @PathVariable("userId") Long userId, @PageableDefault(
+        size = 5,
+        sort = "createdAt",
+        direction = Sort.Direction.DESC,
+        page = 0) Pageable pageable) {
         return BaseResponse.success(userService.getHostedDiscussion(userId, pageable));
     }
 
     @ApiOperation(value = "참여한 토론 조회 api", notes = "유저가 참여한 토론을 조회합니다.")
     @ApiImplicitParams({
-            @ApiImplicitParam(name = "userId", dataType = "long", value = "유저 id", required = true, paramType = "path"),
-            @ApiImplicitParam(name = "page", dataType = "int", value = "페이지 번호(0부터 시작)", required = false, paramType = "path"),
-            @ApiImplicitParam(name = "size", dataType = "int", value = "페이지당 아이템 갯수", required = false, paramType = "path")
+        @ApiImplicitParam(name = "userId", dataType = "long", value = "유저 id", required = true, paramType = "path"),
+        @ApiImplicitParam(name = "page", dataType = "int", value = "페이지 번호(0부터 시작)", paramType = "query"),
+        @ApiImplicitParam(name = "size", dataType = "int", value = "페이지당 아이템 갯수", paramType = "query")
     })
     @GetMapping("/{userId}/discussion/participating")
     @ResponseStatus(HttpStatus.OK)
-    public BaseResponse<List<MyDiscussionDto>> getParticipatedDiscussion(@PathVariable("userId") Long userId, @PageableDefault(
-            size = 5,
-            page = 0) Pageable pageable) {
+    public BaseResponse<List<MyDiscussionDto>> getParticipatedDiscussion(
+        @PathVariable("userId") Long userId, @PageableDefault(
+        size = 5,
+        page = 0) Pageable pageable) {
         return BaseResponse.success(userService.getParticipatedDiscussion(userId, pageable));
     }
 }

src/main/java/tavebalak/OTTify/user/dto/Request/UserOttUpdateDTO.java

@@ -1,11 +1,10 @@
 package tavebalak.OTTify.user.dto.Request;
 
+import java.util.List;
+import javax.validation.constraints.NotNull;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 
-import javax.validation.constraints.NotNull;
-import java.util.List;
-
 @Getter
 @NoArgsConstructor
 public class UserOttUpdateDTO {

src/main/java/tavebalak/OTTify/user/dto/Request/UserProfileUpdateDTO.java

@@ -1,21 +1,20 @@
 package tavebalak.OTTify.user.dto.Request;
 
+import javax.validation.constraints.NotNull;
+import javax.validation.constraints.Pattern;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import org.hibernate.validator.constraints.Length;
 
-import javax.validation.constraints.NotNull;
-import javax.validation.constraints.Pattern;
-
 @Getter
 @NoArgsConstructor
 public class UserProfileUpdateDTO {
 
-     @NotNull(message = "닉네임을 입력해주세요.")
-     @Pattern(regexp = "^[ㄱ-ㅎ가-힣a-z0-9-_]{2,10}$", message="닉네임은 특수문자를 제외한 2 ~ 10자리여야 합니다.")
-     @Length(min=2, max=10, message="닉네임은 2자 이상, 10자 이하로 입력해주세요")
-     private String nickName;
+    @NotNull(message = "닉네임을 입력해주세요.")
+    @Pattern(regexp = "^[ㄱ-ㅎ가-힣a-z0-9-_]{2,10}$", message = "닉네임은 특수문자를 제외한 2 ~ 10자리여야 합니다.")
+    @Length(min = 2, max = 10, message = "닉네임은 2자 이상, 10자 이하로 입력해주세요")
+    private String nickName;
 
-     @NotNull(message = "사진을 업로드해주세요.")
-     private String profilePhoto;
+    @NotNull(message = "사진을 업로드해주세요.")
+    private String profilePhoto;
 }

src/main/java/tavebalak/OTTify/user/dto/Response/LikedProgramDTO.java

@@ -1,13 +1,18 @@
 package tavebalak.OTTify.user.dto.Response;
 
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Builder;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 
 @Getter
 @NoArgsConstructor
 public class LikedProgramDTO {
+
+    @ApiModelProperty(value = "프로그램 id")
     private Long programId;
+
+    @ApiModelProperty(value = "프로그램 포스터 url")
     private String posterPath;
 
     @Builder