Merge pull request #221 from MamboIO/main

bwaldvogel · web-flow · commit 042ce2fd6f60 · 2023-06-25T13:03:10.000+02:00
Fix behaviour of using $ne on a field of an object in an array.
diff --git a/core/src/main/java/de/bwaldvogel/mongo/backend/DefaultQueryMatcher.java b/core/src/main/java/de/bwaldvogel/mongo/backend/DefaultQueryMatcher.java
@@ -140,6 +140,10 @@ private boolean checkMatch(Object queryValue, List<String> keys, Object value) {
                     Object allQuery = query.get(QueryOperator.ALL.getValue());
                     return checkMatchesAllDocuments(allQuery, keys, value);
                 }
+                if (query.containsKey(QueryOperator.NOT_EQUALS.getValue())) {
+                    Object notEqualQuery = query.get(QueryOperator.NOT_EQUALS.getValue());
+                    return !checkMatchesAnyDocument(notEqualQuery, keys, value);
+                }
                 if (query.containsKey(QueryOperator.NOT_IN.getValue())) {
                     Object notInQueryValue = query.get(QueryOperator.NOT_IN.getValue());
                     Document inQuery = new Document(QueryOperator.IN.getValue(), notInQueryValue);
diff --git a/core/src/test/java/de/bwaldvogel/mongo/backend/DefaultQueryMatcherTest.java b/core/src/test/java/de/bwaldvogel/mongo/backend/DefaultQueryMatcherTest.java
@@ -347,6 +347,18 @@ void testMatchesNotEqual() throws Exception {
         assertThat(matcher.matches(document, query)).isTrue();
     }
 
+    // https://github.com/bwaldvogel/mongo-java-server/issues/220
+    @Test
+    void testMatchesNeFieldInArray() throws Exception {
+    	Document query = json("'tags.value': {$ne: 'B'}");
+
+    	Document document = json("_id: 1, tags: [{'value': 'A'}, {'value': 'D'}]");
+        assertThat(matcher.matches(document, query)).isTrue();
+
+        document = json("_id: 1, tags: [{'value': 'B'}, {'value': 'A'}]");
+        assertThat(matcher.matches(document, query)).isFalse();
+    }
+
     // http://docs.mongodb.org/v3.0/reference/operator/query/eq/#op._S_eq
     @Test
     void testMatchesEqual() throws Exception {
diff --git a/test-common/src/main/java/de/bwaldvogel/mongo/backend/AbstractBackendTest.java b/test-common/src/main/java/de/bwaldvogel/mongo/backend/AbstractBackendTest.java
@@ -2307,6 +2307,19 @@ void testMatchesNinFieldInArray() throws Exception {
             .containsExactly(json("_id: 1, tags: [{'value': 'A'}, {'value': 'D'}]"));
     }
 
+    // https://github.com/bwaldvogel/mongo-java-server/issues/220
+    @Test
+    void testMatchesNeFieldInArray() throws Exception {
+        collection.insertOne(json("_id: 1, tags: [{'value': 'A'}, {'value': 'D'}]"));
+        collection.insertOne(json("_id: 2, tags: [{'value': 'A'}, {'value': 'B'}]"));
+        collection.insertOne(json("_id: 3, tags: [{'value': 'A'}, {'value': 'C'}]"));
+
+        assertThat(collection.find(json("'tags.value': {$ne: 'B'}")))
+            .containsExactly(
+            	json("_id: 1, tags: [{'value': 'A'}, {'value': 'D'}]"),
+            	json("_id: 3, tags: [{'value': 'A'}, {'value': 'C'}]"));
+    }
+
     // https://github.com/bwaldvogel/mongo-java-server/issues/7
     @Test
     void testMatchesNotIn() throws Exception {
