🚀 3단계 - 요금 정책 추가

README.md

@@ -16,4 +16,27 @@
   - [x] 인수 테스트를 충족하는 기능 구현
 
 ### 🚀 2단계 - 요금 조회
-- [x] 경로 조회 결과에 요금 정보를 포함
+- [x] 경로 조회 결과에 요금 정보를 포함
+- [x] findPath메서드, calculateFare 메서드를 호출할 때마다 출발지/도착지 파라미터로 전달
+- [x] PathFinder의 역할을 SubwayMap이 가져가도록 변경
+- [x] 요금을 원시값(int) 대신 사용하는 클래스로 변경
+  - 기본요금 제공
+  - 요금 덧셈 기능 제공
+  - 0보다 작을 수 없음을 보장
+
+### 🚀 3단계 - 요금 정책 추가
+- [x] 노선별 추가 요금
+  - [x] 추가 요금이 있는 노선을 이용 할 경우 측정된 요금에 추가
+    ````
+    ex) 900원 추가 요금이 있는 노선 8km 이용 시 1,250원 -> 2,150원
+    ex) 900원 추가 요금이 있는 노선 12km 이용 시 1,350원 -> 2,250원
+    ````
+  - [x] 경로 중 추가요금이 있는 노선을 환승 하여 이용 할 경우 가장 높은 금액의 추가 요금만 적용
+    ````
+    ex) 0원, 500원, 900원의 추가 요금이 있는 노선들을 경유하여 8km 이용 시 1,250원 -> 2,150원
+    ````
+- [x] 로그인 사용자의 경우 연령별 요금으로 계산
+  ````
+  청소년(13세 이상~19세 미만): 운임에서 350원을 공제한 금액의 20%할인
+  어린이(6세 이상~13세 미만): 운임에서 350원을 공제한 금액의 50%할인
+  ````

src/main/java/nextstep/auth/application/JwtTokenProvider.java

