Merge pull request #272 from eclipse/feat/mongodb-multi-level-persistence-issue

Fixed the persistence of entities with a list of sub-entities at JNoSQL MongoDB API

Author: otaviojava

CHANGELOG.adoc

@@ -8,6 +8,7 @@ and this project adheres to https://semver.org/spec/v2.0.0.html[Semantic Version
 
 == [Unreleased]
 
+
 === Changed
 
 - Update ArangoDB driver to 7.5.1
@@ -25,6 +26,7 @@ and this project adheres to https://semver.org/spec/v2.0.0.html[Semantic Version
 === Fixed
 
 - Allow multiple entities at Oracle NoSQL appending the entity name with the id instead of only the id
+- Allow storing of entities with list of sub-entities at MongoDB
 
 == [1.1.0] - 2023-02-05
 

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

@@ -106,7 +106,7 @@ private static Object getMap(Object val) {
         Map<Object, Object> map = new HashMap<>();
         for (Object item : iterable) {
             var document = cast(item);
-            map.put(document.name(), document.get());
+            map.put(document.name(), convert(document.value()));
         }
         return map;
     }

jnosql-mongodb/src/test/java/org/eclipse/jnosql/databases/mongodb/integration/BookOrder.java

@@ -0,0 +1,26 @@
+/*
+ *  Copyright (c) 2023 Contributors to the Eclipse Foundation
+ *   All rights reserved. This program and the accompanying materials
+ *   are made available under the terms of the Eclipse Public License v1.0
+ *   and Apache License v2.0 which accompanies this distribution.
+ *   The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ *   and the Apache License v2.0 is available at http://www.opensource.org/licenses/apache2.0.php.
+ *
+ *   You may elect to redistribute this code under either of these licenses.
+ *
+ *   Contributors:
+ *
+ *   Maximillian Arruda
+ */
+
+package org.eclipse.jnosql.databases.mongodb.integration;
+
+import jakarta.nosql.Column;
+import jakarta.nosql.Entity;
+import jakarta.nosql.Id;
+
+import java.util.List;
+
+@Entity
+public record BookOrder(@Id String id, @Column List<BookOrderItem> items){
+}

jnosql-mongodb/src/test/java/org/eclipse/jnosql/databases/mongodb/integration/BookOrderItem.java

@@ -0,0 +1,22 @@
+/*
+ *  Copyright (c) 2023 Contributors to the Eclipse Foundation
+ *   All rights reserved. This program and the accompanying materials
+ *   are made available under the terms of the Eclipse Public License v1.0
+ *   and Apache License v2.0 which accompanies this distribution.
+ *   The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ *   and the Apache License v2.0 is available at http://www.opensource.org/licenses/apache2.0.php.
+ *
+ *   You may elect to redistribute this code under either of these licenses.
+ *
+ *   Contributors:
+ *
+ *   Maximillian Arruda
+ */
+package org.eclipse.jnosql.databases.mongodb.integration;
+
+import jakarta.nosql.Column;
+import jakarta.nosql.Entity;
+
+@Entity
+public record BookOrderItem(@Column Book book, @Column Integer quantity) {
+}

jnosql-mongodb/src/test/java/org/eclipse/jnosql/databases/mongodb/integration/BookRepository.java

@@ -12,6 +12,7 @@
  *
  *   Maximillian Arruda
  */
+
 package org.eclipse.jnosql.databases.mongodb.integration;
 
 import jakarta.data.repository.Repository;

jnosql-mongodb/src/test/java/org/eclipse/jnosql/databases/mongodb/integration/BookStore.java

