2주차 미션 다시 구현

src/main/java/baseball/application.java

@@ -1,31 +1,31 @@
 package baseball;
 
+import baseball.domain.Ball;
 import baseball.domain.Baseball;
 import baseball.domain.BaseballStatus;
 import baseball.service.BaseballService;
-import baseball.service.RandomNumGenerator;
+import baseball.service.RandomBallGenerator;
 import baseball.view.InputView;
 import baseball.view.OutputView;
 
+import java.util.stream.Collectors;
+
 public class application {
     public static void main(String[] args) throws Exception {
         InputView inputView = new InputView();
         OutputView outputView = new OutputView();
-        RandomNumGenerator randomNumGenerator = new RandomNumGenerator();
+        RandomBallGenerator randomBallGenerator = new RandomBallGenerator();
         BaseballService baseballService = new BaseballService();
 
-        while(true){
-            Baseball randomBaseball = new Baseball(randomNumGenerator.makeNum());
-            BaseballStatus baseballStatus = new BaseballStatus();
-
-            while(!outputView.exitGame(baseballStatus)){
+        do {
+            Baseball randomBaseball = new Baseball(randomBallGenerator.makeNum());
+            BaseballStatus baseballStatus;
+            do {
                 Baseball userBaseball = inputView.inputBall();
                 baseballStatus = baseballService.compare(userBaseball, randomBaseball);
                 outputView.printBaseballStatus(baseballStatus);
-            }
-            if(!inputView.resumeGame()){
-                break;
-            }
-        }
+            } while (!outputView.exitGame(baseballStatus));
+
+        }while(inputView.resumeGame());
     }
 }

src/main/java/baseball/domain/Ball.java

@@ -0,0 +1,13 @@
+package baseball.domain;
+
+public class Ball {
+    private final int number;
+
+    public Ball(final int number) {
+        this.number = number;
+    }
+
+    public int getNumber() {
+        return number;
+    }
+}

src/main/java/baseball/domain/Baseball.java

@@ -1,15 +1,28 @@
 package baseball.domain;
 
