Step3 3단계 요금 정책 추가 리뷰 부탁드립니다.

build.gradle

@@ -41,6 +41,8 @@ dependencies {
 	testImplementation 'io.rest-assured:rest-assured:4.2.0'
 
 	runtimeOnly 'com.h2database:h2'
+
+	annotationProcessor 'org.projectlombok:lombok'
 }
 
 ext {

src/main/java/nextstep/DataLoader.java

@@ -1,22 +1,23 @@
 package nextstep;
 
+import lombok.RequiredArgsConstructor;
 import nextstep.member.domain.Member;
 import nextstep.member.domain.MemberRepository;
 import nextstep.member.domain.RoleType;
 import org.springframework.stereotype.Component;
 
-import java.util.Arrays;
+import java.util.List;
 
+@RequiredArgsConstructor
 @Component
 public class DataLoader {
-    private MemberRepository memberRepository;
-
-    public DataLoader(MemberRepository memberRepository) {
-        this.memberRepository = memberRepository;
-    }
+    private final MemberRepository memberRepository;
 
     public void loadData() {
-        memberRepository.save(new Member("[email protected]", "password", 20, Arrays.asList(RoleType.ROLE_ADMIN.name())));
-        memberRepository.save(new Member("[email protected]", "password", 20, Arrays.asList(RoleType.ROLE_MEMBER.name())));
+        memberRepository.save(new Member("[email protected]", "password", 20, List.of(RoleType.ROLE_ADMIN.name())));
+        memberRepository.save(new Member("[email protected]", "password", 20, List.of(RoleType.ROLE_MEMBER.name())));
+        memberRepository.save(new Member("[email protected]", "password", 20, List.of(RoleType.ROLE_MEMBER.name())));
+        memberRepository.save(new Member("[email protected]", "password", 18, List.of(RoleType.ROLE_MEMBER.name())));
+        memberRepository.save(new Member("[email protected]", "password", 12, List.of(RoleType.ROLE_MEMBER.name())));
     }
 }

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

@@ -0,0 +1,13 @@
+package nextstep.member.domain;
+
+import lombok.NoArgsConstructor;
+
+@NoArgsConstructor
+public class Guest extends Member {
+
+    @Override
+    public Integer getAge() {
+        return Integer.MAX_VALUE;
+    }
+
+}

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

@@ -5,9 +5,9 @@
 import nextstep.subway.applicaion.dto.FavoriteRequest;
 import nextstep.subway.applicaion.dto.FavoriteResponse;
 import nextstep.subway.applicaion.dto.StationResponse;
-import nextstep.subway.domain.Favorite;
-import nextstep.subway.domain.FavoriteRepository;
-import nextstep.subway.domain.Station;
+import nextstep.subway.domain.favorite.Favorite;
+import nextstep.subway.domain.favorite.FavoriteRepository;
+import nextstep.subway.domain.station.Station;
 import org.springframework.stereotype.Service;
 
 import java.util.HashSet;

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

@@ -4,9 +4,9 @@
 import nextstep.subway.applicaion.dto.LineResponse;
 import nextstep.subway.applicaion.dto.SectionRequest;
 import nextstep.subway.applicaion.dto.StationResponse;
-import nextstep.subway.domain.Line;
-import nextstep.subway.domain.LineRepository;
-import nextstep.subway.domain.Station;
+import nextstep.subway.domain.line.Line;
+import nextstep.subway.domain.line.LineRepository;
+import nextstep.subway.domain.station.Station;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -26,7 +26,7 @@ public LineService(LineRepository lineRepository, StationService stationService)
 
     @Transactional
     public LineResponse saveLine(LineRequest request) {
-        Line line = lineRepository.save(new Line(request.getName(), request.getColor()));
+        Line line = lineRepository.save(new Line(request.getName(), request.getColor(), request.getAddFare()));
         if (request.getUpStationId() != null && request.getDownStationId() != null && request.getDistance() != 0) {
             Station upStation = stationService.findById(request.getUpStationId());
             Station downStation = stationService.findById(request.getDownStationId());

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

@@ -1,27 +1,32 @@
 package nextstep.subway.applicaion;
 
+import lombok.RequiredArgsConstructor;
+import nextstep.member.domain.Guest;
+import nextstep.member.domain.Member;
+import nextstep.member.domain.MemberRepository;
 import nextstep.subway.applicaion.dto.PathResponse;
-import nextstep.subway.domain.*;
+import nextstep.subway.domain.SubwayMap;
+import nextstep.subway.domain.fare.Fare;
+import nextstep.subway.domain.line.Line;
+import nextstep.subway.domain.path.Path;
+import nextstep.subway.domain.path.PathType;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
 
+@RequiredArgsConstructor
 @Service
 public class PathService {
-    private LineService lineService;
-    private StationService stationService;
+    private final LineService lineService;
+    private final StationService stationService;
+    private final MemberRepository memberRepository;
 
-    public PathService(LineService lineService, StationService stationService) {
-        this.lineService = lineService;
-        this.stationService = stationService;
-    }
-
-    public PathResponse findPath(PathType pathType, Long source, Long target) {
-        Station upStation = stationService.findById(source);
-        Station downStation = stationService.findById(target);
+    public PathResponse findPath(PathType pathType, Long source, Long target, String userName) {
         List<Line> lines = lineService.findLines();
         SubwayMap subwayMap = SubwayMap.create(lines, pathType);
-        Path path = subwayMap.findPath(upStation, downStation);
-        return PathResponse.of(path);
+        Member member = memberRepository.findByEmail(userName).orElse(new Guest());
+        Path path = subwayMap.findPath(stationService.findById(source), stationService.findById(target));
+        Fare fare = new Fare(path.extractDistance(), path.getSections(), member.getAge());
+        return PathResponse.of(path, fare.calculate());
     }
 }

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

@@ -2,8 +2,8 @@
 
 import nextstep.subway.applicaion.dto.StationRequest;
 import nextstep.subway.applicaion.dto.StationResponse;
-import nextstep.subway.domain.Station;
-import nextstep.subway.domain.StationRepository;
+import nextstep.subway.domain.station.Station;
+import nextstep.subway.domain.station.StationRepository;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 

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

@@ -1,6 +1,6 @@
 package nextstep.subway.applicaion.dto;
 
-import nextstep.subway.domain.Favorite;
+import nextstep.subway.domain.favorite.Favorite;
 
 public class FavoriteResponse {
     private Long id;

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

@@ -1,33 +1,14 @@
 package nextstep.subway.applicaion.dto;
 
+import lombok.Getter;
+
+@Getter
 public class LineRequest {
     private String name;
     private String color;
     private Long upStationId;
     private Long downStationId;
     private int distance;
     private int duration;
-
-    public String getName() {
-        return name;
-    }
-
-    public String getColor() {
-        return color;
-    }
-
-    public Long getUpStationId() {
-        return upStationId;
-    }
-
-    public Long getDownStationId() {
-        return downStationId;
-    }
-
-    public int getDistance() {
-        return distance;
-    }
-    public int getDuration() {
-        return duration;
-    }
+    private int addFare;
 }

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

@@ -1,10 +1,12 @@
 package nextstep.subway.applicaion.dto;
 
-import nextstep.subway.domain.Line;
+import lombok.Getter;
+import nextstep.subway.domain.line.Line;
 
 import java.util.List;
 import java.util.stream.Collectors;
 
+@Getter
 public class LineResponse {
     private Long id;
     private String name;
@@ -25,18 +27,6 @@ public LineResponse(Long id, String name, String color, List<StationResponse> st
         this.stations = stations;
     }
 
-    public Long getId() {
-        return id;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public String getColor() {
-        return color;
-    }
-
     public List<StationResponse> getStations() {
         return stations;
     }

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

@@ -1,6 +1,7 @@
 package nextstep.subway.applicaion.dto;
 
-import nextstep.subway.domain.Path;
+import lombok.Builder;
+import nextstep.subway.domain.path.Path;
 
 import java.util.List;
 import java.util.stream.Collectors;
@@ -11,21 +12,27 @@ public class PathResponse {
     private int duration;
     private int fare;
 
+    @Builder
     public PathResponse(List<StationResponse> stations, int distance, int duration, int fare) {
         this.stations = stations;
         this.distance = distance;
         this.duration = duration;
         this.fare = fare;
     }
 
-    public static PathResponse of(Path path) {
+    public static PathResponse of(Path path, int fare) {
+
         List<StationResponse> stations = path.getStations().stream()
                 .map(StationResponse::of)
                 .collect(Collectors.toList());
-        int distance = path.extractDistance();
-        int duration = path.extractDuration();
-        int fare = path.extractFare();
-        return new PathResponse(stations, distance, duration, fare);
+
+        return PathResponse
+                .builder()
+                .stations(stations)
+                .distance(path.extractDistance())
+                .duration(path.extractDuration())
+                .fare(fare)
+                .build();
     }
 
     public List<StationResponse> getStations() {
@@ -35,9 +42,11 @@ public List<StationResponse> getStations() {
     public int getDistance() {
         return distance;
     }
+
     public int getDuration() {
         return duration;
     }
+
     public int getFare() {
         return fare;
     }

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

@@ -13,6 +13,7 @@ public SectionRequest(Long upStationId, Long downStationId, int distance, int du
         this.upStationId = upStationId;
         this.downStationId = downStationId;
         this.distance = distance;
+        this.duration = duration;
     }
 
     public Long getUpStationId() {

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

@@ -1,6 +1,6 @@
 package nextstep.subway.applicaion.dto;
 
-import nextstep.subway.domain.Station;
+import nextstep.subway.domain.station.Station;
 
 import java.util.List;
 import java.util.stream.Collectors;

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

@@ -1,5 +1,6 @@
 package nextstep.subway.domain;
 
+import nextstep.subway.domain.line.Section;
 import org.jgrapht.graph.DefaultWeightedEdge;
 
 public class SectionEdge extends DefaultWeightedEdge {