#42 add possibility to call removeTimeout after getTimeoutSagas and getOlderSagas

Author: adrai

.gitignore

@@ -12,11 +12,13 @@ $ cat .gitignore
 node_modules
 node_modules/**/*
 
+package-lock.json
+
 .idea
 
 .DS_Store
 
 *.tingo
 *.db
 
-dump.rdb
+dump.rdb

lib/pm.js

@@ -479,6 +479,12 @@ _.extend(ProcessManagement.prototype, {
           calledAddCommandToSend = true;
           sagaModel.addUnsentCommand(cmd);
         };
+        var calledRemoveTimeout = false;
+        var orgRemoveTimeout = sagaModel.removeTimeout;
+        sagaModel.removeTimeout = function () {
+          calledRemoveTimeout = true;
+          orgRemoveTimeout.bind(sagaModel)();
+        };
         sagaModel.commit = function (clb) {
           var cmds = calledAddCommandToSend ? sagaModel.getUndispatchedCommands() : [];
 
@@ -537,6 +543,9 @@ _.extend(ProcessManagement.prototype, {
                 return { id: dotty.get(c, self.definitions.command.id), payload: c };
               });
               self.sagaStore.save(sagaModel.toJSON(), undispCmds, onAfterCommit);
+            } else if (calledRemoveTimeout) {
+              sagaModel.setCommitStamp(new Date());
+              self.sagaStore.save(sagaModel.toJSON(), [], onAfterCommit);
             } else {
               var err = new Error('Use commit only to remove a saga or to addCommandToSend!');
               debug(err);
@@ -571,9 +580,18 @@ _.extend(ProcessManagement.prototype, {
         var sagaModel = new SagaModel(s.id);
         sagaModel.set(s);
         sagaModel.actionOnCommit = 'update';
+        var calledRemoveTimeout = false;
+        var orgRemoveTimeout = sagaModel.removeTimeout;
+        sagaModel.removeTimeout = function () {
+          calledRemoveTimeout = true;
+          orgRemoveTimeout.bind(sagaModel)();
+        };
         sagaModel.commit = function (clb) {
           if (sagaModel.isDestroyed()) {
             self.removeSaga(sagaModel, clb);
+          } else if (calledRemoveTimeout) {
+            sagaModel.setCommitStamp(new Date());
+            self.sagaStore.save(sagaModel.toJSON(), [], clb);
           } else {
             var err = new Error('Use commit only to remove a saga!');
             debug(err);

releasenotes.md

@@ -1,3 +1,6 @@
+## [v1.9.1](https://github.com/adrai/node-cqrs-saga/compare/v1.9.0...v1.9.1)
+- add possibility to call removeTimeout after getTimeoutSagas and getOlderSagas [#42](https://github.com/adrai/node-cqrs-saga/issues/#42) thanks to [edro](https://github.com/edro)
+
 ## [v1.9.0](https://github.com/adrai/node-cqrs-saga/compare/v1.8.0...v1.9.0)
 - optional pagination for getTimeoutedSagas and getUndispatchedCommands
 

test/unit/pmTest.js

@@ -1132,7 +1132,24 @@ describe('power management', function () {
                         expect(cmd.commitStamp).to.be.ok();
                         expect(cmd.command.id).to.eql('newId');
                         expect(cmd.command.name).to.eql('newCommand');
-                        done();
+
+                        pm.getTimeoutedSagas(function (err, sagas) {
+                          expect(err).not.to.be.ok();
+                          expect(sagas).to.be.an('array');
+                          expect(sagas.length).to.eql(1);
+
+                          sagas[0].removeTimeout();
+                          sagas[0].commit(function (err) {
+                            expect(err).not.to.be.ok();
+                            pm.getTimeoutedSagas(function (err, sagas) {
+                              expect(err).not.to.be.ok();
+                              expect(sagas).to.be.an('array');
+                              expect(sagas.length).to.eql(0);
+                              done();
+                            });
+                          });
+                        });
+
                       });
                     });
                   });
@@ -1296,7 +1313,18 @@ describe('power management', function () {
                     expect(sagas[0].getTimeoutAt().getTime()).to.eql(saga2._timeoutAt.getTime());
                     expect(sagas[0].get('data')).to.eql(saga2.data);
 
-                    done();
+                    sagas[0].removeTimeout();
+                    sagas[0].commit(function (err) {
+                      expect(err).not.to.be.ok();
+
+                      pm.getOlderSagas(new Date(2014, 3, 3), function (err, sagas) {
+                        expect(err).not.to.be.ok();
+                        expect(sagas).to.be.an('array');
+                        expect(sagas.length).to.eql(0);
+
+                        done();
+                      });
+                    });
                   });
                 });
               });