diff --git a/src/main/java/ita/tinybite/domain/party/controller/PartyController.java b/src/main/java/ita/tinybite/domain/party/controller/PartyController.java index 33e798e..c502c5f 100644 --- a/src/main/java/ita/tinybite/domain/party/controller/PartyController.java +++ b/src/main/java/ita/tinybite/domain/party/controller/PartyController.java @@ -29,6 +29,8 @@ import java.util.List; +import static ita.tinybite.global.response.APIResponse.*; + @Tag(name = "파티 API", description = "파티 생성, 조회, 참여 관련 API") @RestController @RequestMapping("/api/parties") @@ -65,13 +67,10 @@ public class PartyController { ) }) @PostMapping("/{partyId}/join") - public ResponseEntity joinParty( + public APIResponse joinParty( @PathVariable Long partyId, @Parameter(hidden = true) @AuthenticationPrincipal Long userId) { - - partyService.joinParty(partyId, userId); - - return ResponseEntity.ok().build(); + return success(partyService.joinParty(partyId, userId)); } @Operation(summary = "참여 승인", description = "파티장이 참여를 승인하면 단체 채팅방에 자동 입장됩니다") @@ -496,7 +495,7 @@ public APIResponse getParty( @RequestParam(defaultValue = "20") int size ) { - return APIResponse.success(partySearchService.searchParty(q, category, page, size, userLat, userLon)); + return success(partySearchService.searchParty(q, category, page, size, userLat, userLon)); } @Operation( @@ -508,7 +507,7 @@ public APIResponse getParty( ) @GetMapping("/search/log") public APIResponse> getRecentLog() { - return APIResponse.success(partySearchService.getLog()); + return success(partySearchService.getLog()); } @Operation( @@ -521,7 +520,7 @@ public APIResponse> getRecentLog() { @DeleteMapping("/search/log/{keyword}") public APIResponse deleteRecentLog(@PathVariable String keyword) { partySearchService.deleteLog(keyword); - return APIResponse.success(); + return success(); } @Operation( @@ -533,6 +532,6 @@ public APIResponse deleteRecentLog(@PathVariable String keyword) { @DeleteMapping("/search/log") public APIResponse deleteRecentLogAll() { partySearchService.deleteAllLog(); - return APIResponse.success(); + return success(); } } \ No newline at end of file diff --git a/src/main/java/ita/tinybite/domain/party/service/PartyService.java b/src/main/java/ita/tinybite/domain/party/service/PartyService.java index a7cbc5c..28b9a48 100644 --- a/src/main/java/ita/tinybite/domain/party/service/PartyService.java +++ b/src/main/java/ita/tinybite/domain/party/service/PartyService.java @@ -233,7 +233,7 @@ public Long joinParty(Long partyId, Long userId) { partyId ); - return saved.getId(); + return oneToOneChatRoom.getId(); } private void validateProductLink(PartyCategory category, String productLink) {