Added redis in request to get transactions

BasileusErwin · May 4, 2023 · 849369d · 849369d
1 parent 51d6da3
commit 849369d
Show file tree

Hide file tree

Showing 15 changed files with 30 additions and 27 deletions.
diff --git a/package.json b/package.json
@@ -9,7 +9,7 @@
     "start": "NODE_PATH=dist/src/ node dist/src/server.js",
     "test": "env $(cat .env.test | grep -v '#' | xargs) ENV=test jest --verbose --colors --coverage --detectOpenHandles --forceExit --runInBand", 
     "lint": "yarn rome check {src/,test/}/**/*.ts",
-    "format": "yarn rome format --write --config-path=. {src/,test/}/**/*.ts"
+    "format": "yarn rome format --write --config-path=. {src/,test/}**/*.ts"
   },
   "devDependencies": {
     "@types/bcrypt": "^5.0.0",

diff --git a/src/app.ts b/src/app.ts
@@ -64,16 +64,18 @@ export class App {
     this.server.use(helmet());
     this.server.use(cors());
 
-    this.server.use(session({
-      store: redisStore,
-      resave: false,
-      saveUninitialized: true,
-      secret: config.sessionSecret,
-      name: 'sessionID',
-      cookie: {
-        maxAge: redisKeyLifetime,
-      }
-    }))
+    this.server.use(
+      session({
+        store: redisStore,
+        resave: false,
+        saveUninitialized: true,
+        secret: config.sessionSecret,
+        name: 'sessionID',
+        cookie: {
+          maxAge: redisKeyLifetime,
+        },
+      }),
+    );
   }
 
   private configureRoutes() {

diff --git a/src/redis.ts b/src/redis.ts
@@ -11,11 +11,11 @@ client.connect();
 
 client.on('error', (err) => logger.error({ err }, 'Redis Client Error'));
 
-export const redisKeyLifetime: number = 30 * 24 * 60 * 60 * 1000 // 30 days
+export const redisKeyLifetime: number = 30 * 24 * 60 * 60 * 1000; // 30 days
 
 export const redisStore = new RedisStore({
   client: client,
   prefix: 'session:',
-})
+});
 
 export const redisClient: RedisClientType = client;
diff --git a/src/server.ts b/src/server.ts
@@ -30,4 +30,3 @@ const handleDisconnect = () => {
 };
 
 handleDisconnect();
-
diff --git a/src/services/auth.service.ts b/src/services/auth.service.ts
@@ -18,10 +18,12 @@ async function login(email: string, password: string, sessionId: string): Promis
     throw new CustomError(ApiError.Auth.BAD_AUTH);
   }
 
