Skip to content

develop -> main #86

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
Yyang-YE merged 2 commits into from
Jun 23, 2025
Merged

develop -> main #86

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fa2713f
chore: DTO 수정
Yyang-YE Jun 23, 2025
28cda06
Merge pull request #85 from U-plait/fix/bookmark
Yyang-YE Jun 23, 2025
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
10 changes: 7 additions & 3 deletions src/main/java/com/ureca/uplait/domain/user/dto/response/MobileBookmarkResponse.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,11 @@

@Getter
public class MobileBookmarkResponse extends BookmarkResponse {
@Schema(description = "할인 가격", example = "79500")
private int discountPrice;
@Schema(description = "약정 할인 가격", example = "25")
private int durationDiscountRate;

@Schema(description = "프리미어 할인 가격", example = "25")
private int premierDiscountRate;

@Schema(description = "데이터", example = "128GB")
private String data;
Expand All @@ -20,7 +23,8 @@ public class MobileBookmarkResponse extends BookmarkResponse {

public MobileBookmarkResponse(MobilePlan plan, Long bookmarkId, boolean isBookmarked) {
super(plan, bookmarkId, isBookmarked);
this.discountPrice = (plan.getPlanPrice() * plan.getDurationDiscountRate() / 100) - plan.getPremierDiscountRate();
this.durationDiscountRate = plan.getDurationDiscountRate();
this.premierDiscountRate = plan.getPremierDiscountRate();
this.data = plan.getData();
this.voiceCall = plan.getVoiceCall();
this.message = plan.getMessage();
Expand Down
Loading