From cb6f4b3fd78f42565090477a355a7ddef0ad9048 Mon Sep 17 00:00:00 2001 From: fisayo-dev Date: Fri, 21 Mar 2025 23:39:45 +0100 Subject: [PATCH 1/8] chore: create export file middlewares --- middlewares/index.js | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 middlewares/index.js diff --git a/middlewares/index.js b/middlewares/index.js new file mode 100644 index 0000000..b26dea1 --- /dev/null +++ b/middlewares/index.js @@ -0,0 +1,6 @@ +import arcjetMiddleware from './arcjetMiddleware'; +import authMiddleware from './authMiddleware'; +import errorMiddleware from './errorMiddleware'; + +export { arcjetMiddleware, authMiddleware, errorMiddleware }; + From 02bb6f9cf3fdb2783dac83bafc8f482bd751e8f7 Mon Sep 17 00:00:00 2001 From: fisayo-dev Date: Fri, 21 Mar 2025 23:42:08 +0100 Subject: [PATCH 2/8] chore: import middlewares in app.js --- app.js | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/app.js b/app.js index e440538..7ed2d32 100644 --- a/app.js +++ b/app.js @@ -3,12 +3,14 @@ import cookieParser from 'cookie-parser'; import { PORT } from './config/env.js'; +// Routes import userRouter from './routes/user.routes.js'; import authRouter from './routes/auth.routes.js'; import subscriptionRouter from './routes/subscription.routes.js'; +// Database import connectToDatabase from './database/mongodb.js' -import errorMiddleware from './middlewares/error.middleware.js' -import arcjetMiddleware from './middlewares/arcjet.middleware.js' +// Middleware +import { errorMiddleware, arcjetMiddleware } from './middlewares/index.js' import workflowRouter from './routes/workflow.routes.js' const app = express(); From 54cd6b3fc72496644a6af79af1263d1962e57448 Mon Sep 17 00:00:00 2001 From: fisayo-dev Date: Fri, 21 Mar 2025 23:44:25 +0100 Subject: [PATCH 3/8] fix: optimize imports for subscription, user routes --- middlewares/index.js | 4 ++-- routes/subscription.routes.js | 2 +- routes/user.routes.js | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/middlewares/index.js b/middlewares/index.js index b26dea1..51bbda1 100644 --- a/middlewares/index.js +++ b/middlewares/index.js @@ -1,6 +1,6 @@ import arcjetMiddleware from './arcjetMiddleware'; -import authMiddleware from './authMiddleware'; +import authorize from './authMiddleware'; import errorMiddleware from './errorMiddleware'; -export { arcjetMiddleware, authMiddleware, errorMiddleware }; +export { arcjetMiddleware, authorize, errorMiddleware }; diff --git a/routes/subscription.routes.js b/routes/subscription.routes.js index bba6be3..d05cca7 100644 --- a/routes/subscription.routes.js +++ b/routes/subscription.routes.js @@ -1,5 +1,5 @@ import { Router } from 'express'; -import authorize from '../middlewares/auth.middleware.js' +import { authorize } from '../middlewares/index.js' import { createSubscription, getUserSubscriptions, diff --git a/routes/user.routes.js b/routes/user.routes.js index 8719613..bd6f6f9 100644 --- a/routes/user.routes.js +++ b/routes/user.routes.js @@ -1,6 +1,6 @@ import { Router } from 'express'; -import authorize from '../middlewares/auth.middleware.js' +import { authorize } from '../middlewares/index.js' import { getUser, getUsers } from '../controllers/user.controller.js' const userRouter = Router(); From ef3b11ae3a7c56c7a5df69bdf485ea251523956a Mon Sep 17 00:00:00 2001 From: fisayo-dev Date: Fri, 21 Mar 2025 23:47:15 +0100 Subject: [PATCH 4/8] feat: export file for routes --- middlewares/index.js | 6 +++--- routes/index.js | 6 ++++++ 2 files changed, 9 insertions(+), 3 deletions(-) create mode 100644 routes/index.js diff --git a/middlewares/index.js b/middlewares/index.js index 51bbda1..2a6600b 100644 --- a/middlewares/index.js +++ b/middlewares/index.js @@ -1,6 +1,6 @@ -import arcjetMiddleware from './arcjetMiddleware'; -import authorize from './authMiddleware'; -import errorMiddleware from './errorMiddleware'; +import arcjetMiddleware from './arcjet.middleware.js'; +import authorize from './auth.middleware.js'; +import errorMiddleware from './error.middleware.js'; export { arcjetMiddleware, authorize, errorMiddleware }; diff --git a/routes/index.js b/routes/index.js new file mode 100644 index 0000000..0915ba9 --- /dev/null +++ b/routes/index.js @@ -0,0 +1,6 @@ +import authRoutes from "./auth.routes.js"; +import userRoutes from "./user.routes.js"; +import subscriptionRoutes from "./subscription.routes.js"; +import workflowRoutes from "./workflow.routes.js"; + +export {workflowRoutes, subscriptionRoutes, userRoutes, authRoutes}; \ No newline at end of file From 07261285f1ae6d4df24a541203c62911e6d27d1e Mon Sep 17 00:00:00 2001 From: fisayo-dev Date: Fri, 21 Mar 2025 23:50:44 +0100 Subject: [PATCH 5/8] feat: optimize imports for routes in app.js --- app.js | 7 +++---- routes/index.js | 10 +++++----- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/app.js b/app.js index 7ed2d32..185e69c 100644 --- a/app.js +++ b/app.js @@ -4,14 +4,13 @@ import cookieParser from 'cookie-parser'; import { PORT } from './config/env.js'; // Routes -import userRouter from './routes/user.routes.js'; -import authRouter from './routes/auth.routes.js'; -import subscriptionRouter from './routes/subscription.routes.js'; +import { + userRouter, authRouter, subscriptionRouter, workflowRouter +} from './routes/index.js' // Database import connectToDatabase from './database/mongodb.js' // Middleware import { errorMiddleware, arcjetMiddleware } from './middlewares/index.js' -import workflowRouter from './routes/workflow.routes.js' const app = express(); diff --git a/routes/index.js b/routes/index.js index 0915ba9..a4dab84 100644 --- a/routes/index.js +++ b/routes/index.js @@ -1,6 +1,6 @@ -import authRoutes from "./auth.routes.js"; -import userRoutes from "./user.routes.js"; -import subscriptionRoutes from "./subscription.routes.js"; -import workflowRoutes from "./workflow.routes.js"; +import authRouter from "./auth.routes.js"; +import userRouter from "./user.routes.js"; +import subscriptionRouter from "./subscription.routes.js"; +import workflowRouter from "./workflow.routes.js"; -export {workflowRoutes, subscriptionRoutes, userRoutes, authRoutes}; \ No newline at end of file +export { workflowRouter, subscriptionRouter, userRouter, authRouter }; \ No newline at end of file From a781fd62bbfec7d992d801fae416bed209143ee9 Mon Sep 17 00:00:00 2001 From: fisayo-dev Date: Fri, 21 Mar 2025 23:52:06 +0100 Subject: [PATCH 6/8] chore: remove spacing --- routes/index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/routes/index.js b/routes/index.js index a4dab84..f383f12 100644 --- a/routes/index.js +++ b/routes/index.js @@ -3,4 +3,4 @@ import userRouter from "./user.routes.js"; import subscriptionRouter from "./subscription.routes.js"; import workflowRouter from "./workflow.routes.js"; -export { workflowRouter, subscriptionRouter, userRouter, authRouter }; \ No newline at end of file +export { workflowRouter, subscriptionRouter, userRouter, authRouter }; \ No newline at end of file From f06d6b6621f530f8ada315c1e7a1feae317e219d Mon Sep 17 00:00:00 2001 From: fisayo-dev Date: Fri, 21 Mar 2025 23:53:52 +0100 Subject: [PATCH 7/8] feat: export file for models --- models/index.js | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 models/index.js diff --git a/models/index.js b/models/index.js new file mode 100644 index 0000000..46e537f --- /dev/null +++ b/models/index.js @@ -0,0 +1,4 @@ +import User from "./user.model.js"; +import Subscription from "./subscription.model.js"; + +export { User, Subscription }; \ No newline at end of file From 93dae6c9dde35d55971a4265589966cd11570aaa Mon Sep 17 00:00:00 2001 From: fisayo-dev Date: Fri, 21 Mar 2025 23:57:47 +0100 Subject: [PATCH 8/8] chore: optimzie import for models --- controllers/auth.controller.js | 2 +- controllers/subscription.controller.js | 2 +- controllers/user.controller.js | 2 +- controllers/workflow.controller.js | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/controllers/auth.controller.js b/controllers/auth.controller.js index 84b1102..137f6c6 100644 --- a/controllers/auth.controller.js +++ b/controllers/auth.controller.js @@ -2,7 +2,7 @@ import mongoose from 'mongoose'; import bcrypt from 'bcryptjs'; import jwt from 'jsonwebtoken'; -import User from '../models/user.model.js'; +import { User } from '../models/index.js'; import { JWT_SECRET, JWT_EXPIRES_IN } from '../config/env.js' export const signUp = async (req, res, next) => { diff --git a/controllers/subscription.controller.js b/controllers/subscription.controller.js index 7dd528f..3dd571b 100644 --- a/controllers/subscription.controller.js +++ b/controllers/subscription.controller.js @@ -1,4 +1,4 @@ -import Subscription from '../models/subscription.model.js' +import { Subscription } from '../models/index.js'; import { workflowClient } from '../config/upstash.js' import { SERVER_URL } from '../config/env.js' diff --git a/controllers/user.controller.js b/controllers/user.controller.js index 2cfceab..aede3d3 100644 --- a/controllers/user.controller.js +++ b/controllers/user.controller.js @@ -1,4 +1,4 @@ -import User from '../models/user.model.js' +import { User } from '../models/index.js'; export const getUsers = async (req, res, next) => { try { diff --git a/controllers/workflow.controller.js b/controllers/workflow.controller.js index a70b5dc..fd2be87 100644 --- a/controllers/workflow.controller.js +++ b/controllers/workflow.controller.js @@ -2,7 +2,7 @@ import dayjs from 'dayjs' import { createRequire } from 'module'; const require = createRequire(import.meta.url); const { serve } = require("@upstash/workflow/express"); -import Subscription from '../models/subscription.model.js'; +import { Subscription } from '../models/index.js'; import { sendReminderEmail } from '../utils/send-email.js' const REMINDERS = [7, 5, 2, 1]