From 419581d0d9bfb97001df3bc348699012049c85e4 Mon Sep 17 00:00:00 2001
From: DH Lim <dlarkfl2@gamil.com>
Date: Thu, 10 Dec 2020 12:33:42 +0900
Subject: [PATCH 01/20] =?UTF-8?q?docs(README):=20=EA=B5=AC=ED=98=84?=
 =?UTF-8?q?=ED=95=A0=20=EA=B8=B0=EB=8A=A5=20=EB=AA=A9=EB=A1=9D=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

---
 docs/README.md | 57 ++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 57 insertions(+)
 create mode 100644 docs/README.md

diff --git a/docs/README.md b/docs/README.md
new file mode 100644
index 000000000..2dcdc4b95
--- /dev/null
+++ b/docs/README.md
@@ -0,0 +1,57 @@
+# 🚀 구현할 기능 목록
+
+## 입력
+- 메뉴나 기능 선택시 입력값이 범위 안의 입력인지 검증한다.
+### 입력 예외 상황
+- 메인과 관리 화면에서 보여주는 기능이 아닌경우
+- 등록할 지하철 역 관련
+  - 이름의 길이가 2자 미만인 경우
+  - 이름이 '역'으로 끝나지 않는 경우
+  - 이름에 공백이 들어가는 경우
+  - 이름이 숫자와 한글이 아닌 경우
+  - 중복된 이름인 경우
+- 등록할 노선 관련
+  - 이름의 길이가 2자 미만인 경우
+  - 상행 종점역과 하행 종점역의 이름이 같은 경우
+
+<br>
+
+## 출력
+- 어플리케이션 화면 레이아웃 구성
+    1. 주 메뉴 화면
+    2. 기능 선택 화면
+        - 세부 기능 포함
+    3. 입력 안내 화면
+    4. 입력 결과 출력
+- 입력 유도 메시지 출력
+- 입력 반응 메시지 출력
+    - 기대 출력 결과시 '[INFO] ...'
+    - 에러시 '[ERROR] ...'
+
+<br>
+
+## 주요 로직
+### 지하철 역 관련
+- 역 등록
+- 역 삭제
+- 역 조회
+
+### 지하철 노선 관련
+- 노선 등록
+- 노선 삭제
+- 노선 조회
+
+### 구간 관련
+- 구간 추가(노선에 역을 추가)
+- 구간 삭제
+- 구간 조회
+
+<br>
+
+## 초기 설정
+- 역 등록
+  - 교대역, 강남역, 역삼역, 남부터미널역, 양재역, 양재시민의숲역, 매봉역
+- 노선 등록(왼쪽 끝이 상행 종점)
+  - 2호선: 교대역 - 강남역 - 역삼역
+  - 3호선: 교대역 - 남부터미널역 - 양재역 - 매봉역
+  - 신분당선: 강남역 - 양재역 - 양재시민의숲역
\ No newline at end of file

From 5e028b796e10b0722e09e88b18605363920b7ad5 Mon Sep 17 00:00:00 2001
From: DH Lim <dlarkfl2@gamil.com>
Date: Thu, 10 Dec 2020 23:45:15 +0900
Subject: [PATCH 02/20] =?UTF-8?q?docs(README):=20=EC=A3=BC=EC=9A=94=20?=
 =?UTF-8?q?=EB=A1=9C=EC=A7=81=20=EC=84=B8=EB=B6=80=20=EA=B5=AC=ED=98=84?=
 =?UTF-8?q?=ED=95=A0=20=EA=B8=B0=EB=8A=A5=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 docs/README.md | 50 +++++++++++++++++++++++++++++++++++++++++++++-----
 1 file changed, 45 insertions(+), 5 deletions(-)

diff --git a/docs/README.md b/docs/README.md
index 2dcdc4b95..70842ae7e 100644
--- a/docs/README.md
+++ b/docs/README.md
@@ -12,7 +12,12 @@
   - 중복된 이름인 경우
 - 등록할 노선 관련
   - 이름의 길이가 2자 미만인 경우
+  - 이름이 '선'으로 끝나지 않는 경우
+  - 이름이 숫자와 한글이 아닌 경우
   - 상행 종점역과 하행 종점역의 이름이 같은 경우
+- 등록할 구간 관련
+  - 선택한 노선이 등록되지 않은 노선인 경우
+  - 역이름이 등록되지 않은 경우
 
 <br>
 
@@ -31,20 +36,55 @@
 <br>
 
 ## 주요 로직
-### 지하철 역 관련
+### 메인화면
+- 선택한 메뉴로 이동 또는 기능을 실행한다.
+  - 역 관리, 노선 관리, 구간 관리 -> 세부 기능 선택 안내
+  - 지하철 노선도 출력 -> 기능 실행
+  - 종료 -> 어플리케이션 종료
+
+### 역 관리 관련
 - 역 등록
+  - 입력받은 역을 검증
+  - 검증 결과에 따라 저장소에 역 저장 후 [INFO]또는 [ERROR] 메시지 출력
 - 역 삭제
+  - 입력받은 역을 검증
+  - 검증 결과에 따라 저장소에서 삭제 후 [INFO]또는 [ERROR] 메시지 출력
 - 역 조회
+  - 저장소 모든 역을 호출하여 출력
+- 돌아가기
+  - 메인 화면 호출
 
-### 지하철 노선 관련
+### 노선 관리 관련
 - 노선 등록
+  1. 등록할 노선 이름 입력 검증
+  2. 노선의 상행 종점역 이름 입력 검증
+  3. 노선의 하행 종점역 이름 입력 검증
+  4. 검증 후 결과에 따라 저장소에 저장 후 [INFO]또는 [ERROR] 메시지 출력
 - 노선 삭제
+  - 입력받은 노선 검증
+  - 검증 결과에 따라 저장소에서 삭제 후 [INFO]또는 [ERROR] 메시지 출력
 - 노선 조회
+  - 저장소 모든 노선 호출하여 출력
+- 돌아가기
+  - 메인 화면 호출
 
-### 구간 관련
-- 구간 추가(노선에 역을 추가)
+### 구간 관리 관련
+- 구간 등록(노선에 역을 추가)
+  - 구간 등록할 노선 검증
+  - 역 이름 검증
+  - 순서 검증
+  - 검증 후 결과에 따라 저장소에 저장 및 역 재배열 후 [INFO]또는 [ERROR] 메시지 출력
 - 구간 삭제
-- 구간 조회
+  - 삭제할 구간 노선 검증
+  - 역 이름 검증
+  - 검증 후 결과에 따라 저장소에서 삭제 및 역 재배열 후 [INFO]또는 [ERROR] 메시지 출력
+- 돌아가기
+  - 메인 화면 호출
+
+### 지하철 노선도 출력 관련
+- 노선도는 이름 순으로 출력한다
+- 각 노선도는 노선의 이름과 등록된 역을 포함한다
+- 등록된 역은 순서대로 출력한다
 
 <br>
 

From 11cf5782b9c8def9cd7fecbe6b5d0e18900df87f Mon Sep 17 00:00:00 2001
From: DH Lim <dlarkfl2@gamil.com>
Date: Mon, 14 Dec 2020 12:23:40 +0900
Subject: [PATCH 03/20] =?UTF-8?q?feat(InputView):=20=EC=82=AC=EC=9A=A9?=
 =?UTF-8?q?=EC=9E=90=20=EB=8D=B0=EC=9D=B4=ED=84=B0=20=EC=9E=85=EB=A0=A5=20?=
 =?UTF-8?q?=EA=B8=B0=EB=8A=A5=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/subway/view/InputView.java | 36 ++++++++++++++++++++++++
 1 file changed, 36 insertions(+)
 create mode 100644 src/main/java/subway/view/InputView.java

diff --git a/src/main/java/subway/view/InputView.java b/src/main/java/subway/view/InputView.java
new file mode 100644
index 000000000..ef16215ac
--- /dev/null
+++ b/src/main/java/subway/view/InputView.java
@@ -0,0 +1,36 @@
+package subway.view;
+
+import java.util.Scanner;
+
+public class InputView {
+    private String inputData;
+
+
+    public String getInputData() {
+        return inputData;
+    }
+
+//    public void run(Scanner scanner) {
+//        OutputView.guideChooseFunction();
+//        scanData(scanner);
+//    }
+
+    public void scanData(Scanner scanner) {
+        inputData = scanner.nextLine();
+        System.out.println();
+
+        /*
+        * 구간 재정의 할것. 역과 역사이를 구간. 구간이 모여서 노선.
+        *
+        * 에러코드 받으면 다시 실행
+        *
+        * 화면단 구성
+        * 메인화면 stack 1
+        * 기능선택 stack 2
+        *
+        * */
+    }
+
+
+
+}

From 43b5b9c8ebb0d9bc2c88add9244dfcffaa424e54 Mon Sep 17 00:00:00 2001
From: DH Lim <dlarkfl2@gamil.com>
Date: Mon, 14 Dec 2020 12:25:16 +0900
Subject: [PATCH 04/20] =?UTF-8?q?feat(OutputView):=20=EC=9E=85=EB=A0=A5?=
 =?UTF-8?q?=EC=95=88=EB=82=B4,=20=ED=99=94=EB=A9=B4=EA=B5=AC=EC=84=B1,=20?=
 =?UTF-8?q?=EC=A1=B0=ED=9A=8C=20=EC=B6=9C=EB=A0=A5=20=EA=B8=B0=EB=8A=A5=20?=
 =?UTF-8?q?=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/subway/view/OutputView.java | 165 ++++++++++++++++++++++
 1 file changed, 165 insertions(+)
 create mode 100644 src/main/java/subway/view/OutputView.java

