Skip to content

feat: 리뷰 요약 조회 json 프로퍼티 명 수정 #449

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Sep 27, 2023
Merged

feat: 리뷰 요약 조회 json 프로퍼티 명 수정 #449

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4eeeef9
fix: json 프로퍼티명 수정
wonyongChoi05 Sep 27, 2023
2bb76a4
fix: 리뷰 요약 조회 API 문서 수정
wonyongChoi05 Sep 27, 2023
0290fa1
chore: 사용하지 않는 의존성 제거
wonyongChoi05 Sep 27, 2023
477d802
chore: 사용하지 않는 DTO 제거
wonyongChoi05 Sep 27, 2023
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
2 changes: 0 additions & 2 deletions backend/src/main/java/zipgo/petfood/application/PetFoodQueryService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
import zipgo.petfood.domain.PetFood;
import zipgo.petfood.domain.PrimaryIngredient;
import zipgo.petfood.domain.repository.FunctionalityRepository;
import zipgo.petfood.domain.repository.PetFoodRepository;
import zipgo.petfood.domain.repository.PrimaryIngredientRepository;
import zipgo.petfood.dto.request.FilterRequest;
import zipgo.petfood.dto.response.FilterResponse;
Expand All @@ -26,7 +25,6 @@
@Transactional(readOnly = true)
public class PetFoodQueryService {

private final PetFoodRepository petFoodRepository;
private final PetFoodQueryRepositoryImpl petFoodQueryRepository;
private final BrandRepository brandRepository;
private final FunctionalityRepository functionalityRepository;
Expand Down
9 changes: 0 additions & 9 deletions backend/src/main/java/zipgo/petfood/dto/request/PetFoodSelectRequest.java
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion backend/src/main/java/zipgo/review/dto/response/type/RatingInfoResponse.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package zipgo.review.dto.response.type;

public record RatingInfoResponse(
String rating,
String name,
int percentage
) {

Expand Down
5 changes: 3 additions & 2 deletions backend/src/test/java/zipgo/review/application/ReviewQueryServiceTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
package zipgo.review.application;

import java.util.List;
import org.junit.jupiter.api.Nested;
import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.annotation.Autowired;
Expand Down Expand Up @@ -29,6 +28,8 @@
import zipgo.review.dto.response.type.StoolConditionResponse;
import zipgo.review.dto.response.type.TastePreferenceResponse;

import java.util.List;

import static org.assertj.core.api.Assertions.assertThat;
import static org.junit.jupiter.api.Assertions.assertAll;
import static zipgo.brand.domain.fixture.BrandFixture.아카나_식품_브랜드_생성;
Expand Down Expand Up @@ -204,7 +205,7 @@ class 리뷰_요약_조회 {
public static void validateReviewsRatingSummary(GetReviewsSummaryResponse reviewsSummary) {
assertAll(
() -> assertThat(reviewsSummary.rating().rating()).hasSize(5),
() -> assertThat(reviewsSummary.rating().rating()).extracting(RatingInfoResponse::rating)
() -> assertThat(reviewsSummary.rating().rating()).extracting(RatingInfoResponse::name)
.contains("1", "2", "3", "4", "5"),
() -> assertThat(reviewsSummary.rating().rating()).extracting(RatingInfoResponse::percentage)
.contains(0, 50)
Expand Down
32 changes: 10 additions & 22 deletions backend/src/test/java/zipgo/review/presentation/ReviewControllerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,6 @@
import com.epages.restdocs.apispec.ResourceSnippetDetails;
import com.epages.restdocs.apispec.Schema;
import io.restassured.response.Response;
import java.util.ArrayList;
import java.util.List;
import java.util.stream.Collectors;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.DisplayName;
import org.junit.jupiter.api.Nested;
Expand All @@ -32,37 +29,28 @@
import zipgo.review.domain.repository.ReviewRepository;
import zipgo.review.fixture.ReviewFixture;

import java.util.ArrayList;
import java.util.List;
import java.util.stream.Collectors;

import static com.epages.restdocs.apispec.RestAssuredRestDocumentationWrapper.document;
import static com.epages.restdocs.apispec.RestAssuredRestDocumentationWrapper.resourceDetails;
import static com.epages.restdocs.apispec.Schema.schema;
import static io.restassured.RestAssured.given;
import static io.restassured.http.ContentType.JSON;
import static org.hamcrest.Matchers.equalTo;
import static org.hamcrest.Matchers.is;
import static org.hamcrest.Matchers.lessThan;
import static org.hamcrest.Matchers.*;
import static org.springframework.http.HttpHeaders.AUTHORIZATION;
import static org.springframework.http.HttpStatus.BAD_REQUEST;
import static org.springframework.http.HttpStatus.CREATED;
import static org.springframework.http.HttpStatus.FORBIDDEN;
import static org.springframework.http.HttpStatus.NOT_FOUND;
import static org.springframework.http.HttpStatus.NO_CONTENT;
import static org.springframework.http.HttpStatus.OK;
import static org.springframework.http.HttpStatus.*;
import static org.springframework.restdocs.headers.HeaderDocumentation.headerWithName;
import static org.springframework.restdocs.headers.HeaderDocumentation.requestHeaders;
import static org.springframework.restdocs.payload.PayloadDocumentation.fieldWithPath;
import static org.springframework.restdocs.payload.PayloadDocumentation.requestFields;
import static org.springframework.restdocs.payload.PayloadDocumentation.responseFields;
import static org.springframework.restdocs.request.RequestDocumentation.parameterWithName;
import static org.springframework.restdocs.request.RequestDocumentation.pathParameters;
import static org.springframework.restdocs.request.RequestDocumentation.queryParameters;
import static org.springframework.restdocs.payload.PayloadDocumentation.*;
import static org.springframework.restdocs.request.RequestDocumentation.*;
import static zipgo.pet.domain.fixture.BreedFixture.견종;
import static zipgo.pet.domain.fixture.PetFixture.반려동물;
import static zipgo.pet.domain.fixture.PetSizeFixture.소형견;
import static zipgo.petfood.domain.fixture.PetFoodFixture.모든_영양기준_만족_식품;
import static zipgo.review.fixture.MemberFixture.무민;
import static zipgo.review.fixture.ReviewFixture.극찬_리뷰_생성;
import static zipgo.review.fixture.ReviewFixture.리뷰_생성_요청;
import static zipgo.review.fixture.ReviewFixture.리뷰_수정_요청;
import static zipgo.review.fixture.ReviewFixture.*;


public class ReviewControllerTest extends AcceptanceTest {
Expand Down Expand Up @@ -572,7 +560,7 @@ class GetReviewsSummary {
queryParameters(parameterWithName("petFoodId").description("식품 id")),
responseFields(
fieldWithPath("rating.average").description("리뷰 총 평점").type(JsonFieldType.NUMBER),
fieldWithPath("rating.rating[].rating").description("rating 이름").type(JsonFieldType.STRING),
fieldWithPath("rating.rating[].name").description("rating 이름").type(JsonFieldType.STRING),
fieldWithPath("rating.rating[].percentage").description("rating 해당 백분율")
.type(JsonFieldType.NUMBER),
fieldWithPath("tastePreference[].name").description("tastePreference 이름")
Expand Down