Merge branch 'master' into 'master'

Master See merge request !24
EdgeVerve · Aug 22, 2018 · 42d908a · 42d908a
2 parents a6f4cf5 + df03288
commit 42d908a
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 1 deletion.
diff --git a/common/mixins/maker-checker-mixin-v2.js b/common/mixins/maker-checker-mixin-v2.js
@@ -758,6 +758,9 @@ function addOERemoteMethods(Model) {
     var modelName = Model.definition.name;
     var ChangeWorkflowRequest = app.models.ChangeWorkflowRequest;
 
+    var inputPV = data.pv;
+    delete data.pv;
+
     var idName = Model.definition.idName();
     var id = data[idName] || 'this_id_wont_exist';
     ChangeWorkflowRequest.find({
@@ -856,7 +859,7 @@ function addOERemoteMethods(Model) {
               var mapping = res[0];
 
               let workflowBody = mapping.workflowBody;
-              workflowBody.processVariables = workflowBody.processVariables || {};
+              workflowBody.processVariables = Object.assign(workflowBody.processVariables || {}, inputPV);
               workflowBody.processVariables._operation = mData.operation;
               workflowBody.processVariables._modifiers = mData._modifiers;
               workflowBody.processVariables._modelInstance = mData.data;

diff --git a/common/models/task.js b/common/models/task.js
@@ -237,6 +237,14 @@ module.exports = function Task(Task) {
   Task.prototype.complete = function complete(data, options, next) {
     var self = this;
     var tname = self.name;
+
+    if (self.status !== 'pending') {
+      let error = new Error('Task already completed');
+      error.code = 'TASK_ALREADY_COMPLETED';
+      error.status = error.statusCode = 409;
+      return next(error);
+    }
+
     self.processInstance({}, options, function fetchProcessDef(err, process) {
       if (err) {
         log.error(options, err);