diff --git a/src/main/java/subway/view/OutputView.java b/src/main/java/subway/view/OutputView.java
new file mode 100644
index 000000000..eaf8eb12c
--- /dev/null
+++ b/src/main/java/subway/view/OutputView.java
@@ -0,0 +1,165 @@
+package subway.view;
+
+import subway.domain.Line;
+import subway.domain.LineRepository;
+import subway.domain.Station;
+import subway.domain.StationRepository;
+
+public class OutputView {
+    private static final String NEXT_LINE = "\n";
+    private static final String GUIDE_MESSAGE_START= "##";
+    private static final String GUIDE_MESSAGE_END_CHOOSE_FUNCTION = "원하는 기능을 선택하세요.";
+
+    private static final String GUIDE_MESSAGE_END_ADD_STATION = "등록할 역 이름을 입력하세요.";
+    private static final String GUIDE_MESSAGE_END_DELETE_STATION = "삭제할 역 이름을 입력하세요.";
+
+    private static final String GUIDE_MESSAGE_END_ADD_LINE_NAME = "등록할 노선 이름을 입력하세요.";
+    private static final String GUIDE_MESSAGE_END_ADD_LINE_UPWARD_TERMINAL = "등록할 노선의 상행 종점역 이름을 입력하세요.";
+    private static final String GUIDE_MESSAGE_END_ADD_LINE_DOWNWARD_TERMINAL = "둥록할 노선의 하행 종점역 이름을 입력하세요.";
+    private static final String GUIDE_MESSAGE_END_DELETE_LINE = "삭제할 노선 이름을 입력하세요.";
+
+    private static final String GUIDE_MESSAGE_END_ADD_ROUTE_LINE = "노선을 입력하세요.";
+    private static final String GUIDE_MESSAGE_END_ADD_ROUTE_STATION = "역 이름을 입력하세요.";
+    private static final String GUIDE_MESSAGE_END_ADD_ROUTE_ORDER = "순서를 입력하세요.";
+    private static final String GUIDE_MESSAGE_END_DELETE_ROUTE_LINE = "삭제할 구간의 노선을 입력하세요.";
+    private static final String GUIDE_MESSAGE_END_DELETE_ROUTE_STATION = "삭제할 구간의 역을 입력하세요.";
+    //
+    private static final String INFO_MESSAGE_START = "[INFO]";
+    private static final String INFO_MESSAGE_END_ADD_STATION = "지하철 역이 등록되었습니다.";
+    private static final String INFO_MESSAGE_END_DELETE_STATION = "지하철 역이 삭제되었습니다.";
+
+    private static final String INFO_MESSAGE_END_ADD_LINE = "지하철 노선이 등록되었습니다.";
+    private static final String INFO_MESSAGE_END_DELETE_LINE = "지하철 노선이 삭제되었습니다.";
+
+    private static final String INFO_MESSAGE_END_ADD_ROUTE = "구간이 등록되었습니다.";
+    private static final String INFO_MESSAGE_END_DELETE_ROUTE = "구간이 삭제되었습니다.";
+
+
+    private static final String ERROR_MESSAGE_START = "[ERROR]";
+    private static final String ERROR_MESSAGE_END_CHOOSE_FUNCTION = "선택할 수 없는 기능입니다.";
+    private static final String ERROR_MESSAGE_END_ADD_STATION_DUPLICATE = "이미 등록된 역 이름입니다.";
+//    private static final String ERROR_MESSAGE_END_DELETE_STATION = "지하철 역이 삭제되었습니다.";
+//
+//    private static final String ERROR_MESSAGE_END_ADD_LINE = "지하철 노선이 등록되었습니다.";
+//    private static final String ERROR_MESSAGE_END_DELETE_LINE = "지하철 노선이 삭제되었습니다.";
+//
+//    private static final String ERROR_MESSAGE_END_ADD_ROUTE = "구간이 등록되었습니다.";
+//    private static final String ERROR_MESSAGE_END_DELETE_ROUTE = "구간이 삭제되었습니다.";
+
+
+    public void guideChooseFunction() {
+        System.out.println(String.join(" ",GUIDE_MESSAGE_START,GUIDE_MESSAGE_END_CHOOSE_FUNCTION));
+    }
+
+    public void guideAddStation() {
+        System.out.println(String.join(" ",GUIDE_MESSAGE_START,GUIDE_MESSAGE_END_ADD_STATION));
+    }
+
+    public void guideDeleteStation() {
+        System.out.println(String.join(" ",GUIDE_MESSAGE_START,GUIDE_MESSAGE_END_DELETE_STATION));
+    }
+
+    public void guideAddLineName() {
+        System.out.println(String.join(" ",GUIDE_MESSAGE_START,GUIDE_MESSAGE_END_ADD_LINE_NAME));
+    }
+
+    public void guideAddLineUpwardTerminal() {
+        System.out.println(String.join(" ",GUIDE_MESSAGE_START,GUIDE_MESSAGE_END_ADD_LINE_UPWARD_TERMINAL));
+    }
+
+    public void guideAddLineDownwardTerminal() {
+        System.out.println(String.join(" ",GUIDE_MESSAGE_START,GUIDE_MESSAGE_END_ADD_LINE_DOWNWARD_TERMINAL));
+    }
+
+    public void guideDeleteLine() {
+        System.out.println(String.join(" ",GUIDE_MESSAGE_START,GUIDE_MESSAGE_END_DELETE_LINE));
+    }
+
+    public void guideAddRouteLine() {
+        System.out.println(String.join(" ",GUIDE_MESSAGE_START,GUIDE_MESSAGE_END_ADD_ROUTE_LINE));
+    }
+
+    public void guideAddRouteStation() {
+        System.out.println(String.join(" ",GUIDE_MESSAGE_START,GUIDE_MESSAGE_END_ADD_ROUTE_STATION));
+    }
+
+    public void guideAddRouteOrder() {
+        System.out.println(String.join(" ",GUIDE_MESSAGE_START,GUIDE_MESSAGE_END_ADD_ROUTE_ORDER));
+    }
+
+    public void guideDeleteRouteLine() {
+        System.out.println(String.join(" ",GUIDE_MESSAGE_START,GUIDE_MESSAGE_END_DELETE_ROUTE_LINE));
+    }
+
+    public void guideDeleteRouteStation() {
+        System.out.println(String.join(" ",GUIDE_MESSAGE_START,GUIDE_MESSAGE_END_DELETE_ROUTE_STATION));
+    }
+
+    public void printStartMainError() {
+        System.out.println(String.join(" ",ERROR_MESSAGE_START,ERROR_MESSAGE_END_CHOOSE_FUNCTION));
+        System.out.println();
+    }
+
+    public void printMainScreen() {
+        System.out.println("## 메인 화면");
+        System.out.println("1. 역 관리");
+        System.out.println("2. 노선 관리");
+        System.out.println("3. 구간 관리");
+        System.out.println("4. 지하철 노선도 출력");
+        System.out.println("Q. 종료"+NEXT_LINE);
+        guideChooseFunction();
+    }
+
+    public void printStationManagementScreen() {
+        System.out.println("## 역 관리 화면");
+        System.out.println("1. 역 등록");
+        System.out.println("2. 역 삭제");
+        System.out.println("3. 역 조회");
+        System.out.println("B. 돌아가기"+NEXT_LINE);
+        guideChooseFunction();
+    }
+
+    public void printLineManagementScreen() {
+        System.out.println("## 노선 관리 화면");
+        System.out.println("1. 노선 등록");
+        System.out.println("2. 노선 삭제");
+        System.out.println("3. 노선 조회");
+        System.out.println("B. 돌아가기"+NEXT_LINE);
+        guideChooseFunction();
+    }
+
+    public void printSectionManagementScreen() {
+        System.out.println("## 구간 관리 화면");
+        System.out.println("1. 구간 등록");
+        System.out.println("2. 구간 삭제");
+        System.out.println("B. 돌아가기"+NEXT_LINE);
+        guideChooseFunction();
+    }
+
+    public void printAllStations() {
+        System.out.println(String.join(" ",GUIDE_MESSAGE_START,"역 목록"));
+        for(Station station : StationRepository.getStations()) {
+            System.out.println(String.join(" ",INFO_MESSAGE_START,station.getName()));
+        }
+    }
+
+    public void printAllLines() {
+        System.out.println(String.join(" ",GUIDE_MESSAGE_START,"노선 목록"));
+        for(Line line : LineRepository.getLines()) {
+            System.out.println(String.join(" ",INFO_MESSAGE_START,line.getName()));
+        }
+    }
+
+    public void printSubwaySections() {
+        System.out.println(String.join(" ", GUIDE_MESSAGE_START, "지하철 노선도"));
+        for(Line line : LineRepository.getLines()) {
+            System.out.println(String.join(" ",INFO_MESSAGE_START,line.getName()));
+            System.out.println(String.join(" ",INFO_MESSAGE_START,"---"));
+            for(Station station : line.getSections()) {
+                System.out.println(String.join(" ",INFO_MESSAGE_START,station.getName()));
+            }
+            System.out.println();
+        }
+    }
+
+}

From d18c983d35e917511b2ca468b29e261071e1b847 Mon Sep 17 00:00:00 2001
From: DH Lim <dlarkfl2@gamil.com>
Date: Mon, 14 Dec 2020 12:28:15 +0900
Subject: [PATCH 05/20] =?UTF-8?q?feat(SubwayMap):=20=EB=B9=84=EC=A7=80?=
 =?UTF-8?q?=EB=8B=88=EC=8A=A4=20=EB=A1=9C=EC=A7=81=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

주요 내용
- Run(): 지하철 노선도 기능 실행
- startMain(): 메인화면 관리
- startStationManagement(): 역 관리
- startLineManagement(): 노선 관리
- startSectionManagement(): 구간 관리
---
 .../java/subway/controller/SubwayMap.java     | 176 ++++++++++++++++++
 1 file changed, 176 insertions(+)
 create mode 100644 src/main/java/subway/controller/SubwayMap.java

diff --git a/src/main/java/subway/controller/SubwayMap.java b/src/main/java/subway/controller/SubwayMap.java
new file mode 100644
index 000000000..eaa28faef
--- /dev/null
+++ b/src/main/java/subway/controller/SubwayMap.java
@@ -0,0 +1,176 @@
+package subway.controller;
+
+import subway.domain.*;
+import subway.view.InputView;
+import subway.view.OutputView;
+
+import java.util.Scanner;
+
+public class SubwayMap {
+    private LineRepository lineRepository;
+    private StationRepository stationRepository;
+    private boolean isRun = true;
+    private OutputView outputView;
+    private InputView inputView;
+    private Scanner scanner;
+    private ErrorHandler errorHandler;
+
+    public void Run(Scanner scanner) {
+        // 에러시 무한 루프(일단 보류)
+        this.scanner = scanner;
+        while(isRun) {
+            outputView = new OutputView();
+            inputView = new InputView();
+            errorHandler = new ErrorHandler();
+            startMain(scanner);
+        }
+    }
+
+    private void startMain(Scanner scanner) {
+        outputView.printMainScreen();
+        inputView.scanData(scanner);
+        try{
+            errorHandler.validateMainInput(inputView.getInputData());
+        } catch(IllegalArgumentException E) {
+            outputView.printStartMainError();
+            startMain(scanner);
+        }
+        //
+        chooseFunctionInMain(inputView.getInputData());
+    }
+
+    private void chooseFunctionInMain(String inputData) {
+        if(inputData.equals("1")) {
+            startStationManagement();
+        }
+        if(inputData.equals("2")) {
+            startLineManagement();
+        }
+        if(inputData.equals("3")) {
+            startSectionManagement();
+        }
+        if(inputData.equals("4")) {
+            outputView.printSubwaySections();
+        }
+        if(inputData.equalsIgnoreCase("Q")) {
+            isRun = false;
+        }
+    }
+
+
+
+    private void startStationManagement() {
+        outputView.printStationManagementScreen();
+        inputView.scanData(scanner);
+        chooseFunctionInStationManagement(inputView.getInputData());
+
+    }
+
+    private void chooseFunctionInStationManagement(String inputData) {
+        if(inputData.equals("1")) {
+            outputView.guideAddStation();
+            inputView.scanData(scanner);
+            StationRepository.addStation(new Station(inputView.getInputData()));
+            System.out.println("결과창 출력 수정필요!");
+            startMain(scanner);
+        }
+        if(inputData.equals("2")) {
+            outputView.guideDeleteStation();
+            inputView.scanData(scanner);
+            StationRepository.deleteStation(inputView.getInputData());
+            System.out.println("결과창 출력 수정필요!");
+            startMain(scanner);
+        }
+        if(inputData.equals("3")) {
+            outputView.printAllStations();
+        }
+        if(inputData.equalsIgnoreCase("B")) {
+            startMain(scanner);
+        }
+    }
+
+    private void startLineManagement() {
+        outputView.printLineManagementScreen();
+        inputView.scanData(scanner);
+        chooseFunctionInLineManagement(inputView.getInputData());
+    }
+
+    private void chooseFunctionInLineManagement(String inputData) {
+        if(inputData.equals("1")) {
+            outputView.guideAddLineName();
+            inputView.scanData(scanner);
+            //검사
+            LineRepository.addLine(new Line(inputData));
+            System.out.println();
+
+            outputView.guideAddLineUpwardTerminal();
+            inputView.scanData(scanner);
+            //검사
+            LineRepository.getLine(inputData).setUpwardStation(StationRepository.getStation(inputData));
+            System.out.println();
+
+            outputView.guideAddLineDownwardTerminal();
+            inputView.scanData(scanner);
+            //검사
+            LineRepository.getLine(inputData).setDownwardStation(StationRepository.getStation(inputData));
+            System.out.println();
+        }
+        if(inputData.equals("2")) {
+            outputView.guideDeleteLine();
+            inputView.scanData(scanner);
+            //검사
+            LineRepository.deleteLineByName(inputView.getInputData());
+            System.out.println();
+        }
+        if(inputData.equals("3")) {
+            outputView.printAllLines();
+        }
+        if(inputData.equalsIgnoreCase("B")) {
+            startMain(scanner);
+        }
+
+    }
+
+    private void startSectionManagement() {
+        outputView.printSectionManagementScreen();
+        inputView.scanData(scanner);
+        chooseFunctionInSectionManagement(inputView.getInputData());
+    }
+
+    private void chooseFunctionInSectionManagement(String inputData) {
+        if(inputData.equals("1")) {
+            outputView.guideAddRouteLine();
+            inputView.scanData(scanner);
+            //검사
+            Line line = LineRepository.getLine(inputView.getInputData());
+            System.out.println();
+
+            outputView.guideAddRouteStation();
+            inputView.scanData(scanner);
+            //검사
+            Station station = StationRepository.getStation(inputData);
+            System.out.println();
+
+            outputView.guideAddRouteOrder();
+            inputView.scanData(scanner);
+            // 검사 후 int로 형변환
+            line.addSectionByOrderAndStation(Integer.parseInt(inputView.getInputData()), station);
+            System.out.println("결과 출력 수정필요!");
+        }
+        if(inputData.equals("2")) {
+            outputView.guideDeleteRouteLine();
+            inputView.scanData(scanner);
+            //검사
+            Line line = LineRepository.getLine(inputData);
+            System.out.println();
+
+            outputView.guideDeleteRouteStation();
+            inputView.scanData(scanner);
+            //검사
+            line.deleteSectionByName(inputView.getInputData());
+        }
+        if(inputData.equalsIgnoreCase("B")) {
+            startMain(scanner);
+        }
+    }
+}

