Added event name

src/model/Action.spec.ts

@@ -7,6 +7,7 @@ describe('Action', () => {
   const params = {
     name: 'testAction',
     type: 'some-type',
+    event: 'name-event',
     options: {}
   }
   const testAction = new Action(params)

src/model/Action.ts

@@ -2,10 +2,12 @@ export default class Action {
   name: string
   type: string
   options: any
+  event: string
 
-  constructor({name, type, options}: {name: string, type: string, options: any}) {
+  constructor({name, type, options, event}: {name: string, type: string, options: any, event: string}) {
     this.name = name
     this.type = type
     this.options = options
+    this.event = event
   }
 }

src/worker/ActionCreator.spec.ts

@@ -46,12 +46,14 @@ describe('ActionCreator', () => {
     const action = new Action({
       name: 'mapper1',
       type: 'mapper',
+      event: 'event-name',
       options
     })
 
     const action2 = new Action({
       name: 'mapper2',
       type: 'mapper',
+      event: 'event-name',
       options
     })
 

src/worker/ActionCreator.ts

@@ -4,7 +4,7 @@
 // Start listening to defined rabbitmq event and execute
 // the action based on type and options
 
-import * as rabbit from 'rabbot'
+import rabbit from 'rabbot'
 import debug = require('debug')
 import logger from '../services/logger'
 import ActionExecuter from './ActionExecuter'
@@ -73,15 +73,18 @@ export default class ActionCreator {
 
   // Make a Promise array and execute all the actions in serial
   // fashion
-  executeActions (msg) {
+  async executeActions (msg) {
     const rabbit = this.rabbit
     const contents = extractMessage(msg)
 
     let promiseChain = Promise.resolve([]).then(() => contents)
 
     // Iterate over all actions passing the lastResult
     this.event.actions.forEach((action, index) => {
-      const executer = new ActionExecuter(action, rabbit, this.event)
+      const executer = new ActionExecuter({
+        ...action,
+        event: this.event.name,
+      }, rabbit, this.event)
 
       const executionPromise = (lastValue, preLog, eventsLenght) => {
         if (lastValue.id) {

src/worker/ActionExecuter.spec.ts

@@ -1,4 +1,4 @@
-import * as rabbit from 'rabbot'
+import rabbit from 'rabbot'
 import ActionExecuter from './ActionExecuter'
 import Action from '../model/Action'
 import Event from '../model/Event'
@@ -11,7 +11,8 @@ describe('ActionExecuter', () => {
       options: {
         target: 'test',
         targetRoute: 'someroute'
-      }
+      },
+      event: 'event-name',
     })
 
     const actionExecuter = new ActionExecuter(action, rabbit, new Event({
@@ -43,7 +44,8 @@ describe('ActionExecuter', () => {
           field: 'test',
           operation: 'defined'
         }
-      }
+      },
+      event: 'event-name',
     })
 
     const actionExecuter = new ActionExecuter(action, rabbit, new Event({name: 'test', eventName: 'test', route: 'test', actions: []}))

src/worker/execution-plugins/conditional.spec.ts

@@ -16,7 +16,8 @@ describe('conditional', () => {
           checkValue: 'test'
         }
       ]
-    }
+    },
+    event: 'event-name',
   })
   const conditionalPlugin = new ConditionalPlugin(msg, action, '')
 
@@ -34,7 +35,8 @@ describe('conditional', () => {
             checkValue: 'world'
           }
         ]
-      }
+      },
+      event: 'event-name',
     })
     const passingConditionalPlugin = new ConditionalPlugin(msg, passingAction, '')
 
@@ -55,7 +57,8 @@ describe('conditional', () => {
             checkValue: 'world'
           }
         ]
-      }
+      },
+      event: 'event-name',
     })
     const passingConditionalPlugin = new ConditionalPlugin(msg, passingAction, '')
 
@@ -80,7 +83,8 @@ describe('conditional', () => {
             operation: 'defined'
           }
         ]
-      }
+      },
+      event: 'event-name',
     })
     const passingConditionalPlugin = new ConditionalPlugin(msg, passingAction, '')
 
@@ -109,7 +113,8 @@ describe('conditional', () => {
             operation: 'defined'
           }
         ]
-      }
+      },
+      event: 'event-name',
     })
 
     const nonPassingConditionalPlugin = new ConditionalPlugin(msg, nonPassingAction, '')

src/worker/execution-plugins/http.spec.ts

@@ -15,7 +15,8 @@ describe('http', () => {
       url: 'http://localhost:3000/{{ hello }}',
       method: 'GET',
       merge: true
-    }
+    },
+    event: 'name-event',
   })
   const httpPlugin = new HttpPlugin(msg, action, 'test')
   const mock = new MockAdapter(axios)
@@ -64,7 +65,8 @@ describe('http', () => {
         method: 'GET',
         merge: true,
         mergeTarget: 'response'
-      }
+      },
+      event: 'name-event',
     })
     const httpPlugin = new HttpPlugin(msg, action, 'test')
 

src/worker/execution-plugins/log.spec.ts

@@ -6,7 +6,8 @@ describe('log', () => {
     const action = new Action({
       name: 'log',
       type: 'log',
-      options: {}
+      options: {},
+      event: 'event-name',
     })
 
     const logPlugin = new LogPlugin({test: 'value', test2: 'value2'}, action, 'preLog')

src/worker/execution-plugins/prev2task.spec.ts

@@ -10,7 +10,8 @@ describe('prev2task', () => {
       options: {
         target: 'some-queue',
         targetRoute: 'some-route'
-      }
+      },
+      event: 'event-name',
     })
     const rabbit = {
       publish: () => Promise.resolve({})

src/worker/execution-plugins/telegram.spec.ts

@@ -12,7 +12,8 @@ describe('telegram', () => {
     options: {
       chatId: '1324',
       template: 'Test'
-    }
+    },
+    event: 'event-name',
   })
 
   it('should allow to be initialized with passed configurations', () => {