Merge pull request #50 from protofire/hotfix/fix-earnings-notifications

[Hotfix] - Fix Earn values of emails

index.route.js

@@ -1,6 +1,5 @@
 const express = require('express')
 const subscribersRouters = require('./server/subscriber/subscriber.route')
-const earningsRouters = require('./server/earning/earning.route')
 const telegramRouters = require('./server/telegram/telegram.route')
 const roundRouters = require('./server/round/round.route')
 const delegateRouters = require('./server/delegate/delegate.route')
@@ -12,8 +11,6 @@ router.get('/health-check', (req, res) => res.send('OK'))
 
 router.use('/subscribers', subscribersRouters)
 
-router.use('/earnings', earningsRouters)
-
 router.use('/telegrams', telegramRouters)
 
 router.use('/rounds', roundRouters)

package.json

@@ -12,6 +12,9 @@
   },
   "scripts": {
     "start": "nodemon --harmony index.js",
+    "start:telegram-bot": "nodemon --harmony server/jobs/running-bot-telegram.js",
+    "start:worker-did-reward": "node --harmony ./server/jobs/worker-notification-delegate-did-reward-call.js",
+    "start:worker-claim-reward": "node --harmony ./server/jobs/worker-notification-delegator-claim-reward-call.js",
     "lint": "esw *.js server config --color",
     "lint:watch": "npm run lint -- --watch",
     "test": "NODE_ENV=test ./node_modules/.bin/mocha  test/*.test.js --timeout=1200000 --ui bdd --reporter spec --colors server --harmony --exit",

server/helpers/sdk/delegator.js

@@ -1,6 +1,4 @@
 const LivepeerSDK = require('@mariano-aguero/sdk')
-const { MathBN } = require('../utils')
-
 const getLivepeerDelegatorAccount = async address => {
   if (!address) {
     return null
@@ -31,6 +29,7 @@ const getLivepeerDelegatorStake = async address => {
 
 const getTotalStakeFromSummary = summary => {
   const { bondedAmount = 0, pendingStake = 0 } = summary
+  const { MathBN } = require('../utils')
   return MathBN.max(bondedAmount, pendingStake)
 }
 

server/helpers/sendEmailDidRewardCall.js → server/helpers/sendDelegateEmail.js

@@ -11,7 +11,7 @@ const {
   sendgridTemplateIdDidRewardCallPayAttention
 } = config
 
-const sendEmailDidRewardCall = async data => {
+const sendEmail = async data => {
   const { email, templateId } = data
 
   sgMail.setApiKey(sendgridAPIKEY)
@@ -29,19 +29,19 @@ const sendEmailDidRewardCall = async data => {
       unsubscribeEmailUrl: unsubscribeEmailUrl
     }
   }
-
   if (!['test'].includes(config.env)) {
     try {
       await sgMail.send(msg)
       console.log(`Email sended to ${email} successfully`)
     } catch (err) {
+      console.log('error on email')
       console.log(err)
     }
   }
   return
 }
 
-const sendNotificationEmail = async data => {
+const sendDelegateNotificationEmail = async data => {
   try {
     const { subscriber, delegateCalledReward } = data
 
@@ -55,7 +55,7 @@ const sendNotificationEmail = async data => {
       templateId
     }
 
-    await sendEmailDidRewardCall(emailData)
+    await sendEmail(emailData)
 
     // Save last email sent
     subscriber.lastEmailSent = Date.now()
@@ -66,4 +66,4 @@ const sendNotificationEmail = async data => {
   }
 }
 
-module.exports = { sendNotificationEmail }
+module.exports = { sendDelegateNotificationEmail }