Merge pull request #106 from WOONGEYA/test

CHORE(main) :: 모든 DTO의 네임에서 Dto 삭제

src/main/java/com/woongeya/zoing/domain/auth/presetation/AuthController.java

@@ -2,7 +2,7 @@
 
 import com.woongeya.zoing.domain.auth.service.OAuth2GoogleService;
 import com.woongeya.zoing.domain.auth.service.RefreshTokenService;
-import com.woongeya.zoing.global.jwt.dto.TokenResponseDto;
+import com.woongeya.zoing.global.jwt.dto.TokenResponse;
 import io.swagger.v3.oas.annotations.Operation;
 import lombok.RequiredArgsConstructor;
 import org.springframework.validation.annotation.Validated;
@@ -20,13 +20,13 @@ public class AuthController {
 
     @PostMapping("/google")
     @Operation(summary = "구글 로그인")
-    public TokenResponseDto loginOfGoogle(@Validated @RequestParam(name = "code") String code) {
+    public TokenResponse loginOfGoogle(@Validated @RequestParam(name = "code") String code) {
         return googleService.execute(code);
     }
 
     @PutMapping()
     @Operation(summary = "토큰 재발급")
-    public TokenResponseDto refreshToken(@RequestHeader(value = "Refresh-Token") @NotBlank String refreshToken) {
+    public TokenResponse refreshToken(@RequestHeader(value = "Refresh-Token") @NotBlank String refreshToken) {
         return refreshTokenService.execute(refreshToken);
     }
 }

src/main/java/com/woongeya/zoing/domain/auth/service/OAuth2GoogleService.java

@@ -3,12 +3,11 @@
 import com.woongeya.zoing.domain.user.domain.User;
 import com.woongeya.zoing.domain.user.domain.autority.Authority;
 import com.woongeya.zoing.domain.user.domain.repository.UserRepository;
-import com.woongeya.zoing.domain.user.exception.NotMeisterMemberException;
 import com.woongeya.zoing.global.feign.GoogleAuthClient;
 import com.woongeya.zoing.global.feign.GoogleInfoClient;
-import com.woongeya.zoing.global.feign.dto.request.GoogleTokenRequestDto;
-import com.woongeya.zoing.global.feign.dto.response.GoogleInfoResponseDto;
-import com.woongeya.zoing.global.jwt.dto.TokenResponseDto;
+import com.woongeya.zoing.global.feign.dto.request.GoogleTokenRequest;
+import com.woongeya.zoing.global.feign.dto.response.GoogleInfoResponse;
+import com.woongeya.zoing.global.jwt.dto.TokenResponse;
 import com.woongeya.zoing.global.jwt.util.JwtProvider;
 import com.woongeya.zoing.global.config.propertise.AuthProperties;
 import lombok.RequiredArgsConstructor;
@@ -28,26 +27,26 @@ public class OAuth2GoogleService {
     private final JwtProvider jwtProvider;
     private final UserRepository userRepository;
 
-    public TokenResponseDto execute(String code) {
+    public TokenResponse execute(String code) {
         String googleToken = googleAuthClient.getGoogleToken(
                 createRequest(code)
         ).getAccessToken();
-        GoogleInfoResponseDto userInfo = googleInfoClient.getUserInfo(googleToken);
+        GoogleInfoResponse userInfo = googleInfoClient.getUserInfo(googleToken);
         User user = saveOrUpdate(userInfo);
 
         return jwtProvider.generateToken(user.getEmail(), user.getAuthority().toString());
     }
 
-    public GoogleTokenRequestDto createRequest(String code) {
-        return GoogleTokenRequestDto.builder()
+    public GoogleTokenRequest createRequest(String code) {
+        return GoogleTokenRequest.builder()
                 .code(code)
                 .clientId(authProperties.getClientId())
                 .clientSecret(authProperties.getClientSecret())
                 .redirectUri(authProperties.getRedirectUri())
                 .build();
     }
 
-    private User saveOrUpdate(GoogleInfoResponseDto response) {
+    private User saveOrUpdate(GoogleInfoResponse response) {
         Optional<User> user = userRepository.findByEmail(response.getEmail());
 
         if (user.isEmpty()) {

src/main/java/com/woongeya/zoing/domain/auth/service/RefreshTokenService.java

@@ -3,7 +3,7 @@
 import com.woongeya.zoing.domain.user.UserFacade;
 import com.woongeya.zoing.domain.user.domain.User;
 import com.woongeya.zoing.global.jwt.config.JwtConstants;
-import com.woongeya.zoing.global.jwt.dto.TokenResponseDto;
+import com.woongeya.zoing.global.jwt.dto.TokenResponse;
 import com.woongeya.zoing.global.jwt.util.JwtProvider;
 import com.woongeya.zoing.global.jwt.util.JwtUtil;
 import lombok.RequiredArgsConstructor;
@@ -17,11 +17,11 @@ public class RefreshTokenService {
     private final JwtProvider jwtProvider;
     private final UserFacade userFacade;
 
-    public TokenResponseDto execute(String token) {
+    public TokenResponse execute(String token) {
         String email = jwtUtil.getJws(jwtUtil.parseToken(token)).getBody().get(JwtConstants.AUTH_ID.message).toString();
         User user = userFacade.getUserByEmail(email);
 
-        return TokenResponseDto.builder()
+        return TokenResponse.builder()
                 .accessToken(jwtProvider.generateAccessToken(user.getEmail(), user.getAuthority().toString()))
                 .build();
     }

src/main/java/com/woongeya/zoing/domain/follow/presetation/FollowController.java

@@ -1,6 +1,6 @@
 package com.woongeya.zoing.domain.follow.presetation;
 
-import com.woongeya.zoing.domain.follow.presetation.dto.reponse.FollowResponseDto;
+import com.woongeya.zoing.domain.follow.presetation.dto.reponse.FollowResponse;
 import com.woongeya.zoing.domain.follow.service.*;
 import io.swagger.v3.oas.annotations.Operation;
 import lombok.RequiredArgsConstructor;
@@ -29,7 +29,7 @@ public void createFollow(@PathVariable Long id) {
 
     @GetMapping("/{id}/following")
     @Operation(summary = "유저의 모든 팔로잉 조회")
-    public ResponseEntity<List<FollowResponseDto>> findFollwing(@PathVariable Long id) {
+    public ResponseEntity<List<FollowResponse>> findFollwing(@PathVariable Long id) {
         return ResponseEntity.ok(findFollowingService.execute(id));
     }
 
@@ -41,7 +41,7 @@ public Integer countFollowing(@PathVariable Long id) {
 
     @GetMapping("/{id}/follower")
     @Operation(summary = "유저의 모든 팔로워 조회")
-    public ResponseEntity<List<FollowResponseDto>> findFollower(@PathVariable Long id) {
+    public ResponseEntity<List<FollowResponse>> findFollower(@PathVariable Long id) {
         return ResponseEntity.ok(findFollowerService.execute(id));
     }
 

src/main/java/com/woongeya/zoing/domain/follow/presetation/dto/reponse/FollowResponseDto.java → src/main/java/com/woongeya/zoing/domain/follow/presetation/dto/reponse/FollowResponse.java

@@ -5,16 +5,16 @@
 import lombok.Builder;
 
 @Builder
-public record FollowResponseDto (
+public record FollowResponse(
     Long id,
     String name,
     String imgUrl,
     String major,
     Boolean followState
 ) {
 
-    public static FollowResponseDto of(User user, Boolean followState) {
-        return FollowResponseDto.builder()
+    public static FollowResponse of(User user, Boolean followState) {
+        return FollowResponse.builder()
                 .id(user.getId())
                 .name(user.getName())
                 .imgUrl(user.getImgUrl())

src/main/java/com/woongeya/zoing/domain/follow/service/FindFollowerService.java

@@ -2,7 +2,7 @@
 
 import com.woongeya.zoing.domain.follow.domain.Follow;
 import com.woongeya.zoing.domain.follow.domain.repository.FollowRepository;
-import com.woongeya.zoing.domain.follow.presetation.dto.reponse.FollowResponseDto;
+import com.woongeya.zoing.domain.follow.presetation.dto.reponse.FollowResponse;
 import com.woongeya.zoing.domain.user.UserFacade;
 import com.woongeya.zoing.domain.user.domain.User;
 import com.woongeya.zoing.global.util.SecurityUtil;
@@ -21,15 +21,15 @@ public class FindFollowerService {
     private final FollowRepository followRepository;
 
     @Transactional
-    public List<FollowResponseDto> execute(Long id) {
+    public List<FollowResponse> execute(Long id) {
         User currentUser = SecurityUtil.getCurrentUserOrNull();
         User user = userFacade.getUserById(id);
         List<Follow> follows = followRepository.findByFromUserId(user.getId());
 
         return follows.stream()
                 .map(follow -> {
                     User toUser = userFacade.getUserById(follow.getToUserId());
-                    return FollowResponseDto.of(toUser, currentUser != null && checkFollow(toUser, currentUser));
+                    return FollowResponse.of(toUser, currentUser != null && checkFollow(toUser, currentUser));
                 })
                 .collect(Collectors.toList());
     }

src/main/java/com/woongeya/zoing/domain/follow/service/FindFollowingService.java

@@ -2,7 +2,7 @@
 
 import com.woongeya.zoing.domain.follow.domain.Follow;
 import com.woongeya.zoing.domain.follow.domain.repository.FollowRepository;
-import com.woongeya.zoing.domain.follow.presetation.dto.reponse.FollowResponseDto;
+import com.woongeya.zoing.domain.follow.presetation.dto.reponse.FollowResponse;
 import com.woongeya.zoing.domain.user.UserFacade;
 import com.woongeya.zoing.domain.user.domain.User;
 import com.woongeya.zoing.global.util.SecurityUtil;
@@ -21,15 +21,15 @@ public class FindFollowingService {
     private final FollowRepository followRepository;
 
     @Transactional
-    public List<FollowResponseDto> execute(Long id) {
+    public List<FollowResponse> execute(Long id) {
         User currentUser = SecurityUtil.getCurrentUserOrNull();
         User user = userFacade.getUserById(id);
         List<Follow> follows = followRepository.findByToUserId(user.getId());
 
         return follows.stream()
                 .map(follow -> {
                     User fromUser = userFacade.getUserById(follow.getFromUserId());
-                    return FollowResponseDto.of(fromUser, currentUser != null && checkFollow(fromUser, currentUser));
+                    return FollowResponse.of(fromUser, currentUser != null && checkFollow(fromUser, currentUser));
                 })
                 .collect(Collectors.toList());
     }

src/main/java/com/woongeya/zoing/domain/like/presentation/LikeController.java

@@ -1,8 +1,9 @@
 package com.woongeya.zoing.domain.like.presentation;
 
-import com.woongeya.zoing.domain.like.presentation.dto.response.LikerResponseDto;
+import com.woongeya.zoing.domain.like.presentation.dto.response.LikerResponse;
 import com.woongeya.zoing.domain.like.service.*;
-import com.woongeya.zoing.domain.project.presetation.dto.response.ProjectResponseDto;
+import com.woongeya.zoing.domain.project.presetation.dto.response.ProjectResponse;
+
 import io.swagger.v3.oas.annotations.Operation;
 import lombok.RequiredArgsConstructor;
 import org.springframework.http.ResponseEntity;
@@ -36,13 +37,13 @@ public void unLike(@PathVariable Long id) {
 
     @GetMapping("/{id}/liker")
     @Operation(summary = "좋아요 누른 사람 조회")
-    public ResponseEntity<List<LikerResponseDto>> findLiker(@PathVariable Long id) {
+    public ResponseEntity<List<LikerResponse>> findLiker(@PathVariable Long id) {
         return ResponseEntity.ok(findLikerService.execute(id));
     }
 
     @GetMapping("/my")
     @Operation(summary = "내가 좋아요 누른 프로젝트 조회")
-    public ResponseEntity<List<ProjectResponseDto>> findLikedProject() {
+    public ResponseEntity<List<ProjectResponse>> findLikedProject() {
         return ResponseEntity.ok(findLikedService.execute());
     }
 

src/main/java/com/woongeya/zoing/domain/like/presentation/dto/response/LikerResponse.java

@@ -0,0 +1,10 @@
+package com.woongeya.zoing.domain.like.presentation.dto.response;
+
+public record LikerResponse(
+    Long id,
+    String name
+) {
+    public static LikerResponse of(Long id, String name) {
+        return new LikerResponse(id, name);
+    }
+}

src/main/java/com/woongeya/zoing/domain/like/service/FindLikedService.java

@@ -2,9 +2,8 @@
 
 import com.woongeya.zoing.domain.like.domain.Like;
 import com.woongeya.zoing.domain.like.domain.repository.LikeRepository;
-import com.woongeya.zoing.domain.project.domain.Project;
 import com.woongeya.zoing.domain.project.facade.ProjectFacade;
-import com.woongeya.zoing.domain.project.presetation.dto.response.ProjectResponseDto;
+import com.woongeya.zoing.domain.project.presetation.dto.response.ProjectResponse;
 import com.woongeya.zoing.domain.user.UserFacade;
 import com.woongeya.zoing.domain.user.domain.User;
 import lombok.RequiredArgsConstructor;
@@ -23,15 +22,15 @@ public class FindLikedService {
     private final LikeRepository likeRepository;
 
     @Transactional(readOnly = true)
-    public List<ProjectResponseDto> execute() {
+    public List<ProjectResponse> execute() {
         User user = userFacade.getCurrentUser();
         List<Like> likes = likeRepository.findByUserId(user.getId());
 
         return likes.stream()
                 .map(like -> projectFacade.getProject(like.getProjectId()))
                 .map(project -> {
                     Integer likeCount = likeRepository.countByProjectId(project.getId());
-                    return ProjectResponseDto.of(project, likeCount, true);
+                    return ProjectResponse.of(project, likeCount, true);
                 })
                 .collect(Collectors.toList());
 

src/main/java/com/woongeya/zoing/domain/like/service/FindLikerService.java

@@ -1,7 +1,7 @@
 package com.woongeya.zoing.domain.like.service;
 import com.woongeya.zoing.domain.like.domain.Like;
 import com.woongeya.zoing.domain.like.domain.repository.LikeRepository;
-import com.woongeya.zoing.domain.like.presentation.dto.response.LikerResponseDto;
+import com.woongeya.zoing.domain.like.presentation.dto.response.LikerResponse;
 import com.woongeya.zoing.domain.project.domain.Project;
 import com.woongeya.zoing.domain.project.facade.ProjectFacade;
 import com.woongeya.zoing.domain.user.UserFacade;
@@ -22,14 +22,14 @@ public class FindLikerService {
     private final LikeRepository likeRepository;
 
     @Transactional(readOnly = true)
-    public List<LikerResponseDto> execute(Long id) {
+    public List<LikerResponse> execute(Long id) {
         Project project = projectFacade.getProject(id);
         List<Like> likes = likeRepository.findByProjectId(project.getId());
 
         return likes.stream()
                 .map(like -> userFacade.getUserById(like.getUserId()))
                 .map(User::getName)
-                .map(name -> LikerResponseDto.of(id, name))
+                .map(name -> LikerResponse.of(id, name))
                 .collect(Collectors.toList());
 
     }

src/main/java/com/woongeya/zoing/domain/project/domain/Project.java

@@ -2,7 +2,7 @@
 
 
 import com.woongeya.zoing.domain.project.domain.type.ProjectState;
-import com.woongeya.zoing.domain.project.presetation.dto.request.CreateProjectRequestDto;
+import com.woongeya.zoing.domain.project.presetation.dto.request.CreateProjectRequest;
 import lombok.AccessLevel;
 import lombok.Builder;
 import lombok.Getter;
@@ -83,7 +83,7 @@ public void createAt() {
         this.startDate = LocalDate.now();
     }
 
-    public void update(CreateProjectRequestDto request) {
+    public void update(CreateProjectRequest request) {
         this.name = request.name();
         this.imgUrl = request.imgUrl();
         this.requiredPeople = request.requiredPeople();

src/main/java/com/woongeya/zoing/domain/project/presetation/MemberController.java

@@ -1,7 +1,7 @@
 package com.woongeya.zoing.domain.project.presetation;
 
-import com.woongeya.zoing.domain.project.presetation.dto.request.MemberRequestDto;
-import com.woongeya.zoing.domain.project.presetation.dto.response.MemberResponseDto;
+import com.woongeya.zoing.domain.project.presetation.dto.request.MemberRequest;
+import com.woongeya.zoing.domain.project.presetation.dto.response.MemberResponse;
 import com.woongeya.zoing.domain.project.service.CheckMemberService;
 import com.woongeya.zoing.domain.project.service.DeleteMemberService;
 import com.woongeya.zoing.domain.project.service.FindProjectMemberService;
@@ -23,13 +23,13 @@ public class MemberController {
 
     @DeleteMapping("/{id}")
     @Operation(summary = "멤버 삭제")
-    public void delete(@PathVariable Long id, @RequestBody MemberRequestDto request) {
+    public void delete(@PathVariable Long id, @RequestBody MemberRequest request) {
         deleteMemberService.execute(id, request);
     }
 
     @GetMapping("/{id}")
     @Operation(summary = "프로젝트 멤버 조회")
-    public ResponseEntity<List<MemberResponseDto>> findProjectMember(@PathVariable Long id) {
+    public ResponseEntity<List<MemberResponse>> findProjectMember(@PathVariable Long id) {
         return ResponseEntity.ok(findProjectMemberService.execute(id)) ;
     }