Extract method DetermineAmount()

SoatGroup · Aug 26, 2018 · 8f7fe33 · 8f7fe33
1 parent 7c1f314
commit 8f7fe33
Showing 1 changed file with 23 additions and 18 deletions.
diff --git a/2_Uncle_Bob_Full/Soat.CleanCode.VideoStore.UncleBobFull/Statement.cs b/2_Uncle_Bob_Full/Soat.CleanCode.VideoStore.UncleBobFull/Statement.cs
@@ -52,43 +52,48 @@ private string RentalLines()
         private string RentalLine(Rental rental)
         {
             var rentalLine = "";
-            var thisAmount = 0m;
+            var rentalAmount = DetermineAmount(rental);
 
-            //dtermines the amount for each line
+            FrequentRenterPoints++;
+
+            if (rental.Movie.PriceCode == Movie.NEW_RELEASE
+                && rental.DaysRented > 1)
+            {
+                FrequentRenterPoints++;
+            }
+
+            rentalLine += "\t" + rental.Movie.Title + "\t" + rentalAmount.ToString("0.0", CultureInfo.InvariantCulture) + Environment.NewLine;
+            TotalAmount += rentalAmount;
+            return rentalLine;
+        }
+
+        private static decimal DetermineAmount(Rental rental)
+        {
+            var rentalAmount = 0m;
             switch (rental.Movie.PriceCode)
             {
                 case Movie.REGULAR:
-                    thisAmount += 2;
+                    rentalAmount += 2;
                     if (rental.DaysRented > 2)
                     {
-                        thisAmount += (rental.DaysRented - 2) * 1.5m;
+                        rentalAmount += (rental.DaysRented - 2) * 1.5m;
                     }
 
                     break;
                 case Movie.NEW_RELEASE:
-                    thisAmount += rental.DaysRented * 3;
+                    rentalAmount += rental.DaysRented * 3;
                     break;
                 case Movie.CHILDREN:
-                    thisAmount += 1.5m;
+                    rentalAmount += 1.5m;
                     if (rental.DaysRented > 3)
                     {
-                        thisAmount += (rental.DaysRented - 3) * 1.5m;
+                        rentalAmount += (rental.DaysRented - 3) * 1.5m;
                     }
 
                     break;
             }
 
-            FrequentRenterPoints++;
+            return rentalAmount;
-
-            if (rental.Movie.PriceCode == Movie.NEW_RELEASE
-                && rental.DaysRented > 1)
-            {
-                FrequentRenterPoints++;
-            }
-
-            rentalLine += "\t" + rental.Movie.Title + "\t" + thisAmount.ToString("0.0", CultureInfo.InvariantCulture) + Environment.NewLine;
-            TotalAmount += thisAmount;
-            return rentalLine;
         }
 
         private string Footer()