Merge branch 'feature' into BE/#179

techeer-sv · Jul 30, 2023 · 2700bc6 · 2700bc6
2 parents b7451aa + f7314b2
commit 2700bc6
Show file tree

Hide file tree

Showing 18 changed files with 183 additions and 54 deletions.
diff --git a/backend/src/main/java/com/graphy/backend/domain/comment/controller/CommentController.java b/backend/src/main/java/com/graphy/backend/domain/comment/controller/CommentController.java
@@ -2,6 +2,8 @@
 
 import com.graphy.backend.domain.comment.dto.ReplyListDto;
 import com.graphy.backend.domain.comment.service.CommentService;
+import com.graphy.backend.domain.member.domain.Member;
+import com.graphy.backend.global.auth.jwt.annotation.CurrentUser;
 import com.graphy.backend.global.result.ResultCode;
 import com.graphy.backend.global.result.ResultResponse;
 import io.swagger.v3.oas.annotations.Operation;
@@ -26,16 +28,16 @@ public class CommentController {
 
     @Operation(summary = "createComment", description = "댓글 생성")
     @PostMapping
-    public ResponseEntity<ResultResponse> createComment(@Validated @RequestBody CreateCommentRequest dto) {
-        CreateCommentResponse response = commentService.createComment(dto);
+    public ResponseEntity<ResultResponse> createComment(@Validated @RequestBody CreateCommentRequest dto, @CurrentUser Member loginUser) {
+        CreateCommentResponse response = commentService.createComment(dto, loginUser);
 
         return ResponseEntity.status(HttpStatus.CREATED)
                 .body(ResultResponse.of(ResultCode.COMMENT_CREATE_SUCCESS, response));
     }
 
     @Operation(summary = "updateComment", description = "댓글 수정")
     @PutMapping("/{commentId}")
-    public ResponseEntity<ResultResponse> updateComment(@Validated @RequestBody UpdateCommentRequest dto, @PathVariable Long commentId) {
+    public ResponseEntity<ResultResponse> updateComment(@Validated @RequestBody UpdateCommentRequest dto, @PathVariable Long commentId, @CurrentUser Member loginUser) {
         commentService.updateComment(commentId, dto);
 
         return ResponseEntity.status(HttpStatus.OK)
@@ -44,7 +46,7 @@ public ResponseEntity<ResultResponse> updateComment(@Validated @RequestBody Upda
 
     @Operation(summary = "deleteComment", description = "댓글 삭제")
     @DeleteMapping("/{id}")
-    public ResponseEntity<ResultResponse> deleteComment(@PathVariable Long id) {
+    public ResponseEntity<ResultResponse> deleteComment(@PathVariable Long id, @CurrentUser Member loginUser) {
         commentService.deleteComment(id);
         return ResponseEntity.status(HttpStatus.OK)
                 .body(ResultResponse.of(ResultCode.COMMENT_DELETE_SUCCESS));

diff --git a/backend/src/main/java/com/graphy/backend/domain/comment/dto/CommentDto.java b/backend/src/main/java/com/graphy/backend/domain/comment/dto/CommentDto.java
@@ -11,6 +11,7 @@ public class CommentDto {
 
     @Getter
     @AllArgsConstructor
+    @NoArgsConstructor
     public static class CreateCommentRequest {
 
         @NotBlank
@@ -41,6 +42,7 @@ public static class UpdateCommentRequest {
 
     @Getter
     @AllArgsConstructor
+    @NoArgsConstructor
     public static class CreateCommentResponse {
         private Long commentId;
     }

diff --git a/backend/src/main/java/com/graphy/backend/domain/comment/service/CommentService.java b/backend/src/main/java/com/graphy/backend/domain/comment/service/CommentService.java
@@ -25,11 +25,10 @@ public class CommentService {
     private final CustomUserDetailsService customUserDetailsService;
     private final ProjectRepository projectRepository;
 
-    public CreateCommentResponse createComment(CreateCommentRequest dto) {
+    public CreateCommentResponse createComment(CreateCommentRequest dto, Member loginUser) {
 
         Project project = projectRepository.findById(dto.getProjectId())
                 .orElseThrow(() -> new EmptyResultException(ErrorCode.PROJECT_DELETED_OR_NOT_EXIST));
-        Member loginUser = customUserDetailsService.getLoginUser();
 
         Comment parentComment = null;
         if (dto.getParentId() != null) {

diff --git a/backend/src/main/java/com/graphy/backend/domain/job/dto/JobDto.java b/backend/src/main/java/com/graphy/backend/domain/job/dto/JobDto.java
@@ -11,6 +11,7 @@ public class JobDto {
 
     @Getter
     @AllArgsConstructor
+    @NoArgsConstructor
     public static class CreateJobInfoRequest {
         private Long id;
         private String companyName;

diff --git a/backend/src/main/java/com/graphy/backend/domain/member/controller/MemberController.java b/backend/src/main/java/com/graphy/backend/domain/member/controller/MemberController.java
@@ -1,7 +1,8 @@
 package com.graphy.backend.domain.member.controller;
 
+import com.graphy.backend.domain.member.domain.Member;
 import com.graphy.backend.domain.member.service.MemberService;
-import com.graphy.backend.global.auth.jwt.dto.TokenDto;
+import com.graphy.backend.global.auth.jwt.annotation.CurrentUser;
 import com.graphy.backend.global.result.ResultCode;
 import com.graphy.backend.global.result.ResultResponse;
 import io.swagger.v3.oas.annotations.Operation;
@@ -48,8 +49,8 @@ public ResponseEntity<ResultResponse> findMember(@RequestParam String nickname)
 
     @Operation(summary = "myPage", description = "마이페이지")
     @GetMapping("/myPage")
-    public ResponseEntity<ResultResponse> myPage() {
-        GetMyPageResponse result = memberService.myPage();
+    public ResponseEntity<ResultResponse> myPage(@CurrentUser Member member) {
+        GetMyPageResponse result = memberService.myPage(member);
         return ResponseEntity.ok(ResultResponse.of(ResultCode.MYPAGE_GET_SUCCESS, result));
     }
 

diff --git a/backend/src/main/java/com/graphy/backend/domain/member/dto/MemberDto.java b/backend/src/main/java/com/graphy/backend/domain/member/dto/MemberDto.java
@@ -2,10 +2,7 @@
 
 import com.graphy.backend.domain.member.domain.Member;
 import com.graphy.backend.domain.member.domain.Role;
-import lombok.AccessLevel;
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Getter;
+import lombok.*;
 
 import javax.validation.constraints.Email;
 import javax.validation.constraints.NotBlank;
@@ -17,6 +14,7 @@ public class MemberDto {
     @Getter
     @Builder
     @AllArgsConstructor(access = AccessLevel.PRIVATE)
+    @NoArgsConstructor
     public static class LoginMemberRequest {
         @Email
         private String email;
@@ -29,6 +27,7 @@ public static class LoginMemberRequest {
     @Getter
     @Builder
     @AllArgsConstructor(access = AccessLevel.PRIVATE)
+    @NoArgsConstructor
     public static class GetMemberResponse {
         private String nickname;
         private String email;
@@ -44,6 +43,7 @@ public static GetMemberResponse toDto(Member member) {
     @Getter
     @Builder
     @AllArgsConstructor(access = AccessLevel.PRIVATE)
+    @NoArgsConstructor
     public static class CreateMemberRequest {
         @Email
         private String email;
@@ -69,6 +69,7 @@ public Member toEntity(String encodedPassword) {
     @Getter
     @Builder
     @AllArgsConstructor(access = AccessLevel.PRIVATE)
+    @NoArgsConstructor
     public static class GetMyPageResponse {
         private String nickname;
         private String introduction;

diff --git a/backend/src/main/java/com/graphy/backend/domain/member/dto/MemberInfo.java b/backend/src/main/java/com/graphy/backend/domain/member/dto/MemberInfo.java
@@ -0,0 +1,17 @@
+package com.graphy.backend.domain.member.dto;
+
+import com.graphy.backend.domain.member.domain.Member;
+import lombok.Getter;
+import org.springframework.security.core.authority.SimpleGrantedAuthority;
+import org.springframework.security.core.userdetails.User;
+
+import java.util.List;
+
+@Getter
+public class MemberInfo extends User {
+    private Member member;
+    public MemberInfo(Member member) {
+        super(member.getEmail(), member.getPassword(), List.of(new SimpleGrantedAuthority("ROLE_USER")));
+        this.member = member;
+    }
+}
diff --git a/backend/src/main/java/com/graphy/backend/domain/member/service/MemberService.java b/backend/src/main/java/com/graphy/backend/domain/member/service/MemberService.java
@@ -21,7 +21,7 @@
 
 import javax.servlet.http.HttpServletRequest;
 import javax.transaction.Transactional;
-
+import java.sql.Ref;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -147,11 +147,9 @@ public List<GetMemberResponse> findMember(String nickname) {
                 .collect(Collectors.toList());
     }
 
-    public GetMyPageResponse myPage() {
-        Member member = getLoginMember();
-        List<GetProjectInfoResponse> getProjectInfoResponseList = projectService.getProjectInfoList(member.getId());
-
-        return GetMyPageResponse.from(member, getProjectInfoResponseList);
+    public GetMyPageResponse myPage(Member member) {
+        List<GetProjectInfoResponse> projectInfoList = projectService.getProjectInfoList(member.getId());
+        return GetMyPageResponse.from(member, projectInfoList);
     }
 
     private Member getLoginMember() {

diff --git a/backend/src/main/java/com/graphy/backend/domain/project/controller/ProjectController.java b/backend/src/main/java/com/graphy/backend/domain/project/controller/ProjectController.java
@@ -1,6 +1,8 @@
 package com.graphy.backend.domain.project.controller;
 
+import com.graphy.backend.domain.member.domain.Member;
 import com.graphy.backend.domain.project.service.ProjectService;
+import com.graphy.backend.global.auth.jwt.annotation.CurrentUser;
 import com.graphy.backend.global.common.PageRequest;
 import com.graphy.backend.global.error.ErrorCode;
 import com.graphy.backend.global.error.exception.EmptyResultException;
@@ -30,14 +32,14 @@ public class ProjectController {
 
     @Operation(summary = "createProject", description = "프로젝트 생성")
     @PostMapping
-    public ResponseEntity<ResultResponse> createProject(@Validated @RequestBody CreateProjectRequest dto) {
-        CreateProjectResponse response = projectService.createProject(dto);
+    public ResponseEntity<ResultResponse> createProject(@Validated @RequestBody CreateProjectRequest dto, @CurrentUser Member loginUser) {
+        CreateProjectResponse response = projectService.createProject(dto, loginUser);
         return ResponseEntity.ok(ResultResponse.of(ResultCode.PROJECT_CREATE_SUCCESS, response));
     }
 
     @Operation(summary = "deleteProject", description = "프로젝트 삭제(soft delete)")
     @DeleteMapping("/{project_id}")
-    public ResponseEntity<ResultResponse> deleteProject(@PathVariable Long project_id) {
+    public ResponseEntity<ResultResponse> deleteProject(@PathVariable Long project_id, @CurrentUser Member loginUser) {
         projectService.deleteProject(project_id);
         return ResponseEntity.ok(ResultResponse.of(ResultCode.PROJECT_DELETE_SUCCESS));
     }
@@ -46,7 +48,7 @@ public ResponseEntity<ResultResponse> deleteProject(@PathVariable Long project_i
     @Operation(summary = "updateProject", description = "프로젝트 수정(변경감지)")
     @PutMapping("/{projectId}")
     public ResponseEntity<ResultResponse> updateProject(@PathVariable Long projectId,
-                                                        @RequestBody @Validated UpdateProjectRequest dto) {
+                                                        @RequestBody @Validated UpdateProjectRequest dto, @CurrentUser Member loginUser) {
         UpdateProjectResponse result = projectService.updateProject(projectId, dto);
         return ResponseEntity.ok(ResultResponse.of(ResultCode.PROJECT_UPDATE_SUCCESS, result));
     }
@@ -75,7 +77,7 @@ public ResponseEntity<ResultResponse> getProject(@PathVariable Long projectId) {
 
     @Operation(summary = "getProjectPlan", description = "프로젝트 고도화 계획 제안")
     @PostMapping("/plans")
-    public ResponseEntity<ResultResponse> createPlan(final @RequestBody GetPlanRequest getPlanRequest) throws ExecutionException, InterruptedException {
+    public ResponseEntity<ResultResponse> createPlan(final @RequestBody GetPlanRequest getPlanRequest, @CurrentUser Member loginUser) throws ExecutionException, InterruptedException {
         String prompt = projectService.getPrompt(getPlanRequest);
         projectService.checkGptRequestToken(prompt);
 

diff --git a/backend/src/main/java/com/graphy/backend/domain/project/dto/ProjectDto.java b/backend/src/main/java/com/graphy/backend/domain/project/dto/ProjectDto.java
@@ -15,6 +15,7 @@ public class ProjectDto {
     @Getter
     @Builder
     @AllArgsConstructor(access = AccessLevel.PRIVATE)
+    @NoArgsConstructor
     public static class CreateProjectRequest {
 
 
@@ -34,6 +35,7 @@ public static class CreateProjectRequest {
     @Getter
     @Builder
     @AllArgsConstructor(access = AccessLevel.PRIVATE)
+    @NoArgsConstructor
     public static class GetProjectsRequest {
 
         private String projectName;
@@ -43,6 +45,7 @@ public static class GetProjectsRequest {
     @Getter
     @Builder
     @AllArgsConstructor(access = AccessLevel.PRIVATE)
+    @NoArgsConstructor
     public static class UpdateProjectRequest {
         @NotBlank(message = "project name cannot be blank")
         private String projectName;
@@ -74,13 +77,15 @@ public static class GetPlanRequest {
 
     @Getter
     @Builder
+    @NoArgsConstructor
     @AllArgsConstructor(access = AccessLevel.PRIVATE)
     public static class CreateProjectResponse {
         private Long projectId;
     }
 
     @Getter
     @Builder
+    @NoArgsConstructor
     @AllArgsConstructor(access = AccessLevel.PRIVATE)
     public static class UpdateProjectResponse {
         private Long projectId;
@@ -94,6 +99,7 @@ public static class UpdateProjectResponse {
 
     @Getter
     @Builder
+    @NoArgsConstructor
     @AllArgsConstructor(access = AccessLevel.PRIVATE)
     public static class GetProjectResponse {
         private Long id;
@@ -108,6 +114,7 @@ public static class GetProjectResponse {
 
     @Getter
     @Builder
+    @NoArgsConstructor
     @AllArgsConstructor(access = AccessLevel.PRIVATE)
     public static class GetProjectDetailResponse {
         private Long id;
@@ -123,6 +130,7 @@ public static class GetProjectDetailResponse {
     }
     @Getter
     @Builder
+    @NoArgsConstructor
     @AllArgsConstructor(access = AccessLevel.PRIVATE)
     public static class GetProjectInfoResponse {
         private Long id;

diff --git a/backend/src/main/java/com/graphy/backend/domain/project/service/ProjectService.java b/backend/src/main/java/com/graphy/backend/domain/project/service/ProjectService.java
@@ -62,8 +62,7 @@ public class ProjectService {
 //        br.close();
 //    }
 
-    public CreateProjectResponse createProject(CreateProjectRequest dto) {
-        Member loginUser = customUserDetailsService.getLoginUser();
+    public CreateProjectResponse createProject(CreateProjectRequest dto, Member loginUser) {
         Project entity = mapper.toEntity(dto,loginUser);
         if (dto.getTechTags() != null) {
             Tags foundTags = getTagsWithName(dto.getTechTags());

diff --git a/backend/src/main/java/com/graphy/backend/global/auth/jwt/CustomUserDetailsService.java b/backend/src/main/java/com/graphy/backend/global/auth/jwt/CustomUserDetailsService.java
@@ -1,28 +1,23 @@
 package com.graphy.backend.global.auth.jwt;
 
 import com.graphy.backend.domain.member.domain.Member;
+import com.graphy.backend.domain.member.dto.MemberInfo;
 import com.graphy.backend.domain.member.repository.MemberRepository;
 import com.graphy.backend.global.error.ErrorCode;
 import com.graphy.backend.global.error.exception.EmptyResultException;
 import lombok.RequiredArgsConstructor;
-import org.springframework.security.core.Authentication;
-import org.springframework.security.core.GrantedAuthority;
-import org.springframework.security.core.authority.SimpleGrantedAuthority;
 import org.springframework.security.core.context.SecurityContextHolder;
-import org.springframework.security.core.userdetails.User;
 import org.springframework.security.core.userdetails.UserDetails;
 import org.springframework.security.core.userdetails.UserDetailsService;
 import org.springframework.security.core.userdetails.UsernameNotFoundException;
-import org.springframework.security.crypto.password.PasswordEncoder;
 import org.springframework.stereotype.Service;
 
-import java.util.Collections;
-
 @Service
 @RequiredArgsConstructor
 public class CustomUserDetailsService implements UserDetailsService {
 
     private final MemberRepository memberRepository;
+
     @Override
     public UserDetails loadUserByUsername(String email) throws UsernameNotFoundException {
         return memberRepository.findByEmail(email)
@@ -31,15 +26,10 @@ public UserDetails loadUserByUsername(String email) throws UsernameNotFoundExcep
     }
 
     private UserDetails createUserDetails(Member member) {
-        GrantedAuthority grantedAuthority = new SimpleGrantedAuthority(member.getRole().name());
-        return new User(
-                member.getEmail(),
-                member.getPassword(),
-                Collections.singleton(grantedAuthority)
-        );
+        return new MemberInfo(member);
     }
 
-    public Member getLoginUser(){
+    public Member getLoginUser() {
         Object principal = SecurityContextHolder.getContext().getAuthentication().getPrincipal();
         String email = ((UserDetails) principal).getUsername();
         return memberRepository.findByEmail(email).orElseThrow(

diff --git a/backend/src/main/java/com/graphy/backend/global/auth/jwt/TokenProvider.java b/backend/src/main/java/com/graphy/backend/global/auth/jwt/TokenProvider.java
@@ -10,7 +10,6 @@
 import org.springframework.security.core.Authentication;
 import org.springframework.security.core.GrantedAuthority;
 import org.springframework.security.core.authority.SimpleGrantedAuthority;
-import org.springframework.security.core.userdetails.User;
 import org.springframework.security.core.userdetails.UserDetails;
 import org.springframework.stereotype.Component;
 
@@ -31,7 +30,9 @@ public class TokenProvider {
     private final Key key;
 
 
-    public TokenProvider(@Value("${jwt.secret}") String secretKey) {
+    private final CustomUserDetailsService customUserDetailsService;
+    public TokenProvider(@Value("${jwt.secret}") String secretKey, CustomUserDetailsService customUserDetailsService) {
+        this.customUserDetailsService = customUserDetailsService;
         byte[] keyBytes = Decoders.BASE64.decode(secretKey);
         this.key = Keys.hmacShaKeyFor(keyBytes);
     }
@@ -83,9 +84,9 @@ public Authentication getAuthentication(String accessToken) {
                         .collect(Collectors.toList());
 
         // UserDetails 객체를 만들어서 Authentication 리턴
-        UserDetails principal = new User(claims.getSubject(), "", authorities);
+        UserDetails principal = customUserDetailsService.loadUserByUsername(claims.getSubject());
 
-        return new UsernamePasswordAuthenticationToken(principal, "", authorities);
+        return new UsernamePasswordAuthenticationToken(principal, "", principal.getAuthorities());
     }
 
     public boolean validateToken(String token) {

diff --git a/backend/src/main/java/com/graphy/backend/global/auth/jwt/annotation/CurrentUser.java b/backend/src/main/java/com/graphy/backend/global/auth/jwt/annotation/CurrentUser.java
@@ -0,0 +1,14 @@
+package com.graphy.backend.global.auth.jwt.annotation;
+
+import org.springframework.security.core.annotation.AuthenticationPrincipal;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+@Retention(RetentionPolicy.RUNTIME)
+@Target(ElementType.PARAMETER)
+@AuthenticationPrincipal(expression = "#this == 'anonymousUser' ? null : member")
+public @interface CurrentUser {
+}