diff --git a/src/main/java/ita/tinybite/domain/party/dto/response/PartyCardResponse.java b/src/main/java/ita/tinybite/domain/party/dto/response/PartyCardResponse.java index d3f7437..df1f581 100644 --- a/src/main/java/ita/tinybite/domain/party/dto/response/PartyCardResponse.java +++ b/src/main/java/ita/tinybite/domain/party/dto/response/PartyCardResponse.java @@ -18,6 +18,7 @@ public class PartyCardResponse { private Long partyId; private String thumbnailImage; // 첫 번째 이미지 또는 기본 이미지 private String title; + private PartyStatus partyStatus; private Integer pricePerPerson; // 1/N 가격 private String participantStatus; // "1/4명" private String distance; // "300m" or "1.2km" (화면 표시용) diff --git a/src/main/java/ita/tinybite/domain/party/repository/PartyRepository.java b/src/main/java/ita/tinybite/domain/party/repository/PartyRepository.java index 63876f5..14c9299 100644 --- a/src/main/java/ita/tinybite/domain/party/repository/PartyRepository.java +++ b/src/main/java/ita/tinybite/domain/party/repository/PartyRepository.java @@ -27,7 +27,9 @@ public interface PartyRepository extends JpaRepository { List findByTown(String location); - List findByTownAndCategory(String location, PartyCategory category); + List findByTown(String town); + + List findByTownAndCategory(String town, PartyCategory category); List findByHost_UserId(Long hostUserId); } 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 34b59d5..60d5197 100644 --- a/src/main/java/ita/tinybite/domain/party/service/PartyService.java +++ b/src/main/java/ita/tinybite/domain/party/service/PartyService.java @@ -388,6 +388,7 @@ private PartyCardResponse convertToCardResponse(Party party, return PartyCardResponse.builder() .partyId(party.getId()) .thumbnailImage(party.getThumbnailImage()) + .partyStatus(party.getStatus()) .title(party.getTitle()) .pricePerPerson(pricePerPerson) .participantStatus(participantStatus) @@ -845,13 +846,12 @@ private List fetchPartiesByTown(User user, PartyListRequest request,Strin return List.of(); } - String location = user.getLocation(); PartyCategory category = request.getCategory(); if (category == PartyCategory.ALL) { - return partyRepository.findByTown(location); + return partyRepository.findByTown(myTown); } else { - return partyRepository.findByTownAndCategory(location, category); + return partyRepository.findByTownAndCategory(myTown, category); } }