[정승연] 연료 주입, 블랙잭 (Step1) by seungyeon-1231 · Pull Request #27 · next-step/java-blackjack

seungyeon-1231 · 2022-02-17T10:14:32Z

안녕하세요 리뷰어님 😄
연료 주입, 블랙잭 미션 제출합니다.
리뷰 잘 부탁드립니다. 감사합니다!

Co-authored-by: seungyeonjeong <crowsy@naver.com> Co-authored-by: YuYangWoo <yuyw0712@naver.com>

1. RentCompany create 메서드 구현 2. 자동차를 추가하는 addCar 메서드 구현 3. 차량별로 주입해야 할 연료를 가진 generateReport 메서드 구현 Co-authored-by: seungyeonjeong <crowsy@naver.com> Co-authored-by: YuYangWoo <yuyw0712@naver.com>

Co-authored-by: seungyeonjeong <crowsy@naver.com> Co-authored-by: YuYangWoo <yuyw0712@naver.com>

1. 스페이드, 하트, 다이아몬드, 클로버 Co-authored-by: seungyeonjeong <crowsy@naver.com> Co-authored-by: YuYangWoo <yuyw0712@naver.com>

1. 카드를 생성하는 테스트 코드 구현 Co-authored-by: seungyeonjeong <crowsy@naver.com> Co-authored-by: YuYangWoo <yuyw0712@naver.com>

Co-authored-by: seungyeonjeong <crowsy@naver.com> Co-authored-by: YuYangWoo <yuyw0712@naver.com>

1. 초기에 카드는 섞여서 2개가 주어진다. Co-authored-by: seungyeonjeong <crowsy@naver.com> Co-authored-by: YuYangWoo <yuyw0712@naver.com>

1. 카드를 제공받고 중복 삭제를 위해 2개를 지워준다. Co-authored-by: seungyeonjeong <crowsy@naver.com> Co-authored-by: YuYangWoo <yuyw0712@naver.com>

Co-authored-by: seungyeonjeong <crowsy@naver.com> Co-authored-by: YuYangWoo <yuyw0712@naver.com>

Co-authored-by: seungyeonyeong <crowsy@naver.com> Co-authored-by: YuYangWoo <yuyw0712@naver.com>

1. MatchResult enum class 생성으로 매치 결과를 계산하게끔 구현 2. MatchResultBoard player와 dealer의 결과를 가지는 map 클래스 구현 3. 플레이어와 딜러의 score를 가지는 클래스 구현 4. 코드 리팩토링에 따른 메소드 추가 및 리팩토링 Co-authored-by: seungyeonyeong <crowsy@naver.com> Co-authored-by: YuYangWoo <yuyw0712@naver.com>

Co-authored-by: seungyeonyeong <crowsy@naver.com> Co-authored-by: YuYangWoo <yuyw0712@naver.com>

1. 카드의 합을 계산하는 로직 2. card와 이름을 super를 사용해 Gamer에서 초기화 Co-authored-by: seungyeonjeong <crowsy@naver.com> Co-authored-by: YuYangWoo <yuyw0712@naver.com>

1. isBlackJack 코드 위임 2. isBust 코드 위임 Co-authored-by: seungyeonjeong <crowsy@naver.com> Co-authored-by: YuYangWoo <yuyw0712@naver.com>

Co-authored-by: seungyeonjeong <crowsy@naver.com> Co-authored-by: YuYangWoo <yuyw0712@naver.com>

1. 모든_게이머는_처음에_2장의_카드를_받는다 2. 플레이어의_카드_총합을_계산한다 3. ACE는_1이나_11로_계산될_수_있다 4. 플레이어는_카드를_한_장더_받을_수_있다 Co-authored-by: seungyeonjeong <crowsy@naver.com> Co-authored-by: YuYangWoo <yuyw0712@naver.com>

1. 카드의_총합이_21이면_블랙잭이다 2. 카드의_총합이_21을_넘으면_버스트이다 Co-authored-by: seungyeonjeong <crowsy@naver.com> Co-authored-by: YuYangWoo <yuyw0712@naver.com>

1. 플레이어가_딜러랑_카드합이_같으면_무승부다 2. 플레이어가_딜러보다_카드합이_크면_승리한다 3. 플레이어가_딜러보다_카드합이_작으면_패배한다 Co-authored-by: seungyeonjeong <crowsy@naver.com> Co-authored-by: YuYangWoo <yuyw0712@naver.com>

Co-authored-by: seungyeonjeong <crowsy@naver.com> Co-authored-by: YuYangWoo <yuyw0712@naver.com>

