diff --git a/CHANGELOG.md b/CHANGELOG.md index 8fb2ec1469887ed5f9644fb0224ba8570ceb057c..f91c943a34e958087a091eb173c0bbf1d90d6dbd 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 3e8ae6c563d596d1341f8f7a2f6e47ff82d140f0..a4e0d1b5aaef5c9014cbfd2d80470b6fe3fa8c0f 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 afc4c54d844440267b43efc1e866910235b42e28..5fa4917464d6b39f3046487edc43909d6e6a7cad 100644 --- a/src/main/java/com/marketingconfort/mydressin/services/impl/SaleSessionServiceImp.java +++ b/src/main/java/com/marketingconfort/mydressin/services/impl/SaleSessionServiceImp.java @@ -423,18 +423,14 @@ 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()); - CompletableFuture<SessionOrderDTO> sessionOrderDTO = (sessionOrder.isRegisteredClient()) ? addProductToCartFromLive(itemRequestDTO) : addProductToUnregisteredCartFromLive(itemRequestDTO); - orderRepository.deleteById(orderId); - + sessionOrderRepository.deleteSessionOrderByOrderId(orderId); return sessionOrderDTO; }