@@ -0,0 +1,23 @@
+/*
+ *  Copyright (c) 2023 Contributors to the Eclipse Foundation
+ *   All rights reserved. This program and the accompanying materials
+ *   are made available under the terms of the Eclipse Public License v1.0
+ *   and Apache License v2.0 which accompanies this distribution.
+ *   The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ *   and the Apache License v2.0 is available at http://www.opensource.org/licenses/apache2.0.php.
+ *
+ *   You may elect to redistribute this code under either of these licenses.
+ *
+ *   Contributors:
+ *
+ *   Maximillian Arruda
+ */
+
+package org.eclipse.jnosql.databases.mongodb.integration;
+
+import jakarta.data.repository.Repository;
+import org.eclipse.jnosql.mapping.NoSQLRepository;
+
+@Repository
+public interface BookStore extends NoSQLRepository<BookOrder, String> {
+}

jnosql-mongodb/src/test/java/org/eclipse/jnosql/databases/mongodb/integration/RepositoryIntegrationTest.java

@@ -15,6 +15,7 @@
 package org.eclipse.jnosql.databases.mongodb.integration;
 
 import jakarta.inject.Inject;
+import org.assertj.core.api.SoftAssertions;
 import org.eclipse.jnosql.databases.mongodb.communication.MongoDBDocumentConfigurations;
 import org.eclipse.jnosql.databases.mongodb.mapping.MongoDBTemplate;
 import jakarta.nosql.Convert;
@@ -33,8 +34,12 @@
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.condition.EnabledIfSystemProperty;
 
+import java.util.List;
+
 import static java.util.UUID.randomUUID;
+import static org.assertj.core.api.Assertions.as;
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.SoftAssertions.assertSoftly;
 import static org.eclipse.jnosql.communication.driver.IntegrationTest.MATCHES;
 import static org.eclipse.jnosql.communication.driver.IntegrationTest.NAMED;
 import static org.eclipse.jnosql.databases.mongodb.communication.DocumentDatabase.INSTANCE;
@@ -59,6 +64,11 @@ class RepositoryIntegrationTest {
     @Database(DatabaseType.DOCUMENT)
     BookRepository repository;
 
+
+    @Inject
+    @Database(DatabaseType.DOCUMENT)
+    BookStore bookStore;
+
     @Test
     void shouldSave() {
         Book book = new Book(randomUUID().toString(), "Effective Java", 1);
@@ -75,6 +85,36 @@ void shouldSave() {
         assertThat(repository.findById(book.id()))
                 .isNotNull().get().isEqualTo(updated);
 
+        assertSoftly(softly -> {
+
+            BookOrder order = new BookOrder(
+                    randomUUID().toString(),
+                    List.of(
+                            new BookOrderItem(new Book(randomUUID().toString(), "Effective Java", 3), 1)
+                            ,new BookOrderItem(new Book(randomUUID().toString(), "Java Persistence Layer", 1), 10)
+                            ,new BookOrderItem(new Book(randomUUID().toString(), "Jakarta EE Cookbook", 1), 5)
+                    )
+            );
+
+            bookStore.save(order);
+
+            softly.assertThat(bookStore.findById(order.id()))
+                    .as("cannot find the order persisted previously")
+                    .isPresent()
+                    .get()
+                    .as("the loaded the persisted BookOrder doesn't matches with the BookOrder origin")
+                    .satisfies(persistedOrder ->{
+                        softly.assertThat(persistedOrder.id())
+                                .as("the loaded the persisted BookOrder id is not equals to the BookOrder origin id")
+                                .isEqualTo(order.id());
+                        softly.assertThat(persistedOrder.items())
+                                .as("the loaded the persisted BookOrder items is not equals to the BookOrder origin items")
+                                .containsAll(order.items());
+                    });
+
+
+        });
+
     }
 
     @Test
@@ -111,7 +151,9 @@ void shouldDeleteAll() {
         }
 
         repository.deleteAll();
-        assertThat(repository.findAll()).isEmpty();
+        bookStore.deleteAll();
+        assertThat(repository.findAll()).as("the repository is not empty").isEmpty();
+        assertThat(bookStore.findAll()).as("the bookStore is not empty").isEmpty();
     }
 
 }