1. 초기에_카드는_섞여서_2개가_주어진다() 2. 두_카드의_합이_16_이하일_경우_카드를_추가로_한장_받는다() 3. 두_카드의_합이_16_초과일_경우_카드를_추가로_받지_않는다() Co-authored-by: seungyeonjeong <crowsy@naver.com> Co-authored-by: YuYangWoo <yuyw0712@naver.com>

Co-authored-by: seungyeonjeong <crowsy@naver.com> Co-authored-by: YuYangWoo <yuyw0712@naver.com>

vsh123

승연님 안녕하세요!
블랙잭 미션 잘 구현해주셨네요 :)

몇가지 코멘트를 남겼으니 확인부탁드리겠습니다!

vsh123 · 2022-02-18T08:41:48Z

README.md

-# java-blackjack
+# java-blackjack
+
+# 연료주입


기능 구현 목록 작성 👍

vsh123 · 2022-02-18T08:42:08Z

src/main/java/fuel/domain/Sonata.java

+    private static final int FUEL_EFFICIENCY = 10;
+
+    public Sonata(final double distance) {
+       super(distance, "Sonata");


매직넘버를 상수화 해주면 어떨까요?! 다른 객체들도 한번씩 살펴봐주시면 좋을 것 같아요 :)

vsh123 · 2022-02-18T08:43:45Z

src/main/java/fuel/domain/RentCompany.java

+public class RentCompany {
+    private static final String NEWLINE = System.getProperty("line.separator");
+
+    private final List<Car> carLists = new ArrayList<>();


List라는 특정 Collection명은 제거해주는게 어떨까요? cars로도 의미가 충분해보여요!

Suggested change

private final List<Car> carLists = new ArrayList<>();

private final List<Car> cars = new ArrayList<>();

vsh123 · 2022-02-18T08:44:34Z

src/main/java/fuel/domain/RentCompany.java

+    private final List<Car> carLists = new ArrayList<>();
+
+    public static RentCompany create() {
+        return new RentCompany();


create()를 통해서만 생성이 가능하게하려면, 기본 생성자의 접근제한자를 private으로 선언해보면 어떨까요?

vsh123 · 2022-02-18T08:45:50Z

src/main/java/fuel/domain/Car.java

+    }
+
+    protected double getChargeQuantity() {
+        return getTripDistance() / getDistancePerLiter();


getTripDistance()메서드를 호춣하는 것보다 distance를 바로 호출해보면 어떨까요?

vsh123 · 2022-02-18T08:53:01Z

src/main/java/blackjack/controller/GameLauncher.java

+
+    private static final int BLACK_JACK_SUM_LIMIT = 21;
+
+    public void start() {


메서드가 10 line을 넘어가는 것 같아요!!
아래의 요구사항을 지켜보면 어떨까요?

함수(또는 메서드)의 길이가 10라인을 넘어가지 않도록 구현한다.
함수(또는 메소드)가 한 가지 일만 하도록 최대한 작게 만들어라.

vsh123 · 2022-02-18T08:53:48Z

src/main/java/blackjack/controller/GameLauncher.java

+        OutputView.printDealerCardSum(dealer);
+        OutputView.printPlayerCardSum(players);


두번의 View호출을 한번으로 줄일 수 없을까요?

View호출이 Console이아닌 Network기반이라면 Network비용이 더 소모될 것 같아요!

vsh123 · 2022-02-18T08:55:47Z

src/main/java/blackjack/domain/gamer/Players.java

+public class Players {
+
+    private final List<Player> players = new ArrayList<>();
+    private final String[] playerNames;


해당 필드는 생성 이후 쓰이지 않는데요! 들고있을 필요가 있을까요?

vsh123 · 2022-02-18T08:57:43Z

src/main/java/blackjack/domain/gamer/Players.java

+                Collectors.toMap(player -> player, player -> player.getMatchResult(player, dealer),
+                    (player1, player2) -> player1, LinkedHashMap::new)));


이 경우에는 동일한 Player가 있을 경우 mergeFunction을 수행하는 것이 아닌, 에러를 발생시켜야할 것 같은데요! 어떻게 생각하시나요?(동일한 Player가 존재할 수 있나요?)

아래와 같이 작성이 가능합니다!

Suggested change

Collectors.toMap(player -> player, player -> player.getMatchResult(player, dealer),

(player1, player2) -> player1, LinkedHashMap::new)));

Collectors.toMap(Function.identity(), player -> player.getMatchResult(player, dealer),

(player1, player2) -> player1, LinkedHashMap::new)));

vsh123 · 2022-02-18T08:59:03Z

src/main/java/blackjack/domain/gamer/Gamer.java