-  await redisClient.set(sessionId, user.userId, {
+  await redisClient.set(`user:${sessionId}`, user.userId, {
     EX: redisKeyLifetime,
   });
 
+  await redisClient.del(sessionId);
+
   return user;
 }
 

diff --git a/src/services/middleware.service.ts b/src/services/middleware.service.ts
@@ -20,7 +20,7 @@ async function authorization(req: Request, res: Response, next: NextFunction) {
     return next();
   }
 
-  const userId = await redisClient.get(sessionId);
+  const userId = await redisClient.get(`user:${sessionId}`);
 
   if (!userId) {
     return next();

diff --git a/src/types/DTOs/financial_goal/model.ts b/src/types/DTOs/financial_goal/model.ts
@@ -1,5 +1,5 @@
 import { Exclude, Expose, Type } from 'class-transformer';
-import { CurrencyEnum, MonthEnum, FinancialGoalsType} from '../../../enums';
+import { CurrencyEnum, MonthEnum, FinancialGoalsType } from '../../../enums';
 import { TransactionDTO, UserDTO } from '..';
 
 @Exclude()

diff --git a/src/types/request/financial_goal/update.ts b/src/types/request/financial_goal/update.ts
@@ -1,4 +1,4 @@
-import { CurrencyEnum, FinancialGoalsType, MonthEnum } from "../../../enums/index";
+import { CurrencyEnum, FinancialGoalsType, MonthEnum } from '../../../enums/index';
 
 export interface UpdateOptions {
   type?: FinancialGoalsType;

diff --git a/test/integration/cateogry.test.ts b/test/integration/cateogry.test.ts
@@ -19,7 +19,7 @@ describe('/api/cateogries', () => {
     await databaseHelper.destoryDatabase();
     await userHelper.createUserFromCSV();
 
-    await redisClient.set(userHelper.sessionIdMock, userHelper.userIdMock);
+    await redisClient.set(`user:${userHelper.sessionIdMock}`, userHelper.userIdMock);
   });
 
   describe('Create category', () => {

diff --git a/test/integration/financail_goal.test.ts b/test/integration/financail_goal.test.ts
@@ -19,7 +19,7 @@ describe('/api/financial_goals', () => {
     await databaseHelper.destoryDatabase();
     await userHelper.createUserFromCSV();
 
-  await redisClient.set(userHelper.sessionIdMock, userHelper.userIdMock);
+    await redisClient.set(`user:${userHelper.sessionIdMock}`, userHelper.userIdMock);
   });
 
   describe('Create financial goal', () => {

diff --git a/test/integration/transaction.test.ts b/test/integration/transaction.test.ts
@@ -20,7 +20,7 @@ describe('/api/transactions', () => {
     await userHelper.createUserFromCSV();
     await categoryHelper.createUserFromCSV(userHelper.userIdMock);
 
-    await redisClient.set(userHelper.sessionIdMock, userHelper.userIdMock);
+    await redisClient.set(`user:${userHelper.sessionIdMock}`, userHelper.userIdMock);
   });
 
   describe('Create Transaction type Expenses', () => {

diff --git a/test/integration/transactions/simple/transaction_expenses.test.ts b/test/integration/transactions/simple/transaction_expenses.test.ts
@@ -20,7 +20,7 @@ describe('/api/transactions Simple Expenses', () => {
     await userHelper.createUserFromCSV();
     await categoryHelper.createUserFromCSV(userHelper.userIdMock);
 
-    await redisClient.set(userHelper.sessionIdMock, userHelper.userIdMock);
+    await redisClient.set(`user:${userHelper.sessionIdMock}`, userHelper.userIdMock);
   });
 
   describe('Create Transaction type Expenses', () => {

diff --git a/test/integration/transactions/simple/transaction_incomes.test.ts b/test/integration/transactions/simple/transaction_incomes.test.ts
@@ -20,7 +20,7 @@ describe('/api/transactions Simple Income', () => {
     await userHelper.createUserFromCSV();
     await categoryHelper.createUserFromCSV(userHelper.userIdMock);
 
-    await redisClient.set(userHelper.sessionIdMock, userHelper.userIdMock);
+    await redisClient.set(`user:${userHelper.sessionIdMock}`, userHelper.userIdMock);
   });
 
   describe('Create transaction type Income ', () => {

diff --git a/test/integration/transactions/simple/transaction_installments.test.ts b/test/integration/transactions/simple/transaction_installments.test.ts
@@ -20,7 +20,7 @@ describe('/api/transactions Simple INSTALLMENTS', () => {
     await userHelper.createUserFromCSV();
     await categoryHelper.createUserFromCSV(userHelper.userIdMock);
 
-    await redisClient.set(userHelper.sessionIdMock, userHelper.userIdMock);
+    await redisClient.set(`user:${userHelper.sessionIdMock}`, userHelper.userIdMock);
   });
 
   describe('Create transaction type INSTALLMENTS ', () => {

diff --git a/test/integration/transactions/simple/transaction_saving.test.ts b/test/integration/transactions/simple/transaction_saving.test.ts
@@ -1,10 +1,10 @@
+import 'jest';
+import supertest from 'supertest';
 import { App } from '../../../../src/app';
 import { ApiError, CurrencyEnum, TransactionType } from '../../../../src/enums';
 import { transactionFactory } from '../../../factories';
 import { CategoryHelper, TransactionHelper, UserHelper, databaseHelper } from '../../../helpers';
 import { StatusCodes } from 'http-status-codes';
-import 'jest';
-import supertest from 'supertest';
 import { redisClient } from '../../../../src/redis';
 
 describe('/api/transactions Simple Saving', () => {
@@ -20,7 +20,7 @@ describe('/api/transactions Simple Saving', () => {
     await userHelper.createUserFromCSV();
     await categoryHelper.createUserFromCSV(userHelper.userIdMock);
 
-    await redisClient.set(userHelper.sessionIdMock, userHelper.userIdMock);
+    await redisClient.set(`user:${userHelper.sessionIdMock}`, userHelper.userIdMock);
   });
 
   describe('Create transaction type Saving ', () => {