Deploy : Merge to main

src/main/java/ita/tinybite/domain/notification/controller/FcmTokenController.java

@@ -5,10 +5,12 @@
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestHeader;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 import ita.tinybite.domain.notification.dto.request.FcmTokenRequest;
 import ita.tinybite.domain.notification.service.FcmTokenService;
+import ita.tinybite.domain.notification.service.facade.NotificationFacade;
 import jakarta.validation.Valid;
 import lombok.RequiredArgsConstructor;
 
@@ -18,6 +20,7 @@
 public class FcmTokenController {
 
 	private final FcmTokenService fcmTokenService;
+	private final NotificationFacade notificationFacade;
 
 	// token 이미 존재 시 업데이트 해줌
 	@PostMapping("/token")
@@ -26,4 +29,10 @@ public ResponseEntity<Void> registerToken(@RequestBody @Valid FcmTokenRequest re
 		fcmTokenService.saveOrUpdateToken(currentUserId, request.token());
 		return ResponseEntity.noContent().build();
 	}
+
+	@PostMapping("/Test")
+	public ResponseEntity<Void> test(@RequestParam Long userId) {
+		notificationFacade.notifyTest(userId);
+		return ResponseEntity.ok().build();
+	}
 }

src/main/java/ita/tinybite/domain/notification/enums/NotificationType.java

@@ -27,6 +27,9 @@ public enum NotificationType {
 	// 파티 참여 리마인드
 	PENDING_APPROVAL_REMINDER,
 
+	// 테스트 알림
+	TEST_EVENT,
+
 	// 마케팅 알림
 	MARKETING_LOCAL_NEW_PARTY,
 	MARKETING_WEEKLY_POPULAR,

src/main/java/ita/tinybite/domain/notification/service/TestNotificationService.java

@@ -0,0 +1,42 @@
+package ita.tinybite.domain.notification.service;
+
+import java.util.List;
+
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import com.google.firebase.messaging.BatchResponse;
+
+import ita.tinybite.domain.notification.dto.request.NotificationMulticastRequest;
+import ita.tinybite.domain.notification.enums.NotificationType;
+import ita.tinybite.domain.notification.infra.fcm.FcmNotificationSender;
+import ita.tinybite.domain.notification.infra.helper.NotificationTransactionHelper;
+import ita.tinybite.domain.notification.service.manager.TestMessageManager;
+import lombok.RequiredArgsConstructor;
+
+@Service
+@RequiredArgsConstructor
+public class TestNotificationService {
+	private final FcmNotificationSender fcmNotificationSender;
+	private final FcmTokenService fcmTokenService;
+	private final TestMessageManager testMessageManager;
+	private final NotificationLogService notificationLogService;
+	private final NotificationTransactionHelper notificationTransactionHelper;
+
+	@Transactional
+	public void sendTestNotification(Long targetUserId) {
+		String title = "알림 테스트 제목";
+		String detail = "알림 테스트 내용";
+
+		notificationLogService.saveLog(targetUserId, NotificationType.TEST_EVENT.name(), title, detail);
+
+		List<String> tokens = fcmTokenService.getTokensAndLogIfEmpty(targetUserId);
+		if (tokens.isEmpty())
+			return;
+
+		NotificationMulticastRequest request = testMessageManager.createTestRequest(tokens, title, detail);
+
+		BatchResponse response = fcmNotificationSender.send(request);
+		notificationTransactionHelper.handleBatchResponse(response, tokens);
+	}
+}

src/main/java/ita/tinybite/domain/notification/service/facade/NotificationFacade.java

@@ -8,6 +8,7 @@
 
 import ita.tinybite.domain.notification.service.ChatNotificationService;
 import ita.tinybite.domain.notification.service.PartyNotificationService;
+import ita.tinybite.domain.notification.service.TestNotificationService;
 import ita.tinybite.domain.party.entity.Party;
 import ita.tinybite.domain.party.enums.ParticipantStatus;
 import ita.tinybite.domain.party.repository.PartyParticipantRepository;
@@ -31,14 +32,21 @@ public class NotificationFacade {
 
 	private final PartyNotificationService partyNotificationService;
 	private final ChatNotificationService chatNotificationService;
+	private final TestNotificationService testNotificationService;
 
 	private final PartyRepository partyRepository;
 	private final UserRepository userRepository;
 	private final PartyParticipantRepository partyParticipantRepository;
 
 	private final RedisTemplate<String, String> redisTemplate;
 
-	@Transactional
+	public void notifyTest(Long targetUserId) {
+		userRepository.findById(targetUserId)
+			.orElseThrow(() -> new BusinessException(UserErrorCode.USER_NOT_EXISTS));
+
+		testNotificationService.sendTestNotification(targetUserId);
+	}
+
 	public void notifyNewPartyRequest(Long managerId, Long requesterId, Long partyId) {
 		Party party = partyRepository.findById(partyId)
 			.orElseThrow(() -> new BusinessException(PartyErrorCode.PARTY_NOT_FOUND));

src/main/java/ita/tinybite/domain/notification/service/manager/TestMessageManager.java

@@ -0,0 +1,26 @@
+package ita.tinybite.domain.notification.service.manager;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.springframework.stereotype.Component;
+
+import ita.tinybite.domain.notification.converter.NotificationRequestConverter;
+import ita.tinybite.domain.notification.dto.request.NotificationMulticastRequest;
+import ita.tinybite.domain.notification.enums.NotificationType;
+import lombok.RequiredArgsConstructor;
+
+@Component
+@RequiredArgsConstructor
+public class TestMessageManager {
+
+	private final NotificationRequestConverter requestConverter;
+
+	public NotificationMulticastRequest createTestRequest(List<String> tokens, String title, String detail) {
+		Map<String, String> data = new HashMap<>();
+		data.put("eventType", NotificationType.TEST_EVENT.name());
+
+		return requestConverter.toMulticastRequest(tokens, title, detail, data);
+	}
+}

src/main/java/ita/tinybite/domain/party/controller/PartyController.java

@@ -194,7 +194,7 @@ public ResponseEntity<?> completeRecruitment(
                 content = @Content
         )
     })
-    @PostMapping("{partyId}/participants/{participantId}/approve")
+    @PostMapping("/{partyId}/participants/{participantId}/approve")
     public ResponseEntity<Void> approveParticipant(
             @PathVariable Long partyId,
             @PathVariable Long participantId,
@@ -262,7 +262,7 @@ public ResponseEntity<Void> rejectParticipant(
                 content = @Content
         )
     })
