Fix/scheduler action not populated correctly (#25)

* Develop (#8)

* added timestamps in the datamodels and notification interval control

* removed vsvode env directory from the central repo

* Message template changes (#1)

* Message template changes

* added file ti gitignore

* delete package-lock.json

* Gitignore .idea

* updated a typo

* Fix/config (#4)

* added readme.md and config to be available from environmental variables

* added config doc

* Added database docs (#5)

* Added database docs

* Added link in readme.md

* Fix/env var (#6)

* added readme.md and config to be available from environmental variables

* added config doc

* added config to take envvars for sensitive data, fixed directory name typo

* fixed a config issue

* added healthcheck

* Feature/dockerize (#7)

* Added Dockerfile

* Added Dockerfile and dockerignore

* updated readme

* error catch

* added mongo login information

* uri of central ledger in config; healthcheckport -> PORT (#9)

* mongodb findAndModify is a mess

* typo fix

* findandmodifyhell

* kafka fix and log

* changed /healtcheck to /health

* typo fixe

* changed package.json info and version

* Added initial test to action model and pakage .json to run npm test

* completed unit test on tha action model

* completed unit test on tha current position model

* Add unit tests for events model

* Added unit tests for limits model

* Added unit tests for notificationEndpoints model

* Added unhappy line unit test for database.js

* Fixed unhappy line unit test for database.js

* Changes to unittest still failing

* rewrite unit tests without mocha

* rewrite unit tests without mocha mock a db connection

* Added ne version of unit test

* Fixed the leaked-handles issue

* Added database.js unit test for unhappy line

* unit test for actions added - incomplete

* Added unit test to test if action is finish

* added more unit testing to actions

* More code for action unit test

* added mocking for model.save()

* Added unit tests to Actions observable

* Added proxyquire to setup unit test

* Added code for position change message

* added methode for save event

* Added code for save event and building params

* added more changes to central ledgerAPI and currentpositions model

* Added missing js in store

* Finished the function to create current position record for settlement change

* Finished code changes to centralLedgerApi

* cleaned the enums; added action map for kafka and added email-notifier action; added Hub participant name as a config

* finished 566 tasks.. time to test

* changes for settlement position change implied

* few fixes

* merged something

* ready to merge with master

* fixed vulnerabilities

* fixed package.json

* added notification endpoint call for limits adjustment flow

* removed few spaces

* fixed opposite logic

* fixed naming issue with event collection reference into the action model

Author: vgenev

src/models/action.js

@@ -36,7 +36,7 @@ const config = require('../lib/config')
 const actionSchema = new mongoose.Schema({
   triggeredBy: { type: mongoose.Schema.Types.ObjectId }, // this will show artefact (ndc breach, limit change, etc) in the past
   timesTriggered: { type: Number, default: 1 },
-  fromEvent: { type: mongoose.Schema.Types.ObjectId, ref: 'eventSchema' },
+  fromEvent: { type: mongoose.Schema.Types.ObjectId, ref: config.mongo.eventCollection },
   isActive: { type: Boolean, default: true }
 }, { timestamps: true })
 

src/models/events.js

@@ -30,7 +30,7 @@
  */
 const mongoose = require('mongoose')
 const config = require('../lib/config')
-const getActions = require('../observables/actions').getActions
+// const getActions = require('../observables/actions').getActions
 /**
  * @const limitSchema
  *
@@ -39,14 +39,14 @@ const getActions = require('../observables/actions').getActions
  * @link https://mongoosejs.com , https://github.com/Automattic/mongoose
  */
 
-let actions = getActions()
+// let actions = getActions()
 
 const eventSchema = new mongoose.Schema({
   name: { type: String, required: true, index: true },
   currency: { type: String, required: true, index: true },
   limitType: { type: String, required: true },
   notificationEndpointType: { type: String, required: true },
-  action: { type: String, required: true, enum: actions }, // always sendToKafkaTopic
+  action: { type: String, required: true, enum: ['produceToKafkaTopic', 'sendEmail'] }, // always sendToKafkaTopic
   templateType: { type: String, required: true },
   language: { type: String, required: true },
   isActive: { type: Boolean, default: true }

src/observables/actions.js

@@ -122,7 +122,7 @@ const actionObservable = ({ action, params, message }) => {
         actionResult = await actionBuilder(action)({ payload }) // create new action
         if (Config.get('notificationMinutes').oscilateEvents.includes(params.notificationEndpointType)) {
           let actionCreated = await ActionModel.create({ triggeredBy: params.triggeredBy, fromEvent: params.fromEvent })
-          Rx.asyncScheduler.schedule(clearRepetitionTask, resetPeriod * 60 * 1000, actionCreated.id) // loading the scheduler
+          Rx.asyncScheduler.schedule(clearRepetitionTask, resetPeriod * 60 * 1000, actionCreated.id) // loading the scheduler, clearRepetitionTask is executed after the period and actionCreated.id is sent as a parameter
         } else {
           await ActionModel.create({ triggeredBy: params.triggeredBy, fromEvent: params.fromEvent, isActive: false })
         }
@@ -137,11 +137,11 @@ const actionObservable = ({ action, params, message }) => {
 
 const clearRepetitionTask = async function (actionId) { // clears the timesTriggered after delay is reached if action is still active
   try {
-    let action = await ActionModel.findById(actionId).populate('eventType')
+    let action = await ActionModel.findById(actionId).populate('fromEvent')
     let limit = await LimitModel.findOne({
-      type: action.eventType.limitType,
-      name: action.eventType.name,
-      currency: action.eventType.currency
+      type: action.fromEvent.limitType,
+      name: action.fromEvent.name,
+      currency: action.fromEvent.currency
     })
     if (action.isActive && limit) {
       action.timesTriggered = 1