diff --git a/CHANGELOG.md b/CHANGELOG.md index 760807404ab5536e9affdb955539ee33ec787c6f..48c3c1abe587c31c99fc74d36e96a1b97e0e497c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,22 @@ +## [1.0.76-RELEASE] +### Added +- add isExpired condition to cart pagination + +### Changed +- Changes in existing functionality. + +### Deprecated +- Soon-to-be removed features. + +### Removed +- Features that have been removed. + +### Fixed +- Any bug fixes. + +### Security +- Any security improvements. + ## [1.0.75-RELEASE] ### Added - MS-114/Export sale session data to CSV and upload to FTP server diff --git a/src/main/java/com/marketingconfort/mydressin/repositories/CartRepository.java b/src/main/java/com/marketingconfort/mydressin/repositories/CartRepository.java index ce6b5141806e4dbe9a58400ba4511022699efa22..8fb75d8173b5ad05939aef75a8fbc986544a2cd7 100644 --- a/src/main/java/com/marketingconfort/mydressin/repositories/CartRepository.java +++ b/src/main/java/com/marketingconfort/mydressin/repositories/CartRepository.java @@ -77,7 +77,7 @@ public interface CartRepository extends JpaRepository<Cart, Long>, JpaSpecificat LocalDateTime endDate, ItemSource source); @Query("SELECT c FROM Cart c " + - "WHERE EXISTS (SELECT ic1 FROM c.items ic1 WHERE ic1.status != 'DELETED_BO' ) " + + "WHERE EXISTS (SELECT ic1 FROM c.items ic1 WHERE ic1.status != 'DELETED_BO' AND ic1.isExpired = false ) " + " AND LOWER(c.status) = 'open' " + " AND ((-1L) in :clientIds OR c.clientId IN :clientIds) " + " AND ((-1L) in :productIds OR EXISTS (SELECT ic2 FROM c.items ic2 WHERE ic2.productId IN :productIds))")