From df30a1c68edc00c97aad1add10667f917cf6e869 Mon Sep 17 00:00:00 2001
From: DH Lim <dlarkfl2@gamil.com>
Date: Mon, 14 Dec 2020 12:32:16 +0900
Subject: [PATCH 06/20] =?UTF-8?q?feat(Line):=20=EA=B5=AC=EA=B0=84=20?=
 =?UTF-8?q?=EC=B6=94=EA=B0=80/=EC=82=AD=EC=A0=9C=20=EA=B8=B0=EB=8A=A5=20?=
 =?UTF-8?q?=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

주요 내용
- 구간의 집합(sections)을 line 객체의 멤버변수로 생성함
- addSectionByStation(): 역 이름으로 구간을 추가
- addSectionByOrderAndStation(): 순서와 역 이름으로 구간을 추가
-deleteSectionByName(): 역 이름으로 구간을 삭제
---
 src/main/java/subway/domain/Line.java | 44 +++++++++++++++++++++++++++
 1 file changed, 44 insertions(+)

diff --git a/src/main/java/subway/domain/Line.java b/src/main/java/subway/domain/Line.java
index f4d738d5a..7212babee 100644
--- a/src/main/java/subway/domain/Line.java
+++ b/src/main/java/subway/domain/Line.java
@@ -1,5 +1,9 @@
 package subway.domain;
 
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Objects;
+
 public class Line {
     private String name;
 
@@ -12,4 +16,44 @@ public String getName() {
     }
 
     // 추가 기능 구현
+    private static final int FROM_ORDER_TO_INDEX = 1;//구간 순서 와 인덱스 보정값 네이밍
+    private Station upwardStation; //상행 종착점
+    private Station downwardStation; // 하행 종착점
+    private List<Station> sections = new LinkedList<>();
+
+    // 구간 관련 메소드 시작
+    public List<Station> getSections() {
+        return sections;
+    }
+
+    public void addSectionByStation(Station station) {
+        sections.add(station);
+    }
+    // orderOfRoute-1 == index
+    public void addSectionByOrderAndStation(int orderOfRoute, Station station) {
+        sections.add(orderOfRoute-FROM_ORDER_TO_INDEX,station);
+    }
+
+    public boolean deleteSectionByName(String name) {
+        return sections.removeIf(station -> Objects.equals(station.getName(), name));
+    }
+    // 구간 관련 메소드 끝
+
+    // 상행, 하행 getter setter 시작
+    public Station getUpwardStation() {
+        return upwardStation;
+    }
+
+    public void setUpwardStation(Station upwardStation) {
+        this.upwardStation = upwardStation;
+    }
+
+    public Station getDownwardStation() {
+        return downwardStation;
+    }
+
+    public void setDownwardStation(Station downwardStation) {
+        this.downwardStation = downwardStation;
+    }
+    // 상행, 하행 getter setter 끝
 }

From f2b4fe32ff91851e59d75275d4c58ef78700564b Mon Sep 17 00:00:00 2001
From: DH Lim <dlarkfl2@gamil.com>
Date: Mon, 14 Dec 2020 12:33:50 +0900
Subject: [PATCH 07/20] =?UTF-8?q?feat(LineRepository):=20=EB=85=B8?=
 =?UTF-8?q?=EC=84=A0=EA=B3=BC=20=EB=85=B8=EC=84=A0=EC=9D=98=EC=A7=91?=
 =?UTF-8?q?=ED=95=A9=20=ED=98=B8=EC=B6=9C=20=EA=B8=B0=EB=8A=A5=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/LineRepository.java | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/src/main/java/subway/domain/LineRepository.java b/src/main/java/subway/domain/LineRepository.java
index 49132ddb6..9c99967f6 100644
--- a/src/main/java/subway/domain/LineRepository.java
+++ b/src/main/java/subway/domain/LineRepository.java
@@ -19,4 +19,20 @@ public static void addLine(Line line) {
     public static boolean deleteLineByName(String name) {
         return lines.removeIf(line -> Objects.equals(line.getName(), name));
     }
+
+    public static Line getLine(String name) {
+//        return (Line) lines.stream()
+//                .filter(line -> line.getName().equals(name));
+        int index = 0;
+        for(int i=0; i<lines.size(); i++) {
+            if(lines.get(i).getName().equals(name)) {
+                index = i;
+            }
+        }
+        return lines.get(index);
+    }
+
+    public static List<Line> getLines() {
+        return lines;
+    }
 }

From e5814f47fb098382df0d2b8fa2b135f99b7a25ff Mon Sep 17 00:00:00 2001
From: DH Lim <dlarkfl2@gamil.com>
Date: Mon, 14 Dec 2020 12:34:21 +0900
Subject: [PATCH 08/20] =?UTF-8?q?feat(StationRepository):=20=EC=97=AD?=
 =?UTF-8?q?=EA=B3=BC=20=EC=97=AD=EC=9D=98=EC=A7=91=ED=95=A9=20=ED=98=B8?=
 =?UTF-8?q?=EC=B6=9C=20=EA=B8=B0=EB=8A=A5=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/subway/domain/StationRepository.java    | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/src/main/java/subway/domain/StationRepository.java b/src/main/java/subway/domain/StationRepository.java
index b7245c0f3..4f3654fd6 100644
--- a/src/main/java/subway/domain/StationRepository.java
+++ b/src/main/java/subway/domain/StationRepository.java
@@ -19,4 +19,20 @@ public static void addStation(Station station) {
     public static boolean deleteStation(String name) {
         return stations.removeIf(station -> Objects.equals(station.getName(), name));
     }
+
+    public static Station getStation(String name) {
+        int index = 0;
+        for(int i=0; i<stations.size(); i++) {
+            if(stations.get(i).getName().equals(name)) {
+                index = i;
+            }
+        }
+        return stations.get(index);
+    }
+
+    public static List<Station> getStations() {
+        return stations;
+    }
+
+
 }

From c93e0a027f7c59e68887f1caed59467983cab475 Mon Sep 17 00:00:00 2001
From: DH Lim <dlarkfl2@gamil.com>
Date: Mon, 14 Dec 2020 12:38:11 +0900
Subject: [PATCH 09/20] =?UTF-8?q?feat(DummyDataSetting):=20=EC=B4=88?=
 =?UTF-8?q?=EA=B8=B0=EC=84=A4=EC=A0=95=20=EA=B8=B0=EB=8A=A5=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

- 지하철역 추가: 교대역, 강남역, 역삼역, 남부터미널역, 양재역, 양재시민의숲역, 매봉역
- 노선 추가: 2호선, 3호선, 신분당선
- 노선에 역 추가
  - 2호선: 교대역 - 강남역 - 역삼역
  - 3호선: 교대역 - 남부터미널역 - 양재역 - 매봉역
  - 신분당선: 강남역 - 양재역 - 양재시민의숲역
---
 src/main/java/subway/DummyDataSetting.java | 51 ++++++++++++++++++++++
 1 file changed, 51 insertions(+)
 create mode 100644 src/main/java/subway/DummyDataSetting.java

diff --git a/src/main/java/subway/DummyDataSetting.java b/src/main/java/subway/DummyDataSetting.java
new file mode 100644
index 000000000..a4d942a44
--- /dev/null
+++ b/src/main/java/subway/DummyDataSetting.java
@@ -0,0 +1,51 @@
+package subway;
+
+import subway.domain.Line;
+import subway.domain.LineRepository;
+import subway.domain.Station;
+import subway.domain.StationRepository;
+
+public class DummyDataSetting {
+
+
+    public static void run() {
+        /*
+         * 역: 교대역, 강남역, 역삼역, 남부터미널역, 양재역, 양재시민의숲역, 매봉역
+         * 노선: 2호선, 3호선, 신분당선
+         * 노선에 역
+         * - 2호선: 교대역 - 강남역 - 역삼역
+         * - 3호선: 교대역 - 남부터미널역 - 양재역 - 매봉역
+         * - 신분당선: 강남역 - 양재역 - 양재시민의숲역
+         */
+
+        StationRepository.addStation(new Station("교대역"));
+        StationRepository.addStation(new Station("강남역"));
+        StationRepository.addStation(new Station("역삼역"));
+        StationRepository.addStation(new Station("남부터미널역"));
+        StationRepository.addStation(new Station("양재역"));
+        StationRepository.addStation(new Station("양재시민의숲역"));
+        StationRepository.addStation(new Station("매봉역"));
+
+        LineRepository.addLine(new Line("2호선"));
+        LineRepository.addLine(new Line("3호선"));
+        LineRepository.addLine(new Line("신분당선"));
+
+        LineRepository.getLine("2호선").addSectionByStation(StationRepository.getStation("교대역"));
+        LineRepository.getLine("2호선").addSectionByStation(StationRepository.getStation("강남역"));
+        LineRepository.getLine("2호선").addSectionByStation(StationRepository.getStation("역삼역"));
+        LineRepository.getLine("3호선").addSectionByStation(StationRepository.getStation("교대역"));
+        LineRepository.getLine("3호선").addSectionByStation(StationRepository.getStation("남부터미널역"));
+        LineRepository.getLine("3호선").addSectionByStation(StationRepository.getStation("양재역"));
+        LineRepository.getLine("3호선").addSectionByStation(StationRepository.getStation("매봉역"));
+        LineRepository.getLine("신분당선").addSectionByStation(StationRepository.getStation("강남역"));
+        LineRepository.getLine("신분당선").addSectionByStation(StationRepository.getStation("양재역"));
+        LineRepository.getLine("신분당선").addSectionByStation(StationRepository.getStation("양재시민의숲역"));
+//        for(Line line : LineRepository.lines()) {
+//            System.out.println(line.getName());
+//            for(Station station : line.getRoute()) {
+//                System.out.println(station.getName());
+//            }
+//            System.out.println();
+//        }
+    }
+}

