[OVERALL FIXING] Fixed some issues related to Payment and Rental #33
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
ivan0dyatlyukkk
requested review from
DmytroV95,
OlegStashkiv and
AntonZhdanov
and removed request for
DmytroV95 and
OlegStashkiv
ivan0dyatlyukkk
changed the title
OleksandrSaven
approved these changes
Oct 5, 2023
DmytroV95
requested changes
Oct 5, 2023
| @@ -76,6 +77,13 @@ public User getByEmail(String email) { | |||
| ); | |||
| } | |||
|
|
|||
| @Override | |||
| public User getByAuthentication(Authentication auth) { | |||
There was a problem hiding this comment.
Suggested change
| public User getByAuthentication(Authentication auth) { | |
| public User getAuthenticatedUser(Authentication auth) { |
Comment on lines
39
to
47
| Payment.Type type = Payment.Type.valueOf(requestDto.getType()); | ||
|
|
||
| checkIfPaymentSessionValid(rental); | ||
|
|
||
| if (paymentRepository.existsByRentalIdAndStatus(rental.getId(), Payment.Status.PAUSED)) { | ||
| return paymentMapper.toDto(paymentRepository.findByRentalId(rental.getId()).get()); | ||
| } | ||
|
|
||
| try { |
| @@ -63,6 +64,8 @@ public PaymentResponseDto updateStatus(String sessionId, Payment.Status status) | |||
|
|
|||
| @Override | |||
| public List<PaymentResponseDto> getAll(Authentication authentication, Pageable pageable) { | |||
| User user = userService.getByAuthentication(authentication); | |||
|
|
|||
| if (paymentRepository.existsByRentalIdAndStatus(rental.getId(), Payment.Status.PAID)) { | ||
| throw new NotValidPaymentProcessException("The rental is paid!"); | ||
| } | ||
|
|
| @@ -53,6 +53,14 @@ public List<RentalDto> getByUserIdAndActiveStatus(Pageable pageable, | |||
| .toList(); | |||
| } | |||
|
|
|||
| @Override | |||
| public Rental getByUserAndId(User user, Long id) { | |||
There was a problem hiding this comment.
Can you specify in method name by what entity id you want to get?
…xing-issues # Conflicts: # src/main/java/com/project/carsharingapp/service/impl/RentalServiceImpl.java
AntonZhdanov
approved these changes
Oct 5, 2023
OlegStashkiv
approved these changes
Oct 5, 2023
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.
No description provided.