🚀 3단계 - 요금 정책 추가

README.md

@@ -25,4 +25,12 @@
 
 - 경로 조회 결과에 요금 정보를 포함하세요.
 - 인수 테스트 (수정) -> 문서화 -> 기능 구현 순으로 진행하세요.
+- 개발 흐름을 파악할 수 있도록 커밋을 작은 단위로 나누어 구현해보세요.
+
+## 🚀 3단계 - 요금 정책 추가
+
+### 요구사항
+
+- 추가된 요금 정책을 반영하세요.
+- 인수 테스트 변경 -> 문서화 변경 -> 기능 구현 순으로 진행하세요.
 - 개발 흐름을 파악할 수 있도록 커밋을 작은 단위로 나누어 구현해보세요.

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

@@ -14,7 +14,9 @@ public class JwtTokenProvider {
     @Value("${security.jwt.token.expire-length}")
     private long validityInMilliseconds;
 
-    public String createToken(String principal, List<String> roles) {
+    public String createToken(final String principal,
+                              final int age,
+                              final List<String> roles) {
         Claims claims = Jwts.claims().setSubject(principal);
         Date now = new Date();
         Date validity = new Date(now.getTime() + validityInMilliseconds);
@@ -24,16 +26,25 @@ public String createToken(String principal, List<String> roles) {
                 .setIssuedAt(now)
                 .setExpiration(validity)
                 .claim("roles", roles)
+                .claim("age", age)
                 .signWith(SignatureAlgorithm.HS256, secretKey)
                 .compact();
     }
 
     public String getPrincipal(String token) {
-        return Jwts.parser().setSigningKey(secretKey).parseClaimsJws(token).getBody().getSubject();
+        return getClaims(token).getSubject();
+    }
+
+    public int getAge(final String token) {
+        return getClaims(token).get("age", Integer.class);
     }
 
     public List<String> getRoles(String token) {
-        return Jwts.parser().setSigningKey(secretKey).parseClaimsJws(token).getBody().get("roles", List.class);
+        return getClaims(token).get("roles", List.class);
+    }
+
+    private Claims getClaims(String token) {
+        return Jwts.parser().setSigningKey(secretKey).parseClaimsJws(token).getBody();
     }
 
     public boolean validateToken(String token) {

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

@@ -20,7 +20,7 @@ public TokenService(MemberService memberService, JwtTokenProvider jwtTokenProvid
     public TokenResponse createToken(String email, String password) {
         Member member = memberService.login(email, password);
 
-        String token = jwtTokenProvider.createToken(member.getId().toString(), member.getRoles());
+        String token = jwtTokenProvider.createToken(member.getId().toString(), member.getAge(), member.getRoles());
 
         return new TokenResponse(token);
     }
@@ -32,7 +32,7 @@ public TokenResponse createGithubToken(String code) {
 
         Member member = memberService.createOrFindMember(githubProfile.getEmail());
 
-        String token = jwtTokenProvider.createToken(member.getId().toString(), member.getRoles());
+        String token = jwtTokenProvider.createToken(member.getId().toString(), member.getAge(), member.getRoles());
 
         return new TokenResponse(token);
     }

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

@@ -0,0 +1,10 @@
+package nextstep.member.domain;
+
+import java.util.List;
+
+public class AnonymousMember extends LoginMember {
+
+    public AnonymousMember() {
+        super(-1L, 0, List.of(RoleType.ROLE_ANONYMOUS.name()));
+    }
+}

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

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

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

@@ -4,17 +4,25 @@
 
 public class LoginMember {
     private Long id;
+    private int age;
     private List<String> roles;
 
-    public LoginMember(Long id, List<String> roles) {
+    public LoginMember(final Long id,
+                       final int age,
+                       final List<String> roles) {
         this.id = id;
+        this.age = age;
         this.roles = roles;
     }
 
     public Long getId() {
         return id;
     }
 
+    public int getAge() {
+        return age;
+    }
+
     public List<String> getRoles() {
         return roles;
     }

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

@@ -2,5 +2,6 @@
 
 public enum RoleType {
     ROLE_ADMIN,
-    ROLE_MEMBER
+    ROLE_MEMBER,
+    ROLE_ANONYMOUS
 }

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

@@ -1,16 +1,19 @@
 package nextstep.member.ui;
 
 import nextstep.member.application.JwtTokenProvider;
+import nextstep.member.domain.AnonymousMember;
 import nextstep.member.domain.AuthenticationPrincipal;
 import nextstep.member.domain.LoginMember;
 import org.springframework.core.MethodParameter;
 import org.springframework.stereotype.Component;
+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.List;
+import java.util.Objects;
 
 @Component
 public class AuthenticationPrincipalArgumentResolver implements HandlerMethodArgumentResolver {
@@ -27,15 +30,23 @@ public boolean supportsParameter(MethodParameter parameter) {
 
     @Override
     public Object resolveArgument(MethodParameter parameter, ModelAndViewContainer mavContainer, NativeWebRequest webRequest, WebDataBinderFactory binderFactory) throws Exception {
-        String authorization = webRequest.getHeader("Authorization");
+
+        final boolean required = Objects.requireNonNull(parameter.getParameterAnnotation(AuthenticationPrincipal.class)).required();
+        final String authorization = webRequest.getHeader("Authorization");
+
+        if (!required && !StringUtils.hasText(authorization)) {
+            return new AnonymousMember();
+        }
+
         if (!"bearer".equalsIgnoreCase(authorization.split(" ")[0])) {
             throw new AuthenticationException();
         }
         String token = authorization.split(" ")[1];
 
         Long id = Long.parseLong(jwtTokenProvider.getPrincipal(token));
+        int age = jwtTokenProvider.getAge(token);
         List<String> roles = jwtTokenProvider.getRoles(token);
 
-        return new LoginMember(id, roles);
+        return new LoginMember(id, age, roles);
     }
 }

src/main/java/nextstep/subway/applicaion/LineService.java

@@ -26,7 +26,7 @@ public LineService(LineRepository lineRepository, StationService stationService)
 
     @Transactional
     public LineResponse saveLine(final LineRequest request) {
-        final Line line = lineRepository.save(new Line(request.getName(), request.getColor()));
+        final Line line = lineRepository.save(new Line(request.getName(), request.getColor(), request.getAddFare()));
         if (isValidSaveRequest(request)) {
             Station upStation = stationService.findById(request.getUpStationId());
             Station downStation = stationService.findById(request.getDownStationId());

src/main/java/nextstep/subway/applicaion/PathService.java

@@ -1,5 +1,6 @@
 package nextstep.subway.applicaion;
 
+import nextstep.member.domain.LoginMember;
 import nextstep.subway.applicaion.dto.PathResponse;
 import nextstep.subway.applicaion.dto.PathType;
 import nextstep.subway.domain.*;
@@ -17,13 +18,14 @@ public PathService(LineService lineService, StationService stationService) {
         this.stationService = stationService;
     }
 
-    public PathResponse findPath(final Long source,
+    public PathResponse findPath(final LoginMember member,
+                                 final Long source,
                                  final Long target,
                                  final PathType type) {
         Station upStation = stationService.findById(source);
         Station downStation = stationService.findById(target);
         List<Line> lines = lineService.findLines();
-        SubwayMap subwayMap = new SubwayMap(lines);
+        SubwayMap subwayMap = new SubwayMap(lines, new AgeDiscountPolicy(member));
         Path path = subwayMap.findPath(upStation, downStation, type);
         return PathResponse.of(path);
     }

src/main/java/nextstep/subway/applicaion/dto/LineRequest.java

@@ -7,6 +7,7 @@ public class LineRequest {
     private Long downStationId;
     private int distance;
     private int duration;
+    private int addFare;
 
     public String getName() {
         return name;
@@ -31,4 +32,8 @@ public int getDistance() {
     public int getDuration() {
         return duration;
     }
+
+    public int getAddFare() {
+        return addFare;
+    }
 }

src/main/java/nextstep/subway/domain/AgeDiscountPolicy.java

@@ -0,0 +1,58 @@
+package nextstep.subway.domain;
+
+import nextstep.member.domain.LoginMember;
+
+import static nextstep.member.domain.RoleType.ROLE_ANONYMOUS;
+
+public class AgeDiscountPolicy implements DiscountPolicy {
+
+    public static final int DEDUCTION = 350;
+
+    public static final double CHILD_DISCOUNT = 0.5;
+    public static final double TEENAGER_DISCOUNT = 0.8;
+
+    public static final int CHILD_AGE = 6;
+    public static final int TEENAGER_AGE = 13;
+    public static final int ADULT_AGE = 19;
+
+    private final LoginMember member;
+
+    public AgeDiscountPolicy(LoginMember member) {
+        this.member = member;
+    }
+
+    @Override
+    public int calculator(final int fare) {
+        if (member.getRoles().contains(ROLE_ANONYMOUS.name())) {
+            return fare;
+        }
+
+        if (member.getAge() < 1) {
+            throw new IllegalArgumentException("나이는 0 이하일 수 없습니다.");
+        }
+
+        return getDiscountFare(fare, member.getAge());
+    }
+
+    private int getDiscountFare(final int fare, final int age) {
+        if (isTeenager(age)) {
+            return calculateDiscountFare(fare, TEENAGER_DISCOUNT);
+        } else if (isChild(age)) {
+            return calculateDiscountFare(fare, CHILD_DISCOUNT);
+        }
+
+        return fare;
+    }
+
+    private boolean isChild(final int age) {
+        return age >= CHILD_AGE && age < TEENAGER_AGE;
+    }
+
+    private boolean isTeenager(final int age) {
+        return age >= TEENAGER_AGE && age < ADULT_AGE;
+    }
+
+    private int calculateDiscountFare(final int fare, final double teenagerDiscount) {
+        return (int) ((fare - DEDUCTION) * teenagerDiscount + DEDUCTION);
+    }
+}

src/main/java/nextstep/subway/domain/DiscountPolicy.java

@@ -0,0 +1,6 @@
+package nextstep.subway.domain;
+
+public interface DiscountPolicy {
+
+    int calculator(int fare);
+}

src/main/java/nextstep/subway/domain/DistanceFarePolicy.java

@@ -31,6 +31,6 @@ public int calculator(final int distance) {
 
     private int calculateOverFare(final int distance,
                                   final int chargeDistance) {
-        return (int) ((Math.ceil((distance - 1d) / chargeDistance) + 1) * ADDITIONAL_FARE);
+        return (((distance - 1) / chargeDistance) + 1) * ADDITIONAL_FARE;
     }
 }

src/main/java/nextstep/subway/domain/Line.java

@@ -10,16 +10,24 @@ public class Line {
     private Long id;
     private String name;
     private String color;
+    private int addFare;
 
     @Embedded
     private Sections sections = new Sections();
 
     public Line() {
     }
 
-    public Line(String name, String color) {
+    public Line(final String name, final String color) {
+        this(name, color, 0);
+    }
+
+    public Line(final String name,
+                final String color,
+                final int addFare) {
         this.name = name;
         this.color = color;
+        this.addFare = addFare;
     }
 
     public Long getId() {
@@ -34,6 +42,10 @@ public String getColor() {
         return color;
     }
 
+    public int getAddFare() {
+        return addFare;
+    }
+
     public List<Section> getSections() {
         return sections.getSections();
     }

src/main/java/nextstep/subway/domain/Path.java

@@ -1,23 +1,32 @@
 package nextstep.subway.domain;
 
 import java.util.List;
+import java.util.Optional;
 
 public class Path {
     private Sections sections;
     private FarePolicy farePolicy;
+    private Optional<DiscountPolicy> discountPolicy;
 
+    private int addFare;
     private int minDistance;
 
     public Path(final Sections sections,
-                final FarePolicy farePolicy) {
-        this(sections, farePolicy, 0);
+                final FarePolicy farePolicy,
+                final DiscountPolicy discountPolicy,
+                final int addFare) {
+        this(sections, farePolicy, discountPolicy, addFare ,0);
     }
 
     public Path(final Sections sections,
                 final FarePolicy farePolicy,
+                final DiscountPolicy discountPolicy,
+                final int addFare,
                 final int minDistance) {
         this.sections = sections;
         this.farePolicy = farePolicy;
+        this.discountPolicy = Optional.ofNullable(discountPolicy);
+        this.addFare = addFare;
         this.minDistance = minDistance;
     }
 
@@ -39,8 +48,17 @@ public List<Station> getStations() {
 
     public int getFare() {
         if (minDistance > 0) {
-            return farePolicy.calculator(minDistance);
+            return calculateFare(minDistance);
         }
-        return farePolicy.calculator(sections.totalDistance());
+        return calculateFare(sections.totalDistance());
+    }
+
+    private int calculateFare(final int minDistance) {
+        return getDiscountFare(farePolicy.calculator(minDistance) + addFare);
+    }
+
+    private int getDiscountFare(final int fare) {
+        return discountPolicy.map(policy -> policy.calculator(fare)).orElse(fare);
+
     }
 }