From 9e61b7c6aceea415e717262bafff4ab0d106f2ad Mon Sep 17 00:00:00 2001 From: Zaven Arra Date: Wed, 20 Oct 2021 10:52:54 -0700 Subject: [PATCH] fix: lint:fix applied --- .../20211018163322-createContract.js | 23 ++++++++++--------- .../20211018163418-createEarning.js | 23 ++++++++++--------- .../migrations/20211018163620-alterCapture.js | 23 ++++++++++--------- server/handlers/earningsHandler.js | 2 +- server/models/Earnings.js | 6 ++--- server/services/aws.js | 2 +- server/services/s3.js | 1 + 7 files changed, 42 insertions(+), 38 deletions(-) diff --git a/database/migrations/20211018163322-createContract.js b/database/migrations/20211018163322-createContract.js index 9850246..53d7dba 100644 --- a/database/migrations/20211018163322-createContract.js +++ b/database/migrations/20211018163322-createContract.js @@ -1,11 +1,12 @@ -'use strict'; -var dbm; -var type; -var seed; -var fs = require('fs'); -var path = require('path'); -var Promise; + +let dbm; +let type; +let seed; +const fs = require('fs'); +const path = require('path'); + +let Promise; /** * We receive the dbmigrate dependency from dbmigrate initially. @@ -19,11 +20,11 @@ exports.setup = function(options, seedLink) { }; exports.up = function(db) { - var filePath = path.join(__dirname, 'sqls', '20211018163322-createContract-up.sql'); + const filePath = path.join(__dirname, 'sqls', '20211018163322-createContract-up.sql'); return new Promise( function( resolve, reject ) { fs.readFile(filePath, {encoding: 'utf-8'}, function(err,data){ if (err) return reject(err); - console.log('received data: ' + data); + console.log(`received data: ${ data}`); resolve(data); }); @@ -34,11 +35,11 @@ exports.up = function(db) { }; exports.down = function(db) { - var filePath = path.join(__dirname, 'sqls', '20211018163322-createContract-down.sql'); + const filePath = path.join(__dirname, 'sqls', '20211018163322-createContract-down.sql'); return new Promise( function( resolve, reject ) { fs.readFile(filePath, {encoding: 'utf-8'}, function(err,data){ if (err) return reject(err); - console.log('received data: ' + data); + console.log(`received data: ${ data}`); resolve(data); }); diff --git a/database/migrations/20211018163418-createEarning.js b/database/migrations/20211018163418-createEarning.js index 3d93d5c..809011a 100644 --- a/database/migrations/20211018163418-createEarning.js +++ b/database/migrations/20211018163418-createEarning.js @@ -1,11 +1,12 @@ -'use strict'; -var dbm; -var type; -var seed; -var fs = require('fs'); -var path = require('path'); -var Promise; + +let dbm; +let type; +let seed; +const fs = require('fs'); +const path = require('path'); + +let Promise; /** * We receive the dbmigrate dependency from dbmigrate initially. @@ -19,11 +20,11 @@ exports.setup = function(options, seedLink) { }; exports.up = function(db) { - var filePath = path.join(__dirname, 'sqls', '20211018163418-createEarning-up.sql'); + const filePath = path.join(__dirname, 'sqls', '20211018163418-createEarning-up.sql'); return new Promise( function( resolve, reject ) { fs.readFile(filePath, {encoding: 'utf-8'}, function(err,data){ if (err) return reject(err); - console.log('received data: ' + data); + console.log(`received data: ${ data}`); resolve(data); }); @@ -34,11 +35,11 @@ exports.up = function(db) { }; exports.down = function(db) { - var filePath = path.join(__dirname, 'sqls', '20211018163418-createEarning-down.sql'); + const filePath = path.join(__dirname, 'sqls', '20211018163418-createEarning-down.sql'); return new Promise( function( resolve, reject ) { fs.readFile(filePath, {encoding: 'utf-8'}, function(err,data){ if (err) return reject(err); - console.log('received data: ' + data); + console.log(`received data: ${ data}`); resolve(data); }); diff --git a/database/migrations/20211018163620-alterCapture.js b/database/migrations/20211018163620-alterCapture.js index fe3bbf6..2138df1 100644 --- a/database/migrations/20211018163620-alterCapture.js +++ b/database/migrations/20211018163620-alterCapture.js @@ -1,11 +1,12 @@ -'use strict'; -var dbm; -var type; -var seed; -var fs = require('fs'); -var path = require('path'); -var Promise; + +let dbm; +let type; +let seed; +const fs = require('fs'); +const path = require('path'); + +let Promise; /** * We receive the dbmigrate dependency from dbmigrate initially. @@ -19,11 +20,11 @@ exports.setup = function(options, seedLink) { }; exports.up = function(db) { - var filePath = path.join(__dirname, 'sqls', '20211018163620-alterCapture-up.sql'); + const filePath = path.join(__dirname, 'sqls', '20211018163620-alterCapture-up.sql'); return new Promise( function( resolve, reject ) { fs.readFile(filePath, {encoding: 'utf-8'}, function(err,data){ if (err) return reject(err); - console.log('received data: ' + data); + console.log(`received data: ${ data}`); resolve(data); }); @@ -34,11 +35,11 @@ exports.up = function(db) { }; exports.down = function(db) { - var filePath = path.join(__dirname, 'sqls', '20211018163620-alterCapture-down.sql'); + const filePath = path.join(__dirname, 'sqls', '20211018163620-alterCapture-down.sql'); return new Promise( function( resolve, reject ) { fs.readFile(filePath, {encoding: 'utf-8'}, function(err,data){ if (err) return reject(err); - console.log('received data: ' + data); + console.log(`received data: ${ data}`); resolve(data); }); diff --git a/server/handlers/earningsHandler.js b/server/handlers/earningsHandler.js index fb8d531..612898a 100644 --- a/server/handlers/earningsHandler.js +++ b/server/handlers/earningsHandler.js @@ -134,7 +134,7 @@ const earningsBatchPatch = async (req, res, next) => { throw new HttpError(406, 'Only text/csv is supported'); const key = `treetracker_earnings/${uuid()}.csv`; - let batch_id = uuid(); + const batch_id = uuid(); const fileBuffer = await fs.readFile(req.file.path); await upload_csv(fileBuffer, key); const session = new Session(); diff --git a/server/models/Earnings.js b/server/models/Earnings.js index bfb3a48..322012d 100644 --- a/server/models/Earnings.js +++ b/server/models/Earnings.js @@ -20,7 +20,7 @@ const Earning = ({ batch_id, }) => { // make a call to the contract microservice and get the consolidation_rule - let consolidation_rule = 'mock value'; + const consolidation_rule = 'mock value'; return Object.freeze({ worker_id, funder_id, @@ -93,7 +93,7 @@ const getEarnings = filter = FilterCriteria({ ...filterCriteria, }); - let queryObject = { + const queryObject = { ...QueryOptions({ ...filterCriteria }), ...filterCriteria, }; @@ -103,7 +103,7 @@ const getEarnings = delete queryObject.offset; const query = Object.keys(queryObject) - .map((key) => key + '=' + queryObject[key]) + .map((key) => `${key }=${ queryObject[key]}`) .join('&'); const urlWithLimitAndOffset = `${url}?${query}&offset=`; diff --git a/server/services/aws.js b/server/services/aws.js index 48920b2..fbdc1cd 100644 --- a/server/services/aws.js +++ b/server/services/aws.js @@ -1,4 +1,4 @@ -const s3 = require('../services/s3'); +const s3 = require("./s3"); const upload_csv = async (csv, Key) => { const params = { diff --git a/server/services/s3.js b/server/services/s3.js index 4358a01..d0b9fb1 100644 --- a/server/services/s3.js +++ b/server/services/s3.js @@ -1,4 +1,5 @@ const AWS = require('aws-sdk'); + const s3 = new AWS.S3({ accessKeyId: process.env.ACCESS_KEY_ID, secretAccessKey: process.env.SECRET_ACCESS_KEY,