From 5b0074035acf0fb33300a83a8ba8d127f18fa5e7 Mon Sep 17 00:00:00 2001
From: DH Lim <dlarkfl2@gamil.com>
Date: Mon, 14 Dec 2020 12:39:09 +0900
Subject: [PATCH 10/20] =?UTF-8?q?feat(Application):=20=EB=A1=9C=EC=A7=81?=
 =?UTF-8?q?=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 | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/main/java/subway/Application.java b/src/main/java/subway/Application.java
index 0bcf786cc..1fad276c2 100644
--- a/src/main/java/subway/Application.java
+++ b/src/main/java/subway/Application.java
@@ -1,10 +1,16 @@
 package subway;
 
+import subway.controller.SubwayMap;
+
 import java.util.Scanner;
 
 public class Application {
     public static void main(String[] args) {
         final Scanner scanner = new Scanner(System.in);
         // TODO: 프로그램 구현
+        DummyDataSetting.run();
+
+        SubwayMap subwayMap = new SubwayMap();
+        subwayMap.Run(scanner);
     }
 }

From 765514a52174e01aa617a58abcf0369b3cb54984 Mon Sep 17 00:00:00 2001
From: DH Lim <dlarkfl2@gamil.com>
Date: Tue, 15 Dec 2020 20:31:01 +0900
Subject: [PATCH 11/20] =?UTF-8?q?feat:=20=EA=B0=81=20=ED=99=94=EB=A9=B4=20?=
 =?UTF-8?q?=EB=A9=94=EB=89=B4=20Enum=20=EC=83=9D=EC=84=B1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

주요내용
- 메인, 역 관리, 노선 관리, 구간 관리 화면 Enum 생성
- 각 Enum마다 유효성 검사 메소드 생성
---
 src/main/java/subway/LineManagementSign.java  | 27 ++++++++++++++++++
 src/main/java/subway/MainSign.java            | 28 +++++++++++++++++++
 .../java/subway/SectionManagementSign.java    | 26 +++++++++++++++++
 .../java/subway/StationManagementSign.java    | 27 ++++++++++++++++++
 4 files changed, 108 insertions(+)
 create mode 100644 src/main/java/subway/LineManagementSign.java
 create mode 100644 src/main/java/subway/MainSign.java
 create mode 100644 src/main/java/subway/SectionManagementSign.java
 create mode 100644 src/main/java/subway/StationManagementSign.java

diff --git a/src/main/java/subway/LineManagementSign.java b/src/main/java/subway/LineManagementSign.java
new file mode 100644
index 000000000..032f34dd9
--- /dev/null
+++ b/src/main/java/subway/LineManagementSign.java
@@ -0,0 +1,27 @@
+package subway;
+
+import java.util.Arrays;
+
+public enum LineManagementSign {
+    ADD_LINE("1"),
+    DELETE_LINE("2"),
+    SHOW_LINES("3"),
+    BACK_TO_MAIN("B");
+
+    private String sign;
+
+    LineManagementSign(String sign) {
+        this.sign = sign;
+    }
+
+    public String getSign() {
+        return sign;
+    }
+
+    public static LineManagementSign validateSign(String inputData) {
+        return Arrays.stream(LineManagementSign.values())
+                .filter(sign -> inputData.toUpperCase().equals(sign.getSign()))
+                .findFirst()
+                .orElseThrow(() -> new IllegalArgumentException("없는 기능"));
+    }
+}
diff --git a/src/main/java/subway/MainSign.java b/src/main/java/subway/MainSign.java
new file mode 100644
index 000000000..1be879320
--- /dev/null
+++ b/src/main/java/subway/MainSign.java
@@ -0,0 +1,28 @@
+package subway;
+
+import java.util.Arrays;
+
+public enum MainSign {
+    STATION_MANAGEMENT("1"),
+    LINE_MANAGEMENT("2"),
+    SECTION_MANAGEMENT("3"),
+    PRINT_SUBWAY_ROUTE("4"),
+    CLOSE_MAIN("Q");
+
+    private String sign;
+
+    MainSign(String sign) {
+        this.sign = sign;
+    }
+
+    public String getSign() {
+        return sign;
+    }
+
+    public static MainSign validateSign(String inputData) {
+        return Arrays.stream(MainSign.values())
+                .filter(sign -> inputData.toUpperCase().equals(sign.getSign()))
+                .findFirst()
+                .orElseThrow(() -> new IllegalArgumentException("없는 기능"));
+    }
+}
diff --git a/src/main/java/subway/SectionManagementSign.java b/src/main/java/subway/SectionManagementSign.java
new file mode 100644
index 000000000..af4811e42
--- /dev/null
+++ b/src/main/java/subway/SectionManagementSign.java
@@ -0,0 +1,26 @@
+package subway;
+
+import java.util.Arrays;
+
+public enum SectionManagementSign {
+    ADD_SECTION("1"),
+    DELETE_SECTION("2"),
+    BACK_TO_MAIN("B");
+
+    private String sign;
+
+    SectionManagementSign(String sign) {
+        this.sign = sign;
+    }
+
+    public String getSign() {
+        return sign;
+    }
+
+    public static SectionManagementSign validateSign(String inputData) {
+        return Arrays.stream(SectionManagementSign.values())
+                .filter(sign -> inputData.toUpperCase().equals(sign.getSign()))
+                .findFirst()
+                .orElseThrow(() -> new IllegalArgumentException("없는 기능"));
+    }
+}
diff --git a/src/main/java/subway/StationManagementSign.java b/src/main/java/subway/StationManagementSign.java
new file mode 100644
index 000000000..bfe9154d2
--- /dev/null
+++ b/src/main/java/subway/StationManagementSign.java
@@ -0,0 +1,27 @@
+package subway;
+
+import java.util.Arrays;
+
+public enum StationManagementSign {
+    ADD_STATION("1"),
+    DELETE_STATION("2"),
+    SHOW_STATIONS("3"),
+    BACK_TO_MAIN("B");
+
+    private String sign;
+
+    StationManagementSign(String sign) {
+        this.sign = sign;
+    }
+
+    public String getSign() {
+        return sign;
+    }
+
+    public static StationManagementSign validateSign(String inputData) {
+        return Arrays.stream(StationManagementSign.values())
+                .filter(sign -> inputData.toUpperCase().equals(sign.getSign()))
+                .findFirst()
+                .orElseThrow(() -> new IllegalArgumentException("없는 기능"));
+    }
+}

From a00a1e91b8acbfa84d2b36bbfe826da6afd99cbb Mon Sep 17 00:00:00 2001
From: DH Lim <dlarkfl2@gamil.com>
Date: Tue, 15 Dec 2020 20:37:27 +0900
Subject: [PATCH 12/20] =?UTF-8?q?feat(ErrorHandler):=20=EC=98=88=EC=99=B8?=
 =?UTF-8?q?=20=EC=B2=98=EB=A6=AC=20=ED=81=B4=EB=9E=98=EC=8A=A4=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

주요 예외 내용
이름 - 2글자 미만
이름 - 한글과 숫자 조합이 아닌 경우
이름 - '-역' 또는 '선'으로 끝나지 않는 경우
역, 노선 - 저장소에 없는 경우
역, 노선 - 이미 저장소에 있는 경우
구간순서 - 숫자가 아닌 경우
구간순서 - 구간의 길이를 벗어난 순서일 경우
---
 .../java/subway/controller/ErrorHandler.java  | 78 +++++++++++++++++++
 1 file changed, 78 insertions(+)
 create mode 100644 src/main/java/subway/controller/ErrorHandler.java

diff --git a/src/main/java/subway/controller/ErrorHandler.java b/src/main/java/subway/controller/ErrorHandler.java
new file mode 100644
index 000000000..b757e8793
--- /dev/null
+++ b/src/main/java/subway/controller/ErrorHandler.java
@@ -0,0 +1,78 @@
+package subway.controller;
+
+import subway.domain.Line;
+import subway.domain.LineRepository;
+import subway.domain.Station;
+import subway.domain.StationRepository;
+
+import java.util.Objects;
+import java.util.regex.Pattern;
+
+public class ErrorHandler {
+    private static final String STATION_NAME_END = "역";
+    private static final String LINE_NAME_END = "선";
+    private static final int NAME_MIN_LENGTH = 2;
+    private static final int LENGTH_TO_INDEX = 1;
+
+    public static void validateStationNameFormat(String inputData) {
+        if (inputData.length() < NAME_MIN_LENGTH
+                || !Pattern.matches("^[0-9가-힣]*$", inputData)
+                || !inputData.substring(inputData.length() - LENGTH_TO_INDEX).equals(STATION_NAME_END)) {
+            throw new IllegalArgumentException("format error");
+        }
+    }
+
+    public static void validateStationDuplicate(String inputData) {
+        if (StationRepository.isDuplicate(inputData)) {
+            throw new IllegalArgumentException("duplicate error");
+        }
+    }
+
+    public static void validateStationRegistered(String inputData) {
+        if (!StationRepository.isDuplicate(inputData)) {
+            throw new IllegalArgumentException("not registered error");
+        }
+    }
+
+    public static void validateLineNameFormat(String inputData) {
+        if (inputData.length() < NAME_MIN_LENGTH
+                || !Pattern.matches("^[0-9가-힣]*$", inputData)
+                || !inputData.substring(inputData.length() - LENGTH_TO_INDEX).equals(LINE_NAME_END)) {
+            throw new IllegalArgumentException("format error");
+        }
+    }
+
+    public static void validateLineDuplicate(String inputData) {
+        if (LineRepository.isDuplicate(inputData)) {
+            throw new IllegalArgumentException("duplicate error");
+        }
+    }
+
+    public static void validateLineRegistered(String inputData) {
+        if (!LineRepository.isDuplicate(inputData)) {
+            throw new IllegalArgumentException("not registered error");
+        }
+    }
+
+    public static void validateStationDuplicateInLine(Station targetStation, Line line) {
+        if (line.getSections().stream()
+                .anyMatch(station -> Objects.equals(station, targetStation))) {
+            throw new IllegalArgumentException("duplicate error");
+        }
+    }
+
+    public static void validateStationRegisteredInLine(Station targetStation, Line line) {
+        if (line.getSections().stream()
+                .noneMatch(station -> Objects.equals(station, targetStation))) {
+            throw new IllegalArgumentException("not registered error");
+        }
+    }
+
+    public static void validateOrder(String targetOrder, Line line) {
+        int order = Integer.parseInt(targetOrder);
+        if (order < 1 || order > line.getSections().size()) {
+            throw new IllegalArgumentException("inbound error");
+        }
+    }
+
+}

From 7908b83af8c7d8021962743746d02df67b2c53dc Mon Sep 17 00:00:00 2001
From: DH Lim <dlarkfl2@gamil.com>
Date: Tue, 15 Dec 2020 20:39:00 +0900
Subject: [PATCH 13/20] =?UTF-8?q?style:=20=EB=B6=88=ED=95=84=EC=9A=94?=
 =?UTF-8?q?=ED=95=9C=20=EC=A3=BC=EC=84=9D,=20=EA=B0=9C=ED=96=89=20?=
 =?UTF-8?q?=EC=82=AD=EC=A0=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/subway/view/InputView.java | 20 --------------------
 1 file changed, 20 deletions(-)