+        for(Card card : cards) {
+            this.cards.add(card);
+        }


addAll을 이용해보면 어떨까요?

Suggested change

for(Card card : cards) {

this.cards.add(card);

}

this.cards.addAll(cards);

seungyeon-1231 and others added 30 commits February 11, 2022 16:58

docs: 연료 주입 기능 요구사항 정리

d6b0d2f

Co-authored-by: seungyeonjeong <crowsy@naver.com> Co-authored-by: YuYangWoo <yuyw0712@naver.com>

feat: InputView, OutputView 코드 작성

c8876cf

Co-authored-by: seungyeonjeong <crowsy@naver.com> Co-authored-by: YuYangWoo <yuyw0712@naver.com>

feat: 자동차들이 상속받을 수 있는 Car 클래스 구현

8d9dd7e

Co-authored-by: seungyeonjeong <crowsy@naver.com> Co-authored-by: YuYangWoo <yuyw0712@naver.com>

feat: 자동차를 상속 받는 자동차 객체를 구현

cf23f3a

Co-authored-by: seungyeonjeong <crowsy@naver.com> Co-authored-by: YuYangWoo <yuyw0712@naver.com>

feat: 연료 주입을 위한 Application 구현

39a00f8

Co-authored-by: seungyeonjeong <crowsy@naver.com> Co-authored-by: YuYangWoo <yuyw0712@naver.com>

docs: 기능요구사항 기능 구현 완료

d2c8c91

Co-authored-by: seungyeonjeong <crowsy@naver.com> Co-authored-by: YuYangWoo <yuyw0712@naver.com>

docs: Blackjack 기능 요구사항 정리

c4260e9

Co-authored-by: seungyeonjeong <crowsy@naver.com> Co-authored-by: YuYangWoo <yuyw0712@naver.com>

feat: 카드의 종류를 나타내는 Denomination Enum class로 구현

3f8e6f7

Co-authored-by: seungyeonjeong <crowsy@naver.com> Co-authored-by: YuYangWoo <yuyw0712@naver.com>

test: 카드의 종류를 나타내는 Denomination 테스트코드 구현

d2d00e6

Co-authored-by: seungyeonjeong <crowsy@naver.com> Co-authored-by: YuYangWoo <yuyw0712@naver.com>

feat: OutputView.java 출력을 담당하는 View 구현

6d980da

Co-authored-by: seungyeonjeong <crowsy@naver.com> Co-authored-by: YuYangWoo <yuyw0712@naver.com>

feat: InputView.java 입력을 담당하는 View 구현

de5e6c6

Co-authored-by: seungyeonjeong <crowsy@naver.com> Co-authored-by: YuYangWoo <yuyw0712@naver.com>

feat: 카드의 종류를 나타내는 Suit Enum class 구현

5125c16

1. 스페이드, 하트, 다이아몬드, 클로버 Co-authored-by: seungyeonjeong <crowsy@naver.com> Co-authored-by: YuYangWoo <yuyw0712@naver.com>

test: Denomination과 suit을 사용해 CardTest 구현

4770d77

1. 카드를 생성하는 테스트 코드 구현 Co-authored-by: seungyeonjeong <crowsy@naver.com> Co-authored-by: YuYangWoo <yuyw0712@naver.com>

feat: Card.java denomination와 suit을 상태로 가지는 객체 생성

787ac1d

Co-authored-by: seungyeonjeong <crowsy@naver.com> Co-authored-by: YuYangWoo <yuyw0712@naver.com>

feat: Denomination 카드의 이름과 값을 가지도록 enum class 수정

b97be07

Co-authored-by: seungyeonjeong <crowsy@naver.com> Co-authored-by: YuYangWoo <yuyw0712@naver.com>

test: CardsTest.java 모든 카드를 출력하는 테스트 코드 작성

849b9b1

Co-authored-by: seungyeonjeong <crowsy@naver.com> Co-authored-by: YuYangWoo <yuyw0712@naver.com>

feat: Cards.java static 필드로 모든 카드 추가

940fb0e

Co-authored-by: seungyeonjeong <crowsy@naver.com> Co-authored-by: YuYangWoo <yuyw0712@naver.com>

test: PlayerTest 플레이어 테스트 코드 구현

001161e

1. 초기에 카드는 섞여서 2개가 주어진다. Co-authored-by: seungyeonjeong <crowsy@naver.com> Co-authored-by: YuYangWoo <yuyw0712@naver.com>

feat: player는 초기에 카드가 섞여서 2개씩 주어진다.

4ae4e68

