[B#48] MappingException when removing based on query using lt

Author: kaiso

pom.xml

@@ -5,7 +5,7 @@
 
 	<groupId>io.github.kaiso.relmongo</groupId>
 	<artifactId>relmongo</artifactId>
-	<version>3.2.0</version>
+	<version>3.2.1</version>
 	<packaging>jar</packaging>
 
 	<name>relmongo</name>

src/main/java/io/github/kaiso/relmongo/events/callback/PersistentPropertyCascadingRemoveCallback.java

@@ -22,7 +22,6 @@
 import io.github.kaiso.relmongo.mongo.DatabaseOperations;
 
 import org.bson.Document;
-import org.bson.types.ObjectId;
 import org.springframework.data.mongodb.core.MongoOperations;
 import org.springframework.util.ReflectionUtils;
 import org.springframework.util.ReflectionUtils.FieldCallback;
@@ -40,14 +39,14 @@ public class PersistentPropertyCascadingRemoveCallback implements FieldCallback
 
     private Document source;
     private MongoOperations mongoOperations;
-    private Boolean loaded = Boolean.FALSE;
     private Object entity;
+    private Class<?> entityType;
 
-    public PersistentPropertyCascadingRemoveCallback(Document source, MongoOperations mongoOperations, Class<?> clazz) {
+    public PersistentPropertyCascadingRemoveCallback(Document source, MongoOperations mongoOperations, Class<?> entityType) {
         super();
         this.source = source;
         this.mongoOperations = mongoOperations;
-        this.entity = mongoOperations.getConverter().read(clazz, source);
+        this.entityType = entityType;
     }
 
     public void doWith(Field field) throws IllegalAccessException {
@@ -64,7 +63,6 @@ private void doCascade(Field field, CascadeType cascadeType) throws IllegalAcces
         if (!Arrays.asList(CascadeType.REMOVE, CascadeType.ALL).contains(cascadeType)) {
             return;
         }
-        loadEntity();
         Object child = field.get(entity);
         if (child != null) {
             if (Collection.class.isAssignableFrom(child.getClass())) {
@@ -87,21 +85,20 @@ private void cascadeCollection(Collection<?> child) {
     }
 
     public void doProcessing() {
+        loadEntity();
         if (entity == null) {
             return;
         }
         ReflectionUtils.doWithFields(entity.getClass(), this);
     }
 
     private void loadEntity() {
-        if (!loaded) {
+        if (entity == null) {
             Object sourceId = this.source.get("_id");
             if (sourceId != null) {
-                ObjectId id = sourceId instanceof ObjectId ? (ObjectId) sourceId : new ObjectId((String) sourceId);
-                Collection<?> findByIds = DatabaseOperations.findByIds(mongoOperations, entity.getClass(), id);
+                Collection<?> findByIds = DatabaseOperations.findByIds(mongoOperations, entityType, sourceId);
                 this.entity = findByIds != null && !findByIds.isEmpty() ? findByIds.iterator().next() : null;
             }
-            loaded = Boolean.TRUE;
         }
     }
 

src/test/java/io/github/kaiso/relmongo/data/model/Address.java

@@ -22,6 +22,8 @@ public class Address {
 
     @LastModifiedDate
     private LocalDateTime lastModifiedDate;
+    
+    private LocalDateTime creationDate = LocalDateTime.now();
 
     public ObjectId getId() {
         return id;
@@ -46,4 +48,9 @@ public LocalDateTime getLastModifiedDate() {
     public void setLastModifiedDate(LocalDateTime lastModifiedDate) {
         this.lastModifiedDate = lastModifiedDate;
     }
+
+    public LocalDateTime getCreationDate() {
+        return creationDate;
+    }
+
 }

src/test/java/io/github/kaiso/relmongo/tests/AuditingTest.java

@@ -9,7 +9,10 @@
 import org.bson.Document;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.mongodb.core.query.Criteria;
+import org.springframework.data.mongodb.core.query.Query;
 
+import java.time.LocalDateTime;
 import java.util.Arrays;
 import java.util.LinkedList;
 import java.util.function.Consumer;
@@ -43,6 +46,32 @@ public void accept(Document t) {
         };
         mongoOperations.getCollection("addresses").find().forEach(f);
     }
+    
+    @Test
+    public void shouldRemoveByCriteria() {
+        Address address1 = new Address();
+        Address address2 = new Address();
+        address1.setLocation("1st street");
+        address2.setLocation("2st street");
+        Person person = new Person();
+        person.setName("Dave");
+        person.setEmail("dave@mail.com");
+        person.setAddresses(new LinkedList<Address>(Arrays.asList(address1, address2)));
+        repository.save(person);
+        Consumer<Document> f = new Consumer<Document>() {
+            @Override
+            public void accept(Document t) {
+                assertNotNull(t.get("lastModifiedDate"));
+            }
+        };
+        
+        
+        mongoOperations.getCollection("addresses").find().forEach(f);
+        
+        Criteria expression = Criteria.where("creationDate").lt(LocalDateTime.now());
+        Query query = new Query().addCriteria(expression);
+        mongoOperations.remove(query, Address.class).wasAcknowledged();
+    }
 
     @Test
     public void shouldPopulateAuditingOnSave() {
@@ -57,5 +86,7 @@ public void accept(Document t) {
         };
         mongoOperations.getCollection("addresses").find().forEach(f);
     }
+    
+    
 
 }