moved report email to core-mail

README.md

@@ -14,13 +14,8 @@ npm install
 
 ### Configure service
 
-- As to configure the service copy the json.example files from config folder into new ones. Open a console on projects folder a copy the following codes :
-
-```console
-cp config/common.json.example config/common.json
-cp config/service.report.json.example config/service.report.json
-cp config/schedule.json.example config/schedule.json
-cp config/facs/grc.config.json.example config/facs/grc.config.json
+```bash
+bash setup-config.sh
 ```
 
 - To set grenache client for express, edit common.json. If running locally, leave actual values skipping this step.

config/facs/redis.config.json.example

@@ -0,0 +1,7 @@
+{
+  "sk0": {
+    "host": "127.0.0.1",
+    "port": 6379,
+    "auth": ""
+  }
+}

config/service.report.json.example

@@ -16,5 +16,6 @@
   "isAddedUniqueEndingToReportFileName": false,
   "isCompress": true,
   "isLoggerDisabled": false,
-  "isHosted": true
+  "isHosted": true,
+  "mailQueue": "core.mail"
 }

package.json

@@ -19,7 +19,8 @@
     "bfx-facs-grc-slack": "git+https://github.com/bitfinexcom/bfx-facs-grc-slack.git",
     "bfx-facs-interval": "git+https://github.com/bitfinexcom/bfx-facs-interval.git",
     "bfx-facs-lokue": "git+https://github.com:bitfinexcom/bfx-facs-lokue.git",
-    "bfx-svc-boot-js": "https://github.com/bitfinexcom/bfx-svc-boot-js.git",
+    "bfx-facs-redis": "git+https://github.com/bitfinexcom/bfx-facs-redis.git",
+    "bfx-svc-boot-js": "git+https://github.com/bitfinexcom/bfx-svc-boot-js.git",
     "bfx-wrk-api": "git+https://github.com/bitfinexcom/bfx-wrk-api.git",
     "bitfinex-api-node": "7.0.0",
     "colors": "1.4.0",
@@ -70,8 +71,7 @@
       ".idea/",
       ".vscode/",
       "csv/",
-      "workers/loc.api/queue/temp/",
-      "workers/loc.api/queue/views/"
+      "workers/loc.api/queue/temp/"
     ]
   },
   "betterScripts": {

setup-config.sh

@@ -0,0 +1,25 @@
+#!/bin/bash
+set -e
+
+include_test=false
+while [ $# -ne 0 ]; do
+  arg="$1"
+  case "$arg" in
+    -t | --test ) include_test=true; break ;;
+  esac
+  shift
+done
+
+for file in $(find config -type f -name "*.example"); do
+  new_name=$(echo "$file" | sed -E -e 's/.example//')
+  echo "$file -> $new_name"
+  cp "$file" "$new_name"
+
+  if [ "$include_test" = true ]; then
+    dir_name=$(dirname $new_name)
+    base_name=$(basename $new_name)
+    test_name="$dir_name/test.$base_name"
+    echo "$file -> $test_name"
+    cp "$file" "$test_name"
+  fi
+done

workers/api.service.report.wrk.js

@@ -180,7 +180,8 @@ class WrkReportServiceApi extends WrkApi {
         's0',
         's0',
         {}
-      ]
+      ],
+      ['fac', 'bfx-facs-redis', 'sk0', 'sk0', {}]
     ]
 
     this.setInitFacs(facs)
@@ -205,6 +206,8 @@ class WrkReportServiceApi extends WrkApi {
       link: this.grc_bfx.link,
       deflateFac: this.deflate_gzip,
       grcSlackFac,
+      redisSk0: this.redis_sk0,
+      conf: this.conf.report,
       i18next,
       ...deps
     })

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

@@ -41,12 +41,15 @@ module.exports = ({
   deflateFac,
   grcSlackFac,
   link,
+  redisSk0,
+  conf,
   i18next
 }) => {
   return new ContainerModule((bind) => {
     bind(TYPES.RService).toConstantValue(rService)
     bind(TYPES.RootPath).toConstantValue(rService.ctx.rootPath)
     bind(TYPES.I18next).toConstantValue(i18next)
+    bind(TYPES.RedisSk0).toConstantValue(redisSk0)
     bind(TYPES.RServiceDepsSchema).toConstantValue([
       ['_responder', TYPES.Responder],
       ['_getREST', TYPES.GetREST],
@@ -173,8 +176,8 @@ module.exports = ({
       bindDepsToFn(
         sendMail,
         [
-          TYPES.GrcBfxReq,
-          TYPES.I18next
+          TYPES.CONF,
+          TYPES.RedisSk0
         ]
       )
     )

workers/loc.api/di/types.js

@@ -38,5 +38,6 @@ module.exports = {
   WeightedAveragesReport: Symbol.for('WeightedAveragesReport'),
   WeightedAveragesReportCsvWriter: Symbol.for('WeightedAveragesReportCsvWriter'),
   BfxApiRouter: Symbol.for('BfxApiRouter'),
-  PdfWriter: Symbol.for('PdfWriter')
+  PdfWriter: Symbol.for('PdfWriter'),
+  RedisSk0: Symbol.for('RedisSk0')
 }

workers/loc.api/queue/aggregator.js

@@ -57,7 +57,6 @@ module.exports = (
         await sendMail(
           emailConf,
           email,
-          'email.pug',
           s3Data.map((item, i) => ({
             ...item,
             isUnauth,