-
Notifications
You must be signed in to change notification settings - Fork 1
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
주차장 상세조회 #56
Merged
Merged
주차장 상세조회 #56
Changes from all commits
Commits
Show all changes
14 commits
Select commit
Hold shift + click to select a range
2cd5f1c
feat: 현재 시간과 마지막 업데이트 간 minute 차이 계산 기능 구현
youngh0 03544df
feat: 주차장 상세조회 응답 dto
youngh0 e7ceb83
feat: getter 추가
youngh0 f0c08c9
feat: 주차장 상세 조회 service 구현, fake 객체 의존성 추가
youngh0 c24d3f0
feat: 주차장 상세 조회 controller 구현
youngh0 361c511
feat: getter, 기본 생성자 추가
youngh0 d646899
test: parkingService 테스트 작성
youngh0 84040e6
refactor: 주차장 상세조회 응답 dto 네이밍 수정
youngh0 c9c8e36
test: redisContainer 종료 코드 제거
youngh0 44e835c
feat: swagger 적용
youngh0 8aae542
feat: 운영시간 추가
youngh0 cbd4a64
feat: 현재 시간 변수 생성 위치 수정
youngh0 8a66599
Merge remote-tracking branch 'origin/main' into feat/55-find-parking
youngh0 29b0092
feat: conflict 해결
youngh0 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
97 changes: 97 additions & 0 deletions
97
src/main/java/com/example/parking/application/parking/dto/ParkingDetailInfoResponse.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,97 @@ | ||
package com.example.parking.application.parking.dto; | ||
|
||
import com.example.parking.application.review.dto.ReviewInfoResponse; | ||
import java.time.LocalTime; | ||
import lombok.AccessLevel; | ||
import lombok.Getter; | ||
import lombok.NoArgsConstructor; | ||
|
||
@Getter | ||
@NoArgsConstructor(access = AccessLevel.PRIVATE) | ||
public class ParkingDetailInfoResponse { | ||
|
||
private String parkingName; | ||
private String parkingType; | ||
private Double latitude; | ||
private Double longitude; | ||
private FeeInfo feeInfo; | ||
private Integer currentParkingCount; | ||
private Integer capacity; | ||
private Integer lastUpdated; | ||
private String tel; | ||
private String paymentType; | ||
private WeekdayOperatingTime weekdayOperatingTime; | ||
private SaturdayOperatingTime saturdayOperatingTime; | ||
private HolidayOperatingTime holidayOperatingTime; | ||
private ReviewInfoResponse reviewInfo; | ||
|
||
public ParkingDetailInfoResponse(String parkingName, String parkingType, Double latitude, Double longitude, | ||
FeeInfo feeInfo, | ||
Integer currentParkingCount, Integer capacity, Integer lastUpdated, String tel, | ||
String paymentType, WeekdayOperatingTime weekdayOperatingTime, | ||
SaturdayOperatingTime saturdayOperatingTime, | ||
HolidayOperatingTime holidayOperatingTime, ReviewInfoResponse reviewInfo) { | ||
this.parkingName = parkingName; | ||
this.parkingType = parkingType; | ||
this.latitude = latitude; | ||
this.longitude = longitude; | ||
this.feeInfo = feeInfo; | ||
this.currentParkingCount = currentParkingCount; | ||
this.capacity = capacity; | ||
this.lastUpdated = lastUpdated; | ||
this.tel = tel; | ||
this.paymentType = paymentType; | ||
this.weekdayOperatingTime = weekdayOperatingTime; | ||
this.saturdayOperatingTime = saturdayOperatingTime; | ||
this.holidayOperatingTime = holidayOperatingTime; | ||
this.reviewInfo = reviewInfo; | ||
} | ||
|
||
@Getter | ||
@NoArgsConstructor(access = AccessLevel.PRIVATE) | ||
public static class FeeInfo { | ||
private Integer fee; | ||
private Integer time; | ||
|
||
public FeeInfo(Integer fee, Integer time) { | ||
this.fee = fee; | ||
this.time = time; | ||
} | ||
} | ||
|
||
@Getter | ||
@NoArgsConstructor(access = AccessLevel.PRIVATE) | ||
public static class WeekdayOperatingTime { | ||
private LocalTime beginTime; | ||
private LocalTime endTime; | ||
|
||
public WeekdayOperatingTime(LocalTime beginTime, LocalTime endTime) { | ||
this.beginTime = beginTime; | ||
this.endTime = endTime; | ||
} | ||
} | ||
|
||
@Getter | ||
@NoArgsConstructor(access = AccessLevel.PRIVATE) | ||
public static class SaturdayOperatingTime { | ||
private LocalTime beginTime; | ||
private LocalTime endTime; | ||
|
||
public SaturdayOperatingTime(LocalTime beginTime, LocalTime endTime) { | ||
this.beginTime = beginTime; | ||
this.endTime = endTime; | ||
} | ||
} | ||
|
||
@Getter | ||
@NoArgsConstructor(access = AccessLevel.PRIVATE) | ||
public static class HolidayOperatingTime { | ||
private LocalTime beginTime; | ||
private LocalTime endTime; | ||
|
||
public HolidayOperatingTime(LocalTime beginTime, LocalTime endTime) { | ||
this.beginTime = beginTime; | ||
this.endTime = endTime; | ||
} | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
+ 운영시간
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
api 스펙에 없어서 놓쳤네여 추가햇슴다