[디디] 로또 미션 제출합니다.

src/main/java/lotto/domain/controller/LottoController.java

@@ -29,6 +29,6 @@ private WinningLotto createWinningLotto() {
     private void createResult(PurchaseMoney money, Lottos lottos, WinningLotto winningLotto) {
         LottoGame game = new LottoGame(lottos, winningLotto, money);
         GameResult gameResult = game.getResult();
-        OutputView.printResult(gameResult);
+        OutputView.printResult(gameResult, gameResult.calculateProfit(money));
     }
 }

src/main/java/lotto/domain/model/LottoGame.java

@@ -24,13 +24,12 @@ public LottoGame(Lottos lottos, WinningLotto winningLotto, PurchaseMoney money)
 
     public GameResult getResult() {
         List<Rank> ranks = Arrays.asList(Rank.values());
-        GameResult gameResult = new GameResult(ranks);
+        GameResult gameResult = new GameResult();
 
         for (Lotto lotto : lottos) {
             Rank rank = winningLotto.isWinningLotto(lotto);
             gameResult.count(rank);
         }
-        gameResult.calculateProfit(money);
         return gameResult;
     }
 }

src/main/java/lotto/domain/result/GameResult.java

@@ -2,27 +2,25 @@
 
 import lotto.domain.PurchaseMoney;
 
-import java.util.List;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 
 public class GameResult {
+    public static final int PERCENTAGE = 100;
     private final Map<Rank, Count> statistic;
-    private double profit;
 
-    public GameResult(List<Rank> ranks) {
+    public GameResult() {
         statistic = new ConcurrentHashMap<>();
-        for (Rank rank : ranks) {
+        for (Rank rank : Rank.values()) {
             statistic.put(rank, new Count());
         }
-        this.profit = 0;
     }
 
-    public void calculateProfit(PurchaseMoney money) {
-        profit = statistic.keySet().stream()
+    public double calculateProfit(PurchaseMoney money) {
+        double profit = statistic.keySet().stream()
                 .mapToDouble(rank -> rank.getPrize() * getCountByRank(rank).getCount())
                 .sum();
-        profit = profit / money.getPurchaseMoney() * 100;
+        return profit / money.getPurchaseMoney() * PERCENTAGE;
     }
 
     public void count(Rank rank) {
@@ -38,8 +36,4 @@ public Map<Rank, Count> getStatistic() {
     public Count getCountByRank(Rank rank) {
         return statistic.get(rank);
     }
-
-    public double getProfit() {
-        return profit;
-    }
 }

src/main/java/lotto/domain/result/Rank.java

@@ -1,7 +1,6 @@
 package lotto.domain.result;
 
 import java.util.Arrays;
-import java.util.stream.Stream;
 
 public enum Rank {
     DEFAULT(0, 0, false),
@@ -11,7 +10,6 @@ public enum Rank {
     BONUS(5, 30_000_000, true),
     SIX(6, 2_000_000_000, false);
 
-    public static final int FIVE_MATCH = 5;
     private final int matchingNumbers;
     private final int prize;
     private final boolean bonusMatching;
@@ -23,16 +21,9 @@ public enum Rank {
     }
 
     public static Rank getRank(int numberOfMatch, boolean isBonus) {
-        Stream<Rank> rankStream = Arrays.stream(values())
-                .filter(statistic -> statistic.matchingNumbers == numberOfMatch);
-
-        if (numberOfMatch != FIVE_MATCH) {
-            return rankStream
-                    .findFirst()
-                    .orElse(DEFAULT);
-        }
-        return rankStream
-                .filter(statistic -> statistic.bonusMatching == isBonus)
+         return Arrays.stream(values())
+                .filter(rank -> rank.matchingNumbers == numberOfMatch)
+                .filter(rank->rank.checkBonus(isBonus))
                 .findFirst()
                 .orElse(DEFAULT);
     }
@@ -49,7 +40,17 @@ public boolean isNotDefault() {
         return matchingNumbers != 0;
     }
 
-    public boolean isBonusMatching() {
-        return matchingNumbers == FIVE_MATCH && bonusMatching;
+    public boolean checkBonus(boolean isBonus) {
+        if (this == BONUS || this == FIVE) {
+            return bonusMatching == isBonus;
+        }
+        return true;
+    }
+
+    public boolean isBonus(){
+        if(this==BONUS){
+            return true;
+        }
+        return false;
     }
 }

src/main/java/lotto/view/OutputView.java

@@ -21,11 +21,11 @@ public static void printLottos(Lottos lottos) {
         System.out.println();
     }
 
-    public static void printResult(GameResult gameResult) {
+    public static void printResult(GameResult gameResult, double profit) {
         System.out.println("\n당첨 통계 \n ==============");
 
         printRank(gameResult.getStatistic());
-        printProfit(gameResult.getProfit());
+        printProfit(profit);
     }
 
     private static void printRank(Map<Rank, Count> statistic) {
@@ -59,7 +59,7 @@ private static void printSecond(Rank rank, Count count) {
     }
 
     private static boolean checkBonus(Rank rank, Count count) {
-        if (rank.isBonusMatching()) {
+        if (rank.isBonus()) {
             printSecond(rank, count);
             return true;
         }

src/test/java/lotto/domain/gameResultTest.java

@@ -2,13 +2,9 @@
 
 import lotto.domain.result.GameResult;
 import lotto.domain.result.Rank;
-import org.assertj.core.api.Assert;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.params.provider.ValueSource;
-
-import java.util.Arrays;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
@@ -18,7 +14,7 @@ public class gameResultTest {
 
     @BeforeEach
     void initGameResult() {
-        gameResult = new GameResult(Arrays.asList(Rank.values()));
+        gameResult = new GameResult();
         gameResult.count(Rank.THREE);
         gameResult.count(Rank.THREE);
         gameResult.count(Rank.THREE);
@@ -39,7 +35,6 @@ void countTest() {
     @DisplayName("수익률을 잘 계산하는지 테스트")
     void calculateProfitTest() {
         PurchaseMoney money = new PurchaseMoney("6000");
-        gameResult.calculateProfit(money);
-        assertThat(gameResult.getProfit()).isEqualTo(PROFIT / 6000 * 100);
+        assertThat(gameResult.calculateProfit(money)).isEqualTo(PROFIT / 6000 * 100);
     }
 }