fix arrays with undefined value

90TechSAS · Jan 20, 2017 · a828f85 · a828f85
1 parent c340162
commit a828f85
Show file tree

Hide file tree

Showing 6 changed files with 34 additions and 9 deletions.
diff --git a/build/app.js b/build/app.js
@@ -107,7 +107,9 @@ function ActiveRecord(model, name) {
               /** Unless it is marked nested */
               !(field.nested || _.isArray(field) && field[0].nested)) {
                 if (_.isArray(field)) {
-                  toSave = _this[key].map(function (entry) {
+                  toSave = _this[key].filter(function (e) {
+                    return !_.isUndefined(e);
+                  }).map(function (entry) {
                     return typeof entry === 'string' ? entry : entry._id;
                   });
                 } else {
@@ -323,8 +325,10 @@ function ActiveRecord(model, name) {
                  * */
               } else if (field.nested || _.isArray(field) && field[0].nested) {
                   if (_.isArray(field)) {
-                    obj[key] = obj[key].map(function (e) {
-                      return e.beforeSave(null, { force: true });
+                    obj[key] = obj[key].filter(function (e) {
+                      return !_.isUndefined(e);
+                    }).map(function (e) {
+                      return e.beforeSave ? e.beforeSave(null, { force: true }) : e;
                     });
                   } else {
                     if (obj[key] && obj[key] !== null) {

diff --git a/dest/temp/ActiveRecord.js b/dest/temp/ActiveRecord.js
@@ -106,7 +106,9 @@ function ActiveRecord(model, name) {
               /** Unless it is marked nested */
               !(field.nested || _.isArray(field) && field[0].nested)) {
                 if (_.isArray(field)) {
-                  toSave = _this[key].map(function (entry) {
+                  toSave = _this[key].filter(function (e) {
+                    return !_.isUndefined(e);
+                  }).map(function (entry) {
                     return typeof entry === 'string' ? entry : entry._id;
                   });
                 } else {
@@ -322,8 +324,10 @@ function ActiveRecord(model, name) {
                  * */
               } else if (field.nested || _.isArray(field) && field[0].nested) {
                   if (_.isArray(field)) {
-                    obj[key] = obj[key].map(function (e) {
-                      return e.beforeSave(null, { force: true });
+                    obj[key] = obj[key].filter(function (e) {
+                      return !_.isUndefined(e);
+                    }).map(function (e) {
+                      return e.beforeSave ? e.beforeSave(null, { force: true }) : e;
                     });
                   } else {
                     if (obj[key] && obj[key] !== null) {

diff --git a/dest/temp/specs/angular-dao-base.specs.js b/dest/temp/specs/angular-dao-base.specs.js
@@ -87,4 +87,12 @@ describe('Angular DAO Basics', function () {
     });
     httpBackend.flush();
   });
+
+  it('Should not fail when a nested property is undefined', function () {
+    var m = ModelManager.create({
+      _id: "111",
+      models2: [{ _id: "121212" }, undefined, { _id: null }, null],
+      model2: undefined
+    });
+  });
 });
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "author": "flogou <[email protected]>",
   "name": "angular-orm",
-  "version": "2.0.0",
+  "version": "2.0.1",
   "description": "",
   "homepage": "",
   "dependencies": {

diff --git a/src/ActiveRecord.js b/src/ActiveRecord.js
@@ -73,7 +73,7 @@ export default function ActiveRecord (model, name, SManager = SessionManager(mod
             /** Unless it is marked nested */
             && !(field.nested || (_.isArray(field) && field[ 0 ].nested))) {
             if (_.isArray(field)) {
-              toSave = this[ key ].map(entry => (typeof entry === 'string') ? entry : entry._id)
+              toSave = this[ key ].filter(e => !_.isUndefined(e)).map(entry => (typeof entry === 'string') ? entry : entry._id)
             } else {
               toSave = typeof this[ key ] === 'string' ? this[ key ] : this[ key ]._id
             }
@@ -279,7 +279,9 @@ export default function ActiveRecord (model, name, SManager = SessionManager(mod
              * */
           } else if (field.nested || (_.isArray(field) && field[ 0 ].nested )) {
             if (_.isArray(field)) {
-              obj[ key ] = obj[ key ].map(e => e.beforeSave(null, { force: true }))
+              obj[ key ] = obj[ key ]
+                .filter(e => !_.isUndefined(e))
+                .map(e => e.beforeSave ? e.beforeSave(null, { force: true }) : e)
             } else {
               if (obj[ key ] && obj[ key ] !== null) {
                 obj[ key ] = obj[ key ].beforeSave(null, { force: true })

diff --git a/tst/specs/angular-dao-base.specs.js b/tst/specs/angular-dao-base.specs.js
@@ -86,7 +86,14 @@ describe('Angular DAO Basics', function () {
       expect(data).toEqual({data: []})
     });
     httpBackend.flush();
+  })
 
+  it ('Should not fail when a nested property is undefined', function(){
+    var m = ModelManager.create({
+        _id: "111",
+        models2: [{_id: "121212"}, undefined, {_id: null}, null],
+        model2: undefined
+      })
   })
 
 });