Merge pull request #10 from Chalkac/dev

RTUnu12 · web-flow · commit 759525f69148 · 2024-12-02T16:15:26.000+09:00
Dev
diff --git a/build.gradle b/build.gradle
@@ -36,6 +36,7 @@ dependencies {
     implementation 'org.springframework.boot:spring-boot-starter-security'
     implementation 'software.amazon.awssdk:mediaconvert:2.20.0'
     implementation 'software.amazon.awssdk:s3:2.20.0'
+    implementation 'org.springframework.boot:spring-boot-starter-oauth2-resource-server'
 }
 
 tasks.named('test') {
diff --git a/src/main/java/com/rtu/chalkac/domain/category/controller/CategoryController.java b/src/main/java/com/rtu/chalkac/domain/category/controller/CategoryController.java
@@ -5,13 +5,15 @@
 import com.rtu.chalkac.domain.category.service.CategoryService;
 import lombok.RequiredArgsConstructor;
 import org.springframework.http.ResponseEntity;
+import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
 
 @RestController
 @RequestMapping("/api/v1/category")
 @RequiredArgsConstructor
+@PreAuthorize("hasAnyRole('USER', 'ADMIN')")
 public class CategoryController {
 
     private final CategoryService categoryService;
@@ -31,13 +33,15 @@ public ResponseEntity<CategoryResponseDto> getCategoryById(@PathVariable Long id
     }
 
     // 3. 생성
+    @PreAuthorize("hasRole('ADMIN')")
     @PostMapping
     public ResponseEntity<CategoryResponseDto> createCategory(@RequestBody CreateCategoryRequestDto requestDto) {
         CategoryResponseDto createdCategory = categoryService.createCategory(requestDto);
         return ResponseEntity.ok(createdCategory);
     }
 
     // 4. 삭제
+    @PreAuthorize("hasRole('ADMIN')")
     @DeleteMapping("/{id}")
     public ResponseEntity<Void> deleteCategoryById(@PathVariable Long id) {
         categoryService.deleteCategoryById(id);
diff --git a/src/main/java/com/rtu/chalkac/domain/comment/controller/CommentController.java b/src/main/java/com/rtu/chalkac/domain/comment/controller/CommentController.java
@@ -9,11 +9,13 @@
 import org.springframework.data.domain.PageRequest;
 import org.springframework.data.domain.Pageable;
 import org.springframework.http.ResponseEntity;
+import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
 @RestController
 @RequestMapping("/api/v1/comment")
 @RequiredArgsConstructor
+@PreAuthorize("hasAnyRole('USER', 'ADMIN')")
 public class CommentController {
     private final CommentService commentService;
 
diff --git a/src/main/java/com/rtu/chalkac/domain/comment/model/Comment.java b/src/main/java/com/rtu/chalkac/domain/comment/model/Comment.java
@@ -27,7 +27,7 @@ public class Comment {
     @JoinColumn(name = "user_id", nullable = false)
     private Users user;
 
-    @Column(name = "content", nullable = false)
+    @Column(name = "content", nullable = false, length = 1000)
     private String content;
 
     @Column(name = "like_cnt", nullable = false)
diff --git a/src/main/java/com/rtu/chalkac/domain/comment/repository/CommentRepository.java b/src/main/java/com/rtu/chalkac/domain/comment/repository/CommentRepository.java
@@ -8,8 +8,8 @@
 import org.springframework.data.repository.query.Param;
 
 public interface CommentRepository extends JpaRepository<Comment, String> {
-    @Query("SELECT c FROM Comment c WHERE c.video.videoId = :videoId ORDER BY (c.likeCnt - c.dislikeCnt) DESC")
-    Page<Comment> findByVideoIdOrderByLikeDislikeSumDesc(@Param("videoId") String videoId, Pageable pageable);
+    @Query("SELECT c FROM Comment c WHERE c.video.videoId = :videoId ORDER BY (c.likeCnt - c.dislikeCnt) ASC")
+    Page<Comment> findByVideoIdOrderByLikeDislikeSumAsc(@Param("videoId") String videoId, Pageable pageable);
 
-    Page<Comment> findByVideoVideoIdOrderByDateDesc(String videoId, Pageable pageable);
+    Page<Comment> findByVideoVideoIdOrderByDateAsc(String videoId, Pageable pageable);
 }
diff --git a/src/main/java/com/rtu/chalkac/domain/comment/service/CommentService.java b/src/main/java/com/rtu/chalkac/domain/comment/service/CommentService.java
@@ -31,13 +31,13 @@ public Comment getComment(String commentId){
 
     // 해당 비디오의 댓글 조회, Page, CommentResponseDto 사용, likeCnt 높은순
     public PageableDto<CommentResponseDto> findCommentsByLikes(String videoId, Pageable pageable) {
-        return new PageableDto<>(commentRepository.findByVideoIdOrderByLikeDislikeSumDesc(videoId, pageable)
+        return new PageableDto<>(commentRepository.findByVideoIdOrderByLikeDislikeSumAsc(videoId, pageable)
                 .map(CommentResponseDto::new));
     }
 
     // 해당 비디오의 댓글 조회, Page, CommentResponseDto 사용, date 최신순
     public PageableDto<CommentResponseDto> findCommentsByDate(String videoId, Pageable pageable) {
-        return new PageableDto<>(commentRepository.findByVideoVideoIdOrderByDateDesc(videoId, pageable)
+        return new PageableDto<>(commentRepository.findByVideoVideoIdOrderByDateAsc(videoId, pageable)
                 .map(CommentResponseDto::new));
     }
 
diff --git a/src/main/java/com/rtu/chalkac/domain/reply/controller/ReplyController.java b/src/main/java/com/rtu/chalkac/domain/reply/controller/ReplyController.java
@@ -6,11 +6,13 @@
 import com.rtu.chalkac.global.util.PageableDto;
 import lombok.RequiredArgsConstructor;
 import org.springframework.http.ResponseEntity;
+import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
 @RestController
 @RequestMapping("/api/v1/reply")
 @RequiredArgsConstructor
+@PreAuthorize("hasAnyRole('USER', 'ADMIN')")
 public class ReplyController {
     private final ReplyService replyService;
 
diff --git a/src/main/java/com/rtu/chalkac/domain/reply/model/Reply.java b/src/main/java/com/rtu/chalkac/domain/reply/model/Reply.java
@@ -27,7 +27,7 @@ public class Reply {
     @JoinColumn(name = "user_id", nullable = false)
     private Users user;
 
-    @Column(name = "content", nullable = false)
+    @Column(name = "content", nullable = false, length = 1000)
     private String content;
 
     @Column(name = "like_cnt", nullable = false)
diff --git a/src/main/java/com/rtu/chalkac/domain/users/controller/UserController.java b/src/main/java/com/rtu/chalkac/domain/users/controller/UserController.java
@@ -0,0 +1,46 @@
+package com.rtu.chalkac.domain.users.controller;
+
+import com.rtu.chalkac.domain.users.dto.request.UpdateUserNicknameRequestDto;
+import com.rtu.chalkac.domain.users.dto.request.UpdateUserProfileRequestDto;
+import com.rtu.chalkac.domain.users.dto.response.UserResponseDto;
+import com.rtu.chalkac.domain.users.service.UserService;
+import lombok.RequiredArgsConstructor;
+import org.springframework.http.ResponseEntity;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+@RestController
+@RequestMapping("/api/v1/users")
+@RequiredArgsConstructor
+@PreAuthorize("hasAnyRole('USER', 'ADMIN')")
+public class UserController {
+    private final UserService userService;
+
+    // 유저 정보 불러오기
+    @GetMapping("/{userId}")
+    public ResponseEntity<UserResponseDto> getUser(@PathVariable String userId) {
+        UserResponseDto user = userService.findUser(userId);
+        return ResponseEntity.ok(user);
+    }
+
+    // 유저 닉네임 수정
+    @PatchMapping("/nickname")
+    public ResponseEntity<Void> updateNickname(@RequestBody UpdateUserNicknameRequestDto dto) {
+        userService.updateNickname(dto);
+        return ResponseEntity.ok().build();
+    }
+
+    // 유저 프로필 수정
+    @PatchMapping("/profile")
+    public ResponseEntity<Void> updateProfile(@RequestBody UpdateUserProfileRequestDto dto) {
+        userService.updateProfile(dto);
+        return ResponseEntity.ok().build();
+    }
+
+    // 유저 탈퇴
+    @DeleteMapping("/{userId}")
+    public ResponseEntity<Void> deleteUser(@PathVariable String userId) {
+        userService.deleteUser(userId);
+        return ResponseEntity.ok().build();
+    }
+}
diff --git a/src/main/java/com/rtu/chalkac/domain/users/dto/request/UpdateUserNicknameRequestDto.java b/src/main/java/com/rtu/chalkac/domain/users/dto/request/UpdateUserNicknameRequestDto.java
@@ -0,0 +1,11 @@
+package com.rtu.chalkac.domain.users.dto.request;
+
+import lombok.Getter;
+import lombok.Setter;
+
+@Getter
+@Setter
+public class UpdateUserNicknameRequestDto {
+    private String userId;
+    private String nickname;
+}
diff --git a/src/main/java/com/rtu/chalkac/domain/users/dto/request/UpdateUserProfileRequestDto.java b/src/main/java/com/rtu/chalkac/domain/users/dto/request/UpdateUserProfileRequestDto.java
@@ -0,0 +1,11 @@
+package com.rtu.chalkac.domain.users.dto.request;
+
+import lombok.Getter;
+import lombok.Setter;
+
+@Getter
+@Setter
+public class UpdateUserProfileRequestDto {
+    private String userId;
+    private String profileUrl;
+}
diff --git a/src/main/java/com/rtu/chalkac/domain/users/dto/response/UserResponseDto.java b/src/main/java/com/rtu/chalkac/domain/users/dto/response/UserResponseDto.java
@@ -0,0 +1,23 @@
+package com.rtu.chalkac.domain.users.dto.response;
+
+import com.rtu.chalkac.domain.users.model.Users;
+import lombok.Data;
+
+import java.time.LocalDate;
+
+@Data
+public class UserResponseDto {
+    private String userId;
+    private String nickname;
+    private LocalDate date;
+    private long subscribeCount;
+    private String profileUrl;
+
+    public UserResponseDto(Users user) {
+        this.userId = user.getUserId();
+        this.nickname = user.getNickname();
+        this.date = user.getDate();
+        this.subscribeCount = user.getSubscribeCount();
+        this.profileUrl = user.getProfileUrl();
+    }
+}
diff --git a/src/main/java/com/rtu/chalkac/domain/users/service/UserService.java b/src/main/java/com/rtu/chalkac/domain/users/service/UserService.java
@@ -1,7 +1,11 @@
 package com.rtu.chalkac.domain.users.service;
 
+import com.rtu.chalkac.domain.users.dto.request.UpdateUserNicknameRequestDto;
+import com.rtu.chalkac.domain.users.dto.request.UpdateUserProfileRequestDto;
+import com.rtu.chalkac.domain.users.dto.response.UserResponseDto;
 import com.rtu.chalkac.domain.users.model.Users;
 import com.rtu.chalkac.domain.users.repository.UserRepository;
+import org.springframework.transaction.annotation.Transactional;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 
@@ -13,4 +17,32 @@ public class UserService {
     public Users getUser(String id){
         return userRepository.findById(id).orElseThrow(()-> new IllegalArgumentException("user 404"));
     }
+
+    // 유저 정보 불러오기
+    public UserResponseDto findUser(String userId){
+        return new UserResponseDto(getUser(userId));
+    }
+
+    // 유저 정보 수정하기 (닉네임)
+    @Transactional
+    public void updateNickname(UpdateUserNicknameRequestDto dto){
+        Users user = getUser(dto.getUserId());
+        user.setNickname(dto.getNickname());
+        userRepository.save(user);
+    }
+
+    // 유저 정보 수정하기 (프로필)
+    @Transactional
+    public void updateProfile(UpdateUserProfileRequestDto dto){
+        Users user = getUser(dto.getUserId());
+        user.setProfileUrl(dto.getProfileUrl());
+        userRepository.save(user);
+    }
+
+    // 유저 탈퇴
+    @Transactional
+    public void deleteUser(String userId){
+        Users user = getUser(userId);
+        userRepository.delete(user);
+    }
 }
diff --git a/src/main/java/com/rtu/chalkac/domain/video/controller/VideoController.java b/src/main/java/com/rtu/chalkac/domain/video/controller/VideoController.java
@@ -9,8 +9,8 @@
 import com.rtu.chalkac.global.util.PageableDto;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.data.domain.Page;
 import org.springframework.http.ResponseEntity;
+import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
@@ -19,6 +19,7 @@
 @RestController
 @RequestMapping("/api/v1/video")
 @RequiredArgsConstructor
+@PreAuthorize("hasAnyRole('USER', 'ADMIN')")
 public class VideoController {
 
     private final VideoService videoService;
@@ -38,6 +39,14 @@ public ResponseEntity<PageableDto<VideoResponseDto>> searchVideos(
         return ResponseEntity.ok(searchResults);
     }
 
+    @GetMapping("/users")
+    public ResponseEntity<PageableDto<VideoResponseDto>> getVideosByUser(
+            @RequestParam(defaultValue = "0") int page,
+            @RequestParam(defaultValue = "10") int size,
+            @RequestParam String userId){
+        return ResponseEntity.ok(videoService.findVideosByUserId(page, size, userId));
+    }
+
     @PostMapping("/convert")
     public ResponseEntity<ConvertResponseDto> convertVideo(@RequestBody ConvertRequestDto dto) {
         return ResponseEntity.ok(convertService.startMediaConvertJob(dto.getInputS3Url(), dto.getOutputS3Url()));
diff --git a/src/main/java/com/rtu/chalkac/domain/video/model/Video.java b/src/main/java/com/rtu/chalkac/domain/video/model/Video.java
@@ -48,7 +48,7 @@ public class Video {
     @Column(name = "date", nullable = false)
     private LocalDateTime date;
 
-    @Column(name = "description", nullable = false)
+    @Column(name = "description", nullable = false, length = 4000)
     private String description;
 
     @Column(name = "title")
diff --git a/src/main/java/com/rtu/chalkac/domain/video/repository/VideoRepository.java b/src/main/java/com/rtu/chalkac/domain/video/repository/VideoRepository.java
@@ -1,5 +1,6 @@
 package com.rtu.chalkac.domain.video.repository;
 
+import com.rtu.chalkac.domain.users.model.Users;
 import com.rtu.chalkac.domain.video.model.Video;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
@@ -12,4 +13,8 @@ Page<Video> findByTitleContainingIgnoreCaseOrCategoryNameContainingIgnoreCaseOrU
             String userKeyword,
             Pageable pageable
     );
+
+    Page<Video> findByUser(Pageable pageable, Users user);
+
+    boolean existsByTitle(String title);
 }
diff --git a/src/main/java/com/rtu/chalkac/domain/video/service/VideoService.java b/src/main/java/com/rtu/chalkac/domain/video/service/VideoService.java
@@ -12,7 +12,6 @@
 import com.rtu.chalkac.domain.video.model.Video;
 import com.rtu.chalkac.domain.video.repository.VideoRepository;
 import lombok.RequiredArgsConstructor;
-import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -45,6 +44,11 @@ public PageableDto<VideoResponseDto> findAllVideos(int page, int size) {
         return new PageableDto<>(videoRepository.findAll(PageRequest.of(page, size)).map(VideoResponseDto::new));
     }
 
+    // 1. 유저의 영상 조회
+    public PageableDto<VideoResponseDto> findVideosByUserId(int page, int size, String userId){
+        return new PageableDto<>(videoRepository.findByUser(PageRequest.of(page, size), usersService.getUser(userId)).map(VideoResponseDto::new));
+    }
+
     // 2. 영상 단일 조회
     public VideoResponseDto findVideoById(String videoId) {
         return new VideoResponseDto(getVideo(videoId));
@@ -56,6 +60,10 @@ public VideoResponseDto createVideo(CreateVideoRequestDto requestDto) {
         Category category = categoryService.getCategory(Long.parseLong(requestDto.getCategoryId()));
         Users user = usersService.getUser(requestDto.getUserId());
 
+        if(videoRepository.existsByTitle(requestDto.getTitle())) {
+            throw new IllegalArgumentException("Title already exists");
+        }
+
         Video video = Video.builder()
                 .videoId(generateVideoId()) // 별도의 ID 생성 로직 필요
                 .category(category)
diff --git a/src/main/java/com/rtu/chalkac/global/HealthCheckController.java b/src/main/java/com/rtu/chalkac/global/HealthCheckController.java
@@ -9,6 +9,6 @@ public class HealthCheckController {
 
     @GetMapping("/health")
     public ResponseEntity<String> healthCheck() {
-        return ResponseEntity.ok().body("chalkac-version-1.0");
+        return ResponseEntity.ok().body("chalkac-version-1.1");
     }
 }
diff --git a/src/main/java/com/rtu/chalkac/global/config/SecurityConfig.java b/src/main/java/com/rtu/chalkac/global/config/SecurityConfig.java

Original file line number	Diff line number	Diff line change
`@@ -36,6 +36,7 @@ dependencies {`
`36`	`36`	`implementation 'org.springframework.boot:spring-boot-starter-security'`
`37`	`37`	`implementation 'software.amazon.awssdk:mediaconvert:2.20.0'`
`38`	`38`	`implementation 'software.amazon.awssdk:s3:2.20.0'`
	`39`	`+ implementation 'org.springframework.boot:spring-boot-starter-oauth2-resource-server'`
`39`	`40`	`}`
`40`	`41`
`41`	`42`	`tasks.named('test') {`
Original file line number	Diff line number	Diff line change
`@@ -31,13 +31,13 @@ public Comment getComment(String commentId){`
`31`	`31`
`32`	`32`	`// 해당 비디오의 댓글 조회, Page, CommentResponseDto 사용, likeCnt 높은순`
`33`	`33`	`public PageableDto<CommentResponseDto> findCommentsByLikes(String videoId, Pageable pageable) {`
`34`		`- return new PageableDto<>(commentRepository.findByVideoIdOrderByLikeDislikeSumDesc(videoId, pageable)`
	`34`	`+ return new PageableDto<>(commentRepository.findByVideoIdOrderByLikeDislikeSumAsc(videoId, pageable)`
`35`	`35`	`.map(CommentResponseDto::new));`
`36`	`36`	`}`
`37`	`37`
`38`	`38`	`// 해당 비디오의 댓글 조회, Page, CommentResponseDto 사용, date 최신순`
`39`	`39`	`public PageableDto<CommentResponseDto> findCommentsByDate(String videoId, Pageable pageable) {`
`40`		`- return new PageableDto<>(commentRepository.findByVideoVideoIdOrderByDateDesc(videoId, pageable)`
	`40`	`+ return new PageableDto<>(commentRepository.findByVideoVideoIdOrderByDateAsc(videoId, pageable)`
`41`	`41`	`.map(CommentResponseDto::new));`
`42`	`42`	`}`
`43`	`43`