1. 카드를 제공받고 중복 삭제를 위해 2개를 지워준다. Co-authored-by: seungyeonjeong <crowsy@naver.com> Co-authored-by: YuYangWoo <yuyw0712@naver.com>

feat: Players의 이름을 받아 List<Player>를 구현

b505c92

Co-authored-by: seungyeonjeong <crowsy@naver.com> Co-authored-by: YuYangWoo <yuyw0712@naver.com>

docs: 기능요구사항 반항 사항 반영

b5c3814

Co-authored-by: seungyeonjeong <crowsy@naver.com> Co-authored-by: YuYangWoo <yuyw0712@naver.com>

feat: 딜러와 플레이어가 상속하는 Gamer 클래스 구현

c74faa9

Co-authored-by: seungyeonjeong <crowsy@naver.com> Co-authored-by: YuYangWoo <yuyw0712@naver.com>

feat: 게임의 딜러를 구현하는 클래스 구현

81d8921

Co-authored-by: seungyeonjeong <crowsy@naver.com> Co-authored-by: YuYangWoo <yuyw0712@naver.com>

feat: 겹치는 코드 상속으로 중복 제거

dcd8f4b

Co-authored-by: seungyeonjeong <crowsy@naver.com> Co-authored-by: YuYangWoo <yuyw0712@naver.com>

feat: 딜러와 플레이의 상태를 출력하는 코드 구현

7a1bf32

Co-authored-by: seungyeonjeong <crowsy@naver.com> Co-authored-by: YuYangWoo <yuyw0712@naver.com>

feat: 플레이어가 카드를 더 받는 로직 Gamer.java에 구현

04e744a

Co-authored-by: seungyeonjeong <crowsy@naver.com> Co-authored-by: YuYangWoo <yuyw0712@naver.com>

feat: Player가 가진 카드의 합을 반환하는 로직 구현

4dd6ddb

Co-authored-by: seungyeonjeong <crowsy@naver.com> Co-authored-by: YuYangWoo <yuyw0712@naver.com>

feat: 플레이어가 카드를 더 받을지 안받을지 로직 구현

2a4894c

Co-authored-by: seungyeonjeong <crowsy@naver.com> Co-authored-by: YuYangWoo <yuyw0712@naver.com>

feat: dealer와 player의 cardSum 구하는 코드 구현

015ea73

Co-authored-by: seungyeonjeong <crowsy@naver.com> Co-authored-by: YuYangWoo <yuyw0712@naver.com>

YuYangWoo and others added 26 commits February 15, 2022 22:39

feat: 딜러와 플레이어의 gameResult를 구하는 로직

9edf9ed

Co-authored-by: seungyeonjeong <crowsy@naver.com> Co-authored-by: YuYangWoo <yuyw0712@naver.com>

feat: 게임의 결과를 구하고 카드의 합을 구하는 출력문 구현

97e6457

Co-authored-by: seungyeonyeong <crowsy@naver.com> Co-authored-by: YuYangWoo <yuyw0712@naver.com>

feat: Ace는 예외로 1이나 11로 계산할 수 있는 코드 로직 구현 - Player

2c2d980

Co-authored-by: seungyeonyeong <crowsy@naver.com> Co-authored-by: YuYangWoo <yuyw0712@naver.com>

refactor: Ace가 있을 경우 계산하는 로직 리팩토링

27c5f3f

Co-authored-by: seungyeonyeong <crowsy@naver.com> Co-authored-by: YuYangWoo <yuyw0712@naver.com>

refactor: 메서드 네이밍 수정

2d05151

Co-authored-by: seungyeonyeong <crowsy@naver.com> Co-authored-by: YuYangWoo <yuyw0712@naver.com>

refactor: 딜러와 플레이어의 승, 패 로직 구현

7ca8326

Co-authored-by: seungyeonyeong <crowsy@naver.com> Co-authored-by: YuYangWoo <yuyw0712@naver.com>

refactor: 메서드 코드 간격 수정

cde826e

Co-authored-by: seungyeonyeong <crowsy@naver.com> Co-authored-by: YuYangWoo <yuyw0712@naver.com>

refactor: 중복되는 코드를 Car.class로 위임

317b7dc

Co-authored-by: seungyeonyeong <crowsy@naver.com> Co-authored-by: YuYangWoo <yuyw0712@naver.com>

refactor: 패키지 구조 변경

2019fc6

Co-authored-by: seungyeonyeong <crowsy@naver.com> Co-authored-by: YuYangWoo <yuyw0712@naver.com>

refactor: player와 dealer의 중복된 코드를 Gamer로 위임

0e6fe11

