[feat #1] FCM 알림 추가

.github/workflows/ci.yml

@@ -2,7 +2,7 @@ name: CI Backend
 
 on:
   pull_request:
-    branches: ["main", "dev"]
+    branches: [ "main", "dev" ]
 
 permissions:
   contents: read
@@ -27,16 +27,16 @@ jobs:
           distribution: 'temurin'
 
       # firebase json 파일 생성
-      - name : Generate firebase_account.json
+      - name: Generate serviceAccountKey.json
         run: |
           mkdir -p ./core/src/main/resources/firebase
-          echo "${{ secrets.FIREBASE_ACCOUNT }}" | base64 -d > ./core/src/main/resources/firebase/firebase_account.json
-          mkdir -p ./core/src/test/resources/firebase
-          echo "${{ secrets.FIREBASE_ACCOUNT }}" | base64 -d > ./core/src/test/resources/firebase/firebase_account.json
-          mkdir -p ./api/src/test/resources/firebase
-          echo "${{ secrets.FIREBASE_ACCOUNT }}" | base64 -d > ./api/src/test/resources/firebase/firebase_account.json
+          echo "${{ secrets.FIREBASE_KEY }}" | base64 -d > ./core/src/main/resources/firebase/serviceAccountKey.json
+#          mkdir -p ./core/src/test/resources/firebase
+#          echo "${{ secrets.FIREBASE_KEY }}" | base64 -d > ./core/src/test/resources/firebase/serviceAccountKey.json
+#          mkdir -p ./api/src/test/resources/firebase
+#          echo "${{ secrets.FIREBASE_KEY }}" | base64 -d > ./api/src/test/resources/firebase/serviceAccountKey.json
 
-      # gradle 권한 부여
+    # gradle 권한 부여
       - name: Grant execute permission for gradlew
         run: chmod +x ./gradlew
         shell: bash

.gitignore

@@ -41,7 +41,6 @@ out/
 core/src/main/resources/application-core-prod.yml
 /api/src/main/resources/application.yml
 /core/src/main/generated/
-/core/src/main/resources/firebase/firebase_account.json
-/core/src/test/resources/firebase/firebase_account.json
-/api/src/test/resources/firebase/firebase_account.json
 /core/src/main/resources/application-core-local.yml
+/core/src/main/resources/firebase/serviceAccountKey.json
+/core/src/test/http

api/src/main/java/dev/handsup/auth/controller/AuthApiController.java

@@ -17,7 +17,7 @@
 import dev.handsup.auth.dto.response.TokenReIssueResponse;
 import dev.handsup.auth.jwt.JwtAuthorization;
 import dev.handsup.auth.service.AuthService;
-import dev.handsup.notification.service.FCMService;
+import dev.handsup.notification.service.FcmService;
 import dev.handsup.user.domain.User;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
@@ -35,7 +35,7 @@
 public class AuthApiController {
 
 	private final AuthService authService;
-	private final FCMService fcmService;
+	private final FcmService fcmService;
 
 	@NoAuth
 	@PostMapping("/login")
@@ -60,7 +60,7 @@ public ResponseEntity<LoginSimpleResponse> login(
 	public ResponseEntity<HttpStatus> logout(
 		@Parameter(hidden = true) @JwtAuthorization User user
 	) {
-		fcmService.deleteFcmToken(user.getEmail());
+		fcmService.deleteFcmToken(user.getId());
 		return ResponseEntity.ok(HttpStatus.OK);
 	}
 

api/src/main/java/dev/handsup/notification/controller/FcmController.java

@@ -0,0 +1,34 @@
+package dev.handsup.notification.controller;
+
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RestController;
+
+import dev.handsup.auth.jwt.JwtAuthorization;
+import dev.handsup.notification.dto.SaveFcmTokenRequest;
+import dev.handsup.notification.service.FcmService;
+import dev.handsup.user.domain.User;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.responses.ApiResponse;
+import jakarta.validation.Valid;
+import lombok.RequiredArgsConstructor;
+
+@RestController
+@RequiredArgsConstructor
+public class FcmController {
+	private final FcmService fcmService;
+
+	@PostMapping("/api/fcm-tokens")
+	@Operation(summary = "FCM 토큰 저장 API", description = "{사용자 아이디 : FCM 토큰}을 redis에 저장")
+	@ApiResponse(useReturnTypeSchema = true)
+	public ResponseEntity<HttpStatus> saveFCMToken(
+		@Parameter(hidden = true) @JwtAuthorization User user,
+		@RequestBody @Valid SaveFcmTokenRequest request
+	) {
+		fcmService.saveFcmToken(user.getId(), request.fcmToken());
+		return ResponseEntity.ok(HttpStatus.OK);
+	}
+}

api/src/main/java/dev/handsup/notification/controller/NotificationController.java

@@ -0,0 +1,33 @@
+package dev.handsup.notification.controller;
+
+import org.springframework.data.domain.Pageable;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import dev.handsup.auth.jwt.JwtAuthorization;
+import dev.handsup.common.dto.PageResponse;
+import dev.handsup.notification.dto.NotificationResponse;
+import dev.handsup.notification.service.NotificationService;
+import dev.handsup.user.domain.User;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.responses.ApiResponse;
+import lombok.RequiredArgsConstructor;
+
+@RestController
+@RequiredArgsConstructor
+public class NotificationController {
+	private final NotificationService notificationService;
+
+	@GetMapping("/api/notifications")
+	@Operation(summary = "알림 전체 조회 API", description = "특정 사용자가 받은 알림을 최근 생성 순으로 전체 조회한다")
+	@ApiResponse(useReturnTypeSchema = true)
+	public ResponseEntity<PageResponse<NotificationResponse>> getUserNotifications(
+		@Parameter(hidden = true) @JwtAuthorization User user,
+		Pageable pageable
+	) {
+		PageResponse<NotificationResponse> response = notificationService.getNotifications(user, pageable);
+		return ResponseEntity.ok(response);
+	}
+}

api/src/test/java/dev/handsup/bidding/controller/BiddingApiControllerTest.java

@@ -32,7 +32,6 @@
 import dev.handsup.fixture.AuctionFixture;
 import dev.handsup.fixture.BiddingFixture;
 import dev.handsup.fixture.UserFixture;
-import dev.handsup.notification.repository.FCMTokenRepository;
 import dev.handsup.user.domain.User;
 import dev.handsup.user.repository.UserRepository;
 
@@ -56,8 +55,7 @@ class BiddingApiControllerTest extends ApiTestSupport {
 	private AuctionService auctionService;
 	@Autowired
 	private JwtProvider jwtProvider;
-	@Autowired
-	private FCMTokenRepository fcmTokenRepository;
+
 
 	@BeforeEach
 	void setUp() {
@@ -170,7 +168,6 @@ void getTop3BidsForAuctionTest() throws Exception {
 	@Test
 	void completeTrading() throws Exception {
 		//given
-		fcmTokenRepository.saveFcmToken(bidder.getEmail(), "fcmToken123");
 		ReflectionTestUtils.setField(auction1, "status", AuctionStatus.TRADING); //변경 감지
 		Bidding bidding = BiddingFixture.bidding(bidder, auction1, TradingStatus.PROGRESSING);
 		biddingRepository.save(bidding);
@@ -204,7 +201,6 @@ void completeTrading_fails() throws Exception {
 	@Test
 	void cancelTrading() throws Exception {
 		//given
-		fcmTokenRepository.saveFcmToken(bidder.getEmail(), "fcmToken123");
 		Bidding waitingBidding1 = BiddingFixture.bidding(bidder, auction1, TradingStatus.WAITING, 200000);
 		Bidding waitingBidding2 = BiddingFixture.bidding(bidder, auction1, TradingStatus.WAITING, 300000);
 		Bidding anotherAuctionBidding = BiddingFixture.bidding(bidder, auction2, TradingStatus.WAITING, 400000);

api/src/test/java/dev/handsup/bookmark/controller/BookmarkApiControllerTest.java

@@ -23,7 +23,6 @@
 import dev.handsup.fixture.AuctionFixture;
 import dev.handsup.fixture.BookmarkFixture;
 import dev.handsup.fixture.UserFixture;
-import dev.handsup.notification.repository.FCMTokenRepository;
 import dev.handsup.user.domain.User;
 
 @DisplayName("[Bookmark 통합 테스트]")
@@ -37,8 +36,7 @@ class BookmarkApiControllerTest extends ApiTestSupport {
 	private AuctionRepository auctionRepository;
 	@Autowired
 	private ProductCategoryRepository productCategoryRepository;
-	@Autowired
-	private FCMTokenRepository fcmTokenRepository;
+
 
 	@BeforeEach
 	void setUp() {
@@ -54,8 +52,6 @@ void setUp() {
 	@Test
 	@DisplayName("[북마크를 추가할 수 있다.]")
 	void addBookmark() throws Exception {
-		// fcm 토큰 저장, seller 는 receiver
-		fcmTokenRepository.saveFcmToken(seller.getEmail(), "fcmToken123");
 
 		mockMvc.perform(post("/api/auctions/bookmarks/{auctionId}", auction.getId())
 				.contentType(APPLICATION_JSON)

api/src/test/java/dev/handsup/comment/controller/CommentApiControllerTest.java

@@ -24,7 +24,6 @@
 import dev.handsup.fixture.CommentFixture;
 import dev.handsup.fixture.ProductFixture;
 import dev.handsup.fixture.UserFixture;
-import dev.handsup.notification.repository.FCMTokenRepository;
 import dev.handsup.user.domain.User;
 
 @DisplayName("[Comment 통합 테스트]")
@@ -36,8 +35,7 @@ class CommentApiControllerTest extends ApiTestSupport {
 	private ProductCategory productCategory;
 	@Autowired
 	private CommentRepository commentRepository;
-	@Autowired
-	private FCMTokenRepository fcmTokenRepository;
+
 
 	@BeforeEach
 	void setUp() {
@@ -50,7 +48,6 @@ void setUp() {
 	@DisplayName("[댓글을 등록할 수 있다.]")
 	@Test
 	void registerComment() throws Exception {
-		fcmTokenRepository.saveFcmToken(seller.getEmail(), "fcmToken123");
 		RegisterCommentRequest request = RegisterCommentRequest.of("와");
 
 		mockMvc.perform(post("/api/auctions/{auctionId}/comments", auction.getId())