From 939a241fea582fe23bad6a2a48710e894277119c Mon Sep 17 00:00:00 2001 From: stgctkm Date: Tue, 22 Aug 2023 13:13:11 +0900 Subject: [PATCH 1/3] =?UTF-8?q?=E5=90=88=E8=A8=88=E9=87=91=E9=A1=8D?= =?UTF-8?q?=E3=81=A8=E3=83=AC=E3=83=B3=E3=82=BF=E3=83=AB=E3=83=9D=E3=82=A4?= =?UTF-8?q?=E3=83=B3=E3=83=88=E3=81=AE=E8=A8=88=E7=AE=97=E3=82=92=E5=88=86?= =?UTF-8?q?=E5=89=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/video/domain/Customer.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/main/java/video/domain/Customer.java b/src/main/java/video/domain/Customer.java index f0e7881..22879f1 100644 --- a/src/main/java/video/domain/Customer.java +++ b/src/main/java/video/domain/Customer.java @@ -25,13 +25,16 @@ public Rentals getRentals() { public RentalResult rentalMovies() { int totalAmount = 0; - int frequentRenterPoints = 0; for (Rental each : rentals.list()) { int thisAmount = each.amount(); - frequentRenterPoints += each.frequentRenterPoints(); totalAmount += thisAmount; } + int frequentRenterPoints = 0; + for (Rental each : rentals.list()) { + frequentRenterPoints += each.frequentRenterPoints(); + } + return new RentalResult(totalAmount, frequentRenterPoints); } From dfbbf1c63ccab801ff0783b9665ba126e4f3d567 Mon Sep 17 00:00:00 2001 From: stgctkm Date: Tue, 22 Aug 2023 13:14:21 +0900 Subject: [PATCH 2/3] =?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=81=AE?= =?UTF-8?q?=E6=8A=BD=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/video/domain/Customer.java | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/src/main/java/video/domain/Customer.java b/src/main/java/video/domain/Customer.java index 22879f1..3537634 100644 --- a/src/main/java/video/domain/Customer.java +++ b/src/main/java/video/domain/Customer.java @@ -24,11 +24,7 @@ public Rentals getRentals() { } public RentalResult rentalMovies() { - int totalAmount = 0; - for (Rental each : rentals.list()) { - int thisAmount = each.amount(); - totalAmount += thisAmount; - } + int totalAmount = totalAmount(); int frequentRenterPoints = 0; for (Rental each : rentals.list()) { @@ -38,4 +34,13 @@ public RentalResult rentalMovies() { return new RentalResult(totalAmount, 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 From f400782fedc2ad16b567ee0a1546d128c98a6609 Mon Sep 17 00:00:00 2001 From: stgctkm Date: Tue, 22 Aug 2023 13:14:56 +0900 Subject: [PATCH 3/3] =?UTF-8?q?=E5=90=88=E8=A8=88=E3=83=AC=E3=83=B3?= =?UTF-8?q?=E3=82=BF=E3=83=AB=E3=83=9D=E3=82=A4=E3=83=B3=E3=83=88=E7=AE=97?= =?UTF-8?q?=E5=87=BA=E3=83=A1=E3=82=BD=E3=83=83=E3=83=89=E3=81=AE=E6=8A=BD?= =?UTF-8?q?=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/video/domain/Customer.java | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/main/java/video/domain/Customer.java b/src/main/java/video/domain/Customer.java index 3537634..d8b13d2 100644 --- a/src/main/java/video/domain/Customer.java +++ b/src/main/java/video/domain/Customer.java @@ -26,12 +26,17 @@ public Rentals getRentals() { public RentalResult rentalMovies() { int totalAmount = totalAmount(); + int frequentRenterPoints = frequentRenterPoints(); + + return new RentalResult(totalAmount, frequentRenterPoints); + } + + private int frequentRenterPoints() { int frequentRenterPoints = 0; for (Rental each : rentals.list()) { frequentRenterPoints += each.frequentRenterPoints(); } - - return new RentalResult(totalAmount, frequentRenterPoints); + return frequentRenterPoints; } private int totalAmount() {