From 08850b15afe3080547115f9eaba49bb2e7c17c7b Mon Sep 17 00:00:00 2001
From: soongjamm <kimstz0303@gmail.com>
Date: Sat, 19 Dec 2020 13:14:04 +0900
Subject: [PATCH 01/24] =?UTF-8?q?docs(readme.md):=20=EA=B5=AC=ED=98=84=20?=
 =?UTF-8?q?=EA=B8=B0=EB=8A=A5=20=EB=AA=A9=EB=A1=9D=20=EC=9E=91=EC=84=B1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.md | 273 +++++-------------------------------------------------
 1 file changed, 25 insertions(+), 248 deletions(-)

diff --git a/README.md b/README.md
index d6299154c..3bf59a2b6 100644
--- a/README.md
+++ b/README.md
@@ -3,251 +3,28 @@
 
 <br>
 
-## 🚀 기능 요구사항
-
-> 프리코스 3주차 미션에서 사용한 코드를 참고해도 무관하다. 
-
-### 초기 설정 
-- 프로그램 시작 시 역, 노선, 구간 정보를 초기 설정 해야 한다.
-- 거리와 소요 시간은 양의 정수이며 단위는 km와 분을 의미한다.
-- 아래의 사전 등록 정보로 반드시 초기 설정을 한다.
-
-```
- 1. 지하철역으로 교대역, 강남역, 역삼역, 남부터미널역, 양재역, 양재시민의숲역, 매봉역이 등록되어 있다.
- 2. 지하철 노선으로 2호선, 3호선, 신분당선이 등록되어 있다.
- 3. 노선에 역이 아래와 같이 등록되어 있다.(왼쪽 끝이 상행 종점)
-   - 2호선: 교대역 - ( 2km / 3분 ) - 강남역 - ( 2km / 3분 ) - 역삼역
-   - 3호선: 교대역 - ( 3km / 2분 ) - 남부터미널역 - ( 6km / 5분 ) - 양재역 - ( 1km / 1분 ) - 매봉역
-   - 신분당선: 강남역 - ( 2km / 8분 ) - 양재역 - ( 10km / 3분 ) - 양재시민의숲역
- ```
-  
-### 경로 조회 기능
-- 출발역과 도착역을 입력받아 경로를 조회한다.
-- 경로 조회 시 총 거리, 총 소요 시간도 함께 출력한다.
-- 경로 조회 기준은 `최단 거리` `최소 시간`이 있다.
-
-### 예외 처리
-- 경로 조회 시 출발역과 도착역이 같으면 에러를 출력한다.
-- 경로 조회 시 출발역과 도착역이 연결되어 있지 않으면 에러를 출력한다.
-- 그 외 정상적으로 프로그램이 수행되지 않은 경우 에러를 출력한다.
-
-<br>
-
-## ✍🏻 입출력 요구사항
-- `프로그래밍 실행 결과 예시`와 동일하게 입출력을 구현한다.
-- 기대하는 출력 결과는 `[INFO]`를 붙여서 출력한다. 출력값의 형식은 예시와 동일하게 한다.
-- 에러 발생 시 `[ERROR]`를 붙여서 출력한다. 에러의 문구는 자유롭게 작성한다.
-
-### 💻 프로그래밍 실행 결과 예시
-#### 경로 조회
-```
-## 메인 화면
-1. 경로 조회
-Q. 종료
-
-## 원하는 기능을 선택하세요.
-1
-
-## 경로 기준
-1. 최단 거리
-2. 최소 시간
-B. 돌아가기
-
-## 원하는 기능을 선택하세요.
-1
-
-## 출발역을 입력하세요.
-교대역
-
-## 도착역을 입력하세요.
-양재역
-
-## 조회 결과
-[INFO] ---
-[INFO] 총 거리: 6km
-[INFO] 총 소요 시간: 14분
-[INFO] ---
-[INFO] 교대역
-[INFO] 강남역
-[INFO] 양재역
-
-## 메인 화면
-1. 경로 조회
-Q. 종료
-
-...
-```
-
-#### 에러 출력 예시
-
-```
-## 메인 화면
-1. 경로 조회
-Q. 종료
-
-## 원하는 기능을 선택하세요.
-1
-
-## 경로 기준
-1. 최단 거리
-2. 최소 시간 
-B. 돌아가기
-
-## 원하는 기능을 선택하세요.
-1
-
-## 출발역을 입력하세요.
-강남역
-
-## 도착역을 입력하세요.
-강남역
-
-[ERROR] 출발역과 도착역이 동일합니다.
-
-## 경로 기준
-1. 최단 거리
-2. 최소 시간 
-B. 돌아가기
-
-## 원하는 기능을 선택하세요.
-
-...
-
-```
-
-<br>
-
-## 🎱 프로그래밍 요구사항
-- 자바 코드 컨벤션을 지키면서 프로그래밍한다.
-  - 기본적으로 [Google Java Style Guide](https://google.github.io/styleguide/javaguide.html)을 원칙으로 한다.
-  - 단, 들여쓰기는 '2 spaces'가 아닌 '4 spaces'로 한다.
-- indent(인덴트, 들여쓰기) depth를 3이 넘지 않도록 구현한다. 2까지만 허용한다.
-  - 예를 들어 while문 안에 if문이 있으면 들여쓰기는 2이다.
-  - 힌트: indent(인덴트, 들여쓰기) depth를 줄이는 좋은 방법은 함수(또는 메소드)를 분리하면 된다.
-- 3항 연산자를 쓰지 않는다.
-- 함수(또는 메소드)의 길이가 15라인을 넘어가지 않도록 구현한다.
-  - 함수(또는 메소드)가 한 가지 일만 잘 하도록 구현한다.
-- else 예약어를 쓰지 않는다.
-  - 힌트: if 조건절에서 값을 return하는 방식으로 구현하면 else를 사용하지 않아도 된다.
-  - else를 쓰지 말라고 하니 switch/case로 구현하는 경우가 있는데 switch/case도 허용하지 않는다.
-- 프로그래밍 요구사항에서 별도로 변경 불가 안내가 없는 경우 파일 수정과 패키지 이동을 자유롭게 할 수 있다.
-- 예외 상황 시 에러 문구를 출력해야 한다. 단, 에러 문구는 `[ERROR]` 로 시작해야 한다.
-
-### 프로그래밍 요구사항 - Application
-- Application 클래스를 활용해 구현해야 한다.
-- Application의 패키지 구조는 변경하지 않는다.
-- Application 클래스에 있는 Scanner를 사용하고 별도의 Scanner 객체를 만들지 않는다.
-```java
-public class Application {
-    public static void main(String[] args) {
-        final Scanner scanner = new Scanner(System.in);
-        ...
-    }
-}
-```
-
-### 프로그래밍 요구사항 - Station, Line
-- Station, Line 클래스를 활용하여 지하철역과 노선을 구현해야 한다.
-- 제공하는 각 클래스의 기본 생성자를 추가할 수 없다.
-- 필드(인스턴스 변수)인 name의 접근 제어자 private을 변경할 수 없다.
-- 가능하면 setter 메소드(ex. setXXX)를 추가하지 않고 구현한다.
- 
-```java
-public class Station {
-    private String name;
-
-    public Station(String name) {
-        this.name = name;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    // 추가 기능 구현
-}
-
-```
-
-### 프로그래밍 요구사항 - StationRepository, LineRepository
-- Station과 Line의 상태를 저장할 수 있는 StationRepository, LineRepository를 제공한다.
-- 필요 시 StationRepository, LineRepository 이 외 추가로 Repository를 만들 수 있다.
-- 추가로 생성되는 객체에 대해서 XXXRepository 네이밍으로 저장 클래스를 추가한다.
-- 객체들의 상태를 관리하기 위해서 XXXRepository 클래스를 활용해 저장 로직을 구현해야 한다.
-- 작성된 메서드는 수정할 수 없고, 필요에 따라 메서드를 자유롭게 추가할 수 있다.
- 
-```java
-public class StationRepository {
-    private static final List<Station> stations = new ArrayList<>();
-
-    public static List<Station> stations() {
-        return Collections.unmodifiableList(stations);
-    }
-
-    public static void addStation(Station station) {
-        stations.add(station);
-    }
-
-    public static boolean deleteStation(String name) {
-        return stations.removeIf(station -> Objects.equals(station.getName(), name));
-    }
-
-    public static void deleteAll() {
-        stations.clear();
-    }
-}
-```
-
-<br>
-
-## ❗️힌트
-### 최단 경로 라이브러리
-- jgrapht 라이브러리를 활용하면 간편하게 최단거리를 조회할 수 있음
-- Dijkstra 알고리즘을 반드시 이해할 필요는 없고 미션에 적용할 정도로만 이해하면 됨
-- JGraphtTest 클래스의 테스트를 활용하여 미션에 필요한 라이브러리의 기능을 학습할 수 있음 
-- 정점(vertex)과 간선(edge), 그리고 가중치 개념을 이용
-  - 정점: 지하철역
-  - 간선: 지하철역 연결정보
-  - 가중치: 거리 or 소요 시간
-- 최단 거리 기준 조회 시 가중치를 거리로 설정
-
-```java
-@Test
-public void getDijkstraShortestPath() {
-    WeightedMultigraph<String, DefaultWeightedEdge> graph
-            = new WeightedMultigraph(DefaultWeightedEdge.class);
-    graph.addVertex("v1");
-    graph.addVertex("v2");
-    graph.addVertex("v3");
-    graph.setEdgeWeight(graph.addEdge("v1", "v2"), 2);
-    graph.setEdgeWeight(graph.addEdge("v2", "v3"), 2);
-    graph.setEdgeWeight(graph.addEdge("v1", "v3"), 100);
-
-    DijkstraShortestPath dijkstraShortestPath = new DijkstraShortestPath(graph);
-    List<String> shortestPath = dijkstraShortestPath.getPath("v3", "v1").getVertexList();
-
-    assertThat(shortestPath.size()).isEqualTo(3);
-}
-```
-
-#### 테스트 설명
-
-<img src="image/dijkstra-sample.png" width=400>
-
-- 역 사이의 거리를 고려하지 않는 경우 V1->V3 경로가 최단 경로
-- 역 사이의 거리를 고려할 경우 V1->V3 경로의 거리는 100km, V1->V2->V3 경로의 거리는 4km이므로 최단 경로는 V1->V2->V3
-
-<br>
-
-## 📈 진행 요구사항
-- 미션은 [java-subway-path-precourse 저장소](https://github.com/woowacourse/java-subway-path-precourse) 를 fork/clone해 시작한다.
-- 기능을 구현하기 전에 java-subway-path-precourse/docs/README.md 파일에 구현할 기능 목록을 정리해 추가한다.
-- git의 commit 단위는 앞 단계에서 README.md 파일에 정리한 기능 목록 단위로 추가한다.
-  - [AngularJS Commit Message Conventions](https://gist.github.com/stephenparish/9941e89d80e2bc58a153) 참고해 commit log를 남긴다.
-- [프리코스 과제 제출 문서](https://github.com/woowacourse/woowacourse-docs/tree/master/precourse) 절차를 따라 미션을 제출한다.
-  - [프리코스 과제 FAQ](https://github.com/woowacourse/woowacourse-docs/tree/master/precourse/faq) 문서를 참고하여 진행할 수 있다.
-<br>
-
-## 📝 License
-
-This project is [MIT](https://github.com/woowacourse/java-subway-path-precourse/blob/master/LICENSE.md) licensed.
+## 구현 기능 목록
+- 메인 화면에서 경로 조회와 종료중 입력을 받는다. (1: 경로조회, Q: 종료)
+- 경로 기준을 입력받는다. (1: 최단거리, 2: 최소시간)
+- 경로를 조회한다.
+    - 출발역을 입력받는다.
+    - 도착역을 입력받는다.
+    - (경로 기준) 출발역에서 도착역까지의 갈 수 있는 최단 거리인 경로를 계산한다.
+    - (시간 기준) 출발역에서 도착역까지의 총 소요시간이 가장 짧은 경로를 계산한다.
+    - 찾아낸 경로의 거리와 소요시간을 출력한다.
+- 종료한다.
+
+`예외처리`
+- 메인화면과 경로기준 입력화면에서 정해진 키워드가 아닌 입력은 모두 예외처리
+- 경로조회시 출발역과 도착역이 같은 경우
+- 출발역과 도착역이 연결되어 있지 않은 경우
+
+## 객체
+- 출력
+- 입력
+- 역
+- 역 레포지토리
+- 노선
+- 노선 레포지토리
+- 구간
+- 구간 레포지토리
\ No newline at end of file

From 7a55d3275370ca43275f3f0a28269216fe87a93f Mon Sep 17 00:00:00 2001
From: soongjamm <kimstz0303@gmail.com>
Date: Sat, 19 Dec 2020 13:25:54 +0900
Subject: [PATCH 02/24] =?UTF-8?q?feat(subway):=20=EA=B8=B0=EB=B3=B8=20?=
 =?UTF-8?q?=EB=BC=88=EB=8C=80=20=EC=BD=94=EB=93=9C=20=EC=9E=91=EC=84=B1=20?=
 =?UTF-8?q?=EB=B0=8F=20readme.md=20=EC=97=85=EB=8D=B0=EC=9D=B4=ED=8A=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.md                                     |  3 +++
 src/main/java/subway/Application.java         |  2 +-
 src/main/java/subway/domain/InputView.java    | 19 +++++++++++++++++++
 src/main/java/subway/domain/Menu.java         | 14 ++++++++++++++
 src/main/java/subway/domain/OutputView.java   | 16 ++++++++++++++++
 src/main/java/subway/domain/Screen.java       | 11 +++++++++++
 src/main/java/subway/domain/Section.java      |  4 ++++
 .../java/subway/domain/SectionRepository.java |  4 ++++
 8 files changed, 72 insertions(+), 1 deletion(-)
 create mode 100644 src/main/java/subway/domain/InputView.java
 create mode 100644 src/main/java/subway/domain/Menu.java
 create mode 100644 src/main/java/subway/domain/OutputView.java
 create mode 100644 src/main/java/subway/domain/Screen.java
 create mode 100644 src/main/java/subway/domain/Section.java
 create mode 100644 src/main/java/subway/domain/SectionRepository.java

diff --git a/README.md b/README.md
index 3bf59a2b6..630a30186 100644
--- a/README.md
+++ b/README.md
@@ -4,7 +4,9 @@
 <br>
 
 ## 구현 기능 목록
+- 메인 화면에서 메뉴를 출력한다.
 - 메인 화면에서 경로 조회와 종료중 입력을 받는다. (1: 경로조회, Q: 종료)
+- 경로 기준 화면에서 메뉴를 출력한다.
 - 경로 기준을 입력받는다. (1: 최단거리, 2: 최소시간)
 - 경로를 조회한다.
     - 출발역을 입력받는다.
@@ -20,6 +22,7 @@
 - 출발역과 도착역이 연결되어 있지 않은 경우
 
 ## 객체
+- 화면 관리 객체
 - 출력
 - 입력
 - 역
diff --git a/src/main/java/subway/Application.java b/src/main/java/subway/Application.java
index 0bcf786cc..686a23d35 100644
--- a/src/main/java/subway/Application.java
+++ b/src/main/java/subway/Application.java
@@ -5,6 +5,6 @@
 public class Application {
     public static void main(String[] args) {
         final Scanner scanner = new Scanner(System.in);
-        // TODO: 프로그램 구현
+
     }
 }
diff --git a/src/main/java/subway/domain/InputView.java b/src/main/java/subway/domain/InputView.java
new file mode 100644
index 000000000..c35b96339
--- /dev/null
+++ b/src/main/java/subway/domain/InputView.java
@@ -0,0 +1,19 @@
+package subway.domain;
+
+public class InputView {
+    public void enterMainMenu() {
+
+    }
+
+    public void enterCriteria() {
+
+    }
+
+    public void enterDepartualStation() {
+
+    }
+
+    public void enterArrivalStation() {
+
+    }
+}
diff --git a/src/main/java/subway/domain/Menu.java b/src/main/java/subway/domain/Menu.java
new file mode 100644
index 000000000..e421b33e8
--- /dev/null
+++ b/src/main/java/subway/domain/Menu.java
@@ -0,0 +1,14 @@
+package subway.domain;
+
+public class Menu {
+    public enum Main {
+        ROUTE_INQUIRY,
+        QUIT,
+    }
+
+    public enum ROUTE_CRITERIA {
+        SHORTEST_PATH,
+        SHORTEST_TIME,
+        BACK,
+    }
+}
diff --git a/src/main/java/subway/domain/OutputView.java b/src/main/java/subway/domain/OutputView.java
new file mode 100644
index 000000000..6e8795f0c
--- /dev/null
+++ b/src/main/java/subway/domain/OutputView.java
@@ -0,0 +1,16 @@
+package subway.domain;
+
+public class OutputView {
+    public void printMainMenu() {
+
+    }
+
+    public void printCriteriaMenu() {
+
+    }
+
+    public void printRouteResult() {
+
+    }
+
+}
diff --git a/src/main/java/subway/domain/Screen.java b/src/main/java/subway/domain/Screen.java
new file mode 100644
index 000000000..af05bf06e
--- /dev/null
+++ b/src/main/java/subway/domain/Screen.java
@@ -0,0 +1,11 @@
+package subway.domain;
+
+public class Screen {
+    public void show() {
+
+    }
+
+    public void isEmpty() {
+
+    }
+}
diff --git a/src/main/java/subway/domain/Section.java b/src/main/java/subway/domain/Section.java
new file mode 100644
index 000000000..13ba72bea
--- /dev/null
+++ b/src/main/java/subway/domain/Section.java
@@ -0,0 +1,4 @@
+package subway.domain;
+
+public class Section {
+}
diff --git a/src/main/java/subway/domain/SectionRepository.java b/src/main/java/subway/domain/SectionRepository.java
new file mode 100644
index 000000000..a8ab2e5fb
--- /dev/null
+++ b/src/main/java/subway/domain/SectionRepository.java
@@ -0,0 +1,4 @@
+package subway.domain;
+
+public class SectionRepository {
+}

From 2c026e030d84d4cdf1b386e08bfaa355416d3de4 Mon Sep 17 00:00:00 2001
From: soongjamm <kimstz0303@gmail.com>
Date: Sat, 19 Dec 2020 13:52:16 +0900
Subject: [PATCH 03/24] =?UTF-8?q?feat(MainScreen):=20=EB=A9=94=EB=89=B4=20?=
 =?UTF-8?q?=ED=99=94=EB=A9=B4=20=EB=B0=8F=20=EC=9E=85=EB=A0=A5=20=EC=9A=94?=
 =?UTF-8?q?=EA=B5=AC=20=EB=A9=94=EC=84=B8=EC=A7=80=20=EC=B6=9C=EB=A0=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.md                                     | 12 ++++++++
 src/main/java/subway/Application.java         |  8 ++++++
 src/main/java/subway/domain/InputView.java    | 10 +++----
 src/main/java/subway/domain/MainScreen.java   | 19 +++++++++++++
 src/main/java/subway/domain/Menu.java         | 21 ++++++++++++--
 src/main/java/subway/domain/OutputView.java   | 13 +++++++--
 src/main/java/subway/domain/Screen.java       | 11 --------
 .../java/subway/domain/ScreenManager.java     | 28 +++++++++++++++++++
 src/main/java/subway/domain/ScreenModel.java  |  5 ++++
 src/main/java/subway/domain/Section.java      |  2 ++
 .../java/subway/domain/SectionRepository.java |  3 ++
 11 files changed, 111 insertions(+), 21 deletions(-)
 create mode 100644 src/main/java/subway/domain/MainScreen.java
 delete mode 100644 src/main/java/subway/domain/Screen.java
 create mode 100644 src/main/java/subway/domain/ScreenManager.java
 create mode 100644 src/main/java/subway/domain/ScreenModel.java

diff --git a/README.md b/README.md
index 630a30186..40a36c58e 100644
--- a/README.md
+++ b/README.md
@@ -3,6 +3,18 @@
 
 <br>
 
+## 기본 설정
+- 역, 노선, 구간정보를 초기설정한다.
+- 노선은 `상행쪽역`, `하행쪽역`, `거리`, `시간` 으로 이루어져 있다.
+```
+1. 지하철역으로 교대역, 강남역, 역삼역, 남부터미널역, 양재역, 양재시민의숲역, 매봉역이 등록되어 있다.
+2. 지하철 노선으로 2호선, 3호선, 신분당선이 등록되어 있다.
+3. 노선에 역이 아래와 같이 등록되어 있다.(왼쪽 끝이 상행 종점)
+    - 2호선: 교대역 - ( 2km / 3분 ) - 강남역 - ( 2km / 3분 ) - 역삼역
+    - 3호선: 교대역 - ( 3km / 2분 ) - 남부터미널역 - ( 6km / 5분 ) - 양재역 - ( 1km / 1분 ) - 매봉역
+    - 신분당선: 강남역 - ( 2km / 8분 ) - 양재역 - ( 10km / 3분 ) - 양재시민의숲역
+```
+
 ## 구현 기능 목록
 - 메인 화면에서 메뉴를 출력한다.
 - 메인 화면에서 경로 조회와 종료중 입력을 받는다. (1: 경로조회, Q: 종료)
diff --git a/src/main/java/subway/Application.java b/src/main/java/subway/Application.java
index 686a23d35..f08e6a5e8 100644
--- a/src/main/java/subway/Application.java
+++ b/src/main/java/subway/Application.java
@@ -1,10 +1,18 @@
 package subway;
 
+import subway.domain.MainScreen;
+import subway.domain.ScreenManager;
+
 import java.util.Scanner;
 
 public class Application {
     public static void main(String[] args) {
         final Scanner scanner = new Scanner(System.in);
 
+        ScreenManager.add(new MainScreen());
+
+        while(!ScreenManager.isEmpty()) {
+            ScreenManager.show(ScreenManager.pop());
+        }
     }
 }
diff --git a/src/main/java/subway/domain/InputView.java b/src/main/java/subway/domain/InputView.java
index c35b96339..39e50b0f3 100644
--- a/src/main/java/subway/domain/InputView.java
+++ b/src/main/java/subway/domain/InputView.java
@@ -1,19 +1,19 @@
 package subway.domain;
 
 public class InputView {
-    public void enterMainMenu() {
-
+    public static void enterFeature() {
+        System.out.println("원하는 기능을 선택하세요.");
     }
 
-    public void enterCriteria() {
+    public static void enterCriteria() {
 
     }
 
-    public void enterDepartualStation() {
+    public static void enterDepartualStation() {
 
     }
 
-    public void enterArrivalStation() {
+    public static void enterArrivalStation() {
 
     }
 }
diff --git a/src/main/java/subway/domain/MainScreen.java b/src/main/java/subway/domain/MainScreen.java
new file mode 100644
index 000000000..b1cc97d12
--- /dev/null
+++ b/src/main/java/subway/domain/MainScreen.java
@@ -0,0 +1,19 @@
+package subway.domain;
+
+import java.util.Scanner;
+
+public class MainScreen implements ScreenModel{
+
+    public MainScreen(Scanner scanner) {
+    }
+
+    public MainScreen() {
+
+    }
+
+    @Override
+    public void showMenu() {
+        OutputView.printMainMenu();
+        InputView.enterFeature();
+    }
+}
diff --git a/src/main/java/subway/domain/Menu.java b/src/main/java/subway/domain/Menu.java
index e421b33e8..e46bae999 100644
--- a/src/main/java/subway/domain/Menu.java
+++ b/src/main/java/subway/domain/Menu.java
@@ -2,8 +2,25 @@
 
 public class Menu {
     public enum Main {
-        ROUTE_INQUIRY,
-        QUIT,
+        ROUTE_INQUIRY("1", "경로조회"),
+        QUIT("Q", "종료"),
+        ;
+
+        private String code;
+        private String korean;
+
+        Main(String code, String korean) {
+            this.code = code;
+            this.korean = korean;
+        }
+
+        public String getCode() {
+            return code;
+        }
+
+        public String getKorean() {
+            return korean;
+        }
     }
 
     public enum ROUTE_CRITERIA {
diff --git a/src/main/java/subway/domain/OutputView.java b/src/main/java/subway/domain/OutputView.java
index 6e8795f0c..9b078b382 100644
--- a/src/main/java/subway/domain/OutputView.java
+++ b/src/main/java/subway/domain/OutputView.java
@@ -1,15 +1,22 @@
 package subway.domain;
 
 public class OutputView {
-    public void printMainMenu() {
 
+    private static final String newLine = "\n";
+
+    public static void printMainMenu() {
+        String message = "## 메인 화면" + newLine;
+        for (Menu.Main menu : Menu.Main.values()) {
+            message += String.format("%s. %s" + newLine, menu.getCode(), menu.getKorean() );
+        }
+        System.out.println(message);
     }
 
-    public void printCriteriaMenu() {
+    public static void printCriteriaMenu() {
 
     }
 
-    public void printRouteResult() {
+    public static void printRouteResult() {
 
     }
 
diff --git a/src/main/java/subway/domain/Screen.java b/src/main/java/subway/domain/Screen.java
deleted file mode 100644
index af05bf06e..000000000
--- a/src/main/java/subway/domain/Screen.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package subway.domain;
-
-public class Screen {
-    public void show() {
-
-    }
-
-    public void isEmpty() {
-
-    }
-}
diff --git a/src/main/java/subway/domain/ScreenManager.java b/src/main/java/subway/domain/ScreenManager.java
new file mode 100644
index 000000000..ab0b50b78
--- /dev/null
+++ b/src/main/java/subway/domain/ScreenManager.java
@@ -0,0 +1,28 @@
+package subway.domain;
+
+import java.util.Stack;
+
+public class ScreenManager {
+    private static Stack<ScreenModel> screens = new Stack<>();
+
+
+
+    public static boolean isEmpty() {
+        if(screens.isEmpty()) {
+            return true;
+        }
+        return false;
+    }
+
+    public static void show(ScreenModel screen) {
+        screen.showMenu();
+    }
+
+    public static void add(ScreenModel screen) {
+        screens.push(screen);
+    }
+
+    public static ScreenModel pop() {
+        return screens.pop();
+    }
+}
diff --git a/src/main/java/subway/domain/ScreenModel.java b/src/main/java/subway/domain/ScreenModel.java
new file mode 100644
index 000000000..dd2d43b85
--- /dev/null
+++ b/src/main/java/subway/domain/ScreenModel.java
@@ -0,0 +1,5 @@
+package subway.domain;
+
+public interface ScreenModel {
+    public void showMenu();
+}
diff --git a/src/main/java/subway/domain/Section.java b/src/main/java/subway/domain/Section.java
index 13ba72bea..94c93a11f 100644
--- a/src/main/java/subway/domain/Section.java
+++ b/src/main/java/subway/domain/Section.java
@@ -1,4 +1,6 @@
 package subway.domain;
 
 public class Section {
+    public Section() {
+    }
 }
diff --git a/src/main/java/subway/domain/SectionRepository.java b/src/main/java/subway/domain/SectionRepository.java
index a8ab2e5fb..856ae488b 100644
--- a/src/main/java/subway/domain/SectionRepository.java
+++ b/src/main/java/subway/domain/SectionRepository.java
@@ -1,4 +1,7 @@
 package subway.domain;
 
 public class SectionRepository {
+    public void addSection() {
+
+    }
 }

From f75ba57256fba6c416ae4cdc58fca01611dc2ec5 Mon Sep 17 00:00:00 2001
From: soongjamm <kimstz0303@gmail.com>
Date: Sat, 19 Dec 2020 14:57:16 +0900
Subject: [PATCH 04/24] =?UTF-8?q?feat:=20=EB=A9=94=EC=9D=B8=ED=99=94?=
 =?UTF-8?q?=EB=A9=B4=EA=B3=BC=20=EA=B2=BD=EB=A1=9C=EC=A1=B0=ED=9A=8C?=
 =?UTF-8?q?=EC=97=90=EC=84=9C=20=EC=9E=85=EB=A0=A5=EC=9D=84=20=EB=B0=9B?=
 =?UTF-8?q?=EB=8A=94=20=EA=B2=83=20=EA=B9=8C=EC=A7=80=20=EA=B5=AC=ED=98=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/subway/Application.java         |  7 +++--
 .../java/subway/domain/FeatureScreen.java     | 13 ++++++++++
 src/main/java/subway/domain/InputView.java    | 18 ++++++++++---
 src/main/java/subway/domain/MainScreen.java   | 19 ++++++++++----
 src/main/java/subway/domain/Menu.java         | 22 +++++++++++++---
 src/main/java/subway/domain/OutputView.java   |  6 ++++-
 .../java/subway/domain/ScreenManager.java     | 19 +++++++++++---
 src/main/java/subway/domain/ScreenModel.java  |  4 ++-
 .../subway/domain/SelectCriteriaScreen.java   | 26 +++++++++++++++++++
 9 files changed, 114 insertions(+), 20 deletions(-)
 create mode 100644 src/main/java/subway/domain/FeatureScreen.java
 create mode 100644 src/main/java/subway/domain/SelectCriteriaScreen.java

diff --git a/src/main/java/subway/Application.java b/src/main/java/subway/Application.java
index f08e6a5e8..281e4175a 100644
--- a/src/main/java/subway/Application.java
+++ b/src/main/java/subway/Application.java
@@ -2,6 +2,7 @@
 
 import subway.domain.MainScreen;
 import subway.domain.ScreenManager;
+import subway.domain.ScreenModel;
 
 import java.util.Scanner;
 
@@ -9,10 +10,12 @@ public class Application {
     public static void main(String[] args) {
         final Scanner scanner = new Scanner(System.in);
 
-        ScreenManager.add(new MainScreen());
+        ScreenManager.addNextMenuScreen(new MainScreen(scanner));
 
         while(!ScreenManager.isEmpty()) {
-            ScreenManager.show(ScreenManager.pop());
+            ScreenModel nextScreen = ScreenManager.pop();
+            ScreenManager.show(nextScreen);
+            nextScreen.apply();
         }
     }
 }
diff --git a/src/main/java/subway/domain/FeatureScreen.java b/src/main/java/subway/domain/FeatureScreen.java
new file mode 100644
index 000000000..7993fb372
--- /dev/null
+++ b/src/main/java/subway/domain/FeatureScreen.java
@@ -0,0 +1,13 @@
+package subway.domain;
+
+import java.util.Scanner;
+
+public class FeatureScreen implements ScreenModel {
+
+    private final Scanner scanner;
+
+    public FeatureScreen(Scanner scanner) {
+        this.scanner = scanner;
+    }
+
+}
diff --git a/src/main/java/subway/domain/InputView.java b/src/main/java/subway/domain/InputView.java
index 39e50b0f3..cded69d9c 100644
--- a/src/main/java/subway/domain/InputView.java
+++ b/src/main/java/subway/domain/InputView.java
@@ -1,19 +1,29 @@
 package subway.domain;
 
+import java.util.Scanner;
+
 public class InputView {
-    public static void enterFeature() {
+
+    private final Scanner scanner;
+
+    public InputView(Scanner scanner) {
+        this.scanner = scanner;
+    }
+
+    public String enterFeature() {
         System.out.println("원하는 기능을 선택하세요.");
+        return scanner.nextLine();
     }
 
-    public static void enterCriteria() {
+    public void enterCriteria() {
 
     }
 
-    public static void enterDepartualStation() {
+    public void enterDepartualStation() {
 
     }
 
-    public static void enterArrivalStation() {
+    public void enterArrivalStation() {
 
     }
 }
diff --git a/src/main/java/subway/domain/MainScreen.java b/src/main/java/subway/domain/MainScreen.java
index b1cc97d12..1e82c4fcf 100644
--- a/src/main/java/subway/domain/MainScreen.java
+++ b/src/main/java/subway/domain/MainScreen.java
@@ -2,18 +2,27 @@
 
 import java.util.Scanner;
 
-public class MainScreen implements ScreenModel{
+public class MainScreen implements ScreenModel {
+
+    private final Scanner scanner;
 
     public MainScreen(Scanner scanner) {
+        this.scanner = scanner;
     }
 
-    public MainScreen() {
+    @Override
+    public String showMenu() {
+        InputView inputView = new InputView(scanner);
 
+        OutputView.printMainMenu();
+        return inputView.enterFeature();
     }
 
     @Override
-    public void showMenu() {
-        OutputView.printMainMenu();
-        InputView.enterFeature();
+    public ScreenModel getNextMenuScreen(String input) {
+        if (input.equals( Menu.Main.ROUTE_INQUIRY.getCode())) {
+            return new SelectCriteriaScreen(scanner);
+        }
+        return null;
     }
 }
diff --git a/src/main/java/subway/domain/Menu.java b/src/main/java/subway/domain/Menu.java
index e46bae999..7c36c873d 100644
--- a/src/main/java/subway/domain/Menu.java
+++ b/src/main/java/subway/domain/Menu.java
@@ -24,8 +24,24 @@ public String getKorean() {
     }
 
     public enum ROUTE_CRITERIA {
-        SHORTEST_PATH,
-        SHORTEST_TIME,
-        BACK,
+        SHORTEST_PATH("1", "최단 거리"),
+        SHORTEST_TIME("2", "최소 시간"),
+        BACK("B", "돌아가기");
+
+        private String code;
+        private String korean;
+
+        ROUTE_CRITERIA(String code, String korean) {
+            this.code = code;
+            this.korean = korean;
+        }
+
+        public String getCode() {
+            return code;
+        }
+
+        public String getKorean() {
+            return korean;
+        }
     }
 }
diff --git a/src/main/java/subway/domain/OutputView.java b/src/main/java/subway/domain/OutputView.java
index 9b078b382..5a1a16506 100644
--- a/src/main/java/subway/domain/OutputView.java
+++ b/src/main/java/subway/domain/OutputView.java
@@ -13,7 +13,11 @@ public static void printMainMenu() {
     }
 
     public static void printCriteriaMenu() {
-
+        String message = "## 경로 기준" + newLine;
+        for (Menu.ROUTE_CRITERIA menu : Menu.ROUTE_CRITERIA.values()) {
+            message += String.format("%s. %s" + newLine, menu.getCode(), menu.getKorean() );
+        }
+        System.out.println(message);
     }
 
     public static void printRouteResult() {
diff --git a/src/main/java/subway/domain/ScreenManager.java b/src/main/java/subway/domain/ScreenManager.java
index ab0b50b78..f008552ba 100644
--- a/src/main/java/subway/domain/ScreenManager.java
+++ b/src/main/java/subway/domain/ScreenManager.java
@@ -1,12 +1,13 @@
 package subway.domain;
 
+import java.util.Objects;
 import java.util.Stack;
 
 public class ScreenManager {
+    private static final String DONE = "-1";
     private static Stack<ScreenModel> screens = new Stack<>();
 
 
-
     public static boolean isEmpty() {
         if(screens.isEmpty()) {
             return true;
@@ -15,11 +16,21 @@ public static boolean isEmpty() {
     }
 
     public static void show(ScreenModel screen) {
-        screen.showMenu();
+        String result = screen.showMenu();
+        if (result == DONE) {
+            return;
+        }
+        // todo 유효한 입력인지 검증한다.
+
+        addNextMenuScreen(screen.getNextMenuScreen(result));
+
     }
 
-    public static void add(ScreenModel screen) {
-        screens.push(screen);
+    public static void addNextMenuScreen(ScreenModel nextScreen) {
+        if (Objects.isNull(nextScreen)) {
+            return;
+        }
+        screens.push(nextScreen);
     }
 
     public static ScreenModel pop() {
diff --git a/src/main/java/subway/domain/ScreenModel.java b/src/main/java/subway/domain/ScreenModel.java
index dd2d43b85..d8ee179a0 100644
--- a/src/main/java/subway/domain/ScreenModel.java
+++ b/src/main/java/subway/domain/ScreenModel.java
@@ -1,5 +1,7 @@
 package subway.domain;
 
 public interface ScreenModel {
-    public void showMenu();
+    public default String showMenu() {return null;}
+    public default ScreenModel getNextMenuScreen(String input) {return null;}
+    public default void apply() {}
 }
diff --git a/src/main/java/subway/domain/SelectCriteriaScreen.java b/src/main/java/subway/domain/SelectCriteriaScreen.java
new file mode 100644
index 000000000..10a279cdf
--- /dev/null
+++ b/src/main/java/subway/domain/SelectCriteriaScreen.java
@@ -0,0 +1,26 @@
+package subway.domain;
+
+import java.util.Scanner;
+
+public class SelectCriteriaScreen implements ScreenModel {
+
+    private static final String DONE = "-1";
+    private final Scanner scanner;
+
+    public SelectCriteriaScreen(Scanner scanner) {
+        this.scanner = scanner;
+    }
+
+    @Override
+    public String showMenu() {
+        InputView inputView = new InputView(scanner);
+
+        OutputView.printCriteriaMenu();
+        String input = inputView.enterFeature();
+        if (input.equals(Menu.Main.QUIT)) {
+            return DONE;
+        }
+        return input;
+    }
+
+}

From 1e9f42faf6ea944481db7e003b73ffefc689da1b Mon Sep 17 00:00:00 2001
From: soongjamm <kimstz0303@gmail.com>
Date: Sat, 19 Dec 2020 14:58:56 +0900
Subject: [PATCH 05/24] =?UTF-8?q?refactor:=20=ED=8C=A8=ED=82=A4=EC=A7=80?=
 =?UTF-8?q?=EB=A5=BC=20=EC=83=9D=EC=84=B1=ED=95=B4=EC=84=9C=20=EA=B0=81=20?=
 =?UTF-8?q?=ED=81=B4=EB=9E=98=EC=8A=A4=EB=A5=BC=20=EC=9D=B4=EB=8F=99?=
 =?UTF-8?q?=EC=8B=9C=ED=82=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/subway/Application.java                       | 6 +++---
 src/main/java/subway/{domain => menu}/Menu.java             | 2 +-
 src/main/java/subway/{domain => screen}/FeatureScreen.java  | 2 +-
 src/main/java/subway/{domain => screen}/MainScreen.java     | 6 +++++-
 src/main/java/subway/{domain => screen}/ScreenManager.java  | 2 +-
 src/main/java/subway/{domain => screen}/ScreenModel.java    | 2 +-
 .../subway/{domain => screen}/SelectCriteriaScreen.java     | 6 +++++-
 src/main/java/subway/{domain => view}/InputView.java        | 2 +-
 src/main/java/subway/{domain => view}/OutputView.java       | 4 +++-
 9 files changed, 21 insertions(+), 11 deletions(-)
 rename src/main/java/subway/{domain => menu}/Menu.java (97%)
 rename src/main/java/subway/{domain => screen}/FeatureScreen.java (89%)
 rename src/main/java/subway/{domain => screen}/MainScreen.java (84%)
 rename src/main/java/subway/{domain => screen}/ScreenManager.java (97%)
 rename src/main/java/subway/{domain => screen}/ScreenModel.java (89%)
 rename src/main/java/subway/{domain => screen}/SelectCriteriaScreen.java (83%)
 rename src/main/java/subway/{domain => view}/InputView.java (95%)
 rename src/main/java/subway/{domain => view}/OutputView.java (94%)

diff --git a/src/main/java/subway/Application.java b/src/main/java/subway/Application.java
index 281e4175a..c75c34ae7 100644
--- a/src/main/java/subway/Application.java
+++ b/src/main/java/subway/Application.java
@@ -1,8 +1,8 @@
 package subway;
 
-import subway.domain.MainScreen;
-import subway.domain.ScreenManager;
-import subway.domain.ScreenModel;
+import subway.screen.MainScreen;
+import subway.screen.ScreenManager;
+import subway.screen.ScreenModel;
 
 import java.util.Scanner;
 
diff --git a/src/main/java/subway/domain/Menu.java b/src/main/java/subway/menu/Menu.java
similarity index 97%
rename from src/main/java/subway/domain/Menu.java
rename to src/main/java/subway/menu/Menu.java
index 7c36c873d..a7c979808 100644
--- a/src/main/java/subway/domain/Menu.java
+++ b/src/main/java/subway/menu/Menu.java
@@ -1,4 +1,4 @@
-package subway.domain;
+package subway.menu;
 
 public class Menu {
     public enum Main {
diff --git a/src/main/java/subway/domain/FeatureScreen.java b/src/main/java/subway/screen/FeatureScreen.java
similarity index 89%
rename from src/main/java/subway/domain/FeatureScreen.java
rename to src/main/java/subway/screen/FeatureScreen.java
index 7993fb372..e4b8c0974 100644
--- a/src/main/java/subway/domain/FeatureScreen.java
+++ b/src/main/java/subway/screen/FeatureScreen.java
@@ -1,4 +1,4 @@
-package subway.domain;
+package subway.screen;
 
 import java.util.Scanner;
 
diff --git a/src/main/java/subway/domain/MainScreen.java b/src/main/java/subway/screen/MainScreen.java
similarity index 84%
rename from src/main/java/subway/domain/MainScreen.java
rename to src/main/java/subway/screen/MainScreen.java
index 1e82c4fcf..181e35859 100644
--- a/src/main/java/subway/domain/MainScreen.java
+++ b/src/main/java/subway/screen/MainScreen.java
@@ -1,4 +1,8 @@
-package subway.domain;
+package subway.screen;
+
+import subway.menu.Menu;
+import subway.view.InputView;
+import subway.view.OutputView;
 
 import java.util.Scanner;
 
diff --git a/src/main/java/subway/domain/ScreenManager.java b/src/main/java/subway/screen/ScreenManager.java
similarity index 97%
rename from src/main/java/subway/domain/ScreenManager.java
rename to src/main/java/subway/screen/ScreenManager.java
index f008552ba..5f84e7c2e 100644
--- a/src/main/java/subway/domain/ScreenManager.java
+++ b/src/main/java/subway/screen/ScreenManager.java
@@ -1,4 +1,4 @@
-package subway.domain;
+package subway.screen;
 
 import java.util.Objects;
 import java.util.Stack;
diff --git a/src/main/java/subway/domain/ScreenModel.java b/src/main/java/subway/screen/ScreenModel.java
similarity index 89%
rename from src/main/java/subway/domain/ScreenModel.java
rename to src/main/java/subway/screen/ScreenModel.java
index d8ee179a0..f77e8fc1f 100644
--- a/src/main/java/subway/domain/ScreenModel.java
+++ b/src/main/java/subway/screen/ScreenModel.java
@@ -1,4 +1,4 @@
-package subway.domain;
+package subway.screen;
 
 public interface ScreenModel {
     public default String showMenu() {return null;}
diff --git a/src/main/java/subway/domain/SelectCriteriaScreen.java b/src/main/java/subway/screen/SelectCriteriaScreen.java
similarity index 83%
rename from src/main/java/subway/domain/SelectCriteriaScreen.java
rename to src/main/java/subway/screen/SelectCriteriaScreen.java
index 10a279cdf..5df610e61 100644
--- a/src/main/java/subway/domain/SelectCriteriaScreen.java
+++ b/src/main/java/subway/screen/SelectCriteriaScreen.java
@@ -1,4 +1,8 @@
-package subway.domain;
+package subway.screen;
+
+import subway.menu.Menu;
+import subway.view.InputView;
+import subway.view.OutputView;
 
 import java.util.Scanner;
 
diff --git a/src/main/java/subway/domain/InputView.java b/src/main/java/subway/view/InputView.java
similarity index 95%
rename from src/main/java/subway/domain/InputView.java
rename to src/main/java/subway/view/InputView.java
index cded69d9c..5ef69f9f7 100644
--- a/src/main/java/subway/domain/InputView.java
+++ b/src/main/java/subway/view/InputView.java
@@ -1,4 +1,4 @@
-package subway.domain;
+package subway.view;
 
 import java.util.Scanner;
 
diff --git a/src/main/java/subway/domain/OutputView.java b/src/main/java/subway/view/OutputView.java
similarity index 94%
rename from src/main/java/subway/domain/OutputView.java
rename to src/main/java/subway/view/OutputView.java
index 5a1a16506..5ab97eb3c 100644
--- a/src/main/java/subway/domain/OutputView.java
+++ b/src/main/java/subway/view/OutputView.java
@@ -1,4 +1,6 @@
-package subway.domain;
+package subway.view;
+
+import subway.menu.Menu;
 
 public class OutputView {
 

From 835d997139c54b62d9100f9404d2aa75db12b76e Mon Sep 17 00:00:00 2001
From: soongjamm <kimstz0303@gmail.com>
Date: Sat, 19 Dec 2020 15:28:30 +0900
Subject: [PATCH 06/24] =?UTF-8?q?feat(Section):=20=EA=B5=AC=EA=B0=84=20?=
 =?UTF-8?q?=EC=A0=95=EB=B3=B4=EB=A5=BC=20=EB=8B=B4=EB=8A=94=20Section=20?=
 =?UTF-8?q?=ED=81=B4=EB=9E=98=EC=8A=A4=EC=9D=98=20=EC=83=9D=EC=84=B1?=
 =?UTF-8?q?=EC=9E=90=EC=99=80=20SectionRepository=EC=97=90=EC=84=9C=20?=
 =?UTF-8?q?=EA=B5=AC=EA=B0=84=20=EC=B6=94=EA=B0=80=20=EB=A9=94=EC=86=8C?=
 =?UTF-8?q?=EB=93=9C=20=EC=9E=91=EC=84=B1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/subway/Application.java                |  1 -
 src/main/java/subway/domain/Section.java             | 12 +++++++++++-
 src/main/java/subway/screen/FeatureScreen.java       | 10 +++++++++-
 src/main/java/subway/screen/MainScreen.java          |  4 ++--
 src/main/java/subway/screen/ScreenManager.java       |  4 ++--
 src/main/java/subway/screen/ScreenModel.java         |  5 ++---
 .../java/subway/screen/SelectCriteriaScreen.java     |  7 ++++++-
 7 files changed, 32 insertions(+), 11 deletions(-)

diff --git a/src/main/java/subway/Application.java b/src/main/java/subway/Application.java
index c75c34ae7..7eef3eb1c 100644
--- a/src/main/java/subway/Application.java
+++ b/src/main/java/subway/Application.java
@@ -15,7 +15,6 @@ public static void main(String[] args) {
         while(!ScreenManager.isEmpty()) {
             ScreenModel nextScreen = ScreenManager.pop();
             ScreenManager.show(nextScreen);
-            nextScreen.apply();
         }
     }
 }
diff --git a/src/main/java/subway/domain/Section.java b/src/main/java/subway/domain/Section.java
index 94c93a11f..3ea378c25 100644
--- a/src/main/java/subway/domain/Section.java
+++ b/src/main/java/subway/domain/Section.java
@@ -1,6 +1,16 @@
 package subway.domain;
 
 public class Section {
-    public Section() {
+    private Station departureStation;
+    private Station arriavalStation;
+    private int distance;
+    private int costTime;
+
+    public Section(Station departureStation, Station arriavalStation, int distance, int costTime) {
+        this.departureStation = departureStation;
+        this.arriavalStation = arriavalStation;
+        this.distance = distance;
+        this.costTime = costTime;
     }
+
 }
diff --git a/src/main/java/subway/screen/FeatureScreen.java b/src/main/java/subway/screen/FeatureScreen.java
index e4b8c0974..fde51e6d3 100644
--- a/src/main/java/subway/screen/FeatureScreen.java
+++ b/src/main/java/subway/screen/FeatureScreen.java
@@ -5,9 +5,17 @@
 public class FeatureScreen implements ScreenModel {
 
     private final Scanner scanner;
+    private final String input;
 
-    public FeatureScreen(Scanner scanner) {
+    public FeatureScreen(Scanner scanner, String input) {
         this.scanner = scanner;
+        this.input = input;
+    }
+
+    @Override
+    public String showScreen() {
+        System.out.println("최단거리나 최소시간 실행");
+        return "-1";
     }
 
 }
diff --git a/src/main/java/subway/screen/MainScreen.java b/src/main/java/subway/screen/MainScreen.java
index 181e35859..d6dabed15 100644
--- a/src/main/java/subway/screen/MainScreen.java
+++ b/src/main/java/subway/screen/MainScreen.java
@@ -15,7 +15,7 @@ public MainScreen(Scanner scanner) {
     }
 
     @Override
-    public String showMenu() {
+    public String showScreen() {
         InputView inputView = new InputView(scanner);
 
         OutputView.printMainMenu();
@@ -23,7 +23,7 @@ public String showMenu() {
     }
 
     @Override
-    public ScreenModel getNextMenuScreen(String input) {
+    public ScreenModel getNextScreen(String input) {
         if (input.equals( Menu.Main.ROUTE_INQUIRY.getCode())) {
             return new SelectCriteriaScreen(scanner);
         }
diff --git a/src/main/java/subway/screen/ScreenManager.java b/src/main/java/subway/screen/ScreenManager.java
index 5f84e7c2e..45733fb1a 100644
--- a/src/main/java/subway/screen/ScreenManager.java
+++ b/src/main/java/subway/screen/ScreenManager.java
@@ -16,13 +16,13 @@ public static boolean isEmpty() {
     }
 
     public static void show(ScreenModel screen) {
-        String result = screen.showMenu();
+        String result = screen.showScreen();
         if (result == DONE) {
             return;
         }
         // todo 유효한 입력인지 검증한다.
 
-        addNextMenuScreen(screen.getNextMenuScreen(result));
+        addNextMenuScreen(screen.getNextScreen(result));
 
     }
 
diff --git a/src/main/java/subway/screen/ScreenModel.java b/src/main/java/subway/screen/ScreenModel.java
index f77e8fc1f..5edf05eb2 100644
--- a/src/main/java/subway/screen/ScreenModel.java
+++ b/src/main/java/subway/screen/ScreenModel.java
@@ -1,7 +1,6 @@
 package subway.screen;
 
 public interface ScreenModel {
-    public default String showMenu() {return null;}
-    public default ScreenModel getNextMenuScreen(String input) {return null;}
-    public default void apply() {}
+    public default String showScreen() {return "-1";}
+    public default ScreenModel getNextScreen(String input) {return null;}
 }
diff --git a/src/main/java/subway/screen/SelectCriteriaScreen.java b/src/main/java/subway/screen/SelectCriteriaScreen.java
index 5df610e61..80732362f 100644
--- a/src/main/java/subway/screen/SelectCriteriaScreen.java
+++ b/src/main/java/subway/screen/SelectCriteriaScreen.java
@@ -16,7 +16,7 @@ public SelectCriteriaScreen(Scanner scanner) {
     }
 
     @Override
-    public String showMenu() {
+    public String showScreen() {
         InputView inputView = new InputView(scanner);
 
         OutputView.printCriteriaMenu();
@@ -27,4 +27,9 @@ public String showMenu() {
         return input;
     }
 
+    @Override
+    public ScreenModel getNextScreen(String input) {
+        return new FeatureScreen(scanner, input);
+    }
+
 }

From 5f7ea2ca87648b7ed6bb8ee560cfd3e4e61132aa Mon Sep 17 00:00:00 2001
From: soongjamm <kimstz0303@gmail.com>
Date: Sat, 19 Dec 2020 15:43:19 +0900
Subject: [PATCH 07/24] =?UTF-8?q?feat(initilize):=20=EC=B4=88=EA=B8=B0=20?=
 =?UTF-8?q?=EC=A0=95=EB=B3=B4=EB=A5=BC=20=EC=84=A4=EC=A0=95=ED=95=98?=
 =?UTF-8?q?=EB=8A=94=20=EC=BD=94=EB=93=9C=20=EC=9E=91=EC=84=B1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.md                                     |  2 +-
 src/main/java/subway/Application.java         | 25 ++++++++++++++++++-
 src/main/java/subway/domain/Line.java         |  9 ++++++-
 .../java/subway/domain/LineRepository.java    |  6 +++++
 src/main/java/subway/domain/Section.java      | 12 ++++++---
 .../java/subway/domain/SectionRepository.java |  9 ++++++-
 .../java/subway/domain/StationRepository.java |  6 +++++
 7 files changed, 62 insertions(+), 7 deletions(-)

diff --git a/README.md b/README.md
index 40a36c58e..00504818f 100644
--- a/README.md
+++ b/README.md
@@ -5,7 +5,7 @@
 
 ## 기본 설정
 - 역, 노선, 구간정보를 초기설정한다.
-- 노선은 `상행쪽역`, `하행쪽역`, `거리`, `시간` 으로 이루어져 있다.
+- 구간은 `노선`, `상행쪽역`, `하행쪽역`, `거리`, `시간` 으로 이루어져 있다.
 ```
 1. 지하철역으로 교대역, 강남역, 역삼역, 남부터미널역, 양재역, 양재시민의숲역, 매봉역이 등록되어 있다.
 2. 지하철 노선으로 2호선, 3호선, 신분당선이 등록되어 있다.
diff --git a/src/main/java/subway/Application.java b/src/main/java/subway/Application.java
index 7eef3eb1c..0e5a4fcbb 100644
--- a/src/main/java/subway/Application.java
+++ b/src/main/java/subway/Application.java
@@ -1,15 +1,18 @@
 package subway;
 
+import subway.domain.*;
 import subway.screen.MainScreen;
 import subway.screen.ScreenManager;
 import subway.screen.ScreenModel;
 
+import java.util.Arrays;
+import java.util.List;
 import java.util.Scanner;
 
 public class Application {
     public static void main(String[] args) {
         final Scanner scanner = new Scanner(System.in);
-
+        initialize();
         ScreenManager.addNextMenuScreen(new MainScreen(scanner));
 
         while(!ScreenManager.isEmpty()) {
@@ -17,4 +20,24 @@ public static void main(String[] args) {
             ScreenManager.show(nextScreen);
         }
     }
+
+    private static void initialize() {
+        List<Station> stations = Arrays.asList(new Station("교대역"), new Station("강남역")
+                , new Station("역삼역"), new Station("남부터미널역"), new Station("양재역")
+                , new Station("양재시민의숲역"), new Station("매봉역"));
+        stations.stream().forEach(station -> StationRepository.addStation(station));
+
+        List<Line> lines = Arrays.asList(new Line("2호선").addTerminus("교대역", "역삼역")
+                , new Line("3호선").addTerminus("교대역", "매봉역")
+                , new Line("신분당선").addTerminus("강남역", "양재시민의숲역"));
+        lines.stream().forEach(line -> LineRepository.addLine(line));
+
+        List<Section> sections = Arrays.asList(new Section("2호선", "교대역", "강남역", 2, 3)
+                , new Section("2호선", "강남역", "역삼역", 2, 3)
+                , new Section("3호선", "교대역", "남부터미널역", 3, 2)
+                , new Section("3호선", "남부터미널역", "양재역", 6, 5)
+                , new Section("3호선", "양재역", "매봉역", 1, 1));
+        sections.stream().forEach(section -> SectionRepository.addSection(section));
+
+    }
 }
diff --git a/src/main/java/subway/domain/Line.java b/src/main/java/subway/domain/Line.java
index f4d738d5a..256f392dc 100644
--- a/src/main/java/subway/domain/Line.java
+++ b/src/main/java/subway/domain/Line.java
@@ -1,7 +1,10 @@
 package subway.domain;
 
+import java.util.LinkedList;
+
 public class Line {
     private String name;
+    private LinkedList<Station> line = new LinkedList<>();
 
     public Line(String name) {
         this.name = name;
@@ -11,5 +14,9 @@ public String getName() {
         return name;
     }
 
-    // 추가 기능 구현
+    public Line addTerminus(String upBoundTerminus, String downBoundTerminus) {
+        line.addFirst(StationRepository.findStation(upBoundTerminus));
+        line.addLast(StationRepository.findStation(downBoundTerminus));
+        return this;
+    }
 }
diff --git a/src/main/java/subway/domain/LineRepository.java b/src/main/java/subway/domain/LineRepository.java
index 2c4a723c9..69bfd17cc 100644
--- a/src/main/java/subway/domain/LineRepository.java
+++ b/src/main/java/subway/domain/LineRepository.java
@@ -23,4 +23,10 @@ public static boolean deleteLineByName(String name) {
     public static void deleteAll() {
         lines.clear();
     }
+
+    public static Line findLine(String name) {
+        return lines.stream()
+                .filter(line -> line.getName().equals(name))
+                .findFirst().orElseThrow(() -> new IllegalArgumentException("[ERROR] 존재하지 않는 노선"));
+    }
 }
diff --git a/src/main/java/subway/domain/Section.java b/src/main/java/subway/domain/Section.java
index 3ea378c25..170b00cc5 100644
--- a/src/main/java/subway/domain/Section.java
+++ b/src/main/java/subway/domain/Section.java
@@ -1,14 +1,20 @@
 package subway.domain;
 
 public class Section {
+    private Line line;
     private Station departureStation;
     private Station arriavalStation;
     private int distance;
     private int costTime;
 
-    public Section(Station departureStation, Station arriavalStation, int distance, int costTime) {
-        this.departureStation = departureStation;
-        this.arriavalStation = arriavalStation;
+    public Section(String lineName, String departureName, String arrivalName, int distance, int costTime) {
+        Line line = LineRepository.findLine(lineName);
+        Station departure = StationRepository.findStation(departureName);
+        Station arrival = StationRepository.findStation(arrivalName);
+
+        this.line = line;
+        this.departureStation = departure;
+        this.arriavalStation = arrival;
         this.distance = distance;
         this.costTime = costTime;
     }
diff --git a/src/main/java/subway/domain/SectionRepository.java b/src/main/java/subway/domain/SectionRepository.java
index 856ae488b..1f7ee1ce4 100644
--- a/src/main/java/subway/domain/SectionRepository.java
+++ b/src/main/java/subway/domain/SectionRepository.java
@@ -1,7 +1,14 @@
 package subway.domain;
 
+import java.util.ArrayList;
+import java.util.List;
+
 public class SectionRepository {
-    public void addSection() {
 
+    static List<Section> sections = new ArrayList<>();
+
+    public static void addSection(Section section) {
+        sections.add(section);
     }
+
 }
diff --git a/src/main/java/subway/domain/StationRepository.java b/src/main/java/subway/domain/StationRepository.java
index 8ed9d103f..a475e9e85 100644
--- a/src/main/java/subway/domain/StationRepository.java
+++ b/src/main/java/subway/domain/StationRepository.java
@@ -23,4 +23,10 @@ public static boolean deleteStation(String name) {
     public static void deleteAll() {
         stations.clear();
     }
+
+    public static Station findStation(String name) {
+        return stations.stream()
+                .filter(station -> station.getName().equals(name))
+                .findFirst().orElseThrow(() -> new IllegalArgumentException(("[ERROR] 존재하지 않는 역")));
+    }
 }

From e7d79eb9ad8342110ff484a0ede79ce470a8178d Mon Sep 17 00:00:00 2001
From: soongjamm <kimstz0303@gmail.com>
Date: Sat, 19 Dec 2020 15:48:49 +0900
Subject: [PATCH 08/24] =?UTF-8?q?docs(readme.md):=20=EA=B5=AC=ED=98=84=20?=
 =?UTF-8?q?=EA=B8=B0=EB=8A=A5=20=EB=AA=A9=EB=A1=9D=20=EC=B6=94=EA=B0=80?=
 =?UTF-8?q?=EC=99=80=20=ED=95=84=EC=9A=94=20=EA=B0=9D=EC=B2=B4=20=EC=A0=95?=
 =?UTF-8?q?=EB=B3=B4=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/README.md b/README.md
index 00504818f..94d0b1508 100644
--- a/README.md
+++ b/README.md
@@ -16,6 +16,7 @@
 ```
 
 ## 구현 기능 목록
+- 초기 설정을 위해 역, 노선, 구간 정보를 추가할 수 있어야 한다.
 - 메인 화면에서 메뉴를 출력한다.
 - 메인 화면에서 경로 조회와 종료중 입력을 받는다. (1: 경로조회, Q: 종료)
 - 경로 기준 화면에서 메뉴를 출력한다.
@@ -35,6 +36,9 @@
 
 ## 객체
 - 화면 관리 객체
+- 메인 화면
+- 경로 기준 선택 화면
+- 기능 화면
 - 출력
 - 입력
 - 역

From 921666cffa60032758d4387fa201363c98ce545d Mon Sep 17 00:00:00 2001
From: soongjamm <kimstz0303@gmail.com>
Date: Sat, 19 Dec 2020 17:37:56 +0900
Subject: [PATCH 09/24] =?UTF-8?q?feat(ShortestPath):=20=EC=B5=9C=EB=8B=A8?=
 =?UTF-8?q?=EA=B1=B0=EB=A6=AC=20=EA=B3=84=EC=82=B0=EC=9D=84=20=EC=9C=84?=
 =?UTF-8?q?=ED=95=B4=20Section=EA=B3=BC=20SectionRepository=EC=97=90=20?=
 =?UTF-8?q?=EA=B4=80=EB=A0=A8=20=EB=A9=94=EC=86=8C=EB=93=9C=20=EC=B6=94?=
 =?UTF-8?q?=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/subway/domain/Line.java         |  6 +++-
 src/main/java/subway/domain/Section.java      | 21 +++++++++---
 .../java/subway/domain/SectionRepository.java | 34 +++++++++++++++++++
 src/main/java/subway/menu/Menu.java           | 10 ++++--
 .../java/subway/screen/FeatureScreen.java     | 10 +++++-
 src/main/java/subway/view/InputView.java      | 12 ++++++-
 6 files changed, 84 insertions(+), 9 deletions(-)

diff --git a/src/main/java/subway/domain/Line.java b/src/main/java/subway/domain/Line.java
index 256f392dc..3c2ef9771 100644
--- a/src/main/java/subway/domain/Line.java
+++ b/src/main/java/subway/domain/Line.java
@@ -3,8 +3,8 @@
 import java.util.LinkedList;
 
 public class Line {
+    private static LinkedList<Station> line = new LinkedList<>();
     private String name;
-    private LinkedList<Station> line = new LinkedList<>();
 
     public Line(String name) {
         this.name = name;
@@ -14,6 +14,10 @@ public String getName() {
         return name;
     }
 
+    public void addSection(int sequence, Station station) {
+        line.add(sequence, station);
+    }
+
     public Line addTerminus(String upBoundTerminus, String downBoundTerminus) {
         line.addFirst(StationRepository.findStation(upBoundTerminus));
         line.addLast(StationRepository.findStation(downBoundTerminus));
diff --git a/src/main/java/subway/domain/Section.java b/src/main/java/subway/domain/Section.java
index 170b00cc5..f2a504532 100644
--- a/src/main/java/subway/domain/Section.java
+++ b/src/main/java/subway/domain/Section.java
@@ -1,9 +1,11 @@
 package subway.domain;
 
 public class Section {
+
     private Line line;
-    private Station departureStation;
-    private Station arriavalStation;
+
+    private Station departure;
+    private Station arrival;
     private int distance;
     private int costTime;
 
@@ -13,10 +15,21 @@ public Section(String lineName, String departureName, String arrivalName, int di
         Station arrival = StationRepository.findStation(arrivalName);
 
         this.line = line;
-        this.departureStation = departure;
-        this.arriavalStation = arrival;
+        this.departure = departure;
+        this.arrival = arrival;
         this.distance = distance;
         this.costTime = costTime;
     }
 
+    public Station getDeparture() {
+        return departure;
+    }
+
+    public Station getArrival() {
+        return arrival;
+    }
+
+    public int getCostTime() {
+        return costTime;
+    }
 }
diff --git a/src/main/java/subway/domain/SectionRepository.java b/src/main/java/subway/domain/SectionRepository.java
index 1f7ee1ce4..fe0247a5c 100644
--- a/src/main/java/subway/domain/SectionRepository.java
+++ b/src/main/java/subway/domain/SectionRepository.java
@@ -1,14 +1,48 @@
 package subway.domain;
 
+import org.jgrapht.alg.shortestpath.DijkstraShortestPath;
+import org.jgrapht.graph.DefaultWeightedEdge;
+import org.jgrapht.graph.WeightedMultigraph;
+
 import java.util.ArrayList;
 import java.util.List;
 
 public class SectionRepository {
 
+    static WeightedMultigraph<String, DefaultWeightedEdge> graph = new WeightedMultigraph(DefaultWeightedEdge.class);
     static List<Section> sections = new ArrayList<>();
 
+    public static List<Section> sections() {
+        return sections;
+    }
+
     public static void addSection(Section section) {
         sections.add(section);
+        addVertex(section.getDeparture(), section.getArrival());
+        addWeight(section.getDeparture(), section.getArrival(), section.getCostTime());
+    }
+
+    private static void addWeight(Station departure, Station arrival, int costTime) {
+        if (!graph.containsEdge(graph.addEdge(departure.getName(), arrival.getName()))) {
+            graph.setEdgeWeight(graph.addEdge(departure.getName(), arrival.getName()), costTime);
+        }
+    }
+
+    private static void addVertex(Station departure, Station arrival) {
+        if (!graph.containsVertex(departure.getName())) {
+            graph.addVertex(departure.getName());
+        }
+        if (!graph.containsVertex(arrival.getName())) {
+            graph.addVertex(arrival.getName());
+        }
+    }
+
+    public static void findShortestPath(String departure, String destination) {
+        int shortestDistance = 0;
+
+        DijkstraShortestPath dijkstraShortestPath = new DijkstraShortestPath(graph);
+        List<String> shortestPath = dijkstraShortestPath.getPath(departure, destination).getVertexList();
+
     }
 
 }
diff --git a/src/main/java/subway/menu/Menu.java b/src/main/java/subway/menu/Menu.java
index a7c979808..0e126d8ed 100644
--- a/src/main/java/subway/menu/Menu.java
+++ b/src/main/java/subway/menu/Menu.java
@@ -1,10 +1,16 @@
 package subway.menu;
 
+import org.jgrapht.alg.shortestpath.DijkstraShortestPath;
+import org.jgrapht.graph.DefaultWeightedEdge;
+import org.jgrapht.graph.WeightedMultigraph;
+import subway.domain.SectionRepository;
+
+import java.util.List;
+
 public class Menu {
     public enum Main {
         ROUTE_INQUIRY("1", "경로조회"),
-        QUIT("Q", "종료"),
-        ;
+        QUIT("Q", "종료");
 
         private String code;
         private String korean;
diff --git a/src/main/java/subway/screen/FeatureScreen.java b/src/main/java/subway/screen/FeatureScreen.java
index fde51e6d3..98b985b32 100644
--- a/src/main/java/subway/screen/FeatureScreen.java
+++ b/src/main/java/subway/screen/FeatureScreen.java
@@ -1,5 +1,8 @@
 package subway.screen;
 
+import subway.domain.SectionRepository;
+import subway.view.InputView;
+
 import java.util.Scanner;
 
 public class FeatureScreen implements ScreenModel {
@@ -14,7 +17,12 @@ public FeatureScreen(Scanner scanner, String input) {
 
     @Override
     public String showScreen() {
-        System.out.println("최단거리나 최소시간 실행");
+        InputView inputView = new InputView(scanner);
+
+        String departure = inputView.enterDeparture();
+        String arrival = inputView.enterArrival();
+        SectionRepository.findShortestPath(departure, arrival);
+
         return "-1";
     }
 
diff --git a/src/main/java/subway/view/InputView.java b/src/main/java/subway/view/InputView.java
index 5ef69f9f7..5a0f624dd 100644
--- a/src/main/java/subway/view/InputView.java
+++ b/src/main/java/subway/view/InputView.java
@@ -11,7 +11,7 @@ public InputView(Scanner scanner) {
     }
 
     public String enterFeature() {
-        System.out.println("원하는 기능을 선택하세요.");
+        System.out.println("## 원하는 기능을 선택하세요.");
         return scanner.nextLine();
     }
 
@@ -26,4 +26,14 @@ public void enterDepartualStation() {
     public void enterArrivalStation() {
 
     }
+
+    public String enterDeparture() {
+        System.out.println("## 출발역을 입력하세요.");
+        return scanner.nextLine();
+    }
+
+    public String enterArrival() {
+        System.out.println("## 도착역을 입력하세요.");
+        return scanner.nextLine();
+    }
 }

From 9bdbfc3328e644b30ca6b58a0c7483accc672612 Mon Sep 17 00:00:00 2001
From: soongjamm <kimstz0303@gmail.com>
Date: Sat, 19 Dec 2020 17:58:20 +0900
Subject: [PATCH 10/24] =?UTF-8?q?etc:=20=EB=AF=B8=EC=99=84=EC=84=B1=20?=
 =?UTF-8?q?=EC=8B=9C=ED=97=98=20=EC=8B=9C=EA=B0=84=EC=9D=B4=20=EB=8B=A4?=
 =?UTF-8?q?=EB=90=98=EC=96=B4=EC=84=9C=20=ED=98=84=EC=9E=AC=20=EC=B5=9C?=
 =?UTF-8?q?=EB=8B=A8=EA=B1=B0=EB=A6=AC=EB=A1=9C=20=EA=B8=B8=EC=B0=BE?=
 =?UTF-8?q?=EA=B8=B0=20=EA=B5=AC=ED=98=84=20=EC=A4=91=20=EC=BB=A4=EB=B0=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/subway/domain/Section.java           | 12 ++++++++++++
 src/main/java/subway/domain/SectionRepository.java |  8 ++++++--
 src/main/java/subway/screen/FeatureScreen.java     |  4 +++-
 3 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/src/main/java/subway/domain/Section.java b/src/main/java/subway/domain/Section.java
index f2a504532..b45bfb86a 100644
--- a/src/main/java/subway/domain/Section.java
+++ b/src/main/java/subway/domain/Section.java
@@ -21,6 +21,18 @@ public Section(String lineName, String departureName, String arrivalName, int di
         this.costTime = costTime;
     }
 
+    public boolean hasStation(String station1, String station2) {
+        if ((station1.equals(arrival.getName()) || station2.equals(arrival.getName()))
+                && (station1.equals(departure.getName()) || station2.equals(departure.getName()))) {
+            return true;
+        }
+        return false;
+    }
+
+    public int getDistance() {
+        return distance;
+    }
+
     public Station getDeparture() {
         return departure;
     }
diff --git a/src/main/java/subway/domain/SectionRepository.java b/src/main/java/subway/domain/SectionRepository.java
index fe0247a5c..1d92ee180 100644
--- a/src/main/java/subway/domain/SectionRepository.java
+++ b/src/main/java/subway/domain/SectionRepository.java
@@ -37,12 +37,16 @@ private static void addVertex(Station departure, Station arrival) {
         }
     }
 
-    public static void findShortestPath(String departure, String destination) {
-        int shortestDistance = 0;
+    public static int findShortestPath(String departure, String destination) {
 
         DijkstraShortestPath dijkstraShortestPath = new DijkstraShortestPath(graph);
         List<String> shortestPath = dijkstraShortestPath.getPath(departure, destination).getVertexList();
 
+        return (int) sections.stream()
+                .filter(section -> section.hasStation(departure, destination))
+                .mapToInt(Section::getDistance)
+                .sum();
+
     }
 
 }
diff --git a/src/main/java/subway/screen/FeatureScreen.java b/src/main/java/subway/screen/FeatureScreen.java
index 98b985b32..3e4857ca1 100644
--- a/src/main/java/subway/screen/FeatureScreen.java
+++ b/src/main/java/subway/screen/FeatureScreen.java
@@ -18,10 +18,12 @@ public FeatureScreen(Scanner scanner, String input) {
     @Override
     public String showScreen() {
         InputView inputView = new InputView(scanner);
+        int shortestResult = 0;
 
         String departure = inputView.enterDeparture();
         String arrival = inputView.enterArrival();
-        SectionRepository.findShortestPath(departure, arrival);
+        shortestResult = SectionRepository.findShortestPath(departure, arrival);
+        System.out.println(shortestResult);
 
         return "-1";
     }

From f2b5842ea9d0be9493e190e56fbd1e4c5160e954 Mon Sep 17 00:00:00 2001
From: soongjamm <kimstz0303@gmail.com>
Date: Sat, 19 Dec 2020 18:25:37 +0900
Subject: [PATCH 11/24] Update README.md

---
 README.md | 145 +++++++++++++++++-------------------------------------
 1 file changed, 45 insertions(+), 100 deletions(-)

diff --git a/README.md b/README.md
index 618018a7c..3e1fea825 100644
--- a/README.md
+++ b/README.md
@@ -1,104 +1,49 @@
-# 지하철 노선도 미션
-- 지하철 역과 노선을 관리하는 지하철 노선도 기능을 구현한다.
+# 지하철 노선도 경로 조회 미션
+- 등록된 지하철 노선도에서 경로를 조회하는 기능을 구현한다.
 
 <br>
 
-## 구현 기능 목록
-- [입력](#각각의-기능-선택-화면에서의-입력)
-- [세부기능](#세부-기능)
-
-### 각각의 기능 선택 화면에서의 입력
-- 각 화면에서 어떤 기능을 수행할지 문자를 입력받는다.
-    - 메인, 역 관리, 노선 관리, 구간 관리 화면이 있다.
-- 입력받은 값이 각 화면의 `입력 허용 문자` 에 포함되는지 검증한다.
-- 입력에 따라 화면을 이동한다.
-
-- `예외 처리`  
-    - `입력 허용 문자`외의 입력은 대해 에러를 출력
-    
-- `입력 허용 문자`
-    - **메인 화면**
-        - `1` : 역 관리 화면으로 이동한다.
-        - `2` : 노선 관리 화면으로 이동한다.
-        - `3` : 구간 관리 화면으로 이동한다.
-        - `4` : 지하철 노선도 출력한다.
-        - `Q` : 프로그램을 종료한다.  
-
-    - **역 관리 화면**
-        - `1` : 역 등록 화면으로 이동한다.
-        - `2` : 역 삭제 화면으로 이동한다.
-        - `3` : 역 조회 화면으로 이동한다.
-        - `B` : 메인 화면으로 이동한다.
-            
-    - **노선 관리 화면**
-        - `1` : 노선 등록 화면으로 이동한다.
-        - `2` : 노선 삭제 화면으로 이동한다.
-        - `3` : 노선 조회 화면으로 이동한다.
-        - `B` : 메인 화면으로 이동한다.
-  
-    - **구간 관리 화면**
-        - `1` : 노선 등록 화면으로 이동한다.
-        - `2` : 노선 삭제 화면으로 이동한다.
-        - `B` : 메인 화면으로 이동한다.
-
-<br>
+## 기본 설정
+- 역, 노선, 구간정보를 초기설정한다.
+- 구간은 `노선`, `상행쪽역`, `하행쪽역`, `거리`, `시간` 으로 이루어져 있다.
+```
+1. 지하철역으로 교대역, 강남역, 역삼역, 남부터미널역, 양재역, 양재시민의숲역, 매봉역이 등록되어 있다.
+2. 지하철 노선으로 2호선, 3호선, 신분당선이 등록되어 있다.
+3. 노선에 역이 아래와 같이 등록되어 있다.(왼쪽 끝이 상행 종점)
+    - 2호선: 교대역 - ( 2km / 3분 ) - 강남역 - ( 2km / 3분 ) - 역삼역
+    - 3호선: 교대역 - ( 3km / 2분 ) - 남부터미널역 - ( 6km / 5분 ) - 양재역 - ( 1km / 1분 ) - 매봉역
+    - 신분당선: 강남역 - ( 2km / 8분 ) - 양재역 - ( 10km / 3분 ) - 양재시민의숲역
+```
 
-### 세부 기능
-### 지하철 역 관련 기능
-- 역 등록, 역 삭제, 역 조회가 가능하다.
-- (등록/삭제) 역 이름을 입력받는다.
-- (등록/삭제) 입력이 올바른지 검증해야 한다.
-- (등록/삭제) 입력과 동일한 이름의 역이 존재하는지 검사한다.
-    - (등록) 입력이 역 목록에 존재하지 않는다면 목록에 추가한다.
-    - (삭제) 입력이 역 목록에 존재한다면 목록에서 삭제한다.
-- (조회) 모든 역 이름을 출력한다.
-  
-- `입력 예외 처리` 
-    - 앞/뒤 공백을 제외하고 입력이 2글자 미만인 경우
-    - 입력에 자음/모음으로 구성된 한글, 영어, 숫자 외의 문자가 있는 경우
-    - 이름이 `역`으로 끝나지 않는 경우
-    - (등록) 입력이 목록에 이미 존재하는 경우
-    - (삭제) 입력이 목록에 존재하지 않는 경우
-        
-
-### 노선 관련 기능
-- 노선 등록, 노선 삭제, 노선 조회가 가능하다.
-- (등록/삭제) 노선 이름을 입력받는다.
-- (등록/삭제) 노선 등록/삭제의 입력이 2글자 이상인지 검증해야 한다.
-- (등록) 상행 종점역과 하행 종점역을 입력받아야 한다.
-    - 상행, 하행 종점역 입력이 역 목록에 존재하는지 검사한다.
-- (등록/삭제) 입력과 동일한 이름의 노선이 존재하는지 검사한다.
-    - 등록의 경우 노선 목록에 존재하지 않는다면 목록에 등록한다.
-    - 삭제의 경우 노선 목록에 존재한다면 목록에서 삭제한다.
-- (조회) 모든 노선 이름을 출력한다.
-- (등록) 상행과 하행 종점역이 같은 경우 순환선이므로 가능하다.
-
-- `예외 처리` 
-    - 앞/뒤 공백을 제외하고 입력이 2글자 미만인 경우
-    - 입력에 자음/모음으로 구성된 한글, 영어, 숫자 외의 문자가 있는 경우
-    - (등록) 노선명 입력이 목록에 이미 존재하는 경우
-    - (등록) 상행이나 하행 종점역이 역 목록에 존재하지 않는 경우
-    - (삭제) 노선명 입력이 목록에 존재하지 않는 경우
-
-### 구간 관련 기능
-- 노선에 역을 추가하거나, 노선에 등록된 역 제거가 가능하고, 노선도를 출력할 수 있다.
-- 역과 역 사이에 구간이 추가 될 수 있다.
-- 하나의 역은 여러개의 노선에 포함될 수 있다.
-- (추가) 노선 이름을 입력받는다.
-    - 노선 이름이 노선 목록에 있는지 검사한다.
-- (추가) 역 이름을 입력받는다.
-    - 역 이름이 역 목록에 있는지 검사한다.
-- (추가) 추가하려는 노선의 순서를 입력받는다. (1부터 시작 -> 1은 상행종점역 다음에 추가)
-    - 입력이 정수 1부터 (노선의 길이-1) 인지 검사한다.
-- (추가) 노선에 존재하지 않는 역이라면 n번째에 역을 추가한다.
-- (삭제) 노선 이름을 입력받는다.
-    - 노선 이름이 노선 목록에 있는지 검사한다.
-- (삭제) 역 이름을 입력받는다.
-    - 역 이름이 해당 노선에 포함되어 있는지 검사한다.
-- (삭제) 노선에서 역을 삭제한다. 삭제한 역이 종점이면 그 다음 역이 종점이 된다. (하행 종점역이면 그 전 역이 종점이 된다.)
-- (조회) 메인 메뉴에서 `지하철 노선도 출력`을 통해 가능하며 모든 노선의 상행~하행 종점역까지 연결된 순서대로 조회가 가능하다. 
-
-- `예외 처리` 
-    - 역이나 노선의 이름이 존재하지 않는 경우
-    - (등록) 노선에 동일한 이름의 역이 존재하는 경우 (갈래길 발생 방지)
-    - (삭제) 노선에 포함된 역이 2개인 경우
+## 구현 기능 목록
+- 초기 설정을 위해 역, 노선, 구간 정보를 추가할 수 있어야 한다.
+- 메인 화면에서 메뉴를 출력한다.
+- 메인 화면에서 경로 조회와 종료중 입력을 받는다. (1: 경로조회, Q: 종료)
+- 경로 기준 화면에서 메뉴를 출력한다.
+- 경로 기준을 입력받는다. (1: 최단거리, 2: 최소시간)
+- 경로를 조회한다.
+    - 출발역을 입력받는다.
+    - 도착역을 입력받는다.
+    - (경로 기준) 출발역에서 도착역까지의 갈 수 있는 최단 거리인 경로를 계산한다.
+    - (시간 기준) 출발역에서 도착역까지의 총 소요시간이 가장 짧은 경로를 계산한다.
+    - 찾아낸 경로의 거리와 소요시간을 출력한다.
+- 종료한다.
+
+`예외처리`
+- 메인화면과 경로기준 입력화면에서 정해진 키워드가 아닌 입력은 모두 예외처리
+- 경로조회시 출발역과 도착역이 같은 경우
+- 출발역과 도착역이 연결되어 있지 않은 경우
+
+## 객체
+- 화면 관리 객체
+- 메인 화면
+- 경로 기준 선택 화면
+- 기능 화면
+- 출력
+- 입력
+- 역
+- 역 레포지토리
+- 노선
+- 노선 레포지토리
+- 구간
+- 구간 레포지토리

From dfa48599edecea0dedaf9fd5b58fe6d96a7905e0 Mon Sep 17 00:00:00 2001
From: soongjamm <kimstz0303@gmail.com>
Date: Sun, 20 Dec 2020 20:15:04 +0900
Subject: [PATCH 12/24] =?UTF-8?q?style(screen):=20ScreenModel=EC=97=90=20?=
 =?UTF-8?q?=EC=83=81=EC=88=98=EB=A5=BC=20=EC=B6=94=EA=B0=80=ED=95=98?=
 =?UTF-8?q?=EC=97=AC=20DONE:=EC=A2=85=EB=A3=8C=EB=82=98=20=EB=92=A4?=
 =?UTF-8?q?=EB=A1=9C=EA=B0=80=EA=B8=B0=20=EC=84=A0=ED=83=9D,=20NOTHING:?=
 =?UTF-8?q?=EB=8B=A4=EC=9D=8C=EC=97=90=20=ED=91=9C=EC=8B=9C=ED=95=A0=20?=
 =?UTF-8?q?=EC=8A=A4=ED=81=AC=EB=A6=B0=EC=9D=B4=20=EC=97=86=EC=9D=8C?=
 =?UTF-8?q?=EC=9D=84=20=EC=9D=98=EB=AF=B8=ED=95=98=EB=8F=84=EB=A1=9D=20?=
 =?UTF-8?q?=ED=95=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/subway/Application.java           |  2 +-
 src/main/java/subway/{menu => Menu}/Menu.java   |  9 +--------
 src/main/java/subway/screen/FeatureScreen.java  | 17 +++++++++++------
 src/main/java/subway/screen/MainScreen.java     |  4 ++--
 src/main/java/subway/screen/ScreenManager.java  | 11 ++++-------
 src/main/java/subway/screen/ScreenModel.java    | 12 ++++++++++--
 .../subway/screen/SelectCriteriaScreen.java     |  3 +--
 src/main/java/subway/view/OutputView.java       |  6 +++---
 8 files changed, 33 insertions(+), 31 deletions(-)
 rename src/main/java/subway/{menu => Menu}/Menu.java (80%)

diff --git a/src/main/java/subway/Application.java b/src/main/java/subway/Application.java
index 0e5a4fcbb..426a88b67 100644
--- a/src/main/java/subway/Application.java
+++ b/src/main/java/subway/Application.java
@@ -15,7 +15,7 @@ public static void main(String[] args) {
         initialize();
         ScreenManager.addNextMenuScreen(new MainScreen(scanner));
 
-        while(!ScreenManager.isEmpty()) {
+        while (!ScreenManager.isEmpty()) {
             ScreenModel nextScreen = ScreenManager.pop();
             ScreenManager.show(nextScreen);
         }
diff --git a/src/main/java/subway/menu/Menu.java b/src/main/java/subway/Menu/Menu.java
similarity index 80%
rename from src/main/java/subway/menu/Menu.java
rename to src/main/java/subway/Menu/Menu.java
index 0e126d8ed..58dc1d440 100644
--- a/src/main/java/subway/menu/Menu.java
+++ b/src/main/java/subway/Menu/Menu.java
@@ -1,11 +1,4 @@
-package subway.menu;
-
-import org.jgrapht.alg.shortestpath.DijkstraShortestPath;
-import org.jgrapht.graph.DefaultWeightedEdge;
-import org.jgrapht.graph.WeightedMultigraph;
-import subway.domain.SectionRepository;
-
-import java.util.List;
+package subway.Menu;
 
 public class Menu {
     public enum Main {
diff --git a/src/main/java/subway/screen/FeatureScreen.java b/src/main/java/subway/screen/FeatureScreen.java
index 3e4857ca1..3c93bcdce 100644
--- a/src/main/java/subway/screen/FeatureScreen.java
+++ b/src/main/java/subway/screen/FeatureScreen.java
@@ -1,6 +1,7 @@
 package subway.screen;
 
 import subway.domain.SectionRepository;
+import subway.Menu.Menu;
 import subway.view.InputView;
 
 import java.util.Scanner;
@@ -18,14 +19,18 @@ public FeatureScreen(Scanner scanner, String input) {
     @Override
     public String showScreen() {
         InputView inputView = new InputView(scanner);
-        int shortestResult = 0;
 
-        String departure = inputView.enterDeparture();
-        String arrival = inputView.enterArrival();
-        shortestResult = SectionRepository.findShortestPath(departure, arrival);
-        System.out.println(shortestResult);
+        if (input.equals(Menu.ROUTE_CRITERIA.SHORTEST_PATH.getCode())) {
+            // 최단경로 by 거리 수행
+            System.out.println("[임시] 최단경로 by 거리 수행합니다.");
+        }
 
-        return "-1";
+        if (input.equals(Menu.ROUTE_CRITERIA.SHORTEST_TIME.getCode())) {
+            // 최단경로 by 시간 수행
+            System.out.println("[임시] 최단경로 by 거리 수행합니다.");
+        }
+
+        return DONE;
     }
 
 }
diff --git a/src/main/java/subway/screen/MainScreen.java b/src/main/java/subway/screen/MainScreen.java
index d6dabed15..feecd2d28 100644
--- a/src/main/java/subway/screen/MainScreen.java
+++ b/src/main/java/subway/screen/MainScreen.java
@@ -1,6 +1,6 @@
 package subway.screen;
 
-import subway.menu.Menu;
+import subway.Menu.Menu;
 import subway.view.InputView;
 import subway.view.OutputView;
 
@@ -24,7 +24,7 @@ public String showScreen() {
 
     @Override
     public ScreenModel getNextScreen(String input) {
-        if (input.equals( Menu.Main.ROUTE_INQUIRY.getCode())) {
+        if (input.equals(Menu.Main.ROUTE_INQUIRY.getCode())) {
             return new SelectCriteriaScreen(scanner);
         }
         return null;
diff --git a/src/main/java/subway/screen/ScreenManager.java b/src/main/java/subway/screen/ScreenManager.java
index 45733fb1a..a9011fcb4 100644
--- a/src/main/java/subway/screen/ScreenManager.java
+++ b/src/main/java/subway/screen/ScreenManager.java
@@ -4,12 +4,10 @@
 import java.util.Stack;
 
 public class ScreenManager {
-    private static final String DONE = "-1";
     private static Stack<ScreenModel> screens = new Stack<>();
 
-
     public static boolean isEmpty() {
-        if(screens.isEmpty()) {
+        if (screens.isEmpty()) {
             return true;
         }
         return false;
@@ -17,7 +15,7 @@ public static boolean isEmpty() {
 
     public static void show(ScreenModel screen) {
         String result = screen.showScreen();
-        if (result == DONE) {
+        if (result == ScreenModel.DONE) {
             return;
         }
         // todo 유효한 입력인지 검증한다.
@@ -27,10 +25,9 @@ public static void show(ScreenModel screen) {
     }
 
     public static void addNextMenuScreen(ScreenModel nextScreen) {
-        if (Objects.isNull(nextScreen)) {
-            return;
+        if (!Objects.isNull(nextScreen)) {
+            screens.push(nextScreen);
         }
-        screens.push(nextScreen);
     }
 
     public static ScreenModel pop() {
diff --git a/src/main/java/subway/screen/ScreenModel.java b/src/main/java/subway/screen/ScreenModel.java
index 5edf05eb2..c3003e7a1 100644
--- a/src/main/java/subway/screen/ScreenModel.java
+++ b/src/main/java/subway/screen/ScreenModel.java
@@ -1,6 +1,14 @@
 package subway.screen;
 
 public interface ScreenModel {
-    public default String showScreen() {return "-1";}
-    public default ScreenModel getNextScreen(String input) {return null;}
+    public static final String DONE = "-1";
+    public static final ScreenModel NOTHING = null;
+
+    public default String showScreen() {
+        return DONE;
+    }
+
+    public default ScreenModel getNextScreen(String input) {
+        return NOTHING;
+    }
 }
diff --git a/src/main/java/subway/screen/SelectCriteriaScreen.java b/src/main/java/subway/screen/SelectCriteriaScreen.java
index 80732362f..c9b196eef 100644
--- a/src/main/java/subway/screen/SelectCriteriaScreen.java
+++ b/src/main/java/subway/screen/SelectCriteriaScreen.java
@@ -1,6 +1,6 @@
 package subway.screen;
 
-import subway.menu.Menu;
+import subway.Menu.Menu;
 import subway.view.InputView;
 import subway.view.OutputView;
 
@@ -8,7 +8,6 @@
 
 public class SelectCriteriaScreen implements ScreenModel {
 
-    private static final String DONE = "-1";
     private final Scanner scanner;
 
     public SelectCriteriaScreen(Scanner scanner) {
diff --git a/src/main/java/subway/view/OutputView.java b/src/main/java/subway/view/OutputView.java
index 5ab97eb3c..9517426d6 100644
--- a/src/main/java/subway/view/OutputView.java
+++ b/src/main/java/subway/view/OutputView.java
@@ -1,6 +1,6 @@
 package subway.view;
 
-import subway.menu.Menu;
+import subway.Menu.Menu;
 
 public class OutputView {
 
@@ -9,7 +9,7 @@ public class OutputView {
     public static void printMainMenu() {
         String message = "## 메인 화면" + newLine;
         for (Menu.Main menu : Menu.Main.values()) {
-            message += String.format("%s. %s" + newLine, menu.getCode(), menu.getKorean() );
+            message += String.format("%s. %s" + newLine, menu.getCode(), menu.getKorean());
         }
         System.out.println(message);
     }
@@ -17,7 +17,7 @@ public static void printMainMenu() {
     public static void printCriteriaMenu() {
         String message = "## 경로 기준" + newLine;
         for (Menu.ROUTE_CRITERIA menu : Menu.ROUTE_CRITERIA.values()) {
-            message += String.format("%s. %s" + newLine, menu.getCode(), menu.getKorean() );
+            message += String.format("%s. %s" + newLine, menu.getCode(), menu.getKorean());
         }
         System.out.println(message);
     }

From f4024141cad272414b119c55fb1bbfedd9d689e8 Mon Sep 17 00:00:00 2001
From: soongjamm <kimstz0303@gmail.com>
Date: Sun, 20 Dec 2020 20:40:01 +0900
Subject: [PATCH 13/24] =?UTF-8?q?feat:=20=EA=B5=AC=EA=B0=84=EC=9D=84=20?=
 =?UTF-8?q?=EC=B6=94=EA=B0=80=ED=95=98=EB=8A=94=20=EB=B0=A9=EC=8B=9D?=
 =?UTF-8?q?=EC=9D=84=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/subway/Application.java         | 17 +++--
 .../java/subway/domain/SectionRepository.java | 69 ++++++++-----------
 2 files changed, 41 insertions(+), 45 deletions(-)

diff --git a/src/main/java/subway/Application.java b/src/main/java/subway/Application.java
index 426a88b67..492f72add 100644
--- a/src/main/java/subway/Application.java
+++ b/src/main/java/subway/Application.java
@@ -32,12 +32,17 @@ private static void initialize() {
                 , new Line("신분당선").addTerminus("강남역", "양재시민의숲역"));
         lines.stream().forEach(line -> LineRepository.addLine(line));
 
-        List<Section> sections = Arrays.asList(new Section("2호선", "교대역", "강남역", 2, 3)
-                , new Section("2호선", "강남역", "역삼역", 2, 3)
-                , new Section("3호선", "교대역", "남부터미널역", 3, 2)
-                , new Section("3호선", "남부터미널역", "양재역", 6, 5)
-                , new Section("3호선", "양재역", "매봉역", 1, 1));
-        sections.stream().forEach(section -> SectionRepository.addSection(section));
+        SectionRepository.addSection("2호선", "강남역", 1);
+        SectionRepository.addSection("3호선", "남부터미널역", 1);
+        SectionRepository.addSection("3호선", "양재역", 2);
+        SectionRepository.addSection("신분당선", "양재역", 1);
+
+//        List<Section> sections = Arrays.asList(new Section("2호선", "강남역", 1),
+//                new Section("3호선", "남부터미널역", 1),
+//                new Section("3호선", "양재역", 2),
+//                new Section("신분당선", "양재역", 1)
+//
+//        sections.stream().forEach(section -> SectionRepository.addSection(section));
 
     }
 }
diff --git a/src/main/java/subway/domain/SectionRepository.java b/src/main/java/subway/domain/SectionRepository.java
index 1d92ee180..362d6c208 100644
--- a/src/main/java/subway/domain/SectionRepository.java
+++ b/src/main/java/subway/domain/SectionRepository.java
@@ -1,52 +1,43 @@
 package subway.domain;
 
-import org.jgrapht.alg.shortestpath.DijkstraShortestPath;
 import org.jgrapht.graph.DefaultWeightedEdge;
 import org.jgrapht.graph.WeightedMultigraph;
 
-import java.util.ArrayList;
-import java.util.List;
-
 public class SectionRepository {
 
     static WeightedMultigraph<String, DefaultWeightedEdge> graph = new WeightedMultigraph(DefaultWeightedEdge.class);
-    static List<Section> sections = new ArrayList<>();
-
-    public static List<Section> sections() {
-        return sections;
-    }
 
-    public static void addSection(Section section) {
-        sections.add(section);
-        addVertex(section.getDeparture(), section.getArrival());
-        addWeight(section.getDeparture(), section.getArrival(), section.getCostTime());
+    public static void addSection(String lineName, String stationName, int sequence) {
+        Line line = LineRepository.findLine(lineName);
+        Station station = StationRepository.findStation(stationName);
+        line.addSection(sequence, station);
     }
 
-    private static void addWeight(Station departure, Station arrival, int costTime) {
-        if (!graph.containsEdge(graph.addEdge(departure.getName(), arrival.getName()))) {
-            graph.setEdgeWeight(graph.addEdge(departure.getName(), arrival.getName()), costTime);
-        }
-    }
-
-    private static void addVertex(Station departure, Station arrival) {
-        if (!graph.containsVertex(departure.getName())) {
-            graph.addVertex(departure.getName());
-        }
-        if (!graph.containsVertex(arrival.getName())) {
-            graph.addVertex(arrival.getName());
-        }
-    }
-
-    public static int findShortestPath(String departure, String destination) {
-
-        DijkstraShortestPath dijkstraShortestPath = new DijkstraShortestPath(graph);
-        List<String> shortestPath = dijkstraShortestPath.getPath(departure, destination).getVertexList();
-
-        return (int) sections.stream()
-                .filter(section -> section.hasStation(departure, destination))
-                .mapToInt(Section::getDistance)
-                .sum();
-
-    }
+//    private static void addWeight(Station departure, Station arrival, int costTime) {
+//        if (!graph.containsEdge(graph.addEdge(departure.getName(), arrival.getName()))) {
+//            graph.setEdgeWeight(graph.addEdge(departure.getName(), arrival.getName()), costTime);
+//        }
+//    }
+//
+//    private static void addVertex(Station departure, Station arrival) {
+//        if (!graph.containsVertex(departure.getName())) {
+//            graph.addVertex(departure.getName());
+//        }
+//        if (!graph.containsVertex(arrival.getName())) {
+//            graph.addVertex(arrival.getName());
+//        }
+//    }
+//
+//    public static int findShortestPath(String departure, String destination) {
+//
+//        DijkstraShortestPath dijkstraShortestPath = new DijkstraShortestPath(graph);
+//        List<String> shortestPath = dijkstraShortestPath.getPath(departure, destination).getVertexList();
+//
+//        return (int) sections.stream()
+//                .filter(section -> section.hasStation(departure, destination))
+//                .mapToInt(Section::getDistance)
+//                .sum();
+//
+//    }
 
 }

From c18965ee8b2cf88a2c57757e83ce9264d076f91e Mon Sep 17 00:00:00 2001
From: soongjamm <kimstz0303@gmail.com>
Date: Sun, 20 Dec 2020 21:15:33 +0900
Subject: [PATCH 14/24] =?UTF-8?q?feat:=20=EA=B5=AC=EA=B0=84=EC=9D=98=20?=
 =?UTF-8?q?=EC=A0=95=EB=B3=B4(=EA=B1=B0=EB=A6=AC,=20=EC=8B=9C=EA=B0=84)=20?=
 =?UTF-8?q?=EC=B6=94=EA=B0=80=ED=95=98=EB=8A=94=20=EB=B0=A9=EC=8B=9D?=
 =?UTF-8?q?=EC=9D=84=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/subway/Application.java         |  8 ++++
 src/main/java/subway/domain/Section.java      | 40 ++++---------------
 .../java/subway/domain/SectionRepository.java | 26 ++++++++----
 3 files changed, 33 insertions(+), 41 deletions(-)

diff --git a/src/main/java/subway/Application.java b/src/main/java/subway/Application.java
index 492f72add..2c27cca74 100644
--- a/src/main/java/subway/Application.java
+++ b/src/main/java/subway/Application.java
@@ -37,6 +37,14 @@ private static void initialize() {
         SectionRepository.addSection("3호선", "양재역", 2);
         SectionRepository.addSection("신분당선", "양재역", 1);
 
+        SectionRepository.addSectinonDistanceAndCost("교대역", "강남역", 2, 3);
+        SectionRepository.addSectinonDistanceAndCost("강남역", "역삼역", 2, 3);
+        SectionRepository.addSectinonDistanceAndCost("교대역", "남부터미널역", 3, 2);
+        SectionRepository.addSectinonDistanceAndCost("남부터미널역", "양재역", 6, 5);
+        SectionRepository.addSectinonDistanceAndCost("양재역", "매봉역", 1, 1);
+        SectionRepository.addSectinonDistanceAndCost("강남역", "양재역", 2, 8);
+        SectionRepository.addSectinonDistanceAndCost("양재역", "양재시민의숲역", 10, 3);
+
 //        List<Section> sections = Arrays.asList(new Section("2호선", "강남역", 1),
 //                new Section("3호선", "남부터미널역", 1),
 //                new Section("3호선", "양재역", 2),
diff --git a/src/main/java/subway/domain/Section.java b/src/main/java/subway/domain/Section.java
index b45bfb86a..ba2c83dbe 100644
--- a/src/main/java/subway/domain/Section.java
+++ b/src/main/java/subway/domain/Section.java
@@ -1,47 +1,21 @@
 package subway.domain;
 
-public class Section {
+import java.util.HashSet;
+import java.util.Set;
 
-    private Line line;
+public class Section {
 
-    private Station departure;
-    private Station arrival;
+    private Set<String> stations = new HashSet<>();
     private int distance;
     private int costTime;
 
-    public Section(String lineName, String departureName, String arrivalName, int distance, int costTime) {
-        Line line = LineRepository.findLine(lineName);
-        Station departure = StationRepository.findStation(departureName);
-        Station arrival = StationRepository.findStation(arrivalName);
-
-        this.line = line;
-        this.departure = departure;
-        this.arrival = arrival;
+    public Section(String station1, String station2, int distance, int costTime) {
+        stations.add(station1);
+        stations.add(station2);
         this.distance = distance;
         this.costTime = costTime;
-    }
-
-    public boolean hasStation(String station1, String station2) {
-        if ((station1.equals(arrival.getName()) || station2.equals(arrival.getName()))
-                && (station1.equals(departure.getName()) || station2.equals(departure.getName()))) {
-            return true;
-        }
-        return false;
-    }
 
-    public int getDistance() {
-        return distance;
     }
 
-    public Station getDeparture() {
-        return departure;
-    }
 
-    public Station getArrival() {
-        return arrival;
-    }
-
-    public int getCostTime() {
-        return costTime;
-    }
 }
diff --git a/src/main/java/subway/domain/SectionRepository.java b/src/main/java/subway/domain/SectionRepository.java
index 362d6c208..bc0ea6213 100644
--- a/src/main/java/subway/domain/SectionRepository.java
+++ b/src/main/java/subway/domain/SectionRepository.java
@@ -3,9 +3,13 @@
 import org.jgrapht.graph.DefaultWeightedEdge;
 import org.jgrapht.graph.WeightedMultigraph;
 
+import java.util.ArrayList;
+import java.util.List;
+
 public class SectionRepository {
 
     static WeightedMultigraph<String, DefaultWeightedEdge> graph = new WeightedMultigraph(DefaultWeightedEdge.class);
+    static List<Section> sections = new ArrayList<>();
 
     public static void addSection(String lineName, String stationName, int sequence) {
         Line line = LineRepository.findLine(lineName);
@@ -13,20 +17,26 @@ public static void addSection(String lineName, String stationName, int sequence)
         line.addSection(sequence, station);
     }
 
+    public static void addSectinonDistanceAndCost(String station1, String station2, int distance, int cost) {
+        addVertex(station1, station2);
+        sections.add(new Section(station1, station2, distance, cost));
+    }
+
+    private static void addVertex(String station1, String station2) {
+        if (!graph.containsVertex(station1)) {
+            graph.addVertex(station1);
+        }
+        if (!graph.containsVertex(station2)) {
+            graph.addVertex(station2);
+        }
+    }
+
 //    private static void addWeight(Station departure, Station arrival, int costTime) {
 //        if (!graph.containsEdge(graph.addEdge(departure.getName(), arrival.getName()))) {
 //            graph.setEdgeWeight(graph.addEdge(departure.getName(), arrival.getName()), costTime);
 //        }
 //    }
 //
-//    private static void addVertex(Station departure, Station arrival) {
-//        if (!graph.containsVertex(departure.getName())) {
-//            graph.addVertex(departure.getName());
-//        }
-//        if (!graph.containsVertex(arrival.getName())) {
-//            graph.addVertex(arrival.getName());
-//        }
-//    }
 //
 //    public static int findShortestPath(String departure, String destination) {
 //

From 43d538f9fa8fcf0c6b83dc50940471315cf2a0f0 Mon Sep 17 00:00:00 2001
From: soongjamm <kimstz0303@gmail.com>
Date: Sun, 20 Dec 2020 23:02:36 +0900
Subject: [PATCH 15/24] =?UTF-8?q?feat:=20=EA=B1=B0=EB=A6=AC=EA=B8=B0?=
 =?UTF-8?q?=EC=A4=80=20=EC=B5=9C=EC=86=8C=EA=B2=BD=EB=A1=9C=EB=A5=BC=20?=
 =?UTF-8?q?=EA=B5=AC=ED=95=A0=20=EB=95=8C,=20=EA=B1=B0=EB=A6=AC=20?=
 =?UTF-8?q?=EA=B3=84=EC=82=B0=EA=B9=8C=EC=A7=80=20=EA=B5=AC=ED=98=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/subway/Application.java         |  1 -
 src/main/java/subway/domain/Section.java      |  9 ++++
 .../java/subway/domain/SectionRepository.java | 46 +++++++++++++++++--
 3 files changed, 50 insertions(+), 6 deletions(-)

diff --git a/src/main/java/subway/Application.java b/src/main/java/subway/Application.java
index 2c27cca74..ca2cb919a 100644
--- a/src/main/java/subway/Application.java
+++ b/src/main/java/subway/Application.java
@@ -44,7 +44,6 @@ private static void initialize() {
         SectionRepository.addSectinonDistanceAndCost("양재역", "매봉역", 1, 1);
         SectionRepository.addSectinonDistanceAndCost("강남역", "양재역", 2, 8);
         SectionRepository.addSectinonDistanceAndCost("양재역", "양재시민의숲역", 10, 3);
-
 //        List<Section> sections = Arrays.asList(new Section("2호선", "강남역", 1),
 //                new Section("3호선", "남부터미널역", 1),
 //                new Section("3호선", "양재역", 2),
diff --git a/src/main/java/subway/domain/Section.java b/src/main/java/subway/domain/Section.java
index ba2c83dbe..2c85f4ebf 100644
--- a/src/main/java/subway/domain/Section.java
+++ b/src/main/java/subway/domain/Section.java
@@ -14,8 +14,17 @@ public Section(String station1, String station2, int distance, int costTime) {
         stations.add(station2);
         this.distance = distance;
         this.costTime = costTime;
+    }
 
+    public Set<String> getStations() {
+        return stations;
     }
 
+    public int getDistance() {
+        return distance;
+    }
 
+    public int getCostTime() {
+        return costTime;
+    }
 }
diff --git a/src/main/java/subway/domain/SectionRepository.java b/src/main/java/subway/domain/SectionRepository.java
index bc0ea6213..f9c9a9cbc 100644
--- a/src/main/java/subway/domain/SectionRepository.java
+++ b/src/main/java/subway/domain/SectionRepository.java
@@ -1,5 +1,7 @@
 package subway.domain;
 
+import org.jgrapht.GraphPath;
+import org.jgrapht.alg.shortestpath.DijkstraShortestPath;
 import org.jgrapht.graph.DefaultWeightedEdge;
 import org.jgrapht.graph.WeightedMultigraph;
 
@@ -8,7 +10,8 @@
 
 public class SectionRepository {
 
-    static WeightedMultigraph<String, DefaultWeightedEdge> graph = new WeightedMultigraph(DefaultWeightedEdge.class);
+    static WeightedMultigraph<String, DefaultWeightedEdge> graphByDistance = new WeightedMultigraph(DefaultWeightedEdge.class);
+    static WeightedMultigraph<String, DefaultWeightedEdge> graphByCost = new WeightedMultigraph(DefaultWeightedEdge.class);
     static List<Section> sections = new ArrayList<>();
 
     public static void addSection(String lineName, String stationName, int sequence) {
@@ -19,15 +22,48 @@ public static void addSection(String lineName, String stationName, int sequence)
 
     public static void addSectinonDistanceAndCost(String station1, String station2, int distance, int cost) {
         addVertex(station1, station2);
+        setEdgeWeight(station1, station2, distance, cost);
         sections.add(new Section(station1, station2, distance, cost));
     }
 
+    private static void setEdgeWeight(String station1, String station2, int distance, int cost) {
+        graphByDistance.setEdgeWeight(graphByDistance.addEdge(station1, station2), distance);
+        graphByCost.setEdgeWeight(graphByCost.addEdge(station1, station2), cost);
+    }
+
+    public static void findShortestPathByDistance(String departure, String destination) {
+        DijkstraShortestPath dijkstraShortestPath = new DijkstraShortestPath(graphByDistance);
+        GraphPath graphPath = dijkstraShortestPath.getPath(departure, destination);
+
+        List<String> path = graphPath.getVertexList();
+        double shortestPathDistance = graphPath.getWeight();
+        int costTime = calculateCostTime(path);
+    }
+
+    private static int calculateCostTime(List<String> path) {
+        for(int i=0; i<path.size()-1; i++) {
+            // if sections중 하나가 path.get(i) path.get(i+1)둘다 가지고 있음
+            // 그 section의 거리만큼 +
+        }
+        return 1;
+    }
+
+    public static void findShortestPathByCost(String departure, String destination) {
+
+    }
+
     private static void addVertex(String station1, String station2) {
-        if (!graph.containsVertex(station1)) {
-            graph.addVertex(station1);
+        if (!graphByDistance.containsVertex(station1)) {
+            graphByDistance.addVertex(station1);
+        }
+        if (!graphByDistance.containsVertex(station2)) {
+            graphByDistance.addVertex(station2);
+        }
+        if (!graphByCost.containsVertex(station1)) {
+            graphByCost.addVertex(station1);
         }
-        if (!graph.containsVertex(station2)) {
-            graph.addVertex(station2);
+        if (!graphByCost.containsVertex(station2)) {
+            graphByCost.addVertex(station2);
         }
     }
 

From e5c0bfd93d3257cb4f6b784b208fd516642eea21 Mon Sep 17 00:00:00 2001
From: soongjamm <kimstz0303@gmail.com>
Date: Sun, 20 Dec 2020 23:09:55 +0900
Subject: [PATCH 16/24] =?UTF-8?q?feat:=20=EA=B1=B0=EB=A6=AC=EA=B8=B0?=
 =?UTF-8?q?=EC=A4=80=20=EC=B5=9C=EC=86=8C=EA=B2=BD=EB=A1=9C=EB=A5=BC=20?=
 =?UTF-8?q?=EA=B5=AC=ED=95=A0=20=EB=95=8C,=20=EC=86=8C=EC=9A=94=EB=90=98?=
 =?UTF-8?q?=EB=8A=94=20=EC=8B=9C=EA=B0=84=20=EA=B3=84=EC=82=B0=20=EA=B5=AC?=
 =?UTF-8?q?=ED=98=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/subway/domain/SectionRepository.java | 14 +++++++++++---
 src/main/java/subway/screen/FeatureScreen.java     |  1 +
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/src/main/java/subway/domain/SectionRepository.java b/src/main/java/subway/domain/SectionRepository.java
index f9c9a9cbc..6ef92b776 100644
--- a/src/main/java/subway/domain/SectionRepository.java
+++ b/src/main/java/subway/domain/SectionRepository.java
@@ -6,7 +6,9 @@
 import org.jgrapht.graph.WeightedMultigraph;
 
 import java.util.ArrayList;
+import java.util.HashSet;
 import java.util.List;
+import java.util.Set;
 
 public class SectionRepository {
 
@@ -37,15 +39,21 @@ public static void findShortestPathByDistance(String departure, String destinati
 
         List<String> path = graphPath.getVertexList();
         double shortestPathDistance = graphPath.getWeight();
-        int costTime = calculateCostTime(path);
+        int costTime = (int) sections.stream().filter(section -> calculateCostTime(path, section)).mapToInt(Section::getCostTime).sum();
+
+        System.out.println(shortestPathDistance + " " + costTime);
     }
 
-    private static int calculateCostTime(List<String> path) {
+    private static boolean calculateCostTime(List<String> path, Section section) {
+        Set<String> stations = section.getStations();
         for(int i=0; i<path.size()-1; i++) {
+            if(stations.contains(path.get(i)) && stations.contains(path.get(i+1))) {
+                return true;
+            }
             // if sections중 하나가 path.get(i) path.get(i+1)둘다 가지고 있음
             // 그 section의 거리만큼 +
         }
-        return 1;
+        return false;
     }
 
     public static void findShortestPathByCost(String departure, String destination) {
diff --git a/src/main/java/subway/screen/FeatureScreen.java b/src/main/java/subway/screen/FeatureScreen.java
index 3c93bcdce..661d739cf 100644
--- a/src/main/java/subway/screen/FeatureScreen.java
+++ b/src/main/java/subway/screen/FeatureScreen.java
@@ -23,6 +23,7 @@ public String showScreen() {
         if (input.equals(Menu.ROUTE_CRITERIA.SHORTEST_PATH.getCode())) {
             // 최단경로 by 거리 수행
             System.out.println("[임시] 최단경로 by 거리 수행합니다.");
+            SectionRepository.findShortestPathByDistance("교대역", "양재역");
         }
 
         if (input.equals(Menu.ROUTE_CRITERIA.SHORTEST_TIME.getCode())) {

From 3ed2800004509d7bcc03b5a5eaab001a6507f4fd Mon Sep 17 00:00:00 2001
From: soongjamm <kimstz0303@gmail.com>
Date: Mon, 21 Dec 2020 01:34:07 +0900
Subject: [PATCH 17/24] =?UTF-8?q?refactor:=20=EC=B5=9C=EB=8B=A8=EA=B2=BD?=
 =?UTF-8?q?=EB=A1=9C=EC=97=90=20=ED=8F=AC=ED=95=A8=EB=90=98=EB=8A=94=20?=
 =?UTF-8?q?=EA=B5=AC=EA=B0=84=EC=9D=B8=EC=A7=80=20=ED=99=95=EC=9D=B8?=
 =?UTF-8?q?=ED=95=98=EB=8A=94=20=EB=A9=94=EC=86=8C=EB=93=9C=EB=A5=BC=20Sec?=
 =?UTF-8?q?tion=20=ED=81=B4=EB=9E=98=EC=8A=A4=EB=A1=9C=20=EC=9D=B4?=
 =?UTF-8?q?=EB=8F=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/subway/domain/Section.java      | 10 +++++
 .../java/subway/domain/SectionRepository.java | 41 +++----------------
 2 files changed, 16 insertions(+), 35 deletions(-)

diff --git a/src/main/java/subway/domain/Section.java b/src/main/java/subway/domain/Section.java
index 2c85f4ebf..e1270705c 100644
--- a/src/main/java/subway/domain/Section.java
+++ b/src/main/java/subway/domain/Section.java
@@ -1,6 +1,7 @@
 package subway.domain;
 
 import java.util.HashSet;
+import java.util.List;
 import java.util.Set;
 
 public class Section {
@@ -16,6 +17,15 @@ public Section(String station1, String station2, int distance, int costTime) {
         this.costTime = costTime;
     }
 
+    public boolean isInShortestPath(List<String> shortestPath) {
+        for(int i=0; i<shortestPath.size()-1; i++) {
+            if(stations.contains(shortestPath.get(i)) && stations.contains(shortestPath.get(i+1))) {
+                return true;
+            }
+        }
+        return false;
+    }
+
     public Set<String> getStations() {
         return stations;
     }
diff --git a/src/main/java/subway/domain/SectionRepository.java b/src/main/java/subway/domain/SectionRepository.java
index 6ef92b776..08ea87c7c 100644
--- a/src/main/java/subway/domain/SectionRepository.java
+++ b/src/main/java/subway/domain/SectionRepository.java
@@ -6,9 +6,7 @@
 import org.jgrapht.graph.WeightedMultigraph;
 
 import java.util.ArrayList;
-import java.util.HashSet;
 import java.util.List;
-import java.util.Set;
 
 public class SectionRepository {
 
@@ -37,23 +35,15 @@ public static void findShortestPathByDistance(String departure, String destinati
         DijkstraShortestPath dijkstraShortestPath = new DijkstraShortestPath(graphByDistance);
         GraphPath graphPath = dijkstraShortestPath.getPath(departure, destination);
 
-        List<String> path = graphPath.getVertexList();
         double shortestPathDistance = graphPath.getWeight();
-        int costTime = (int) sections.stream().filter(section -> calculateCostTime(path, section)).mapToInt(Section::getCostTime).sum();
-
-        System.out.println(shortestPathDistance + " " + costTime);
+        int costTime = calculateCostTime(graphPath.getVertexList());
     }
 
-    private static boolean calculateCostTime(List<String> path, Section section) {
-        Set<String> stations = section.getStations();
-        for(int i=0; i<path.size()-1; i++) {
-            if(stations.contains(path.get(i)) && stations.contains(path.get(i+1))) {
-                return true;
-            }
-            // if sections중 하나가 path.get(i) path.get(i+1)둘다 가지고 있음
-            // 그 section의 거리만큼 +
-        }
-        return false;
+    private static int calculateCostTime(List<String> shortestPath) {
+        return sections.stream()
+                .filter(section -> section.isInShortestPath(shortestPath))
+                .mapToInt(Section::getCostTime)
+                .sum();
     }
 
     public static void findShortestPathByCost(String departure, String destination) {
@@ -75,23 +65,4 @@ private static void addVertex(String station1, String station2) {
         }
     }
 
-//    private static void addWeight(Station departure, Station arrival, int costTime) {
-//        if (!graph.containsEdge(graph.addEdge(departure.getName(), arrival.getName()))) {
-//            graph.setEdgeWeight(graph.addEdge(departure.getName(), arrival.getName()), costTime);
-//        }
-//    }
-//
-//
-//    public static int findShortestPath(String departure, String destination) {
-//
-//        DijkstraShortestPath dijkstraShortestPath = new DijkstraShortestPath(graph);
-//        List<String> shortestPath = dijkstraShortestPath.getPath(departure, destination).getVertexList();
-//
-//        return (int) sections.stream()
-//                .filter(section -> section.hasStation(departure, destination))
-//                .mapToInt(Section::getDistance)
-//                .sum();
-//
-//    }
-
 }

From 0af7958019347d55878a1875255a0f3ce1ddca44 Mon Sep 17 00:00:00 2001
From: soongjamm <kimstz0303@gmail.com>
Date: Mon, 21 Dec 2020 01:45:02 +0900
Subject: [PATCH 18/24] =?UTF-8?q?feat:=20=EA=B2=BD=EB=A1=9C=20=EC=A1=B0?=
 =?UTF-8?q?=ED=9A=8C=20=EA=B2=B0=EA=B3=BC=20=EC=B6=9C=EB=A0=A5=20=EA=B5=AC?=
 =?UTF-8?q?=ED=98=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/subway/Application.java              |  6 ------
 src/main/java/subway/domain/SectionRepository.java |  7 +++++--
 src/main/java/subway/view/OutputView.java          | 11 +++++++++++
 3 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/src/main/java/subway/Application.java b/src/main/java/subway/Application.java
index ca2cb919a..691658d5b 100644
--- a/src/main/java/subway/Application.java
+++ b/src/main/java/subway/Application.java
@@ -44,12 +44,6 @@ private static void initialize() {
         SectionRepository.addSectinonDistanceAndCost("양재역", "매봉역", 1, 1);
         SectionRepository.addSectinonDistanceAndCost("강남역", "양재역", 2, 8);
         SectionRepository.addSectinonDistanceAndCost("양재역", "양재시민의숲역", 10, 3);
-//        List<Section> sections = Arrays.asList(new Section("2호선", "강남역", 1),
-//                new Section("3호선", "남부터미널역", 1),
-//                new Section("3호선", "양재역", 2),
-//                new Section("신분당선", "양재역", 1)
-//
-//        sections.stream().forEach(section -> SectionRepository.addSection(section));
 
     }
 }
diff --git a/src/main/java/subway/domain/SectionRepository.java b/src/main/java/subway/domain/SectionRepository.java
index 08ea87c7c..d0236a021 100644
--- a/src/main/java/subway/domain/SectionRepository.java
+++ b/src/main/java/subway/domain/SectionRepository.java
@@ -4,6 +4,7 @@
 import org.jgrapht.alg.shortestpath.DijkstraShortestPath;
 import org.jgrapht.graph.DefaultWeightedEdge;
 import org.jgrapht.graph.WeightedMultigraph;
+import subway.view.OutputView;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -35,8 +36,10 @@ public static void findShortestPathByDistance(String departure, String destinati
         DijkstraShortestPath dijkstraShortestPath = new DijkstraShortestPath(graphByDistance);
         GraphPath graphPath = dijkstraShortestPath.getPath(departure, destination);
 
-        double shortestPathDistance = graphPath.getWeight();
-        int costTime = calculateCostTime(graphPath.getVertexList());
+        List<String> shortestPath = graphPath.getVertexList();
+        int shortestPathDistance = (int)graphPath.getWeight();
+        int costTime = calculateCostTime(shortestPath);
+        OutputView.printRouteResult(shortestPath, shortestPathDistance, costTime);
     }
 
     private static int calculateCostTime(List<String> shortestPath) {
diff --git a/src/main/java/subway/view/OutputView.java b/src/main/java/subway/view/OutputView.java
index 9517426d6..7ec1e9476 100644
--- a/src/main/java/subway/view/OutputView.java
+++ b/src/main/java/subway/view/OutputView.java
@@ -2,6 +2,8 @@
 
 import subway.Menu.Menu;
 
+import java.util.List;
+
 public class OutputView {
 
     private static final String newLine = "\n";
@@ -26,4 +28,13 @@ public static void printRouteResult() {
 
     }
 
+    public static void printRouteResult(List<String> shortestPath, int shortestPathDistance, int costTime) {
+        System.out.println("## 조회 결과");
+        System.out.println("[INFO] ---");
+        System.out.println(String.format("총 거리: %dkm", shortestPathDistance));
+        System.out.println(String.format("총 소요시간: %d분", costTime));
+        System.out.println("[INFO] ---");
+        shortestPath.stream()
+                .forEach(station -> System.out.println("[INFO] " + station));
+    }
 }

From 832ea11a281a1b48c46a53df8ca92990e8e28521 Mon Sep 17 00:00:00 2001
From: soongjamm <kimstz0303@gmail.com>
Date: Mon, 21 Dec 2020 01:52:33 +0900
Subject: [PATCH 19/24] =?UTF-8?q?fix:=20=EC=A1=B0=ED=9A=8C=ED=9B=84=20?=
 =?UTF-8?q?=ED=94=84=EB=A1=9C=EA=B7=B8=EB=9E=A8=20=EC=A2=85=EB=A3=8C?=
 =?UTF-8?q?=EB=90=98=EB=8A=94=20=ED=98=84=EC=83=81=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 gradlew                                               | 8 ++++----
 src/main/java/subway/screen/FeatureScreen.java        | 6 +++++-
 src/main/java/subway/screen/ScreenManager.java        | 2 +-
 src/main/java/subway/screen/ScreenModel.java          | 5 +++--
 src/main/java/subway/screen/SelectCriteriaScreen.java | 2 +-
 5 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/gradlew b/gradlew
index 2fe81a7d9..9b9244cd2 100755
--- a/gradlew
+++ b/gradlew
@@ -34,7 +34,7 @@ while [ -h "$PRG" ] ; do
     else
         PRG=`dirname "$PRG"`"/$link"
     fi
-done
+GO_BACK
 SAVED="`pwd`"
 cd "`dirname \"$PRG\"`/" >/dev/null
 APP_HOME="`pwd -P`"
@@ -137,7 +137,7 @@ if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
     for dir in $ROOTDIRSRAW ; do
         ROOTDIRS="$ROOTDIRS$SEP$dir"
         SEP="|"
-    done
+    GO_BACK
     OURCYGPATTERN="(^($ROOTDIRS))"
     # Add a user-defined pattern to the cygpath arguments
     if [ "$GRADLE_CYGPATTERN" != "" ] ; then
@@ -155,7 +155,7 @@ if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
             eval `echo args$i`="\"$arg\""
         fi
         i=`expr $i + 1`
-    done
+    GO_BACK
     case $i in
         0) set -- ;;
         1) set -- "$args0" ;;
@@ -172,7 +172,7 @@ fi
 
 # Escape application args
 save () {
-    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
+    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; GO_BACK
     echo " "
 }
 APP_ARGS=`save "$@"`
diff --git a/src/main/java/subway/screen/FeatureScreen.java b/src/main/java/subway/screen/FeatureScreen.java
index 661d739cf..c40c47176 100644
--- a/src/main/java/subway/screen/FeatureScreen.java
+++ b/src/main/java/subway/screen/FeatureScreen.java
@@ -31,7 +31,11 @@ public String showScreen() {
             System.out.println("[임시] 최단경로 by 거리 수행합니다.");
         }
 
-        return DONE;
+        return GO_MAIN;
     }
 
+    @Override
+    public ScreenModel getNextScreen(String input) {
+        return new MainScreen(scanner);
+    }
 }
diff --git a/src/main/java/subway/screen/ScreenManager.java b/src/main/java/subway/screen/ScreenManager.java
index a9011fcb4..13d537aab 100644
--- a/src/main/java/subway/screen/ScreenManager.java
+++ b/src/main/java/subway/screen/ScreenManager.java
@@ -15,7 +15,7 @@ public static boolean isEmpty() {
 
     public static void show(ScreenModel screen) {
         String result = screen.showScreen();
-        if (result == ScreenModel.DONE) {
+        if (result == ScreenModel.GO_BACK) {
             return;
         }
         // todo 유효한 입력인지 검증한다.
diff --git a/src/main/java/subway/screen/ScreenModel.java b/src/main/java/subway/screen/ScreenModel.java
index c3003e7a1..f77010e19 100644
--- a/src/main/java/subway/screen/ScreenModel.java
+++ b/src/main/java/subway/screen/ScreenModel.java
@@ -1,11 +1,12 @@
 package subway.screen;
 
 public interface ScreenModel {
-    public static final String DONE = "-1";
+    public static final String GO_MAIN = "0";
+    public static final String GO_BACK = "-1";
     public static final ScreenModel NOTHING = null;
 
     public default String showScreen() {
-        return DONE;
+        return GO_BACK;
     }
 
     public default ScreenModel getNextScreen(String input) {
diff --git a/src/main/java/subway/screen/SelectCriteriaScreen.java b/src/main/java/subway/screen/SelectCriteriaScreen.java
index c9b196eef..bc49b3700 100644
--- a/src/main/java/subway/screen/SelectCriteriaScreen.java
+++ b/src/main/java/subway/screen/SelectCriteriaScreen.java
@@ -21,7 +21,7 @@ public String showScreen() {
         OutputView.printCriteriaMenu();
         String input = inputView.enterFeature();
         if (input.equals(Menu.Main.QUIT)) {
-            return DONE;
+            return GO_BACK;
         }
         return input;
     }

From 8a6d5dffd1b5d232feab73985adc0307c8706eee Mon Sep 17 00:00:00 2001
From: soongjamm <kimstz0303@gmail.com>
Date: Mon, 21 Dec 2020 09:32:13 +0900
Subject: [PATCH 20/24] =?UTF-8?q?feat:=20=EA=B0=81=20=EB=A9=94=EB=89=B4=20?=
 =?UTF-8?q?=EC=84=A0=ED=83=9D=ED=99=94=EB=A9=B4=EC=97=90=EC=84=9C=20?=
 =?UTF-8?q?=EC=9E=98=EB=AA=BB=20=EC=9E=85=EB=A0=A5=EB=90=9C=20=EA=B0=92=20?=
 =?UTF-8?q?=EC=98=88=EC=99=B8=EC=B2=98=EB=A6=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/subway/Application.java                |  9 +++++++--
 src/main/java/subway/screen/MainScreen.java          | 12 ++++++++++--
 src/main/java/subway/screen/ScreenManager.java       |  2 --
 src/main/java/subway/screen/ScreenModel.java         |  8 ++++++++
 .../java/subway/screen/SelectCriteriaScreen.java     | 12 +++++++++++-
 5 files changed, 36 insertions(+), 7 deletions(-)

diff --git a/src/main/java/subway/Application.java b/src/main/java/subway/Application.java
index 691658d5b..5dba4eed8 100644
--- a/src/main/java/subway/Application.java
+++ b/src/main/java/subway/Application.java
@@ -16,8 +16,13 @@ public static void main(String[] args) {
         ScreenManager.addNextMenuScreen(new MainScreen(scanner));
 
         while (!ScreenManager.isEmpty()) {
-            ScreenModel nextScreen = ScreenManager.pop();
-            ScreenManager.show(nextScreen);
+            try {
+                ScreenModel nextScreen = ScreenManager.pop();
+                ScreenManager.show(nextScreen);
+            } catch (IllegalArgumentException e) {
+                System.out.println(e.getMessage());
+                ScreenManager.addNextMenuScreen(new MainScreen(scanner));
+            }
         }
     }
 
diff --git a/src/main/java/subway/screen/MainScreen.java b/src/main/java/subway/screen/MainScreen.java
index feecd2d28..fb7e25466 100644
--- a/src/main/java/subway/screen/MainScreen.java
+++ b/src/main/java/subway/screen/MainScreen.java
@@ -4,6 +4,7 @@
 import subway.view.InputView;
 import subway.view.OutputView;
 
+import java.util.Arrays;
 import java.util.Scanner;
 
 public class MainScreen implements ScreenModel {
@@ -24,9 +25,16 @@ public String showScreen() {
 
     @Override
     public ScreenModel getNextScreen(String input) {
-        if (input.equals(Menu.Main.ROUTE_INQUIRY.getCode())) {
+        if (anyMatchToMenu(input)){
             return new SelectCriteriaScreen(scanner);
         }
-        return null;
+        throw new IllegalArgumentException("[ERROR] 잘못된 입력입니다.\n");
     }
+
+    @Override
+    public boolean anyMatchToMenu(String input) {
+        return Arrays.stream(Menu.Main.values())
+                .anyMatch(menu -> menu.getCode().equals(input));
+    }
+
 }
diff --git a/src/main/java/subway/screen/ScreenManager.java b/src/main/java/subway/screen/ScreenManager.java
index 13d537aab..b7ce74e1a 100644
--- a/src/main/java/subway/screen/ScreenManager.java
+++ b/src/main/java/subway/screen/ScreenManager.java
@@ -18,8 +18,6 @@ public static void show(ScreenModel screen) {
         if (result == ScreenModel.GO_BACK) {
             return;
         }
-        // todo 유효한 입력인지 검증한다.
-
         addNextMenuScreen(screen.getNextScreen(result));
 
     }
diff --git a/src/main/java/subway/screen/ScreenModel.java b/src/main/java/subway/screen/ScreenModel.java
index f77010e19..45a0d35d0 100644
--- a/src/main/java/subway/screen/ScreenModel.java
+++ b/src/main/java/subway/screen/ScreenModel.java
@@ -1,5 +1,9 @@
 package subway.screen;
 
+import subway.Menu.Menu;
+
+import java.util.Arrays;
+
 public interface ScreenModel {
     public static final String GO_MAIN = "0";
     public static final String GO_BACK = "-1";
@@ -12,4 +16,8 @@ public default String showScreen() {
     public default ScreenModel getNextScreen(String input) {
         return NOTHING;
     }
+
+    public default boolean anyMatchToMenu(String input) {
+        return false;
+    }
 }
diff --git a/src/main/java/subway/screen/SelectCriteriaScreen.java b/src/main/java/subway/screen/SelectCriteriaScreen.java
index bc49b3700..11fe93e36 100644
--- a/src/main/java/subway/screen/SelectCriteriaScreen.java
+++ b/src/main/java/subway/screen/SelectCriteriaScreen.java
@@ -4,6 +4,7 @@
 import subway.view.InputView;
 import subway.view.OutputView;
 
+import java.util.Arrays;
 import java.util.Scanner;
 
 public class SelectCriteriaScreen implements ScreenModel {
@@ -28,7 +29,16 @@ public String showScreen() {
 
     @Override
     public ScreenModel getNextScreen(String input) {
-        return new FeatureScreen(scanner, input);
+        if (anyMatchToMenu(input)) {
+            return new FeatureScreen(scanner, input);
+        }
+        throw new IllegalArgumentException("[ERROR] 잘못된 입력입니다.\n");
+    }
+
+    @Override
+    public boolean anyMatchToMenu(String input) {
+        return Arrays.stream(Menu.ROUTE_CRITERIA.values())
+                .anyMatch(menu -> menu.getCode().equals(input));
     }
 
 }

From b58bc2da5ab3509f4861d4fd434001ebe72d1a53 Mon Sep 17 00:00:00 2001
From: soongjamm <kimstz0303@gmail.com>
Date: Mon, 21 Dec 2020 09:52:02 +0900
Subject: [PATCH 21/24] =?UTF-8?q?feat:=20=EA=B2=BD=EB=A1=9C=EC=A1=B0?=
 =?UTF-8?q?=ED=9A=8C=EC=8B=9C=20=EC=97=AD=EC=9D=84=20=EA=B2=80=EC=A6=9D?=
 =?UTF-8?q?=ED=95=98=EB=8A=94=20=EA=B8=B0=EB=8A=A5=20=EA=B5=AC=ED=98=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/subway/domain/SectionRepository.java     | 15 ++++++++++++---
 src/main/java/subway/screen/FeatureScreen.java    |  9 ++++-----
 src/main/java/subway/view/InputView.java          | 14 +-------------
 3 files changed, 17 insertions(+), 21 deletions(-)

diff --git a/src/main/java/subway/domain/SectionRepository.java b/src/main/java/subway/domain/SectionRepository.java
index d0236a021..ccb61936a 100644
--- a/src/main/java/subway/domain/SectionRepository.java
+++ b/src/main/java/subway/domain/SectionRepository.java
@@ -33,15 +33,25 @@ private static void setEdgeWeight(String station1, String station2, int distance
     }
 
     public static void findShortestPathByDistance(String departure, String destination) {
+        validateDepartureAndDestination(departure, destination);
+
         DijkstraShortestPath dijkstraShortestPath = new DijkstraShortestPath(graphByDistance);
         GraphPath graphPath = dijkstraShortestPath.getPath(departure, destination);
-
         List<String> shortestPath = graphPath.getVertexList();
         int shortestPathDistance = (int)graphPath.getWeight();
         int costTime = calculateCostTime(shortestPath);
         OutputView.printRouteResult(shortestPath, shortestPathDistance, costTime);
     }
 
+    private static void validateDepartureAndDestination(String departure, String destination) {
+        StationRepository.findStation(departure);
+        StationRepository.deleteStation(destination);
+        if (departure.equals(destination)) {
+            throw  new IllegalArgumentException("[ERROR] 출발역과 도착역이 같습니다.");
+        }
+    }
+
+
     private static int calculateCostTime(List<String> shortestPath) {
         return sections.stream()
                 .filter(section -> section.isInShortestPath(shortestPath))
@@ -49,7 +59,7 @@ private static int calculateCostTime(List<String> shortestPath) {
                 .sum();
     }
 
-    public static void findShortestPathByCost(String departure, String destination) {
+    public static void findShortestPathByCostTime(String departure, String destination) {
 
     }
 
@@ -67,5 +77,4 @@ private static void addVertex(String station1, String station2) {
             graphByCost.addVertex(station2);
         }
     }
-
 }
diff --git a/src/main/java/subway/screen/FeatureScreen.java b/src/main/java/subway/screen/FeatureScreen.java
index c40c47176..4e8cd4ffb 100644
--- a/src/main/java/subway/screen/FeatureScreen.java
+++ b/src/main/java/subway/screen/FeatureScreen.java
@@ -19,16 +19,15 @@ public FeatureScreen(Scanner scanner, String input) {
     @Override
     public String showScreen() {
         InputView inputView = new InputView(scanner);
+        String departure = inputView.enterDeparture();
+        String destination = inputView.enterDestination();
 
         if (input.equals(Menu.ROUTE_CRITERIA.SHORTEST_PATH.getCode())) {
-            // 최단경로 by 거리 수행
-            System.out.println("[임시] 최단경로 by 거리 수행합니다.");
-            SectionRepository.findShortestPathByDistance("교대역", "양재역");
+            SectionRepository.findShortestPathByDistance(departure, destination);
         }
 
         if (input.equals(Menu.ROUTE_CRITERIA.SHORTEST_TIME.getCode())) {
-            // 최단경로 by 시간 수행
-            System.out.println("[임시] 최단경로 by 거리 수행합니다.");
+            SectionRepository.findShortestPathByCostTime(departure, destination);
         }
 
         return GO_MAIN;
diff --git a/src/main/java/subway/view/InputView.java b/src/main/java/subway/view/InputView.java
index 5a0f624dd..6a49f3f60 100644
--- a/src/main/java/subway/view/InputView.java
+++ b/src/main/java/subway/view/InputView.java
@@ -15,24 +15,12 @@ public String enterFeature() {
         return scanner.nextLine();
     }
 
-    public void enterCriteria() {
-
-    }
-
-    public void enterDepartualStation() {
-
-    }
-
-    public void enterArrivalStation() {
-
-    }
-
     public String enterDeparture() {
         System.out.println("## 출발역을 입력하세요.");
         return scanner.nextLine();
     }
 
-    public String enterArrival() {
+    public String enterDestination() {
         System.out.println("## 도착역을 입력하세요.");
         return scanner.nextLine();
     }

From 10bef674a5992148ea7b71a7a0de47c92404b20c Mon Sep 17 00:00:00 2001
From: soongjamm <kimstz0303@gmail.com>
Date: Mon, 21 Dec 2020 10:01:09 +0900
Subject: [PATCH 22/24] =?UTF-8?q?style:=20=EC=8B=9C=EA=B0=84=EA=B3=BC=20?=
 =?UTF-8?q?=EA=B4=80=EB=A0=A8=EB=90=9C=20=EC=9D=B4=EB=A6=84=EC=9D=84=20cos?=
 =?UTF-8?q?t=20->=20requiredTime=20=EC=9C=BC=EB=A1=9C=20=EB=B3=80=EA=B2=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/subway/Application.java         | 14 ++++++-------
 src/main/java/subway/domain/Section.java      | 10 +++++-----
 .../java/subway/domain/SectionRepository.java | 20 +++++++++----------
 .../java/subway/screen/FeatureScreen.java     |  2 +-
 src/main/java/subway/view/OutputView.java     |  1 +
 5 files changed, 24 insertions(+), 23 deletions(-)

diff --git a/src/main/java/subway/Application.java b/src/main/java/subway/Application.java
index 5dba4eed8..4a06e12fb 100644
--- a/src/main/java/subway/Application.java
+++ b/src/main/java/subway/Application.java
@@ -42,13 +42,13 @@ private static void initialize() {
         SectionRepository.addSection("3호선", "양재역", 2);
         SectionRepository.addSection("신분당선", "양재역", 1);
 
-        SectionRepository.addSectinonDistanceAndCost("교대역", "강남역", 2, 3);
-        SectionRepository.addSectinonDistanceAndCost("강남역", "역삼역", 2, 3);
-        SectionRepository.addSectinonDistanceAndCost("교대역", "남부터미널역", 3, 2);
-        SectionRepository.addSectinonDistanceAndCost("남부터미널역", "양재역", 6, 5);
-        SectionRepository.addSectinonDistanceAndCost("양재역", "매봉역", 1, 1);
-        SectionRepository.addSectinonDistanceAndCost("강남역", "양재역", 2, 8);
-        SectionRepository.addSectinonDistanceAndCost("양재역", "양재시민의숲역", 10, 3);
+        SectionRepository.addSectinonDistanceAndTime("교대역", "강남역", 2, 3);
+        SectionRepository.addSectinonDistanceAndTime("강남역", "역삼역", 2, 3);
+        SectionRepository.addSectinonDistanceAndTime("교대역", "남부터미널역", 3, 2);
+        SectionRepository.addSectinonDistanceAndTime("남부터미널역", "양재역", 6, 5);
+        SectionRepository.addSectinonDistanceAndTime("양재역", "매봉역", 1, 1);
+        SectionRepository.addSectinonDistanceAndTime("강남역", "양재역", 2, 8);
+        SectionRepository.addSectinonDistanceAndTime("양재역", "양재시민의숲역", 10, 3);
 
     }
 }
diff --git a/src/main/java/subway/domain/Section.java b/src/main/java/subway/domain/Section.java
index e1270705c..aed82e2f8 100644
--- a/src/main/java/subway/domain/Section.java
+++ b/src/main/java/subway/domain/Section.java
@@ -8,13 +8,13 @@ public class Section {
 
     private Set<String> stations = new HashSet<>();
     private int distance;
-    private int costTime;
+    private int requiredTime;
 
-    public Section(String station1, String station2, int distance, int costTime) {
+    public Section(String station1, String station2, int distance, int requiredTime) {
         stations.add(station1);
         stations.add(station2);
         this.distance = distance;
-        this.costTime = costTime;
+        this.requiredTime = requiredTime;
     }
 
     public boolean isInShortestPath(List<String> shortestPath) {
@@ -34,7 +34,7 @@ public int getDistance() {
         return distance;
     }
 
-    public int getCostTime() {
-        return costTime;
+    public int getRequiredTime() {
+        return requiredTime;
     }
 }
diff --git a/src/main/java/subway/domain/SectionRepository.java b/src/main/java/subway/domain/SectionRepository.java
index ccb61936a..0bc4cf324 100644
--- a/src/main/java/subway/domain/SectionRepository.java
+++ b/src/main/java/subway/domain/SectionRepository.java
@@ -21,15 +21,15 @@ public static void addSection(String lineName, String stationName, int sequence)
         line.addSection(sequence, station);
     }
 
-    public static void addSectinonDistanceAndCost(String station1, String station2, int distance, int cost) {
+    public static void addSectinonDistanceAndTime(String station1, String station2, int distance, int requiredTime) {
         addVertex(station1, station2);
-        setEdgeWeight(station1, station2, distance, cost);
-        sections.add(new Section(station1, station2, distance, cost));
+        setEdgeWeight(station1, station2, distance, requiredTime);
+        sections.add(new Section(station1, station2, distance, requiredTime));
     }
 
-    private static void setEdgeWeight(String station1, String station2, int distance, int cost) {
+    private static void setEdgeWeight(String station1, String station2, int distance, int requiredTime) {
         graphByDistance.setEdgeWeight(graphByDistance.addEdge(station1, station2), distance);
-        graphByCost.setEdgeWeight(graphByCost.addEdge(station1, station2), cost);
+        graphByCost.setEdgeWeight(graphByCost.addEdge(station1, station2), requiredTime);
     }
 
     public static void findShortestPathByDistance(String departure, String destination) {
@@ -39,8 +39,8 @@ public static void findShortestPathByDistance(String departure, String destinati
         GraphPath graphPath = dijkstraShortestPath.getPath(departure, destination);
         List<String> shortestPath = graphPath.getVertexList();
         int shortestPathDistance = (int)graphPath.getWeight();
-        int costTime = calculateCostTime(shortestPath);
-        OutputView.printRouteResult(shortestPath, shortestPathDistance, costTime);
+        int requiredTime = calculateRequiredTime(shortestPath);
+        OutputView.printRouteResult(shortestPath, shortestPathDistance, requiredTime);
     }
 
     private static void validateDepartureAndDestination(String departure, String destination) {
@@ -52,14 +52,14 @@ private static void validateDepartureAndDestination(String departure, String des
     }
 
 
-    private static int calculateCostTime(List<String> shortestPath) {
+    private static int calculateRequiredTime(List<String> shortestPath) {
         return sections.stream()
                 .filter(section -> section.isInShortestPath(shortestPath))
-                .mapToInt(Section::getCostTime)
+                .mapToInt(Section::getRequiredTime)
                 .sum();
     }
 
-    public static void findShortestPathByCostTime(String departure, String destination) {
+    public static void findShortestPathByRequiredTime(String departure, String destination) {
 
     }
 
diff --git a/src/main/java/subway/screen/FeatureScreen.java b/src/main/java/subway/screen/FeatureScreen.java
index 4e8cd4ffb..f65a333e3 100644
--- a/src/main/java/subway/screen/FeatureScreen.java
+++ b/src/main/java/subway/screen/FeatureScreen.java
@@ -27,7 +27,7 @@ public String showScreen() {
         }
 
         if (input.equals(Menu.ROUTE_CRITERIA.SHORTEST_TIME.getCode())) {
-            SectionRepository.findShortestPathByCostTime(departure, destination);
+            SectionRepository.findShortestPathByRequiredTime(departure, destination);
         }
 
         return GO_MAIN;
diff --git a/src/main/java/subway/view/OutputView.java b/src/main/java/subway/view/OutputView.java
index 7ec1e9476..0dcdc2ad5 100644
--- a/src/main/java/subway/view/OutputView.java
+++ b/src/main/java/subway/view/OutputView.java
@@ -29,6 +29,7 @@ public static void printRouteResult() {
     }
 
     public static void printRouteResult(List<String> shortestPath, int shortestPathDistance, int costTime) {
+        System.out.println();
         System.out.println("## 조회 결과");
         System.out.println("[INFO] ---");
         System.out.println(String.format("총 거리: %dkm", shortestPathDistance));

From 6cd3836e16ee9970d1ff724bfddaecfb3d528568 Mon Sep 17 00:00:00 2001
From: soongjamm <kimstz0303@gmail.com>
Date: Mon, 21 Dec 2020 10:07:30 +0900
Subject: [PATCH 23/24] =?UTF-8?q?feat:=20=EC=8B=9C=EA=B0=84=EA=B8=B0?=
 =?UTF-8?q?=EC=A4=80=20=EC=B5=9C=EB=8B=A8=EA=B1=B0=EB=A6=AC=20=EC=B0=BE?=
 =?UTF-8?q?=EA=B8=B0=20=EA=B5=AC=ED=98=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/subway/domain/SectionRepository.java | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/src/main/java/subway/domain/SectionRepository.java b/src/main/java/subway/domain/SectionRepository.java
index 0bc4cf324..d430ffd51 100644
--- a/src/main/java/subway/domain/SectionRepository.java
+++ b/src/main/java/subway/domain/SectionRepository.java
@@ -60,7 +60,21 @@ private static int calculateRequiredTime(List<String> shortestPath) {
     }
 
     public static void findShortestPathByRequiredTime(String departure, String destination) {
+        validateDepartureAndDestination(departure, destination);
+
+        DijkstraShortestPath dijkstraShortestPath = new DijkstraShortestPath(graphByCost);
+        GraphPath graphPath = dijkstraShortestPath.getPath(departure, destination);
+        List<String> shortestPath = graphPath.getVertexList();
+        int shortestPathRequiredTime = (int)graphPath.getWeight();
+        int distance = calculateDistance(shortestPath);
+        OutputView.printRouteResult(shortestPath, distance, shortestPathRequiredTime);
+    }
 
+    private static int calculateDistance(List<String> shortestPath) {
+        return sections.stream()
+                .filter(section -> section.isInShortestPath(shortestPath))
+                .mapToInt(Section::getDistance)
+                .sum();
     }
 
     private static void addVertex(String station1, String station2) {

From 22f0cfcd0968bdd8d49308f5c6ee1bd6bfb07f0b Mon Sep 17 00:00:00 2001
From: soongjamm <kimstz0303@gmail.com>
Date: Mon, 21 Dec 2020 15:03:40 +0900
Subject: [PATCH 24/24] =?UTF-8?q?feat(PathResult):=20=EA=B2=BD=EB=A1=9C=20?=
 =?UTF-8?q?=EA=B2=80=EC=83=89=20=EA=B2=B0=EA=B3=BC=EB=A5=BC=20=EC=A0=80?=
 =?UTF-8?q?=EC=9E=A5=ED=95=98=EB=8A=94=20=ED=81=B4=EB=9E=98=EC=8A=A4=20?=
 =?UTF-8?q?=EC=83=9D=EC=84=B1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/subway/Menu/Menu.java           |  2 +-
 src/main/java/subway/PathResult.java          | 27 +++++++++++++
 .../java/subway/domain/SectionRepository.java | 40 +++++++++----------
 .../java/subway/screen/FeatureScreen.java     | 14 +++----
 src/main/java/subway/view/InputView.java      |  2 +
 src/main/java/subway/view/OutputView.java     | 14 ++++---
 6 files changed, 64 insertions(+), 35 deletions(-)
 create mode 100644 src/main/java/subway/PathResult.java

diff --git a/src/main/java/subway/Menu/Menu.java b/src/main/java/subway/Menu/Menu.java
index 58dc1d440..05467cdbc 100644
--- a/src/main/java/subway/Menu/Menu.java
+++ b/src/main/java/subway/Menu/Menu.java
@@ -23,7 +23,7 @@ public String getKorean() {
     }
 
     public enum ROUTE_CRITERIA {
-        SHORTEST_PATH("1", "최단 거리"),
+        SHORTEST_DISTANCE("1", "최단 거리"),
         SHORTEST_TIME("2", "최소 시간"),
         BACK("B", "돌아가기");
 
diff --git a/src/main/java/subway/PathResult.java b/src/main/java/subway/PathResult.java
new file mode 100644
index 000000000..fa40092b0
--- /dev/null
+++ b/src/main/java/subway/PathResult.java
@@ -0,0 +1,27 @@
+package subway;
+
+import java.util.List;
+
+public class PathResult {
+    List<String> shortestPath;
+    int distance;
+    int requiredTime;
+
+    public PathResult(List<String> shortestPath, int distance, int requiredTime) {
+        this.shortestPath = shortestPath;
+        this.distance = distance;
+        this.requiredTime = requiredTime;
+    }
+
+    public List<String> getShortestPath() {
+        return shortestPath;
+    }
+
+    public int getDistance() {
+        return distance;
+    }
+
+    public int getRequiredTime() {
+        return requiredTime;
+    }
+}
diff --git a/src/main/java/subway/domain/SectionRepository.java b/src/main/java/subway/domain/SectionRepository.java
index d430ffd51..0417a1d08 100644
--- a/src/main/java/subway/domain/SectionRepository.java
+++ b/src/main/java/subway/domain/SectionRepository.java
@@ -4,7 +4,8 @@
 import org.jgrapht.alg.shortestpath.DijkstraShortestPath;
 import org.jgrapht.graph.DefaultWeightedEdge;
 import org.jgrapht.graph.WeightedMultigraph;
-import subway.view.OutputView;
+import subway.Menu.Menu;
+import subway.PathResult;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -32,26 +33,36 @@ private static void setEdgeWeight(String station1, String station2, int distance
         graphByCost.setEdgeWeight(graphByCost.addEdge(station1, station2), requiredTime);
     }
 
-    public static void findShortestPathByDistance(String departure, String destination) {
+    public static PathResult findshortestPath(String input, String departure, String destination) {
         validateDepartureAndDestination(departure, destination);
 
-        DijkstraShortestPath dijkstraShortestPath = new DijkstraShortestPath(graphByDistance);
+        WeightedMultigraph<String, DefaultWeightedEdge> graph = null;
+        if (input.equals(Menu.ROUTE_CRITERIA.SHORTEST_DISTANCE.getCode())) {
+            graph = graphByDistance;
+        }
+        if (input.equals(Menu.ROUTE_CRITERIA.SHORTEST_TIME.getCode())) {
+            graph = graphByCost;
+        }
+        List<String> shortestPath = getShortestPath(graph, departure, destination);
+
+        return new PathResult(shortestPath, calculateDistance(shortestPath), calculateRequiredTime(shortestPath));
+    }
+
+    public static List<String> getShortestPath(WeightedMultigraph<String, DefaultWeightedEdge> graph, String departure, String destination) {
+        DijkstraShortestPath dijkstraShortestPath = new DijkstraShortestPath(graph);
         GraphPath graphPath = dijkstraShortestPath.getPath(departure, destination);
-        List<String> shortestPath = graphPath.getVertexList();
-        int shortestPathDistance = (int)graphPath.getWeight();
-        int requiredTime = calculateRequiredTime(shortestPath);
-        OutputView.printRouteResult(shortestPath, shortestPathDistance, requiredTime);
+        return  graphPath.getVertexList();
+
     }
 
     private static void validateDepartureAndDestination(String departure, String destination) {
         StationRepository.findStation(departure);
         StationRepository.deleteStation(destination);
         if (departure.equals(destination)) {
-            throw  new IllegalArgumentException("[ERROR] 출발역과 도착역이 같습니다.");
+            throw new IllegalArgumentException("[ERROR] 출발역과 도착역이 같습니다.");
         }
     }
 
-
     private static int calculateRequiredTime(List<String> shortestPath) {
         return sections.stream()
                 .filter(section -> section.isInShortestPath(shortestPath))
@@ -59,17 +70,6 @@ private static int calculateRequiredTime(List<String> shortestPath) {
                 .sum();
     }
 
-    public static void findShortestPathByRequiredTime(String departure, String destination) {
-        validateDepartureAndDestination(departure, destination);
-
-        DijkstraShortestPath dijkstraShortestPath = new DijkstraShortestPath(graphByCost);
-        GraphPath graphPath = dijkstraShortestPath.getPath(departure, destination);
-        List<String> shortestPath = graphPath.getVertexList();
-        int shortestPathRequiredTime = (int)graphPath.getWeight();
-        int distance = calculateDistance(shortestPath);
-        OutputView.printRouteResult(shortestPath, distance, shortestPathRequiredTime);
-    }
-
     private static int calculateDistance(List<String> shortestPath) {
         return sections.stream()
                 .filter(section -> section.isInShortestPath(shortestPath))
diff --git a/src/main/java/subway/screen/FeatureScreen.java b/src/main/java/subway/screen/FeatureScreen.java
index f65a333e3..fc003f153 100644
--- a/src/main/java/subway/screen/FeatureScreen.java
+++ b/src/main/java/subway/screen/FeatureScreen.java
@@ -1,11 +1,13 @@
 package subway.screen;
 
-import subway.domain.SectionRepository;
-import subway.Menu.Menu;
+import subway.PathResult;
 import subway.view.InputView;
+import subway.view.OutputView;
 
 import java.util.Scanner;
 
+import static subway.domain.SectionRepository.*;
+
 public class FeatureScreen implements ScreenModel {
 
     private final Scanner scanner;
@@ -21,14 +23,10 @@ public String showScreen() {
         InputView inputView = new InputView(scanner);
         String departure = inputView.enterDeparture();
         String destination = inputView.enterDestination();
+        PathResult pathResult = findshortestPath(input, departure, destination);
+        OutputView.printRouteResult(pathResult);
 
-        if (input.equals(Menu.ROUTE_CRITERIA.SHORTEST_PATH.getCode())) {
-            SectionRepository.findShortestPathByDistance(departure, destination);
-        }
 
-        if (input.equals(Menu.ROUTE_CRITERIA.SHORTEST_TIME.getCode())) {
-            SectionRepository.findShortestPathByRequiredTime(departure, destination);
-        }
 
         return GO_MAIN;
     }
diff --git a/src/main/java/subway/view/InputView.java b/src/main/java/subway/view/InputView.java
index 6a49f3f60..0ca9b7d96 100644
--- a/src/main/java/subway/view/InputView.java
+++ b/src/main/java/subway/view/InputView.java
@@ -16,11 +16,13 @@ public String enterFeature() {
     }
 
     public String enterDeparture() {
+        System.out.println();
         System.out.println("## 출발역을 입력하세요.");
         return scanner.nextLine();
     }
 
     public String enterDestination() {
+        System.out.println();
         System.out.println("## 도착역을 입력하세요.");
         return scanner.nextLine();
     }
diff --git a/src/main/java/subway/view/OutputView.java b/src/main/java/subway/view/OutputView.java
index 0dcdc2ad5..05167b51a 100644
--- a/src/main/java/subway/view/OutputView.java
+++ b/src/main/java/subway/view/OutputView.java
@@ -1,6 +1,7 @@
 package subway.view;
 
 import subway.Menu.Menu;
+import subway.PathResult;
 
 import java.util.List;
 
@@ -24,18 +25,19 @@ public static void printCriteriaMenu() {
         System.out.println(message);
     }
 
-    public static void printRouteResult() {
+    public static void printRouteResult(PathResult pathResult) {
+        List<String> shortestPath = pathResult.getShortestPath();
+        int shortestPathDistance = pathResult.getDistance();
+        int requiredTime = pathResult.getRequiredTime();
 
-    }
-
-    public static void printRouteResult(List<String> shortestPath, int shortestPathDistance, int costTime) {
         System.out.println();
         System.out.println("## 조회 결과");
         System.out.println("[INFO] ---");
-        System.out.println(String.format("총 거리: %dkm", shortestPathDistance));
-        System.out.println(String.format("총 소요시간: %d분", costTime));
+        System.out.println(String.format("[INFO] 총 거리: %dkm", shortestPathDistance));
+        System.out.println(String.format("[INFO] 총 소요시간: %d분", requiredTime));
         System.out.println("[INFO] ---");
         shortestPath.stream()
                 .forEach(station -> System.out.println("[INFO] " + station));
+        System.out.println();
     }
 }