refactor: stream 적용

Author: jsween5723

src/main/java/cleancode/studycafe/tobe/io/OutputHandler.java

@@ -1,6 +1,5 @@
 package cleancode.studycafe.tobe.io;
 
-import cleancode.studycafe.tobe.model.StudyCafeLockerPass;
 import cleancode.studycafe.tobe.model.StudyCafePass;
 
 import java.util.List;

src/main/java/cleancode/studycafe/tobe/io/StudyCafeFileHandler.java

@@ -2,12 +2,10 @@
 
 import cleancode.studycafe.tobe.model.StudyCafeLockerPass;
 import cleancode.studycafe.tobe.model.StudyCafePass;
-import cleancode.studycafe.tobe.model.StudyCafePassType;
 
 import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Paths;
-import java.util.ArrayList;
 import java.util.List;
 
 public class StudyCafeFileHandler {
@@ -16,23 +14,12 @@ public List<StudyCafePass> readStudyCafePasses() {
         List<StudyCafeLockerPass> lockerPasses = readLockerPasses();
         try {
             List<String> lines = Files.readAllLines(Paths.get("src/main/resources/cleancode/studycafe/pass-list.csv"));
-            List<StudyCafePass> studyCafePasses = new ArrayList<>();
-            for (String line : lines) {
-                String[] values = line.split(",");
-                StudyCafePassType studyCafePassType = StudyCafePassType.valueOf(values[0]);
-                int duration = Integer.parseInt(values[1]);
-                int price = Integer.parseInt(values[2]);
-                double discountRate = Double.parseDouble(values[3]);
-                var pass = switch (studyCafePassType) {
-                    case HOURLY -> StudyCafePass.hourlyOf(duration, price, discountRate);
-                    case WEEKLY -> StudyCafePass.weeklyOf(duration, price, discountRate);
-                    case FIXED ->
-                            StudyCafePass.fixedOf(duration, price, discountRate, lockerPasses.stream().filter((lockerPass -> lockerPass.isCompatible(duration))).findFirst().orElse(null));
-                };
-                studyCafePasses.add(pass);
-            }
-
-            return studyCafePasses;
+            return lines.stream().map(line -> line.split(","))
+                    .map(values -> {
+                        int duration = Integer.parseInt(values[1]);
+                        StudyCafeLockerPass locker = lockerPasses.stream().filter((lockerPass -> lockerPass.isCompatible(duration))).findFirst().orElse(null);
+                        return StudyCafePass.of(values, locker);
+                    }).toList();
         } catch (IOException e) {
             throw new RuntimeException("파일을 읽는데 실패했습니다.", e);
         }
@@ -41,17 +28,8 @@ public List<StudyCafePass> readStudyCafePasses() {
     private List<StudyCafeLockerPass> readLockerPasses() {
         try {
             List<String> lines = Files.readAllLines(Paths.get("src/main/resources/cleancode/studycafe/locker.csv"));
-            List<StudyCafeLockerPass> lockerPasses = new ArrayList<>();
-            for (String line : lines) {
-                String[] values = line.split(",");
-                int duration = Integer.parseInt(values[1]);
-                int price = Integer.parseInt(values[2]);
-
-                StudyCafeLockerPass lockerPass = StudyCafeLockerPass.of(duration, price);
-                lockerPasses.add(lockerPass);
-            }
-
-            return lockerPasses;
+            return lines.stream().map(line -> line.split(","))
+                    .map(StudyCafeLockerPass::fromValues).toList();
         } catch (IOException e) {
             throw new RuntimeException("파일을 읽는데 실패했습니다.", e);
         }

src/main/java/cleancode/studycafe/tobe/model/StudyCafeLockerPass.java

@@ -11,10 +11,16 @@ private StudyCafeLockerPass(int duration, int price) {
         this.price = price;
     }
 
-    public static StudyCafeLockerPass of(int duration, int price) {
+    private static StudyCafeLockerPass of(int duration, int price) {
         return new StudyCafeLockerPass(duration, price);
     }
 
+    public static StudyCafeLockerPass fromValues(String[] values) {
+        int duration = Integer.parseInt(values[1]);
+        int price = Integer.parseInt(values[2]);
+        return StudyCafeLockerPass.of(duration, price);
+    }
+
     int getPrice() {
         return selected ? price : 0;
     }

src/main/java/cleancode/studycafe/tobe/model/StudyCafePass.java

@@ -14,18 +14,31 @@ protected StudyCafePass(StudyCafePassType passType, int duration, int price, dou
         this.discountRate = discountRate;
     }
 
-    public static StudyCafePass weeklyOf(int duration, int price, double discountRate) {
+    private static StudyCafePass weeklyOf(int duration, int price, double discountRate) {
         return new WeeklyStudyCafePass(duration, price, discountRate);
     }
 
-    public static StudyCafePass hourlyOf(int duration, int price, double discountRate) {
+    private static StudyCafePass hourlyOf(int duration, int price, double discountRate) {
         return new HourlyStudyCafePass(duration, price, discountRate);
     }
 
-    public static StudyCafePass fixedOf(int duration, int price, double discountRate, StudyCafeLockerPass lockerPass) {
+    private static StudyCafePass fixedOf(int duration, int price, double discountRate, StudyCafeLockerPass lockerPass) {
         return new FixedStudyCafePass(duration, price, discountRate, lockerPass);
     }
 
+    public static StudyCafePass of(String[] values, StudyCafeLockerPass lockerPass) {
+        StudyCafePassType studyCafePassType = StudyCafePassType.valueOf(values[0]);
+        int duration = Integer.parseInt(values[1]);
+        int price = Integer.parseInt(values[2]);
+        double discountRate = Double.parseDouble(values[3]);
+        return switch (studyCafePassType) {
+            case HOURLY -> hourlyOf(duration, price, discountRate);
+            case WEEKLY -> weeklyOf(duration, price, discountRate);
+            case FIXED ->
+                    fixedOf(duration, price, discountRate, lockerPass);
+        };
+    }
+
     public StudyCafePassType getPassType() {
         return passType;
     }