Skip to content
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -1,14 +1,16 @@
package eatda.controller.store;

import eatda.domain.store.Store;
import java.util.List;

public record StorePreviewResponse(
long id,
String imageUrl,
String name,
String district,
String neighborhood,
String category
String category,
List<String> cheerDescriptions
) {

public StorePreviewResponse(Store store, String imageUrl) {
Expand All @@ -18,7 +20,8 @@ public StorePreviewResponse(Store store, String imageUrl) {
store.getName(),
store.getAddressDistrict(),
store.getAddressNeighborhood(),
store.getCategory().getCategoryName()
store.getCategory().getCategoryName(),
store.getCheerDescriptions()
);
}
}
13 changes: 13 additions & 0 deletions src/main/java/eatda/domain/store/Store.java
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package eatda.domain.store;

import eatda.domain.AuditingEntity;
import eatda.domain.cheer.Cheer;
import jakarta.persistence.Column;
import jakarta.persistence.Embedded;
import jakarta.persistence.Entity;
Expand All @@ -9,7 +10,10 @@
import jakarta.persistence.GeneratedValue;
import jakarta.persistence.GenerationType;
import jakarta.persistence.Id;
import jakarta.persistence.OneToMany;
import jakarta.persistence.Table;
import java.util.ArrayList;
import java.util.List;
import lombok.AccessLevel;
import lombok.Builder;
import lombok.Getter;
Expand Down Expand Up @@ -54,6 +58,9 @@ public class Store extends AuditingEntity {
@Embedded
private Coordinates coordinates;

@OneToMany(mappedBy = "store")
private List<Cheer> cheers = new ArrayList<>();

@Builder
private Store(String kakaoId,
StoreCategory category,
Expand Down Expand Up @@ -87,4 +94,10 @@ public String getAddressNeighborhood() {
}
return addressParts[2];
}

public List<String> getCheerDescriptions() {
return cheers.stream()
.map(Cheer::getDescription)
.toList();
}
}
3 changes: 3 additions & 0 deletions src/main/java/eatda/repository/store/StoreRepository.java
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
import java.util.List;
import java.util.Optional;
import org.springframework.data.domain.Pageable;
import org.springframework.data.jpa.repository.EntityGraph;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.jpa.repository.Query;

Expand All @@ -20,8 +21,10 @@ default Store getById(Long id) {

Optional<Store> findByKakaoId(String kakaoId);

@EntityGraph(attributePaths = {"cheers"})
List<Store> findAllByOrderByCreatedAtDesc(Pageable pageable);

@EntityGraph(attributePaths = {"cheers"})
List<Store> findAllByCategoryOrderByCreatedAtDesc(StoreCategory category, Pageable pageable);

@Query("""
Expand Down
2 changes: 2 additions & 0 deletions src/main/java/eatda/service/store/StoreService.java
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ public StoreResponse getStore(long storeId) {
}

// TODO : N+1 문제 해결
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

EntityGraph를 사용했어도 아직 N + 1 문제가 남아있나요??

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

추후 지워질 예정이라 그대로 두겠습니다.

@Transactional(readOnly = true)
public StoresResponse getStores(int page, int size, @Nullable String category) {
return findStores(page, size, category)
.stream()
Expand All @@ -51,6 +52,7 @@ private List<Store> findStores(int page, int size, @Nullable String category) {
StoreCategory.from(category), PageRequest.of(page, size));
}

@Transactional(readOnly = true)
public ImagesResponse getStoreImages(long storeId) {
Store store = storeRepository.getById(storeId);
List<String> imageUrls = cheerRepository.findAllImageKey(store)
Expand Down
9 changes: 6 additions & 3 deletions src/test/java/eatda/document/store/StoreDocumentTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,8 @@ class GetStores {
fieldWithPath("stores[].name").type(STRING).description("음식점 이름"),
fieldWithPath("stores[].district").type(STRING).description("음식점 주소 (구)"),
fieldWithPath("stores[].neighborhood").type(STRING).description("음식점 주소 (동)"),
fieldWithPath("stores[].category").type(STRING).description("음식점 카테고리")
fieldWithPath("stores[].category").type(STRING).description("음식점 카테고리"),
fieldWithPath("stores[].cheerDescriptions").type(ARRAY).description("음식점에 달린 응원 메시지")
);

@Test
Expand All @@ -125,8 +126,10 @@ class GetStores {
int size = 2;
StoreCategory category = StoreCategory.CAFE;
StoresResponse response = new StoresResponse(List.of(
new StorePreviewResponse(2L, "https://example.image", "농민백암순대", "강남구", "대치동", "한식"),
new StorePreviewResponse(1L, "https://example.image", "석관동떡볶이", "성북구", "석관동", "한식")
new StorePreviewResponse(2L, "https://example.image", "농민백암순대", "강남구", "대치동", "한식",
List.of("응원해요!", "순대가 맛돌이!")),
new StorePreviewResponse(1L, "https://example.image", "석관동떡볶이", "성북구", "석관동", "한식",
List.of("응원해요!", "떡볶이가 맛있게 매워요~", "매운 떡볶이 최고!"))
));
doReturn(response).when(storeService).getStores(page, size, category.getCategoryName());

Expand Down
18 changes: 12 additions & 6 deletions src/test/java/eatda/service/store/StoreServiceTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -59,25 +59,31 @@ class GetStores {

@Test
void 모든_카테고리의_음식점_목록을_최신순으로_조회한다() {
Member member = memberGenerator.generate("111");
Member member1 = memberGenerator.generate("111", "[email protected]", "nickname1");
Member member2 = memberGenerator.generate("113", "[email protected]", "nickname2");
LocalDateTime startAt = LocalDateTime.of(2025, 7, 26, 1, 0, 0);
Store store1 = storeGenerator.generate("농민백암순대", "서울 강남구 대치동 896-33", StoreCategory.KOREAN, startAt);
Store store2 = storeGenerator.generate("석관동떡볶이", "서울 성북구 석관동 123-45", StoreCategory.OTHER,
startAt.plusHours(1));
Store store3 = storeGenerator.generate("강남순대국", "서울 강남구 역삼동 678-90", StoreCategory.KOREAN,
startAt.plusHours(2));
cheerGenerator.generateCommon(member, store1, "image-key-1");
cheerGenerator.generateCommon(member, store2, "image-key-2");
cheerGenerator.generateCommon(member, store3, "image-key-3");
cheerGenerator.generateCommon(member1, store1, "image-key-1");
cheerGenerator.generateCommon(member1, store2, "image-key-2");
cheerGenerator.generateCommon(member2, store2, "image-key-3");
cheerGenerator.generateCommon(member1, store3, "image-key-4");
int page = 0;
int size = 2;

var response = storeService.getStores(page, size, null);

assertAll(
() -> assertThat(response.stores()).hasSize(size),
() -> assertThat(response.stores()).hasSize(2),
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

위에 size 선언은 안쓰게 되나요??

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

위의 size 값을 쓰도록 변경했습니다.

() -> assertThat(response.stores().get(0).id()).isEqualTo(store3.getId()),
() -> assertThat(response.stores().get(1).id()).isEqualTo(store2.getId())
() -> assertThat(response.stores().get(0).name()).isEqualTo(store3.getName()),
() -> assertThat(response.stores().get(0).cheerDescriptions()).hasSize(1),
() -> assertThat(response.stores().get(1).id()).isEqualTo(store2.getId()),
() -> assertThat(response.stores().get(1).name()).isEqualTo(store2.getName()),
() -> assertThat(response.stores().get(1).cheerDescriptions()).hasSize(2)
);
}

Expand Down