@@ -8,13 +8,17 @@
 
 @Component
 public class JwtTokenProvider {
+
+    private static final String AGE_KEY = "age";
+
     @Value("${security.jwt.token.secret-key}")
     private String secretKey;
     @Value("${security.jwt.token.expire-length}")
     private long validityInMilliseconds;
 
-    public String createToken(String principal) {
+    public String createToken(String principal, int age) {
         Claims claims = Jwts.claims().setSubject(principal);
+        claims.put(AGE_KEY, age);
         Date now = new Date();
         Date validity = new Date(now.getTime() + validityInMilliseconds);
 
@@ -26,8 +30,9 @@ public String createToken(String principal) {
                 .compact();
     }
 
-    public String getPrincipal(String token) {
-        return Jwts.parser().setSigningKey(secretKey).parseClaimsJws(token).getBody().getSubject();
+    public TokenInfo getPrincipal(String token) {
+        Claims claims = Jwts.parser().setSigningKey(secretKey).parseClaimsJws(token).getBody();
+        return new TokenInfo(claims.getSubject(), claims.get(AGE_KEY, Integer.class));
     }
 
     public boolean validateToken(String token) {

src/main/java/nextstep/auth/application/TokenInfo.java

@@ -0,0 +1,21 @@
+package nextstep.auth.application;
+
+public class TokenInfo {
+
+    private String email;
+    private Integer age;
+
+    public TokenInfo(String email, Integer age) {
+        this.email = email;
+        this.age = age;
+    }
+
+    public String getEmail() {
+        return email;
+    }
+
+    public Integer getAge() {
+        return age;
+    }
+}
+

src/main/java/nextstep/auth/application/TokenService.java

@@ -24,7 +24,7 @@ public TokenResponse createToken(String email, String password) {
             throw new AuthenticationException();
         }
 
-        String token = jwtTokenProvider.createToken(user.getEmail());
+        String token = jwtTokenProvider.createToken(user.getEmail(), user.getAge());
 
         return new TokenResponse(token);
     }
@@ -34,7 +34,7 @@ public TokenResponse createTokenByGithubLogin(GithubLoginRequest request) {
         GithubProfileResponse profileResponse = githubClient.requestGithubProfile(accessToken);
 
         UserDetails user = userDetailsService.findOrCreateMember(profileResponse.getEmail(), profileResponse.getAge());
-        String token = jwtTokenProvider.createToken(user.getEmail());
+        String token = jwtTokenProvider.createToken(user.getEmail(), user.getAge());
 
         return new TokenResponse(token);
     }

src/main/java/nextstep/auth/application/UserDetails.java

@@ -5,4 +5,6 @@ public interface UserDetails {
     String getPassword();
 
     String getEmail();
+
+    Integer getAge();
 }

src/main/java/nextstep/auth/ui/AuthenticationPrincipal.java

@@ -8,4 +8,5 @@
 @Target(ElementType.PARAMETER)
 @Retention(RetentionPolicy.RUNTIME)
 public @interface AuthenticationPrincipal {
+    boolean required() default true;
 }

src/main/java/nextstep/auth/ui/AuthenticationPrincipalArgumentResolver.java

@@ -2,19 +2,21 @@
 
 import nextstep.auth.AuthenticationException;
 import nextstep.auth.application.JwtTokenProvider;
+import nextstep.auth.application.TokenInfo;
 import nextstep.member.domain.LoginMember;
 import org.springframework.core.MethodParameter;
+import org.springframework.util.StringUtils;
 import org.springframework.web.bind.support.WebDataBinderFactory;
 import org.springframework.web.context.request.NativeWebRequest;
 import org.springframework.web.method.support.HandlerMethodArgumentResolver;
 import org.springframework.web.method.support.ModelAndViewContainer;
 
+import java.util.Optional;
+
 public class AuthenticationPrincipalArgumentResolver implements HandlerMethodArgumentResolver {
 
+    public static final String AUTH_PREFIX = "Bearer ";
     private static final String AUTHORIZATION = "Authorization";
-    private static final String BEARER = "bearer";
-    private static final String SPACE = " ";
-
     private JwtTokenProvider jwtTokenProvider;
 
     public AuthenticationPrincipalArgumentResolver(JwtTokenProvider jwtTokenProvider) {
@@ -29,13 +31,24 @@ public boolean supportsParameter(MethodParameter parameter) {
     @Override
     public Object resolveArgument(MethodParameter parameter, ModelAndViewContainer mavContainer, NativeWebRequest webRequest, WebDataBinderFactory binderFactory) throws Exception {
         String authorization = webRequest.getHeader(AUTHORIZATION);
-        if (authorization == null || authorization.isEmpty() || !BEARER.equalsIgnoreCase(authorization.split(SPACE)[0])) {
+
+        if (StringUtils.hasLength(authorization) && authorization.startsWith(AUTH_PREFIX)) {
+            String token = authorization.substring(AUTH_PREFIX.length());
+            TokenInfo tokenInfo = jwtTokenProvider.getPrincipal(token);
+            return new LoginMember(tokenInfo.getEmail(), tokenInfo.getAge());
+        }
+
+        if (isAuthRequired(parameter)) {
             throw new AuthenticationException();
         }
-        String token = authorization.split(SPACE)[1];
 
-        String email = jwtTokenProvider.getPrincipal(token);
+        return new LoginMember(null, null);
+    }
 
-        return new LoginMember(email);
+    private boolean isAuthRequired(final MethodParameter parameter) {
+        final AuthenticationPrincipal annotation = parameter.getParameterAnnotation(AuthenticationPrincipal.class);
+        return Optional.ofNullable(annotation)
+                .map(AuthenticationPrincipal::required)
+                .orElse(true);
     }
 }

src/main/java/nextstep/exception/GlobalExceptionHandler.java

@@ -1,5 +1,6 @@
 package nextstep.exception;
 
+import nextstep.path.fare.NegativeNumberException;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.ExceptionHandler;
@@ -12,4 +13,9 @@ public class GlobalExceptionHandler {
     protected ResponseEntity<ExceptionResponse> handleApplication(SubwayException ex) {
         return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(new ExceptionResponse(ex.getMessage()));
     }
+
+    @ExceptionHandler(NegativeNumberException.class)
+    protected ResponseEntity<ExceptionResponse> handleApplication(NegativeNumberException ex) {
+        return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(new ExceptionResponse(ex.getMessage()));
+    }
 }

src/main/java/nextstep/favorite/application/FavoriteService.java

@@ -10,8 +10,7 @@
 import nextstep.member.domain.LoginMember;
 import nextstep.member.domain.Member;
 import nextstep.member.domain.MemberRepository;
-import nextstep.path.Path;
-import nextstep.path.PathFinder;
+import nextstep.path.SubwayMap;
 import nextstep.station.Station;
 import nextstep.station.StationRepository;
 import org.springframework.stereotype.Service;
@@ -40,7 +39,7 @@ public Long createFavorite(LoginMember loginMember, FavoriteRequest request) {
         Station targetStation = stationRepository.findById(request.getTarget()).orElseThrow(() -> new SubwayException("존재하지 않는 역입니다."));
         List<Line> lines = lineRepository.findAll();
 
-        PathFinder pathFinder = new PathFinder(lines);
+        SubwayMap pathFinder = new SubwayMap(lines);
         pathFinder.isValidateRoute(sourceStation, targetStation);
 
         Favorite favorite = new Favorite(sourceStation, targetStation, member);

src/main/java/nextstep/line/Line.java

@@ -20,6 +20,9 @@ public class Line {
     @Column(length = 20, nullable = false)
     private String color;
 
+    @Column(nullable = false)
+    private int extraFare;
+
     @Embedded
     private Sections sections = new Sections();
 
@@ -32,6 +35,11 @@ public Line(String name, String color, Section section) {
         sections.addSection(section);
     }
 
+    public Line(String name, String color, int extraFare, Section section) {
+        this(name, color, section);
+        this.extraFare = extraFare;
+    }
+
     public void update(String name, String color) {
         this.name = name;
         this.color = color;
@@ -57,6 +65,10 @@ public String getColor() {
         return color;
     }
 
+    public int getExtraFare() {
+        return extraFare;
+    }
+
     public List<Section> getSections() {
         return sections.getSections();
     }
@@ -65,4 +77,10 @@ public List<Station> getOrderedStations() {
         return sections.getOrderedStations();
     }
 
+    @Override
+    public String toString() {
+        return "Line{" +
+                ", name='" + name + '\'' +
+                '}';
+    }
 }

src/main/java/nextstep/line/LineRequest.java

@@ -8,6 +8,7 @@ public class LineRequest {
     private Long downStationId;
     private int distance;
     private int duration;
+    private int extraFare;
 
     public String getName() {
         return name;
@@ -33,4 +34,8 @@ public int getDuration() {
         return duration;
     }
 
+    public int getExtraFare() {
+        return extraFare;
+    }
+
 }

src/main/java/nextstep/line/LineService.java

@@ -31,7 +31,7 @@ public LineResponse saveLine(LineRequest lineRequest) {
                 .orElseThrow(EntityNotFoundException::new);
 
         Section section = new Section(upStation, downStation, lineRequest.getDistance(), lineRequest.getDuration());
-        Line line = new Line(lineRequest.getName(), lineRequest.getColor(), section);
+        Line line = new Line(lineRequest.getName(), lineRequest.getColor(), lineRequest.getExtraFare(), section);
         Line savedLine = lineRepository.save(line);
 
         return new LineResponse(savedLine);

src/main/java/nextstep/member/domain/LoginMember.java

@@ -2,12 +2,18 @@
 
 public class LoginMember {
     private String email;
+    private Integer age;
 
-    public LoginMember(String email) {
+    public LoginMember(String email, Integer age) {
         this.email = email;
+        this.age = age;
     }
 
     public String getEmail() {
         return email;
     }
+
+    public Integer getAge() {
+        return age;
+    }
 }

src/main/java/nextstep/member/domain/Member.java

@@ -38,6 +38,7 @@ public String getPassword() {
         return password;
     }
 
+    @Override
     public Integer getAge() {
         return age;
     }

src/main/java/nextstep/path/Path.java

@@ -1,5 +1,6 @@
 package nextstep.path;
 
+import nextstep.line.Line;
 import nextstep.station.Station;
 
 import java.util.List;
@@ -9,11 +10,13 @@ public class Path {
     private List<Station> stations;
     private int distance;
     private int duration;
+    private List<Line> usedLine;
 
-    public Path(List<Station> stations, int distance, int duration) {
+    public Path(List<Station> stations, int distance, int duration, List<Line> usedLine) {
         this.stations = stations;
         this.distance = distance;
         this.duration = duration;
+        this.usedLine = usedLine;
     }
 
     public List<Station> getStations() {
@@ -28,4 +31,7 @@ public int getDuration() {
         return duration;
     }
 
+    public List<Line> getUsedLine() {
+        return usedLine;
+    }
 }

src/main/java/nextstep/path/PathController.java

@@ -1,5 +1,7 @@
 package nextstep.path;
 
+import nextstep.auth.ui.AuthenticationPrincipal;
+import nextstep.member.domain.LoginMember;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestParam;
@@ -15,7 +17,8 @@ public PathController(PathService pathService) {
     }
 
     @GetMapping(value = "/paths")
-    public ResponseEntity<PathResponse> getPaths(@RequestParam Long source, @RequestParam Long target, @RequestParam PathType type) {
-        return ResponseEntity.ok().body(pathService.findPath(source, target, type));
+    public ResponseEntity<PathResponse> getPaths(@RequestParam Long source, @RequestParam Long target, @RequestParam PathType type,
+                                                 @AuthenticationPrincipal(required = false) LoginMember loginMember) {
+        return ResponseEntity.ok().body(pathService.findPath(source, target, type, loginMember.getAge()));
     }
 }