diff --git a/src/main/java/subway/view/InputView.java b/src/main/java/subway/view/InputView.java
index ef16215ac..5bda58b72 100644
--- a/src/main/java/subway/view/InputView.java
+++ b/src/main/java/subway/view/InputView.java
@@ -5,32 +5,12 @@
 public class InputView {
     private String inputData;
 
-
     public String getInputData() {
         return inputData;
     }
 
-//    public void run(Scanner scanner) {
-//        OutputView.guideChooseFunction();
-//        scanData(scanner);
-//    }
-
     public void scanData(Scanner scanner) {
         inputData = scanner.nextLine();
         System.out.println();
-
-        /*
-        * 구간 재정의 할것. 역과 역사이를 구간. 구간이 모여서 노선.
-        *
-        * 에러코드 받으면 다시 실행
-        *
-        * 화면단 구성
-        * 메인화면 stack 1
-        * 기능선택 stack 2
-        *
-        * */
     }
-
-
-
 }

From b1b277531d3be4ad08f5b24cfa564bc3962b99a6 Mon Sep 17 00:00:00 2001
From: DH Lim <dlarkfl2@gamil.com>
Date: Tue, 15 Dec 2020 20:40:43 +0900
Subject: [PATCH 14/20] =?UTF-8?q?refactor:=20=EC=83=81=ED=96=89/=ED=95=98?=
 =?UTF-8?q?=ED=96=89=20=EC=A2=85=EC=A0=90=20=EB=A9=A4=EB=B2=84=EB=B3=80?=
 =?UTF-8?q?=EC=88=98=EC=99=80=20=EA=B4=80=EB=A0=A8=20=EB=A9=94=EC=86=8C?=
 =?UTF-8?q?=EB=93=9C=20=EC=82=AD=EC=A0=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

구간의 집합(sections)에서 처음과 끝이 각각 상행, 하행 종점을 의미하므로 불필요한 중복 삭제
---
 src/main/java/subway/domain/Line.java | 28 +++------------------------
 1 file changed, 3 insertions(+), 25 deletions(-)

diff --git a/src/main/java/subway/domain/Line.java b/src/main/java/subway/domain/Line.java
index 7212babee..2f1cc75e9 100644
--- a/src/main/java/subway/domain/Line.java
+++ b/src/main/java/subway/domain/Line.java
@@ -16,12 +16,9 @@ public String getName() {
     }
 
     // 추가 기능 구현
-    private static final int FROM_ORDER_TO_INDEX = 1;//구간 순서 와 인덱스 보정값 네이밍
-    private Station upwardStation; //상행 종착점
-    private Station downwardStation; // 하행 종착점
+    private static final int FROM_ORDER_TO_INDEX = 1;
     private List<Station> sections = new LinkedList<>();
 
-    // 구간 관련 메소드 시작
     public List<Station> getSections() {
         return sections;
     }
@@ -29,31 +26,12 @@ public List<Station> getSections() {
     public void addSectionByStation(Station station) {
         sections.add(station);
     }
-    // orderOfRoute-1 == index
+
     public void addSectionByOrderAndStation(int orderOfRoute, Station station) {
-        sections.add(orderOfRoute-FROM_ORDER_TO_INDEX,station);
+        sections.add(orderOfRoute - FROM_ORDER_TO_INDEX, station);
     }
 
     public boolean deleteSectionByName(String name) {
         return sections.removeIf(station -> Objects.equals(station.getName(), name));
     }
-    // 구간 관련 메소드 끝
-
-    // 상행, 하행 getter setter 시작
-    public Station getUpwardStation() {
-        return upwardStation;
-    }
-
-    public void setUpwardStation(Station upwardStation) {
-        this.upwardStation = upwardStation;
-    }
-
-    public Station getDownwardStation() {
-        return downwardStation;
-    }
-
-    public void setDownwardStation(Station downwardStation) {
-        this.downwardStation = downwardStation;
-    }
-    // 상행, 하행 getter setter 끝
 }

From 168b97cc22ec0e7f48228dc650ee19b9c05825a9 Mon Sep 17 00:00:00 2001
From: DH Lim <dlarkfl2@gamil.com>
Date: Tue, 15 Dec 2020 20:44:44 +0900
Subject: [PATCH 15/20] =?UTF-8?q?refactor:=20=EB=A9=94=EC=86=8C=EB=93=9C?=
 =?UTF-8?q?=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

getNewLine(): 노선 등록시 등록중인 노선 호출
deleteStationInLine(): 모든 노선에서 역 삭제
isDuplicate(): 이미 저장되어있는 역인지 검사
---
 .../java/subway/domain/LineRepository.java    | 28 +++++++++++++------
 1 file changed, 20 insertions(+), 8 deletions(-)

diff --git a/src/main/java/subway/domain/LineRepository.java b/src/main/java/subway/domain/LineRepository.java
index 9c99967f6..ba95b24ec 100644
--- a/src/main/java/subway/domain/LineRepository.java
+++ b/src/main/java/subway/domain/LineRepository.java
@@ -20,16 +20,28 @@ public static boolean deleteLineByName(String name) {
         return lines.removeIf(line -> Objects.equals(line.getName(), name));
     }
 
