refactor: long id를 받도록 NewsController 수정

Author: nayonsoso

src/main/java/com/example/solidconnection/news/controller/NewsController.java

@@ -11,7 +11,6 @@
 import com.example.solidconnection.news.service.NewsQueryService;
 import com.example.solidconnection.security.annotation.RequireRoleAccess;
 import com.example.solidconnection.siteuser.domain.Role;
-import com.example.solidconnection.siteuser.domain.SiteUser;
 import jakarta.validation.Valid;
 import lombok.RequiredArgsConstructor;
 import org.springframework.http.ResponseEntity;
@@ -47,24 +46,24 @@ public ResponseEntity<NewsListResponse> findNewsBySiteUserId(
     @RequireRoleAccess(roles = {Role.ADMIN, Role.MENTOR})
     @PostMapping
     public ResponseEntity<NewsCommandResponse> createNews(
-            @AuthorizedUser SiteUser siteUser,
+            @AuthorizedUser long siteUserId,
             @Valid @RequestPart("newsCreateRequest") NewsCreateRequest newsCreateRequest,
             @RequestParam(value = "file", required = false) MultipartFile imageFile
     ) {
-        NewsCommandResponse newsCommandResponse = newsCommandService.createNews(siteUser.getId(), newsCreateRequest, imageFile);
+        NewsCommandResponse newsCommandResponse = newsCommandService.createNews(siteUserId, newsCreateRequest, imageFile);
         return ResponseEntity.ok(newsCommandResponse);
     }
 
     @RequireRoleAccess(roles = {Role.ADMIN, Role.MENTOR})
     @PutMapping("/{news-id}")
     public ResponseEntity<NewsCommandResponse> updateNews(
-            @AuthorizedUser SiteUser siteUser,
+            @AuthorizedUser long siteUserId,
             @PathVariable("news-id") Long newsId,
             @Valid @RequestPart(value = "newsUpdateRequest") NewsUpdateRequest newsUpdateRequest,
             @RequestParam(value = "file", required = false) MultipartFile imageFile
     ) {
         NewsCommandResponse newsCommandResponse = newsCommandService.updateNews(
-                siteUser.getId(),
+                siteUserId,
                 newsId,
                 newsUpdateRequest,
                 imageFile);
@@ -74,37 +73,37 @@ public ResponseEntity<NewsCommandResponse> updateNews(
     @RequireRoleAccess(roles = {Role.ADMIN, Role.MENTOR})
     @DeleteMapping("/{news-id}")
     public ResponseEntity<NewsCommandResponse> deleteNewsById(
-            @AuthorizedUser SiteUser siteUser,
+            @AuthorizedUser long siteUserId,
             @PathVariable("news-id") Long newsId
     ) {
-        NewsCommandResponse newsCommandResponse = newsCommandService.deleteNewsById(siteUser, newsId);
+        NewsCommandResponse newsCommandResponse = newsCommandService.deleteNewsById(siteUserId, newsId);
         return ResponseEntity.ok(newsCommandResponse);
     }
 
     @GetMapping("/{news-id}/like")
     public ResponseEntity<LikedNewsResponse> isNewsLiked(
-            @AuthorizedUser SiteUser siteUser,
+            @AuthorizedUser long siteUserId,
             @PathVariable("news-id") Long newsId
     ) {
-        LikedNewsResponse likedNewsResponse = newsLikeService.isNewsLiked(siteUser.getId(), newsId);
+        LikedNewsResponse likedNewsResponse = newsLikeService.isNewsLiked(siteUserId, newsId);
         return ResponseEntity.ok(likedNewsResponse);
     }
 
     @PostMapping("/{news-id}/like")
     public ResponseEntity<Void> addNewsLike(
-            @AuthorizedUser SiteUser siteUser,
+            @AuthorizedUser long siteUserId,
             @PathVariable("news-id") Long newsId
     ) {
-        newsLikeService.addNewsLike(siteUser.getId(), newsId);
+        newsLikeService.addNewsLike(siteUserId, newsId);
         return ResponseEntity.ok().build();
     }
 
     @DeleteMapping("/{news-id}/like")
     public ResponseEntity<Void> cancelNewsLike(
-            @AuthorizedUser SiteUser siteUser,
+            @AuthorizedUser long siteUserId,
             @PathVariable("news-id") Long newsId
     ) {
-        newsLikeService.cancelNewsLike(siteUser.getId(), newsId);
+        newsLikeService.cancelNewsLike(siteUserId, newsId);
         return ResponseEntity.ok().build();
     }
 }

src/main/java/com/example/solidconnection/news/service/NewsCommandService.java

@@ -2,6 +2,7 @@
 
 import static com.example.solidconnection.common.exception.ErrorCode.INVALID_NEWS_ACCESS;
 import static com.example.solidconnection.common.exception.ErrorCode.NEWS_NOT_FOUND;
+import static com.example.solidconnection.common.exception.ErrorCode.USER_NOT_FOUND;
 
 import com.example.solidconnection.common.exception.CustomException;
 import com.example.solidconnection.news.config.NewsProperties;
@@ -15,6 +16,7 @@
 import com.example.solidconnection.s3.service.S3Service;
 import com.example.solidconnection.siteuser.domain.Role;
 import com.example.solidconnection.siteuser.domain.SiteUser;
+import com.example.solidconnection.siteuser.repository.SiteUserRepository;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -27,6 +29,7 @@ public class NewsCommandService {
     private final S3Service s3Service;
     private final NewsProperties newsProperties;
     private final NewsRepository newsRepository;
+    private final SiteUserRepository siteUserRepository;
 
     @Transactional
     public NewsCommandResponse createNews(long siteUserId, NewsCreateRequest newsCreateRequest, MultipartFile imageFile) {
@@ -77,7 +80,9 @@ private void updateThumbnail(News news, MultipartFile imageFile, Boolean resetTo
     }
 
     @Transactional
-    public NewsCommandResponse deleteNewsById(SiteUser siteUser, Long newsId) {
+    public NewsCommandResponse deleteNewsById(long siteUserId, Long newsId) {
+        SiteUser siteUser = siteUserRepository.findById(siteUserId)
+                .orElseThrow(() -> new CustomException(USER_NOT_FOUND));
         News news = newsRepository.findById(newsId)
                 .orElseThrow(() -> new CustomException(NEWS_NOT_FOUND));
         validatePermission(siteUser, news);

src/test/java/com/example/solidconnection/news/service/NewsCommandServiceTest.java

@@ -302,7 +302,7 @@ class 소식지_삭제_테스트 {
             String expectedImageUrl = originNews.getThumbnailUrl();
 
             // when
-            NewsCommandResponse response = newsCommandService.deleteNewsById(user, originNews.getId());
+            NewsCommandResponse response = newsCommandService.deleteNewsById(user.getId(), originNews.getId());
 
             // then
             assertAll(