javajigi · May 12, 2018 · Apr 21, 2018 · May 10, 2018 · May 10, 2018 · May 11, 2018
diff --git a/build.gradle b/build.gradle
@@ -8,6 +8,10 @@ repositories {
     mavenCentral()
 }
 
+tasks.withType(JavaCompile) {
+    options.encoding = 'UTF-8'
+}
+
 dependencies {
     compile('com.sparkjava:spark-core:2.6.0')
     compile('com.sparkjava:spark-template-handlebars:2.5.5')

diff --git a/src/main/java/BowlingGameConsoleApp.java b/src/main/java/BowlingGameConsoleApp.java
@@ -1,23 +1,17 @@
+import domain.BowlingGame;
 import domain.frame.Frame;
 import domain.frame.NormalFrame;
 import view.InputView;
 import view.OutputView;
 
-import java.util.ArrayList;
-import java.util.List;
-
 public class BowlingGameConsoleApp {
+	private static BowlingGame bowlingGame;
+
 	public static void main(String[] args) {
-		String playerName = InputView.showGetPlayerNameView();
-		List<Frame> frames = new ArrayList<>();
-		Frame currentFrame;
+		bowlingGame = new BowlingGame(InputView.showGetPlayerNameView());
 		do {
-			int pinCount = InputView.showGetPinCountView(frames);
-			currentFrame = frames.isEmpty() ? new NormalFrame(pinCount) : frames.get(frames.size() - 1).bowl(pinCount);
-			if (!frames.contains(currentFrame)) {
-				frames.add(currentFrame);
-			}
-			OutputView.showStatusBoardView(playerName, frames);
-		} while(!currentFrame.isFinalFrame() || !currentFrame.isComplete());
+			bowlingGame.play(InputView.showGetPinCountView(bowlingGame.getFrames().getNextFrameNumber()));
+			OutputView.showStatusBoardView(bowlingGame);
+		} while(bowlingGame.canPlay());
 	}
 }
diff --git a/src/main/java/BowlingGameWebApp.java b/src/main/java/BowlingGameWebApp.java
@@ -28,7 +28,7 @@ public static void main(String[] args) {
             Map<String, Object> model = new HashMap<>();
             model.put("bowlingGames", bowlingGames);
             model.put("player", bowlingGames.get(playerIndex).getPlayerName());
-            model.put("currentFrameNumber", getCurrentFrameNumber());
+            model.put("nowFrameNumber", bowlingGames.get(playerIndex).getFrames().getNextFrameNumber());
             return render(model, "/play.html");
         });
 
@@ -38,15 +38,11 @@ public static void main(String[] args) {
             Map<String, Object> model = new HashMap<>();
             model.put("bowlingGames", bowlingGames);
             model.put("player", getNextPlayer());
-            model.put("currentFrameNumber", getCurrentFrameNumber());
+            model.put("nowFrameNumber", bowlingGames.get(playerIndex).getFrames().getNextFrameNumber());
             return render(model, "/play.html");
         });
     }
 
