Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[3단계 - 요금 정책 추가] 우르(김현우) 미션 제출합니다 #181

Merged
merged 41 commits into from
May 26, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
41 commits
Select commit Hold shift + click to select a range
62a03e6
fix : 제일 앞의 Section에 역을 추가할 경우 예외 수정
java-saeng May 18, 2023
752ed20
refactor : 도메인이 외부 라이브러리에 바로 의존하지 않고 인터페이스에 의존하면서 최단 경로 조회
java-saeng May 19, 2023
6e9cf73
feat : 하나의 yml 안에 여러 profile 설정해보기
java-saeng May 19, 2023
f9eebfc
feat : 최소 경로 구할 때, Section 반환하는 기능 추가
java-saeng May 20, 2023
8eb7638
feat : 호선에 따라서 요금 정책 기능 추가
java-saeng May 20, 2023
8856369
refactor : SubwayPricePolicy -> SubwayChargePolicy 로 변경
java-saeng May 20, 2023
e8ec926
feat : 연령별 요금 할인 정책 기능 구현
java-saeng May 20, 2023
dac9a3b
refactor : 돈 관련 메서드 모두 Money로 변경
java-saeng May 20, 2023
402a425
refactor : 요금 할인, 요금 부과 계산을 ChargePolicyComposite 에서 모두 하기
java-saeng May 21, 2023
c2f7753
refactor : 패키지 수정
java-saeng May 21, 2023
6eddf3d
refactor : 예외 메시지 전달
java-saeng May 21, 2023
a42f94a
refactor : 불필요한 메서드 삭제
java-saeng May 21, 2023
aa0e619
feat : line id 로 조회하는 API 생성
java-saeng May 21, 2023
781c569
refactor : line 조회 시 id 반환
java-saeng May 21, 2023
71c6785
refactor : 도메인 패키지 변경에 따른 테스트 코드 패키지 변경
java-saeng May 21, 2023
4bcca05
refactor : 도메인 패키지 변경에 따른 테스트 코드 패키지 변경
java-saeng May 21, 2023
13d1d2d
test : LineDao 테스트 작성
java-saeng May 21, 2023
19f4307
test : SectionDao 테스트 작성
java-saeng May 21, 2023
074f896
test : LineControllerTest 작성
java-saeng May 21, 2023
35ea991
test : RouteControllerTest 작성
java-saeng May 21, 2023
ff4297e
test : StationController 작성
java-saeng May 21, 2023
9c12f91
test : LineCommandService Integration Test 추가
java-saeng May 21, 2023
e90d594
test : LineQueryService Integration Test 추가
java-saeng May 21, 2023
028a82a
test : RouteQueryService Integration Test 추가
java-saeng May 21, 2023
3927e12
test : SectionCommandService Integration Test 추가
java-saeng May 22, 2023
7c02029
test : SectionQueryService Integration Test 추가
java-saeng May 22, 2023
868b698
test : StationService Integration Test 추가
java-saeng May 22, 2023
f385149
refactor : exception 패키지 이동
java-saeng May 22, 2023
5f0a505
refactor : java style google 로 변경
java-saeng May 23, 2023
89a3d4a
refactor : 메서드 명 변경
java-saeng May 23, 2023
7a95acc
refactor : 경로 조회 시 하나의 service 에서 조회하도록 변경
java-saeng May 23, 2023
beded7a
refactor : DefaultFarePolicy -> DistanceFarePolicy 로 이름 변경
java-saeng May 23, 2023
d320f85
refactor : Route 도메인 삭제
java-saeng May 25, 2023
c9ee774
feat : 처음 애플리케이션이 실행될 때와 역에 변경이 일어날 경우 다익스트라 그래프 수정하는 이벤트 추가
java-saeng May 25, 2023
62caf14
test : yml 테스트 시 애플리케이션 컨테이네가 띄워지면 자동으로 이벤트가 수행되기 때문에 이를 방지하고자 Profil…
java-saeng May 25, 2023
d3d66cb
refactor : Policy 관련 빈 해제하고, Composite 만 빈 등록
java-saeng May 25, 2023
10b95bb
refactor : Line 생성 시 이벤트 발행
java-saeng May 25, 2023
966df84
refactor : 최소 경로 구할 때, key 값을 역 이름(String)이 아닌 Station으로 사용
java-saeng May 25, 2023
c6984bb
refactor : Event 삭제
java-saeng May 25, 2023
1390aaf
refactor : 그래프 생성하는 Factory 클래스 생성
java-saeng May 25, 2023
727c10b
refactor : 패키지 구조 변경
java-saeng May 25, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,8 @@ dependencies {
implementation 'mysql:mysql-connector-java:8.0.33'

implementation 'org.jgrapht:jgrapht-core:1.5.2'

implementation 'org.mockito:mockito-inline:3.4.6'
}

test {
Expand Down
6 changes: 3 additions & 3 deletions src/main/java/subway/SubwayApplication.java
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
@SpringBootApplication
public class SubwayApplication {

public static void main(String[] args) {
SpringApplication.run(SubwayApplication.class, args);
}
public static void main(String[] args) {
SpringApplication.run(SubwayApplication.class, args);
}

}
21 changes: 21 additions & 0 deletions src/main/java/subway/config/ChargePolicyConfig.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
package subway.config;

import java.util.List;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import subway.policy.application.ChargePolicyComposite;
import subway.policy.infrastructure.AgeDiscountPolicy;
import subway.policy.infrastructure.DistanceFarePolicy;
import subway.policy.infrastructure.LineFarePolicy;

@Configuration
public class ChargePolicyConfig {

@Bean
public ChargePolicyComposite chargePolicyComposite() {
return new ChargePolicyComposite(
List.of(new DistanceFarePolicy(), new LineFarePolicy()),
List.of(new AgeDiscountPolicy())
);
}
}
60 changes: 0 additions & 60 deletions src/main/java/subway/controller/LineController.java

This file was deleted.

27 changes: 0 additions & 27 deletions src/main/java/subway/controller/RouteController.java

This file was deleted.

38 changes: 0 additions & 38 deletions src/main/java/subway/controller/StationController.java

This file was deleted.

58 changes: 0 additions & 58 deletions src/main/java/subway/dao/LineDao.java

This file was deleted.

24 changes: 0 additions & 24 deletions src/main/java/subway/dao/LineEntity.java

This file was deleted.

68 changes: 0 additions & 68 deletions src/main/java/subway/dao/SectionDao.java

This file was deleted.

56 changes: 0 additions & 56 deletions src/main/java/subway/dao/SectionEntity.java

This file was deleted.

Loading