This repository was archived by the owner on Feb 9, 2026. It is now read-only.
forked from next-step/java-baseball-playground
-
Notifications
You must be signed in to change notification settings - Fork 3
Songhansol #3
Open
SongHanSol1140
wants to merge
7
commits into
CODE-CLEANERS:main
Choose a base branch
from
SongHanSol1140:songhansol
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Songhansol #3
Changes from all commits
Commits
Show all changes
7 commits
Select commit
Hold shift + click to select a range
aa0d27f
2026/02/02 16:00 저장
SongHanSol1140 2c1c641
2026/02/02 16:00 저장
SongHanSol1140 e0ea7d5
2026/02/02 17:31 완성?
SongHanSol1140 922b834
2026/02/02 18:30 도메인 분리
SongHanSol1140 6264c5b
테스트 가능하게 NumberGenerator추상화 + 모델에 게임에 사용할 숫자 갯수 상수 선언
SongHanSol1140 9981a13
테스트 가능하게 NumberGenerator추상화 + 모델에 게임에 사용할 숫자 갯수 상수 선언
SongHanSol1140 f937024
게임에 사용할 숫자 갯수 상수 선언 미적용된 부분 수정
SongHanSol1140 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,8 @@ | ||
| import gameController.GameController; | ||
|
|
||
| public class Application { | ||
| public static void main(String[] args) { | ||
| GameController gameController = new GameController(); | ||
| gameController.start(); | ||
| } | ||
| } |
25 changes: 25 additions & 0 deletions
25
src/main/java/domain/generator/BaseBallNumbersGenerator.java
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,25 @@ | ||
| package domain.generator; | ||
|
|
||
| import domain.model.BaseBallNumbers; | ||
|
|
||
| import java.util.ArrayList; | ||
| import java.util.List; | ||
|
|
||
| public class BaseBallNumbersGenerator { | ||
| private final NumberGenerator numberGenerator; | ||
|
|
||
| public BaseBallNumbersGenerator(NumberGenerator numberGenerator) { | ||
| this.numberGenerator = numberGenerator; | ||
| } | ||
|
|
||
| public List<Integer> generate() { | ||
| List<Integer> numbers = new ArrayList<>(); | ||
| while (numbers.size() < BaseBallNumbers.NumberSize) { | ||
| int num = numberGenerator.generate(); | ||
| if (!numbers.contains(num)) { | ||
| numbers.add(num); | ||
| } | ||
| } | ||
| return numbers; | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,5 @@ | ||
| package domain.generator; | ||
|
|
||
| public interface NumberGenerator { | ||
| int generate(); | ||
| } |
12 changes: 12 additions & 0 deletions
12
src/main/java/domain/generator/RandomNumbersGenerator.java
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,12 @@ | ||
| package domain.generator; | ||
|
|
||
| import java.util.Random; | ||
|
|
||
| public class RandomNumbersGenerator implements NumberGenerator { | ||
| private final Random random = new Random(); | ||
|
|
||
| @Override | ||
| public int generate() { | ||
| return random.nextInt(9) + 1; | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,55 @@ | ||
| package domain.model; | ||
|
|
||
| import java.util.ArrayList; | ||
| import java.util.List; | ||
|
|
||
| public class BaseBallNumbers { | ||
| public static final int NumberSize = 3; | ||
| private final List<Integer> numbers; | ||
| public static BaseBallNumbers from(List<Integer> numbers) { | ||
| return new BaseBallNumbers(numbers); | ||
| } | ||
| public static BaseBallNumbers parse(String input) { | ||
| List<Integer> numbers = new ArrayList<>(); | ||
| for (char c : input.toCharArray()) { | ||
| numbers.add(Character.getNumericValue(c)); | ||
| } | ||
| return new BaseBallNumbers(numbers); | ||
| } | ||
|
|
||
| private BaseBallNumbers(List<Integer> numbers) { | ||
| validate(numbers); | ||
| this.numbers = numbers; | ||
| } | ||
|
|
||
| private void validate(List<Integer> numbers) { | ||
| if (numbers.size() != NumberSize) { | ||
| throw new IllegalArgumentException("숫자는 " + NumberSize + "개여야 합니다."); | ||
| } | ||
| if (numbers.stream().distinct().count() != NumberSize) { | ||
| throw new IllegalArgumentException("중복된 숫자가 있습니다."); | ||
| } | ||
| for (int num : numbers) { | ||
| if (num < 1 || num > 9) { | ||
| throw new IllegalArgumentException("숫자는 1-9 사이여야 합니다."); | ||
| } | ||
| } | ||
| } | ||
|
|
||
| public int get(int index) { | ||
| return numbers.get(index); | ||
| } | ||
|
|
||
| public boolean contains(int num) { | ||
| return numbers.contains(num); | ||
| } | ||
|
|
||
| public int size() { | ||
| return numbers.size(); | ||
| } | ||
| // 값 확인용 | ||
| @Override | ||
| public String toString() { | ||
| return numbers.toString(); | ||
| } | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,27 @@ | ||
| package domain.model; | ||
|
|
||
| public class GameResult { | ||
| private final int strike; | ||
| private final int ball; | ||
|
|
||
| public GameResult(int strike, int ball) { | ||
| this.strike = strike; | ||
| this.ball = ball; | ||
| } | ||
|
|
||
| public boolean isWin() { | ||
| return strike == BaseBallNumbers.NumberSize; | ||
| } | ||
|
|
||
| public boolean isNothing() { | ||
| return strike == 0 && ball == 0; | ||
| } | ||
|
|
||
| public int getStrike() { | ||
| return strike; | ||
| } | ||
|
|
||
| public int getBall() { | ||
| return ball; | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,22 @@ | ||
| package domain.service; | ||
|
|
||
| import domain.model.BaseBallNumbers; | ||
| import domain.model.GameResult; | ||
|
|
||
| public class Referee { | ||
|
|
||
| public GameResult decides(BaseBallNumbers problemNumbers, BaseBallNumbers inputNumber) { | ||
| int strike = 0; | ||
| int ball = 0; | ||
|
|
||
| for (int i = 0; i < problemNumbers.size(); i++) { | ||
| int guessNum = inputNumber.get(i); | ||
| if (guessNum == problemNumbers.get(i)) { | ||
| strike++; | ||
| } else if (problemNumbers.contains(guessNum)) { | ||
| ball++; | ||
| } | ||
| } | ||
| return new GameResult(strike, ball); | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,46 @@ | ||
| package gameController; | ||
|
|
||
| import domain.model.BaseBallNumbers; | ||
| import domain.model.GameResult; | ||
| import domain.service.Referee; | ||
| import domain.generator.BaseBallNumbersGenerator; | ||
| import domain.generator.RandomNumbersGenerator; | ||
| import handler.InputHandler; | ||
| import view.OutputView; | ||
|
|
||
|
|
||
| public class GameController { | ||
| private final InputHandler inputHandler; | ||
| private final OutputView outputView; | ||
| private final Referee referee; | ||
| private int failCount; | ||
|
|
||
| public GameController() { | ||
| this.inputHandler = new InputHandler(); | ||
| this.outputView = new OutputView(); | ||
| this.referee = new Referee(); | ||
| this.failCount = 0; | ||
| } | ||
|
|
||
| public void start() { | ||
| BaseBallNumbersGenerator numberGenerator = new BaseBallNumbersGenerator(new RandomNumbersGenerator()); | ||
| BaseBallNumbers problemNumbers = BaseBallNumbers.from(numberGenerator.generate()); | ||
| outputView.printGameStart(); | ||
| try { | ||
| while (true) { | ||
| String userInput = inputHandler.getUserInput(); | ||
| BaseBallNumbers userNumbers = BaseBallNumbers.parse(userInput); | ||
| GameResult gameResult = referee.decides(problemNumbers, userNumbers); | ||
| if (gameResult.isWin()) { | ||
| outputView.printWin(); | ||
| break; | ||
| } | ||
| failCount++; | ||
| outputView.printResult(gameResult.getStrike(), gameResult.getBall(), failCount); | ||
| } | ||
| inputHandler.close(); | ||
| } catch (IllegalArgumentException error) { | ||
| System.out.println(error.getMessage()); | ||
| } | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,43 @@ | ||
| package handler; | ||
|
|
||
| import domain.model.BaseBallNumbers; | ||
|
|
||
| import java.util.Scanner; | ||
|
|
||
| public class InputHandler { | ||
| private final Scanner scanner; | ||
| public InputHandler() { | ||
| this.scanner = new Scanner(System.in); | ||
| } | ||
|
|
||
| public String getUserInput() { | ||
| System.out.print("숫자를 입력하세요: "); | ||
| String input = scanner.nextLine(); | ||
| validate(input); | ||
| return input; | ||
| } | ||
|
|
||
| private void validate(String input) { | ||
| // 자릿수 체크 | ||
| if (input.length() != BaseBallNumbers.NumberSize) { | ||
| throw new IllegalArgumentException("3자리 숫자를 입력하세요."); | ||
| } | ||
|
Comment on lines
21
to
24
Collaborator
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. 여기도 3이라는 매직넘버가 등장한다.
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. 모델 BaseBallNumbers에 게임에 사용될 숫자 갯수 상수로 수정 |
||
| // 1-9 숫자 확인 | ||
| for (int i = 0; i < BaseBallNumbers.NumberSize; i++) { | ||
| char c = input.charAt(i); | ||
| if (c < '1' || c > '9') { | ||
| throw new IllegalArgumentException("1-9 사이 숫자만 입력하세요."); | ||
| } | ||
| } | ||
| // 중복 체크 | ||
| if (input.chars().distinct().count() != BaseBallNumbers.NumberSize) { | ||
| throw new IllegalArgumentException("중복된 숫자는 입력할 수 없습니다."); | ||
| } | ||
|
|
||
| } | ||
|
|
||
| // 재시작 로직이 | ||
| public void close() { | ||
| scanner.close(); | ||
| } | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,28 @@ | ||
| package view; | ||
|
|
||
| public class OutputView { | ||
|
|
||
| public void printGameStart() { | ||
| System.out.println("숫자 야구 게임 시작"); | ||
| } | ||
|
|
||
| public void printResult(int strike, int ball, int failCount) { | ||
| StringBuilder text = new StringBuilder(); | ||
| if (strike > 0) { | ||
| text.append(strike).append("스트라이크 "); | ||
| } | ||
| if (ball > 0) { | ||
| text.append(ball).append("볼 "); | ||
| } | ||
| if (strike == 0 && ball == 0) { | ||
| text.append("일치값 없음 "); | ||
| } | ||
|
|
||
| text.append("(").append(failCount).append("번 실패)"); | ||
| System.out.println(text.toString()); | ||
| } | ||
|
|
||
| public void printWin() { | ||
| System.out.println("정답!"); | ||
| } | ||
| } |
39 changes: 39 additions & 0 deletions
39
src/test/java/domain/generator/BaseBallNumbersGeneratorTest.java
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,39 @@ | ||
| package domain.generator; | ||
|
|
||
| import org.junit.jupiter.api.Test; | ||
|
|
||
| import java.util.List; | ||
|
|
||
| import static org.assertj.core.api.Assertions.assertThat; | ||
|
|
||
| public class BaseBallNumbersGeneratorTest { | ||
|
|
||
| @Test | ||
| void Numbers123Test() { | ||
| NumberGenerator fixedGenerator = new TestNumberGenerator(1, 2, 3); | ||
| BaseBallNumbersGenerator generator = new BaseBallNumbersGenerator(fixedGenerator); | ||
| List<Integer> result = generator.generate(); | ||
| assertThat(result).containsExactly(1, 2, 3); | ||
| // assertThat(result) => 검사할 값 | ||
| // containsExactly > 배열이 일치하는지 확인(가변 배열을 인자로 받음) | ||
| System.out.println("Number123Test Check Complete"); | ||
| } | ||
|
|
||
| @Test | ||
| void Numbers459() { | ||
| NumberGenerator fixedGenerator = new TestNumberGenerator(4, 5, 9); | ||
| BaseBallNumbersGenerator generator = new BaseBallNumbersGenerator(fixedGenerator); | ||
| List<Integer> result = generator.generate(); | ||
| assertThat(result).containsExactly(4, 5, 9); | ||
| System.out.println("Numbers459 Check Complete"); | ||
| } | ||
|
|
||
| @Test | ||
| void duplicateNumbersCheck() { | ||
| NumberGenerator fixedGenerator = new TestNumberGenerator(1, 1, 2, 3); | ||
| BaseBallNumbersGenerator generator = new BaseBallNumbersGenerator(fixedGenerator); | ||
| List<Integer> result = generator.generate(); | ||
| assertThat(result).containsExactly(1, 2, 3); | ||
| assertThat(result).hasSize(3); | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,15 @@ | ||
| package domain.generator; | ||
|
|
||
| public class TestNumberGenerator implements NumberGenerator { | ||
| private final int[] numbers; | ||
| private int index = 0; | ||
|
|
||
| public TestNumberGenerator(int... numbers) { | ||
| this.numbers = numbers; | ||
| } | ||
|
|
||
| @Override | ||
| public int generate() { | ||
| return numbers[index++]; | ||
| } | ||
| } |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
숫자가 3이여야 한다는 것은 정책 아닌가? 이 숫자가 여러 번 등장하는데, 정책이 바뀔 때 마다 여러 번 등장하는 해당 숫자가 변경되어야 한다.
상수로 처리하거나, 로직을 변경하는 게 좋을 듯 하다
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
테스트 가능한 코드를 위해 NumberGenerator 인터페이스 추가
이렇게 인터페이스를 추상화해야 테스트에서 임의의 값을 생성할 수 있음
=> 그러나 추상화에 대한 이해가 잘 안됨 좀더 고민이 필요한듯..
=> 왜 interface로 선언해야하지? 최소한의 동일성을 위해?
현재 프로젝트가 너무 단순해서 필요성을 못 느껴서 그럴 수 있겠단 생각
요구사항이 많아질수록 인터페이스를 쓰는게 테스트하기 더 좋아지지 않을까
(테스트를 위해 전부 다시 선언하는건 너무 소모적이라?)
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@SongHanSol1140
인터페이스의 장점을 잘 생각하면 좋을 듯 하다. 이 경우 아래와 같이 사용했다. (네가, 일부는.)
이 경우 테스트 환경에만 존재하는 FixedNumberGenerator 를 Stub 이라고 하며, 인터페이스의 반환값이나 입력값이 변경되지 않는 한 해당 구현체도 변경 될 필요가 없다.
현재 구현에서는 "랜덤 넘버를 만든다" 자체를 테스트 하기가 어렵기 때문에 위와 같이 작성해야 했는데, 이 외에도 여러 장점이 있다.