Release version to master

config/service.report.json.example

@@ -3,10 +3,6 @@
     "rest:report:api"
   ],
   "restUrl": "https://api-pub.bitfinex.com",
-  "emailConf": {
-    "from": "Bitfinex <no-reply@bitfinex.com>",
-    "subject": "Your report is ready"
-  },
   "s3Conf": {
     "bucket": "",
     "acl": "",

package.json

@@ -1,6 +1,6 @@
 {
   "name": "bfx-report",
-  "version": "4.13.1",
+  "version": "4.13.2",
   "description": "Reporting tool",
   "main": "worker.js",
   "license": "Apache-2.0",
@@ -70,8 +70,7 @@
       ".idea/",
       ".vscode/",
       "csv/",
-      "workers/loc.api/queue/temp/",
-      "workers/loc.api/queue/views/"
+      "workers/loc.api/queue/temp/"
     ]
   },
   "betterScripts": {

test/helpers/helpers.worker.js

@@ -20,7 +20,7 @@ const startHelpers = (
   logs,
   workers = [
     { name: 's3', port: 13371 },
-    { name: 'sendgrid', port: 1310 },
+    { name: 'mail', port: 1310 },
     { name: 'gpg', port: 1320 },
     { name: 'pdf', port: 1330 },
     { name: 'testcalls', port: 1300 }

test/simulate/mocks-spies/mail.js

@@ -0,0 +1,43 @@
+'use strict'
+
+const workerArgs = ['rest:core:mail']
+
+function addFunctions (ExtApi) {
+  ExtApi.prototype.enqueueEmail = function (space, msg, cb) {
+    const {
+      lang,
+      to,
+      reportUrl,
+      fileName
+    } = msg?.payload
+
+    if (!msg?.type) return cb(new Error('ERR_API_NO_TYPE'))
+    if (!lang) return cb(new Error('ERR_API_NO_LANGUAGE'))
+    if (!to) return cb(new Error('ERR_API_NO_TO'))
+    if (!reportUrl) return cb(new Error('ERR_API_NO_REPORT_URL'))
+    if (!fileName) return cb(new Error('ERR_API_NO_FILE_NAME'))
+
+    try {
+      const res = ['send']
+      const grcBfx = this.ctx.grc_bfx
+      const call = {
+        worker: 'core.mail',
+        on: 'enqueueEmail',
+        params: { msg },
+        res: res[0],
+        timestamp: Date.now()
+      }
+      grcBfx.req('rest:ext:testcalls', 'addCall', [call], { timeout: 10000 }, (err, data) => {
+        if (err) cb(new Error('core.mail:enqueueEmail:testcalls'))
+        else return cb(null, res && res.length && res[0])
+      })
+    } catch (e) {
+      cb(new Error(`ERR_API_MAIL: ${e.toString()}`))
+    }
+  }
+}
+
+module.exports = {
+  addFunctions,
+  workerArgs
+}

test/simulate/mocks-spies/s3.js

@@ -4,17 +4,15 @@ const workerArgs = ['rest:ext:s3']
 
 function addFunctions (ExtApi) {
   ExtApi.prototype.uploadPresigned = function (space, data, opts, cb) {
-    const upload = {
-      public_url: 'https://fakeUrl.com',
-      key: 'fakeKey',
-      s3bucket: 'fakeBucket'
+    const mockedRes = {
+      presigned_url: 'https://fakePresignedUrl.com'
     }
     const grcBfx = this.ctx.grc_bfx
     const call = {
       worker: 'ext.s3',
       on: 'uploadPresigned',
-      params: { opts },
-      res: { upload },
+      params: { data, opts },
+      res: mockedRes,
       timestamp: Date.now()
     }
 
@@ -25,7 +23,7 @@ function addFunctions (ExtApi) {
       { timeout: 10000 },
       (err, data) => {
         if (err) cb(new Error('ext.s3:uploadPresigned:testcalls'))
-        else return cb(null, upload)
+        else return cb(null, mockedRes)
       }
     )
   }

workers/loc.api/di/app.deps.js

@@ -173,8 +173,7 @@ module.exports = ({
       bindDepsToFn(
         sendMail,
         [
-          TYPES.GrcBfxReq,
-          TYPES.I18next
+          TYPES.GrcBfxReq
         ]
       )
     )

workers/loc.api/generate-report-file/index.js

@@ -50,7 +50,7 @@ const _getReportFileStoreStatus = async ({
     }
   }
 
-  if (!await hasGrcService.hasS3AndSendgrid()) {
+  if (!await hasGrcService.hasS3AndMailServices()) {
     throw new EmailSendingError()
   }
   if (

workers/loc.api/has.grc.service/index.js

@@ -29,15 +29,15 @@ class HasGrcService {
     }
   }
 
-  async hasS3AndSendgrid () {
+  async hasS3AndMailServices () {
     const countS3Services = await this.lookUpFunction(
       'rest:ext:s3'
     )
-    const countSendgridServices = await this.lookUpFunction(
-      'rest:ext:sendgrid'
+    const countMailServices = await this.lookUpFunction(
+      'rest:core:mail'
     )
 
-    return !!(countS3Services && countSendgridServices)
+    return !!(countS3Services && countMailServices)
   }
 
   async hasGPGService () {

workers/loc.api/i18next/index.js

@@ -29,7 +29,7 @@ module.exports = (params) => {
         default: ['en']
       },
       ns: Object.values(TRANSLATION_NAMESPACES),
-      defaultNS: 'email',
+      defaultNS: TRANSLATION_NAMESPACES.PDF,
       preload: [...transPaths.reduce((accum, transPath) => {
         const allFileNames = fs.readdirSync(transPath)
 

workers/loc.api/i18next/translation.namespaces.js

@@ -1,7 +1,6 @@
 'use strict'
 
 const TRANSLATION_NAMESPACES = {
-  EMAIL: 'email',
   PDF: 'pdf'
 }
 

workers/loc.api/queue/aggregator.js

@@ -29,13 +29,12 @@ module.exports = (
         email,
         isUnauth,
         s3Conf,
-        emailConf,
         language
       } = job.data
 
       const isEnableToSendEmail = (
         typeof email === 'string' &&
-        await hasGrcService.hasS3AndSendgrid()
+        await hasGrcService.hasS3AndMailServices()
       )
 
       const newFilePaths = []
@@ -55,9 +54,7 @@ module.exports = (
         )
 
         await sendMail(
-          emailConf,
           email,
-          'email.pug',
           s3Data.map((item, i) => ({
             ...item,
             isUnauth,

workers/loc.api/queue/processor.js

@@ -88,7 +88,6 @@ module.exports = (
   processorQueue.on('completed', (result) => {
     aggregatorQueue.addJob({
       ...result,
-      emailConf: conf.emailConf,
       s3Conf: conf.s3Conf
     })
   })