1. 카드의 합을 계산하는 로직 2. card와 이름을 super를 사용해 Gamer에서 초기화 Co-authored-by: seungyeonjeong <crowsy@naver.com> Co-authored-by: YuYangWoo <yuyw0712@naver.com>

refactor: 중복된 코드 Gamer에 위임

8dfac2c

1. isBlackJack 코드 위임 2. isBust 코드 위임 Co-authored-by: seungyeonjeong <crowsy@naver.com> Co-authored-by: YuYangWoo <yuyw0712@naver.com>

refactor: 생성자 네이밍 변경

9bf6d84

Co-authored-by: seungyeonjeong <crowsy@naver.com> Co-authored-by: YuYangWoo <yuyw0712@naver.com>

refactor: Gamer를 이용한 일급객체 초기화

f7fa94e

Co-authored-by: seungyeonjeong <crowsy@naver.com> Co-authored-by: YuYangWoo <yuyw0712@naver.com>

refactor: Gamer를 이용한 일급객체 초기화 - Gamer Player

c6ae257

Co-authored-by: seungyeonjeong <crowsy@naver.com> Co-authored-by: YuYangWoo <yuyw0712@naver.com>

refactor: LinkedHashMap을 사용해 결과 순서보장

fe72065

Co-authored-by: seungyeonjeong <crowsy@naver.com> Co-authored-by: YuYangWoo <yuyw0712@naver.com>

test: 모든 카드는 52장이다.

ebf319e

Co-authored-by: seungyeonjeong <crowsy@naver.com> Co-authored-by: YuYangWoo <yuyw0712@naver.com>

test: GamerTest.java 에 Gamer에 대한 테스트 로직 구현

12d9584

1. 카드의_총합이_21이면_블랙잭이다 2. 카드의_총합이_21을_넘으면_버스트이다 Co-authored-by: seungyeonjeong <crowsy@naver.com> Co-authored-by: YuYangWoo <yuyw0712@naver.com>

refactor: 방어적 복사 적용

41acbdf

Co-authored-by: seungyeonjeong <crowsy@naver.com> Co-authored-by: YuYangWoo <yuyw0712@naver.com>

refactor: Dealer.java 16이하면 카드를 더받는 로직 Dealer에 책임 위임

8f65321

Co-authored-by: seungyeonjeong <crowsy@naver.com> Co-authored-by: YuYangWoo <yuyw0712@naver.com>

fix: 카드가 중복이 되는 경우 이슈 해결

69de10d

Co-authored-by: seungyeonjeong <crowsy@naver.com> Co-authored-by: YuYangWoo <yuyw0712@naver.com>

refactor: 코드 정렬 및 final 추가

0d305fe

Co-authored-by: seungyeonjeong <crowsy@naver.com> Co-authored-by: YuYangWoo <yuyw0712@naver.com>

refactor: 코드 정렬 및 final 추가

397f22e

Co-authored-by: seungyeonjeong <crowsy@naver.com> Co-authored-by: YuYangWoo <yuyw0712@naver.com>

vsh123 requested changes Feb 18, 2022

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[정승연] 연료 주입, 블랙잭 (Step1)#27

[정승연] 연료 주입, 블랙잭 (Step1)#27
seungyeon-1231 wants to merge 56 commits intonext-step:seungyeonjeongfrom
seungyeon-1231:step1

seungyeon-1231 commented Feb 17, 2022

Uh oh!

vsh123 left a comment

Uh oh!

vsh123 Feb 18, 2022

Uh oh!

vsh123 Feb 18, 2022

Uh oh!

vsh123 Feb 18, 2022

Uh oh!

vsh123 Feb 18, 2022

Uh oh!

vsh123 Feb 18, 2022

Uh oh!

vsh123 Feb 18, 2022

Uh oh!

vsh123 Feb 18, 2022

Uh oh!

vsh123 Feb 18, 2022

Uh oh!

vsh123 Feb 18, 2022

Uh oh!

vsh123 Feb 18, 2022 •

edited

Loading

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

	private final List<Car> carLists = new ArrayList<>();
	private final List<Car> cars = new ArrayList<>();


		private static final int BLACK_JACK_SUM_LIMIT = 21;

		public void start() {

		OutputView.printDealerCardSum(dealer);
		OutputView.printPlayerCardSum(players);

		Collectors.toMap(player -> player, player -> player.getMatchResult(player, dealer),
		(player1, player2) -> player1, LinkedHashMap::new)));

Conversation

seungyeon-1231 commented Feb 17, 2022

Uh oh!

vsh123 left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

vsh123 Feb 18, 2022 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

vsh123 Feb 18, 2022 •

edited

Loading