-    @GetMapping("{partyId}/chat/group")
+    @GetMapping("/{partyId}/chat/group")
     public ResponseEntity<ChatRoomResponse> getGroupChatRoom(
             @PathVariable Long partyId,
             @Parameter(hidden = true) @AuthenticationPrincipal Long userId) {
@@ -285,7 +285,7 @@ public ResponseEntity<ChatRoomResponse> getGroupChatRoom(
                 content = @Content
         )
     })
-    @GetMapping("{partyId}/can-settle")
+    @GetMapping("/{partyId}/can-settle")
     public ResponseEntity<Boolean> canSettle(@PathVariable Long partyId) {
         boolean canSettle = partyService.canSettle(partyId);
         return ResponseEntity.ok(canSettle);
@@ -319,7 +319,7 @@ public ResponseEntity<Boolean> canSettle(@PathVariable Long partyId) {
                 content = @Content
         )
    })
-    @PostMapping("{partyId}/settle")
+    @PostMapping("/{partyId}/settle")
     public ResponseEntity<Void> settleParty(
             @PathVariable Long partyId,
             @Parameter(hidden = true) @AuthenticationPrincipal Long userId) {
@@ -352,7 +352,7 @@ public ResponseEntity<Void> settleParty(
                 content = @Content
         )
     })
