From 61d5c878afd6d96af035738af65a4b53358f7c7a Mon Sep 17 00:00:00 2001 From: stgctkm Date: Tue, 22 Aug 2023 13:20:43 +0900 Subject: [PATCH 1/2] =?UTF-8?q?=E5=90=88=E8=A8=88=E9=87=91=E9=A1=8D?= =?UTF-8?q?=E7=AE=97=E5=87=BA=E3=83=A1=E3=82=BD=E3=83=83=E3=83=89=E3=80=81?= =?UTF-8?q?=E5=90=88=E8=A8=88=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=82=92Rentals=E3=82=AF=E3=83=A9=E3=82=B9?= =?UTF-8?q?=E3=81=AB=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 | 21 ++----------------- .../java/video/domain/rental/Rentals.java | 17 +++++++++++++++ 2 files changed, 19 insertions(+), 19 deletions(-) diff --git a/src/main/java/video/domain/Customer.java b/src/main/java/video/domain/Customer.java index d8b13d2..aa16265 100644 --- a/src/main/java/video/domain/Customer.java +++ b/src/main/java/video/domain/Customer.java @@ -24,28 +24,11 @@ public Rentals getRentals() { } public RentalResult rentalMovies() { - int totalAmount = totalAmount(); + int totalAmount = rentals.totalAmount(); - int frequentRenterPoints = frequentRenterPoints(); + int frequentRenterPoints = rentals.frequentRenterPoints(); return new RentalResult(totalAmount, frequentRenterPoints); } - private int frequentRenterPoints() { - int frequentRenterPoints = 0; - for (Rental each : rentals.list()) { - frequentRenterPoints += each.frequentRenterPoints(); - } - return frequentRenterPoints; - } - - private int totalAmount() { - int totalAmount = 0; - for (Rental each : rentals.list()) { - int thisAmount = each.amount(); - totalAmount += thisAmount; - } - return totalAmount; - } - } \ No newline at end of file diff --git a/src/main/java/video/domain/rental/Rentals.java b/src/main/java/video/domain/rental/Rentals.java index 3e6aca3..792fd39 100644 --- a/src/main/java/video/domain/rental/Rentals.java +++ b/src/main/java/video/domain/rental/Rentals.java @@ -13,4 +13,21 @@ public void add(Rental rental) { public List list() { return list; } + + public int totalAmount() { + int totalAmount = 0; + for (Rental each : list()) { + int thisAmount = each.amount(); + totalAmount += thisAmount; + } + return totalAmount; + } + + public int frequentRenterPoints() { + int frequentRenterPoints = 0; + for (Rental each : list()) { + frequentRenterPoints += each.frequentRenterPoints(); + } + return frequentRenterPoints; + } } From f8057706275cd488fab5b8637df121a02a78c239 Mon Sep 17 00:00:00 2001 From: stgctkm Date: Tue, 22 Aug 2023 13:24:24 +0900 Subject: [PATCH 2/2] =?UTF-8?q?=E3=83=A1=E3=82=BD=E3=83=83=E3=83=89?= =?UTF-8?q?=E5=90=8D=E3=82=92=E5=A4=89=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/video/domain/Customer.java | 2 +- src/main/java/video/domain/rental/Rentals.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/video/domain/Customer.java b/src/main/java/video/domain/Customer.java index aa16265..4de5e45 100644 --- a/src/main/java/video/domain/Customer.java +++ b/src/main/java/video/domain/Customer.java @@ -26,7 +26,7 @@ public Rentals getRentals() { public RentalResult rentalMovies() { int totalAmount = rentals.totalAmount(); - int frequentRenterPoints = rentals.frequentRenterPoints(); + int frequentRenterPoints = rentals.totalFrequentRenterPoints(); return new RentalResult(totalAmount, frequentRenterPoints); } diff --git a/src/main/java/video/domain/rental/Rentals.java b/src/main/java/video/domain/rental/Rentals.java index 792fd39..548865f 100644 --- a/src/main/java/video/domain/rental/Rentals.java +++ b/src/main/java/video/domain/rental/Rentals.java @@ -23,7 +23,7 @@ public int totalAmount() { return totalAmount; } - public int frequentRenterPoints() { + public int totalFrequentRenterPoints() { int frequentRenterPoints = 0; for (Rental each : list()) { frequentRenterPoints += each.frequentRenterPoints();