From 300b9e296b9ce70dfc07b9c833a54b12b5a01ec5 Mon Sep 17 00:00:00 2001 From: C4 Patino Date: Thu, 18 Aug 2022 18:35:59 -0400 Subject: [PATCH] Removed console.logs and uncommented cron --- .../FormControllers/SendMailController.js | 7 ++---- client/src/services/api.js | 2 +- server/bin/www | 4 ++-- server/utils/api.js | 22 ++++++++----------- 4 files changed, 14 insertions(+), 21 deletions(-) diff --git a/client/src/controllers/FormControllers/SendMailController.js b/client/src/controllers/FormControllers/SendMailController.js index 54c076f..1c779d4 100644 --- a/client/src/controllers/FormControllers/SendMailController.js +++ b/client/src/controllers/FormControllers/SendMailController.js @@ -24,12 +24,9 @@ export default function SendMailController() { const sendMail = async (fields) => { const { error, status } = await postMail(fields); - console.log(error, status, 12313); if (error) { - if (status === 500) - return { receiver: 'Error' }; - else if (status === 404) - return { receiver: 'User not found' }; + if (status === 500) return { receiver: 'Error' }; + else if (status === 404) return { receiver: 'User not found' }; } else { window.location.reload(false); } diff --git a/client/src/services/api.js b/client/src/services/api.js index f6455d9..2406c66 100644 --- a/client/src/services/api.js +++ b/client/src/services/api.js @@ -4,7 +4,7 @@ import Throttle from 'superagent-throttle'; const throttle = new Throttle({ active: true, - rate: 2, + rate: 10, ratePer: 1000, concurrent: 2, }); diff --git a/server/bin/www b/server/bin/www index 1ba6662..88f0fe5 100644 --- a/server/bin/www +++ b/server/bin/www @@ -43,8 +43,8 @@ mongoose.connection.on( console.error.bind(console, '[ERROR]: MongoDB connection error - ') ); -// cron.schedule('*/30 * * * * *', refreshQuestions); -// cron.schedule('*/2 * * * *', refreshUsers); +cron.schedule('*/30 * * * * *', refreshQuestions); +cron.schedule('*/2 * * * *', refreshUsers); server.listen(port, console.log(`Listening on port: ${port}`)); server.on('error', onError); diff --git a/server/utils/api.js b/server/utils/api.js index c0c18ba..b876449 100644 --- a/server/utils/api.js +++ b/server/utils/api.js @@ -3,22 +3,20 @@ const superagent = require('superagent'); const Throttle = require('superagent-throttle'); const throttle = new Throttle({ active: true, - rate: 2, + rate: 5, ratePer: 1000, concurrent: 2, }); -const cleanObject = (data) => - Object.fromEntries( - Object.entries(data) - .filter(([, v]) => v) - ) +const cleanObject = (data) => Object.fromEntries(Object.entries(data).filter(([, v]) => v)); const stringifyQuery = (data = {}) => Object.fromEntries( - Object.entries(data) - .map(([k, v]) => [k, typeof (v) === 'object' ? JSON.stringify(cleanObject(v)) : v]) - ) + Object.entries(data).map(([k, v]) => [ + k, + typeof v === 'object' ? JSON.stringify(cleanObject(v)) : v, + ]) + ); const createRequest = async (op, endpoint, data) => { let request = superagent[op](`${process.env.API_URL}${endpoint}`) @@ -26,10 +24,8 @@ const createRequest = async (op, endpoint, data) => { .set('Authorization', `bearer ${process.env.API_KEY}`); if (data) - if (op === 'get' || op === 'delete') - request = request.query(stringifyQuery(data)); - else if (op === 'post' || op === 'patch') - request = request.send(data); + if (op === 'get' || op === 'delete') request = request.query(stringifyQuery(data)); + else if (op === 'post' || op === 'patch') request = request.send(data); return request .then((res) => {