Fixing instance delete bug

Author: masumsoft

lib/orm/apollo_error.js

@@ -76,6 +76,9 @@ var AERROR_TYPES = {
     },
     'model.value.invalidvalue' : {
         msg : 'Invalid Value: "%s" for Field: %s (Type: %s)'
+    },
+    'model.delete.invalidvalue' : {
+        msg : 'Invalid Value: "%s" for Field: %s (Type: %s)'
     }
 };
 

lib/orm/base_model.js

@@ -57,7 +57,7 @@ var BaseModel = function(instance_values){
         };
 
         Object.defineProperty(this, property_name, descriptor);
-	if(!field['virtual']){
+        if(!field['virtual']){
             this[property_name] = instance_values[property_name];
         }
     }
@@ -1087,7 +1087,16 @@ BaseModel.prototype.delete = function(options, callback){
     var delete_query = {};
 
     for(var i in schema.key){
-        delete_query[schema.key[i]] = this[schema.key[i]];
+        var field_key = schema.key[i];
+        var field_value = this[field_key];
+        var field_type = schemer.get_field_type(schema,field_key);
+
+        try{
+            delete_query[field_key] = this.constructor._get_db_value_expression(field_key,field_value);
+        }
+        catch(e){
+            return callback(build_error('model.delete.invalidvalue',field_value,field_key,field_type));
+        }
     }
     this.constructor.delete(delete_query, options, callback);
 };

test/test.js

@@ -188,8 +188,41 @@ describe('Unit Tests', function(){
         });
     });
 
+    describe('#instance update after find',function(){
+        it('should find and update single data object without errors', function(done) {
+            models.instance.Person.findOne({userID:1234, age:32}, function(err, user){
+                if(err) throw err;
+                user.Name = "Updated Stupid";
+                user.save(function(err){
+                    if(err) throw err;
+                    models.instance.Person.findOne({userID:1234, age:32}, function(err, user_new){
+                        if(err) throw err;
+                        user_new.Name.should.equal('Updated Stupid');
+                        done();
+                    });
+                });
+            });
+        });
+    });
+
+    describe('#instance delete after find',function(){
+        it('should find and delete single data object without errors', function(done) {
+            models.instance.Person.findOne({userID:1234, age:32}, function(err, user){
+                if(err) throw err;
+                user.delete(function(err){
+                    if(err) throw err;
+                    models.instance.Person.findOne({userID:1234, age:32}, function(err, user_new){
+                        if(err) throw err;
+                        expect(user_new).to.not.exist;
+                        done();
+                    });
+                });
+            });
+        });
+    });
+
     describe('#delete',function(){
-        it('should delete data from db without errors', function(done) {
+        it('should cleanup the db without errors', function(done) {
             models.instance.Person.delete({userID:1234, age:32}, function(err){
                 if(err) throw err;
                 done();
@@ -198,7 +231,7 @@ describe('Unit Tests', function(){
     });
 
     describe('#find after delete',function(){
-        it('should find data as deleted', function(done) {
+        it('should find all data as deleted', function(done) {
             models.instance.Person.find({userID: 1234}, function(err, people){
                 if(err) throw err;
                 people.length.should.equal(0);