fix(Model.update()): Fix bug in Model.update() inside a transaction

#144
sebelga · Feb 3, 2019 · 3609623 · 3609623
1 parent 9f8a6c2
commit 3609623
Show file tree

Hide file tree

Showing 3 changed files with 78 additions and 3 deletions.
diff --git a/lib/model.js b/lib/model.js
@@ -218,6 +218,8 @@ class Model extends Entity {
         const key = this.key(id, ancestors, namespace);
         const replace = options && options.replace === true;
 
+        let internalTransaction = false;
+
         /**
          * If options.replace is set to true we don't fetch the entity
          * and save the data directly to the specified key, overriding any previous data.
@@ -228,6 +230,7 @@ class Model extends Entity {
         }
 
         if (typeof transaction === 'undefined' || transaction === null) {
+            internalTransaction = true;
             transaction = this.gstore.ds.transaction();
             return transaction
                 .run()
@@ -302,7 +305,9 @@ class Model extends Entity {
                 options.dataloader.clear(key);
             }
 
-            if (transaction) {
+            if (internalTransaction) {
+                // If we created the Transaction instance internally for the update, we commit it
+                // otherwise we leave the commit() call to the transaction creator
                 return transaction.commit().then(onTransactionSuccess);
             }
 
@@ -311,7 +316,9 @@ class Model extends Entity {
 
         function onUpdateError(err) {
             error = err;
-            if (transaction) {
+            if (internalTransaction) {
+                // If we created the Transaction instance internally for the update, we rollback it
+                // otherwise we leave the rollback() call to the transaction creator
                 return transaction.rollback().then(onTransactionError);
             }
 

diff --git a/test/integration/model.js b/test/integration/model.js
@@ -5,6 +5,7 @@
 const chai = require('chai');
 const sinon = require('sinon');
 const Chance = require('chance');
+const Joi = require('joi');
 const { Datastore } = require('@google-cloud/datastore');
 const { argv } = require('yargs');
 
@@ -291,6 +292,73 @@ describe('Model (Integration Tests)', () => {
         });
     });
 
+    describe('update()', () => {
+        describe('transaction()', () => {
+            it('should update entity inside a transaction', () => {
+                const userSchema = new Schema({
+                    name: { joi: Joi.string().required() },
+                    lastname: { joi: Joi.string() },
+                    password: { joi: Joi.string() },
+                    coins: { joi: Joi.number().integer().min(0) },
+                    email: { joi: Joi.string().email() },
+                    createdAt: { joi: Joi.date() },
+                    access_token: { joi: [Joi.string(), Joi.number()] },
+                    birthyear: { joi: Joi.number().integer().min(1900).max(2013) },
+                }, { joi: true });
+
+                const User = gstore.model('ModelTestsTransaction-User', userSchema);
+
+                function transferCoins(fromUser, toUser, amount) {
+                    return new Promise((resolve, reject) => {
+                        const transaction = gstore.transaction();
+                        return transaction.run()
+                            .then(async () => {
+                                await User.update(fromUser.entityKey.id, {
+                                    coins: fromUser.coins - amount,
+                                }, null, null, transaction);
+
+                                await User.update(toUser.entityKey.id, {
+                                    coins: toUser.coins + amount,
+                                }, null, null, transaction);
+
+                                transaction.commit()
+                                    .then(async () => {
+                                        const [user1, user2] = await User.get([
+                                            fromUser.entityKey.id,
+                                            toUser.entityKey.id,
+                                        ], null, null, null, { preserveOrder: true });
+                                        expect(user1.name).equal('User1');
+                                        expect(user1.coins).equal(0);
+                                        expect(user2.name).equal('User2');
+                                        expect(user2.coins).equal(1050);
+                                        resolve();
+                                    }).catch((err) => {
+                                        reject(err);
+                                    });
+                            }).catch((err) => {
+                                transaction.rollback();
+                                reject(err);
+                            });
+                    });
+                }
+
+                const fromUser = new User({ name: 'User1', coins: 1000 });
+                const toUser = new User({ name: 'User2', coins: 50 });
+
+                return fromUser.save()
+                    .then(({ entityKey }) => {
+                        addKey(entityKey);
+                        return toUser.save();
+                    })
+                    .then(({ entityKey }) => {
+                        addKey(entityKey);
+                        return transferCoins(fromUser, toUser, 1000);
+                    });
+            });
+        });
+    });
+
+
     describe('hooks', () => {
         it('post delete hook should set scope on entity instance', () => {
             const schema = new Schema({ name: { type: 'string' } });

diff --git a/test/integration/schema.js b/test/integration/schema.js
@@ -52,7 +52,7 @@ describe('Schema (Integration Tests)', () => {
             },
         });
 
-        const User = gstore.model('User', schema);
+        const User = gstore.model('ModelTestsSchema-User', schema);
 
         const email = chance.email();
         const password = chance.string();