Merge branch 'develop' into main v.1

Author: youngseo22

.coderabbit.yaml

@@ -0,0 +1,15 @@
+# .coderabbit.yaml
+language: "ko-KR" # 한국말로 설정
+early_access: false
+reviews:
+  profile: "chill" # 리뷰 너무 빡세게는 안한다는 뜻
+  request_changes_workflow: true # 코드래빗이 리뷰 끝나면 알아서 PR 승인하게끔
+  high_level_summary: true
+  poem: true
+  review_status: true
+  collapse_walkthrough: false
+  auto_review:
+    enabled: true
+    drafts: false
+chat:
+  auto_reply: true

build.gradle

@@ -25,14 +25,16 @@ repositories {
 
 dependencies {
 	implementation 'org.springframework.boot:spring-boot-starter-data-jpa'
-	implementation 'org.springframework.boot:spring-boot-starter-security'
+ 	implementation 'org.springframework.boot:spring-boot-starter-security'
 	implementation 'org.springframework.boot:spring-boot-starter-web'
-	compileOnly 'org.projectlombok:lombok'
+	implementation 'io.jsonwebtoken:jjwt-api:0.11.5'
+	runtimeOnly 'io.jsonwebtoken:jjwt-impl:0.11.5'
+	runtimeOnly('io.jsonwebtoken:jjwt-jackson:0.11.5')
 	runtimeOnly 'com.h2database:h2'
 	runtimeOnly 'com.mysql:mysql-connector-j'
+	compileOnly 'org.projectlombok:lombok'
 	annotationProcessor 'org.projectlombok:lombok'
 	testImplementation 'org.springframework.boot:spring-boot-starter-test'
-	testImplementation 'org.springframework.security:spring-security-test'
 	testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
 }
 

gradlew

@@ -0,0 +1,56 @@
+package com.example.FixLog.config;
+
+import com.example.FixLog.domain.member.Member;
+import com.example.FixLog.exception.CustomException;
+import com.example.FixLog.repository.MemberRepository;
+import com.example.FixLog.util.JwtUtil;
+import java.io.IOException;
+import jakarta.servlet.FilterChain;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
+import org.springframework.security.core.Authentication;
+import org.springframework.security.core.context.SecurityContextHolder;
+import org.springframework.util.StringUtils;
+import org.springframework.web.filter.OncePerRequestFilter;
+import com.example.FixLog.exception.ErrorCode;
+
+public class JwtAuthenticationFilter extends OncePerRequestFilter {
+
+    private final JwtUtil jwtUtil;
+    private final MemberRepository memberRepository;
+
+    public JwtAuthenticationFilter(JwtUtil jwtUtil, MemberRepository memberRepository) {
+        this.jwtUtil = jwtUtil;
+        this.memberRepository = memberRepository;
+    }
+
+    @Override
+    protected void doFilterInternal(HttpServletRequest request,
+                                    HttpServletResponse response,
+                                    FilterChain filterChain)
+            throws ServletException, IOException {
+
+        String token = resolveToken(request);
+
+        if (token != null && jwtUtil.isTokenValid(token)) {
+            String email = jwtUtil.getEmailFromToken(token);
+            Member member = memberRepository.findByEmail(email)
+                    .orElseThrow(() -> new CustomException(ErrorCode.USER_NICKNAME_NOT_FOUND));
+
+            Authentication auth = new UsernamePasswordAuthenticationToken(member, null, member.getAuthorities());
+            SecurityContextHolder.getContext().setAuthentication(auth);
+        }
+
+        filterChain.doFilter(request, response);
+    }
+
+    private String resolveToken(HttpServletRequest request) {
+        String bearerToken = request.getHeader("Authorization");
+        if (StringUtils.hasText(bearerToken) && bearerToken.startsWith("Bearer ")) {
+            return bearerToken.substring(7);
+        }
+        return null;
+    }
+}

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

@@ -0,0 +1,58 @@
+package com.example.FixLog.config;
+
+import com.example.FixLog.repository.MemberRepository;
+import com.example.FixLog.util.JwtUtil;
+import jakarta.servlet.Filter;
+import lombok.RequiredArgsConstructor;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.http.HttpMethod;
+import org.springframework.security.authentication.AuthenticationManager;
+import org.springframework.security.config.annotation.authentication.configuration.AuthenticationConfiguration;
+import org.springframework.security.config.annotation.web.builders.HttpSecurity;
+import org.springframework.security.web.SecurityFilterChain;
+import org.springframework.security.web.authentication.UsernamePasswordAuthenticationFilter;
+import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
+import org.springframework.security.crypto.password.PasswordEncoder;
+
+@Configuration
+@RequiredArgsConstructor
+public class SecurityConfig {
+
+    private final JwtUtil jwtUtil;
+    private final MemberRepository memberRepository;
+
+    @Bean
+    public SecurityFilterChain filterChain(HttpSecurity http) throws Exception {
+        http
+                .csrf(csrf -> csrf.disable())
+                .authorizeHttpRequests(auth -> auth
+                        .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()
+                )
+                .headers(headers -> headers.frameOptions(frame -> frame.disable())) // H2 콘솔용
+                .addFilterBefore(jwtAuthenticationFilter(), UsernamePasswordAuthenticationFilter.class);
+
+        return http.build();
+    }
+
+    @Bean
+    public Filter jwtAuthenticationFilter() {
+        return new JwtAuthenticationFilter(jwtUtil, memberRepository);
+    }
+
+    @Bean
+    public PasswordEncoder passwordEncoder() {
+        return new BCryptPasswordEncoder();
+    }
+
+    // 인증 매니저 (선택: 로그인 시 AuthenticationManager 사용 가능)
+    @Bean
+    public AuthenticationManager authenticationManager(AuthenticationConfiguration config) throws Exception {
+        return config.getAuthenticationManager();
+    }
+}

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

@@ -0,0 +1,23 @@
+package com.example.FixLog.controller;
+
+import com.example.FixLog.dto.Response;
+import com.example.FixLog.dto.member.LoginRequestDto;
+import com.example.FixLog.dto.member.LoginResponseDto;
+import com.example.FixLog.service.AuthService;
+import lombok.RequiredArgsConstructor;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.*;
+
+@RestController
+@RequestMapping("/auth")
+@RequiredArgsConstructor
+public class AuthController {
+
+    private final AuthService authService;
+
+    @PostMapping("/login")
+    public ResponseEntity<Response<LoginResponseDto>> login(@RequestBody LoginRequestDto requestDto) {
+        LoginResponseDto result = authService.login(requestDto);
+        return ResponseEntity.ok(Response.success("로그인 성공", result));
+    }
+}

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

@@ -0,0 +1,97 @@
+package com.example.FixLog.controller;
+
+import com.example.FixLog.dto.PageResponseDto;
+import com.example.FixLog.dto.Response;
+import com.example.FixLog.dto.bookmark.request.BookmarkFolderCreateRequest;
+import com.example.FixLog.dto.bookmark.request.BookmarkFolderUpdateRequest;
+import com.example.FixLog.dto.bookmark.request.BookmarkMoveRequest;
+import com.example.FixLog.dto.bookmark.response.BookmarkFolderCreateResponse;
+import com.example.FixLog.dto.bookmark.response.BookmarkFolderReadResponse;
+import com.example.FixLog.dto.post.MyPostPageResponseDto;
+import com.example.FixLog.service.BookmarkFolderService;
+import com.example.FixLog.service.BookmarkService;
+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.*;
+
+@RestController
+@RequiredArgsConstructor
+@RequestMapping("/bookmark-folders")
+public class BookmarkFolderController {
+    private final BookmarkFolderService bookmarkFolderService;
+    private final BookmarkService bookmarkService;
+
+    // 북마크 폴더 생성
+    @PostMapping
+    public ResponseEntity<?> createFolder(
+            @RequestBody BookmarkFolderCreateRequest request,
+            @RequestParam String requesterEmail
+    ) {
+        BookmarkFolderCreateResponse response = bookmarkFolderService.createFolder(request.folderName(), requesterEmail);
+
+        return ResponseEntity.ok(Response.success("북마크 폴더 생성 성공", response));
+    }
+
+    // 북마크 폴더 이름 수정
+    @PatchMapping("/{folder_id}")
+    public ResponseEntity<Response<Void>> updateFolderName(
+            @PathVariable Long folderId,
+            @RequestParam String requesterEmail,
+            @RequestBody BookmarkFolderUpdateRequest request
+    ) {
+        bookmarkFolderService.updateFolderName(folderId, requesterEmail, request.folderName());
+        return ResponseEntity.ok(Response.success("폴더 이름 수정 완료", null));
+    }
+
+    // 북마크 폴더 이동
+    @PatchMapping("/{bookmarkId}/move")
+    public ResponseEntity<Response<Void>> moveBookmark(
+            @PathVariable Long bookmarkId,
+            @RequestParam String requesterEmail,
+            @RequestBody BookmarkMoveRequest request
+    ) {
+        bookmarkService.moveBookmarkToFolder(bookmarkId, request.folderId(), requesterEmail);
+        return ResponseEntity.ok(Response.success("북마크 다른 폴더로 이동 성공", null));
+    }
+
+
+    // 북마크 폴더 삭제
+    @DeleteMapping("/{folderId}")
+    public ResponseEntity<Response<Void>> deleteFolder(
+            @PathVariable Long folderId,
+            @RequestParam String requesterEmail
+    ) {
+        bookmarkFolderService.deleteFolder(folderId, requesterEmail);
+        return ResponseEntity.ok(Response.success("북마크 폴더 삭제 완료", null));
+    }
+
+    // 북마크 폴더 목록 전체 조회 - MVP
+    @GetMapping
+    public ResponseEntity<Response<PageResponseDto<BookmarkFolderReadResponse>>> getFolders(
+            @AuthenticationPrincipal UserDetails userDetails,
+            @RequestParam(defaultValue = "0") int page,
+            @RequestParam(defaultValue = "20") int size
+    ) {
+        String email = userDetails.getUsername();
+        PageResponseDto<BookmarkFolderReadResponse> response = bookmarkFolderService.getFoldersByEmail(email, page, size);
+        return ResponseEntity.ok(Response.success("북마크 폴더 목록 전체 조회 성공", response));
+    }
+
+    // 특정 폴더의 북마크 목록 조회 -MVP
+    @GetMapping("/{folderId}/bookmarks")
+    public ResponseEntity<Response<PageResponseDto<MyPostPageResponseDto>>> getBookmarksByFolder(
+            @PathVariable Long folderId,
+            @AuthenticationPrincipal UserDetails userDetails,
+            @RequestParam(defaultValue = "0") int page,
+            @RequestParam(defaultValue = "6") int size,
+            @RequestParam(defaultValue = "0") int sort
+    ) {
+        String email = userDetails.getUsername();
+        PageResponseDto<MyPostPageResponseDto> data = bookmarkService.getBookmarksInFolder(email, folderId, page, sort, size);
+        return ResponseEntity.ok(Response.success("특정 폴더의 북마크 목록 조회 성공", data));
+    }
+
+
+}

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

@@ -0,0 +1,65 @@
+package com.example.FixLog.controller;
+
+import com.example.FixLog.dto.Response;
+import com.example.FixLog.dto.follow.request.FollowRequestDto;
+import com.example.FixLog.dto.follow.request.UnfollowRequestDto;
+import com.example.FixLog.dto.follow.response.FollowResponseDto;
+import com.example.FixLog.dto.follow.response.FollowerListResponseDto;
+import com.example.FixLog.dto.follow.response.FollowingListResponseDto;
+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;
+
+@RestController
+@RequestMapping("/follow")
+@RequiredArgsConstructor
+public class FollowController {
+    private final FollowService followService;
+
+    // 팔로우하기
+    @PostMapping
+    public ResponseEntity<Response<FollowResponseDto>> follow(
+            @RequestBody FollowRequestDto followRequestDto,
+            @AuthenticationPrincipal UserDetails userDetails  // jwt 구현 전까지 임시 사용 -> 이후 AuthenticationPrincipal 사용 예정
+            ){
+        String requesterEmail = userDetails.getUsername();
+        FollowResponseDto result = followService.follow(requesterEmail, followRequestDto.getTargetMemberId());
+        return ResponseEntity.ok(Response.success("팔로우 완료", result));
+    }
+
+    // 언팔로우하기
+    @PostMapping("/unfollow")
+    public ResponseEntity<Response<Void>> unfollow(
+            @RequestBody UnfollowRequestDto requestDto,
+            @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(
+            @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(
+            @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/FollowController.java

@@ -0,0 +1,31 @@
+package com.example.FixLog.controller;
+
+import com.example.FixLog.dto.Response;
+import com.example.FixLog.dto.main.MainPageResponseDto;
+import com.example.FixLog.service.MainPageService;
+import org.springframework.web.bind.annotation.*;
+
+@RestController
+@RequestMapping("/main")
+public class MainPageController {
+    private final MainPageService mainPageService;
+
+    public MainPageController(MainPageService mainPageService){
+        this.mainPageService = mainPageService;
+    }
+
+    @GetMapping
+    public Response<Object> mainPageView(@RequestParam(value = "sort", defaultValue = "0") int sort,
+                                         @RequestParam(value = "page", defaultValue = "12") int size){
+        MainPageResponseDto mainPageView = mainPageService.mainPageView(sort, size);
+        return Response.success("메인페이지 불러오기 성공", mainPageView);
+    }
+
+    @GetMapping("/full")
+    public Response<Object> mainPageFullView(@RequestParam(value = "sort", defaultValue = "0") int sort,
+                                             @RequestParam(value = "page", defaultValue = "1") int page,
+                                             @RequestParam(value = "page", defaultValue = "12") int size){
+        MainPageResponseDto mainPageFullView = mainPageService.mainPageFullView(sort, page, size);
+        return Response.success("메인페이지 전체보기 성공", mainPageFullView);
+    }
+}