Merge branch 'develop' into feat/#46-getMember-ys

Author: youngseo22

src/main/java/com/example/FixLog/config/JwtAuthenticationFilter.java

@@ -37,7 +37,7 @@ protected void doFilterInternal(HttpServletRequest request,
         if (token != null && jwtUtil.isTokenValid(token)) {
             String email = jwtUtil.getEmailFromToken(token);
             Member member = memberRepository.findByEmail(email)
-                    .orElseThrow(() -> new CustomException(ErrorCode.MEMBER_NOT_FOUND));
+                    .orElseThrow(() -> new CustomException(ErrorCode.USER_NICKNAME_NOT_FOUND));
 
             Authentication auth = new UsernamePasswordAuthenticationToken(member, null, member.getAuthorities());
             SecurityContextHolder.getContext().setAuthentication(auth);

src/main/java/com/example/FixLog/config/SecurityConfig.java

@@ -27,10 +27,10 @@ public SecurityFilterChain filterChain(HttpSecurity http) throws Exception {
         http
                 .csrf(csrf -> csrf.disable())
                 .authorizeHttpRequests(auth -> auth
-                        .requestMatchers(HttpMethod.POST, "/api/members/signup").permitAll()
-                        .requestMatchers(HttpMethod.POST, "/api/auth/login").permitAll()
-                        .requestMatchers(HttpMethod.GET, "/api/members/check-email").permitAll()
-                        .requestMatchers(HttpMethod.GET, "/api/members/check-nickname").permitAll()
+                        .requestMatchers(HttpMethod.POST, "/members/signup").permitAll()
+                        .requestMatchers(HttpMethod.POST, "/auth/login").permitAll()
+                        .requestMatchers(HttpMethod.GET, "/members/check-email").permitAll()
+                        .requestMatchers(HttpMethod.GET, "/members/check-nickname").permitAll()
                         .requestMatchers(HttpMethod.GET, "/h2-console/**").permitAll()
                         .anyRequest().authenticated()
                 )

src/main/java/com/example/FixLog/controller/AuthController.java

@@ -9,7 +9,7 @@
 import org.springframework.web.bind.annotation.*;
 
 @RestController
-@RequestMapping("/api/auth")
+@RequestMapping("/auth")
 @RequiredArgsConstructor
 public class AuthController {
 

src/main/java/com/example/FixLog/controller/FollowController.java

@@ -9,6 +9,8 @@
 import com.example.FixLog.service.FollowService;
 import lombok.RequiredArgsConstructor;
 import org.springframework.http.ResponseEntity;
+import org.springframework.security.core.annotation.AuthenticationPrincipal;
+import org.springframework.security.core.userdetails.UserDetails;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
@@ -23,8 +25,9 @@ public class FollowController {
     @PostMapping
     public ResponseEntity<Response<FollowResponseDto>> follow(
             @RequestBody FollowRequestDto followRequestDto,
-            @RequestParam String requesterEmail // jwt 구현 전까지 임시 사용 -> 이후 AuthenticationPrincipal 사용 예정
+            @AuthenticationPrincipal UserDetails userDetails  // jwt 구현 전까지 임시 사용 -> 이후 AuthenticationPrincipal 사용 예정
             ){
+        String requesterEmail = userDetails.getUsername();
         FollowResponseDto result = followService.follow(requesterEmail, followRequestDto.getTargetMemberId());
         return ResponseEntity.ok(Response.success("팔로우 완료", result));
     }
@@ -33,26 +36,29 @@ public ResponseEntity<Response<FollowResponseDto>> follow(
     @PostMapping("/unfollow")
     public ResponseEntity<Response<Void>> unfollow(
             @RequestBody UnfollowRequestDto requestDto,
-            @RequestParam String requesterEmail) {
-
+            @AuthenticationPrincipal UserDetails userDetails
+    ) {
+        String requesterEmail = userDetails.getUsername();
         followService.unfollow(requesterEmail, requestDto.getTargetMemberId());
         return ResponseEntity.ok(Response.success("언팔로우 완료", null));
     }
 
     // 나를 팔로우하는 목록 조회
     @GetMapping("/followers")
     public ResponseEntity<Response<List<FollowerListResponseDto>>> getMyFollowers(
-            @RequestParam String requesterEmail) {
-
+            @AuthenticationPrincipal UserDetails userDetails
+    ) {
+        String requesterEmail = userDetails.getUsername();
         List<FollowerListResponseDto> followers = followService.getMyFollowers(requesterEmail);
         return ResponseEntity.ok(Response.success("나를 팔로우하는 목록 조회 성공", followers));
     }
 
     // 내가 팔로우하는 목록 조회
     @GetMapping("/followings")
     public ResponseEntity<Response<List<FollowingListResponseDto>>> getMyFollowings(
-            @RequestParam String requesterEmail) {
-
+            @AuthenticationPrincipal UserDetails userDetails
+    ) {
+        String requesterEmail = userDetails.getUsername();
         List<FollowingListResponseDto> followings = followService.getMyFollowings(requesterEmail);
         return ResponseEntity.ok(Response.success("내가 팔로우 중인 목록 조회 성공", followings));
     }

src/main/java/com/example/FixLog/controller/MemberController.java

@@ -1,6 +1,5 @@
 package com.example.FixLog.controller;
 
-
 import com.example.FixLog.domain.member.Member;
 import com.example.FixLog.dto.Response;
 import com.example.FixLog.dto.member.MemberInfoResponseDto;
@@ -13,7 +12,7 @@
 import org.springframework.web.bind.annotation.*;
 
 @RestController
-@RequestMapping("/api/members")
+@RequestMapping("/members")
 @RequiredArgsConstructor
 public class MemberController {
 
@@ -50,4 +49,10 @@ public ResponseEntity<Response<MemberInfoResponseDto>> getMyInfo(@Authentication
         );
         return ResponseEntity.ok(Response.success("회원 정보 조회 성공", responseDto));
     }
-}
+
+    @DeleteMapping("/me")
+    public ResponseEntity<Response<Void>> withdraw(@AuthenticationPrincipal Member member) {
+        memberService.withdraw(member);
+        return ResponseEntity.ok(Response.success("회원 탈퇴 성공", null));
+    }
+}

src/main/java/com/example/FixLog/controller/MypagePostController.java

@@ -0,0 +1,36 @@
+package com.example.FixLog.controller;
+
+import com.example.FixLog.dto.PageResponseDto;
+import com.example.FixLog.dto.Response;
+import com.example.FixLog.dto.post.MyPostPageResponseDto;
+import com.example.FixLog.service.MypagePostService;
+import lombok.RequiredArgsConstructor;
+import org.springframework.http.ResponseEntity;
+import org.springframework.security.core.annotation.AuthenticationPrincipal;
+import org.springframework.security.core.userdetails.UserDetails;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@RequiredArgsConstructor
+@RequestMapping("/mypage")
+public class MypagePostController {
+
+    private final MypagePostService mypagePostService;
+
+    // 내가 쓴 글 보기
+    @GetMapping("/posts")
+    public ResponseEntity<Response<PageResponseDto<MyPostPageResponseDto>>> getMyPosts(
+            @AuthenticationPrincipal UserDetails userDetails,
+            @RequestParam(defaultValue = "0") int page,
+            @RequestParam(defaultValue = "4") int size,
+            @RequestParam(defaultValue = "0") int sort
+    ) {
+        String email = userDetails.getUsername();
+        PageResponseDto<MyPostPageResponseDto> data = mypagePostService.getMyPosts(email, page, sort, size);
+        return ResponseEntity.ok(Response.success("내가 작성한 글 보기 성공", data));
+    }
+
+}

src/main/java/com/example/FixLog/controller/TagController.java

@@ -0,0 +1,22 @@
+package com.example.FixLog.controller;
+
+import com.example.FixLog.dto.Response;
+import com.example.FixLog.dto.tag.TagResponseDto;
+import com.example.FixLog.service.TagService;
+import org.springframework.web.bind.annotation.*;
+
+@RestController
+@RequestMapping("/tags")
+public class TagController {
+    private final TagService tagService;
+
+    public TagController(TagService tagService){
+        this.tagService = tagService;
+    }
+
+    @GetMapping
+    public Response<Object> viewTags(@RequestParam("page") int page){
+        TagResponseDto tags = tagService.viewTags(page);
+        return Response.success("태그 모아보기 성공", tags);
+    }
+}

src/main/java/com/example/FixLog/domain/member/Member.java

@@ -41,6 +41,10 @@ public class Member implements UserDetails {
     @Column(nullable = false)
     private Boolean isDeleted = false;
 
+    public void setIsDeleted(boolean isDeleted) {
+        this.isDeleted = isDeleted;
+    }
+
     @Enumerated(EnumType.STRING)
     @Column(nullable = false)
     private SocialType socialType = SocialType.EMAIL;

src/main/java/com/example/FixLog/domain/post/Post.java

@@ -4,16 +4,16 @@
 import com.example.FixLog.domain.like.PostLike;
 import com.example.FixLog.domain.member.Member;
 import jakarta.persistence.*;
-import lombok.AccessLevel;
-import lombok.Getter;
-import lombok.NoArgsConstructor;
+import lombok.*;
 
 import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.List;
 
 @Entity
 @Getter
+@Builder
+@AllArgsConstructor
 @NoArgsConstructor(access = AccessLevel.PROTECTED)
 public class Post {
 

src/main/java/com/example/FixLog/dto/PageResponseDto.java

@@ -0,0 +1,35 @@
+package com.example.FixLog.dto;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import lombok.Getter;
+import org.springframework.data.domain.Page;
+
+import java.util.List;
+import java.util.function.Function;
+
+@Getter
+@JsonInclude(JsonInclude.Include.NON_NULL)
+public class PageResponseDto<T> {
+
+    private final List<T> content;
+    private final int page;
+    private final int size;
+    private final long totalElements;
+
+    @JsonInclude(JsonInclude.Include.NON_NULL)
+    private final Integer totalPages;
+
+    private PageResponseDto(Page<T> page) {
+        this.content = page.getContent();
+        this.page = page.getNumber() + 1; // 1부터 시작
+        this.size = page.getSize();
+        this.totalElements = page.getTotalElements();
+        this.totalPages = page.getTotalPages() == 0 ? null : page.getTotalPages();
+    }
+
+    public static <T, R> PageResponseDto<R> from(Page<T> page, Function<T, R> mapper) {
+        Page<R> mapped = page.map(mapper);
+        return new PageResponseDto<>(mapped);
+    }
+}
+