+    private static final int FROM_ORDER_TO_INDEX = 1;
+
     public static Line getLine(String name) {
-//        return (Line) lines.stream()
-//                .filter(line -> line.getName().equals(name));
-        int index = 0;
-        for(int i=0; i<lines.size(); i++) {
-            if(lines.get(i).getName().equals(name)) {
-                index = i;
-            }
+        return lines.stream()
+                .filter(station -> station.getName().equals(name))
+                .findAny()
+                .get();
+    }
+
+    public static Line getNewLine() {
+        return lines.get(lines.size() - FROM_ORDER_TO_INDEX);
+    }
+
+    public static void deleteStationInLine(String name) {
+        for (Line line : lines) {
+            line.getSections().removeIf(station -> Objects.equals(station.getName(), name));
         }
-        return lines.get(index);
+    }
+
+    public static boolean isDuplicate(String name) {
+        return lines.stream()
+                .anyMatch(station -> station.getName().equals(name));
     }
 
     public static List<Line> getLines() {

From af5f44de919d362ca177ed55a81b526dff6bd0fb Mon Sep 17 00:00:00 2001
From: DH Lim <dlarkfl2@gamil.com>
Date: Tue, 15 Dec 2020 20:46:57 +0900
Subject: [PATCH 16/20] =?UTF-8?q?refactor:=20=EC=A0=95=EC=83=81/=EB=B9=84?=
 =?UTF-8?q?=EC=A0=95=EC=83=81=EC=A0=81=EC=9D=B8=20=EA=B2=B0=EA=B3=BC=20?=
 =?UTF-8?q?=EC=B0=BD=20=EC=B6=9C=EB=A0=A5=20=EA=B8=B0=EB=8A=A5=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/view/OutputView.java | 178 +++++++++++++++-------
 1 file changed, 121 insertions(+), 57 deletions(-)

diff --git a/src/main/java/subway/view/OutputView.java b/src/main/java/subway/view/OutputView.java
index eaf8eb12c..b393a7238 100644
--- a/src/main/java/subway/view/OutputView.java
+++ b/src/main/java/subway/view/OutputView.java
@@ -7,96 +7,159 @@
 
 public class OutputView {
     private static final String NEXT_LINE = "\n";
-    private static final String GUIDE_MESSAGE_START= "##";
+    private static final String GUIDE_MESSAGE_START = "##";
     private static final String GUIDE_MESSAGE_END_CHOOSE_FUNCTION = "원하는 기능을 선택하세요.";
-
     private static final String GUIDE_MESSAGE_END_ADD_STATION = "등록할 역 이름을 입력하세요.";
     private static final String GUIDE_MESSAGE_END_DELETE_STATION = "삭제할 역 이름을 입력하세요.";
-
     private static final String GUIDE_MESSAGE_END_ADD_LINE_NAME = "등록할 노선 이름을 입력하세요.";
     private static final String GUIDE_MESSAGE_END_ADD_LINE_UPWARD_TERMINAL = "등록할 노선의 상행 종점역 이름을 입력하세요.";
     private static final String GUIDE_MESSAGE_END_ADD_LINE_DOWNWARD_TERMINAL = "둥록할 노선의 하행 종점역 이름을 입력하세요.";
     private static final String GUIDE_MESSAGE_END_DELETE_LINE = "삭제할 노선 이름을 입력하세요.";
+    private static final String GUIDE_MESSAGE_END_CKECK_SECTION_LINE = "노선을 입력하세요.";
+    private static final String GUIDE_MESSAGE_END_CHECK_SECTION_STATION = "역 이름을 입력하세요.";
+    private static final String GUIDE_MESSAGE_END_CHECK_SECTION_ORDER = "순서를 입력하세요.";
+    private static final String GUIDE_MESSAGE_END_DELETE_SECTION_LINE = "삭제할 구간의 노선을 입력하세요.";
+    private static final String GUIDE_MESSAGE_END_DELETE_SECTION_STATION = "삭제할 구간의 역을 입력하세요.";
 
-    private static final String GUIDE_MESSAGE_END_ADD_ROUTE_LINE = "노선을 입력하세요.";
-    private static final String GUIDE_MESSAGE_END_ADD_ROUTE_STATION = "역 이름을 입력하세요.";
-    private static final String GUIDE_MESSAGE_END_ADD_ROUTE_ORDER = "순서를 입력하세요.";
-    private static final String GUIDE_MESSAGE_END_DELETE_ROUTE_LINE = "삭제할 구간의 노선을 입력하세요.";
-    private static final String GUIDE_MESSAGE_END_DELETE_ROUTE_STATION = "삭제할 구간의 역을 입력하세요.";
-    //
     private static final String INFO_MESSAGE_START = "[INFO]";
     private static final String INFO_MESSAGE_END_ADD_STATION = "지하철 역이 등록되었습니다.";
     private static final String INFO_MESSAGE_END_DELETE_STATION = "지하철 역이 삭제되었습니다.";
-
     private static final String INFO_MESSAGE_END_ADD_LINE = "지하철 노선이 등록되었습니다.";
     private static final String INFO_MESSAGE_END_DELETE_LINE = "지하철 노선이 삭제되었습니다.";
-
-    private static final String INFO_MESSAGE_END_ADD_ROUTE = "구간이 등록되었습니다.";
-    private static final String INFO_MESSAGE_END_DELETE_ROUTE = "구간이 삭제되었습니다.";
-
+    private static final String INFO_MESSAGE_END_ADD_SECTION = "구간이 등록되었습니다.";
+    private static final String INFO_MESSAGE_END_DELETE_SECTION = "구간이 삭제되었습니다.";
 
     private static final String ERROR_MESSAGE_START = "[ERROR]";
     private static final String ERROR_MESSAGE_END_CHOOSE_FUNCTION = "선택할 수 없는 기능입니다.";
+    private static final String ERROR_MESSAGE_END_ADD_STATION_FORMAT = "역 이름은 2글자 이상, 한글과 숫자 조합이며, '-역'으로 끝나야 합니다.";
     private static final String ERROR_MESSAGE_END_ADD_STATION_DUPLICATE = "이미 등록된 역 이름입니다.";
-//    private static final String ERROR_MESSAGE_END_DELETE_STATION = "지하철 역이 삭제되었습니다.";
-//
-//    private static final String ERROR_MESSAGE_END_ADD_LINE = "지하철 노선이 등록되었습니다.";
-//    private static final String ERROR_MESSAGE_END_DELETE_LINE = "지하철 노선이 삭제되었습니다.";
-//
-//    private static final String ERROR_MESSAGE_END_ADD_ROUTE = "구간이 등록되었습니다.";
-//    private static final String ERROR_MESSAGE_END_DELETE_ROUTE = "구간이 삭제되었습니다.";
-
+    private static final String ERROR_MESSAGE_END_DELETE_STATION_NOT_REGISTERED = "등록되지 않은 역입니다.";
+    private static final String ERROR_MESSAGE_END_ADD_LINE_FORMAT = "노선 이름은 2글자 이상, 한글과 숫자 조합이며, '-선'으로 끝나야 합니다.";
+    private static final String ERROR_MESSAGE_END_ADD_LINE_DUPLICATE = "이미 등록된 노선 이름입니다.";
+    private static final String ERROR_MESSAGE_END_DELETE_LINE_NOT_REGISTERED = "등록되지 않은 노선입니다.";
+    private static final String ERROR_MESSAGE_END_PARSEINT_ORDER = "구간 순서는 숫자여야 합니다.";
+    private static final String ERROR_MESSAGE_END_INBOUND_ORDER = "구간 순서는 1이상이며 해당 노선 구간의 길이 이하입니다.";
 
     public void guideChooseFunction() {
-        System.out.println(String.join(" ",GUIDE_MESSAGE_START,GUIDE_MESSAGE_END_CHOOSE_FUNCTION));
+        System.out.println(String.join(" ", GUIDE_MESSAGE_START, GUIDE_MESSAGE_END_CHOOSE_FUNCTION));
     }
 
     public void guideAddStation() {
-        System.out.println(String.join(" ",GUIDE_MESSAGE_START,GUIDE_MESSAGE_END_ADD_STATION));
+        System.out.println(String.join(" ", GUIDE_MESSAGE_START, GUIDE_MESSAGE_END_ADD_STATION));
     }
 
     public void guideDeleteStation() {
-        System.out.println(String.join(" ",GUIDE_MESSAGE_START,GUIDE_MESSAGE_END_DELETE_STATION));
+        System.out.println(String.join(" ", GUIDE_MESSAGE_START, GUIDE_MESSAGE_END_DELETE_STATION));
     }
 
     public void guideAddLineName() {
-        System.out.println(String.join(" ",GUIDE_MESSAGE_START,GUIDE_MESSAGE_END_ADD_LINE_NAME));
+        System.out.println(String.join(" ", GUIDE_MESSAGE_START, GUIDE_MESSAGE_END_ADD_LINE_NAME));
     }
 
     public void guideAddLineUpwardTerminal() {
-        System.out.println(String.join(" ",GUIDE_MESSAGE_START,GUIDE_MESSAGE_END_ADD_LINE_UPWARD_TERMINAL));
+        System.out.println(String.join(" ", GUIDE_MESSAGE_START, GUIDE_MESSAGE_END_ADD_LINE_UPWARD_TERMINAL));
     }
 
     public void guideAddLineDownwardTerminal() {
-        System.out.println(String.join(" ",GUIDE_MESSAGE_START,GUIDE_MESSAGE_END_ADD_LINE_DOWNWARD_TERMINAL));
+        System.out.println(String.join(" ", GUIDE_MESSAGE_START, GUIDE_MESSAGE_END_ADD_LINE_DOWNWARD_TERMINAL));
     }
 
     public void guideDeleteLine() {
-        System.out.println(String.join(" ",GUIDE_MESSAGE_START,GUIDE_MESSAGE_END_DELETE_LINE));
+        System.out.println(String.join(" ", GUIDE_MESSAGE_START, GUIDE_MESSAGE_END_DELETE_LINE));
+    }
+
+    public void guideCheckLine() {
+        System.out.println(String.join(" ", GUIDE_MESSAGE_START, GUIDE_MESSAGE_END_CKECK_SECTION_LINE));
+    }
+
+    public void guideCheckSectionStation() {
+        System.out.println(String.join(" ", GUIDE_MESSAGE_START, GUIDE_MESSAGE_END_CHECK_SECTION_STATION));
+    }
+
+    public void guideCheckSectionOrder() {
+        System.out.println(String.join(" ", GUIDE_MESSAGE_START, GUIDE_MESSAGE_END_CHECK_SECTION_ORDER));
+    }
+
+    public void guideDeleteSectionLine() {
+        System.out.println(String.join(" ", GUIDE_MESSAGE_START, GUIDE_MESSAGE_END_DELETE_SECTION_LINE));
     }
 
-    public void guideAddRouteLine() {
-        System.out.println(String.join(" ",GUIDE_MESSAGE_START,GUIDE_MESSAGE_END_ADD_ROUTE_LINE));
+    public void guideDeleteSectionStation() {
+        System.out.println(String.join(" ", GUIDE_MESSAGE_START, GUIDE_MESSAGE_END_DELETE_SECTION_STATION));
     }
 
-    public void guideAddRouteStation() {
-        System.out.println(String.join(" ",GUIDE_MESSAGE_START,GUIDE_MESSAGE_END_ADD_ROUTE_STATION));
+    public void errorChooseFunction() {
+        System.out.println(String.join(" ", ERROR_MESSAGE_START, ERROR_MESSAGE_END_CHOOSE_FUNCTION));
+        System.out.println();
     }
 
-    public void guideAddRouteOrder() {
-        System.out.println(String.join(" ",GUIDE_MESSAGE_START,GUIDE_MESSAGE_END_ADD_ROUTE_ORDER));
+    public void infoAddStation() {
+        System.out.println(String.join(" ", INFO_MESSAGE_START, INFO_MESSAGE_END_ADD_STATION));
+        System.out.println();
     }
 
-    public void guideDeleteRouteLine() {
-        System.out.println(String.join(" ",GUIDE_MESSAGE_START,GUIDE_MESSAGE_END_DELETE_ROUTE_LINE));
+    public void errorStationFormat() {
+        System.out.println(String.join(" ", ERROR_MESSAGE_START, ERROR_MESSAGE_END_ADD_STATION_FORMAT));
+        System.out.println();
     }
 
-    public void guideDeleteRouteStation() {
-        System.out.println(String.join(" ",GUIDE_MESSAGE_START,GUIDE_MESSAGE_END_DELETE_ROUTE_STATION));
+    public void errorStationDuplicate() {
+        System.out.println(String.join(" ", ERROR_MESSAGE_START, ERROR_MESSAGE_END_ADD_STATION_DUPLICATE));
+        System.out.println();
     }
 
-    public void printStartMainError() {
-        System.out.println(String.join(" ",ERROR_MESSAGE_START,ERROR_MESSAGE_END_CHOOSE_FUNCTION));
+    public void infoDeleteStation() {
+        System.out.println(String.join(" ", INFO_MESSAGE_START, INFO_MESSAGE_END_DELETE_STATION));
+        System.out.println();
+    }
+
+    public void errorDeleteStationNotRegistered() {
+        System.out.println(String.join(" ", ERROR_MESSAGE_START, ERROR_MESSAGE_END_DELETE_STATION_NOT_REGISTERED));
+        System.out.println();
+    }
+
+    public void infoAddLine() {
+        System.out.println(String.join(" ", INFO_MESSAGE_START, INFO_MESSAGE_END_ADD_LINE));
+        System.out.println();
+    }
+
+    public void errorLineFormat() {
+        System.out.println(String.join(" ", ERROR_MESSAGE_START, ERROR_MESSAGE_END_ADD_LINE_FORMAT));
+        System.out.println();
+    }
+
+    public void errorLineDuplicate() {
+        System.out.println(String.join(" ", ERROR_MESSAGE_START, ERROR_MESSAGE_END_ADD_LINE_DUPLICATE));
+        System.out.println();
+    }
+
+    public void infoDeleteLine() {
+        System.out.println(String.join(" ", INFO_MESSAGE_START, INFO_MESSAGE_END_DELETE_LINE));
+        System.out.println();
+    }
+
+    public void errorDeleteLineNotRegistered() {
+        System.out.println(String.join(" ", ERROR_MESSAGE_START, ERROR_MESSAGE_END_DELETE_LINE_NOT_REGISTERED));
+        System.out.println();
+    }
+
+    public void infoAddSection() {
+        System.out.println(String.join(" ", INFO_MESSAGE_START, INFO_MESSAGE_END_ADD_SECTION));
+        System.out.println();
+    }
+
+    public void errorParseIntOrder() {
+        System.out.println(String.join(" ", ERROR_MESSAGE_START, ERROR_MESSAGE_END_PARSEINT_ORDER));
+        System.out.println();
+    }
+
+    public void errorInBoundOrder() {
+        System.out.println(String.join(" ", ERROR_MESSAGE_START, ERROR_MESSAGE_END_INBOUND_ORDER));
+        System.out.println();
+    }
+
+    public void infoDeleteSection() {
+        System.out.println(String.join(" ", INFO_MESSAGE_START, INFO_MESSAGE_END_DELETE_SECTION));
         System.out.println();
     }
 
@@ -106,7 +169,7 @@ public void printMainScreen() {
         System.out.println("2. 노선 관리");
         System.out.println("3. 구간 관리");
         System.out.println("4. 지하철 노선도 출력");
-        System.out.println("Q. 종료"+NEXT_LINE);
+        System.out.println("Q. 종료" + NEXT_LINE);
         guideChooseFunction();
     }
 
@@ -115,7 +178,7 @@ public void printStationManagementScreen() {
         System.out.println("1. 역 등록");
         System.out.println("2. 역 삭제");
         System.out.println("3. 역 조회");
-        System.out.println("B. 돌아가기"+NEXT_LINE);
+        System.out.println("B. 돌아가기" + NEXT_LINE);
         guideChooseFunction();
     }
 
@@ -124,7 +187,7 @@ public void printLineManagementScreen() {
         System.out.println("1. 노선 등록");
         System.out.println("2. 노선 삭제");
         System.out.println("3. 노선 조회");
-        System.out.println("B. 돌아가기"+NEXT_LINE);
+        System.out.println("B. 돌아가기" + NEXT_LINE);
         guideChooseFunction();
     }
 
@@ -132,34 +195,35 @@ public void printSectionManagementScreen() {
         System.out.println("## 구간 관리 화면");
         System.out.println("1. 구간 등록");
         System.out.println("2. 구간 삭제");
-        System.out.println("B. 돌아가기"+NEXT_LINE);
+        System.out.println("B. 돌아가기" + NEXT_LINE);
         guideChooseFunction();
     }
 
     public void printAllStations() {
-        System.out.println(String.join(" ",GUIDE_MESSAGE_START,"역 목록"));
-        for(Station station : StationRepository.getStations()) {
-            System.out.println(String.join(" ",INFO_MESSAGE_START,station.getName()));
+        System.out.println(String.join(" ", GUIDE_MESSAGE_START, "역 목록"));
+        for (Station station : StationRepository.getStations()) {
+            System.out.println(String.join(" ", INFO_MESSAGE_START, station.getName()));
         }
+        System.out.println();
     }
 
     public void printAllLines() {
-        System.out.println(String.join(" ",GUIDE_MESSAGE_START,"노선 목록"));
-        for(Line line : LineRepository.getLines()) {
-            System.out.println(String.join(" ",INFO_MESSAGE_START,line.getName()));
+        System.out.println(String.join(" ", GUIDE_MESSAGE_START, "노선 목록"));
+        for (Line line : LineRepository.getLines()) {
+            System.out.println(String.join(" ", INFO_MESSAGE_START, line.getName()));
         }
+        System.out.println();
     }
 
     public void printSubwaySections() {
         System.out.println(String.join(" ", GUIDE_MESSAGE_START, "지하철 노선도"));
-        for(Line line : LineRepository.getLines()) {
-            System.out.println(String.join(" ",INFO_MESSAGE_START,line.getName()));
-            System.out.println(String.join(" ",INFO_MESSAGE_START,"---"));
-            for(Station station : line.getSections()) {
-                System.out.println(String.join(" ",INFO_MESSAGE_START,station.getName()));
+        for (Line line : LineRepository.getLines()) {
+            System.out.println(String.join(" ", INFO_MESSAGE_START, line.getName()));
+            System.out.println(String.join(" ", INFO_MESSAGE_START, "---"));
+            for (Station station : line.getSections()) {
+                System.out.println(String.join(" ", INFO_MESSAGE_START, station.getName()));
             }
             System.out.println();
         }
     }
-
 }

From 270d4dfb860ba24ca802bfe65838b635d3375b30 Mon Sep 17 00:00:00 2001
From: DH Lim <dlarkfl2@gamil.com>
Date: Tue, 15 Dec 2020 20:48:02 +0900
Subject: [PATCH 17/20] =?UTF-8?q?refactor:=20=EC=A4=91=EB=B3=B5=20?=
 =?UTF-8?q?=ED=99=95=EC=9D=B8=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

---
 .../java/subway/domain/StationRepository.java  | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/main/java/subway/domain/StationRepository.java b/src/main/java/subway/domain/StationRepository.java
index 4f3654fd6..5a7dc09c2 100644
--- a/src/main/java/subway/domain/StationRepository.java
+++ b/src/main/java/subway/domain/StationRepository.java
@@ -21,18 +21,18 @@ public static boolean deleteStation(String name) {
     }
 
     public static Station getStation(String name) {
-        int index = 0;
-        for(int i=0; i<stations.size(); i++) {
-            if(stations.get(i).getName().equals(name)) {
-                index = i;
-            }
-        }
-        return stations.get(index);
+        return stations.stream()
+                .filter(station -> station.getName().equals(name))
+                .findAny()
+                .get();
+    }
+
+    public static boolean isDuplicate(String name) {
+        return stations.stream()
+                .anyMatch(station -> station.getName().equals(name));
     }
 
     public static List<Station> getStations() {
         return stations;
     }
-
-
 }

From 81cd2d4ef49688ea2735df9dd70932ad5928f0a8 Mon Sep 17 00:00:00 2001
From: DH Lim <dlarkfl2@gamil.com>
Date: Tue, 15 Dec 2020 20:48:34 +0900
Subject: [PATCH 18/20] =?UTF-8?q?refactor:=20=EB=B0=98=EB=B3=B5=EB=AC=B8?=
 =?UTF-8?q?=20=EC=B5=9C=EC=86=8C=ED=99=94?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/subway/DummyDataSetting.java | 33 +++++++++-------------
 1 file changed, 14 insertions(+), 19 deletions(-)

diff --git a/src/main/java/subway/DummyDataSetting.java b/src/main/java/subway/DummyDataSetting.java
index a4d942a44..f434e51ce 100644
--- a/src/main/java/subway/DummyDataSetting.java
+++ b/src/main/java/subway/DummyDataSetting.java
@@ -5,8 +5,10 @@
 import subway.domain.Station;
 import subway.domain.StationRepository;
 
-public class DummyDataSetting {
+import java.util.Arrays;
+import java.util.List;
 
+public class DummyDataSetting {
 
     public static void run() {
         /*
@@ -17,35 +19,28 @@ public static void run() {
          * - 3호선: 교대역 - 남부터미널역 - 양재역 - 매봉역
          * - 신분당선: 강남역 - 양재역 - 양재시민의숲역
          */
+        List<String> stationNames = Arrays.asList("교대역", "강남역", "역삼역", "남부터미널역", "양재역",
+                "양재시민의숲역", "매봉역");
+        for (String name : stationNames) {
+            StationRepository.addStation(new Station(name));
+        }
 
-        StationRepository.addStation(new Station("교대역"));
-        StationRepository.addStation(new Station("강남역"));
-        StationRepository.addStation(new Station("역삼역"));
-        StationRepository.addStation(new Station("남부터미널역"));
-        StationRepository.addStation(new Station("양재역"));
-        StationRepository.addStation(new Station("양재시민의숲역"));
-        StationRepository.addStation(new Station("매봉역"));
-
-        LineRepository.addLine(new Line("2호선"));
-        LineRepository.addLine(new Line("3호선"));
-        LineRepository.addLine(new Line("신분당선"));
+        List<String> lineNames = Arrays.asList("2호선", "3호선", "신분당선");
+        for (String name : lineNames) {
+            LineRepository.addLine(new Line(name));
+        }
 
         LineRepository.getLine("2호선").addSectionByStation(StationRepository.getStation("교대역"));
         LineRepository.getLine("2호선").addSectionByStation(StationRepository.getStation("강남역"));
         LineRepository.getLine("2호선").addSectionByStation(StationRepository.getStation("역삼역"));
+
         LineRepository.getLine("3호선").addSectionByStation(StationRepository.getStation("교대역"));
         LineRepository.getLine("3호선").addSectionByStation(StationRepository.getStation("남부터미널역"));
         LineRepository.getLine("3호선").addSectionByStation(StationRepository.getStation("양재역"));
         LineRepository.getLine("3호선").addSectionByStation(StationRepository.getStation("매봉역"));
+
         LineRepository.getLine("신분당선").addSectionByStation(StationRepository.getStation("강남역"));
         LineRepository.getLine("신분당선").addSectionByStation(StationRepository.getStation("양재역"));
         LineRepository.getLine("신분당선").addSectionByStation(StationRepository.getStation("양재시민의숲역"));
-//        for(Line line : LineRepository.lines()) {
-//            System.out.println(line.getName());
-//            for(Station station : line.getRoute()) {
-//                System.out.println(station.getName());
-//            }
-//            System.out.println();
-//        }
     }
 }

From 62f95f5ef6fdc9ef50beabe95df2c9618b20ac82 Mon Sep 17 00:00:00 2001
From: DH Lim <dlarkfl2@gamil.com>
Date: Tue, 15 Dec 2020 20:49:01 +0900
Subject: [PATCH 19/20] =?UTF-8?q?style:=20=EB=B6=88=ED=95=84=EC=9A=94?=
 =?UTF-8?q?=ED=95=9C=20=EA=B0=9C=ED=96=89=20=EC=82=AD=EC=A0=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/subway/Application.java | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/main/java/subway/Application.java b/src/main/java/subway/Application.java
index 1fad276c2..8ee3d2246 100644
--- a/src/main/java/subway/Application.java
+++ b/src/main/java/subway/Application.java
@@ -9,7 +9,6 @@ public static void main(String[] args) {
         final Scanner scanner = new Scanner(System.in);
         // TODO: 프로그램 구현
         DummyDataSetting.run();
-
         SubwayMap subwayMap = new SubwayMap();
         subwayMap.Run(scanner);
     }

From 9a96a016595d3fa61cbf9ce24c9bc95db15a96e1 Mon Sep 17 00:00:00 2001
From: DH Lim <dlarkfl2@gamil.com>
Date: Tue, 15 Dec 2020 20:50:16 +0900
Subject: [PATCH 20/20] =?UTF-8?q?refactor:=20=EA=B8=B0=EB=8A=A5=20?=
 =?UTF-8?q?=EB=B6=84=EB=A6=AC,=20=EC=98=88=EC=99=B8=20=EC=B2=98=EB=A6=AC?=
 =?UTF-8?q?=20=EB=A9=94=EC=86=8C=EB=93=9C=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/subway/controller/SubwayMap.java     | 369 +++++++++++++-----
 1 file changed, 269 insertions(+), 100 deletions(-)

diff --git a/src/main/java/subway/controller/SubwayMap.java b/src/main/java/subway/controller/SubwayMap.java
index eaa28faef..4e555c36c 100644
--- a/src/main/java/subway/controller/SubwayMap.java
+++ b/src/main/java/subway/controller/SubwayMap.java
@@ -1,176 +1,345 @@
 package subway.controller;
 
+import subway.LineManagementSign;
+import subway.MainSign;
+import subway.SectionManagementSign;
+import subway.StationManagementSign;
 import subway.domain.*;
 import subway.view.InputView;
 import subway.view.OutputView;
 
 import java.util.Scanner;
+import java.util.function.Consumer;
 
 public class SubwayMap {
-    private LineRepository lineRepository;
-    private StationRepository stationRepository;
     private boolean isRun = true;
     private OutputView outputView;
     private InputView inputView;
     private Scanner scanner;
-    private ErrorHandler errorHandler;
 
     public void Run(Scanner scanner) {
-        // 에러시 무한 루프(일단 보류)
         this.scanner = scanner;
-        while(isRun) {
+        while (isRun) {
             outputView = new OutputView();
             inputView = new InputView();
-            errorHandler = new ErrorHandler();
-            startMain(scanner);
+            startMain();
         }
     }
 
-    private void startMain(Scanner scanner) {
+    private void startMain() {
         outputView.printMainScreen();
         inputView.scanData(scanner);
-        try{
-            errorHandler.validateMainInput(inputView.getInputData());
-        } catch(IllegalArgumentException E) {
-            outputView.printStartMainError();
-            startMain(scanner);
-        }
-        //
+        validateSign(inputView.getInputData(),
+                t -> MainSign.validateSign(t),
+                () -> startMain());
         chooseFunctionInMain(inputView.getInputData());
     }
 
     private void chooseFunctionInMain(String inputData) {
-        if(inputData.equals("1")) {
+        if (inputData.equals(MainSign.STATION_MANAGEMENT.getSign())) {
             startStationManagement();
         }
-        if(inputData.equals("2")) {
+        if (inputData.equals(MainSign.LINE_MANAGEMENT.getSign())) {
             startLineManagement();
         }
-        if(inputData.equals("3")) {
+        if (inputData.equals(MainSign.SECTION_MANAGEMENT.getSign())) {
             startSectionManagement();
         }
-        if(inputData.equals("4")) {
+        if (inputData.equals(MainSign.PRINT_SUBWAY_ROUTE.getSign())) {
             outputView.printSubwaySections();
         }
-        if(inputData.equalsIgnoreCase("Q")) {
+        if (inputData.equalsIgnoreCase(MainSign.CLOSE_MAIN.getSign())) {
             isRun = false;
         }
     }
 
 
-
     private void startStationManagement() {
         outputView.printStationManagementScreen();
         inputView.scanData(scanner);
+        validateSign(inputView.getInputData(),
+                t -> StationManagementSign.validateSign(t),
+                () -> startStationManagement());
         chooseFunctionInStationManagement(inputView.getInputData());
 
     }
 
     private void chooseFunctionInStationManagement(String inputData) {
-        if(inputData.equals("1")) {
-            outputView.guideAddStation();
-            inputView.scanData(scanner);
-            StationRepository.addStation(new Station(inputView.getInputData()));
-            System.out.println("결과창 출력 수정필요!");
-            startMain(scanner);
-        }
-        if(inputData.equals("2")) {
-            outputView.guideDeleteStation();
-            inputView.scanData(scanner);
-            StationRepository.deleteStation(inputView.getInputData());
-            System.out.println("결과창 출력 수정필요!");
-            startMain(scanner);
-        }
-        if(inputData.equals("3")) {
+        if (inputData.equals(StationManagementSign.ADD_STATION.getSign())) {
+            addStation();
+            System.out.println("addStation 끝");
+            outputView.infoAddStation();
+        }
+        if (inputData.equals(StationManagementSign.DELETE_STATION.getSign())) {
+            deleteStation();
+            outputView.infoDeleteStation();
+        }
+        if (inputData.equals(StationManagementSign.SHOW_STATIONS.getSign())) {
             outputView.printAllStations();
         }
-        if(inputData.equalsIgnoreCase("B")) {
-            startMain(scanner);
+        if (inputData.equalsIgnoreCase(StationManagementSign.BACK_TO_MAIN.getSign())) {
+            startMain();
+        }
+    }
+
+    private void addStation() {
+        outputView.guideAddStation();
+        inputView.scanData(scanner);
+        String name = inputView.getInputData();
+        validateStationName(name, () -> addStation());
+        validateStationDuplicate(name, () -> addStation());
+        StationRepository.addStation(new Station(name));
+    }
+
+    private void validateSign(String inputData, Consumer<String> tryExpression, Runnable catchExpression) {
+        try {
+            tryExpression.accept(inputData);
+        } catch (IllegalArgumentException E) {
+            outputView.errorChooseFunction();
+            catchExpression.run();
+        }
+    }
+
+    private void validateStationName(String inputData, Runnable catchExpression) {
+        try {
+            ErrorHandler.validateStationNameFormat(inputData);
+        } catch (IllegalArgumentException E) {
+            outputView.errorStationFormat();
+            catchExpression.run();
+        }
+    }
+
+    private void validateStationDuplicate(String inputData, Runnable catchExpression) {
+        try {
+            ErrorHandler.validateStationDuplicate(inputData);
+        } catch (IllegalArgumentException E) {
+            outputView.errorStationDuplicate();
+            catchExpression.run();
+        }
+    }
+
+    private void validateStationRegistered(String inputData, Runnable catchExpression) {
+        try {
+            ErrorHandler.validateStationRegistered(inputData);
+        } catch (IllegalArgumentException E) {
+            outputView.errorDeleteStationNotRegistered();
+            catchExpression.run();
         }
     }
 
+    private void deleteStation() {
+        outputView.guideDeleteStation();
+        inputView.scanData(scanner);
+        validateStationName(inputView.getInputData(), () -> deleteStation());
+        validateStationRegistered(inputView.getInputData(), () -> deleteStation());
+        StationRepository.deleteStation(inputView.getInputData());
+        LineRepository.deleteStationInLine(inputView.getInputData());
+
+    }
+
     private void startLineManagement() {
         outputView.printLineManagementScreen();
         inputView.scanData(scanner);
+        validateSign(inputView.getInputData(),
+                t -> LineManagementSign.validateSign(t),
+                () -> startLineManagement());
         chooseFunctionInLineManagement(inputView.getInputData());
     }
 
     private void chooseFunctionInLineManagement(String inputData) {
-        if(inputData.equals("1")) {
-            outputView.guideAddLineName();
-            inputView.scanData(scanner);
-            //검사
-            LineRepository.addLine(new Line(inputData));
-            System.out.println();
-
-            outputView.guideAddLineUpwardTerminal();
-            inputView.scanData(scanner);
-            //검사
-            LineRepository.getLine(inputData).setUpwardStation(StationRepository.getStation(inputData));
-            System.out.println();
-
-            outputView.guideAddLineDownwardTerminal();
-            inputView.scanData(scanner);
-            //검사
-            LineRepository.getLine(inputData).setDownwardStation(StationRepository.getStation(inputData));
-            System.out.println();
-        }
-        if(inputData.equals("2")) {
-            outputView.guideDeleteLine();
-            inputView.scanData(scanner);
-            //검사
-            LineRepository.deleteLineByName(inputView.getInputData());
-            System.out.println();
-        }
-        if(inputData.equals("3")) {
+        if (inputData.equals(LineManagementSign.ADD_LINE.getSign())) {
+            addLine();
+            addUpwardTerminal();
+            addDownwardTerminal();
+            outputView.infoAddLine();
+        }
+        if (inputData.equals(LineManagementSign.DELETE_LINE.getSign())) {
+            deleteLine();
+            outputView.infoDeleteLine();
+        }
+        if (inputData.equals(LineManagementSign.SHOW_LINES.getSign())) {
             outputView.printAllLines();
         }
-        if(inputData.equalsIgnoreCase("B")) {
-            startMain(scanner);
+        if (inputData.equalsIgnoreCase(LineManagementSign.BACK_TO_MAIN.getSign())) {
+            startMain();
         }
+    }
 
+    private void addLine() {
+        outputView.guideAddLineName();
+        inputView.scanData(scanner);
+        String name = inputView.getInputData();
+        validateLineName(name, () -> addLine());
+        validateLineDuplicate(name, () -> addLine());
+        LineRepository.addLine(new Line(name));
+    }
+
+    private void addUpwardTerminal() {
+        outputView.guideAddLineUpwardTerminal();
+        inputView.scanData(scanner);
+        String name = inputView.getInputData();
+        validateStationName(name, () -> addUpwardTerminal());
+        validateStationRegistered(name, () -> addUpwardTerminal());
+        LineRepository.getNewLine().addSectionByStation(StationRepository.getStation(name));
+    }
+
+    private void addDownwardTerminal() {
+        outputView.guideAddLineDownwardTerminal();
+        inputView.scanData(scanner);
+        String name = inputView.getInputData();
+        validateStationName(name, () -> addDownwardTerminal());
+        validateStationRegistered(name, () -> addDownwardTerminal());
+        LineRepository.getNewLine().addSectionByStation(StationRepository.getStation(name));
+    }
+
+    private void deleteLine() {
+        outputView.guideDeleteLine();
+        inputView.scanData(scanner);
+        String name = inputView.getInputData();
+        validateLineName(name, () -> deleteLine());
+        validateLineRegistered(name, () -> deleteLine());
+        LineRepository.deleteLineByName(inputView.getInputData());
+    }
+
+    private void validateLineName(String inputData, Runnable catchExpression) {
+        try {
+            ErrorHandler.validateLineNameFormat(inputData);
+        } catch (IllegalArgumentException E) {
+            outputView.errorLineFormat();
+            catchExpression.run();
+        }
+    }
+
+    private void validateLineDuplicate(String inputData, Runnable catchExpression) {
+        try {
+            ErrorHandler.validateLineDuplicate(inputData);
+        } catch (IllegalArgumentException E) {
+            outputView.errorLineDuplicate();
+            catchExpression.run();
+        }
+    }
+
+    private void validateLineRegistered(String inputData, Runnable catchExpression) {
+        try {
+            ErrorHandler.validateLineRegistered(inputData);
+        } catch (IllegalArgumentException E) {
+            outputView.errorDeleteLineNotRegistered();
+            catchExpression.run();
+        }
     }
 
     private void startSectionManagement() {
         outputView.printSectionManagementScreen();
         inputView.scanData(scanner);
+        validateSign(inputView.getInputData(),
+                t -> SectionManagementSign.validateSign(t),
+                () -> startSectionManagement());
         chooseFunctionInSectionManagement(inputView.getInputData());
     }
 
     private void chooseFunctionInSectionManagement(String inputData) {
-        if(inputData.equals("1")) {
-            outputView.guideAddRouteLine();
-            inputView.scanData(scanner);
-            //검사
-            Line line = LineRepository.getLine(inputView.getInputData());
-            System.out.println();
-
-            outputView.guideAddRouteStation();
-            inputView.scanData(scanner);
-            //검사
-            Station station = StationRepository.getStation(inputData);
-            System.out.println();
-
-            outputView.guideAddRouteOrder();
-            inputView.scanData(scanner);
-            // 검사 후 int로 형변환
-            line.addSectionByOrderAndStation(Integer.parseInt(inputView.getInputData()), station);
-            System.out.println("결과 출력 수정필요!");
-        }
-        if(inputData.equals("2")) {
-            outputView.guideDeleteRouteLine();
-            inputView.scanData(scanner);
-            //검사
-            Line line = LineRepository.getLine(inputData);
-            System.out.println();
-
-            outputView.guideDeleteRouteStation();
-            inputView.scanData(scanner);
-            //검사
-            line.deleteSectionByName(inputView.getInputData());
-        }
-        if(inputData.equalsIgnoreCase("B")) {
-            startMain(scanner);
+        if (inputData.equals(SectionManagementSign.ADD_SECTION.getSign())) {
+            addSection();
+            outputView.infoAddSection();
+        }
+        if (inputData.equals(SectionManagementSign.DELETE_SECTION.getSign())) {
+            deleteSection();
+            outputView.infoDeleteSection();
+        }
+        if (inputData.equalsIgnoreCase(SectionManagementSign.BACK_TO_MAIN.getSign())) {
+            startMain();
+        }
+    }
+
+    private void addSection() {
+        Line line;
+        Station station;
+        int order;
+        line = addCheckLine();
+        station = addCheckStation(line);
+        order = addcheckOrder(line);
+        line.addSectionByOrderAndStation(order, station);
+    }
+
+    private Line addCheckLine() {
+        outputView.guideCheckLine();
+        inputView.scanData(scanner);
+        String name = inputView.getInputData();
+        validateLineName(name, () -> addSection());
+        validateLineRegistered(name, () -> addSection());
+        return LineRepository.getLine(name);
+    }
+
+    private Station addCheckStation(Line line) {
+        outputView.guideCheckSectionStation();
+        inputView.scanData(scanner);
+        String name = inputView.getInputData();
+        validateStationName(name, () -> addSection());
+        validateStationRegistered(name, () -> addSection());
+        validateStationDuplicateInLine(StationRepository.getStation(name), line, () -> addSection());
+        return StationRepository.getStation(name);
+    }
+
+    private int addcheckOrder(Line line) {
+        outputView.guideCheckSectionOrder();
+        inputView.scanData(scanner);
+        String order = inputView.getInputData();
+        validateOrder(order, line, () -> addSection());
+        return Integer.parseInt(order);
+    }
+
+    private void validateStationDuplicateInLine(Station station, Line line, Runnable expression) {
+        try {
+            ErrorHandler.validateStationDuplicateInLine(station, line);
+        } catch (IllegalArgumentException E) {
+            outputView.errorStationDuplicate();
+            expression.run();
+        }
+    }
+
+    private void validateOrder(String order, Line line, Runnable expression) {
+        try {
+            ErrorHandler.validateOrder(order, line);
+        } catch (NumberFormatException E) {
+            outputView.errorParseIntOrder();
+            expression.run();
+        } catch (IllegalArgumentException E) {
+            outputView.errorInBoundOrder();
+            expression.run();
+        }
+    }
+
+    private void deleteSection() {
+        Line line = deleteCheckLine();
+        Station station = deleteCheckStation(line);
+        line.deleteSectionByName(station.getName());
+    }
+
+    private Line deleteCheckLine() {
+        outputView.guideDeleteSectionLine();
+        inputView.scanData(scanner);
+        String name = inputView.getInputData();
+        validateLineName(name, () -> deleteSection());
+        validateLineRegistered(name, () -> deleteSection());
+        return LineRepository.getLine(name);
+    }
+
+    private Station deleteCheckStation(Line line) {
+        outputView.guideDeleteSectionStation();
+        inputView.scanData(scanner);
+        String name = inputView.getInputData();
+        validateStationName(name, () -> deleteSection());
+        validateStationRegistered(name, () -> deleteSection());
+        validateStationRegisteredInLine(StationRepository.getStation(name), line, () -> deleteSection());
+        return StationRepository.getStation(name);
+    }
+
+    private void validateStationRegisteredInLine(Station station, Line line, Runnable expression) {
+        try {
+            ErrorHandler.validateStationRegisteredInLine(station, line);
+        } catch (IllegalArgumentException E) {
+            outputView.errorStationDuplicate();
+            expression.run();
         }
     }
 }