+import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 
 public class Baseball {
-    List<Integer> baseballs;
+    private final List<Ball> baseballs;
 
-    public Baseball(List<Integer> balls) {
-        this.baseballs = balls;
+    public Baseball(final List<Ball> ballList){
+        this.baseballs= new ArrayList<>(ballList);
+        isDistinct();
     }
 
-    public List<Integer> getBaseballs() {
-        return baseballs;
+    public List<Ball> getBaseballs() {
+        return Collections.unmodifiableList(baseballs);
     }
-}
+
+    public void isDistinct(){
+        for(int i=0;i<this.baseballs.size();i++){
+            for(int j=0;j<i;j++){
+                if(this.baseballs.get(i).getNumber() == this.baseballs.get(j).getNumber()){
+                    throw new RuntimeException("중복된 값이 있습니다.");
+                }
+            }
+        }
+    }
+}

src/main/java/baseball/domain/BaseballStatus.java

@@ -1,8 +1,19 @@
 package baseball.domain;
 
 public class BaseballStatus {
-    int ball;
-    int strike;
+    private final int ball;
+    private final int strike;
+
+    public BaseballStatus(int ball, int strike) throws Exception {
+        this.ball = ball;
+        this.strike = strike;
+        this.isValid();
+    }
+    private void isValid() throws Exception{
+        if (!this.existsBall() && !this.existsStrike() && !this.nothing())
+            throw new Exception("결과를 반환할 수 없습니다");
+    }
+
 
     public int getBall() {
         return ball;
@@ -12,14 +23,6 @@ public int getStrike() {
         return strike;
     }
 
-    public void setBall(int ball) {
-        this.ball = ball;
-    }
-
-    public void setStrike(int strike) {
-        this.strike = strike;
-    }
-
     @Override
     public String toString() {
         return "BaseballStatus{" +

src/main/java/baseball/service/BaseballService.java

@@ -1,34 +1,31 @@
 package baseball.service;
 
+import baseball.domain.Action;
+import baseball.domain.Ball;
 import baseball.domain.Baseball;
 import baseball.domain.BaseballStatus;
 
 public class BaseballService {
-    public boolean isStrike(int userNum, int randomNum) {
-        return userNum == randomNum;
+    public boolean isStrike(Ball userBall, Ball randomBall) {
+        return userBall.getNumber() == randomBall.getNumber();
     }
 
-    public boolean isBall(int userNum, int userIdx, Baseball randomBall) {
-        if (!isStrike(userNum, randomBall.getBaseballs().get(userIdx))) {
-            return randomBall.getBaseballs().contains(userNum);
-        }
-        return false;
+    public boolean isBall(Ball userBall, Baseball randomBall) {
+        return randomBall.getBaseballs().stream().anyMatch(ball -> ball.getNumber()==userBall.getNumber());
     }
 
-    public BaseballStatus compare(Baseball userBall, Baseball randomBall) {
-        int strike = 0, ball = 0;
+    public BaseballStatus compare(Baseball userBall, Baseball randomBall) throws Exception {
+        int strike = 0;
+        int ball = 0;
         for (int i = 0; i < userBall.getBaseballs().size(); i++) {
             if (isStrike(userBall.getBaseballs().get(i), randomBall.getBaseballs().get(i))) {
                 strike++;
                 continue;
             }
-            if (isBall(userBall.getBaseballs().get(i), i, randomBall)) {
+            if (isBall(userBall.getBaseballs().get(i), randomBall)) {
                 ball++;
             }
         }
-        BaseballStatus baseballStatus = new BaseballStatus();
-        baseballStatus.setBall(ball);
-        baseballStatus.setStrike(strike);
-        return baseballStatus;
+        return new BaseballStatus(ball, strike);
     }
 }

src/main/java/baseball/service/RandomBallGenerator.java

@@ -0,0 +1,27 @@
+package baseball.service;
+
+import baseball.domain.Ball;
+
+import java.util.*;
+
+public class RandomBallGenerator {
+    static int MAX_SIZE = 3;
+    static int MAX_NUM = 9;
+
+    public List<Ball> makeNum(){
+        Random random = new Random();
+        Set<Integer> set = new HashSet<>();
+
+        while(set.size()<MAX_SIZE){
+            int num = random.nextInt(MAX_NUM)+1;
+            set.add(num);
+        }
+
+        List<Ball> balls = new ArrayList<>();
+        for(int e: set){
+            Ball ball = new Ball(e);
+            balls.add(ball);
+        }
+        return balls;
+    }
+}

src/main/java/baseball/view/InputView.java

@@ -1,22 +1,30 @@
 package baseball.view;
 
+import baseball.domain.Ball;
 import baseball.domain.Baseball;
 
-import java.util.Arrays;
-import java.util.List;
-import java.util.Scanner;
+import java.util.*;
 import java.util.stream.Collectors;
 
+
 public class InputView {
-    public Baseball inputBall() throws Exception {
+    static int MAX_SIZE = 3;
+
+    private void isValidInput(List<Ball> ballList) throws RuntimeException{
+        if(ballList.size()!=MAX_SIZE){
+            throw new RuntimeException("3자리 숫자여야 합니다.");
+        }
+        if(!ballList.stream().allMatch(ball -> ball.getNumber()>0 && ball.getNumber()<=9)){
+            throw new RuntimeException("범위를 벗어납니다.");
+        }
+    }
+
+    public Baseball inputBall() throws RuntimeException {
         Scanner scanner = new Scanner(System.in);
         System.out.print("숫자를 입력해 주세요 : ");
         String input = scanner.next();
-        List<Integer> list = Arrays.stream(input.split("")).mapToInt(Integer::parseInt).boxed().collect(Collectors.toList());
-        if(list.size()!=3){
-            throw new Exception("3자리 숫자여야 합니다.");
-        }
-
+        List<Ball> list = Arrays.stream(input.split("")).mapToInt(Integer::parseInt).mapToObj(Ball::new).collect(Collectors.toList());
+        isValidInput(list);
         return new Baseball(list);
     }
 
@@ -26,4 +34,6 @@ public boolean resumeGame() {
         int input = scanner.nextInt();
         return input == 1;
     }
-}
+
+
+}

src/main/java/baseball/view/OutputView.java

@@ -4,10 +4,9 @@
 import baseball.domain.BaseballStatus;
 
 public class OutputView {
-    public String outputBaseballStatus(BaseballStatus baseballStatus) throws Exception {
+    public String outputBaseballStatus(BaseballStatus baseballStatus) {
         String result = "";
-        if (!baseballStatus.existsBall() && !baseballStatus.existsStrike() && !baseballStatus.nothing())
-            throw new Exception("결과를 반환할 수 없습니다");
+
         if (baseballStatus.existsBall()) {
             result += baseballStatus.getBall() + Action.볼.toString() + " ";
         }
@@ -20,7 +19,7 @@ public String outputBaseballStatus(BaseballStatus baseballStatus) throws Excepti
         return result;
     }
 
-    public void printBaseballStatus(BaseballStatus baseballStatus) throws Exception {
+    public void printBaseballStatus(BaseballStatus baseballStatus) {
         System.out.println(outputBaseballStatus(baseballStatus));
     }
 
@@ -31,4 +30,4 @@ public boolean exitGame(BaseballStatus ballStatus) {
         }
         return false;
     }
-}
+}

src/test/java/baseball/service/BaseballServiceTest.java

@@ -1,5 +1,6 @@
 package baseball.service;
 
+import baseball.domain.Ball;
 import baseball.domain.Baseball;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -20,29 +21,28 @@ void setUp(){
 
     @Test
     void isStrikeTest(){
-        Baseball userBall = new Baseball(Arrays.asList(1,2,3));
-        Baseball randomBall = new Baseball(Arrays.asList(1,2,3));
+        Baseball userBall = new Baseball(Arrays.asList(new Ball(1),new Ball(2),new Ball(3)));
+        Baseball randomBall = new Baseball(Arrays.asList(new Ball(1),new Ball(2),new Ball(3)));
         for(int i=0;i<3;i++){
             assertThat(baseballService.isStrike(userBall.getBaseballs().get(i), randomBall.getBaseballs().get(i))).isTrue();
         }
     }
 
     @Test
     void isBallTest(){
-        Baseball userBall = new Baseball(Arrays.asList(1,3,2));
-        Baseball randomBall = new Baseball(Arrays.asList(2,1,3));
+        Baseball userBall = new Baseball(Arrays.asList(new Ball(1),new Ball(3),new Ball(2)));
+        Baseball randomBall = new Baseball(Arrays.asList(new Ball(2),new Ball(1),new Ball(3)));
         for(int i=0;i<3;i++){
-            assertThat(baseballService.isBall(userBall.getBaseballs().get(i), i, randomBall)).isTrue();
+            assertThat(baseballService.isBall(userBall.getBaseballs().get(i), randomBall)).isTrue();
         }
     }
 
     @ParameterizedTest
     @CsvSource({"1,2,6,1,9,2,1,1", "3,7,5,7,3,9,2,0", "1,2,3,4,5,6,0,0", "3,4,8,3,4,2,0,2"})
-    void compareTest(int u1,int u2,int u3,int r1,int r2,int r3, int e1, int e2){
-        Baseball userBall = new Baseball(Arrays.asList(u1, u2, u3));
-        Baseball randomBall = new Baseball(Arrays.asList(r1, r2, r3));
+    void compareTest(int u1,int u2,int u3,int r1,int r2,int r3, int e1, int e2) throws Exception {
+        Baseball userBall = new Baseball(Arrays.asList(new Ball(u1),new Ball(u2),new Ball(u3)));
+        Baseball randomBall = new Baseball(Arrays.asList(new Ball(r1),new Ball(r2),new Ball(r3)));
 
         assertThat(new int[]{baseballService.compare(userBall, randomBall).getBall(), baseballService.compare(userBall, randomBall).getStrike()}).isEqualTo(new int[]{e1, e2});
-        //assertThat().isEqualTo(ballStatus.getStrike());
     }
-}
+}

src/test/java/baseball/service/RandomNumTest.java → src/test/java/baseball/service/RandomBallTest.java

@@ -1,5 +1,6 @@
 package baseball.service;
 
+import baseball.domain.Ball;
 import baseball.domain.Baseball;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.DisplayName;
@@ -9,18 +10,18 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-public class RandomNumTest {
-    RandomNumGenerator randomNumGenerator;
+public class RandomBallTest {
+    RandomBallGenerator randomBallGenerator;
 
     @BeforeEach
     public void setUp() {
-        randomNumGenerator = new RandomNumGenerator();
+        randomBallGenerator = new RandomBallGenerator();
     }
 
     @Test
     @DisplayName("3개의 서로다른 숫자가 생성되는지 확인하는 테스트입니다.")
     public void makeNumTest() {
-        List<Integer> list = randomNumGenerator.makeNum();
+        List<Ball> list = randomBallGenerator.makeNum();
 
         Baseball randomNum = new Baseball(list);
         assertThat(randomNum.getBaseballs().size()).isEqualTo(3);
@@ -29,8 +30,8 @@ public void makeNumTest() {
     @Test
     @DisplayName("1부터 9 사이의 값인지 확인하는 테스트입니다.")
     public void rangeTest() {
-        List<Integer> list = randomNumGenerator.makeNum();
+        List<Ball> list = randomBallGenerator.makeNum();
 
-        assertThat(list.stream().filter(integer -> integer >= 1 && integer <= 9).count()).isEqualTo(3);
+        assertThat(list.stream().filter(ball -> ball.getNumber() >= 1 && ball.getNumber() <= 9).count()).isEqualTo(3);
     }
 }