Merge pull request #236 from Garodden/171/backendDeploy_modify

comment dto 리팩토링

src/main/java/com/example/oneinkedoneproject/controller/comment/CommentApiController.java

@@ -2,9 +2,9 @@
 
 import com.example.oneinkedoneproject.domain.Comment;
 import com.example.oneinkedoneproject.domain.User;
-import com.example.oneinkedoneproject.dto.AddCommentRequestDto;
-import com.example.oneinkedoneproject.dto.CommentResponseDto;
-import com.example.oneinkedoneproject.dto.UpdateCommentRequestDto;
+import com.example.oneinkedoneproject.dto.comment.AddCommentRequestDto;
+import com.example.oneinkedoneproject.dto.comment.CommentResponseDto;
+import com.example.oneinkedoneproject.dto.comment.UpdateCommentRequestDto;
 import com.example.oneinkedoneproject.service.comment.CommentService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
@@ -16,7 +16,6 @@
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.security.core.annotation.AuthenticationPrincipal;
-import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.ArrayList;

src/main/java/com/example/oneinkedoneproject/service/comment/CommentService.java

@@ -3,18 +3,16 @@
 import com.example.oneinkedoneproject.domain.Article;
 import com.example.oneinkedoneproject.domain.Comment;
 import com.example.oneinkedoneproject.domain.User;
-import com.example.oneinkedoneproject.dto.AddCommentRequestDto;
-import com.example.oneinkedoneproject.dto.UpdateCommentRequestDto;
+import com.example.oneinkedoneproject.dto.comment.AddCommentRequestDto;
+import com.example.oneinkedoneproject.dto.comment.UpdateCommentRequestDto;
 import com.example.oneinkedoneproject.repository.article.ArticleRepository;
 import com.example.oneinkedoneproject.repository.comment.CommentRepository;
 import jakarta.transaction.Transactional;
 import lombok.RequiredArgsConstructor;
 
 import org.springframework.stereotype.Service;
 
-import java.util.ArrayList;
 import java.util.List;
-import java.util.stream.Collectors;
 
 @Service
 @RequiredArgsConstructor

src/test/java/com/example/oneinkedoneproject/controller/CommentApiControllerIntegratedTest.java

@@ -4,9 +4,6 @@
 import static org.springframework.test.web.servlet.result.MockMvcResultHandlers.print;
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
 
-import java.util.ArrayList;
-import java.util.List;
-
 import com.example.oneinkedoneproject.dto.auth.TokenInfo;
 import com.example.oneinkedoneproject.service.auth.JwtTokenProvider;
 import org.junit.jupiter.api.AfterEach;
@@ -29,8 +26,8 @@
 import com.example.oneinkedoneproject.domain.Grade;
 import com.example.oneinkedoneproject.domain.PasswordQuestion;
 import com.example.oneinkedoneproject.domain.User;
-import com.example.oneinkedoneproject.dto.AddCommentRequestDto;
-import com.example.oneinkedoneproject.dto.UpdateCommentRequestDto;
+import com.example.oneinkedoneproject.dto.comment.AddCommentRequestDto;
+import com.example.oneinkedoneproject.dto.comment.UpdateCommentRequestDto;
 import com.example.oneinkedoneproject.repository.article.ArticleRepository;
 import com.example.oneinkedoneproject.repository.comment.CommentRepository;
 import com.example.oneinkedoneproject.repository.password.PasswordRepository;
@@ -39,8 +36,6 @@
 import com.example.oneinkedoneproject.utils.GenerateIdUtils;
 import com.google.gson.Gson;
 
-import jakarta.transaction.Transactional;
-
 @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
 @AutoConfigureMockMvc
 public class CommentApiControllerIntegratedTest {

src/test/java/com/example/oneinkedoneproject/controller/CommentApiControllerUnitTest.java

@@ -6,8 +6,7 @@
 import com.example.oneinkedoneproject.domain.Grade;
 import com.example.oneinkedoneproject.domain.PasswordQuestion;
 import com.example.oneinkedoneproject.domain.User;
-import com.example.oneinkedoneproject.dto.AddCommentRequestDto;
-import com.example.oneinkedoneproject.repository.article.ArticleRepository;
+import com.example.oneinkedoneproject.dto.comment.AddCommentRequestDto;
 import com.example.oneinkedoneproject.service.comment.CommentService;
 import com.example.oneinkedoneproject.utils.GenerateIdUtils;
 import com.google.gson.Gson;
@@ -19,24 +18,12 @@
 import org.mockito.Mock;
 import org.mockito.junit.jupiter.MockitoExtension;
 import org.springframework.http.MediaType;
-import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
-import org.springframework.security.core.authority.SimpleGrantedAuthority;
-import org.springframework.security.core.context.SecurityContext;
-import org.springframework.security.core.context.SecurityContextHolder;
-import org.springframework.security.test.context.support.WithMockUser;
-import org.springframework.security.test.context.support.WithSecurityContext;
-import org.springframework.security.test.context.support.WithSecurityContextFactory;
-import org.springframework.security.test.web.servlet.request.SecurityMockMvcRequestPostProcessors;
 import org.springframework.test.web.servlet.MockMvc;
 import org.springframework.test.web.servlet.ResultActions;
-import org.springframework.test.web.servlet.request.MockMvcRequestBuilders;
 import org.springframework.test.web.servlet.setup.MockMvcBuilders;
 
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Optional;
 
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.doReturn;

src/test/java/com/example/oneinkedoneproject/controller/ResumeApiControllerIntegrationTest.java

@@ -1,8 +1,7 @@
 package com.example.oneinkedoneproject.controller;
 
 import com.example.oneinkedoneproject.domain.*;
-import com.example.oneinkedoneproject.dto.AddCommentRequestDto;
-import com.example.oneinkedoneproject.dto.UpdateCommentRequestDto;
+import com.example.oneinkedoneproject.dto.comment.UpdateCommentRequestDto;
 import com.example.oneinkedoneproject.dto.auth.TokenInfo;
 import com.example.oneinkedoneproject.dto.resume.AddResumeRequestDto;
 import com.example.oneinkedoneproject.dto.resume.UpdateResumeRequestDto;
@@ -25,7 +24,6 @@
 import org.springframework.security.core.Authentication;
 import org.springframework.security.core.context.SecurityContextHolder;
 import org.springframework.test.web.servlet.MockMvc;
-import org.springframework.test.web.servlet.request.MockMvcRequestBuilders;
 
 import static org.hamcrest.Matchers.hasSize;
 import static org.springframework.security.test.web.servlet.request.SecurityMockMvcRequestPostProcessors.user;

src/test/java/com/example/oneinkedoneproject/controller/ResumeApiControllerUnitTest.java

@@ -2,7 +2,6 @@
 
 import com.example.oneinkedoneproject.controller.resume.ResumeApiController;
 import com.example.oneinkedoneproject.domain.*;
-import com.example.oneinkedoneproject.dto.AddCommentRequestDto;
 import com.example.oneinkedoneproject.dto.resume.AddResumeRequestDto;
 import com.example.oneinkedoneproject.dto.resume.UpdateResumeRequestDto;
 import com.example.oneinkedoneproject.service.resume.ResumeService;
@@ -14,13 +13,11 @@
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.InjectMocks;
 import org.mockito.Mock;
-import org.mockito.Mockito;
 import org.mockito.junit.jupiter.MockitoExtension;
 import org.springframework.http.MediaType;
 import org.springframework.test.web.servlet.MockMvc;
 import org.springframework.test.web.servlet.setup.MockMvcBuilders;
 
-import javax.print.DocFlavor;
 import java.util.ArrayList;
 import java.util.List;
 

src/test/java/com/example/oneinkedoneproject/service/CommentServiceUnitTest.java

@@ -2,8 +2,8 @@
 
 import com.example.oneinkedoneproject.domain.Article;
 import com.example.oneinkedoneproject.domain.Comment;
-import com.example.oneinkedoneproject.dto.AddCommentRequestDto;
-import com.example.oneinkedoneproject.dto.UpdateCommentRequestDto;
+import com.example.oneinkedoneproject.dto.comment.AddCommentRequestDto;
+import com.example.oneinkedoneproject.dto.comment.UpdateCommentRequestDto;
 import com.example.oneinkedoneproject.repository.article.ArticleRepository;
 import com.example.oneinkedoneproject.repository.comment.CommentRepository;
 import com.example.oneinkedoneproject.repository.user.UserRepository;