Merge branch 'main' of https://github.com/wednesday-solutions/parcel-node-mongo-express

Author: Rushabh Sancheti

.env.example

@@ -13,4 +13,7 @@ FRONTEND_CLIENT_ID=bcJD0I08jykjwYBcxBGy
 FRONTEND_GRANT_TYPE=http://auth0.com/oauth/grant-type/password-realm
 
 # AUTH0 api
-API_AUDIENCE = https://node-express-demo
+API_AUDIENCE = https://node-express-demo
+
+REDIS_PORT=6379
+REDIS_DOMAIN=localhost

.env.test

@@ -14,5 +14,8 @@ FRONTEND_GRANT_TYPE=http://auth0.com/oauth/grant-type/password-realm
 
 # AUTH0 api
 API_AUDIENCE =https://express-demo
+
 ENVIRONMENT_NAME=test
-NODE_ENV=test
+NODE_ENV=test
+REDIS_PORT=6379
+REDIS_DOMAIN=localhost

jest.setup.js

@@ -1,7 +1,11 @@
+require('dotenv').config({
+    path: `.env.test`
+});
 process.env.ENVIRONMENT_NAME = 'test';
 beforeEach(() => {
     process.env = { ...process.env, ENVIRONMENT_NAME: 'test' };
 });
+
 afterEach(() => {
     jest.clearAllMocks();
     jest.resetAllMocks();

server/api/index.js

@@ -12,7 +12,7 @@ import {
 import { mongoConnector } from 'middlewares/mongo';
 
 import { customApisMapper, REQUEST_TYPES } from 'api/customApisMapper';
-import customRoutes from './routes/custom';
+import customRoutes from '../routes';
 import { isTestEnv } from 'utils';
 
 /* istanbul ignore next */

server/api/tests/utils.test.js

@@ -75,7 +75,7 @@ describe('utils tests', () => {
                     throw error;
                 })
             };
-            expect(() => fetchItems(model)).rejects.toThrow(error);
+            expect(() => fetchItems(model, {})).rejects.toThrow(error);
         });
     });
 

server/daos/order.js

@@ -48,7 +48,6 @@ export const totalAmtForDate = async date => {
 
 export const earliestCreatedDate = async () => {
     try {
-        console.log('I GOT IT THIS FAR');
         const order = await Orders.findOne().sort({ createdAt: 1 }).limit(1);
 
         return order.createdAt.toISOString().split('T')[0];

server/daos/tests/order.test.js

@@ -54,7 +54,7 @@ describe('Order daos tests', () => {
                 await totalAmtForDate(date);
             }).rejects.toThrow(mockError);
         });
-        it('should return total amount as 0 for the day', async () => {
+        it('should return total amount as 0 for the day as no order is placed on that day', async () => {
             mockingoose(model).toReturn([], 'aggregate');
             const res = await totalAmtForDate(date);
             expect(res).toBe(0);
@@ -88,7 +88,7 @@ describe('Order daos tests', () => {
                 await totalByDateForCategory(date, category);
             }).rejects.toThrow(mockError);
         });
-        it('should return total amt as 0 for the day for a category', async () => {
+        it('should return total amt as 0 for the day for a category as no order is placed for that category on that day', async () => {
             mockingoose(model).toReturn([], 'aggregate');
             const res = await totalByDateForCategory(date, category);
             expect(res).toBe(0);
@@ -109,7 +109,7 @@ describe('Order daos tests', () => {
             }).rejects.toThrow(mockError);
         });
 
-        it('should return the total count of order as 0 for the day', async () => {
+        it('should return the total count of order as 0 for the day as no order is placed on that date', async () => {
             mockingoose(model).toReturn([], 'aggregate');
             const res = await countByDate(date);
             expect(res).toBe(0);
@@ -130,7 +130,7 @@ describe('Order daos tests', () => {
             }).rejects.toThrow(mockError);
         });
 
-        it('should return count for the day for a category as 0', async () => {
+        it('should return count for the day for a category as 0 as no order was placed for that category on that day', async () => {
             mockingoose(model).toReturn([], 'aggregate');
             const res = await countByDateForCategory(date, category);
             expect(res).toBe(0);

server/middlewares/Authenticate/index.js server/middlewares/authenticate/index.jsserver/middlewares/Authenticate/index.js renamed to server/middlewares/authenticate/index.js

@@ -4,7 +4,7 @@ import { roles, roleValidator } from 'api/roles';
 import { assignRoles, assignRoleValidator } from 'api/assignRoles';
 import { cronJob, cronJobValidator } from 'api/cronJob';
 import { createOrder, orderValidator } from 'api/orders';
-import checkJwt from 'middlewares/Authenticate';
+import checkJwt from 'middlewares/authenticate';
 import checkRole from 'middlewares/checkRole';
 import limiter from 'middlewares/rateLimiter';
 

server/api/routes/custom.js server/routes/index.jsserver/api/routes/custom.js renamed to server/routes/index.js

@@ -7284,7 +7284,7 @@ superagent@^5.1.1:
     readable-stream "^3.6.0"
     semver "^7.3.2"
 
-superagent@^7.0.2:
+superagent@^7.1.0:
   version "7.1.2"
   resolved "https://registry.yarnpkg.com/superagent/-/superagent-7.1.2.tgz#71393141edd086ccf2544a29a4a609e46b7911f3"
   integrity sha512-o9/fP6dww7a4xmEF5a484o2rG34UUGo8ztDlv7vbCWuqPhpndMi0f7eXxdlryk5U12Kzy46nh8eNpLAJ93Alsg==