-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* feat: 음료 상세 조회 기능 구현 (#53) * feat: drink entity에 index 추가 (#53) * chore: 웅답 dto 네이밍 변경 (#53) * chore: dto 패지키 변경 (#53) * chore: jpql 수정 (#53)
- Loading branch information
1 parent
8796bc3
commit 253d715
Showing
9 changed files
with
204 additions
and
13 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
23 changes: 23 additions & 0 deletions
23
oversweet-api/src/main/java/com/depromeet/oversweet/drink/dto/request/DrinkInfoRequest.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,23 @@ | ||
package com.depromeet.oversweet.drink.dto.request; | ||
|
||
import io.swagger.v3.oas.annotations.media.Schema; | ||
import jakarta.validation.constraints.NotEmpty; | ||
import jakarta.validation.constraints.NotNull; | ||
import lombok.Getter; | ||
|
||
/** | ||
* 음료 상세 정보를 보기 위한 요청 DTO | ||
*/ | ||
@Getter | ||
public class DrinkInfoRequest { | ||
|
||
@Schema(description = "프랜차이즈 ID", example = "1") | ||
@NotNull(message = "프랜차이즈 ID는 필수 값입니다.") | ||
private Long franchiseId; | ||
|
||
@Schema(description = "음료 이름", example = "아메리카노") | ||
@NotEmpty(message = "음료 이름은 필수 값입니다.") | ||
private String drinkName; | ||
|
||
|
||
} |
23 changes: 23 additions & 0 deletions
23
...api/src/main/java/com/depromeet/oversweet/drink/dto/response/DrinkDetailInfoResponse.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,23 @@ | ||
package com.depromeet.oversweet.drink.dto.response; | ||
|
||
import com.depromeet.oversweet.bookmark.dto.response.FranchiseInfo; | ||
import com.depromeet.oversweet.domain.drink.dto.DrinkInfoWithScrapStatus; | ||
import lombok.Getter; | ||
|
||
import java.util.List; | ||
|
||
/** | ||
* 상세 음료 정보를 응답하는 DTO | ||
*/ | ||
@Getter | ||
public class DrinkDetailInfoResponse { | ||
|
||
private final FranchiseInfo franchise; | ||
|
||
private final List<DrinkInfoWithScrapStatus> drinks; | ||
|
||
public DrinkDetailInfoResponse(FranchiseInfo franchise, List<DrinkInfoWithScrapStatus> drinks) { | ||
this.franchise = franchise; | ||
this.drinks = drinks; | ||
} | ||
} |
46 changes: 46 additions & 0 deletions
46
...eet-api/src/main/java/com/depromeet/oversweet/drink/service/DrinkDetailSearchService.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,46 @@ | ||
package com.depromeet.oversweet.drink.service; | ||
|
||
import com.depromeet.oversweet.bookmark.dto.response.FranchiseInfo; | ||
import com.depromeet.oversweet.domain.drink.dto.DrinkInfoWithScrapStatus; | ||
import com.depromeet.oversweet.domain.drink.repository.FindDrinkRepository; | ||
import com.depromeet.oversweet.domain.franchise.entity.FranchiseEntity; | ||
import com.depromeet.oversweet.domain.franchise.repository.FindFranchiseRepository; | ||
import com.depromeet.oversweet.drink.dto.request.DrinkInfoRequest; | ||
import com.depromeet.oversweet.drink.dto.response.DrinkDetailInfoResponse; | ||
import lombok.RequiredArgsConstructor; | ||
import org.springframework.stereotype.Service; | ||
|
||
import java.util.List; | ||
|
||
/** | ||
* 음료 상세 정보를 보기 위한 서비스 | ||
*/ | ||
@Service | ||
@RequiredArgsConstructor | ||
public class DrinkDetailSearchService { | ||
|
||
private final FindDrinkRepository findDrinkRepository; | ||
private final FindFranchiseRepository findFranchiseRepository; | ||
|
||
/** | ||
* 음료 상세 정보 조회 | ||
* | ||
* @param memberId API 접근자 memberId | ||
* @param request 음료 정보를 확인하기 위해 필요한 값을 담고 있는 request dto | ||
* @return 음료 상세 정보 | ||
*/ | ||
public DrinkDetailInfoResponse retrieveDrinkDetail(Long memberId, DrinkInfoRequest request) { | ||
// 프랜차이즈 ID와 음료 이름으로 => 음료가 존재하는지 학인 => 없으면 exception | ||
findDrinkRepository.checkDrinkExist(request.getFranchiseId(), request.getDrinkName()); | ||
|
||
// 프랜차이즈 응답을 위한 조회 | ||
FranchiseEntity franchise = findFranchiseRepository.findFranchiseById(request.getFranchiseId()); | ||
|
||
// 음료 정보를 조회 (음료 정보 & 사이즈별 즐겨 찾기 여부) | ||
List<DrinkInfoWithScrapStatus> drinkDetails = findDrinkRepository.findDrinkDetail(memberId, franchise.getId(), request.getDrinkName()); | ||
|
||
return new DrinkDetailInfoResponse(new FranchiseInfo(franchise), drinkDetails); | ||
} | ||
|
||
|
||
} |
36 changes: 36 additions & 0 deletions
36
...main/src/main/java/com/depromeet/oversweet/domain/drink/dto/DrinkInfoWithScrapStatus.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,36 @@ | ||
package com.depromeet.oversweet.domain.drink.dto; | ||
|
||
import io.swagger.v3.oas.annotations.media.Schema; | ||
import lombok.Getter; | ||
|
||
/** | ||
* 음료 상세 정보를 보기 위한 응답 DTO | ||
*/ | ||
@Getter | ||
public class DrinkInfoWithScrapStatus { | ||
|
||
@Schema(name = "음료 ID", example = "1") | ||
private final Long id; | ||
@Schema(name = "음료 이름", example = "아메리카노") | ||
private final String name; | ||
@Schema(name = "음료 이미지 URL") | ||
private final String drinkImageUrl; | ||
@Schema(name = "음료 사이즈", example = "355") | ||
private final Integer size; | ||
@Schema(name = "음료 칼로리", example = "10") | ||
private final Integer calorie; | ||
@Schema(name = "음료 당도", example = "10") | ||
private final Integer sugar; | ||
@Schema(name = "즐겨찾기 여부", example = "true") | ||
private final Boolean scrapStatus; | ||
|
||
public DrinkInfoWithScrapStatus(Long id, String name, String drinkImageUrl, Integer size, Integer calorie, Integer sugar, Boolean scrapStatus) { | ||
this.id = id; | ||
this.name = name; | ||
this.drinkImageUrl = drinkImageUrl; | ||
this.size = size; | ||
this.calorie = calorie; | ||
this.sugar = sugar; | ||
this.scrapStatus = scrapStatus; | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
15 changes: 15 additions & 0 deletions
15
...ain/src/main/java/com/depromeet/oversweet/domain/drink/repository/DrinkJpaRepository.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,7 +1,22 @@ | ||
package com.depromeet.oversweet.domain.drink.repository; | ||
|
||
import com.depromeet.oversweet.domain.drink.dto.DrinkInfoWithScrapStatus; | ||
import com.depromeet.oversweet.domain.drink.entity.DrinkEntity; | ||
import org.springframework.data.jpa.repository.JpaRepository; | ||
import org.springframework.data.jpa.repository.Query; | ||
import org.springframework.data.repository.query.Param; | ||
|
||
import java.util.List; | ||
|
||
public interface DrinkJpaRepository extends JpaRepository<DrinkEntity, Long> { | ||
|
||
List<DrinkEntity> findByFranchiseIdAndName(Long franchiseId, String drinkName); | ||
|
||
@Query("SELECT new com.depromeet.oversweet.domain.drink.dto.DrinkInfoWithScrapStatus(d.id, d.name, d.imageUrl, d.size, d.calorie, d.sugar, " + | ||
"(CASE WHEN db IS NULL THEN false ELSE true END)) " + | ||
"FROM DrinkEntity d " + | ||
"LEFT JOIN DrinkBookmarkEntity db ON d.id = db.drink.id AND db.member.id = :memberId " + | ||
"WHERE d.franchise.id = :franchiseId AND d.name = :drinkName ORDER BY d.size ASC") | ||
List<DrinkInfoWithScrapStatus> findDrinkWithBookmarkStatus(@Param("memberId") Long memberId, @Param("franchiseId") Long franchiseId, @Param("drinkName") String drinkName); | ||
|
||
} |
7 changes: 7 additions & 0 deletions
7
...in/src/main/java/com/depromeet/oversweet/domain/drink/repository/FindDrinkRepository.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,10 +1,17 @@ | ||
package com.depromeet.oversweet.domain.drink.repository; | ||
|
||
import com.depromeet.oversweet.domain.drink.dto.DrinkInfoWithScrapStatus; | ||
import com.depromeet.oversweet.domain.drink.entity.DrinkEntity; | ||
|
||
import java.util.List; | ||
|
||
/** | ||
* 음료 정보 조회 Interface | ||
*/ | ||
public interface FindDrinkRepository { | ||
DrinkEntity findDrinkById(final Long drinkId); | ||
|
||
List<DrinkInfoWithScrapStatus> findDrinkDetail(final Long memberId, final Long franchiseId, final String drinkName); | ||
|
||
void checkDrinkExist(final Long franchiseId, final String drinkName); | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters