Skip to content

Commit

Permalink
Merge pull request #193 from Central-MakeUs/develop
Browse files Browse the repository at this point in the history
v1.1.2
  • Loading branch information
leeeeeyeon authored Feb 23, 2024
2 parents 875655a + 886e216 commit b3c37ff
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 6 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,7 @@ public DataResponseDto<KakaoImgResponse> getKakaoMessageImgUrl(
return DataResponseDto.from(giftBoxService.getKakaoMessageImgUrl(giftBoxId));
}

@Operation(summary = "메인화면에 띄울 선물박스 조회")
@Operation(summary = "홈 화면에 띄울 선물박스 조회")
@GetMapping("/main")
public DataResponseDto<MainGiftBoxResponse> getMainGiftBox() {
return DataResponseDto.from(giftBoxService.getMainGiftBox());
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -338,10 +338,12 @@ public MainGiftBoxResponse getMainGiftBox() {
Optional<AdminGiftBox> adminGiftBox = adminGiftBoxReader.findByAdminType(
AdminType.ONBOARDING);

if (adminGiftBox.isPresent()) {
return MainGiftBoxResponse.from(adminGiftBox.get().getGiftBox());
} else {
return MainGiftBoxResponse.builder().build();
}
// if (adminGiftBox.isPresent()) {
// return MainGiftBoxResponse.from(adminGiftBox.get().getGiftBox());
// } else {
// return MainGiftBoxResponse.builder().build();
// }

return MainGiftBoxResponse.builder().build();
}
}

0 comments on commit b3c37ff

Please sign in to comment.