#18 [Refactor] 패키지 구조 변경 및 Dto 네이밍 수정

src/main/java/com/mpnp/baechelin/bookmark/controller/BookmarkController.java

@@ -1,6 +1,6 @@
 package com.mpnp.baechelin.bookmark.controller;
 
-import com.mpnp.baechelin.bookmark.dto.BookmarkReqDTO;
+import com.mpnp.baechelin.bookmark.dto.BookmarkRequestDto;
 import com.mpnp.baechelin.bookmark.service.BookmarkService;
 import lombok.RequiredArgsConstructor;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -14,8 +14,8 @@ public class BookmarkController {
 
     /** 북마크 생성 폴더 담기 */
     @PostMapping("/bookmark")
-    public void bookmark(@RequestBody BookmarkReqDTO bookmarkReqDTO){
+    public void bookmark(@RequestBody BookmarkRequestDto bookmarkRequestDto){
 
-        bookmarkService.bookmark(bookmarkReqDTO);
+        bookmarkService.bookmark(bookmarkRequestDto);
     }
 }

src/main/java/com/mpnp/baechelin/bookmark/controller/FolderController.java

@@ -1,8 +1,8 @@
 package com.mpnp.baechelin.bookmark.controller;
 
 
-import com.mpnp.baechelin.bookmark.dto.FolderReqDTO;
-import com.mpnp.baechelin.bookmark.dto.FolderResDTO;
+import com.mpnp.baechelin.bookmark.dto.FolderRequestDto;
+import com.mpnp.baechelin.bookmark.dto.FolderResponseDto;
 import com.mpnp.baechelin.bookmark.service.FolderService;
 import lombok.RequiredArgsConstructor;
 import org.springframework.web.bind.annotation.*;
@@ -18,9 +18,9 @@ public class FolderController {
 
     /** 폴더 신규 생성 */
     @PostMapping("/folder")
-    public void folder (@RequestBody FolderReqDTO folderReqDTO){
+    public void folder (@RequestBody FolderRequestDto folderRequestDto){
 
-        folderService.folder(folderReqDTO);
+        folderService.folder(folderRequestDto);
     }
 
     /* 폴더 삭제 -> 삭제 시 안에 담긴 모든 북마크가 삭제됨 */
@@ -41,7 +41,7 @@ public void folderUpdate (@PathVariable int folderId, @RequestParam String newFo
     }
 
     @PutMapping("/folderList/{userId}")
-    public List<FolderResDTO> folderList (@PathVariable int userId){
+    public List<FolderResponseDto> folderList (@PathVariable int userId){
 
         return folderService.folderList(userId);
     }

src/main/java/com/mpnp/baechelin/bookmark/domain/Folder.java

@@ -3,7 +3,7 @@
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
 
-import com.mpnp.baechelin.user.entity.user.User;
+import com.mpnp.baechelin.user.domain.User;
 import com.mpnp.baechelin.util.TimeStamped;
 import lombok.*;
 

src/main/java/com/mpnp/baechelin/bookmark/dto/BookmarkDTO.java

@@ -12,7 +12,7 @@
 @AllArgsConstructor
 @NoArgsConstructor
 @Builder
-public class BookmarkDTO {
+public class BookmarkDto {
 
     private List<Store> storeList = new ArrayList<>();
 

src/main/java/com/mpnp/baechelin/bookmark/dto/BookmarkReqDTO.java → src/main/java/com/mpnp/baechelin/bookmark/dto/BookmarkRequestDto.java

@@ -9,7 +9,7 @@
 @NoArgsConstructor
 @AllArgsConstructor
 @Builder
-public class BookmarkReqDTO {
+public class BookmarkRequestDto {
     private int storeId;
     private int folderId;
 }

src/main/java/com/mpnp/baechelin/bookmark/dto/FolderReqDTO.java → src/main/java/com/mpnp/baechelin/bookmark/dto/FolderRequestDto.java

@@ -10,7 +10,7 @@
 @NoArgsConstructor
 @AllArgsConstructor
 @Builder
-public class FolderReqDTO {
+public class FolderRequestDto {
 
     private String folderName = "미분류";
 }

src/main/java/com/mpnp/baechelin/bookmark/dto/FolderResDTO.java → src/main/java/com/mpnp/baechelin/bookmark/dto/FolderResponseDto.java

@@ -13,17 +13,17 @@
 @NoArgsConstructor
 @AllArgsConstructor
 @Builder
-public class FolderResDTO {
+public class FolderResponseDto {
     private int id;
     private String folderName;
     private List<List<String>> bookmarkList;
 
-    public FolderResDTO(Folder folder) {
+    public FolderResponseDto(Folder folder) {
         this.id = folder.getId();
         this.folderName = folder.getFolderName();
     }
 
-    public static FolderResDTO FolderDtoRes(Folder folder) {
+    public static FolderResponseDto FolderDtoRes(Folder folder) {
         /** 북마크의 정보를 담는 작업 */
         List<List<String>> bookmarks = new ArrayList<>();
         if(folder.getBookmarkList() != null) {
@@ -33,13 +33,13 @@ public static FolderResDTO FolderDtoRes(Folder folder) {
                 bookmarks.add(tempBookmarkList);
             }
         } else if(folder.getBookmarkList() == null) {
-            return FolderResDTO.builder()
+            return FolderResponseDto.builder()
                     .folderName(folder.getFolderName())
                     .id(folder.getId())
                     .build();
         }
 
-        return FolderResDTO.builder()
+        return FolderResponseDto.builder()
                 .folderName(folder.getFolderName())
                 .id(folder.getId())
                 .bookmarkList(bookmarks)

src/main/java/com/mpnp/baechelin/bookmark/repository/FolderRepository.java

@@ -1,7 +1,7 @@
 package com.mpnp.baechelin.bookmark.repository;
 
 import com.mpnp.baechelin.bookmark.domain.Folder;
-import com.mpnp.baechelin.user.entity.user.User;
+import com.mpnp.baechelin.user.domain.User;
 import org.springframework.data.jpa.repository.JpaRepository;
 
 import java.util.List;

src/main/java/com/mpnp/baechelin/bookmark/service/BookmarkService.java

@@ -2,16 +2,14 @@
 
 import com.mpnp.baechelin.bookmark.domain.Bookmark;
 import com.mpnp.baechelin.bookmark.domain.Folder;
-import com.mpnp.baechelin.bookmark.dto.BookmarkReqDTO;
+import com.mpnp.baechelin.bookmark.dto.BookmarkRequestDto;
 import com.mpnp.baechelin.bookmark.repository.BookmarkRepository;
 import com.mpnp.baechelin.bookmark.repository.FolderRepository;
 import com.mpnp.baechelin.store.domain.Store;
 import com.mpnp.baechelin.store.repository.StoreRepository;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 
-import java.util.Optional;
-
 @Service
 @RequiredArgsConstructor
 public class BookmarkService {
@@ -20,11 +18,11 @@ public class BookmarkService {
     private final FolderRepository folderRepository;
     private final StoreRepository storeRepository;
 
-    public void bookmark(BookmarkReqDTO bookmarkReqDTO) {
+    public void bookmark(BookmarkRequestDto bookmarkRequestDto) {
 
-        Folder folder = folderRepository.findById(bookmarkReqDTO.getFolderId())
+        Folder folder = folderRepository.findById(bookmarkRequestDto.getFolderId())
                 .orElseThrow(()-> new IllegalArgumentException("폴더가 존재하지 않습니다"));
-        Store store = storeRepository.findById(bookmarkReqDTO.getStoreId())
+        Store store = storeRepository.findById(bookmarkRequestDto.getStoreId())
                 .orElseThrow(()-> new IllegalArgumentException("가게가 존재하지 않습니다"));
 
         Bookmark bookmark = Bookmark

src/main/java/com/mpnp/baechelin/bookmark/service/FolderService.java

@@ -1,11 +1,11 @@
 package com.mpnp.baechelin.bookmark.service;
 
 import com.mpnp.baechelin.bookmark.domain.Folder;
-import com.mpnp.baechelin.bookmark.dto.FolderReqDTO;
-import com.mpnp.baechelin.bookmark.dto.FolderResDTO;
+import com.mpnp.baechelin.bookmark.dto.FolderRequestDto;
+import com.mpnp.baechelin.bookmark.dto.FolderResponseDto;
 import com.mpnp.baechelin.bookmark.repository.FolderRepository;
 
-import com.mpnp.baechelin.user.entity.user.User;
+import com.mpnp.baechelin.user.domain.User;
 import com.mpnp.baechelin.user.repository.UserRepository;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
@@ -23,12 +23,12 @@ public class FolderService {
     private final UserRepository userRepository;
 
     @Transactional
-    public void folder(FolderReqDTO folderReqDTO) {
+    public void folder(FolderRequestDto folderRequestDto) {
 
         Optional<User> user = userRepository.findById(1);
 
         Folder folder = Folder.builder()
-                .folderName(folderReqDTO.getFolderName())
+                .folderName(folderRequestDto.getFolderName())
                 .userId(user.get())
                 .build();
         folderRepository.save(folder);
@@ -49,15 +49,15 @@ public void folderUpdate(int folderId, String newFolderName) {
     }
 
     @Transactional(readOnly = true)
-    public List<FolderResDTO> folderList(int userId) {
+    public List<FolderResponseDto> folderList(int userId) {
         Optional<User> user = userRepository.findById(userId);
 
-        List<FolderResDTO> folderResDTOList = new ArrayList<>();
+        List<FolderResponseDto> folderResponseDtoList = new ArrayList<>();
 
         for(Folder obj : user.get().getFolderList()){
-            folderResDTOList.add(FolderResDTO.FolderDtoRes(obj));
+            folderResponseDtoList.add(FolderResponseDto.FolderDtoRes(obj));
         }
 
-        return folderResDTOList;
+        return folderResponseDtoList;
     }
 }

src/main/java/com/mpnp/baechelin/oauth/controller/AuthController.java

@@ -1,27 +1,15 @@
 package com.mpnp.baechelin.oauth.controller;
 
-import com.mpnp.baechelin.config.properties.AppProperties;
 import com.mpnp.baechelin.oauth.common.AuthResponse;
-import com.mpnp.baechelin.oauth.entity.RoleType;
 import com.mpnp.baechelin.oauth.service.AuthService;
-import com.mpnp.baechelin.oauth.token.AuthToken;
-import com.mpnp.baechelin.oauth.token.AuthTokenProvider;
-import com.mpnp.baechelin.user.entity.user.UserRefreshToken;
-import com.mpnp.baechelin.user.repository.UserRefreshTokenRepository;
-import com.mpnp.baechelin.util.CookieUtil;
-import com.mpnp.baechelin.util.HeaderUtil;
-import io.jsonwebtoken.Claims;
 import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import javax.servlet.http.Cookie;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-import javax.transaction.Transactional;
-import java.util.Date;
 
 @RestController
 @RequestMapping("/auth")

src/main/java/com/mpnp/baechelin/oauth/entity/UserPrincipal.java

@@ -1,6 +1,6 @@
 package com.mpnp.baechelin.oauth.entity;
 
-import com.mpnp.baechelin.user.entity.user.User;
+import com.mpnp.baechelin.user.domain.User;
 import lombok.*;
 import org.springframework.security.core.GrantedAuthority;
 import org.springframework.security.core.authority.SimpleGrantedAuthority;

src/main/java/com/mpnp/baechelin/oauth/handler/OAuth2AuthenticationSuccessHandler.java

@@ -8,7 +8,7 @@
 import com.mpnp.baechelin.oauth.repository.OAuth2AuthorizationRequestBasedOnCookieRepository;
 import com.mpnp.baechelin.oauth.token.AuthToken;
 import com.mpnp.baechelin.oauth.token.AuthTokenProvider;
-import com.mpnp.baechelin.user.entity.user.UserRefreshToken;
+import com.mpnp.baechelin.user.domain.UserRefreshToken;
 import com.mpnp.baechelin.user.repository.UserRefreshTokenRepository;
 import com.mpnp.baechelin.util.CookieUtil;
 import lombok.RequiredArgsConstructor;
@@ -23,9 +23,7 @@
 import javax.servlet.http.Cookie;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-import javax.transaction.Transactional;
 import java.io.IOException;
-import java.lang.annotation.Documented;
 import java.net.URI;
 import java.util.Collection;
 import java.util.Date;

src/main/java/com/mpnp/baechelin/oauth/service/AuthService.java

@@ -5,13 +5,11 @@
 import com.mpnp.baechelin.oauth.entity.RoleType;
 import com.mpnp.baechelin.oauth.token.AuthToken;
 import com.mpnp.baechelin.oauth.token.AuthTokenProvider;
-import com.mpnp.baechelin.user.entity.user.UserRefreshToken;
+import com.mpnp.baechelin.user.domain.UserRefreshToken;
 import com.mpnp.baechelin.user.repository.UserRefreshTokenRepository;
 import com.mpnp.baechelin.util.CookieUtil;
 import com.mpnp.baechelin.util.HeaderUtil;
 import io.jsonwebtoken.Claims;
-import io.jsonwebtoken.ExpiredJwtException;
-import io.jsonwebtoken.MalformedJwtException;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;

src/main/java/com/mpnp/baechelin/oauth/service/CustomOAuth2UserService.java

@@ -7,7 +7,7 @@
 import com.mpnp.baechelin.oauth.exception.OAuthProviderMissMatchException;
 import com.mpnp.baechelin.oauth.info.OAuth2UserInfo;
 import com.mpnp.baechelin.oauth.info.OAuth2UserInfoFactory;
-import com.mpnp.baechelin.user.entity.user.User;
+import com.mpnp.baechelin.user.domain.User;
 import com.mpnp.baechelin.user.repository.UserRepository;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;

src/main/java/com/mpnp/baechelin/oauth/service/CustomUserDetailsService.java

@@ -1,7 +1,7 @@
 package com.mpnp.baechelin.oauth.service;
 
 import com.mpnp.baechelin.oauth.entity.UserPrincipal;
-import com.mpnp.baechelin.user.entity.user.User;
+import com.mpnp.baechelin.user.domain.User;
 import com.mpnp.baechelin.user.repository.UserRepository;
 import lombok.RequiredArgsConstructor;
 import org.springframework.security.core.userdetails.UserDetails;

src/main/java/com/mpnp/baechelin/review/dto/ReviewMainResDto.java → src/main/java/com/mpnp/baechelin/review/dto/ReviewMainResponseDto.java

@@ -10,13 +10,13 @@
 @AllArgsConstructor
 @NoArgsConstructor
 @Builder
-public class ReviewMainResDto {
+public class ReviewMainResponseDto {
     // review 테이블 컬럼
     private String comment; //리뷰 코멘트
     private double point; //별점
     private String imageFileUrl; //리뷰 이미지 사진
 
-    public ReviewMainResDto(Review review) {
+    public ReviewMainResponseDto(Review review) {
         this.comment = review.getReview();
         this.point = review.getPoint();
         this.imageFileUrl = review.getReviewImageUrl();

src/main/java/com/mpnp/baechelin/review/dto/ReviewRequestDto.java

@@ -0,0 +1,20 @@
+package com.mpnp.baechelin.review.dto;
+
+import lombok.*;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.util.List;
+
+
+@Getter @Setter
+@NoArgsConstructor
+@AllArgsConstructor
+@Builder
+public class ReviewRequestDto {
+    //review 테이블 컬럼
+    private int storeId;      //업장 아이디
+    private String comment;      //리뷰 코멘트
+    private double point;        //별점
+    private MultipartFile imageFile;    //리뷰 이미지 사진
+    private List<String> tagList;
+}