-    private static int getCurrentFrameNumber() {
-        return bowlingGames.get(playerIndex).getFrames().size() + 1;
-    }
-
     private static String getNextPlayer() {
         playerIndex = (playerIndex + 1) % bowlingGames.size();
         return bowlingGames.get(playerIndex).getPlayerName();

diff --git a/src/main/java/domain/BowlingGame.java b/src/main/java/domain/BowlingGame.java
@@ -1,32 +1,30 @@
 package domain;
 
 import domain.frame.Frame;
+import domain.frame.Frames;
 import domain.frame.NormalFrame;
 
-import java.util.ArrayList;
-import java.util.List;
-
 public class BowlingGame {
-    private List<Frame> frames;
     private String playerName;
+    private Frames frames;
 
     public BowlingGame(String playerName) {
         this.playerName = playerName;
-        this.frames = new ArrayList<>();
+        this.frames = new Frames();
     }
-
-    public List<Frame> getFrames() {
+    
+    public Frames getFrames() {
         return frames;
     }
 
     public String getPlayerName() {
         return playerName;
     }
 
-    public List<Frame> play(int pinCount) {
-        Frame currentFrame = frames.isEmpty() ? new NormalFrame(pinCount) : frames.get(frames.size() - 1).bowl(pinCount);
-        if (!frames.contains(currentFrame)) {
-            frames.add(currentFrame);
+    public Frames play(int pin) {
+        Frame nowFrame = frames.isEmpty() ? new NormalFrame(pin) : frames.getLast().bowl(pin);
+        if (!frames.contains(nowFrame)) {
+            frames.add(nowFrame);
         }
         return frames;
     }
@@ -36,7 +34,7 @@ public boolean canPlay() {
             return true;
         }
 
-        Frame lastFrame = frames.get(frames.size() - 1);
+        Frame lastFrame = frames.getLast();
         return !lastFrame.isFinalFrame() || !lastFrame.isComplete();
     }
 }
diff --git a/src/main/java/domain/PlayStatus.java b/src/main/java/domain/PlayStatus.java
diff --git a/src/main/java/domain/Score.java b/src/main/java/domain/Score.java
@@ -0,0 +1,55 @@
+package domain;
+
+import domain.pin.Pins;
+import domain.status.*;
+
+public class Score {
+	private int score;
+	private int canScoreCount;
+
+	public Score(int score, int canScoreCount) {
+		this.score = score;
+		this.canScoreCount = canScoreCount;
+	}
+
+	public static Score ofStatus(Status status, Pins pins) {
+		if (status.ofInstance(Strike.class)) {
+			return ofStrike();
+		}
+		if (status.ofInstance(Spare.class)) {
+			return ofSpare();
+		}
+		if (status.ofInstance(Gutter.class, None.class)) {
+			return new Score(pins.sum(), 1);
+		}
+		return ofNone(pins.sum());
+	}
+
+	public static Score ofNone(int score) {
+		return new Score(score, 0);
+	}
+
+	public static Score ofSpare() {
+		return new Score(10, 1);
+	}
+
+	public static Score ofStrike() {
+		return new Score(10, 2);
+	}
+
+	public int getScore() {
+		if(!getScoreFlag()) {
+			throw new IllegalStateException("점수를 구할 수 없는 상태인 프레임의 점수를 합산시도하였습니다.");
+		}
+
+		return score;
+	}
+
+	public Score next(int pin) {
+		return new Score(score + pin, canScoreCount - 1);
+	}
+
+	public boolean getScoreFlag() {
+		return canScoreCount == 0;
+	}
+}
diff --git a/src/main/java/domain/frame/FinalFrame.java b/src/main/java/domain/frame/FinalFrame.java
@@ -1,37 +1,35 @@
 package domain.frame;
 
-import domain.PlayStatus;
+import domain.Score;
+import domain.status.Spare;
+import domain.status.Strike;
 
 public class FinalFrame extends Frame {
-	public FinalFrame(int firstPitch) {
-		super(Frame.MAX_FRAME_NUMBER, firstPitch);
+	public FinalFrame(int firstPin) {
+		super(MAX_FRAME_NUMBER, firstPin);
 	}
 
 	@Override
 	public boolean isComplete() {
-		if (getPitches().has(3)) {
+		if (getPins().size() > 2) {
 			return true;
 		}
 
-		if (getPitches().has(2)) {
-			PlayStatus secondPitchStatus = getPitches().get(2).getStatus();
-			return PlayStatus.OPEN.equals(secondPitchStatus)
-					|| PlayStatus.MISS.equals(secondPitchStatus);
-		}
-
-		return false;
+		return getStatus().isComplete() && !getStatus().ofInstance(Spare.class, Strike.class);
+
 	}
 
 	@Override
-	public boolean getScoreFlag() {
-		return isComplete();
+	public Score getScore() {
+		if(isComplete()) {
+			return Score.ofNone(getPins().sum());
+		}
+
+		return Score.ofStatus(getStatus(), getPins());
 	}
-
+	
 	@Override
-	public int getScore() {
-		if (!getScoreFlag()) {
-			throw new IllegalStateException(getFrameNumber() + "프레임은 점수를 구할 수 없는 상태입니다.");
-		}
-		return getPitches().sum();
+	protected Score getScoreWith(Score beforeScore) {
+		return getPins().scoreWith(beforeScore);
 	}
 }
diff --git a/src/main/java/domain/frame/Frame.java b/src/main/java/domain/frame/Frame.java
@@ -1,19 +1,25 @@
 package domain.frame;
 
-import domain.PlayStatus;
-import domain.pitch.Pitches;
+import domain.Score;
+import domain.pin.Pin;
+import domain.pin.Pins;
+import domain.status.Spare;
+import domain.status.Status;
+import domain.status.Strike;
+
+import java.util.stream.Collectors;
 
 public abstract class Frame {
 	public static final int MIN_FRAME_NUMBER = 1;
 	public static final int MAX_FRAME_NUMBER = 10;
-
-	private Pitches pitches;
+	
+	private Pins pins;
 	private Frame nextFrame;
 	private int frameNumber;
 
-	public Frame(int frameNumber, int firstPitch) {
+	public Frame(int frameNumber, int firstPin) {
 		this.frameNumber = frameNumber;
-		this.pitches = new Pitches(firstPitch);
+		this.pins = new Pins(firstPin);
 	}
 
 	public Frame getNextFrame() {
@@ -24,12 +30,16 @@ public boolean hasNextFrame() {
 		return nextFrame != null;
 	}
 
+	public Pins getPins() {
+		return pins;
+	}
+
 	public int getFrameNumber() {
 		return frameNumber;
 	}
 
-	public Pitches getPitches() {
-		return pitches;
+	public Status getStatus() {
+		return pins.getLastStatus();
 	}
 
 	public abstract boolean isComplete();
@@ -38,31 +48,33 @@ public boolean isFinalFrame() {
 		return frameNumber == MAX_FRAME_NUMBER;
 	}
 
-	public Frame bowl(int pinCount) {
+	public Frame bowl(int pin) {
 		if (isComplete()) {
-			return createNextFrame(pinCount);
+			return createNextFrame(pin);
 		}
 
-		pitches.add(pinCount);
+		pins.add(pin);
 		return this;
 	}
 
-	protected Frame createNextFrame(int firstPitch) {
+	protected Frame createNextFrame(int firstPin) {
 		if (frameNumber == MAX_FRAME_NUMBER) {
 			throw new IllegalArgumentException("마지막 프레임 이후에는 프레임을 생성할 수 없습니다.");
 		}
 
 		if (frameNumber < MAX_FRAME_NUMBER - 1) {
-			return nextFrame = new NormalFrame(frameNumber + 1, firstPitch);
+			return nextFrame = new NormalFrame(frameNumber + 1, firstPin);
 		}
-		return nextFrame = new FinalFrame(firstPitch);
+		return nextFrame = new FinalFrame(firstPin);
 	}
-
-	public PlayStatus getStatus() {
-		return pitches.getLast().getStatus();
+
+	public String getDisplayStatus() {
+		return pins.stream()
+				.map(Pin::getStatus)
+				.map(Status::display)
+				.collect(Collectors.joining("|"));
 	}
 
-	public abstract boolean getScoreFlag();
-
-	public abstract int getScore();
+	public abstract Score getScore();
+	protected abstract Score getScoreWith(Score score);
 }