Merge pull request #279 from eclipse/include-between-support-mongodb

Include between support mongodb

Author: otaviojava

CHANGELOG.adoc

@@ -8,6 +8,10 @@ and this project adheres to https://semver.org/spec/v2.0.0.html[Semantic Version
 
 == [Unreleased]
 
+=== Added
+
+- Include between query support at MongoDB
+
 == [1.1.1] - 2023-05-25
 
 === Changed

jnosql-mongodb/src/main/java/org/eclipse/jnosql/databases/mongodb/communication/DocumentQueryConversor.java

@@ -56,6 +56,11 @@ public static Bson convert(CriteriaCondition condition) {
                 });
                 yield Filters.or(orList.stream()
                         .map(DocumentQueryConversor::convert).toList());
+            }case BETWEEN -> {
+                List<Object> betweenList = ValueUtil.convertToList(document.value());
+                yield Filters.and(Filters.gte(document.name(), betweenList.get(0)),
+                        Filters.lte(document.name(), betweenList.get(1)));
+
             }
             default -> throw new UnsupportedOperationException("The condition " + condition.condition()
                     + " is not supported from mongoDB diana driver");

jnosql-mongodb/src/test/java/org/eclipse/jnosql/databases/mongodb/communication/MongoDBDocumentManagerTest.java

@@ -266,6 +266,47 @@ void shouldFindDocumentIn() {
         assertEquals(entities, entityManager.select(query).collect(Collectors.toList()));
     }
 
+    @Test
+    void shouldFindBetween() {
+        var deleteQuery = delete().from(COLLECTION_NAME).where("type").eq("V").build();
+        entityManager.delete(deleteQuery);
+        Iterable<CommunicationEntity> entitiesSaved = entityManager.insert(getEntitiesWithValues());
+
+        var query = select().from(COLLECTION_NAME)
+                .where("age").between(22, 23)
+                .build();
+
+        var result = entityManager.select(query).toList();
+
+        SoftAssertions.assertSoftly(softly -> {
+            softly.assertThat(result).hasSize(2);
+            softly.assertThat(result).map(e -> e.find("age").orElseThrow().get(Integer.class)).contains(22, 23);
+            softly.assertThat(result).map(e -> e.find("age").orElseThrow().get(Integer.class)).doesNotContain(25);
+        });
+    }
+
+    @Test
+    void shouldFindBetween2() {
+        var deleteQuery = delete().from(COLLECTION_NAME).where("type").eq("V").build();
+        entityManager.delete(deleteQuery);
+        Iterable<CommunicationEntity> entitiesSaved = entityManager.insert(getEntitiesWithValues());
+
+        var query = select().from(COLLECTION_NAME)
+                .where("age").between(22, 23)
+                .and("type").eq("V")
+                .build();
+
+        var result = entityManager.select(query).toList();
+
+        SoftAssertions.assertSoftly(softly -> {
+            softly.assertThat(result).hasSize(2);
+            softly.assertThat(result).map(e -> e.find("age").orElseThrow().get(Integer.class)).contains(22, 23);
+            softly.assertThat(result).map(e -> e.find("age").orElseThrow().get(Integer.class)).doesNotContain(25);
+        });
+    }
+
+
+
     @Test
     void shouldFindDocumentStart() {
         DeleteQuery deleteQuery = delete().from(COLLECTION_NAME).where("type").eq("V").build();
@@ -440,7 +481,7 @@ void shouldCreateEntityByteArray() {
         entityManager.insert(entity);
 
         List<CommunicationEntity> entities = entityManager.select(select().from("download")
-                .where("_id").eq(id).build()).collect(Collectors.toList());
+                .where("_id").eq(id).build()).toList();
 
         assertEquals(1, entities.size());
         CommunicationEntity documentEntity = entities.get(0);
@@ -481,6 +522,7 @@ void shouldConvertFromListDocumentList() {
         assertDoesNotThrow(() -> entityManager.insert(entity));
     }
 
+    @SuppressWarnings("unchecked")
     @Test
     void shouldRetrieveListDocumentList() {
         CommunicationEntity entity = entityManager.insert(createDocumentList());
@@ -565,6 +607,7 @@ void shouldUpdateNull(){
         });
     }
 
+
     private CommunicationEntity createDocumentList() {
         CommunicationEntity entity = CommunicationEntity.of("AppointmentBook");
         entity.add(Element.of("_id", new Random().nextInt()));
@@ -594,23 +637,24 @@ private CommunicationEntity getEntity() {
     }
 
     private List<CommunicationEntity> getEntitiesWithValues() {
-        CommunicationEntity lucas = CommunicationEntity.of(COLLECTION_NAME);
+        var lucas = CommunicationEntity.of(COLLECTION_NAME);
         lucas.add(Element.of("name", "Lucas"));
         lucas.add(Element.of("age", 22));
         lucas.add(Element.of("location", "BR"));
         lucas.add(Element.of("type", "V"));
 
-        CommunicationEntity otavio = CommunicationEntity.of(COLLECTION_NAME);
+        var luna = CommunicationEntity.of(COLLECTION_NAME);
+        luna.add(Element.of("name", "Luna"));
+        luna.add(Element.of("age", 23));
+        luna.add(Element.of("location", "US"));
+        luna.add(Element.of("type", "V"));
+
+        var otavio = CommunicationEntity.of(COLLECTION_NAME);
         otavio.add(Element.of("name", "Otavio"));
         otavio.add(Element.of("age", 25));
         otavio.add(Element.of("location", "BR"));
         otavio.add(Element.of("type", "V"));
 
-        CommunicationEntity luna = CommunicationEntity.of(COLLECTION_NAME);
-        luna.add(Element.of("name", "Luna"));
-        luna.add(Element.of("age", 23));
-        luna.add(Element.of("location", "US"));
-        luna.add(Element.of("type", "V"));
 
         return asList(lucas, otavio, luna);
     }