-    @GetMapping("{partyId}/participants/pending")
+    @GetMapping("/{partyId}/participants/pending")
     public ResponseEntity<List<PartyParticipant>> getPendingParticipants(
             @PathVariable Long partyId,
             @Parameter(hidden = true) @AuthenticationPrincipal Long userId) {
@@ -365,6 +365,27 @@ public ResponseEntity<List<PartyParticipant>> getPendingParticipants(
     /**
      * 파티 목록 조회 (홈 화면)
      */
+    @Operation(
+            summary = "파티 목록 조회",
+            description = "홈 화면에서 파티 목록을 조회합니다. 카테고리별 필터링, 정렬, 위치 기반 조회를 지원합니다."
+    )
+    @ApiResponses({
+            @ApiResponse(
+                    responseCode = "200",
+                    description = "조회 성공",
+                    content = @Content(schema = @Schema(implementation = PartyListResponse.class))
+            ),
+            @ApiResponse(
+                    responseCode = "400",
+                    description = "잘못된 요청 (위치 정보 형식 오류)",
+                    content = @Content
+            ),
+            @ApiResponse(
+                    responseCode = "401",
+                    description = "인증 실패",
+                    content = @Content
+            )
+    })
     @GetMapping
     public ResponseEntity<PartyListResponse> getPartyList(
             @Parameter(hidden = true) @AuthenticationPrincipal Long userId,
@@ -380,9 +401,6 @@ public ResponseEntity<PartyListResponse> getPartyList(
             ) {
         Double lat = null;
         Double lon = null;
-//        if (userLat == null || userLon == null) {
-//            throw new IllegalArgumentException("거리순 정렬을 위해서는 현재 위치 정보가 필요합니다.");
-//        }
 
         if (latitude != null && longitude != null) {
             try {
@@ -577,6 +595,18 @@ public ResponseEntity<Void> deleteParty(
                     몇 번째 페이지 인지 (page), 한 페이지 당 몇 개의 파티를 조회할 지 (size) 파라미터로 입력해주시면 됩니다.
                     """
     )
+    @ApiResponses({
+            @ApiResponse(
+                    responseCode = "200",
+                    description = "검색 성공",
+                    content = @Content(schema = @Schema(implementation = PartyQueryListResponse.class))
+            ),
+            @ApiResponse(
+                    responseCode = "400",
+                    description = "잘못된 요청 (검색어 누락)",
+                    content = @Content
+            )
+    })
     @GetMapping("/search")
     public APIResponse<PartyQueryListResponse> getParty(
             @RequestParam String q,
@@ -602,6 +632,17 @@ public APIResponse<PartyQueryListResponse> getParty(
                     한 번에 20개가 조회됩니다.
                     """
     )
+    @ApiResponses({
+            @ApiResponse(
+                    responseCode = "200",
+                    description = "조회 성공"
+            ),
+            @ApiResponse(
+                    responseCode = "401",
+                    description = "인증 실패",
+                    content = @Content
+            )
+    })
     @GetMapping("/search/log")
     public APIResponse<List<String>> getRecentLog() {
          return success(partySearchService.getLog());
@@ -614,6 +655,17 @@ public APIResponse<List<String>> getRecentLog() {
                     이때 검색어에 대한 Id값은 없고, 최근 검색어 자체를 keyword에 넣어주시면 됩니다.
                     """
     )
+    @ApiResponses({
+            @ApiResponse(
+                    responseCode = "200",
+                    description = "삭제 성공"
+            ),
+            @ApiResponse(
+                    responseCode = "401",
+                    description = "인증 실패",
+                    content = @Content
+            )
+    })
     @DeleteMapping("/search/log/{keyword}")
     public APIResponse<?>  deleteRecentLog(@PathVariable String keyword) {
         partySearchService.deleteLog(keyword);
@@ -626,6 +678,17 @@ public APIResponse<?>  deleteRecentLog(@PathVariable String keyword) {
                     특정 유저에 대한 모든 최근 검색어를 삭제합니다.
                     """
     )
+    @ApiResponses({
+            @ApiResponse(
+                    responseCode = "200",
+                    description = "전체 삭제 성공"
+            ),
+            @ApiResponse(
+                    responseCode = "401",
+                    description = "인증 실패",
+                    content = @Content
+            )
+    })
     @DeleteMapping("/search/log")
     public APIResponse<?> deleteRecentLogAll() {
          partySearchService.deleteAllLog();

src/main/java/ita/tinybite/domain/party/dto/response/PartyCardResponse.java

@@ -28,14 +28,36 @@ public class PartyCardResponse {
     private LocalDateTime createdAt;
 
     public static PartyCardResponse from(Party party, int currentParticipants) {
+        return from(party, currentParticipants, null, null);
+    }
+
+    public static PartyCardResponse from(Party party, int currentParticipants, Double userLat, Double userLon) {
+        String distanceValue = null;
+        String distanceKmValue = null;
+
+        // 거리 계산
+        if (userLat != null && userLon != null
+                && party.getPickupLocation() != null
+                && party.getPickupLocation().getPickupLatitude() != null
+                && party.getPickupLocation().getPickupLongitude() != null) {
+            double distance = DistanceCalculator.calculateDistance(
+                    userLat,
+                    userLon,
+                    party.getPickupLocation().getPickupLatitude(),
+                    party.getPickupLocation().getPickupLongitude()
+            );
+            distanceKmValue = DistanceCalculator.formatDistance(distance);
+            distanceValue = Double.toString(distance);
+        }
+
         return PartyCardResponse.builder()
                 .partyId(party.getId())
                 .thumbnailImage(party.getThumbnailImage())
                 .title(party.getTitle())
                 .pricePerPerson(calculatePricePerPerson(party, currentParticipants))
                 .participantStatus(formatParticipantStatus(currentParticipants, party.getMaxParticipants()))
-                .distance(null) // 거리 계산은 별도 처리 필요
-                .distanceKm(null) // 거리 계산은 별도 처리 필요
+                .distance(distanceValue)
+                .distanceKm(distanceKmValue)
                 .timeAgo(calculateTimeAgo(party.getCreatedAt()))
                 .isClosed(checkIfClosed(party, currentParticipants))
                 .category(party.getCategory())