Skip to content

Fix cart problemssss #18

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.

Sign up for GitHub

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

Merged
YehiaFarghaly merged 3 commits into from
May 19, 2025
Merged

Fix cart problemssss #18

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
29fbf13
fix: update event type from ORDER_PLACED to CART_CHECKEDOUT in checko…
NourAlPha May 18, 2025
d127103
feat : only admin access promocodes endpoints
Aelmeky May 19, 2025
8f69bff
fix: update podzilla-utils-lib version to v1.1.13
NourAlPha May 19, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@
<dependency>
<groupId>com.github.Podzilla</groupId>
<artifactId>podzilla-utils-lib</artifactId>
<version>1.1.11</version>
<version>v1.1.13</version>

</dependency>

Expand Down
2 changes: 2 additions & 0 deletions src/main/java/com/podzilla/cart/controller/PromoCodeController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package com.podzilla.cart.controller;

import com.podzilla.auth.annotations.AllowedRoles;
import com.podzilla.cart.model.PromoCode;
import com.podzilla.cart.service.PromoCodeService;
import io.swagger.v3.oas.annotations.Operation;
Expand All @@ -22,6 +23,7 @@

@RestController
@RequestMapping("/admin/promocodes")
@AllowedRoles({"ROLE_ADMIN"})
@RequiredArgsConstructor
@Tag(name = "PromoCode Admin", description = "Manage promotional codes (Requires Admin Role)")
@Slf4j
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/podzilla/cart/service/CartService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -294,7 +294,7 @@ public Cart checkoutCart(final String customerId, final ConfirmationType confirm
+ " Discount={}, Total={}, ConfirmationType={}",
cart.getId(), cart.getSubTotal(), cart.getDiscountAmount(),
cart.getTotalPrice(), confirmationType);
eventPublisher.publishEvent(EventsConstants.ORDER_PLACED, checkoutEvent);
eventPublisher.publishEvent(EventsConstants.CART_CHECKEDOUT, checkoutEvent);

log.info("Checkout event published successfully for cartId: {}. Clearing cart.", cart.getId());
cart.getItems().clear();
Expand Down
12 changes: 6 additions & 6 deletions src/test/java/service/CartServiceTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -343,12 +343,12 @@ void checkoutCart_validCartWithPromo_publishesEventAndClearsCart() {
PromoCode promo = createTestPromoCode("SAVE10", PromoCode.DiscountType.PERCENTAGE, new BigDecimal("10"), null, null, true);
when(promoCodeService.getActivePromoCode("SAVE10")).thenReturn(Optional.of(promo));

doNothing().when(eventPublisher).publishEvent(eq(EventsConstants.ORDER_PLACED), any(CartCheckedoutEvent.class));
doNothing().when(eventPublisher).publishEvent(eq(EventsConstants.CART_CHECKEDOUT), any(CartCheckedoutEvent.class));

Cart result = cartService.checkoutCart(customerId, ConfirmationType.OTP, "", latitude, longitude, address);

ArgumentCaptor<CartCheckedoutEvent> eventCaptor = ArgumentCaptor.forClass(CartCheckedoutEvent.class);
verify(eventPublisher).publishEvent(eq(EventsConstants.ORDER_PLACED), eventCaptor.capture());
verify(eventPublisher).publishEvent(eq(EventsConstants.CART_CHECKEDOUT), eventCaptor.capture());
CartCheckedoutEvent publishedEvent = eventCaptor.getValue();

assertEquals(customerId, publishedEvent.getCustomerId());
Expand Down Expand Up @@ -377,7 +377,7 @@ void checkoutCart_withSignature_publishesEventWithSignature() {
Cart result = cartService.checkoutCart(customerId, ConfirmationType.SIGNATURE, signature, latitude, longitude, address);

ArgumentCaptor<CartCheckedoutEvent> eventCaptor = ArgumentCaptor.forClass(CartCheckedoutEvent.class);
verify(eventPublisher).publishEvent(eq(EventsConstants.ORDER_PLACED), eventCaptor.capture());
verify(eventPublisher).publishEvent(eq(EventsConstants.CART_CHECKEDOUT), eventCaptor.capture());
CartCheckedoutEvent publishedEvent = eventCaptor.getValue();

assertEquals(ConfirmationType.SIGNATURE, publishedEvent.getConfirmationType());
Expand All @@ -393,7 +393,7 @@ void checkoutCart_signatureTypeWithoutSignature_throwsException() {

assertEquals(HttpStatus.BAD_REQUEST, ex.getStatus());
assertEquals("Signature is required for SIGNATURE confirmation type", ex.getMessage());
verify(eventPublisher, never()).publishEvent(eq(EventsConstants.ORDER_PLACED), any(CartCheckedoutEvent.class));
verify(eventPublisher, never()).publishEvent(eq(EventsConstants.CART_CHECKEDOUT), any(CartCheckedoutEvent.class));
}

@Test
Expand All @@ -405,7 +405,7 @@ void checkoutCart_emptyCart_throwsGlobalHandlerException() {

assertEquals(HttpStatus.BAD_REQUEST, ex.getStatus());
assertEquals("Cannot checkout an empty cart.", ex.getMessage());
verify(eventPublisher, never()).publishEvent(eq(EventsConstants.ORDER_PLACED), any(CartCheckedoutEvent.class));
verify(eventPublisher, never()).publishEvent(eq(EventsConstants.CART_CHECKEDOUT), any(CartCheckedoutEvent.class));
}

@Test
Expand All @@ -421,7 +421,7 @@ void checkoutCart_rabbitMqFails_throwsRuntimeExceptionAndCartNotCleared() {
cart.setDiscountAmount(new BigDecimal(formattedBigZero));

doThrow(new RuntimeException("Event publish error")).when(eventPublisher)
.publishEvent(eq(EventsConstants.ORDER_PLACED), any(CartCheckedoutEvent.class));
.publishEvent(eq(EventsConstants.CART_CHECKEDOUT), any(CartCheckedoutEvent.class));

RuntimeException ex = assertThrows(RuntimeException.class,
() -> cartService.checkoutCart(customerId, ConfirmationType.QR_CODE, null, latitude, longitude, address));
Expand Down