Save and find nested entities

src/dataMapper.js

@@ -1,5 +1,5 @@
 const Convention = require('./convention')
-const { entity } = require('@herbsjs/herbs')
+const { entity, checker } = require('@herbsjs/herbs')
 const dependency = { convention: Convention }
 
 class DataMapper {
@@ -58,15 +58,31 @@ class DataMapper {
 
   collectionFields() {
     return this.allFields
-      .filter((i) => !i.isEntity)
       .map((i) => i.nameDb)
   }
 
+  filterNullAndUndefined(i, instance) {
+    if (instance[i.name] === null || instance[i.name] === undefined) return null
+    if (i.isEntity) {
+      const entity = instance[i.name]
+      const newObject = Object.keys(entity).reduce((acc, key) => {
+        if (entity[key] === null || entity[key] === undefined) return acc
+
+        acc[key] = entity[key]
+
+        return acc
+      }, {})
+
+      return { [i.nameDb]: newObject }
+    }
+    return { [i.nameDb]: instance[i.name] }
+  }
+
   collectionFieldsWithValue(instance) {
 
     let collectionFields = this.allFields
-      .filter((i) => !i.isEntity)
-      .map(i => ({ [i.nameDb]: instance[i.name] }))
+      .map(i => this.filterNullAndUndefined(i, instance))
+      .filter(Boolean)
       .reduce((x, y) => ({ ...x, ...y }))
 
     if (instance.id === undefined) {
@@ -85,7 +101,7 @@ class DataMapper {
 
     function getDataParser(type, isArray) {
       function arrayDataParser(value, parser) {
-        if (value === null) return null
+        if (checker.isEmpty(value)) return null
         return value.map((i) => parser(i))
       }
 
@@ -126,7 +142,7 @@ class DataMapper {
       Object.defineProperty(proxy, field.name, {
         enumerable: true,
         get: function () {
-          if (field.isEntity) return undefined
+          if (field.isEntity) return parser(this._payload[nameDb])
           return parser(this._payload[nameDb])
         }
       })

src/herbs2mongo.js

@@ -1,3 +1,4 @@
 const Repository = require('./repository')
+const DataMapper = require('./dataMapper')
 
-module.exports = { Repository }
+module.exports = { Repository, DataMapper }

test/dataMapper.test.js

@@ -38,7 +38,6 @@ describe('Data Mapper', () => {
             assert.deepStrictEqual(toEntity.idField, 1)
             assert.deepStrictEqual(toEntity.field1, true)
             assert.deepStrictEqual(toEntity.fieldName, false)
-
         })
 
         it('should convert an entity field to the collection string convetion', () => {
@@ -98,6 +97,118 @@ describe('Data Mapper', () => {
         })
     })
 
+    describe('Simple Nested Entity', () => {
+        const ChildEntity = entity('Child entity', {
+            field1: field(String)
+        })
+
+        const givenAnNestedEntity = () => {
+
+            return entity('A nested entity', {
+                idField: field(Number),
+                field1: field(Boolean),
+                childEntity: field(ChildEntity),
+                arrayChildEntity: field([ChildEntity])
+            })
+        }
+
+        it('should convert data from collection to nested entity', () => {
+            //given
+            const Entity = givenAnNestedEntity()
+            const entityIDs = ['idField']
+            const dataMapper = new DataMapper(Entity, entityIDs)
+            const childEntity = new ChildEntity()
+            childEntity.field1 = 'String'
+
+            //when
+            const toEntity = dataMapper.toEntity({
+                id_field: 1,
+                field1: true,
+                child_entity: {
+                    field1: 'String'
+                },
+                array_child_entity: [
+                    { field1: 'String' }
+                ]
+            })
+
+            //then
+            assert.deepStrictEqual(toEntity.idField, 1)
+            assert.deepStrictEqual(toEntity.field1, true)
+            assert.deepStrictEqual(toEntity.childEntity, childEntity)
+            assert.deepStrictEqual(toEntity.arrayChildEntity, [childEntity])
+        })
+
+        it('should retrieve collection fields an nested entity', () => {
+            //given
+            const Entity = givenAnNestedEntity()
+            const entityInstance = new Entity()
+            entityInstance.idField = 1
+            entityInstance.field1 = true
+            entityInstance.childEntity = {
+                field1: 'String'
+            }
+            const entityIDs = ['idField']
+            const dataMapper = new DataMapper(Entity, entityIDs)
+
+            //when
+            const toEntity = dataMapper.collectionFields()
+
+            //then
+            assert.deepStrictEqual(toEntity, ['id_field', 'field1', 'child_entity', 'array_child_entity'])
+        })
+
+        it('should retrieve collection fields with values of an nested entity', () => {
+            //given
+            const Entity = givenAnNestedEntity()
+            const entityInstance = new Entity()
+            entityInstance.idField = 1
+            entityInstance.field1 = true
+            entityInstance.childEntity = {
+                field1: 'String'
+            }
+            entityInstance.arrayChildEntity = [
+                {
+                    field1: 'String'
+                }
+            ]
+            const entityIDs = ['idField']
+            const dataMapper = new DataMapper(Entity, entityIDs)
+
+            //when
+            const toEntity = dataMapper.collectionFieldsWithValue(entityInstance)
+
+            //then
+            assert.deepStrictEqual(toEntity, {
+                id_field: 1,
+                field1: true,
+                child_entity: {
+                    field1: 'String'
+                },
+                array_child_entity: {
+                    0: { field1: 'String' }
+                }
+            })
+        })
+
+        it('should retrieve collection fields with values of an nested entity with child entity as empty object', () => {
+            //given
+            const Entity = givenAnNestedEntity()
+            const entityInstance = new Entity()
+            entityInstance.idField = 1
+            entityInstance.field1 = true
+            entityInstance.childEntity = {}
+            const entityIDs = ['idField']
+            const dataMapper = new DataMapper(Entity, entityIDs)
+
+            //when
+            const toEntity = dataMapper.collectionFieldsWithValue(entityInstance)
+
+            //then
+            assert.deepStrictEqual(toEntity, { id_field: 1, field1: true, child_entity: {} })
+        })
+    })
+
     describe('Complex Entity - Multiple Types', () => {
 
         const givenAnComplexEntity = () => {

test/queries/find.js

@@ -134,7 +134,7 @@ describe('Query Find', () => {
             const ret = await itemRepo.find({ filter: { stringTest: ["aString"] } })
 
             //then
-            assert.deepStrictEqual(ret[0].toJSON(), { id: '60edc25fc39277307ca9a7ff', stringTest: "aString",  numberTest: 100, booleanTest: true , entityTest: undefined, entitiesTest: undefined })
+            assert.deepStrictEqual(ret[0].toJSON(), { id: '60edc25fc39277307ca9a7ff', stringTest: "aString",  numberTest: 100, booleanTest: true , entityTest: undefined, entitiesTest: null })
             assert.deepStrictEqual(ret[0].isValid(),true )
 
         })

test/queries/findByID.js

@@ -64,7 +64,7 @@ describe('Query Find by ID', () => {
         const ret = await itemRepo.findByID(anEntity.id)
 
         //then
-        assert.deepStrictEqual(ret[0].toJSON(), { id: '60edc25fc39277307ca9a7ff', stringTest: "aString",  numberTest: 100, booleanTest: true , entityTest: undefined, entitiesTest: undefined })
+        assert.deepStrictEqual(ret[0].toJSON(), { id: '60edc25fc39277307ca9a7ff', stringTest: "aString",  numberTest: 100, booleanTest: true , entityTest: undefined, entitiesTest: null })
         assert.deepStrictEqual(ret[0].isValid(),true )
 
     })