From 7998b81bb6dcb1b56c8c9254587a355b13db4c03 Mon Sep 17 00:00:00 2001 From: maverickstuder Date: Fri, 3 May 2024 12:36:50 +0200 Subject: [PATCH] RED-9104: Rectangle redaction cannot be removed * fixed and improved mongodb queries empty array comparison --- .../repository/EntityLogEntryDocumentRepository.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/persistence-service-v1/persistence-service-shared-mongo-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/shared/mongo/repository/EntityLogEntryDocumentRepository.java b/persistence-service-v1/persistence-service-shared-mongo-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/shared/mongo/repository/EntityLogEntryDocumentRepository.java index 6a99fe797..b57549f7e 100644 --- a/persistence-service-v1/persistence-service-shared-mongo-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/shared/mongo/repository/EntityLogEntryDocumentRepository.java +++ b/persistence-service-v1/persistence-service-shared-mongo-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/shared/mongo/repository/EntityLogEntryDocumentRepository.java @@ -13,7 +13,7 @@ import com.iqser.red.service.persistence.service.v1.api.shared.mongo.document.En @Repository public interface EntityLogEntryDocumentRepository extends MongoRepository { - @Query("{ 'entityLogId' : ?0, 'manualChanges' : { $exists: true, $not: { $size: 0 } } }") + @Query("{ 'entityLogId' : ?0, 'manualChanges' : { $exists: true, $ne: [] } }") List findByEntityLogIdAndManualChangesNotEmpty(String entityLogId); @@ -25,19 +25,19 @@ public interface EntityLogEntryDocumentRepository extends MongoRepository findByEntityLogId(String entityLogId); - @Query("{ 'entityLogId' : ?0, 'containingNodeId' : { $exists: true, $not: { $size: 0 } } }") + @Query("{ 'entityLogId' : ?0, 'containingNodeId' : { $exists: true, $ne: [] } }") List findByEntityLogIdAndContainingNodeIdNotEmpty(String entityLogId); - @Query("{ 'entityLogId' : ?0 , 'containingNodeId' : { $exists: true, $eq: { $size: 0 } } }") + @Query("{ 'entityLogId' : ?0 , 'containingNodeId' : { $exists: true, $eq: [] } }") List findByEntityLogIdAndContainingNodeIdEmpty(String entityLogId); - @Query(value = "{ 'id' : { $in: ?0 }, 'containingNodeId' : { $exists: true, $not: { $size: 0 } } }", fields = "{ 'containingNodeId': 1 }") + @Query(value = "{ 'id' : { $in: ?0 }, 'containingNodeId' : { $exists: true, $ne: [] } }", fields = "{ 'containingNodeId': 1 }") List findContainingNodeIdForAllByIdAndContainingNodeIdNotEmpty(List ids); - @Query("{ 'entityLogId' : ?0, $or: [ { 'containingNodeId' : { $exists: true, $eq: { $size: 0 } } }, { 'containingNodeId.0' : { $in: ?1 } } ] }") + @Query("{ 'entityLogId' : ?0, $or: [ { 'containingNodeId' : { $exists: true, $eq: [] } }, { 'containingNodeId.0' : { $in: ?1 } } ] }") List findByEntityLogIdAndNotContainedOrFirstContainedByElementInList(String entityLogId, Collection containingNodeIds); -- 2.47.2