From dcb14dba5f56218ccea2a62f2b19b6fd767c8ff6 Mon Sep 17 00:00:00 2001 From: stgctkm Date: Tue, 22 Aug 2023 12:41:24 +0900 Subject: [PATCH] =?UTF-8?q?=E3=83=AC=E3=83=B3=E3=82=BF=E3=83=AB=E3=83=9D?= =?UTF-8?q?=E3=82=A4=E3=83=B3=E3=83=88=E7=AE=97=E5=87=BA=E3=83=A1=E3=82=BD?= =?UTF-8?q?=E3=83=83=E3=83=89=E3=81=AE=E7=A7=BB=E5=8B=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/video/domain/Customer.java | 9 +-------- src/main/java/video/domain/Rental.java | 7 +++++++ 2 files changed, 8 insertions(+), 8 deletions(-) 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