Fix : #1, #145, #146, #147, #148, #149, #150 #151
Merged
Conversation
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
- CarRepositoryImpl
- searchUsableCar
- select문에 photoUrl 추가
- ReservationDetailDto
- photoUrl 추가
- reservationId 추가
- ReservationListResponseDto
- photoUrl 추가
- ReservationRepositoryImpl
- findNowReservationDetailByUsername
- select문에 photoUrl, reservationId 추가
- getReservationListByUsername
- select문에 photoUrl 추가
- UsableCarResponseDto
- photoUrl 추가
Related to : YU-RentCar#145
- KioskService
- returnKey
- 파이 서버 요청 URL 수정
- "를 공백으로 변경하는 로직 추가
Related to : YU-RentCar#146
- Notice
- updateNotice
- null 체크하는 변수 변경
- NoticeService
- patchNotice
- fileName 선언 시 null로 초기화
Related to : YU-RentCar#147
- ParkingSpot
- updateState
- ParkingSpotType이 PARKINGSPOT_NO_CAR인 경우 car 값 null로 변경
- ParkingSpotService
- Transactional 어노테이션 추가
Related to : YU-RentCar#148
- SecurityConfig
- URL 추가
- WebMvcConfig
- 불필요로 인한 삭제
Related to : YU-RentCar#149
- CustomOAuth2UserService
- nickname을 hi에서 사용자 name으로 변경
Related to : YU-RentCar#150
- Card
- Builder 어노테이션 적용
- InsuranceCompany
- Builder 어노테이션 적용
- InsuranceContract
- Builder 어노테이션 적용
- InsuranceCompanyRepository
- JPA 적용
- InsuranceContractRepository
- JPA 적용
Related to : YU-RentCar#1
Capoomaru
approved these changes
Nov 17, 2023
| log.info("rfid 미인식"); | ||
|
|
||
| return true; |
There was a problem hiding this comment.
네 맞습니다. 파이서버에서 저희가 주는 값을 사용하지 않기 때문입니다.
Comment on lines
+26
to
33
| @ToString.Exclude | ||
| private InsuranceCompany insuranceCompany; | ||
|
|
||
| @NotNull | ||
| @ManyToOne(fetch = FetchType.LAZY) | ||
| @JoinColumn(name = "reservation_id") | ||
| @ToString.Exclude | ||
| private Reservation reservation; |
There was a problem hiding this comment.
Fetch가 필요한 코드는 Exclude 해둔 점 좋네요
| @@ -142,10 +154,10 @@ public SecurityFilterChain springSecurity(HttpSecurity http) throws Exception { | |||
| CorsConfigurationSource corsConfigurationSource() { | |||
| CorsConfiguration configuration = new CorsConfiguration(); | |||
| //configuration.setAllowedOrigins(Collections.singletonList("http://42.82.185.184:3000")); // singletonList : 하나짜리 리스트 | |||
| configuration.setAllowedOrigins(Arrays.asList(webBaseUrl, "http://localhost:3000", "http://localhost:3001")); | |||
| configuration.setAllowedOrigins(Arrays.asList(webBaseUrl, adminBaseUrl, piBaseUrl, pi2BaseUrl, kioskBaseUrl, "http://localhost:3000", "http://yurentcar.kro.kr:9876", "http://192.68.1.13:8000", "http://192.168.1.63", "http://192.168.1.1")); | |||
There was a problem hiding this comment.
뒤에 들어간 평문 주소값들은 지우는게 좋았을 것 같네요
- SecurityConfig
- corsConfigurationSource
- 주소 수정
Related to : YU-RentCar#151
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
close : #1, #145, #146, #147, #148, #149, #150