refactor: private 메서드 위치를 호출부 아래로 이동

Author: Gyuhyeok99

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

@@ -36,6 +36,14 @@ public NewsCommandResponse createNews(long siteUserId,NewsCreateRequest newsCrea
         return NewsCommandResponse.from(savedNews);
     }
 
+    private String getImageUrl(MultipartFile imageFile) {
+        if (imageFile != null && !imageFile.isEmpty()) {
+            UploadedFileUrlResponse uploadedFile = s3Service.uploadFile(imageFile, ImgType.NEWS);
+            return uploadedFile.fileUrl();
+        }
+        return newsProperties.defaultThumbnailUrl();
+    }
+
     @Transactional
     public NewsCommandResponse updateNews(
             long siteUserId,
@@ -51,38 +59,12 @@ public NewsCommandResponse updateNews(
         return NewsCommandResponse.from(savedNews);
     }
 
-    @Transactional
-    public NewsCommandResponse deleteNewsById(SiteUser siteUser, Long newsId) {
-        News news = newsRepository.findById(newsId)
-                .orElseThrow(() -> new CustomException(NEWS_NOT_FOUND));
-        validatePermission(siteUser, news);
-        deleteCustomImage(news.getThumbnailUrl());
-        newsRepository.delete(news);
-        return NewsCommandResponse.from(news);
-    }
-
-    private String getImageUrl(MultipartFile imageFile) {
-        if (imageFile != null && !imageFile.isEmpty()) {
-            UploadedFileUrlResponse uploadedFile = s3Service.uploadFile(imageFile, ImgType.NEWS);
-            return uploadedFile.fileUrl();
-        }
-        return newsProperties.defaultThumbnailUrl();
-    }
-
     private void validateOwnership(News news, long siteUserId) {
         if (news.getSiteUserId() != siteUserId) {
             throw new CustomException(INVALID_NEWS_ACCESS);
         }
     }
 
-    private void validatePermission(SiteUser currentUser, News news) {
-        boolean isOwner = news.getSiteUserId() == currentUser.getId();
-        boolean isAdmin = currentUser.getRole().equals(Role.ADMIN);
-        if (!isOwner && !isAdmin) {
-            throw new CustomException(INVALID_NEWS_ACCESS);
-        }
-    }
-
     private void updateThumbnail(News news, MultipartFile imageFile, Boolean resetToDefaultImage) {
         if (Boolean.TRUE.equals(resetToDefaultImage)) {
             deleteCustomImage(news.getThumbnailUrl());
@@ -95,6 +77,24 @@ else if (imageFile != null && !imageFile.isEmpty()) {
         }
     }
 
+    @Transactional
+    public NewsCommandResponse deleteNewsById(SiteUser siteUser, Long newsId) {
+        News news = newsRepository.findById(newsId)
+                .orElseThrow(() -> new CustomException(NEWS_NOT_FOUND));
+        validatePermission(siteUser, news);
+        deleteCustomImage(news.getThumbnailUrl());
+        newsRepository.delete(news);
+        return NewsCommandResponse.from(news);
+    }
+
+    private void validatePermission(SiteUser currentUser, News news) {
+        boolean isOwner = news.getSiteUserId() == currentUser.getId();
+        boolean isAdmin = currentUser.getRole().equals(Role.ADMIN);
+        if (!isOwner && !isAdmin) {
+            throw new CustomException(INVALID_NEWS_ACCESS);
+        }
+    }
+
     private void deleteCustomImage(String imageUrl) {
         if (!newsProperties.defaultThumbnailUrl().equals(imageUrl)) {
             s3Service.deletePostImage(imageUrl);

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

@@ -83,6 +83,10 @@ class 소식지_생성_테스트 {
         }
     }
 
+    private NewsCreateRequest createNewsCreateRequest() {
+        return new NewsCreateRequest("제목", "설명", "https://youtu.be/test");
+    }
+
     @Nested
     class 소식지_수정_테스트 {
 
@@ -275,6 +279,19 @@ void setUp() {
         }
     }
 
+    private NewsUpdateRequest createNewsUpdateRequest(String title, String description, String url, Boolean resetToDefaultImage) {
+        return new NewsUpdateRequest(title, description, url, resetToDefaultImage);
+    }
+
+    private MockMultipartFile createImageFile() {
+        return new MockMultipartFile(
+                "image",
+                "test.jpg",
+                "image/jpeg",
+                "test image content".getBytes()
+        );
+    }
+
     @Nested
     class 소식지_삭제_테스트 {
 
@@ -295,21 +312,4 @@ class 소식지_삭제_테스트 {
             );
         }
     }
-
-    private NewsCreateRequest createNewsCreateRequest() {
-        return new NewsCreateRequest("제목", "설명", "https://youtu.be/test");
-    }
-
-    private NewsUpdateRequest createNewsUpdateRequest(String title, String description, String url, Boolean resetToDefaultImage) {
-        return new NewsUpdateRequest(title, description, url, resetToDefaultImage);
-    }
-
-    private MockMultipartFile createImageFile() {
-        return new MockMultipartFile(
-                "image",
-                "test.jpg",
-                "image/jpeg",
-                "test image content".getBytes()
-        );
-    }
 }