diff --git a/src/main/java/video/domain/Customer.java b/src/main/java/video/domain/Customer.java index 0a8081d..3bb6a68 100644 --- a/src/main/java/video/domain/Customer.java +++ b/src/main/java/video/domain/Customer.java @@ -28,18 +28,11 @@ public RentalResult rentalMovies() { int frequentRenterPoints = 0; for (Rental each : rentals) { int thisAmount = each.amount(); - frequentRenterPoints += frequentRenterPoints(each); + frequentRenterPoints += each.frequentRenterPoints(); totalAmount += thisAmount; } return new RentalResult(totalAmount, frequentRenterPoints); } - private int frequentRenterPoints(Rental each) { - // 新作を二日以上借りた場合はボーナスポイント - if ((each.getMovie().getPriceType() == PriceType.NEW_RELEASE) && - each.getDaysRented() > 1) return 2; - return 1; - } - } \ No newline at end of file diff --git a/src/main/java/video/domain/Rental.java b/src/main/java/video/domain/Rental.java index 796858a..0652924 100644 --- a/src/main/java/video/domain/Rental.java +++ b/src/main/java/video/domain/Rental.java @@ -37,4 +37,11 @@ int amount() { } return thisAmount; } + + int frequentRenterPoints() { + // 新作を二日以上借りた場合はボーナスポイント + if ((getMovie().getPriceType() == PriceType.NEW_RELEASE) && + getDaysRented() > 1) return 2; + return 1; + } } \ No newline at end of file