fix bug at AccommodationController and StripeServiceImpl

jv-feb24-group-project5 · Jun 5, 2024 · 5acba97 · 5acba97
1 parent 3f0882e
commit 5acba97
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 6 deletions.
diff --git a/src/main/java/com/ua/accommodation/config/SecurityConfig.java b/src/main/java/com/ua/accommodation/config/SecurityConfig.java
@@ -42,7 +42,8 @@ public SecurityFilterChain securityFilterChain(HttpSecurity http) throws Excepti
                                 "/checkout/payments/success/**",
                                 "/swagger-ui/**",
                                 "/v3/api-docs/**",
-                                "/actuator/**")
+                                "/actuator/**",
+                                "/accommodations")
                         .permitAll()
                         .anyRequest()
                         .authenticated()

diff --git a/src/main/java/com/ua/accommodation/controller/AccommodationController.java b/src/main/java/com/ua/accommodation/controller/AccommodationController.java
@@ -47,7 +47,6 @@ public AccommodationDto addAccommodation(
             description = "Retrieves a list of all accommodations available in the system."
     )
     @GetMapping
-    @PreAuthorize("hasRole('USER')")
     public List<AccommodationDto> getAllAccommodations(Pageable pageable) {
         return accommodationService.getAccommodations(pageable);
     }

diff --git a/src/main/java/com/ua/accommodation/service/impl/StripeServiceImpl.java b/src/main/java/com/ua/accommodation/service/impl/StripeServiceImpl.java
@@ -14,11 +14,13 @@
 import com.ua.accommodation.model.Booking;
 import com.ua.accommodation.model.Payment;
 import com.ua.accommodation.model.User;
+import com.ua.accommodation.repository.BookingRepository;
 import com.ua.accommodation.repository.PaymentRepository;
 import com.ua.accommodation.service.BookingService;
 import com.ua.accommodation.service.StripeService;
 import com.ua.accommodation.service.event.NotificationEvent;
 import jakarta.annotation.PostConstruct;
+import jakarta.persistence.EntityNotFoundException;
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
 import java.util.List;
@@ -40,6 +42,7 @@ public class StripeServiceImpl implements StripeService {
     private final PaymentRepository paymentRepository;
     private final PaymentMapper paymentMapper;
     private final BookingService bookingService;
+    private final BookingRepository bookingRepository;
     private final ApplicationEventPublisher eventPublisher;
     @Value("${stripe.secret.key}")
     private String stripeApiKey;
@@ -54,6 +57,10 @@ public void init() {
     public PaymentResponseDto createPaymentSession(
             PaymentRequestDto sessionDto, Authentication authentication
     ) {
+        if (!bookingRepository.existsById(sessionDto.getBookingId())) {
+            throw new EntityNotFoundException("No booking with id "
+                    + sessionDto.getBookingId());
+        }
         User user = (User) authentication.getPrincipal();
         try {
             Customer customer = findOrCreateCustomer(
@@ -97,11 +104,9 @@ public PaymentResponseDto retrieveSession(String id) {
             booking.setStatus(Booking.Status.CONFIRMED);
             bookingService.saveBooking(booking);
             responseDto.setMessage("Payment successful.");
-            publishEvent(payment);
             return responseDto;
         }
         responseDto.setMessage("Payment paused, you can complete it later.");
-        publishEvent(payment);
         return responseDto;
     }
 
@@ -111,7 +116,7 @@ public void checkExpiredSessions() {
                 paymentRepository.findPaymentsByExpiresAtBefore(LocalDateTime.now());
         expiredPayments.forEach(payment -> payment.setStatus(Payment.Status.EXPIRED));
         paymentRepository.saveAll(expiredPayments);
-
+        expiredPayments.forEach(this::publishEvent);
     }
 
     public List<PaymentResponseDto> findPaymentsByUserId(Long userId, Pageable pageable) {
@@ -182,7 +187,9 @@ private void publishEvent(Payment payment) {
                 + System.lineSeparator()
                 + "Created at: " + payment.getCreated()
                 + System.lineSeparator()
-                + "Expires at: " + payment.getExpiresAt();
+                + "Expires at: " + payment.getExpiresAt()
+                + System.lineSeparator()
+                + "Status: " + payment.getStatus();
 
         NotificationEvent event = new NotificationEvent(this, message);
         eventPublisher.publishEvent(event);