Step3 - 볼링 점수판(리팩토링) 리뷰 요청드립니다. (#44)

* [step3] refactor : 브랜칭을 잘못하여 삭제되지 않은 step1의 클래스들 삭제

* [step3] refactor : List<Frame>을 Getter로 노출하지 않도록 수정

* [step3] refactor : Score 각 상태에 따른 팩토리 메서드 추가

* [step3] refactor : 추가된 Score 팩토리 메서드를 테스트 코드에 적용

* [step3] refactor : 자주 사용되는 Pins의 정적 팩토리 메서드 생성

* [step3] refactor : 호출될 때마다 인스턴스를 새로 만들지 않도록 FinalState 정적 팩토리 메서드 생성

Author: Integerous

src/main/java/domain/BowlingGame.java

@@ -39,8 +39,8 @@ public String getPlayerName() {
         return player.getName();
     }
 
-    public List<Frame> getFrames() {
-        return frames.getFrames();
+    public Frame getFirstFrame() {
+        return frames.getFirstFrame();
     }
 
     public FrameResults getFrameResults() {

src/main/java/domain/Pins.java

@@ -6,6 +6,8 @@ public class Pins {
     static final String ALERT_OUT_OF_PINS_RANGE = "쓰러진 핀의 개수는 최소 0개에서 최대 10개 입니다.";
     public static final int STRIKE_PINS = 10;
     public static final int GUTTER_PINS = 0;
+    public static final Pins STRIKE = Pins.from(STRIKE_PINS);
+    public static final Pins GUTTER = Pins.from(GUTTER_PINS);
 
     private final int fallenPins;
 

src/main/java/domain/Score.java

@@ -1,12 +1,12 @@
 package domain;
 
-import domain.frame.FrameResult;
-
 import java.util.Objects;
 
-import static domain.frame.FrameResult.UNFINISHED_SCORE;
+import static domain.Pins.STRIKE_PINS;
 
 public class Score {
+    private static final int DEFAULT_SCORE = 0;
+    public static final int UNFINISHED_SCORE = -1;
 
     private int score;
     private int remainingAddition;
@@ -20,6 +20,26 @@ public static Score of(int score, int remainingAddition) {
         return new Score(score, remainingAddition);
     }
 
+    public static Score ofDefault() {
+        return new Score(DEFAULT_SCORE, 0);
+    }
+
+    public static Score ofUnfinished() {
+        return new Score(UNFINISHED_SCORE, 0);
+    }
+
+    public static Score ofMiss(int sumOfPins) {
+        return new Score(sumOfPins, 0);
+    }
+
+    public static Score ofSpare() {
+        return new Score(STRIKE_PINS, 1);
+    }
+
+    public static Score ofStrike() {
+        return new Score(STRIKE_PINS, 2);
+    }
+
     public Score update(int newScore) {
         if (isFullyCalculated() || isUnfinishedScore(newScore)) {
             return this;

src/main/java/domain/frame/FinalFrame.java

@@ -68,7 +68,7 @@ public FrameIndex getIndex() {
 
     @Override
     public State getState() {
-        return new FinalState(states, bowlOrder);
+        return FinalState.of(states, bowlOrder);
     }
 
     @Override
@@ -78,17 +78,17 @@ public boolean isSameFrame(Frame targetFrame) {
 
     @Override
     public Score getScore() {
-        return new FinalState(states, bowlOrder).getScore();
+        return getState().getScore();
     }
 
     @Override
     public Score updateScore(Score score) {
-        return new FinalState(states, bowlOrder).updateScore(score);
+        return getState().updateScore(score);
     }
 
     @Override
     public FrameResult getResult() {
-        return FrameResult.of(new FinalState(states, bowlOrder), getScore());
+        return FrameResult.of(getState(), getScore());
     }
 
 }

src/main/java/domain/frame/FrameIndex.java

@@ -6,8 +6,8 @@ public class FrameIndex {
     static final String ALERT_INVALID_FRAME_NUMBER = "프레임 번호는 1부터 10까지만 허용됩니다.";
     static final int MINIMUM_FRAME_INDEX = 1;
     public static final int MAXIMUM_FRAME_INDEX = 10;
-    static final int SECOND_TO_LAST_INDEX = 9;
-    static final int INCREMENT_AMOUNT = 1;
+    private static final int SECOND_TO_LAST_INDEX = 9;
+    private static final int INCREMENT_AMOUNT = 1;
 
     private int frameIndex;
 
@@ -33,7 +33,7 @@ boolean isSameIndex(Frame targetFrame) {
     }
 
     private void validationFrameNumber(int frameNumber) {
-        if (frameNumber < MINIMUM_FRAME_INDEX || frameNumber > MAXIMUM_FRAME_INDEX) {
+        if ((frameNumber < MINIMUM_FRAME_INDEX) || (frameNumber > MAXIMUM_FRAME_INDEX)) {
             throw new IllegalArgumentException(ALERT_INVALID_FRAME_NUMBER);
         }
     }

src/main/java/domain/frame/FrameResult.java

@@ -3,8 +3,9 @@
 import domain.Score;
 import domain.state.State;
 
+import static domain.Score.UNFINISHED_SCORE;
+
 public class FrameResult {
-    public static final int UNFINISHED_SCORE = -1;
 
     private String state;
     private int score;

src/main/java/domain/frame/FrameResults.java

@@ -5,7 +5,7 @@
 import java.util.List;
 import java.util.stream.Collectors;
 
-import static domain.frame.FrameResult.UNFINISHED_SCORE;
+import static domain.Score.UNFINISHED_SCORE;
 
 public class FrameResults {
 

src/main/java/domain/frame/Frames.java

@@ -61,4 +61,8 @@ public FrameResults getResults() {
                 .map(Frame::getResult)
                 .collect(Collectors.toList()));
     }
+
+    public Frame getFirstFrame() {
+        return frames.get(0);
+    }
 }

src/main/java/domain/frame/NormalFrame.java

@@ -6,7 +6,6 @@
 import domain.state.State;
 
 import static domain.frame.FrameIndex.MINIMUM_FRAME_INDEX;
-import static domain.frame.FrameResult.UNFINISHED_SCORE;
 
 public class NormalFrame implements Frame {
 
@@ -80,7 +79,7 @@ public Score updateScore(Score score) {
             return updatedScore;
         }
         if (nextFrame == null) {
-            return Score.of(UNFINISHED_SCORE, 0);
+            return Score.ofUnfinished();
         }
         return nextFrame.updateScore(updatedScore);
     }