From b1995ba799a721756323e404a73849093950265b Mon Sep 17 00:00:00 2001 From: Bernand Date: Sun, 21 Jan 2024 16:31:43 +0700 Subject: [PATCH] fix: Update Code --- .../repositories/mysql/refreshTokenRepository.js | 2 +- .../repositories/mysql/userRepository.js | 2 +- .../repositories/redis/cacheRepository.js | 2 +- authentication-service/routes/v1/authentication.js | 10 +++------- task-service/repositories/mysql/taskRepository.js | 2 +- task-service/repositories/redis/cacheRepository.js | 2 +- task-service/routes/v1/task.js | 6 ++---- todo-service/repositories/firebase/todoRepository.js | 2 +- todo-service/repositories/redis/cacheRepository.js | 2 +- todo-service/routes/v1/todo.js | 6 ++---- todo-service/utils/deleteCache.js | 3 +-- 11 files changed, 15 insertions(+), 24 deletions(-) diff --git a/authentication-service/repositories/mysql/refreshTokenRepository.js b/authentication-service/repositories/mysql/refreshTokenRepository.js index 8c0eb94..d5028fd 100644 --- a/authentication-service/repositories/mysql/refreshTokenRepository.js +++ b/authentication-service/repositories/mysql/refreshTokenRepository.js @@ -56,4 +56,4 @@ class RefreshTokenRepository { } } -module.exports = RefreshTokenRepository; \ No newline at end of file +module.exports = new RefreshTokenRepository(); \ No newline at end of file diff --git a/authentication-service/repositories/mysql/userRepository.js b/authentication-service/repositories/mysql/userRepository.js index fd08094..ca08015 100644 --- a/authentication-service/repositories/mysql/userRepository.js +++ b/authentication-service/repositories/mysql/userRepository.js @@ -71,4 +71,4 @@ class UserRepository { } } -module.exports = UserRepository; \ No newline at end of file +module.exports = new UserRepository(); \ No newline at end of file diff --git a/authentication-service/repositories/redis/cacheRepository.js b/authentication-service/repositories/redis/cacheRepository.js index 36250f0..95427a6 100644 --- a/authentication-service/repositories/redis/cacheRepository.js +++ b/authentication-service/repositories/redis/cacheRepository.js @@ -55,4 +55,4 @@ class CacheRepository { } } -module.exports = CacheRepository; \ No newline at end of file +module.exports = new CacheRepository(); \ No newline at end of file diff --git a/authentication-service/routes/v1/authentication.js b/authentication-service/routes/v1/authentication.js index 17ee8b5..c9a9871 100644 --- a/authentication-service/routes/v1/authentication.js +++ b/authentication-service/routes/v1/authentication.js @@ -2,19 +2,15 @@ const express = require('express'); require('express-async-errors'); const router = express.Router(); const httpStatus = require('http-status'); -const jwt = require('jsonwebtoken'); const rateLimit = require('../../utils/rateLimiter'); const tokenManager = require('../../utils/tokenManager'); // Repositories -const UserRepository = require('../../repositories/mysql/userRepository'); -const userRepository = new UserRepository(); +const userRepository = require('../../repositories/mysql/userRepository'); -const RefreshTokenRepository = require('../../repositories/mysql/refreshTokenRepository'); -const refreshTokenRepository = new RefreshTokenRepository(); +const refreshTokenRepository = require('../../repositories/mysql/refreshTokenRepository'); -const CacheRepository = require('../../repositories/redis/cacheRepository'); -const cacheRepository = new CacheRepository(); +// const cacheRepository = require('../../repositories/redis/cacheRepository'); // Validator const authenticationValidator = require('../../validators/authenticationValidator'); diff --git a/task-service/repositories/mysql/taskRepository.js b/task-service/repositories/mysql/taskRepository.js index e0400a0..75d04df 100644 --- a/task-service/repositories/mysql/taskRepository.js +++ b/task-service/repositories/mysql/taskRepository.js @@ -88,4 +88,4 @@ class TaskRepository { } } -module.exports = TaskRepository; \ No newline at end of file +module.exports = new TaskRepository(); \ No newline at end of file diff --git a/task-service/repositories/redis/cacheRepository.js b/task-service/repositories/redis/cacheRepository.js index 36250f0..95427a6 100644 --- a/task-service/repositories/redis/cacheRepository.js +++ b/task-service/repositories/redis/cacheRepository.js @@ -55,4 +55,4 @@ class CacheRepository { } } -module.exports = CacheRepository; \ No newline at end of file +module.exports = new CacheRepository(); \ No newline at end of file diff --git a/task-service/routes/v1/task.js b/task-service/routes/v1/task.js index a71d209..d68a88f 100644 --- a/task-service/routes/v1/task.js +++ b/task-service/routes/v1/task.js @@ -4,11 +4,9 @@ const router = express.Router(); const httpStatus = require('http-status'); // Repositories -const TaskRepository = require('../../repositories/mysql/taskRepository'); -const taskRepository = new TaskRepository(); +const taskRepository = require('../../repositories/mysql/taskRepository'); -const CacheRepository = require('../../repositories/redis/cacheRepository'); -const cacheRepository = new CacheRepository(); +const cacheRepository = require('../../repositories/redis/cacheRepository'); // const rabbitMq = require('../../repositories/messageBroker/rabbitmqRepository'); diff --git a/todo-service/repositories/firebase/todoRepository.js b/todo-service/repositories/firebase/todoRepository.js index b69757f..f83595e 100644 --- a/todo-service/repositories/firebase/todoRepository.js +++ b/todo-service/repositories/firebase/todoRepository.js @@ -228,4 +228,4 @@ class TodoRepository { } } -module.exports = TodoRepository ; \ No newline at end of file +module.exports = new TodoRepository(); \ No newline at end of file diff --git a/todo-service/repositories/redis/cacheRepository.js b/todo-service/repositories/redis/cacheRepository.js index 0f5dad4..6fe2718 100644 --- a/todo-service/repositories/redis/cacheRepository.js +++ b/todo-service/repositories/redis/cacheRepository.js @@ -67,4 +67,4 @@ class CacheRepository { } } -module.exports = CacheRepository; \ No newline at end of file +module.exports = new CacheRepository(); \ No newline at end of file diff --git a/todo-service/routes/v1/todo.js b/todo-service/routes/v1/todo.js index f11a316..dadff88 100644 --- a/todo-service/routes/v1/todo.js +++ b/todo-service/routes/v1/todo.js @@ -5,15 +5,13 @@ const httpStatus = require('http-status'); const deleteCache = require('../../utils/deleteCache'); // Repositories -const TodoRepository = require('../../repositories/firebase/todoRepository'); -const todoRepository = new TodoRepository(); +const todoRepository = require('../../repositories/firebase/todoRepository'); // Validator const todoValidator = require('../../validators/todoValidator'); // Cached -const CacheRepository = require('../../repositories/redis/cacheRepository'); -const cacheRepository = new CacheRepository(); +const cacheRepository = require('../../repositories/redis/cacheRepository'); router.get('/', async (req, res) => { const { next } = req.query; diff --git a/todo-service/utils/deleteCache.js b/todo-service/utils/deleteCache.js index 9245d44..702324f 100644 --- a/todo-service/utils/deleteCache.js +++ b/todo-service/utils/deleteCache.js @@ -1,5 +1,4 @@ -const CacheRepository = require('../repositories/redis/cacheRepository'); -const cacheRepository = new CacheRepository(); +const cacheRepository = require('../repositories/redis/cacheRepository'); bulkDelete = async (prefix) => { const keys = await cacheRepository.keys(prefix);