From effb75db01cc059d253fe7a67bc59a92a6f86aa4 Mon Sep 17 00:00:00 2001
From: anasElhaddad <anas.elhaddad@marketingconfort.com>
Date: Mon, 12 May 2025 14:17:08 +0000
Subject: [PATCH] fix items cart filters
---
CHANGELOG.md | 19 +++++++++++++++++++
.../services/impl/CartServiceImp.java | 3 ++-
2 files changed, 21 insertions(+), 1 deletion(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 312db3f..8fb2ec1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,22 @@
+## [1.0.77-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 items cart filters
+
+### Security
+- Any security improvements.
+
## [1.0.77-RELEASE]
### Added
- add order restoration
diff --git a/src/main/java/com/marketingconfort/mydressin/services/impl/CartServiceImp.java b/src/main/java/com/marketingconfort/mydressin/services/impl/CartServiceImp.java
index 6056129..7b0cdd8 100644
--- a/src/main/java/com/marketingconfort/mydressin/services/impl/CartServiceImp.java
+++ b/src/main/java/com/marketingconfort/mydressin/services/impl/CartServiceImp.java
@@ -1098,10 +1098,11 @@ public class CartServiceImp implements CartService {
}
List<ProductDetailsCartDTO> productDetailsCartDTOS = cart.getItems().stream()
- .map(item -> mapItemToProductDetails(item, productMap))
.filter(Objects::nonNull)
.filter(item -> !item.getStatus().equals(ItemCartStatus.DELETED_BO))
.filter(item -> !(item.getStatus().equals(ItemCartStatus.DELETED_SITE) && item.getSource().equals(ItemSource.WEB)))
+ .filter(itemCart -> Boolean.FALSE.equals(itemCart.isExpired()))
+ .map(item -> mapItemToProductDetails(item, productMap))
.toList();
--
GitLab