From 17c6dafb94a7874eba14d35c3d4b67dea3a577d1 Mon Sep 17 00:00:00 2001 From: anasElhaddad <anas.elhaddad@marketingconfort.com> Date: Tue, 13 May 2025 00:59:12 +0000 Subject: [PATCH 1/2] fix delete after restore order --- CHANGELOG.md | 19 +++++++++++++++++++ .../repositories/SessionOrderRepository.java | 4 ++++ .../services/impl/SaleSessionServiceImp.java | 5 ++--- 3 files changed, 25 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8fb2ec1..f91c943 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,22 @@ +## [1.0.78-RELEASE] +### Added +- New features that have been added. + +### Changed +- Changes in existing functionality. + +### Deprecated +- Soon-to-be removed features. + +### Removed +- Features that have been removed. + +### Fixed +- fix delete after restore order + +### Security +- Any security improvements. + ## [1.0.77-RELEASE] ### Added - New features that have been added. diff --git a/src/main/java/com/marketingconfort/mydressin/repositories/SessionOrderRepository.java b/src/main/java/com/marketingconfort/mydressin/repositories/SessionOrderRepository.java index 3e8ae6c..a4e0d1b 100644 --- a/src/main/java/com/marketingconfort/mydressin/repositories/SessionOrderRepository.java +++ b/src/main/java/com/marketingconfort/mydressin/repositories/SessionOrderRepository.java @@ -22,4 +22,8 @@ public interface SessionOrderRepository extends JpaRepository<SessionOrder,Long> @Param("expirationDate") LocalDateTime expirationDate); List<SessionOrder> findAll(); SessionOrder findSessionOrderByItemCart_Id(Long id); + + @Modifying + @Query("DELETE SessionOrder s WHERE s.id = :id") + void deleteSessionOrderByOrderId(Long id); } diff --git a/src/main/java/com/marketingconfort/mydressin/services/impl/SaleSessionServiceImp.java b/src/main/java/com/marketingconfort/mydressin/services/impl/SaleSessionServiceImp.java index afc4c54..610d111 100644 --- a/src/main/java/com/marketingconfort/mydressin/services/impl/SaleSessionServiceImp.java +++ b/src/main/java/com/marketingconfort/mydressin/services/impl/SaleSessionServiceImp.java @@ -410,6 +410,7 @@ public class SaleSessionServiceImp implements SaleSessionService { @Override @Transactional public CompletableFuture<SessionOrderDTO> restoreSaleSessionDetails(Long orderId) throws FunctionalException { + System.out.println("1:" + orderId); SessionOrder sessionOrder = orderRepository.findById(orderId) .orElseThrow(() -> new FunctionalException("Order not found")); @@ -431,10 +432,8 @@ public class SaleSessionServiceImp implements SaleSessionService { } itemRequestDTO.setLiveId(sessionOrder.getSaleSession().getLive()); - CompletableFuture<SessionOrderDTO> sessionOrderDTO = (sessionOrder.isRegisteredClient()) ? addProductToCartFromLive(itemRequestDTO) : addProductToUnregisteredCartFromLive(itemRequestDTO); - orderRepository.deleteById(orderId); - + sessionOrderRepository.deleteSessionOrderByOrderId(orderId); return sessionOrderDTO; } -- GitLab From 7ed6183fb425820eded262d45d4c43b9c386eef3 Mon Sep 17 00:00:00 2001 From: anas elhaddad <anas.elhaddad@marketingconfort.com> Date: Tue, 13 May 2025 09:15:49 +0000 Subject: [PATCH 2/2] remove print --- .../mydressin/services/impl/SaleSessionServiceImp.java | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/main/java/com/marketingconfort/mydressin/services/impl/SaleSessionServiceImp.java b/src/main/java/com/marketingconfort/mydressin/services/impl/SaleSessionServiceImp.java index 610d111..5fa4917 100644 --- a/src/main/java/com/marketingconfort/mydressin/services/impl/SaleSessionServiceImp.java +++ b/src/main/java/com/marketingconfort/mydressin/services/impl/SaleSessionServiceImp.java @@ -410,7 +410,6 @@ public class SaleSessionServiceImp implements SaleSessionService { @Override @Transactional public CompletableFuture<SessionOrderDTO> restoreSaleSessionDetails(Long orderId) throws FunctionalException { - System.out.println("1:" + orderId); SessionOrder sessionOrder = orderRepository.findById(orderId) .orElseThrow(() -> new FunctionalException("Order not found")); @@ -424,11 +423,9 @@ public class SaleSessionServiceImp implements SaleSessionService { itemRequestDTO.setUgs(sessionOrder.getItemCart().getUgs()); itemRequestDTO.setUseWebStockForLive(true); - if (sessionOrder.getItemCart().getProductType() != null && sessionOrder.getItemCart().getProductType().equals(ProductType.GIFT_CARD)) { itemRequestDTO.setGiftCardDTO(externalApiService.getGiftCardById(sessionOrder.getItemCart().getProductId())); itemRequestDTO.setUseWebStockForLive(false); - } itemRequestDTO.setLiveId(sessionOrder.getSaleSession().getLive()); -- GitLab