Merge pull request #94 from prgrms-web-devcourse-final-project/dev

Dev

Author: KangDaegyeom

src/main/java/com/grepp/teamnotfound/app/controller/api/admin/AdminController.java

@@ -32,39 +32,26 @@ public class AdminController {
     @Operation(summary = "전체 가입자 수 조회")
     @GetMapping("v1/stats/users")
     public ResponseEntity<UserCountResponse> getUsersCount(){
-        TotalUsersDto totalUsersDto = adminService.getTotalUsersCount();
-        UserCountResponse response = UserCountResponse.builder()
-                .date(OffsetDateTime.now())
-                .total(totalUsersDto.getTotal())
-                .build();
+        TotalUsersDto dto = adminService.getTotalUsersCount();
+        UserCountResponse response = UserCountResponse.of(dto);
         return ResponseEntity.ok(response);
     }
 
     @Operation(summary = "회원 목록 조회")
     @GetMapping("v1/users")
     public ResponseEntity<UsersListResponse> getUsers(
-            @Valid @ModelAttribute UsersListRequest request
-            ){
+            @Valid @ModelAttribute UsersListRequest request){
         Page<UsersListDto> userPage = adminService.getUsersList(request);
-        UsersListResponse response = UsersListResponse.builder()
-                .users(userPage.getContent())
-                .pageInfo(PageInfo.fromPage(userPage))
-                .build();
-
+        UsersListResponse response = UsersListResponse.of(userPage);
         return ResponseEntity.ok(response);
     }
 
     @Operation(summary = "신고 내역 목록 조회")
     @GetMapping("v1/reports")
     public ResponseEntity<ReportsListResponse> getReports(
-            @Valid @ModelAttribute ReportsListRequest request
-    ){
+            @Valid @ModelAttribute ReportsListRequest request){
         Page<ReportsListDto> reportPage = adminService.getReportsList(request);
-        ReportsListResponse response = ReportsListResponse.builder()
-                .reports(reportPage.getContent())
-                .pageInfo(PageInfo.fromPage(reportPage))
-                .build();
-
+        ReportsListResponse response = ReportsListResponse.of(reportPage);
         return ResponseEntity.ok(response);
     }
 
@@ -126,26 +113,15 @@ public ResponseEntity<ReportDetailResponse> getReportDetail(@PathVariable Long r
     @Operation(summary = "신고 처리하기")
     @PatchMapping("v1/reports/result-accept")
     public ResponseEntity<?> acceptReport(@RequestBody AcceptReportRequest request){
-
-        AcceptReportDto dto = AcceptReportDto.builder()
-                .reportId(request.getReportId())
-                .adminReason(request.getAdminReason())
-                .period(request.getPeriod())
-                .build();
-
+        AcceptReportDto dto = AcceptReportDto.of(request);
         adminService.acceptReportAndSuspendUser(dto);
         return ResponseEntity.ok("신고가 정상적으로 처리되었습니다.");
     }
 
     @Operation(summary = "신고 철회하기")
     @PatchMapping("v1/reports/result-reject")
     public ResponseEntity<?> rejectReport(@RequestBody RejectReportRequest request){
-
-        RejectReportDto dto = RejectReportDto.builder()
-                .reportId(request.getReportId())
-                .adminReason(request.getAdminReason())
-                .build();
-
+        RejectReportDto dto = RejectReportDto.of(request);
         adminService.rejectReport(dto);
         return ResponseEntity.ok("신고를 성공적으로 거절하였습니다.");
     }

src/main/java/com/grepp/teamnotfound/app/controller/api/admin/payload/ReportsListResponse.java

@@ -3,6 +3,7 @@
 import com.grepp.teamnotfound.app.model.report.dto.ReportsListDto;
 import lombok.Builder;
 import lombok.Data;
+import org.springframework.data.domain.Page;
 
 import java.util.List;
 
@@ -12,4 +13,11 @@ public class ReportsListResponse {
 
     private List<ReportsListDto> reports;
     private PageInfo pageInfo;
+
+    public static ReportsListResponse of(Page<ReportsListDto> reportPage) {
+        return ReportsListResponse.builder()
+                .reports(reportPage.getContent())
+                .pageInfo(PageInfo.fromPage(reportPage))
+                .build();
+    }
 }

src/main/java/com/grepp/teamnotfound/app/controller/api/admin/payload/UserCountResponse.java

@@ -1,5 +1,6 @@
 package com.grepp.teamnotfound.app.controller.api.admin.payload;
 
+import com.grepp.teamnotfound.app.model.user.dto.TotalUsersDto;
 import lombok.Builder;
 import lombok.Data;
 import lombok.Getter;
@@ -12,4 +13,11 @@ public class UserCountResponse {
 
     private OffsetDateTime date;
     private long total;
+
+    public static UserCountResponse of(TotalUsersDto dto) {
+        return UserCountResponse.builder()
+                .date(OffsetDateTime.now())
+                .total(dto.getTotal())
+                .build();
+    }
 }

src/main/java/com/grepp/teamnotfound/app/controller/api/admin/payload/UsersListResponse.java

@@ -3,8 +3,8 @@
 import com.grepp.teamnotfound.app.model.user.dto.UsersListDto;
 import lombok.Builder;
 import lombok.Data;
+import org.springframework.data.domain.Page;
 
-import java.time.OffsetDateTime;
 import java.util.List;
 
 @Data
@@ -13,4 +13,11 @@ public class UsersListResponse {
 
     private List<UsersListDto> users;
     private PageInfo pageInfo;
+
+    public static UsersListResponse of(Page<UsersListDto> userPage){
+        return UsersListResponse.builder()
+                .users(userPage.getContent())
+                .pageInfo(PageInfo.fromPage(userPage))
+                .build();
+    }
 }

src/main/java/com/grepp/teamnotfound/app/controller/api/article/ArticleApiController.java

@@ -130,12 +130,17 @@ public ResponseEntity<?> getReplyCount(
 
     @GetMapping("/v1/{articleId}/like")
     @Operation(summary = "게시글 좋아요 개수")
+    @PreAuthorize("isAnonymous() or isAuthenticated()")
     public ResponseEntity<?> getLikeCount(
-        @PathVariable Long articleId
+        @PathVariable Long articleId,
+        @AuthenticationPrincipal Principal principal
     ) {
-        Integer likeCount = articleService.getActualLikeCount(articleId);
-        return ResponseEntity.ok(ApiResponse.success(Map.of("likes", likeCount)));
-    }
+        Long userId = null;
+        if (principal != null) {
+            userId = principal.getUserId();
+        }
 
-    // TODO 게시글 신고 기능
+        LikeResponse response = articleService.getNewestLikeCount(articleId, userId);
+        return ResponseEntity.ok(ApiResponse.success(response));
+    }
 }

src/main/java/com/grepp/teamnotfound/app/controller/api/auth/AuthController.java

@@ -1,5 +1,6 @@
 package com.grepp.teamnotfound.app.controller.api.auth;
 
+import com.grepp.teamnotfound.app.controller.api.auth.code.ProviderType;
 import com.grepp.teamnotfound.app.controller.api.auth.payload.EmailVerificationRequest;
 import com.grepp.teamnotfound.app.controller.api.auth.payload.EmailVerifyRequest;
 import com.grepp.teamnotfound.app.controller.api.auth.payload.LoginRequest;
@@ -75,32 +76,18 @@ public ResponseEntity<?> checkNickname(@RequestParam("nickname") String nickname
     @Operation(summary = "최종 회원가입")
     @PostMapping("v2/register")
     public ResponseEntity<ApiResponse<?>> register(@RequestBody RegisterRequest request) {
-
-        RegisterCommand command = RegisterCommand.builder()
-                .email(request.getEmail())
-                .name(request.getName())
-                .nickname(request.getNickname())
-                .password(request.getPassword())
-                .build();
+        RegisterCommand command = RegisterCommand.of(request);
         Long userId = userService.registerUser(command);
         RegisterResponse response = new RegisterResponse(userId);
-
         notificationService.createManagement(userId);
-
         return ResponseEntity.ok(ApiResponse.success(response));
     }
 
 
     @PostMapping("v2/admin/register")
     @PreAuthorize("permitAll()")
     public ResponseEntity<ApiResponse<?>> registerAdmin(@RequestBody RegisterRequest request) {
-
-        RegisterCommand command = RegisterCommand.builder()
-                .email(request.getEmail())
-                .name(request.getName())
-                .nickname(request.getNickname())
-                .password(request.getPassword())
-                .build();
+        RegisterCommand command = RegisterCommand.of(request);
         Long userId = userService.registerAdmin(command);
         RegisterResponse response = new RegisterResponse(userId);
         return ResponseEntity.ok(ApiResponse.success(response));
@@ -109,34 +96,21 @@ public ResponseEntity<ApiResponse<?>> registerAdmin(@RequestBody RegisterRequest
     @Operation(summary = "소셜 로그인")
     @GetMapping("v1/social-auth/{provider}")
     public ResponseEntity<?> socialLogin(@PathVariable String provider) {
-        String url = customOAuth2UserService.getAuthUrl(provider);
+        ProviderType providerType = ProviderType.valueOf(provider.toUpperCase());
+        String url = customOAuth2UserService.getAuthUrl(providerType);
         return ResponseEntity.ok(url);
     }
 
 
     @Operation(summary = "회원 로그인")
     @PostMapping("v1/login")
     public ResponseEntity<ApiResponse<LoginResponse>> login(@RequestBody LoginRequest request, HttpServletResponse response) {
-
-        LoginCommand command = LoginCommand.builder()
-                .email(request.getEmail())
-                .password(request.getPassword())
-                .build();
-
+        LoginCommand command = LoginCommand.of(request);
         LoginResult dto = authService.login(command);
         createAuthTokenCookies(dto, response);
 
-        TokenResponse tokenResponse = TokenResponse.builder()
-                .accessToken(dto.getAccessToken())
-                .expiresIn(dto.getAtExpiresIn())
-                .grantType(GrantType.BEARER)
-                .refreshToken(dto.getRefreshToken())
-                .build();
-
-        LoginResponse loginResponse = LoginResponse.builder()
-                .tokenResponse(tokenResponse)
-                .userId(dto.getUserId())
-                .build();
+        TokenResponse tokenResponse = TokenResponse.of(dto);
+        LoginResponse loginResponse = LoginResponse.of(tokenResponse, dto);
         return ResponseEntity.ok(ApiResponse.success(loginResponse));
 
     }
@@ -147,27 +121,14 @@ public ResponseEntity<ApiResponse<LoginResponse>> login(@RequestBody LoginReques
     @PreAuthorize("permitAll()")
     public ResponseEntity<ApiResponse<LoginResponse>> adminLogin(@RequestBody LoginRequest request, HttpServletResponse response) {
 
-        LoginCommand command = LoginCommand.builder()
-                .email(request.getEmail())
-                .password(request.getPassword())
-                .build();
+        LoginCommand command = LoginCommand.of(request);
 
         LoginResult dto = authService.adminLogin(command);
         createAuthTokenCookies(dto, response);
 
-        TokenResponse tokenResponse = TokenResponse.builder()
-                .accessToken(dto.getAccessToken())
-                .expiresIn(dto.getAtExpiresIn())
-                .grantType(GrantType.BEARER)
-                .refreshToken(dto.getRefreshToken())
-                .build();
-
-        LoginResponse loginResponse = LoginResponse.builder()
-                .tokenResponse(tokenResponse)
-                .userId(dto.getUserId())
-                .build();
+        TokenResponse tokenResponse = TokenResponse.of(dto);
+        LoginResponse loginResponse = LoginResponse.of(tokenResponse, dto);
         return ResponseEntity.ok(ApiResponse.success(loginResponse));
-
     }
 
     private void createAuthTokenCookies(LoginResult dto, HttpServletResponse response) {

src/main/java/com/grepp/teamnotfound/app/controller/api/auth/code/ProviderType.java

@@ -0,0 +1,16 @@
+package com.grepp.teamnotfound.app.controller.api.auth.code;
+
+import com.grepp.teamnotfound.infra.error.exception.BusinessException;
+import com.grepp.teamnotfound.infra.error.exception.code.AuthErrorCode;
+
+public enum ProviderType {
+    GOOGLE, KAKAO, NAVER;
+
+    public static ProviderType from(String input){
+        try {
+            return ProviderType.valueOf(input.toUpperCase());
+        } catch (IllegalArgumentException e) {
+            throw new BusinessException(AuthErrorCode.UNSUPPORTED_PROVIDER);
+        }
+    }
+}

src/main/java/com/grepp/teamnotfound/app/controller/api/auth/payload/LoginResponse.java

@@ -1,5 +1,6 @@
 package com.grepp.teamnotfound.app.controller.api.auth.payload;
 
+import com.grepp.teamnotfound.app.model.auth.dto.LoginResult;
 import lombok.Builder;
 import lombok.Data;
 
@@ -9,4 +10,11 @@ public class LoginResponse {
 
     private Long userId;
     private TokenResponse tokenResponse;
+
+    public static LoginResponse of(TokenResponse tokenResponse, LoginResult dto) {
+        return LoginResponse.builder()
+                .tokenResponse(tokenResponse)
+                .userId(dto.getUserId())
+                .build();
+    }
 }

src/main/java/com/grepp/teamnotfound/app/controller/api/auth/payload/TokenResponse.java

@@ -1,5 +1,6 @@
 package com.grepp.teamnotfound.app.controller.api.auth.payload;
 
+import com.grepp.teamnotfound.app.model.auth.dto.LoginResult;
 import com.grepp.teamnotfound.infra.auth.token.code.GrantType;
 import lombok.Builder;
 import lombok.Data;
@@ -12,5 +13,12 @@ public class TokenResponse {
     private GrantType grantType;
     private Long expiresIn;
 
-
+    public static TokenResponse of(LoginResult result){
+        return TokenResponse.builder()
+                .accessToken(result.getAccessToken())
+                .refreshToken(result.getRefreshToken())
+                .grantType(GrantType.BEARER)
+                .expiresIn(result.getAtExpiresIn())
+                .build();
+    }
 }