Skip to content

料金メソッドの抽出 #2

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

Draft
stgctkm wants to merge 2 commits into
base: remove-dependencies-from-domain
Choose a base branch
from
Draft

料金メソッドの抽出 #2

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
454e0ef
料金メソッドの抽出
stgctkm Aug 21, 2023
4a58ace
Merge branch 'remove-dependencies-from-domain' into extract-amount-me…
stgctkm Aug 21, 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
39 changes: 22 additions & 17 deletions src/main/java/video/domain/Customer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,23 +27,7 @@ public RentalResult rentalMovies() {
int totalAmount = 0;
int frequentRenterPoints = 0;
for (Rental each : rentals) {
int thisAmount = 0;
// 一行ごとに金額を計算
switch (each.getMovie().getPriceType()) {
case REGULAR:
thisAmount += 200;
if (each.getDaysRented() > 2)
thisAmount += (each.getDaysRented() - 2) * 150;
break;
case NEW_RELEASE:
thisAmount += each.getDaysRented() * 300;
break;
case CHILDREN:
thisAmount += 150;
if (each.getDaysRented() > 3)
thisAmount += (each.getDaysRented() - 3) * 150;
break;
}
int thisAmount = amount(each);
// レンタルポイントを加算
frequentRenterPoints++;
// 新作を二日以上借りた場合はボーナスポイント
Expand All @@ -54,4 +38,25 @@ public RentalResult rentalMovies() {

return new RentalResult(totalAmount, frequentRenterPoints);
}

private int amount(Rental each) {
int thisAmount = 0;
// 金額を計算
switch (each.getMovie().getPriceType()) {
case REGULAR:
thisAmount += 200;
if (each.getDaysRented() > 2)
thisAmount += (each.getDaysRented() - 2) * 150;
break;
case NEW_RELEASE:
thisAmount += each.getDaysRented() * 300;
break;
case CHILDREN:
thisAmount += 150;
if (each.getDaysRented() > 3)
thisAmount += (each.getDaysRented() - 3) * 150;
break;
}
return thisAmount;
}
}