From da37ae67cafba562c5b1ffeadd98d8e70b6a6aa5 Mon Sep 17 00:00:00 2001 From: Yogeshwaran S Date: Tue, 26 May 2026 14:26:43 +0530 Subject: [PATCH 01/87] fix(backend): configure TypeScript ESM module system for Sequelize setup --- server/.sequelizerc | 11 +++ server/package.json | 2 +- server/prisma.config.ts | 14 --- server/prisma/schema.prisma | 13 --- server/src/database/config/config.json | 23 +++++ server/src/database/config/databse.ts | 16 +++ server/src/database/connection/database.ts | 18 ++++ server/src/database/index.ts | 3 + server/src/database/models/index.js | 43 ++++++++ server/src/database/testconnection.ts | 13 +++ server/tsconfig.json | 108 +++++++++++++-------- 11 files changed, 198 insertions(+), 66 deletions(-) create mode 100644 server/.sequelizerc delete mode 100644 server/prisma.config.ts delete mode 100644 server/prisma/schema.prisma create mode 100644 server/src/database/config/config.json create mode 100644 server/src/database/config/databse.ts create mode 100644 server/src/database/connection/database.ts create mode 100644 server/src/database/index.ts create mode 100644 server/src/database/models/index.js create mode 100644 server/src/database/testconnection.ts diff --git a/server/.sequelizerc b/server/.sequelizerc new file mode 100644 index 0000000..d5e355f --- /dev/null +++ b/server/.sequelizerc @@ -0,0 +1,11 @@ +const path = require("path"); + +module.exports = { + config: path.resolve("src/database/config", "database.ts"), + + "models-path": path.resolve("src/database/models"), + + "seeders-path": path.resolve("src/database/seeders"), + + "migrations-path": path.resolve("src/database/migrations"), +}; \ No newline at end of file diff --git a/server/package.json b/server/package.json index 9721646..6a3d9c3 100644 --- a/server/package.json +++ b/server/package.json @@ -10,7 +10,7 @@ "keywords": [], "author": "", "license": "ISC", - "type": "commonjs", + "type": "module", "dependencies": { "@prisma/client": "^7.8.0", "bcrypt": "^6.0.0", diff --git a/server/prisma.config.ts b/server/prisma.config.ts deleted file mode 100644 index 831a20f..0000000 --- a/server/prisma.config.ts +++ /dev/null @@ -1,14 +0,0 @@ -// This file was generated by Prisma, and assumes you have installed the following: -// npm install --save-dev prisma dotenv -import "dotenv/config"; -import { defineConfig } from "prisma/config"; - -export default defineConfig({ - schema: "prisma/schema.prisma", - migrations: { - path: "prisma/migrations", - }, - datasource: { - url: process.env["DATABASE_URL"], - }, -}); diff --git a/server/prisma/schema.prisma b/server/prisma/schema.prisma deleted file mode 100644 index 8bddec1..0000000 --- a/server/prisma/schema.prisma +++ /dev/null @@ -1,13 +0,0 @@ -// This is your Prisma schema file, -// learn more about it in the docs: https://pris.ly/d/prisma-schema - -// Get a free hosted Postgres database in seconds: `npx create-db` - -generator client { - provider = "prisma-client" - output = "../generated/prisma" -} - -datasource db { - provider = "postgresql" -} diff --git a/server/src/database/config/config.json b/server/src/database/config/config.json new file mode 100644 index 0000000..0f858c6 --- /dev/null +++ b/server/src/database/config/config.json @@ -0,0 +1,23 @@ +{ + "development": { + "username": "root", + "password": null, + "database": "database_development", + "host": "127.0.0.1", + "dialect": "mysql" + }, + "test": { + "username": "root", + "password": null, + "database": "database_test", + "host": "127.0.0.1", + "dialect": "mysql" + }, + "production": { + "username": "root", + "password": null, + "database": "database_production", + "host": "127.0.0.1", + "dialect": "mysql" + } +} diff --git a/server/src/database/config/databse.ts b/server/src/database/config/databse.ts new file mode 100644 index 0000000..f4971dd --- /dev/null +++ b/server/src/database/config/databse.ts @@ -0,0 +1,16 @@ +import dotenv from "dotenv"; + +dotenv.config(); + +const databaseConfig = { + development: { + username: process.env.DB_USER, + password: process.env.DB_PASSWORD, + database: process.env.DB_NAME, + host: process.env.DB_HOST, + dialect: "postgres", + port: Number(process.env.DB_PORT), + }, +}; + +export default databaseConfig; \ No newline at end of file diff --git a/server/src/database/connection/database.ts b/server/src/database/connection/database.ts new file mode 100644 index 0000000..b91a6d4 --- /dev/null +++ b/server/src/database/connection/database.ts @@ -0,0 +1,18 @@ +import { Sequelize } from "sequelize"; +import dotenv from "dotenv"; + +dotenv.config(); + +const sequelize = new Sequelize( + process.env.DB_NAME!, + process.env.DB_USER!, + process.env.DB_PASSWORD!, + { + host: process.env.DB_HOST!, + dialect: "postgres", + port: Number(process.env.DB_PORT!), + logging: false, + } +); + +export default sequelize; \ No newline at end of file diff --git a/server/src/database/index.ts b/server/src/database/index.ts new file mode 100644 index 0000000..5f6e648 --- /dev/null +++ b/server/src/database/index.ts @@ -0,0 +1,3 @@ +import sequelize from "./connection/database.js"; + +export { sequelize }; \ No newline at end of file diff --git a/server/src/database/models/index.js b/server/src/database/models/index.js new file mode 100644 index 0000000..024200e --- /dev/null +++ b/server/src/database/models/index.js @@ -0,0 +1,43 @@ +'use strict'; + +const fs = require('fs'); +const path = require('path'); +const Sequelize = require('sequelize'); +const process = require('process'); +const basename = path.basename(__filename); +const env = process.env.NODE_ENV || 'development'; +const config = require(__dirname + '/../config/config.json')[env]; +const db = {}; + +let sequelize; +if (config.use_env_variable) { + sequelize = new Sequelize(process.env[config.use_env_variable], config); +} else { + sequelize = new Sequelize(config.database, config.username, config.password, config); +} + +fs + .readdirSync(__dirname) + .filter(file => { + return ( + file.indexOf('.') !== 0 && + file !== basename && + file.slice(-3) === '.js' && + file.indexOf('.test.js') === -1 + ); + }) + .forEach(file => { + const model = require(path.join(__dirname, file))(sequelize, Sequelize.DataTypes); + db[model.name] = model; + }); + +Object.keys(db).forEach(modelName => { + if (db[modelName].associate) { + db[modelName].associate(db); + } +}); + +db.sequelize = sequelize; +db.Sequelize = Sequelize; + +module.exports = db; diff --git a/server/src/database/testconnection.ts b/server/src/database/testconnection.ts new file mode 100644 index 0000000..f6b8518 --- /dev/null +++ b/server/src/database/testconnection.ts @@ -0,0 +1,13 @@ +import sequelize from "./connection/database.js"; + +const testConnection = async () => { + try { + await sequelize.authenticate(); + + console.log("Database connected successfully"); + } catch (error) { + console.error("Database connection failed", error); + } +}; + +testConnection(); \ No newline at end of file diff --git a/server/tsconfig.json b/server/tsconfig.json index cec4a3a..f40c5a8 100644 --- a/server/tsconfig.json +++ b/server/tsconfig.json @@ -1,44 +1,76 @@ +// { +// // Visit https://aka.ms/tsconfig to read more about this file +// "compilerOptions": { +// // File Layout +// // "rootDir": "./src", +// // "outDir": "./dist", + +// // Environment Settings +// // See also https://aka.ms/tsconfig/module +// "module": "nodenext", +// "target": "esnext", +// "types": [], +// // For nodejs: +// // "lib": ["esnext"], +// // "types": ["node"], +// // and npm install -D @types/node + +// // Other Outputs +// "sourceMap": true, +// "declaration": true, +// "declarationMap": true, + +// // Stricter Typechecking Options +// "noUncheckedIndexedAccess": true, +// "exactOptionalPropertyTypes": true, + +// // Style Options +// // "noImplicitReturns": true, +// // "noImplicitOverride": true, +// // "noUnusedLocals": true, +// // "noUnusedParameters": true, +// // "noFallthroughCasesInSwitch": true, +// // "noPropertyAccessFromIndexSignature": true, + +// // Recommended Options +// "strict": true, +// "jsx": "react-jsx", +// "isolatedModules": true, +// "noUncheckedSideEffectImports": true, +// "moduleDetection": "force", +// "skipLibCheck": true, +// } +// } { - // Visit https://aka.ms/tsconfig to read more about this file "compilerOptions": { - // File Layout - // "rootDir": "./src", - // "outDir": "./dist", - - // Environment Settings - // See also https://aka.ms/tsconfig/module - "module": "nodenext", - "target": "esnext", - "types": [], - // For nodejs: - // "lib": ["esnext"], - // "types": ["node"], - // and npm install -D @types/node - - // Other Outputs - "sourceMap": true, - "declaration": true, - "declarationMap": true, - - // Stricter Typechecking Options - "noUncheckedIndexedAccess": true, - "exactOptionalPropertyTypes": true, + "target": "ES2022", - // Style Options - // "noImplicitReturns": true, - // "noImplicitOverride": true, - // "noUnusedLocals": true, - // "noUnusedParameters": true, - // "noFallthroughCasesInSwitch": true, - // "noPropertyAccessFromIndexSignature": true, + "module": "NodeNext", + + "moduleResolution": "NodeNext", + + "rootDir": "./src", + + "outDir": "./dist", - // Recommended Options "strict": true, - "jsx": "react-jsx", - "verbatimModuleSyntax": true, - "isolatedModules": true, - "noUncheckedSideEffectImports": true, - "moduleDetection": "force", + + "esModuleInterop": true, + "skipLibCheck": true, - } -} + + "forceConsistentCasingInFileNames": true, + + "resolveJsonModule": true, + + "isolatedModules": true, + + "noUncheckedIndexedAccess": true, + + "exactOptionalPropertyTypes": true + }, + + "include": ["src"], + + "exclude": ["node_modules", "dist"] +} \ No newline at end of file From 7a4eb1afacde1899ce83df1eeee3651a2dba9514 Mon Sep 17 00:00:00 2001 From: Yogeshwaran S Date: Tue, 26 May 2026 14:41:08 +0530 Subject: [PATCH 02/87] fix(backend): resolve Sequelize dependency and ESM runtime setup --- .github/workflows/ci.yml | 10 + server/package-lock.json | 687 +++++++++++++++++++++++++- server/package.json | 5 + server/src/database/testconnection.ts | 4 +- server/tsconfig.json | 55 +-- 5 files changed, 712 insertions(+), 49 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index e69de29..5352980 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -0,0 +1,10 @@ +name: Disabled CI + +on: + workflow_dispatch: # Allows manual triggering only, won't run on push + +jobs: + nothing: + runs-on: ubuntu-latest + steps: + - run: echo "Not active yet" \ No newline at end of file diff --git a/server/package-lock.json b/server/package-lock.json index 4ab01a3..d1633ba 100644 --- a/server/package-lock.json +++ b/server/package-lock.json @@ -23,7 +23,10 @@ "http-status-codes": "^2.3.0", "jsonwebtoken": "^9.0.3", "morgan": "^1.10.1", + "pg": "^8.21.0", + "pg-hstore": "^2.3.4", "prisma": "^7.8.0", + "sequelize": "^6.37.8", "swagger-jsdoc": "^6.2.8", "swagger-ui-express": "^5.0.1", "uuid": "^14.0.0", @@ -37,11 +40,13 @@ "@types/jest": "^30.0.0", "@types/jsonwebtoken": "^9.0.10", "@types/node": "^25.9.1", + "@types/sequelize": "^4.28.20", "@types/supertest": "^7.2.0", "eslint": "^10.4.0", "eslint-config-prettier": "^10.1.8", "jest": "^30.4.2", "prettier": "^3.8.3", + "sequelize-cli": "^6.6.5", "supertest": "^7.2.2", "ts-jest": "^29.4.10", "ts-node-dev": "^2.0.0", @@ -2072,6 +2077,13 @@ "url": "https://paulmillr.com/funding/" } }, + "node_modules/@one-ini/wasm": { + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/@one-ini/wasm/-/wasm-0.1.1.tgz", + "integrity": "sha512-XuySG1E38YScSJoMlqovLru4KTUNSjgVTIjyh7qMX6aNN5HY5Ct5LhRJdxO79JtTzKfzV/bnWpz+zquYrISsvw==", + "dev": true, + "license": "MIT" + }, "node_modules/@paralleldrive/cuid2": { "version": "2.3.1", "resolved": "https://registry.npmjs.org/@paralleldrive/cuid2/-/cuid2-2.3.1.tgz", @@ -2566,6 +2578,13 @@ "@types/node": "*" } }, + "node_modules/@types/bluebird": { + "version": "3.5.42", + "resolved": "https://registry.npmjs.org/@types/bluebird/-/bluebird-3.5.42.tgz", + "integrity": "sha512-Jhy+MWRlro6UjVi578V/4ZGNfeCOcNCp0YaFNIUGFKlImowqwb1O/22wDVk3FDGMLqxdpOV3qQHD5fPEH4hK6A==", + "dev": true, + "license": "MIT" + }, "node_modules/@types/body-parser": { "version": "1.19.6", "resolved": "https://registry.npmjs.org/@types/body-parser/-/body-parser-1.19.6.tgz", @@ -2587,6 +2606,16 @@ "@types/node": "*" } }, + "node_modules/@types/continuation-local-storage": { + "version": "3.2.7", + "resolved": "https://registry.npmjs.org/@types/continuation-local-storage/-/continuation-local-storage-3.2.7.tgz", + "integrity": "sha512-Q7dPOymVpRG5Zpz90/o26+OAqOG2Sw+FED7uQmTrJNCF/JAPTylclZofMxZKd6W7g1BDPmT9/C/jX0ZcSNTQwQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "@types/node": "*" + } + }, "node_modules/@types/cookiejar": { "version": "2.1.5", "resolved": "https://registry.npmjs.org/@types/cookiejar/-/cookiejar-2.1.5.tgz", @@ -2604,6 +2633,15 @@ "@types/node": "*" } }, + "node_modules/@types/debug": { + "version": "4.1.13", + "resolved": "https://registry.npmjs.org/@types/debug/-/debug-4.1.13.tgz", + "integrity": "sha512-KSVgmQmzMwPlmtljOomayoR89W4FynCAi3E8PPs7vmDVPe84hT+vGPKkJfThkmXs0x0jAaa9U8uW8bbfyS2fWw==", + "license": "MIT", + "dependencies": { + "@types/ms": "*" + } + }, "node_modules/@types/esrecurse": { "version": "4.3.1", "resolved": "https://registry.npmjs.org/@types/esrecurse/-/esrecurse-4.3.1.tgz", @@ -2705,6 +2743,13 @@ "@types/node": "*" } }, + "node_modules/@types/lodash": { + "version": "4.17.24", + "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.17.24.tgz", + "integrity": "sha512-gIW7lQLZbue7lRSWEFql49QJJWThrTFFeIMJdp3eH4tKoxm1OvEPg02rm4wCCSHS0cL3/Fizimb35b7k8atwsQ==", + "dev": true, + "license": "MIT" + }, "node_modules/@types/methods": { "version": "1.1.4", "resolved": "https://registry.npmjs.org/@types/methods/-/methods-1.1.4.tgz", @@ -2716,14 +2761,12 @@ "version": "2.1.0", "resolved": "https://registry.npmjs.org/@types/ms/-/ms-2.1.0.tgz", "integrity": "sha512-GsCCIZDE/p3i96vtEqx+7dBUGXrc7zeSK3wwPHIaRThS+9OhWIXRqzs4d6k1SVU8g91DrNRWxWUGhp5KXQb2VA==", - "dev": true, "license": "MIT" }, "node_modules/@types/node": { "version": "25.9.1", "resolved": "https://registry.npmjs.org/@types/node/-/node-25.9.1.tgz", "integrity": "sha512-xfrlY7UD5rMJk3ZVJP8BNzS28J36YJg+xp+LPXV1TdWxr8uMH5A860QNxYDGQe/ylDSgjxE52Q9VnO7p75tJxg==", - "dev": true, "license": "MIT", "dependencies": { "undici-types": ">=7.24.0 <7.24.7" @@ -2763,6 +2806,19 @@ "@types/node": "*" } }, + "node_modules/@types/sequelize": { + "version": "4.28.20", + "resolved": "https://registry.npmjs.org/@types/sequelize/-/sequelize-4.28.20.tgz", + "integrity": "sha512-XaGOKRhdizC87hDgQ0u3btxzbejlF+t6Hhvkek1HyphqCI4y7zVBIVAGmuc4cWJqGpxusZ1RiBToHHnNK/Edlw==", + "dev": true, + "license": "MIT", + "dependencies": { + "@types/bluebird": "*", + "@types/continuation-local-storage": "*", + "@types/lodash": "*", + "@types/validator": "*" + } + }, "node_modules/@types/serve-static": { "version": "2.2.0", "resolved": "https://registry.npmjs.org/@types/serve-static/-/serve-static-2.2.0.tgz", @@ -2825,6 +2881,12 @@ "integrity": "sha512-6WaYesThRMCl19iryMYP7/x2OVgCtbIVflDGFpWnb9irXI3UjYE4AzmYuiUKY1AJstGijoY+MgUszMgRxIYTYw==", "license": "MIT" }, + "node_modules/@types/validator": { + "version": "13.15.10", + "resolved": "https://registry.npmjs.org/@types/validator/-/validator-13.15.10.tgz", + "integrity": "sha512-T8L6i7wCuyoK8A/ZeLYt1+q0ty3Zb9+qbSSvrIVitzT3YjZqkTZ40IbRsPanlB4h1QB3JVL1SYCdR6ngtFYcuA==", + "license": "MIT" + }, "node_modules/@types/yargs": { "version": "17.0.35", "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.35.tgz", @@ -3192,6 +3254,16 @@ "win32" ] }, + "node_modules/abbrev": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-2.0.0.tgz", + "integrity": "sha512-6/mh1E2u2YgEsCHdY0Yx5oW+61gZU+1vXaoiHHrpKeuRNNgFvS+/jrwHiQhB5apAf5oB7UB7E19ol2R2LKH8hQ==", + "dev": true, + "license": "ISC", + "engines": { + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + } + }, "node_modules/accepts": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/accepts/-/accepts-2.0.0.tgz", @@ -3366,6 +3438,16 @@ "dev": true, "license": "MIT" }, + "node_modules/at-least-node": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/at-least-node/-/at-least-node-1.0.0.tgz", + "integrity": "sha512-+q/t7Ekv1EDY2l6Gda6LLiX14rU9TV20Wa3ofeQmwPFZbOMo9DXrLbOjFaaclkXKWidIaopwAObQDqwWtGUjqg==", + "dev": true, + "license": "ISC", + "engines": { + "node": ">= 4.0.0" + } + }, "node_modules/aws-ssl-profiles": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/aws-ssl-profiles/-/aws-ssl-profiles-1.1.2.tgz", @@ -3544,6 +3626,13 @@ "url": "https://github.com/sponsors/sindresorhus" } }, + "node_modules/bluebird": { + "version": "3.7.2", + "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.7.2.tgz", + "integrity": "sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==", + "dev": true, + "license": "MIT" + }, "node_modules/body-parser": { "version": "2.2.2", "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-2.2.2.tgz", @@ -4028,6 +4117,17 @@ "integrity": "sha512-ysOGlgTFbN2/Y6Cg3Iye8YKulHw+R2fNXHrgSmXISQdMnomY6eNDprVdW9R5xBguEqI954+S6709UyiO7B+6OQ==", "license": "MIT" }, + "node_modules/config-chain": { + "version": "1.1.13", + "resolved": "https://registry.npmjs.org/config-chain/-/config-chain-1.1.13.tgz", + "integrity": "sha512-qj+f8APARXHrM0hraqXYb2/bOVSV4PvJQlNZ/DVj0QrmNM2q2euizkeuVckQ57J+W0mRH6Hvi+k50M4Jul2VRQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "ini": "^1.3.4", + "proto-list": "~1.2.1" + } + }, "node_modules/content-disposition": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-1.1.0.tgz", @@ -4305,6 +4405,13 @@ "dotenv": ">= 8.2.0" } }, + "node_modules/dottie": { + "version": "2.0.7", + "resolved": "https://registry.npmjs.org/dottie/-/dottie-2.0.7.tgz", + "integrity": "sha512-7lAK2A0b3zZr3UC5aE69CPdCFR4RHW1o2Dr74TqFykxkUCBXSRJum/yPc7g8zRHJqWKomPLHwFLLoUnn8PXXRg==", + "deprecated": "Package no longer supported. Contact Support at https://www.npmjs.com/support for more info.", + "license": "MIT" + }, "node_modules/dunder-proto": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/dunder-proto/-/dunder-proto-1.0.1.tgz", @@ -4345,6 +4452,61 @@ "safe-buffer": "^5.0.1" } }, + "node_modules/editorconfig": { + "version": "1.0.7", + "resolved": "https://registry.npmjs.org/editorconfig/-/editorconfig-1.0.7.tgz", + "integrity": "sha512-e0GOtq/aTQhVdNyDU9e02+wz9oDDM+SIOQxWME2QRjzRX5yyLAuHDE+0aE8vHb9XRC8XD37eO2u57+F09JqFhw==", + "dev": true, + "license": "MIT", + "dependencies": { + "@one-ini/wasm": "0.1.1", + "commander": "^10.0.0", + "minimatch": "^9.0.1", + "semver": "^7.5.3" + }, + "bin": { + "editorconfig": "bin/editorconfig" + }, + "engines": { + "node": ">=14" + } + }, + "node_modules/editorconfig/node_modules/brace-expansion": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.1.1.tgz", + "integrity": "sha512-WR1cURNjuvBLMZBMbqM0UoE+WAfdUcEV1ccD8PVBVOI+Z3ND4+SZbN8RsfT2bMuG1qwz5RFvPukSZm5fF2D5eA==", + "dev": true, + "license": "MIT", + "dependencies": { + "balanced-match": "^1.0.0" + } + }, + "node_modules/editorconfig/node_modules/commander": { + "version": "10.0.1", + "resolved": "https://registry.npmjs.org/commander/-/commander-10.0.1.tgz", + "integrity": "sha512-y4Mg2tXshplEbSGzx7amzPwKKOCGuoSRP/CjEdwwk0FOGlUbq6lKuoyDZTNZkmxHdJtp54hdfY/JUrdL7Xfdug==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=14" + } + }, + "node_modules/editorconfig/node_modules/minimatch": { + "version": "9.0.9", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.9.tgz", + "integrity": "sha512-OBwBN9AL4dqmETlpS2zasx+vTeWclWzkblfZk7KTA5j3jeOONz/tRCnZomUyvNg83wL5Zv9Ss6HMJXAgL8R2Yg==", + "dev": true, + "license": "ISC", + "dependencies": { + "brace-expansion": "^2.0.2" + }, + "engines": { + "node": ">=16 || 14 >=14.17" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, "node_modules/ee-first": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz", @@ -5272,6 +5434,22 @@ "node": ">= 0.8" } }, + "node_modules/fs-extra": { + "version": "9.1.0", + "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-9.1.0.tgz", + "integrity": "sha512-hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "at-least-node": "^1.0.0", + "graceful-fs": "^4.2.0", + "jsonfile": "^6.0.1", + "universalify": "^2.0.0" + }, + "engines": { + "node": ">=10" + } + }, "node_modules/fs.realpath": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", @@ -5660,6 +5838,15 @@ "node": ">=0.8.19" } }, + "node_modules/inflection": { + "version": "1.13.4", + "resolved": "https://registry.npmjs.org/inflection/-/inflection-1.13.4.tgz", + "integrity": "sha512-6I/HUDeYFfuNCVS3td055BaXBwKYuzw7K3ExVMStBowKo9oOAMJIXIHvdyR3iboTCp1b+1i5DSkIZTcwIktuDw==", + "engines": [ + "node >= 0.4.0" + ], + "license": "MIT" + }, "node_modules/inflight": { "version": "1.0.6", "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", @@ -5677,6 +5864,13 @@ "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==", "license": "ISC" }, + "node_modules/ini": { + "version": "1.3.8", + "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.8.tgz", + "integrity": "sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==", + "dev": true, + "license": "ISC" + }, "node_modules/ip-address": { "version": "10.2.0", "resolved": "https://registry.npmjs.org/ip-address/-/ip-address-10.2.0.tgz", @@ -6687,6 +6881,86 @@ "jiti": "lib/jiti-cli.mjs" } }, + "node_modules/js-beautify": { + "version": "1.15.4", + "resolved": "https://registry.npmjs.org/js-beautify/-/js-beautify-1.15.4.tgz", + "integrity": "sha512-9/KXeZUKKJwqCXUdBxFJ3vPh467OCckSBmYDwSK/EtV090K+iMJ7zx2S3HLVDIWFQdqMIsZWbnaGiba18aWhaA==", + "dev": true, + "license": "MIT", + "dependencies": { + "config-chain": "^1.1.13", + "editorconfig": "^1.0.4", + "glob": "^10.4.2", + "js-cookie": "^3.0.5", + "nopt": "^7.2.1" + }, + "bin": { + "css-beautify": "js/bin/css-beautify.js", + "html-beautify": "js/bin/html-beautify.js", + "js-beautify": "js/bin/js-beautify.js" + }, + "engines": { + "node": ">=14" + } + }, + "node_modules/js-beautify/node_modules/brace-expansion": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.1.1.tgz", + "integrity": "sha512-WR1cURNjuvBLMZBMbqM0UoE+WAfdUcEV1ccD8PVBVOI+Z3ND4+SZbN8RsfT2bMuG1qwz5RFvPukSZm5fF2D5eA==", + "dev": true, + "license": "MIT", + "dependencies": { + "balanced-match": "^1.0.0" + } + }, + "node_modules/js-beautify/node_modules/glob": { + "version": "10.5.0", + "resolved": "https://registry.npmjs.org/glob/-/glob-10.5.0.tgz", + "integrity": "sha512-DfXN8DfhJ7NH3Oe7cFmu3NCu1wKbkReJ8TorzSAFbSKrlNaQSKfIzqYqVY8zlbs2NLBbWpRiU52GX2PbaBVNkg==", + "deprecated": "Old versions of glob are not supported, and contain widely publicized security vulnerabilities, which have been fixed in the current version. Please update. Support for old versions may be purchased (at exorbitant rates) by contacting i@izs.me", + "dev": true, + "license": "ISC", + "dependencies": { + "foreground-child": "^3.1.0", + "jackspeak": "^3.1.2", + "minimatch": "^9.0.4", + "minipass": "^7.1.2", + "package-json-from-dist": "^1.0.0", + "path-scurry": "^1.11.1" + }, + "bin": { + "glob": "dist/esm/bin.mjs" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/js-beautify/node_modules/minimatch": { + "version": "9.0.9", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.9.tgz", + "integrity": "sha512-OBwBN9AL4dqmETlpS2zasx+vTeWclWzkblfZk7KTA5j3jeOONz/tRCnZomUyvNg83wL5Zv9Ss6HMJXAgL8R2Yg==", + "dev": true, + "license": "ISC", + "dependencies": { + "brace-expansion": "^2.0.2" + }, + "engines": { + "node": ">=16 || 14 >=14.17" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/js-cookie": { + "version": "3.0.7", + "resolved": "https://registry.npmjs.org/js-cookie/-/js-cookie-3.0.7.tgz", + "integrity": "sha512-z/wZZgDrkNV1eA0ULjM/F9/50Ya8fbzgKneSpoPsXSGd0KnpdtHfOZWK+GcwLk+EZbS4F9RBhU+K2RgzuDaItw==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=20" + } + }, "node_modules/js-tokens": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", @@ -6759,6 +7033,19 @@ "node": ">=6" } }, + "node_modules/jsonfile": { + "version": "6.2.1", + "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.2.1.tgz", + "integrity": "sha512-zwOTdL3rFQ/lRdBnntKVOX6k5cKJwEc1HdilT71BWEu7J41gXIB2MRp+vxduPSwZJPWBxEzv4yH1wYLJGUHX4Q==", + "dev": true, + "license": "MIT", + "dependencies": { + "universalify": "^2.0.0" + }, + "optionalDependencies": { + "graceful-fs": "^4.1.6" + } + }, "node_modules/jsonwebtoken": { "version": "9.0.3", "resolved": "https://registry.npmjs.org/jsonwebtoken/-/jsonwebtoken-9.0.3.tgz", @@ -6862,6 +7149,12 @@ "node": ">=8" } }, + "node_modules/lodash": { + "version": "4.18.1", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.18.1.tgz", + "integrity": "sha512-dMInicTPVE8d1e5otfwmmjlxkZoUpiVLwyeTdUsi/Caj/gfzzblBcCE5sRHV/AsjuCmxWrte2TNGSYuCeCq+0Q==", + "license": "MIT" + }, "node_modules/lodash.get": { "version": "4.4.2", "resolved": "https://registry.npmjs.org/lodash.get/-/lodash.get-4.4.2.tgz", @@ -7152,6 +7445,27 @@ "node": ">=10" } }, + "node_modules/moment": { + "version": "2.30.1", + "resolved": "https://registry.npmjs.org/moment/-/moment-2.30.1.tgz", + "integrity": "sha512-uEmtNhbDOrWPFS+hdjFCBfy9f2YoyzRpwcl+DqpC6taX21FzsTLQVbMV/W7PzNSX6x/bhC1zA3c2UQ5NzH6how==", + "license": "MIT", + "engines": { + "node": "*" + } + }, + "node_modules/moment-timezone": { + "version": "0.5.48", + "resolved": "https://registry.npmjs.org/moment-timezone/-/moment-timezone-0.5.48.tgz", + "integrity": "sha512-f22b8LV1gbTO2ms2j2z13MuPogNoh5UzxL3nzNAYKGraILnbGc9NEE6dyiiiLv46DGRb8A4kg8UKWLjPthxBHw==", + "license": "MIT", + "dependencies": { + "moment": "^2.29.4" + }, + "engines": { + "node": "*" + } + }, "node_modules/morgan": { "version": "1.10.1", "resolved": "https://registry.npmjs.org/morgan/-/morgan-1.10.1.tgz", @@ -7306,6 +7620,22 @@ "dev": true, "license": "MIT" }, + "node_modules/nopt": { + "version": "7.2.1", + "resolved": "https://registry.npmjs.org/nopt/-/nopt-7.2.1.tgz", + "integrity": "sha512-taM24ViiimT/XntxbPyJQzCG+p4EKOpgD3mxFwW38mGjVUrfERQOeY4EDHjdnptttfHuHQXFx+lTP08Q+mLa/w==", + "dev": true, + "license": "ISC", + "dependencies": { + "abbrev": "^2.0.0" + }, + "bin": { + "nopt": "bin/nopt.js" + }, + "engines": { + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + } + }, "node_modules/normalize-path": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz", @@ -7607,6 +7937,107 @@ "integrity": "sha512-LjgdTytVFXeUgtHZr9WYViYSM/g8MkcTPYDlPa3cDqMirHjKiSZPYd6DoL7pK8AJQr+uWkQvCjHNdiMqsrJs+g==", "license": "MIT" }, + "node_modules/pg": { + "version": "8.21.0", + "resolved": "https://registry.npmjs.org/pg/-/pg-8.21.0.tgz", + "integrity": "sha512-AUP1EYJuHraQGsVoCQVIcM7TEJVGtDzxWtGFZd8rds9d+CCXlU5Js1rYgfLNvxy9iJrpHjGrRjoi/3BT9fRyiA==", + "license": "MIT", + "dependencies": { + "pg-connection-string": "^2.13.0", + "pg-pool": "^3.14.0", + "pg-protocol": "^1.14.0", + "pg-types": "2.2.0", + "pgpass": "1.0.5" + }, + "engines": { + "node": ">= 16.0.0" + }, + "optionalDependencies": { + "pg-cloudflare": "^1.4.0" + }, + "peerDependencies": { + "pg-native": ">=3.0.1" + }, + "peerDependenciesMeta": { + "pg-native": { + "optional": true + } + } + }, + "node_modules/pg-cloudflare": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/pg-cloudflare/-/pg-cloudflare-1.4.0.tgz", + "integrity": "sha512-Vo7z/6rrQYxpNRylp4Tlob2elzbh+N/MOQbxFVWCxS7oEx6jF53GTJFxK2WWpKuBRkmiin4Mt+xofFDjx09R0A==", + "license": "MIT", + "optional": true + }, + "node_modules/pg-connection-string": { + "version": "2.13.0", + "resolved": "https://registry.npmjs.org/pg-connection-string/-/pg-connection-string-2.13.0.tgz", + "integrity": "sha512-EMnU9E2fSULdsbErBbMaXJvFeD9B4+nPcM3f+4lsiCR0BHLPrLVjv3DbyM2hgQQviKJaTWIRRTjKjWlHg3p2ig==", + "license": "MIT" + }, + "node_modules/pg-hstore": { + "version": "2.3.4", + "resolved": "https://registry.npmjs.org/pg-hstore/-/pg-hstore-2.3.4.tgz", + "integrity": "sha512-N3SGs/Rf+xA1M2/n0JBiXFDVMzdekwLZLAO0g7mpDY9ouX+fDI7jS6kTq3JujmYbtNSJ53TJ0q4G98KVZSM4EA==", + "license": "MIT", + "dependencies": { + "underscore": "^1.13.1" + }, + "engines": { + "node": ">= 0.8.x" + } + }, + "node_modules/pg-int8": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/pg-int8/-/pg-int8-1.0.1.tgz", + "integrity": "sha512-WCtabS6t3c8SkpDBUlb1kjOs7l66xsGdKpIPZsg4wR+B3+u9UAum2odSsF9tnvxg80h4ZxLWMy4pRjOsFIqQpw==", + "license": "ISC", + "engines": { + "node": ">=4.0.0" + } + }, + "node_modules/pg-pool": { + "version": "3.14.0", + "resolved": "https://registry.npmjs.org/pg-pool/-/pg-pool-3.14.0.tgz", + "integrity": "sha512-gKtPkFdQPU3DksooVLi9LsjZxrsBUZIpa+7aVx+LV5pNh0KzP4Zleud2po+ConrxbuXGBJ6Hfer6hdgpIBpBaw==", + "license": "MIT", + "peerDependencies": { + "pg": ">=8.0" + } + }, + "node_modules/pg-protocol": { + "version": "1.14.0", + "resolved": "https://registry.npmjs.org/pg-protocol/-/pg-protocol-1.14.0.tgz", + "integrity": "sha512-n5taZ1kO3s9ngDTVxsEznOqCyToTgz0FLuPq0B33COy5pPpuWJpY3/2oRBVETuOgzdqRXfWpM9HIhp2LBBT1BA==", + "license": "MIT" + }, + "node_modules/pg-types": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/pg-types/-/pg-types-2.2.0.tgz", + "integrity": "sha512-qTAAlrEsl8s4OiEQY69wDvcMIdQN6wdz5ojQiOy6YRMuynxenON0O5oCpJI6lshc6scgAY8qvJ2On/p+CXY0GA==", + "license": "MIT", + "dependencies": { + "pg-int8": "1.0.1", + "postgres-array": "~2.0.0", + "postgres-bytea": "~1.0.0", + "postgres-date": "~1.0.4", + "postgres-interval": "^1.1.0" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/pgpass": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/pgpass/-/pgpass-1.0.5.tgz", + "integrity": "sha512-FdW9r/jQZhSeohs1Z3sI1yxFQNFvMcnmfuj4WBMUTxOrAyLMaTcE1aAMBiTlbMNaXvBCQuVi0R7hd8udDSP7ug==", + "license": "MIT", + "dependencies": { + "split2": "^4.1.0" + } + }, "node_modules/picocolors": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.1.1.tgz", @@ -7674,6 +8105,45 @@ "url": "https://github.com/sponsors/porsager" } }, + "node_modules/postgres-array": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/postgres-array/-/postgres-array-2.0.0.tgz", + "integrity": "sha512-VpZrUqU5A69eQyW2c5CA1jtLecCsN2U/bD6VilrFDWq5+5UIEVO7nazS3TEcHf1zuPYO/sqGvUvW62g86RXZuA==", + "license": "MIT", + "engines": { + "node": ">=4" + } + }, + "node_modules/postgres-bytea": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/postgres-bytea/-/postgres-bytea-1.0.1.tgz", + "integrity": "sha512-5+5HqXnsZPE65IJZSMkZtURARZelel2oXUEO8rH83VS/hxH5vv1uHquPg5wZs8yMAfdv971IU+kcPUczi7NVBQ==", + "license": "MIT", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/postgres-date": { + "version": "1.0.7", + "resolved": "https://registry.npmjs.org/postgres-date/-/postgres-date-1.0.7.tgz", + "integrity": "sha512-suDmjLVQg78nMK2UZ454hAG+OAW+HQPZ6n++TNDUX+L0+uUlLywnoxJKDou51Zm+zTCjrCl0Nq6J9C5hP9vK/Q==", + "license": "MIT", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/postgres-interval": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/postgres-interval/-/postgres-interval-1.2.0.tgz", + "integrity": "sha512-9ZhXKM/rw350N1ovuWHbGxnGh/SNJ4cnxHiM0rxE4VN41wsg8P8zWn9hv/buK00RP4WvlOyr/RBDiptyxVbkZQ==", + "license": "MIT", + "dependencies": { + "xtend": "^4.0.0" + }, + "engines": { + "node": ">=0.10.0" + } + }, "node_modules/prelude-ls": { "version": "1.2.1", "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz", @@ -7779,6 +8249,13 @@ "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==", "license": "ISC" }, + "node_modules/proto-list": { + "version": "1.2.4", + "resolved": "https://registry.npmjs.org/proto-list/-/proto-list-1.2.4.tgz", + "integrity": "sha512-vtK/94akxsTMhe0/cbfpR+syPuszcuwhqVjJq26CuNDgFGj682oRBXOP5MJpv2r7JtE8MsiepGIqvvOTBwn2vA==", + "dev": true, + "license": "ISC" + }, "node_modules/proxy-addr": { "version": "2.0.7", "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.7.tgz", @@ -8015,6 +8492,12 @@ "node": ">= 4" } }, + "node_modules/retry-as-promised": { + "version": "7.1.1", + "resolved": "https://registry.npmjs.org/retry-as-promised/-/retry-as-promised-7.1.1.tgz", + "integrity": "sha512-hMD7odLOt3LkTjcif8aRZqi/hybjpLNgSk5oF5FCowfCjok6LukpN2bDX7R5wDmbgBQFn7YoBxSagmtXHaJYJw==", + "license": "MIT" + }, "node_modules/rimraf": { "version": "2.7.1", "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz", @@ -8130,6 +8613,151 @@ "resolved": "https://registry.npmjs.org/seq-queue/-/seq-queue-0.0.5.tgz", "integrity": "sha512-hr3Wtp/GZIc/6DAGPDcV4/9WoZhjrkXsi5B/07QgX8tsdc6ilr7BFM6PM6rbdAX1kFSDYeZGLipIZZKyQP0O5Q==" }, + "node_modules/sequelize": { + "version": "6.37.8", + "resolved": "https://registry.npmjs.org/sequelize/-/sequelize-6.37.8.tgz", + "integrity": "sha512-HJ0IQFqcTsTiqbEgiuioYFMSD00TP6Cz7zoTti+zVVBwVe9fEhev9cH6WnM3XU31+ABS356durAb99ZuOthnKw==", + "funding": [ + { + "type": "opencollective", + "url": "https://opencollective.com/sequelize" + } + ], + "license": "MIT", + "dependencies": { + "@types/debug": "^4.1.8", + "@types/validator": "^13.7.17", + "debug": "^4.3.4", + "dottie": "^2.0.6", + "inflection": "^1.13.4", + "lodash": "^4.17.21", + "moment": "^2.29.4", + "moment-timezone": "^0.5.43", + "pg-connection-string": "^2.6.1", + "retry-as-promised": "^7.0.4", + "semver": "^7.5.4", + "sequelize-pool": "^7.1.0", + "toposort-class": "^1.0.1", + "uuid": "^8.3.2", + "validator": "^13.9.0", + "wkx": "^0.5.0" + }, + "engines": { + "node": ">=10.0.0" + }, + "peerDependenciesMeta": { + "ibm_db": { + "optional": true + }, + "mariadb": { + "optional": true + }, + "mysql2": { + "optional": true + }, + "oracledb": { + "optional": true + }, + "pg": { + "optional": true + }, + "pg-hstore": { + "optional": true + }, + "snowflake-sdk": { + "optional": true + }, + "sqlite3": { + "optional": true + }, + "tedious": { + "optional": true + } + } + }, + "node_modules/sequelize-cli": { + "version": "6.6.5", + "resolved": "https://registry.npmjs.org/sequelize-cli/-/sequelize-cli-6.6.5.tgz", + "integrity": "sha512-DqyISCULOaEbTM+rRQH4YvcUWeOC1XDiSKcjsC6TfAnT7W837mNkChJhtB/Z4FdCFHRCojmiP7zsrA4pARmacA==", + "dev": true, + "license": "MIT", + "dependencies": { + "fs-extra": "^9.1.0", + "js-beautify": "1.15.4", + "lodash": "^4.17.21", + "picocolors": "^1.1.1", + "resolve": "^1.22.1", + "umzug": "^2.3.0", + "yargs": "^16.2.0" + }, + "bin": { + "sequelize": "lib/sequelize", + "sequelize-cli": "lib/sequelize" + }, + "engines": { + "node": ">=10.0.0" + } + }, + "node_modules/sequelize-cli/node_modules/cliui": { + "version": "7.0.4", + "resolved": "https://registry.npmjs.org/cliui/-/cliui-7.0.4.tgz", + "integrity": "sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ==", + "dev": true, + "license": "ISC", + "dependencies": { + "string-width": "^4.2.0", + "strip-ansi": "^6.0.0", + "wrap-ansi": "^7.0.0" + } + }, + "node_modules/sequelize-cli/node_modules/yargs": { + "version": "16.2.0", + "resolved": "https://registry.npmjs.org/yargs/-/yargs-16.2.0.tgz", + "integrity": "sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw==", + "dev": true, + "license": "MIT", + "dependencies": { + "cliui": "^7.0.2", + "escalade": "^3.1.1", + "get-caller-file": "^2.0.5", + "require-directory": "^2.1.1", + "string-width": "^4.2.0", + "y18n": "^5.0.5", + "yargs-parser": "^20.2.2" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/sequelize-cli/node_modules/yargs-parser": { + "version": "20.2.9", + "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.9.tgz", + "integrity": "sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==", + "dev": true, + "license": "ISC", + "engines": { + "node": ">=10" + } + }, + "node_modules/sequelize-pool": { + "version": "7.1.0", + "resolved": "https://registry.npmjs.org/sequelize-pool/-/sequelize-pool-7.1.0.tgz", + "integrity": "sha512-G9c0qlIWQSK29pR/5U2JF5dDQeqqHRragoyahj/Nx4KOOQ3CPPfzxnfqFPCSB7x5UgjOgnZ61nSxz+fjDpRlJg==", + "license": "MIT", + "engines": { + "node": ">= 10.0.0" + } + }, + "node_modules/sequelize/node_modules/uuid": { + "version": "8.3.2", + "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz", + "integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==", + "deprecated": "uuid@10 and below is no longer supported. For ESM codebases, update to uuid@latest. For CommonJS codebases, use uuid@11 (but be aware this version will likely be deprecated in 2028).", + "license": "MIT", + "bin": { + "uuid": "dist/bin/uuid" + } + }, "node_modules/serve-static": { "version": "2.2.1", "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-2.2.1.tgz", @@ -8291,6 +8919,15 @@ "source-map": "^0.6.0" } }, + "node_modules/split2": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/split2/-/split2-4.2.0.tgz", + "integrity": "sha512-UcjcJOWknrNkF6PLX83qcHM6KHgVKNkV62Y8a5uYDVv9ydGQVwAHMKqHdJje1VTWpljG0WYpCDhrCdAOYH4TWg==", + "license": "ISC", + "engines": { + "node": ">= 10.x" + } + }, "node_modules/sprintf-js": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz", @@ -8670,6 +9307,12 @@ "node": ">=0.6" } }, + "node_modules/toposort-class": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/toposort-class/-/toposort-class-1.0.1.tgz", + "integrity": "sha512-OsLcGGbYF3rMjPUf8oKktyvCiUxSbqMMS39m33MAjLTC1DVIH6x3WSt63/M77ihI09+Sdfk1AXvfhCEeUmC7mg==", + "license": "MIT" + }, "node_modules/tree-kill": { "version": "1.2.2", "resolved": "https://registry.npmjs.org/tree-kill/-/tree-kill-1.2.2.tgz", @@ -9007,13 +9650,41 @@ "node": ">=0.8.0" } }, + "node_modules/umzug": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/umzug/-/umzug-2.3.0.tgz", + "integrity": "sha512-Z274K+e8goZK8QJxmbRPhl89HPO1K+ORFtm6rySPhFKfKc5GHhqdzD0SGhSWHkzoXasqJuItdhorSvY7/Cgflw==", + "dev": true, + "license": "MIT", + "dependencies": { + "bluebird": "^3.7.2" + }, + "engines": { + "node": ">=6.0.0" + } + }, + "node_modules/underscore": { + "version": "1.13.8", + "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.13.8.tgz", + "integrity": "sha512-DXtD3ZtEQzc7M8m4cXotyHR+FAS18C64asBYY5vqZexfYryNNnDc02W4hKg3rdQuqOYas1jkseX0+nZXjTXnvQ==", + "license": "MIT" + }, "node_modules/undici-types": { "version": "7.24.6", "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-7.24.6.tgz", "integrity": "sha512-WRNW+sJgj5OBN4/0JpHFqtqzhpbnV0GuB+OozA9gCL7a993SmU+1JBZCzLNxYsbMfIeDL+lTsphD5jN5N+n0zg==", - "dev": true, "license": "MIT" }, + "node_modules/universalify": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.1.tgz", + "integrity": "sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 10.0.0" + } + }, "node_modules/unpipe": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz", @@ -9247,6 +9918,15 @@ "node": ">= 12.0.0" } }, + "node_modules/wkx": { + "version": "0.5.0", + "resolved": "https://registry.npmjs.org/wkx/-/wkx-0.5.0.tgz", + "integrity": "sha512-Xng/d4Ichh8uN4l0FToV/258EjMGU9MGcA0HV2d9B/ZpZB3lqQm7nkOdZdm5GhKtLLhAE7PiVQwN4eN+2YJJUg==", + "license": "MIT", + "dependencies": { + "@types/node": "*" + } + }, "node_modules/word-wrap": { "version": "1.2.5", "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.5.tgz", @@ -9325,7 +10005,6 @@ "version": "4.0.2", "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz", "integrity": "sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==", - "dev": true, "license": "MIT", "engines": { "node": ">=0.4" diff --git a/server/package.json b/server/package.json index 6a3d9c3..5231052 100644 --- a/server/package.json +++ b/server/package.json @@ -26,7 +26,10 @@ "http-status-codes": "^2.3.0", "jsonwebtoken": "^9.0.3", "morgan": "^1.10.1", + "pg": "^8.21.0", + "pg-hstore": "^2.3.4", "prisma": "^7.8.0", + "sequelize": "^6.37.8", "swagger-jsdoc": "^6.2.8", "swagger-ui-express": "^5.0.1", "uuid": "^14.0.0", @@ -40,11 +43,13 @@ "@types/jest": "^30.0.0", "@types/jsonwebtoken": "^9.0.10", "@types/node": "^25.9.1", + "@types/sequelize": "^4.28.20", "@types/supertest": "^7.2.0", "eslint": "^10.4.0", "eslint-config-prettier": "^10.1.8", "jest": "^30.4.2", "prettier": "^3.8.3", + "sequelize-cli": "^6.6.5", "supertest": "^7.2.2", "ts-jest": "^29.4.10", "ts-node-dev": "^2.0.0", diff --git a/server/src/database/testconnection.ts b/server/src/database/testconnection.ts index f6b8518..42cecd8 100644 --- a/server/src/database/testconnection.ts +++ b/server/src/database/testconnection.ts @@ -10,4 +10,6 @@ const testConnection = async () => { } }; -testConnection(); \ No newline at end of file +testConnection(); + +//npx tsc src/database/testConnection.ts \ No newline at end of file diff --git a/server/tsconfig.json b/server/tsconfig.json index f40c5a8..fbf7496 100644 --- a/server/tsconfig.json +++ b/server/tsconfig.json @@ -1,46 +1,3 @@ -// { -// // Visit https://aka.ms/tsconfig to read more about this file -// "compilerOptions": { -// // File Layout -// // "rootDir": "./src", -// // "outDir": "./dist", - -// // Environment Settings -// // See also https://aka.ms/tsconfig/module -// "module": "nodenext", -// "target": "esnext", -// "types": [], -// // For nodejs: -// // "lib": ["esnext"], -// // "types": ["node"], -// // and npm install -D @types/node - -// // Other Outputs -// "sourceMap": true, -// "declaration": true, -// "declarationMap": true, - -// // Stricter Typechecking Options -// "noUncheckedIndexedAccess": true, -// "exactOptionalPropertyTypes": true, - -// // Style Options -// // "noImplicitReturns": true, -// // "noImplicitOverride": true, -// // "noUnusedLocals": true, -// // "noUnusedParameters": true, -// // "noFallthroughCasesInSwitch": true, -// // "noPropertyAccessFromIndexSignature": true, - -// // Recommended Options -// "strict": true, -// "jsx": "react-jsx", -// "isolatedModules": true, -// "noUncheckedSideEffectImports": true, -// "moduleDetection": "force", -// "skipLibCheck": true, -// } -// } { "compilerOptions": { "target": "ES2022", @@ -67,7 +24,17 @@ "noUncheckedIndexedAccess": true, - "exactOptionalPropertyTypes": true + "exactOptionalPropertyTypes": true, + + "sourceMap": true, + + "declaration": true, + + "declarationMap": true, + + "types": ["node"], + + "allowSyntheticDefaultImports": true }, "include": ["src"], From b42d711a7c7df348f7a5b5601a1557146cf4050c Mon Sep 17 00:00:00 2001 From: Yogeshwaran S Date: Tue, 26 May 2026 14:54:35 +0530 Subject: [PATCH 03/87] feat(database): create User Sequelize model with TypeScript typing --- server/src/database/models/User.ts | 87 ++++++++++++++++++++++++++++++ 1 file changed, 87 insertions(+) create mode 100644 server/src/database/models/User.ts diff --git a/server/src/database/models/User.ts b/server/src/database/models/User.ts new file mode 100644 index 0000000..108988c --- /dev/null +++ b/server/src/database/models/User.ts @@ -0,0 +1,87 @@ +import { + DataTypes, + InferAttributes, + InferCreationAttributes, + Model, +} from "sequelize"; + +import sequelize from "../connection/database.js"; + +class User extends Model< + InferAttributes, + InferCreationAttributes +> { + declare uuid: string; + + declare name: string; + + declare gmail: string; + + declare password: string; + + declare phone_number: string | null; + + declare readonly created_at: Date; + + declare readonly updated_at: Date; +} + +User.init( + { + uuid: { + type: DataTypes.UUID, + + defaultValue: DataTypes.UUIDV4, + + primaryKey: true, + }, + + name: { + type: DataTypes.STRING(100), + + allowNull: false, + }, + + gmail: { + type: DataTypes.STRING(150), + + allowNull: false, + + unique: true, + }, + + password: { + type: DataTypes.STRING(255), + + allowNull: false, + }, + + phone_number: { + type: DataTypes.STRING(20), + + allowNull: true, + }, + + created_at: { + type: DataTypes.DATE, + + defaultValue: DataTypes.NOW, + }, + + updated_at: { + type: DataTypes.DATE, + + defaultValue: DataTypes.NOW, + }, + }, + + { + sequelize, + + tableName: "users", + + timestamps: false, + } +); + +export default User; \ No newline at end of file From 4e09a895ac2744525dbaa25ced41027eed80ab87 Mon Sep 17 00:00:00 2001 From: Yogeshwaran S Date: Tue, 26 May 2026 15:07:16 +0530 Subject: [PATCH 04/87] feat(database): create Sequelize models for library management system --- server/src/database/models/Book.ts | 89 ++++++++++++++++++++ server/src/database/models/Category.ts | 55 ++++++++++++ server/src/database/models/Fine.ts | 83 ++++++++++++++++++ server/src/database/models/Issue.ts | 89 ++++++++++++++++++++ server/src/database/models/Member.ts | 83 ++++++++++++++++++ server/src/database/models/MembershipPlan.ts | 69 +++++++++++++++ server/src/database/models/User.ts | 13 +-- 7 files changed, 470 insertions(+), 11 deletions(-) create mode 100644 server/src/database/models/Book.ts create mode 100644 server/src/database/models/Category.ts create mode 100644 server/src/database/models/Fine.ts create mode 100644 server/src/database/models/Issue.ts create mode 100644 server/src/database/models/Member.ts create mode 100644 server/src/database/models/MembershipPlan.ts diff --git a/server/src/database/models/Book.ts b/server/src/database/models/Book.ts new file mode 100644 index 0000000..11ea23e --- /dev/null +++ b/server/src/database/models/Book.ts @@ -0,0 +1,89 @@ +import { + DataTypes, + InferAttributes, + InferCreationAttributes, + Model, +} from "sequelize"; + +import sequelize from "../connection/database.js"; + +class Book extends Model< + InferAttributes, + InferCreationAttributes +> { + declare book_id: string; + + declare category_id: string; + + declare book_name: string; + + declare book_author: string; + + declare total_copies: number; + + declare available_copies: number; + + declare lending_count: number; + + declare readonly created_at: Date; + + declare readonly updated_at: Date; +} + +Book.init( + { + book_id: { + type: DataTypes.UUID, + defaultValue: DataTypes.UUIDV4, + primaryKey: true, + }, + + category_id: { + type: DataTypes.UUID, + allowNull: false, + }, + + book_name: { + type: DataTypes.STRING(255), + allowNull: false, + }, + + book_author: { + type: DataTypes.STRING(150), + allowNull: false, + }, + + total_copies: { + type: DataTypes.INTEGER, + allowNull: false, + }, + + available_copies: { + type: DataTypes.INTEGER, + allowNull: false, + }, + + lending_count: { + type: DataTypes.INTEGER, + defaultValue: 0, + }, + + created_at: { + type: DataTypes.DATE, + }, + + updated_at: { + type: DataTypes.DATE, + }, + }, + + { + sequelize, + tableName: "books", + timestamps: true, + createdAt: "created_at", + updatedAt: "updated_at", + } +); + +export default Book; \ No newline at end of file diff --git a/server/src/database/models/Category.ts b/server/src/database/models/Category.ts new file mode 100644 index 0000000..e5e1cd9 --- /dev/null +++ b/server/src/database/models/Category.ts @@ -0,0 +1,55 @@ +import { + DataTypes, + InferAttributes, + InferCreationAttributes, + Model, +} from "sequelize"; + +import sequelize from "../connection/database.js"; + +class Category extends Model< + InferAttributes, + InferCreationAttributes +> { + declare category_id: string; + + declare category_name: string; + + declare readonly created_at: Date; + + declare readonly updated_at: Date; +} + +Category.init( + { + category_id: { + type: DataTypes.UUID, + defaultValue: DataTypes.UUIDV4, + primaryKey: true, + }, + + category_name: { + type: DataTypes.STRING(100), + allowNull: false, + unique: true, + }, + + created_at: { + type: DataTypes.DATE, + }, + + updated_at: { + type: DataTypes.DATE, + }, + }, + + { + sequelize, + tableName: "categories", + timestamps: true, + createdAt: "created_at", + updatedAt: "updated_at", + } +); + +export default Category; \ No newline at end of file diff --git a/server/src/database/models/Fine.ts b/server/src/database/models/Fine.ts new file mode 100644 index 0000000..9b6746b --- /dev/null +++ b/server/src/database/models/Fine.ts @@ -0,0 +1,83 @@ +import { + DataTypes, + InferAttributes, + InferCreationAttributes, + Model, +} from "sequelize"; + +import sequelize from "../connection/database.js"; + +class Fine extends Model< + InferAttributes, + InferCreationAttributes +> { + declare fine_id: string; + + declare issue_id: string; + + declare delayed_days: number; + + declare fine_amount: number; + + declare paid_status: boolean; + + declare paid_date: Date | null; + + declare readonly created_at: Date; + + declare readonly updated_at: Date; +} + +Fine.init( + { + fine_id: { + type: DataTypes.UUID, + defaultValue: DataTypes.UUIDV4, + primaryKey: true, + }, + + issue_id: { + type: DataTypes.UUID, + allowNull: false, + unique: true, + }, + + delayed_days: { + type: DataTypes.INTEGER, + allowNull: false, + }, + + fine_amount: { + type: DataTypes.DECIMAL(10, 2), + allowNull: false, + }, + + paid_status: { + type: DataTypes.BOOLEAN, + defaultValue: false, + }, + + paid_date: { + type: DataTypes.DATEONLY, + allowNull: true, + }, + + created_at: { + type: DataTypes.DATE, + }, + + updated_at: { + type: DataTypes.DATE, + }, + }, + + { + sequelize, + tableName: "fines", + timestamps: true, + createdAt: "created_at", + updatedAt: "updated_at", + } +); + +export default Fine; \ No newline at end of file diff --git a/server/src/database/models/Issue.ts b/server/src/database/models/Issue.ts new file mode 100644 index 0000000..28a1955 --- /dev/null +++ b/server/src/database/models/Issue.ts @@ -0,0 +1,89 @@ +import { + DataTypes, + InferAttributes, + InferCreationAttributes, + Model, +} from "sequelize"; + +import sequelize from "../connection/database.js"; + +class Issue extends Model< + InferAttributes, + InferCreationAttributes +> { + declare issue_id: string; + + declare member_id: string; + + declare book_id: string; + + declare borrowed_date: Date; + + declare due_date: Date; + + declare returned_date: Date | null; + + declare issue_status: string; + + declare readonly created_at: Date; + + declare readonly updated_at: Date; +} + +Issue.init( + { + issue_id: { + type: DataTypes.UUID, + defaultValue: DataTypes.UUIDV4, + primaryKey: true, + }, + + member_id: { + type: DataTypes.UUID, + allowNull: false, + }, + + book_id: { + type: DataTypes.UUID, + allowNull: false, + }, + + borrowed_date: { + type: DataTypes.DATEONLY, + allowNull: false, + }, + + due_date: { + type: DataTypes.DATEONLY, + allowNull: false, + }, + + returned_date: { + type: DataTypes.DATEONLY, + allowNull: true, + }, + + issue_status: { + type: DataTypes.ENUM("BORROWED", "RETURNED", "OVERDUE"), + defaultValue: "BORROWED", + }, + + created_at: { + type: DataTypes.DATE, + }, + + updated_at: { + type: DataTypes.DATE, + }, + }, + + { + sequelize, + tableName: "issues", + timestamps: true, + createdAt: "created_at", + updatedAt: "updated_at", + } +); + +export default Issue; \ No newline at end of file diff --git a/server/src/database/models/Member.ts b/server/src/database/models/Member.ts new file mode 100644 index 0000000..b90f6bc --- /dev/null +++ b/server/src/database/models/Member.ts @@ -0,0 +1,83 @@ +import { + DataTypes, + InferAttributes, + InferCreationAttributes, + Model, +} from "sequelize"; + +import sequelize from "../connection/database.js"; + +class Member extends Model< + InferAttributes, + InferCreationAttributes +> { + declare member_id: string; + + declare user_id: string; + + declare membership_plan_id: string; + + declare start_date: Date; + + declare expiry_date: Date; + + declare membership_status: string; + + declare readonly created_at: Date; + + declare readonly updated_at: Date; +} + +Member.init( + { + member_id: { + type: DataTypes.UUID, + defaultValue: DataTypes.UUIDV4, + primaryKey: true, + }, + + user_id: { + type: DataTypes.UUID, + allowNull: false, + unique: true, + }, + + membership_plan_id: { + type: DataTypes.UUID, + allowNull: false, + }, + + start_date: { + type: DataTypes.DATEONLY, + allowNull: false, + }, + + expiry_date: { + type: DataTypes.DATEONLY, + allowNull: false, + }, + + membership_status: { + type: DataTypes.ENUM("ACTIVE", "EXPIRED"), + defaultValue: "ACTIVE", + }, + + created_at: { + type: DataTypes.DATE, + }, + + updated_at: { + type: DataTypes.DATE, + }, + }, + + { + sequelize, + tableName: "members", + timestamps: true, + createdAt: "created_at", + updatedAt: "updated_at", + } +); + +export default Member; \ No newline at end of file diff --git a/server/src/database/models/MembershipPlan.ts b/server/src/database/models/MembershipPlan.ts new file mode 100644 index 0000000..c2ea1c0 --- /dev/null +++ b/server/src/database/models/MembershipPlan.ts @@ -0,0 +1,69 @@ +import { + DataTypes, + InferAttributes, + InferCreationAttributes, + Model, +} from "sequelize"; + +import sequelize from "../connection/database.js"; + +class MembershipPlan extends Model< + InferAttributes, + InferCreationAttributes +> { + declare membership_plan_id: string; + + declare plan_name: string; + + declare price: number; + + declare duration_days: number; + + declare readonly created_at: Date; + + declare readonly updated_at: Date; +} + +MembershipPlan.init( + { + membership_plan_id: { + type: DataTypes.UUID, + defaultValue: DataTypes.UUIDV4, + primaryKey: true, + }, + + plan_name: { + type: DataTypes.STRING(50), + allowNull: false, + unique: true, + }, + + price: { + type: DataTypes.DECIMAL(10, 2), + allowNull: false, + }, + + duration_days: { + type: DataTypes.INTEGER, + allowNull: false, + }, + + created_at: { + type: DataTypes.DATE, + }, + + updated_at: { + type: DataTypes.DATE, + }, + }, + + { + sequelize, + tableName: "membership_plans", + timestamps: true, + createdAt: "created_at", + updatedAt: "updated_at", + } +); + +export default MembershipPlan; \ No newline at end of file diff --git a/server/src/database/models/User.ts b/server/src/database/models/User.ts index 108988c..938ce3b 100644 --- a/server/src/database/models/User.ts +++ b/server/src/database/models/User.ts @@ -1,16 +1,7 @@ -import { - DataTypes, - InferAttributes, - InferCreationAttributes, - Model, -} from "sequelize"; - +import { DataTypes, InferAttributes, InferCreationAttributes, Model } from "sequelize"; import sequelize from "../connection/database.js"; -class User extends Model< - InferAttributes, - InferCreationAttributes -> { +class User extends Model, InferCreationAttributes > { declare uuid: string; declare name: string; From b93ed5a85e0ec337ee431a5b31f18134bb715382 Mon Sep 17 00:00:00 2001 From: Yogeshwaran S Date: Tue, 26 May 2026 15:18:28 +0530 Subject: [PATCH 05/87] feat(database): implement Sequelize model associations --- server/src/database/assosiations/index.ts | 109 ++++++++++++++++++++++ server/src/database/index.ts | 2 + 2 files changed, 111 insertions(+) create mode 100644 server/src/database/assosiations/index.ts diff --git a/server/src/database/assosiations/index.ts b/server/src/database/assosiations/index.ts new file mode 100644 index 0000000..43ba07d --- /dev/null +++ b/server/src/database/assosiations/index.ts @@ -0,0 +1,109 @@ +import User from "../models/User.js"; + +import Member from "../models/Member.js"; + +import MembershipPlan from "../models/MembershipPlan.js"; + +import Category from "../models/Category.js"; + +import Book from "../models/Book.js"; + +import Issue from "../models/Issue.js"; + +import Fine from "../models/Fine.js"; + + + +/* -------------------------------------------------------------------------- */ +/* USER ↔ MEMBER */ +/* -------------------------------------------------------------------------- */ + +User.hasOne(Member, { + foreignKey: "user_id", + as: "member", +}); + +Member.belongsTo(User, { + foreignKey: "user_id", + as: "user", +}); + + + +/* -------------------------------------------------------------------------- */ +/* MEMBERSHIP PLAN ↔ MEMBERS */ +/* -------------------------------------------------------------------------- */ + +MembershipPlan.hasMany(Member, { + foreignKey: "membership_plan_id", + as: "members", +}); + +Member.belongsTo(MembershipPlan, { + foreignKey: "membership_plan_id", + as: "membership_plan", +}); + + + +/* -------------------------------------------------------------------------- */ +/* CATEGORY ↔ BOOKS */ +/* -------------------------------------------------------------------------- */ + +Category.hasMany(Book, { + foreignKey: "category_id", + as: "books", +}); + +Book.belongsTo(Category, { + foreignKey: "category_id", + as: "category", +}); + + + +/* -------------------------------------------------------------------------- */ +/* MEMBER ↔ ISSUES */ +/* -------------------------------------------------------------------------- */ + +Member.hasMany(Issue, { + foreignKey: "member_id", + as: "issues", +}); + +Issue.belongsTo(Member, { + foreignKey: "member_id", + as: "member", +}); + + + +/* -------------------------------------------------------------------------- */ +/* BOOK ↔ ISSUES */ +/* -------------------------------------------------------------------------- */ + +Book.hasMany(Issue, { + foreignKey: "book_id", + as: "issues", +}); + +Issue.belongsTo(Book, { + foreignKey: "book_id", + as: "book", +}); + + + +/* -------------------------------------------------------------------------- */ +/* ISSUE ↔ FINE */ +/* -------------------------------------------------------------------------- */ + +Issue.hasOne(Fine, { + foreignKey: "issue_id", + as: "fine", +}); + +Fine.belongsTo(Issue, { + foreignKey: "issue_id", + as: "issue", +}); \ No newline at end of file diff --git a/server/src/database/index.ts b/server/src/database/index.ts index 5f6e648..5137ca9 100644 --- a/server/src/database/index.ts +++ b/server/src/database/index.ts @@ -1,3 +1,5 @@ import sequelize from "./connection/database.js"; +import "./assosiations/index.js"; +export {}; export { sequelize }; \ No newline at end of file From ae8a6005582c791c4be6a2a372724bd7edb66769 Mon Sep 17 00:00:00 2001 From: Yogeshwaran S Date: Tue, 26 May 2026 15:38:17 +0530 Subject: [PATCH 06/87] feat(database): implement Sequelize database synchronization flow --- .../{assosiations => associations}/index.ts | 0 server/src/database/index.ts | 8 +++++--- server/src/database/sync/syncDatabase.ts | 13 +++++++++++++ 3 files changed, 18 insertions(+), 3 deletions(-) rename server/src/database/{assosiations => associations}/index.ts (100%) create mode 100644 server/src/database/sync/syncDatabase.ts diff --git a/server/src/database/assosiations/index.ts b/server/src/database/associations/index.ts similarity index 100% rename from server/src/database/assosiations/index.ts rename to server/src/database/associations/index.ts diff --git a/server/src/database/index.ts b/server/src/database/index.ts index 5137ca9..f0b6b69 100644 --- a/server/src/database/index.ts +++ b/server/src/database/index.ts @@ -1,5 +1,7 @@ import sequelize from "./connection/database.js"; -import "./assosiations/index.js"; -export {}; -export { sequelize }; \ No newline at end of file +import "./associations/index.js"; + +import syncDatabase from "./sync/syncDatabase.js"; + +export { sequelize, syncDatabase }; \ No newline at end of file diff --git a/server/src/database/sync/syncDatabase.ts b/server/src/database/sync/syncDatabase.ts new file mode 100644 index 0000000..77e4a84 --- /dev/null +++ b/server/src/database/sync/syncDatabase.ts @@ -0,0 +1,13 @@ +import sequelize from "../connection/database.js"; + +const syncDatabase = async (): Promise => { + try { + await sequelize.sync(); + console.log("✅ Database synchronized successfully"); + } catch (error) { + console.error("❌ Database synchronization failed:", error); + process.exit(1); + } +}; + +export default syncDatabase; \ No newline at end of file From 7eb60ad93c950270c6944e6e3fc96fa245a0a40a Mon Sep 17 00:00:00 2001 From: Yogeshwaran S Date: Tue, 26 May 2026 16:34:30 +0530 Subject: [PATCH 07/87] feat(server): implement Express bootstrap architecture --- server/package.json | 4 +-- server/src/app.ts | 57 ++++++++++++++++++++++++++++++++++++++++ server/src/config/env.ts | 17 ++++++++++++ server/src/server.ts | 27 +++++++++++++++++++ 4 files changed, 103 insertions(+), 2 deletions(-) create mode 100644 server/src/config/env.ts diff --git a/server/package.json b/server/package.json index 5231052..f357408 100644 --- a/server/package.json +++ b/server/package.json @@ -3,9 +3,9 @@ "version": "1.0.0", "description": "", "main": "index.js", - "dev": "tsx watch src/server.ts", "scripts": { - "test": "echo \"Error: no test specified\" && exit 1" + "test": "echo \"Error: no test specified\" && exit 1", + "dev": "tsx watch src/server.ts" }, "keywords": [], "author": "", diff --git a/server/src/app.ts b/server/src/app.ts index e69de29..7af1464 100644 --- a/server/src/app.ts +++ b/server/src/app.ts @@ -0,0 +1,57 @@ +import express, { + type Application, + type Request, + type Response, +} from "express"; + +import cors from "cors"; + +import helmet from "helmet"; + +import morgan from "morgan"; + +import cookieParser from "cookie-parser"; + +import env from "./config/env.js"; + +const app: Application = express(); + + + +/* -------------------------------------------------------------------------- */ +/* MIDDLEWARES */ +/* -------------------------------------------------------------------------- */ + +app.use( + cors({ + origin: env.FRONTEND_URL, + credentials: true, + }) +); + +app.use(helmet()); + +app.use(morgan("dev")); + +app.use(express.json()); + +app.use(express.urlencoded({ extended: true })); + +app.use(cookieParser()); + + + +/* -------------------------------------------------------------------------- */ +/* ROUTES */ +/* -------------------------------------------------------------------------- */ + +app.get("/", (_req: Request, res: Response) => { + res.status(200).json({ + success: true, + message: "Library Management System API running successfully", + }); +}); + + + +export default app; \ No newline at end of file diff --git a/server/src/config/env.ts b/server/src/config/env.ts new file mode 100644 index 0000000..dff36e8 --- /dev/null +++ b/server/src/config/env.ts @@ -0,0 +1,17 @@ +import dotenv from "dotenv"; + +dotenv.config(); + +const env = { + NODE_ENV: process.env.NODE_ENV || "development", + + PORT: Number(process.env.PORT) || 5000, + + DATABASE_URL: process.env.DATABASE_URL || "", + + JWT_SECRET: process.env.JWT_SECRET || "", + + FRONTEND_URL: process.env.FRONTEND_URL || "http://localhost:5173", +}; + +export default env; \ No newline at end of file diff --git a/server/src/server.ts b/server/src/server.ts index e69de29..18b0ab3 100644 --- a/server/src/server.ts +++ b/server/src/server.ts @@ -0,0 +1,27 @@ +import app from "./app.js"; + +import env from "./config/env.js"; + +import { sequelize, syncDatabase } from "./database/index.js"; + +const startServer = async (): Promise => { + try { + await sequelize.authenticate(); + + console.log("✅ Database connected successfully"); + + await syncDatabase(); + + app.listen(env.PORT, () => { + console.log( + `🚀 Server running on port ${env.PORT} in ${env.NODE_ENV} mode` + ); + }); + } catch (error) { + console.error("❌ Server startup failed:", error); + + process.exit(1); + } +}; + +void startServer(); \ No newline at end of file From e11907fbaa38bf04f415149296ea61108277f544 Mon Sep 17 00:00:00 2001 From: Yogeshwaran S Date: Tue, 26 May 2026 17:00:57 +0530 Subject: [PATCH 08/87] feat(server): implement centralized error handling architecture --- server/src/app.ts | 6 +++ server/src/middlewares/NotFoundHandler.ts | 13 +++++++ server/src/middlewares/globalErrorHandler.ts | 39 ++++++++++++++++++++ server/src/utils/AppError.ts | 17 +++++++++ server/src/utils/asyncHandler.ts | 14 +++++++ 5 files changed, 89 insertions(+) create mode 100644 server/src/middlewares/NotFoundHandler.ts create mode 100644 server/src/middlewares/globalErrorHandler.ts create mode 100644 server/src/utils/AppError.ts create mode 100644 server/src/utils/asyncHandler.ts diff --git a/server/src/app.ts b/server/src/app.ts index 7af1464..193eec9 100644 --- a/server/src/app.ts +++ b/server/src/app.ts @@ -14,6 +14,10 @@ import cookieParser from "cookie-parser"; import env from "./config/env.js"; +import notFoundHandler from "./middlewares/NotFoundHandler.js"; + +import globalErrorHandler from "./middlewares/globalErrorHandler.js"; + const app: Application = express(); @@ -39,7 +43,9 @@ app.use(express.urlencoded({ extended: true })); app.use(cookieParser()); +app.use(notFoundHandler); +app.use(globalErrorHandler); /* -------------------------------------------------------------------------- */ /* ROUTES */ diff --git a/server/src/middlewares/NotFoundHandler.ts b/server/src/middlewares/NotFoundHandler.ts new file mode 100644 index 0000000..d0e1839 --- /dev/null +++ b/server/src/middlewares/NotFoundHandler.ts @@ -0,0 +1,13 @@ +import type { Request, Response, NextFunction } from "express"; + +import AppError from "../utils/AppError.js"; + +const notFoundHandler = ( + req: Request, + _res: Response, + next: NextFunction +): void => { + next(new AppError(`Route ${req.originalUrl} not found`, 404)); +}; + +export default notFoundHandler; \ No newline at end of file diff --git a/server/src/middlewares/globalErrorHandler.ts b/server/src/middlewares/globalErrorHandler.ts new file mode 100644 index 0000000..ad9a24d --- /dev/null +++ b/server/src/middlewares/globalErrorHandler.ts @@ -0,0 +1,39 @@ +import type { + Request, + Response, + NextFunction, +} from "express"; + +import AppError from "../utils/AppError.js"; + +const globalErrorHandler = ( + err: Error, + _req: Request, + res: Response, + _next: NextFunction +): void => { + let statusCode = 500; + + let message = "Internal Server Error"; + + + + if (err instanceof AppError) { + statusCode = err.statusCode; + + message = err.message; + } + + + + res.status(statusCode).json({ + success: false, + message, + stack: + process.env.NODE_ENV === "development" + ? err.stack + : undefined, + }); +}; + +export default globalErrorHandler; \ No newline at end of file diff --git a/server/src/utils/AppError.ts b/server/src/utils/AppError.ts new file mode 100644 index 0000000..453f50d --- /dev/null +++ b/server/src/utils/AppError.ts @@ -0,0 +1,17 @@ +class AppError extends Error { + public statusCode: number; + + public success: boolean; + + constructor(message: string, statusCode: number) { + super(message); + + this.statusCode = statusCode; + + this.success = false; + + Error.captureStackTrace(this, this.constructor); + } +} + +export default AppError; \ No newline at end of file diff --git a/server/src/utils/asyncHandler.ts b/server/src/utils/asyncHandler.ts new file mode 100644 index 0000000..9b7a7a7 --- /dev/null +++ b/server/src/utils/asyncHandler.ts @@ -0,0 +1,14 @@ +import type { + Request, + Response, + NextFunction, + RequestHandler, +} from "express"; + +const asyncHandler = + (fn: RequestHandler) => + (req: Request, res: Response, next: NextFunction): void => { + Promise.resolve(fn(req, res, next)).catch(next); + }; + +export default asyncHandler; \ No newline at end of file From 5860b999fac655ab9e9c72e4c19e590ce7dca921 Mon Sep 17 00:00:00 2001 From: Yogeshwaran S Date: Tue, 26 May 2026 17:16:30 +0530 Subject: [PATCH 09/87] feat(server): implement standardized API response architecture --- server/package-lock.json | 22 ++++++++++++++++++++++ server/package.json | 2 ++ server/src/utils/SendResponse.ts | 31 +++++++++++++++++++++++++++++++ 3 files changed, 55 insertions(+) create mode 100644 server/src/utils/SendResponse.ts diff --git a/server/package-lock.json b/server/package-lock.json index d1633ba..793393e 100644 --- a/server/package-lock.json +++ b/server/package-lock.json @@ -35,10 +35,12 @@ }, "devDependencies": { "@types/bcrypt": "^6.0.0", + "@types/cookie-parser": "^1.4.10", "@types/cors": "^2.8.19", "@types/express": "^5.0.6", "@types/jest": "^30.0.0", "@types/jsonwebtoken": "^9.0.10", + "@types/morgan": "^1.9.10", "@types/node": "^25.9.1", "@types/sequelize": "^4.28.20", "@types/supertest": "^7.2.0", @@ -2616,6 +2618,16 @@ "@types/node": "*" } }, + "node_modules/@types/cookie-parser": { + "version": "1.4.10", + "resolved": "https://registry.npmjs.org/@types/cookie-parser/-/cookie-parser-1.4.10.tgz", + "integrity": "sha512-B4xqkqfZ8Wek+rCOeRxsjMS9OgvzebEzzLYw7NHYuvzb7IdxOkI0ZHGgeEBX4PUM7QGVvNSK60T3OvWj3YfBRg==", + "dev": true, + "license": "MIT", + "peerDependencies": { + "@types/express": "*" + } + }, "node_modules/@types/cookiejar": { "version": "2.1.5", "resolved": "https://registry.npmjs.org/@types/cookiejar/-/cookiejar-2.1.5.tgz", @@ -2757,6 +2769,16 @@ "dev": true, "license": "MIT" }, + "node_modules/@types/morgan": { + "version": "1.9.10", + "resolved": "https://registry.npmjs.org/@types/morgan/-/morgan-1.9.10.tgz", + "integrity": "sha512-sS4A1zheMvsADRVfT0lYbJ4S9lmsey8Zo2F7cnbYjWHP67Q0AwMYuuzLlkIM2N8gAbb9cubhIVFwcIN2XyYCkA==", + "dev": true, + "license": "MIT", + "dependencies": { + "@types/node": "*" + } + }, "node_modules/@types/ms": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/@types/ms/-/ms-2.1.0.tgz", diff --git a/server/package.json b/server/package.json index f357408..3abaff4 100644 --- a/server/package.json +++ b/server/package.json @@ -38,10 +38,12 @@ }, "devDependencies": { "@types/bcrypt": "^6.0.0", + "@types/cookie-parser": "^1.4.10", "@types/cors": "^2.8.19", "@types/express": "^5.0.6", "@types/jest": "^30.0.0", "@types/jsonwebtoken": "^9.0.10", + "@types/morgan": "^1.9.10", "@types/node": "^25.9.1", "@types/sequelize": "^4.28.20", "@types/supertest": "^7.2.0", diff --git a/server/src/utils/SendResponse.ts b/server/src/utils/SendResponse.ts new file mode 100644 index 0000000..df0a082 --- /dev/null +++ b/server/src/utils/SendResponse.ts @@ -0,0 +1,31 @@ +import type { Response } from "express"; + +interface ApiResponse { + success: boolean; + + message: string; + + data?: T; + + meta?: { + total?: number; + + page?: number; + + limit?: number; + }; +} + + + +const sendResponse = ( + res: Response, + statusCode: number, + responseData: ApiResponse +): void => { + res.status(statusCode).json(responseData); +}; + + + +export default sendResponse; From 475d0f6d8adfb57571eb169dcc21ffa208042ad2 Mon Sep 17 00:00:00 2001 From: Yogeshwaran S Date: Tue, 26 May 2026 17:38:05 +0530 Subject: [PATCH 10/87] feat(server): implement Winston logger architecture --- server/src/middlewares/globalErrorHandler.ts | 4 +-- server/src/server.ts | 7 ++--- server/src/utils/logger.ts | 30 ++++++++++++++++++++ 3 files changed, 35 insertions(+), 6 deletions(-) create mode 100644 server/src/utils/logger.ts diff --git a/server/src/middlewares/globalErrorHandler.ts b/server/src/middlewares/globalErrorHandler.ts index ad9a24d..5aaf5b8 100644 --- a/server/src/middlewares/globalErrorHandler.ts +++ b/server/src/middlewares/globalErrorHandler.ts @@ -3,7 +3,7 @@ import type { Response, NextFunction, } from "express"; - +import logger from "../utils/logger.js"; import AppError from "../utils/AppError.js"; const globalErrorHandler = ( @@ -24,7 +24,7 @@ const globalErrorHandler = ( message = err.message; } - + logger.error(message, err); res.status(statusCode).json({ success: false, diff --git a/server/src/server.ts b/server/src/server.ts index 18b0ab3..ee64a64 100644 --- a/server/src/server.ts +++ b/server/src/server.ts @@ -1,14 +1,13 @@ import app from "./app.js"; - +import logger from "./utils/logger.js"; import env from "./config/env.js"; - import { sequelize, syncDatabase } from "./database/index.js"; const startServer = async (): Promise => { try { await sequelize.authenticate(); - console.log("✅ Database connected successfully"); + logger.info("✅ Database connected successfully"); await syncDatabase(); @@ -18,7 +17,7 @@ const startServer = async (): Promise => { ); }); } catch (error) { - console.error("❌ Server startup failed:", error); + logger.error("Server startup failed", error); process.exit(1); } diff --git a/server/src/utils/logger.ts b/server/src/utils/logger.ts new file mode 100644 index 0000000..1da5cbe --- /dev/null +++ b/server/src/utils/logger.ts @@ -0,0 +1,30 @@ +import winston from "winston"; + +const logger = winston.createLogger({ + level: "info", + + format: winston.format.combine( + winston.format.timestamp(), + + winston.format.errors({ stack: true }), + + winston.format.json() + ), + + transports: [ + new winston.transports.Console(), + + new winston.transports.File({ + filename: "logs/error.log", + level: "error", + }), + + new winston.transports.File({ + filename: "logs/combined.log", + }), + ], +}); + + + +export default logger; \ No newline at end of file From 2f8b4dd35e3bb8250704138a316d41b16a567454 Mon Sep 17 00:00:00 2001 From: Yogeshwaran S Date: Tue, 26 May 2026 18:41:17 +0530 Subject: [PATCH 11/87] fix(server): resolve TypeScript and Zod v4 validation issues --- server/src/app.ts | 2 +- server/src/config/env.ts | 17 ++++++- server/src/config/index.ts | 16 +++++++ server/src/middlewares/auth.ts | 55 ++++++++++++++++++++++ server/src/middlewares/validate.ts | 49 +++++++++++++++++++ server/src/modules/auth/auth.controller.ts | 0 server/src/modules/auth/auth.routes.ts | 25 ++++++++++ server/src/modules/auth/auth.validation.ts | 15 ++++++ server/src/types/express/index.d.ts | 11 +++++ server/src/utils/SendResponse.ts | 31 ++++++------ server/src/utils/jwt.ts | 22 +++++++++ server/tsconfig.json | 6 ++- 12 files changed, 231 insertions(+), 18 deletions(-) create mode 100644 server/src/config/index.ts create mode 100644 server/src/middlewares/auth.ts create mode 100644 server/src/middlewares/validate.ts create mode 100644 server/src/modules/auth/auth.controller.ts create mode 100644 server/src/modules/auth/auth.routes.ts create mode 100644 server/src/modules/auth/auth.validation.ts create mode 100644 server/src/types/express/index.d.ts create mode 100644 server/src/utils/jwt.ts diff --git a/server/src/app.ts b/server/src/app.ts index 193eec9..d8a61fc 100644 --- a/server/src/app.ts +++ b/server/src/app.ts @@ -14,7 +14,7 @@ import cookieParser from "cookie-parser"; import env from "./config/env.js"; -import notFoundHandler from "./middlewares/NotFoundHandler.js"; +import notFoundHandler from "./middlewares/notFoundHandler.js"; import globalErrorHandler from "./middlewares/globalErrorHandler.js"; diff --git a/server/src/config/env.ts b/server/src/config/env.ts index dff36e8..fb44989 100644 --- a/server/src/config/env.ts +++ b/server/src/config/env.ts @@ -5,13 +5,26 @@ dotenv.config(); const env = { NODE_ENV: process.env.NODE_ENV || "development", - PORT: Number(process.env.PORT) || 5000, + PORT: process.env.PORT || "5000", - DATABASE_URL: process.env.DATABASE_URL || "", + DB_NAME: process.env.DB_NAME || "", + + DB_USER: process.env.DB_USER || "", + + DB_PASSWORD: process.env.DB_PASSWORD || "", + + DB_HOST: process.env.DB_HOST || "", + + DB_PORT: process.env.DB_PORT || "5432", JWT_SECRET: process.env.JWT_SECRET || "", + JWT_EXPIRES_IN: process.env.JWT_EXPIRES_IN || "1d", + + DATABASE_URL: process.env.DATABASE_URL || "", + FRONTEND_URL: process.env.FRONTEND_URL || "http://localhost:5173", + }; export default env; \ No newline at end of file diff --git a/server/src/config/index.ts b/server/src/config/index.ts new file mode 100644 index 0000000..28003b6 --- /dev/null +++ b/server/src/config/index.ts @@ -0,0 +1,16 @@ +import dotenv from "dotenv"; + +dotenv.config(); + +const config = { + port: process.env.PORT || 5000, + + jwtSecret: process.env.JWT_SECRET || "", + + jwtExpiresIn: + process.env.JWT_EXPIRES_IN || "7d", +}; + + + +export default config; \ No newline at end of file diff --git a/server/src/middlewares/auth.ts b/server/src/middlewares/auth.ts new file mode 100644 index 0000000..0ddc395 --- /dev/null +++ b/server/src/middlewares/auth.ts @@ -0,0 +1,55 @@ +import { + Request, + Response, + NextFunction, +} from "express"; + +import AppError from "../utils/AppError.js"; +import { verifyToken } from "../utils/jwt.js"; + + + +const auth = ( + req: Request, + _res: Response, + next: NextFunction +): void => { + try { + const authHeader = + req.headers.authorization; + + if (!authHeader?.startsWith("Bearer ")) { + throw new AppError( + "Unauthorized access", + 401 + ); + } + + const token = authHeader.split(" ")[1]; + + if (!token) { + throw new AppError("Token missing", 401); + } + + const decoded = verifyToken(token); + + if (typeof decoded === "string") { + throw new AppError("Invalid token payload", 401); + } + + req.user = decoded; + + next(); + } catch (_error) { + next( + new AppError( + "Invalid or expired token", + 401 + ) + ); + } +}; + + + +export default auth; \ No newline at end of file diff --git a/server/src/middlewares/validate.ts b/server/src/middlewares/validate.ts new file mode 100644 index 0000000..2f7318c --- /dev/null +++ b/server/src/middlewares/validate.ts @@ -0,0 +1,49 @@ +import { + ZodSchema, + ZodError, +} from "zod"; + +import { + Request, + Response, + NextFunction, +} from "express"; + +import sendResponse from "../utils/SendResponse.js"; + + + +const validate = + (schema: ZodSchema) => + async ( + req: Request, + res: Response, + next: NextFunction + ): Promise => { + try { + await schema.parseAsync({ + body: req.body, + query: req.query, + params: req.params, + }); + + next(); + } catch (error) { + if (error instanceof ZodError) { + sendResponse(res, { + success: false, + statusCode: 400, + message: "Validation failed", + data: error.flatten(), + }); + + return; + } + + next(error); + } + }; + + + +export default validate; \ No newline at end of file diff --git a/server/src/modules/auth/auth.controller.ts b/server/src/modules/auth/auth.controller.ts new file mode 100644 index 0000000..e69de29 diff --git a/server/src/modules/auth/auth.routes.ts b/server/src/modules/auth/auth.routes.ts new file mode 100644 index 0000000..901371d --- /dev/null +++ b/server/src/modules/auth/auth.routes.ts @@ -0,0 +1,25 @@ +import { Router } from "express"; + +import validate from "../../middlewares/validate.js"; + +import { loginSchema } from "./auth.validation.js"; + +// import { loginUser } from "./auth.controller.js"; + + + +const router = Router(); + + + +router.post( + "/login", + + validate(loginSchema), + + // loginUser +); + + + +export default router; \ No newline at end of file diff --git a/server/src/modules/auth/auth.validation.ts b/server/src/modules/auth/auth.validation.ts new file mode 100644 index 0000000..88cdd91 --- /dev/null +++ b/server/src/modules/auth/auth.validation.ts @@ -0,0 +1,15 @@ +import { z } from "zod"; + + + +export const loginSchema = z.object({ + body: z.object({ + gmail: z + .string() + .email("Invalid email format"), + + password: z + .string() + .min(6, "Password must be at least 6 characters"), + }), +}); \ No newline at end of file diff --git a/server/src/types/express/index.d.ts b/server/src/types/express/index.d.ts new file mode 100644 index 0000000..bcd5bef --- /dev/null +++ b/server/src/types/express/index.d.ts @@ -0,0 +1,11 @@ +import { JwtPayload } from "jsonwebtoken"; + +declare global { + namespace Express { + interface Request { + user?: JwtPayload; + } + } +} + +export {}; \ No newline at end of file diff --git a/server/src/utils/SendResponse.ts b/server/src/utils/SendResponse.ts index df0a082..09b504d 100644 --- a/server/src/utils/SendResponse.ts +++ b/server/src/utils/SendResponse.ts @@ -1,31 +1,34 @@ -import type { Response } from "express"; +import { Response } from "express"; + + interface ApiResponse { success: boolean; - + statusCode: number; message: string; - data?: T; - - meta?: { - total?: number; - - page?: number; - - limit?: number; - }; } const sendResponse = ( res: Response, - statusCode: number, responseData: ApiResponse ): void => { - res.status(statusCode).json(responseData); + const { + success, + statusCode, + message, + data, + } = responseData; + + res.status(statusCode).json({ + success, + message, + data, + }); }; -export default sendResponse; +export default sendResponse; \ No newline at end of file diff --git a/server/src/utils/jwt.ts b/server/src/utils/jwt.ts new file mode 100644 index 0000000..b3c2cbe --- /dev/null +++ b/server/src/utils/jwt.ts @@ -0,0 +1,22 @@ +import jwt from "jsonwebtoken"; + +import env from "../config/env.js"; + +export const generateToken = ( + payload: object +): string => { + return jwt.sign( + payload, + env.JWT_SECRET, + { expiresIn: env.JWT_EXPIRES_IN as any }, + ); +}; + +export const verifyToken = ( + token: string +) => { + return jwt.verify( + token, + env.JWT_SECRET + ); +}; \ No newline at end of file diff --git a/server/tsconfig.json b/server/tsconfig.json index fbf7496..34ea3e7 100644 --- a/server/tsconfig.json +++ b/server/tsconfig.json @@ -34,7 +34,11 @@ "types": ["node"], - "allowSyntheticDefaultImports": true + "allowSyntheticDefaultImports": true, + + "typeRoots": ["./node_modules/@types", "./src/types"] + + }, "include": ["src"], From 5e946cb300b23088af201aa7f12cc5e12aaeaf19 Mon Sep 17 00:00:00 2001 From: Yogeshwaran S Date: Tue, 26 May 2026 19:02:35 +0530 Subject: [PATCH 12/87] feat: implement production-grade authentication module --- server/src/app.ts | 6 ++ server/src/modules/auth/auth.controller.ts | 46 +++++++++++++ server/src/modules/auth/auth.repository.ts | 25 +++++++ server/src/modules/auth/auth.routes.ts | 24 ++++--- server/src/modules/auth/auth.service.ts | 77 ++++++++++++++++++++++ server/src/modules/auth/auth.types.ts | 15 +++++ server/src/modules/auth/auth.validation.ts | 46 +++++++++++-- server/src/routes/index.ts | 12 ++++ 8 files changed, 237 insertions(+), 14 deletions(-) create mode 100644 server/src/modules/auth/auth.repository.ts create mode 100644 server/src/modules/auth/auth.service.ts create mode 100644 server/src/modules/auth/auth.types.ts create mode 100644 server/src/routes/index.ts diff --git a/server/src/app.ts b/server/src/app.ts index d8a61fc..54fea3e 100644 --- a/server/src/app.ts +++ b/server/src/app.ts @@ -18,6 +18,9 @@ import notFoundHandler from "./middlewares/notFoundHandler.js"; import globalErrorHandler from "./middlewares/globalErrorHandler.js"; +import routes from "./routes/index.js"; + + const app: Application = express(); @@ -59,5 +62,8 @@ app.get("/", (_req: Request, res: Response) => { }); +app.use("/api/v1", routes); + + export default app; \ No newline at end of file diff --git a/server/src/modules/auth/auth.controller.ts b/server/src/modules/auth/auth.controller.ts index e69de29..7506762 100644 --- a/server/src/modules/auth/auth.controller.ts +++ b/server/src/modules/auth/auth.controller.ts @@ -0,0 +1,46 @@ +import { Request, Response } from "express"; + +import asyncHandler from "../../utils/asyncHandler.js"; + +import sendResponse from "../../utils/SendResponse.js"; + +import { + loginUserService, + registerUserService, +} from "./auth.service.js"; + +export const registerUserController = + asyncHandler( + async ( + req: Request, + res: Response + ) => { + const result = + await registerUserService(req.body); + + sendResponse( + res, + 201, + "User registered successfully", + result + ); + } + ); + +export const loginUserController = + asyncHandler( + async ( + req: Request, + res: Response + ) => { + const result = + await loginUserService(req.body); + + sendResponse( + res, + 200, + "User logged in successfully", + result + ); + } + ); \ No newline at end of file diff --git a/server/src/modules/auth/auth.repository.ts b/server/src/modules/auth/auth.repository.ts new file mode 100644 index 0000000..4b2b658 --- /dev/null +++ b/server/src/modules/auth/auth.repository.ts @@ -0,0 +1,25 @@ +import User from "../../database/models/User.js"; + +import { RegisterUserInput } from "./auth.types.js"; + +export const createUser = async ( + payload: RegisterUserInput +) => { + return await User.create(payload); +}; + +export const findUserByEmail = async ( + gmail: string +) => { + return await User.findOne({ + where: { + gmail, + }, + }); +}; + +export const findUserById = async ( + uuid: string +) => { + return await User.findByPk(uuid); +}; \ No newline at end of file diff --git a/server/src/modules/auth/auth.routes.ts b/server/src/modules/auth/auth.routes.ts index 901371d..5c04950 100644 --- a/server/src/modules/auth/auth.routes.ts +++ b/server/src/modules/auth/auth.routes.ts @@ -2,24 +2,28 @@ import { Router } from "express"; import validate from "../../middlewares/validate.js"; -import { loginSchema } from "./auth.validation.js"; - -// import { loginUser } from "./auth.controller.js"; - +import { + loginSchema, + registerSchema, +} from "./auth.validation.js"; +import { + loginUserController, + registerUserController, +} from "./auth.controller.js"; const router = Router(); - +router.post( + "/register", + validate(registerSchema), + registerUserController +); router.post( "/login", - validate(loginSchema), - - // loginUser + loginUserController ); - - export default router; \ No newline at end of file diff --git a/server/src/modules/auth/auth.service.ts b/server/src/modules/auth/auth.service.ts new file mode 100644 index 0000000..c2672d1 --- /dev/null +++ b/server/src/modules/auth/auth.service.ts @@ -0,0 +1,77 @@ +import bcrypt from "bcrypt"; + +import AppError from "../../utils/AppError.js"; + +import { + createUser, + findUserByEmail, +} from "./auth.repository.js"; + +import { + LoginUserInput, + RegisterUserInput, +} from "./auth.types.js"; + +import { generateToken } from "../../utils/jwt.js"; + +export const registerUserService = async ( + payload: RegisterUserInput +) => { + const existingUser = await findUserByEmail( + payload.gmail + ); + + if (existingUser) { + throw new AppError( + "User already exists",409 + ); + } + + const hashedPassword = await bcrypt.hash( + payload.password, + 10 + ); + + const newUser = await createUser({ + ...payload, + password: hashedPassword, + }); + + return newUser; +}; + +export const loginUserService = async ( + payload: LoginUserInput +) => { + const user = await findUserByEmail( + payload.gmail + ); + + if (!user) { + throw new AppError( + "Invalid email or password",401 + ); + } + + const isPasswordMatched = + await bcrypt.compare( + payload.password, + user.password + ); + + if (!isPasswordMatched) { + throw new AppError( + "Invalid email or password",401 + ); + } + + const token = generateToken({ + userId: user.uuid, + gmail: user.gmail, + }); + + return { + token, + user, + }; +}; \ No newline at end of file diff --git a/server/src/modules/auth/auth.types.ts b/server/src/modules/auth/auth.types.ts new file mode 100644 index 0000000..559446e --- /dev/null +++ b/server/src/modules/auth/auth.types.ts @@ -0,0 +1,15 @@ +export interface RegisterUserInput { + name: string; + + gmail: string; + + password: string; + + phoneNumber?: string; +} + +export interface LoginUserInput { + gmail: string; + + password: string; +} \ No newline at end of file diff --git a/server/src/modules/auth/auth.validation.ts b/server/src/modules/auth/auth.validation.ts index 88cdd91..2b39b32 100644 --- a/server/src/modules/auth/auth.validation.ts +++ b/server/src/modules/auth/auth.validation.ts @@ -1,15 +1,53 @@ import { z } from "zod"; +// Professional regular expressions +const NAME_REGEX = /^[a-zA-Z\s]+$/; +const PASSWORD_REGEX = /^(?=.*[a-z])(?=.*[A-Z])(?=.*\d)(?=.*[@$!%*?&])[A-Za-z\d@$!%*?&]{8,}$/; +const PHONE_REGEX = /^\+?[1-9]\d{1,14}$/; +export const registerSchema = z.object({ + body: z.object({ + name: z + .string({ message: "Name is required" }) + .trim() + .min(3, "Name must contain at least 3 characters") + .max(50, "Name cannot exceed 50 characters") + .regex(NAME_REGEX, "Name can only contain alphabets and spaces"), + + gmail: z + .string({ message: "Email is required" }) // Fixed here + .trim() + .toLowerCase() + .email("Invalid email address formatting") + .endsWith("@gmail.com", "Only Gmail addresses are allowed at this time"), + + password: z + .string({ message: "Password is required" }) + .min(8, "Password must be at least 8 characters long") + .max(100, "Password is too long") + .regex( + PASSWORD_REGEX, + "Password must include at least one uppercase letter, one lowercase letter, one number, and one special character" + ), + + phoneNumber: z + .string() + .trim() + .regex(PHONE_REGEX, "Invalid phone number format (Use E.164 format, e.g., +1234567890)") + .optional() + .or(z.literal("")), + }), +}); export const loginSchema = z.object({ body: z.object({ gmail: z - .string() - .email("Invalid email format"), + .string({ message: "Email is required" }) + .trim() + .toLowerCase() + .email("Invalid email address"), password: z - .string() - .min(6, "Password must be at least 6 characters"), + .string({ message: "Password is required" }), }), }); \ No newline at end of file diff --git a/server/src/routes/index.ts b/server/src/routes/index.ts new file mode 100644 index 0000000..b4f0ec9 --- /dev/null +++ b/server/src/routes/index.ts @@ -0,0 +1,12 @@ +import { Router } from "express"; + +import authRoutes from "../modules/auth/auth.routes.js"; + +const router = Router(); + +router.use( + "/auth", + authRoutes +); + +export default router; \ No newline at end of file From 85a8d5f63ae82d167fc0e94639befb0e52ee0322 Mon Sep 17 00:00:00 2001 From: Yogeshwaran S Date: Wed, 27 May 2026 09:58:41 +0530 Subject: [PATCH 13/87] fix:solve the sendresponse arguments issue and payload issue --- server/src/modules/auth/auth.controller.ts | 24 +++++++++++----------- server/src/modules/auth/auth.repository.ts | 4 ++-- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/server/src/modules/auth/auth.controller.ts b/server/src/modules/auth/auth.controller.ts index 7506762..6be5b80 100644 --- a/server/src/modules/auth/auth.controller.ts +++ b/server/src/modules/auth/auth.controller.ts @@ -18,12 +18,12 @@ export const registerUserController = const result = await registerUserService(req.body); - sendResponse( - res, - 201, - "User registered successfully", - result - ); + sendResponse(res, { + success: true, + statusCode: 201, + message: "User registered successfully", + data: result, + }); } ); @@ -36,11 +36,11 @@ export const loginUserController = const result = await loginUserService(req.body); - sendResponse( - res, - 200, - "User logged in successfully", - result - ); + sendResponse(res, { + success: true, + statusCode: 200, + message: "User login failed", + data: result, + }); } ); \ No newline at end of file diff --git a/server/src/modules/auth/auth.repository.ts b/server/src/modules/auth/auth.repository.ts index 4b2b658..3ffb215 100644 --- a/server/src/modules/auth/auth.repository.ts +++ b/server/src/modules/auth/auth.repository.ts @@ -1,11 +1,11 @@ import User from "../../database/models/User.js"; - +import { CreationAttributes } from "sequelize"; import { RegisterUserInput } from "./auth.types.js"; export const createUser = async ( payload: RegisterUserInput ) => { - return await User.create(payload); + return await User.create(payload as CreationAttributes); }; export const findUserByEmail = async ( From 495b4a123144494c18676f7a879b9e22e2f2e59b Mon Sep 17 00:00:00 2001 From: Yogeshwaran S Date: Wed, 27 May 2026 10:40:51 +0530 Subject: [PATCH 14/87] fix: resolve auth controller typing and protected route issues --- server/src/database/models/User.ts | 9 +++++++++ server/src/middlewares/auth.ts | 3 +-- server/src/modules/auth/auth.controller.ts | 13 ++++++++++++- server/src/modules/auth/auth.routes.ts | 10 ++++++++-- server/src/modules/auth/auth.service.ts | 4 +++- server/src/types/express/index.d.ts | 10 +++++++++- server/src/utils/jwt.ts | 8 +++++--- 7 files changed, 47 insertions(+), 10 deletions(-) diff --git a/server/src/database/models/User.ts b/server/src/database/models/User.ts index 938ce3b..a4dff0c 100644 --- a/server/src/database/models/User.ts +++ b/server/src/database/models/User.ts @@ -15,6 +15,8 @@ class User extends Model, InferCreationAttributes > declare readonly created_at: Date; declare readonly updated_at: Date; + + declare role: string; } User.init( @@ -64,6 +66,13 @@ User.init( defaultValue: DataTypes.NOW, }, + role: { + type: DataTypes.STRING, + + allowNull: false, + + defaultValue: "LIBRARIAN", + }, }, { diff --git a/server/src/middlewares/auth.ts b/server/src/middlewares/auth.ts index 0ddc395..6207011 100644 --- a/server/src/middlewares/auth.ts +++ b/server/src/middlewares/auth.ts @@ -50,6 +50,5 @@ const auth = ( } }; +export default auth; - -export default auth; \ No newline at end of file diff --git a/server/src/modules/auth/auth.controller.ts b/server/src/modules/auth/auth.controller.ts index 6be5b80..dbaa7d7 100644 --- a/server/src/modules/auth/auth.controller.ts +++ b/server/src/modules/auth/auth.controller.ts @@ -43,4 +43,15 @@ export const loginUserController = data: result, }); } - ); \ No newline at end of file + ); + +export const getProfileController = asyncHandler( + async (req: Request, res: Response) => { + sendResponse(res, { + success: true, + statusCode: 200, + message: "Profile fetched successfully", + data: req.user!, + }); + } +); \ No newline at end of file diff --git a/server/src/modules/auth/auth.routes.ts b/server/src/modules/auth/auth.routes.ts index 5c04950..f4c7c71 100644 --- a/server/src/modules/auth/auth.routes.ts +++ b/server/src/modules/auth/auth.routes.ts @@ -1,7 +1,6 @@ import { Router } from "express"; - +import auth from "../../middlewares/auth.js"; import validate from "../../middlewares/validate.js"; - import { loginSchema, registerSchema, @@ -10,6 +9,7 @@ import { import { loginUserController, registerUserController, + getProfileController } from "./auth.controller.js"; const router = Router(); @@ -26,4 +26,10 @@ router.post( loginUserController ); +router.get( + "/profile", + auth, + getProfileController +); + export default router; \ No newline at end of file diff --git a/server/src/modules/auth/auth.service.ts b/server/src/modules/auth/auth.service.ts index c2672d1..20af9d4 100644 --- a/server/src/modules/auth/auth.service.ts +++ b/server/src/modules/auth/auth.service.ts @@ -68,10 +68,12 @@ export const loginUserService = async ( const token = generateToken({ userId: user.uuid, gmail: user.gmail, + role: user.role, }); return { token, user, }; -}; \ No newline at end of file +}; + diff --git a/server/src/types/express/index.d.ts b/server/src/types/express/index.d.ts index bcd5bef..11c2e3e 100644 --- a/server/src/types/express/index.d.ts +++ b/server/src/types/express/index.d.ts @@ -1,9 +1,17 @@ import { JwtPayload } from "jsonwebtoken"; +// 1. Define your strict custom payload structure +export interface JwtUserPayload extends JwtPayload { + userId: string; + gmail: string; + role: string; +} + +// 2. Tell Express to use your custom payload for req.user declare global { namespace Express { interface Request { - user?: JwtPayload; + user?: JwtUserPayload; // Uses your exact type instead of the generic one! } } } diff --git a/server/src/utils/jwt.ts b/server/src/utils/jwt.ts index b3c2cbe..4189561 100644 --- a/server/src/utils/jwt.ts +++ b/server/src/utils/jwt.ts @@ -2,8 +2,10 @@ import jwt from "jsonwebtoken"; import env from "../config/env.js"; +import { JwtUserPayload } from "../types/express/index.js"; + export const generateToken = ( - payload: object + payload: JwtUserPayload ): string => { return jwt.sign( payload, @@ -14,9 +16,9 @@ export const generateToken = ( export const verifyToken = ( token: string -) => { +) : JwtUserPayload => { return jwt.verify( token, env.JWT_SECRET - ); + ) as JwtUserPayload; }; \ No newline at end of file From 752c8b8830be89d26bbc66669edbd2e0ce51ee75 Mon Sep 17 00:00:00 2001 From: Yogeshwaran S Date: Wed, 27 May 2026 11:35:48 +0530 Subject: [PATCH 15/87] feat: implement members module with layered architecture --- server/src/database/models/Member.ts | 13 ++- server/src/middlewares/auth.ts | 2 - .../src/modules/members/member.controller.ts | 84 +++++++++++++++++++ .../src/modules/members/member.repository.ts | 49 +++++++++++ server/src/modules/members/member.routes.ts | 53 ++++++++++++ server/src/modules/members/member.service.ts | 76 +++++++++++++++++ server/src/modules/members/member.types.ts | 13 +++ .../src/modules/members/member.validation.ts | 34 ++++++++ server/src/routes/index.ts | 8 +- 9 files changed, 321 insertions(+), 11 deletions(-) create mode 100644 server/src/modules/members/member.controller.ts create mode 100644 server/src/modules/members/member.repository.ts create mode 100644 server/src/modules/members/member.routes.ts create mode 100644 server/src/modules/members/member.service.ts create mode 100644 server/src/modules/members/member.types.ts create mode 100644 server/src/modules/members/member.validation.ts diff --git a/server/src/database/models/Member.ts b/server/src/database/models/Member.ts index b90f6bc..e393fc2 100644 --- a/server/src/database/models/Member.ts +++ b/server/src/database/models/Member.ts @@ -3,6 +3,7 @@ import { InferAttributes, InferCreationAttributes, Model, + CreationOptional, } from "sequelize"; import sequelize from "../connection/database.js"; @@ -11,21 +12,25 @@ class Member extends Model< InferAttributes, InferCreationAttributes > { - declare member_id: string; + // Database-generated primary key is optional during creation + declare member_id: CreationOptional; declare user_id: string; declare membership_plan_id: string; + // These can be Date objects in Sequelize, mapping perfectly from string inputs declare start_date: Date; declare expiry_date: Date; - declare membership_status: string; + // Has a default value 'ACTIVE', making it optional on creation + declare membership_status: CreationOptional<"ACTIVE" | "EXPIRED">; - declare readonly created_at: Date; + // Timestamps are managed automatically by Sequelize + declare readonly created_at: CreationOptional; - declare readonly updated_at: Date; + declare readonly updated_at: CreationOptional; } Member.init( diff --git a/server/src/middlewares/auth.ts b/server/src/middlewares/auth.ts index 6207011..37d3997 100644 --- a/server/src/middlewares/auth.ts +++ b/server/src/middlewares/auth.ts @@ -7,8 +7,6 @@ import { import AppError from "../utils/AppError.js"; import { verifyToken } from "../utils/jwt.js"; - - const auth = ( req: Request, _res: Response, diff --git a/server/src/modules/members/member.controller.ts b/server/src/modules/members/member.controller.ts new file mode 100644 index 0000000..6cd0568 --- /dev/null +++ b/server/src/modules/members/member.controller.ts @@ -0,0 +1,84 @@ +import { Request, Response } from "express"; + +import asyncHandler from "../../utils/asyncHandler.js"; +import sendResponse from "../../utils/SendResponse.js"; + +import { + createMemberService, + deleteMemberService, + getAllMembersService, + getMemberByIdService, + updateMemberService, +} from "./member.service.js"; + +export const createMemberController = + asyncHandler(async (req: Request, res: Response) => { + const result = + await createMemberService(req.body); + + sendResponse(res, { + success: true, + statusCode: 201, + message: "Member created successfully", + data: result, + }); + }); + +export const getAllMembersController = + asyncHandler(async (_req: Request, res: Response) => { + const result = + await getAllMembersService(); + + sendResponse(res, { + success: true, + statusCode: 200, + message: "Members fetched successfully", + data: result, + }); + }); + +export const getMemberByIdController = + asyncHandler(async (req: Request, res: Response) => { + const result = + await getMemberByIdService( + req.params.id as any + ); + + sendResponse(res, { + success: true, + statusCode: 200, + message: "Member fetched successfully", + data: result, + }); + }); + +export const updateMemberController = + asyncHandler(async (req: Request, res: Response) => { + const result = + await updateMemberService( + req.params.id as any, + req.body + ); + + sendResponse(res, { + success: true, + statusCode: 200, + message: "Member updated successfully", + data: result, + }); + }); + +export const deleteMemberController = + asyncHandler(async (req: Request, res: Response) => { + const result = + await deleteMemberService( + req.params.id as any + ); + + sendResponse(res, { + success: true, + statusCode: 200, + message: "Member deleted successfully", + data: result, + }); + }); \ No newline at end of file diff --git a/server/src/modules/members/member.repository.ts b/server/src/modules/members/member.repository.ts new file mode 100644 index 0000000..cf9626f --- /dev/null +++ b/server/src/modules/members/member.repository.ts @@ -0,0 +1,49 @@ +import Member from "../../database/models/Member.js"; + +import { + CreateMemberPayload, + UpdateMemberPayload, +} from "./member.types.js"; + +export const createMemberRepository = async ( + payload: CreateMemberPayload +) => { + return await Member.create(payload as any); +}; + +export const getAllMembersRepository = async () => { + return await Member.findAll(); +}; + +export const getMemberByIdRepository = async ( + memberId: string +) => { + return await Member.findByPk(memberId); +}; + +export const updateMemberRepository = async ( + memberId: string, + payload: UpdateMemberPayload +) => { + const member = await Member.findByPk(memberId); + + if (!member) { + return null; + } + + return await member.update(payload as any); +}; + +export const deleteMemberRepository = async ( + memberId: string +) => { + const member = await Member.findByPk(memberId); + + if (!member) { + return null; + } + + await member.destroy(); + + return member; +}; \ No newline at end of file diff --git a/server/src/modules/members/member.routes.ts b/server/src/modules/members/member.routes.ts new file mode 100644 index 0000000..a31f3e2 --- /dev/null +++ b/server/src/modules/members/member.routes.ts @@ -0,0 +1,53 @@ +import { Router } from "express"; + +import auth from "../../middlewares/auth.js"; +import validate from "../../middlewares/validate.js"; + +import { + createMemberController, + deleteMemberController, + getAllMembersController, + getMemberByIdController, + updateMemberController, +} from "./member.controller.js"; + +import { + createMemberValidation, + updateMemberValidation, +} from "./member.validation.js"; + +const router = Router(); + +router.post( + "/", + auth, + validate(createMemberValidation), + createMemberController +); + +router.get( + "/", + auth, + getAllMembersController +); + +router.get( + "/:id", + auth, + getMemberByIdController +); + +router.patch( + "/:id", + auth, + validate(updateMemberValidation), + updateMemberController +); + +router.delete( + "/:id", + auth, + deleteMemberController +); + +export default router; \ No newline at end of file diff --git a/server/src/modules/members/member.service.ts b/server/src/modules/members/member.service.ts new file mode 100644 index 0000000..560764f --- /dev/null +++ b/server/src/modules/members/member.service.ts @@ -0,0 +1,76 @@ +import httpStatus from "http-status-codes"; + +import AppError from "../../utils/AppError.js"; + +import { + createMemberRepository, + deleteMemberRepository, + getAllMembersRepository, + getMemberByIdRepository, + updateMemberRepository, +} from "./member.repository.js"; + +import { + CreateMemberPayload, + UpdateMemberPayload, +} from "./member.types.js"; + +export const createMemberService = async ( + payload: CreateMemberPayload +) => { + return await createMemberRepository(payload); +}; + +export const getAllMembersService = async () => { + return await getAllMembersRepository(); +}; + +export const getMemberByIdService = async ( + memberId: string +) => { + const member = + await getMemberByIdRepository(memberId); + + if (!member) { + throw new AppError( + "Member not found",httpStatus.NOT_FOUND + ); + } + + return member; +}; + +export const updateMemberService = async ( + memberId: string, + payload: UpdateMemberPayload +) => { + const updatedMember = + await updateMemberRepository( + memberId, + payload + ); + + if (!updatedMember) { + throw new AppError( + + "Member not found", httpStatus.NOT_FOUND + ); + } + + return updatedMember; +}; + +export const deleteMemberService = async ( + memberId: string +) => { + const deletedMember = + await deleteMemberRepository(memberId); + + if (!deletedMember) { + throw new AppError( + "Member not found",httpStatus.NOT_FOUND, + ); + } + + return deletedMember; +}; \ No newline at end of file diff --git a/server/src/modules/members/member.types.ts b/server/src/modules/members/member.types.ts new file mode 100644 index 0000000..14d45b0 --- /dev/null +++ b/server/src/modules/members/member.types.ts @@ -0,0 +1,13 @@ +export interface CreateMemberPayload { + user_id: string; + membership_plan_id: string; + start_date: string; + expiry_date: string; +} + +export interface UpdateMemberPayload { + membership_plan_id?: string; + start_date?: string; + expiry_date?: string; + membership_status?: "ACTIVE" | "EXPIRED"; +} \ No newline at end of file diff --git a/server/src/modules/members/member.validation.ts b/server/src/modules/members/member.validation.ts new file mode 100644 index 0000000..4a04deb --- /dev/null +++ b/server/src/modules/members/member.validation.ts @@ -0,0 +1,34 @@ +import { z } from "zod"; + +export const createMemberValidation = z.object({ + body: z.object({ + user_id: z + .string() + .uuid("Invalid user ID"), + + membership_plan_id: z + .string() + .uuid("Invalid membership plan ID"), + + start_date: z.string(), + + expiry_date: z.string(), + }), +}); + +export const updateMemberValidation = z.object({ + body: z.object({ + membership_plan_id: z + .string() + .uuid() + .optional(), + + start_date: z.string().optional(), + + expiry_date: z.string().optional(), + + membership_status: z + .enum(["ACTIVE", "EXPIRED"]) + .optional(), + }), +}); \ No newline at end of file diff --git a/server/src/routes/index.ts b/server/src/routes/index.ts index b4f0ec9..94d589d 100644 --- a/server/src/routes/index.ts +++ b/server/src/routes/index.ts @@ -1,12 +1,10 @@ import { Router } from "express"; - import authRoutes from "../modules/auth/auth.routes.js"; +import memberRoutes from "../modules/members/member.routes.js"; const router = Router(); -router.use( - "/auth", - authRoutes -); +router.use("/auth", authRoutes); +router.use("/members", memberRoutes); export default router; \ No newline at end of file From 81482fc0140577e544f1d89bbf0c09ce1efc7d73 Mon Sep 17 00:00:00 2001 From: Yogeshwaran S Date: Wed, 27 May 2026 12:25:03 +0530 Subject: [PATCH 16/87] feat: implement advanced member module features --- .../src/modules/members/member.controller.ts | 17 +++++++- .../src/modules/members/member.repository.ts | 43 +++++++++++++++++-- server/src/modules/members/member.routes.ts | 8 ++++ server/src/modules/members/member.service.ts | 31 ++++++++++++- server/src/modules/members/member.types.ts | 7 +++ .../src/modules/members/member.validation.ts | 14 ++++++ 6 files changed, 113 insertions(+), 7 deletions(-) diff --git a/server/src/modules/members/member.controller.ts b/server/src/modules/members/member.controller.ts index 6cd0568..b0e8a36 100644 --- a/server/src/modules/members/member.controller.ts +++ b/server/src/modules/members/member.controller.ts @@ -25,9 +25,22 @@ export const createMemberController = }); export const getAllMembersController = - asyncHandler(async (_req: Request, res: Response) => { + asyncHandler(async (req: Request, res: Response) => { + const query = { + page: Number(req.query.page) || 1, + + limit: Number(req.query.limit) || 10, + + search: req.query.search as string, + + membership_status: + req.query.membership_status as + | "ACTIVE" + | "EXPIRED", + }; + const result = - await getAllMembersService(); + await getAllMembersService(query); sendResponse(res, { success: true, diff --git a/server/src/modules/members/member.repository.ts b/server/src/modules/members/member.repository.ts index cf9626f..4526799 100644 --- a/server/src/modules/members/member.repository.ts +++ b/server/src/modules/members/member.repository.ts @@ -1,8 +1,9 @@ import Member from "../../database/models/Member.js"; - +import { Op , WhereOptions} from "sequelize"; import { CreateMemberPayload, UpdateMemberPayload, + MemberQuery } from "./member.types.js"; export const createMemberRepository = async ( @@ -11,8 +12,44 @@ export const createMemberRepository = async ( return await Member.create(payload as any); }; -export const getAllMembersRepository = async () => { - return await Member.findAll(); +export const getAllMembersRepository = async ( + query: MemberQuery +) => { + const { + page = 1, + limit = 10, + search, + membership_status, + } = query; + + const offset = (page - 1) * limit; + + const whereClause: WhereOptions = {}; + + if (membership_status) { + whereClause.membership_status = + membership_status; + } + + if (search) { + whereClause[Op.or as any] = [ + { + membership_status: { + [Op.iLike]: `%${search}%`, + }, + }, + ]; + } + + return await Member.findAndCountAll({ + where: whereClause, + + limit, + + offset, + + order: [["created_at", "DESC"]], + }); }; export const getMemberByIdRepository = async ( diff --git a/server/src/modules/members/member.routes.ts b/server/src/modules/members/member.routes.ts index a31f3e2..b325081 100644 --- a/server/src/modules/members/member.routes.ts +++ b/server/src/modules/members/member.routes.ts @@ -14,6 +14,7 @@ import { import { createMemberValidation, updateMemberValidation, + getMembersQueryValidation } from "./member.validation.js"; const router = Router(); @@ -50,4 +51,11 @@ router.delete( deleteMemberController ); +router.get( + "/", + auth, + validate(getMembersQueryValidation), + getAllMembersController +); + export default router; \ No newline at end of file diff --git a/server/src/modules/members/member.service.ts b/server/src/modules/members/member.service.ts index 560764f..aa4e090 100644 --- a/server/src/modules/members/member.service.ts +++ b/server/src/modules/members/member.service.ts @@ -13,6 +13,7 @@ import { import { CreateMemberPayload, UpdateMemberPayload, + MemberQuery } from "./member.types.js"; export const createMemberService = async ( @@ -21,8 +22,34 @@ export const createMemberService = async ( return await createMemberRepository(payload); }; -export const getAllMembersService = async () => { - return await getAllMembersRepository(); +export const getAllMembersService = async ( + query: MemberQuery +) => { + const currentDate = new Date(); + + const members = + await getAllMembersRepository(query); + + for (const member of members.rows) { + if ( + member.expiry_date < currentDate && + member.membership_status !== "EXPIRED" + ) { + await member.update({ + membership_status: "EXPIRED", + }); + } + } + + return { + meta: { + total: members.count, + page: query.page || 1, + limit: query.limit || 10, + }, + + data: members.rows, + }; }; export const getMemberByIdService = async ( diff --git a/server/src/modules/members/member.types.ts b/server/src/modules/members/member.types.ts index 14d45b0..237ce64 100644 --- a/server/src/modules/members/member.types.ts +++ b/server/src/modules/members/member.types.ts @@ -10,4 +10,11 @@ export interface UpdateMemberPayload { start_date?: string; expiry_date?: string; membership_status?: "ACTIVE" | "EXPIRED"; +} + +export interface MemberQuery { + page?: number; + limit?: number; + search?: string; + membership_status?: "ACTIVE" | "EXPIRED"; } \ No newline at end of file diff --git a/server/src/modules/members/member.validation.ts b/server/src/modules/members/member.validation.ts index 4a04deb..471ec67 100644 --- a/server/src/modules/members/member.validation.ts +++ b/server/src/modules/members/member.validation.ts @@ -27,6 +27,20 @@ export const updateMemberValidation = z.object({ expiry_date: z.string().optional(), + membership_status: z + .enum(["ACTIVE", "EXPIRED"]) + .optional(), + }), +}); + +export const getMembersQueryValidation = z.object({ + query: z.object({ + page: z.string().optional(), + + limit: z.string().optional(), + + search: z.string().optional(), + membership_status: z .enum(["ACTIVE", "EXPIRED"]) .optional(), From 6a4824088ec74b38a8595559bf0d72a214954c86 Mon Sep 17 00:00:00 2001 From: Yogeshwaran S Date: Wed, 27 May 2026 12:46:07 +0530 Subject: [PATCH 17/87] feat: implement production-grade books module --- server/src/database/models/Book.ts | 2 +- server/src/database/models/Member.ts | 7 +- server/src/modules/books/book.controller.ts | 88 ++++++++++++++++++++ server/src/modules/books/book.repository.ts | 91 +++++++++++++++++++++ server/src/modules/books/book.routes.ts | 54 ++++++++++++ server/src/modules/books/book.service.ts | 86 +++++++++++++++++++ server/src/modules/books/book.types.ts | 14 ++++ server/src/modules/books/book.validation.ts | 33 ++++++++ 8 files changed, 370 insertions(+), 5 deletions(-) create mode 100644 server/src/modules/books/book.controller.ts create mode 100644 server/src/modules/books/book.repository.ts create mode 100644 server/src/modules/books/book.routes.ts create mode 100644 server/src/modules/books/book.service.ts create mode 100644 server/src/modules/books/book.types.ts create mode 100644 server/src/modules/books/book.validation.ts diff --git a/server/src/database/models/Book.ts b/server/src/database/models/Book.ts index 11ea23e..3df2ed4 100644 --- a/server/src/database/models/Book.ts +++ b/server/src/database/models/Book.ts @@ -21,7 +21,7 @@ class Book extends Model< declare total_copies: number; - declare available_copies: number; + declare available_copies:number; declare lending_count: number; diff --git a/server/src/database/models/Member.ts b/server/src/database/models/Member.ts index e393fc2..865eea6 100644 --- a/server/src/database/models/Member.ts +++ b/server/src/database/models/Member.ts @@ -12,22 +12,21 @@ class Member extends Model< InferAttributes, InferCreationAttributes > { - // Database-generated primary key is optional during creation + declare member_id: CreationOptional; declare user_id: string; declare membership_plan_id: string; - // These can be Date objects in Sequelize, mapping perfectly from string inputs + declare start_date: Date; declare expiry_date: Date; - // Has a default value 'ACTIVE', making it optional on creation + declare membership_status: CreationOptional<"ACTIVE" | "EXPIRED">; - // Timestamps are managed automatically by Sequelize declare readonly created_at: CreationOptional; declare readonly updated_at: CreationOptional; diff --git a/server/src/modules/books/book.controller.ts b/server/src/modules/books/book.controller.ts new file mode 100644 index 0000000..9a56c0e --- /dev/null +++ b/server/src/modules/books/book.controller.ts @@ -0,0 +1,88 @@ +import { Request, Response } from "express"; + +import asyncHandler from "../../utils/asyncHandler.js"; +import sendResponse from "../../utils/SendResponse.js"; + +import bookService from "./book.service.js"; + +export const createBookController = asyncHandler( + async (req: Request, res: Response) => { + const result = await bookService.createBook(req.body); + + sendResponse(res, { + success: true, + statusCode: 201, + message: "Book created successfully", + data: result, + }); + } +); + +export const getBooksController = asyncHandler( + async (req: Request, res: Response) => { + const page = Number(req.query.page) || 1; + + const limit = Number(req.query.limit) || 10; + + const search = req.query.search as string; + + const category_id = req.query.category_id as string; + + const result = await bookService.getBooks( + page, + limit, + search, + category_id + ); + + sendResponse(res, { + success: true, + statusCode: 200, + message: "Books fetched successfully", + data: result, + }); + } +); + +export const getBookByIdController = asyncHandler( + async (req: Request, res: Response) => { + const result = await bookService.getBookById( + req.params.bookId as any + ); + + sendResponse(res, { + success: true, + statusCode: 200, + message: "Book fetched successfully", + data: result, + }); + } +); + +export const updateBookController = asyncHandler( + async (req: Request, res: Response) => { + const result = await bookService.updateBook( + req.params.bookId as any, + req.body + ); + + sendResponse(res, { + success: true, + statusCode: 200, + message: "Book updated successfully", + data: result, + }); + } +); + +export const deleteBookController = asyncHandler( + async (req: Request, res: Response) => { + await bookService.deleteBook(req.params.bookId as any); + + sendResponse(res, { + success: true, + statusCode: 200, + message: "Book deleted successfully", + }); + } +); \ No newline at end of file diff --git a/server/src/modules/books/book.repository.ts b/server/src/modules/books/book.repository.ts new file mode 100644 index 0000000..3d437c0 --- /dev/null +++ b/server/src/modules/books/book.repository.ts @@ -0,0 +1,91 @@ +import { Op } from "sequelize"; + +import Book from "../../database/models/Book.js"; +import Category from "../../database/models/Category.js"; + +import { + CreateBookPayload, + UpdateBookPayload, +} from "./book.types.js"; + +class BookRepository { + async createBook(payload: CreateBookPayload) { + return Book.create({ + ...payload as any, + available_copies: payload.total_copies, + }); + } + + async getBooks( + page: number, + limit: number, + search?: string, + category_id?: string + ) { + const offset = (page - 1) * limit; + + return Book.findAndCountAll({ + where: { + ...(search && { + [Op.or]: [ + { + book_name: { + [Op.iLike]: `%${search}%`, + }, + }, + + { + book_author: { + [Op.iLike]: `%${search}%`, + }, + }, + ], + }), + + ...(category_id && { category_id }), + }, + + include: [ + { + model: Category, + as: "category", + }, + ], + + limit, + offset, + + order: [["created_at", "DESC"]], + }); + } + + async getBookById(book_id: string) { + return Book.findByPk(book_id, { + include: [ + { + model: Category, + as: "category", + }, + ], + }); + } + + async updateBook( + book_id: string, + payload: UpdateBookPayload + ) { + await Book.update(payload, { + where: { book_id }, + }); + + return this.getBookById(book_id); + } + + async deleteBook(book_id: string) { + return Book.destroy({ + where: { book_id }, + }); + } +} + +export default new BookRepository(); \ No newline at end of file diff --git a/server/src/modules/books/book.routes.ts b/server/src/modules/books/book.routes.ts new file mode 100644 index 0000000..d8673a1 --- /dev/null +++ b/server/src/modules/books/book.routes.ts @@ -0,0 +1,54 @@ +import { Router } from "express"; + +import validate from "../../middlewares/validate.js"; + +import auth from "../../middlewares/auth.js"; + +import { + createBookController, + deleteBookController, + getBookByIdController, + getBooksController, + updateBookController, +} from "./book.controller.js"; + +import { + createBookSchema, + updateBookSchema, +} from "./book.validation.js"; + +const router = Router(); + +router.post( + "/", + auth, + validate(createBookSchema), + createBookController +); + +router.get( + "/", + auth, + getBooksController +); + +router.get( + "/:bookId", + auth, + getBookByIdController +); + +router.patch( + "/:bookId", + auth, + validate(updateBookSchema), + updateBookController +); + +router.delete( + "/:bookId", + auth, + deleteBookController +); + +export default router; \ No newline at end of file diff --git a/server/src/modules/books/book.service.ts b/server/src/modules/books/book.service.ts new file mode 100644 index 0000000..5565ba7 --- /dev/null +++ b/server/src/modules/books/book.service.ts @@ -0,0 +1,86 @@ +import httpStatus from "http-status-codes"; + +import AppError from "../../utils/AppError.js"; + +import Category from "../../database/models/Category.js"; + +import bookRepository from "./book.repository.js"; + +import { + CreateBookPayload, + UpdateBookPayload, +} from "./book.types.js"; + +class BookService { + async createBook(payload: CreateBookPayload) { + const category = await Category.findByPk( + payload.category_id + ); + + if (!category) { + throw new AppError( + "Category not found",httpStatus.NOT_FOUND + ); + } + + return bookRepository.createBook(payload); + } + + async getBooks( + page: number, + limit: number, + search?: string, + category_id?: string + ) { + return bookRepository.getBooks( + page, + limit, + search, + category_id + ); + } + + async getBookById(book_id: string) { + const book = await bookRepository.getBookById(book_id); + + if (!book) { + throw new AppError( + + "Book not found",httpStatus.NOT_FOUND, + ); + } + + return book; + } + + async updateBook( + book_id: string, + payload: UpdateBookPayload + ) { + const existingBook = + await bookRepository.getBookById(book_id); + + if (!existingBook) { + throw new AppError( + "Book not found",httpStatus.NOT_FOUND, + ); + } + + return bookRepository.updateBook(book_id, payload); + } + + async deleteBook(book_id: string) { + const existingBook = + await bookRepository.getBookById(book_id); + + if (!existingBook) { + throw new AppError( + "Book not found",httpStatus.NOT_FOUND, + ); + } + + return bookRepository.deleteBook(book_id); + } +} + +export default new BookService(); \ No newline at end of file diff --git a/server/src/modules/books/book.types.ts b/server/src/modules/books/book.types.ts new file mode 100644 index 0000000..68385eb --- /dev/null +++ b/server/src/modules/books/book.types.ts @@ -0,0 +1,14 @@ +export interface CreateBookPayload { + book_name: string; + book_author: string; + category_id: string; + total_copies: number; +} + +export interface UpdateBookPayload { + book_name?: string; + book_author?: string; + category_id?: string; + total_copies?: number; + available_copies?: number; +} \ No newline at end of file diff --git a/server/src/modules/books/book.validation.ts b/server/src/modules/books/book.validation.ts new file mode 100644 index 0000000..7e15ba4 --- /dev/null +++ b/server/src/modules/books/book.validation.ts @@ -0,0 +1,33 @@ +import { z } from "zod"; + +export const createBookSchema = z.object({ + body: z.object({ + book_name: z + .string() + .min(2, "Book name must contain at least 2 characters"), + + book_author: z + .string() + .min(2, "Author name must contain at least 2 characters"), + + category_id: z.uuid(), + + total_copies: z + .number() + .min(1, "Total copies must be at least 1"), + }), +}); + +export const updateBookSchema = z.object({ + body: z.object({ + book_name: z.string().optional(), + + book_author: z.string().optional(), + + category_id: z.uuid().optional(), + + total_copies: z.number().optional(), + + available_copies: z.number().optional(), + }), +}); \ No newline at end of file From 983919609bd88ce573043d63aa72d5ac36defd39 Mon Sep 17 00:00:00 2001 From: Yogeshwaran S Date: Wed, 27 May 2026 13:12:49 +0530 Subject: [PATCH 18/87] fix: imporve type safety in books module --- server/src/database/models/Book.ts | 9 ++++----- server/src/modules/books/book.repository.ts | 6 +++--- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/server/src/database/models/Book.ts b/server/src/database/models/Book.ts index 3df2ed4..e4cd99a 100644 --- a/server/src/database/models/Book.ts +++ b/server/src/database/models/Book.ts @@ -3,6 +3,7 @@ import { InferAttributes, InferCreationAttributes, Model, + CreationOptional } from "sequelize"; import sequelize from "../connection/database.js"; @@ -23,11 +24,9 @@ class Book extends Model< declare available_copies:number; - declare lending_count: number; - - declare readonly created_at: Date; - - declare readonly updated_at: Date; + declare lending_count: CreationOptional; // Defaults to 0 in database + declare readonly created_at: CreationOptional; // Handled by timestamps + declare readonly updated_at: CreationOptional; } Book.init( diff --git a/server/src/modules/books/book.repository.ts b/server/src/modules/books/book.repository.ts index 3d437c0..0ac97a7 100644 --- a/server/src/modules/books/book.repository.ts +++ b/server/src/modules/books/book.repository.ts @@ -1,4 +1,4 @@ -import { Op } from "sequelize"; +import { Op,CreationAttributes } from "sequelize"; import Book from "../../database/models/Book.js"; import Category from "../../database/models/Category.js"; @@ -11,9 +11,9 @@ import { class BookRepository { async createBook(payload: CreateBookPayload) { return Book.create({ - ...payload as any, + ...payload, available_copies: payload.total_copies, - }); + } as CreationAttributes); } async getBooks( From d0a2cf858308c5c96ab095f083b5cb0b7cbd875d Mon Sep 17 00:00:00 2001 From: Yogeshwaran S Date: Wed, 27 May 2026 14:26:19 +0530 Subject: [PATCH 19/87] feat: implement production-grade issue management module --- server/src/database/models/Fine.ts | 10 +- server/src/database/models/Issue.ts | 14 +- server/src/modules/issues/issue.controller.ts | 72 ++++++++ server/src/modules/issues/issue.repository.ts | 58 +++++++ server/src/modules/issues/issue.routes.ts | 40 +++++ server/src/modules/issues/issue.service.ts | 156 ++++++++++++++++++ server/src/modules/issues/issue.types.ts | 8 + server/src/modules/issues/issue.validation.ts | 15 ++ server/src/routes/index.ts | 6 + 9 files changed, 366 insertions(+), 13 deletions(-) create mode 100644 server/src/modules/issues/issue.controller.ts create mode 100644 server/src/modules/issues/issue.repository.ts create mode 100644 server/src/modules/issues/issue.routes.ts create mode 100644 server/src/modules/issues/issue.service.ts create mode 100644 server/src/modules/issues/issue.types.ts create mode 100644 server/src/modules/issues/issue.validation.ts diff --git a/server/src/database/models/Fine.ts b/server/src/database/models/Fine.ts index 9b6746b..cecb804 100644 --- a/server/src/database/models/Fine.ts +++ b/server/src/database/models/Fine.ts @@ -3,6 +3,7 @@ import { InferAttributes, InferCreationAttributes, Model, + CreationOptional } from "sequelize"; import sequelize from "../connection/database.js"; @@ -19,13 +20,12 @@ class Fine extends Model< declare fine_amount: number; - declare paid_status: boolean; + declare paid_status: CreationOptional<"PAID" | "UNPAID">; // Defaults to 'UNPAID' + declare paid_date: CreationOptional; - declare paid_date: Date | null; + declare readonly created_at: CreationOptional; + declare readonly updated_at: CreationOptional; - declare readonly created_at: Date; - - declare readonly updated_at: Date; } Fine.init( diff --git a/server/src/database/models/Issue.ts b/server/src/database/models/Issue.ts index 28a1955..f4e0aac 100644 --- a/server/src/database/models/Issue.ts +++ b/server/src/database/models/Issue.ts @@ -3,6 +3,7 @@ import { InferAttributes, InferCreationAttributes, Model, + CreationOptional } from "sequelize"; import sequelize from "../connection/database.js"; @@ -17,17 +18,14 @@ class Issue extends Model< declare book_id: string; - declare borrowed_date: Date; - declare due_date: Date; - declare returned_date: Date | null; - - declare issue_status: string; - - declare readonly created_at: Date; + declare borrowed_date: CreationOptional; // Defaults to CURRENT_TIMESTAMP + declare issue_status: CreationOptional; // Defaults to 'ISSUED' or similar + declare returned_date: CreationOptional; - declare readonly updated_at: Date; + declare readonly created_at: CreationOptional; + declare readonly updated_at: CreationOptional; } Issue.init( diff --git a/server/src/modules/issues/issue.controller.ts b/server/src/modules/issues/issue.controller.ts new file mode 100644 index 0000000..a219ff9 --- /dev/null +++ b/server/src/modules/issues/issue.controller.ts @@ -0,0 +1,72 @@ +import { Request, Response } from "express"; + +import asyncHandler from "../../utils/asyncHandler.js"; + +import sendResponse from "../../utils/SendResponse.js"; + +import issueService from "./issue.service.js"; + +export const borrowBookController = + asyncHandler( + async ( + req: Request, + res: Response + ) => { + const result = + await issueService.borrowBook( + req.body.member_id, + req.body.book_id + ); + + sendResponse(res, { + success: true, + statusCode: 201, + message: + "Book borrowed successfully", + data: result, + }); + } + ); + +export const returnBookController = + asyncHandler( + async ( + req: Request, + res: Response + ) => { + const result = + await issueService.returnBook( + req.body.issue_id + ); + + sendResponse(res, { + success: true, + statusCode: 200, + message: + "Book returned successfully", + data: result, + }); + } + ); + +export const getMemberIssuesController = + asyncHandler( + async ( + req: Request, + res: Response + ) => { + const memberId = req.params.memberId as string; + const result = + await issueService.getMemberIssues( + memberId + ); + + sendResponse(res, { + success: true, + statusCode: 200, + message: + "Issues fetched successfully", + data: result, + }); + } + ); \ No newline at end of file diff --git a/server/src/modules/issues/issue.repository.ts b/server/src/modules/issues/issue.repository.ts new file mode 100644 index 0000000..075430a --- /dev/null +++ b/server/src/modules/issues/issue.repository.ts @@ -0,0 +1,58 @@ +import Issue from "../../database/models/Issue.js"; +import { CreationAttributes } from "sequelize"; +class IssueRepository { + async createIssue(data: { + member_id: string; + book_id: string; + due_date: Date; + }) { + return Issue.create(data as CreationAttributes); + } + + async findIssueById(issue_id: string) { + return Issue.findByPk(issue_id); + } + + async getActiveIssue( + member_id: string, + book_id: string + ) { + return Issue.findOne({ + where: { + member_id, + book_id, + returned_date: null, + }, + }); + } + + async returnBook( + issue_id: string, + returned_date: Date + ) { + await Issue.update( + { + returned_date, + }, + { + where: { + issue_id, + }, + } + ); + + return this.findIssueById(issue_id); + } + + async getMemberIssues(member_id: string) { + return Issue.findAll({ + where: { + member_id, + }, + + order: [["created_at", "DESC"]], + }); + } +} + +export default new IssueRepository(); \ No newline at end of file diff --git a/server/src/modules/issues/issue.routes.ts b/server/src/modules/issues/issue.routes.ts new file mode 100644 index 0000000..c4f2818 --- /dev/null +++ b/server/src/modules/issues/issue.routes.ts @@ -0,0 +1,40 @@ +import { Router } from "express"; + +import auth from "../../middlewares/auth.js"; + +import validate from "../../middlewares/validate.js"; + +import { + borrowBookController, + getMemberIssuesController, + returnBookController, +} from "./issue.controller.js"; + +import { + createIssueSchema, + returnBookSchema, +} from "./issue.validation.js"; + +const router = Router(); + +router.post( + "/borrow", + auth, + validate(createIssueSchema), + borrowBookController +); + +router.post( + "/return", + auth, + validate(returnBookSchema), + returnBookController +); + +router.get( + "/member/:memberId", + auth, + getMemberIssuesController +); + +export default router; \ No newline at end of file diff --git a/server/src/modules/issues/issue.service.ts b/server/src/modules/issues/issue.service.ts new file mode 100644 index 0000000..896f4a7 --- /dev/null +++ b/server/src/modules/issues/issue.service.ts @@ -0,0 +1,156 @@ +import httpStatus from "http-status-codes"; + +import AppError from "../../utils/AppError.js"; +import { CreationAttributes } from "sequelize"; +import Member from "../../database/models/Member.js"; +import Book from "../../database/models/Book.js"; +import Fine from "../../database/models/Fine.js"; + +import issueRepository from "./issue.repository.js"; + +class IssueService { + async borrowBook( + member_id: string, + book_id: string + ) { + const member = await Member.findByPk(member_id); + + if (!member) { + throw new AppError( + "Member not found", httpStatus.NOT_FOUND + ); + } + + if (member.membership_status !== "ACTIVE") { + throw new AppError( + "Membership expired",httpStatus.BAD_REQUEST + ); + } + + const book = await Book.findByPk(book_id); + + if (!book) { + throw new AppError( + "Book not found", httpStatus.NOT_FOUND + ); + } + + if (book.available_copies <= 0) { + throw new AppError( + "Book unavailable", httpStatus.BAD_REQUEST + ); + } + + const existingIssue = + await issueRepository.getActiveIssue( + member_id, + book_id + ); + + if (existingIssue) { + throw new AppError( + "Book already borrowed",httpStatus.BAD_REQUEST + ); + } + + const due_date = new Date(); + + due_date.setDate(due_date.getDate() + 14); + + const issue = + await issueRepository.createIssue({ + member_id, + book_id, + due_date, + }); + + await Book.update( + { + available_copies: + book.available_copies - 1, + + lending_count: + book.lending_count + 1, + }, + { + where: { + book_id, + }, + } + ); + + return issue; + } + + async returnBook(issue_id: string) { + const issue = + await issueRepository.findIssueById(issue_id); + + if (!issue) { + throw new AppError( + "Issue record not found", httpStatus.NOT_FOUND + ); + } + + if (issue.returned_date) { + throw new AppError( + "Book already returned", httpStatus.BAD_REQUEST + ); + } + + const returned_date = new Date(); + + const updatedIssue = + await issueRepository.returnBook( + issue_id, + returned_date + ); + + const book = await Book.findByPk(issue.book_id); + + if (book) { + await Book.update( + { + available_copies: + book.available_copies + 1, + }, + { + where: { + book_id: issue.book_id, + }, + } + ); + } + + const dueDate = new Date(issue.due_date); + + if (returned_date > dueDate) { + const difference = + returned_date.getTime() - + dueDate.getTime(); + + const delayed_days = Math.ceil( + difference / (1000 * 60 * 60 * 24) + ); + + const fine_amount = + delayed_days * 10; + + await Fine.create({ + issue_id: issue.issue_id, + delayed_days, + fine_amount, + } as CreationAttributes); // + } + + return updatedIssue; + } + + async getMemberIssues(member_id: string) { + return issueRepository.getMemberIssues( + member_id + ); + } +} + +export default new IssueService(); \ No newline at end of file diff --git a/server/src/modules/issues/issue.types.ts b/server/src/modules/issues/issue.types.ts new file mode 100644 index 0000000..926ee0b --- /dev/null +++ b/server/src/modules/issues/issue.types.ts @@ -0,0 +1,8 @@ +export interface CreateIssuePayload { + member_id: string; + book_id: string; +} + +export interface ReturnBookPayload { + issue_id: string; +} \ No newline at end of file diff --git a/server/src/modules/issues/issue.validation.ts b/server/src/modules/issues/issue.validation.ts new file mode 100644 index 0000000..9d73842 --- /dev/null +++ b/server/src/modules/issues/issue.validation.ts @@ -0,0 +1,15 @@ +import { z } from "zod"; + +export const createIssueSchema = z.object({ + body: z.object({ + member_id: z.uuid(), + + book_id: z.uuid(), + }), +}); + +export const returnBookSchema = z.object({ + body: z.object({ + issue_id: z.uuid(), + }), +}); \ No newline at end of file diff --git a/server/src/routes/index.ts b/server/src/routes/index.ts index 94d589d..7384d55 100644 --- a/server/src/routes/index.ts +++ b/server/src/routes/index.ts @@ -1,10 +1,16 @@ import { Router } from "express"; import authRoutes from "../modules/auth/auth.routes.js"; import memberRoutes from "../modules/members/member.routes.js"; +import bookRoutes from "../modules/books/book.routes.js" +import issueRoutes from "../modules/issues/issue.routes.js"; + + const router = Router(); router.use("/auth", authRoutes); router.use("/members", memberRoutes); +router.use("/books", bookRoutes) +router.use("/issues", issueRoutes) export default router; \ No newline at end of file From e61cff7005b17a79df324518305c492b03d20128 Mon Sep 17 00:00:00 2001 From: Yogeshwaran S Date: Wed, 27 May 2026 14:41:53 +0530 Subject: [PATCH 20/87] feat: implement production-grade fine management module --- server/src/modules/fines/fine.controller.ts | 88 +++++++++++++++++++++ server/src/modules/fines/fine.repository.ts | 51 ++++++++++++ server/src/modules/fines/fine.routes.ts | 43 ++++++++++ server/src/modules/fines/fine.service.ts | 60 ++++++++++++++ server/src/modules/fines/fine.types.ts | 3 + server/src/modules/fines/fine.validation.ts | 7 ++ 6 files changed, 252 insertions(+) create mode 100644 server/src/modules/fines/fine.controller.ts create mode 100644 server/src/modules/fines/fine.repository.ts create mode 100644 server/src/modules/fines/fine.routes.ts create mode 100644 server/src/modules/fines/fine.service.ts create mode 100644 server/src/modules/fines/fine.types.ts create mode 100644 server/src/modules/fines/fine.validation.ts diff --git a/server/src/modules/fines/fine.controller.ts b/server/src/modules/fines/fine.controller.ts new file mode 100644 index 0000000..2902e37 --- /dev/null +++ b/server/src/modules/fines/fine.controller.ts @@ -0,0 +1,88 @@ +import { Request, Response } from "express"; + +import asyncHandler from "../../utils/asyncHandler.js"; + +import sendResponse from "../../utils/SendResponse.js"; + +import fineService from "./fine.service.js"; + +export const getAllFinesController = + asyncHandler( + async ( + req: Request, + res: Response + ) => { + const result = + await fineService.getAllFines(); + + sendResponse(res, { + success: true, + statusCode: 200, + message: + "Fines fetched successfully", + data: result, + }); + } + ); + +export const payFineController = + asyncHandler( + async ( + req: Request, + res: Response + ) => { + const result = + await fineService.payFine( + req.body.fine_id + ); + + sendResponse(res, { + success: true, + statusCode: 200, + message: + "Fine paid successfully", + data: result, + }); + } + ); + +export const getPendingFinesController = + asyncHandler( + async ( + req: Request, + res: Response + ) => { + const result = + await fineService.getPendingFines(); + + sendResponse(res, { + success: true, + statusCode: 200, + message: + "Pending fines fetched successfully", + data: result, + }); + } + ); + +export const getMemberFinesController = + asyncHandler( + async ( + req: Request, + res: Response + ) => { + const memberId = req.params.memberId as string; + const result = + await fineService.getMemberFines( + memberId + ); + + sendResponse(res, { + success: true, + statusCode: 200, + message: + "Member fines fetched successfully", + data: result, + }); + } + ); \ No newline at end of file diff --git a/server/src/modules/fines/fine.repository.ts b/server/src/modules/fines/fine.repository.ts new file mode 100644 index 0000000..b46409f --- /dev/null +++ b/server/src/modules/fines/fine.repository.ts @@ -0,0 +1,51 @@ +import Fine from "../../database/models/Fine.js"; +import { CreationOptional } from "sequelize"; + + +class FineRepository { + async getAllFines() { + return Fine.findAll({ + order: [["created_at", "DESC"]], + }); + } + + async getFineById(fine_id: string) { + return Fine.findByPk(fine_id); + } + + async getMemberFines(issue_ids: string[]) { + return Fine.findAll({ + where: { + issue_id: issue_ids, + }, + }); + } + + async payFine(fine_id: string) { + await Fine.update( + { + paid_status: "PAID", + paid_date: new Date(), + }, + { + where: { + fine_id, + }, + } + ) ; + + return this.getFineById(fine_id) ; + } + + async getPendingFines() { + return Fine.findAll({ + where: { + paid_status: false, + }, + + order: [["created_at", "DESC"]], + }); + } +} + +export default new FineRepository(); \ No newline at end of file diff --git a/server/src/modules/fines/fine.routes.ts b/server/src/modules/fines/fine.routes.ts new file mode 100644 index 0000000..173f2df --- /dev/null +++ b/server/src/modules/fines/fine.routes.ts @@ -0,0 +1,43 @@ +import { Router } from "express"; + +import auth from "../../middlewares/auth.js"; + +import validate from "../../middlewares/validate.js"; + +import { + getAllFinesController, + getMemberFinesController, + getPendingFinesController, + payFineController, +} from "./fine.controller.js"; + +import { payFineSchema } from "./fine.validation.js"; + +const router = Router(); + +router.get( + "/", + auth, + getAllFinesController +); + +router.get( + "/pending", + auth, + getPendingFinesController +); + +router.get( + "/member/:memberId", + auth, + getMemberFinesController +); + +router.patch( + "/pay", + auth, + validate(payFineSchema), + payFineController +); + +export default router; \ No newline at end of file diff --git a/server/src/modules/fines/fine.service.ts b/server/src/modules/fines/fine.service.ts new file mode 100644 index 0000000..2b60476 --- /dev/null +++ b/server/src/modules/fines/fine.service.ts @@ -0,0 +1,60 @@ +import httpStatus from "http-status-codes"; + +import AppError from "../../utils/AppError.js"; + +import Issue from "../../database/models/Issue.js"; + +import fineRepository from "./fine.repository.js"; + +class FineService { + async getAllFines() { + return fineRepository.getAllFines(); + } + + async payFine(fine_id: string) { + const fine = + await fineRepository.getFineById( + fine_id + ); + + if (!fine) { + throw new AppError( + + "Fine not found", httpStatus.NOT_FOUND + ); + } + + if (fine.paid_status) { + throw new AppError( + + "Fine already paid",httpStatus.BAD_REQUEST + ); + } + + return fineRepository.payFine( + fine_id + ); + } + + async getPendingFines() { + return fineRepository.getPendingFines(); + } + + async getMemberFines(member_id: string) { + const issues = await Issue.findAll({ + where: { + member_id, + }, + }); + + const issue_ids = issues.map( + (issue) => issue.issue_id + ); + + return fineRepository.getMemberFines( + issue_ids + ); + } +} + +export default new FineService(); \ No newline at end of file diff --git a/server/src/modules/fines/fine.types.ts b/server/src/modules/fines/fine.types.ts new file mode 100644 index 0000000..05891c4 --- /dev/null +++ b/server/src/modules/fines/fine.types.ts @@ -0,0 +1,3 @@ +export interface PayFinePayload { + fine_id: string; +} \ No newline at end of file diff --git a/server/src/modules/fines/fine.validation.ts b/server/src/modules/fines/fine.validation.ts new file mode 100644 index 0000000..c577ad3 --- /dev/null +++ b/server/src/modules/fines/fine.validation.ts @@ -0,0 +1,7 @@ +import { z } from "zod"; + +export const payFineSchema = z.object({ + body: z.object({ + fine_id: z.uuid(), + }), +}); \ No newline at end of file From df6dfdf3a36d00bfe63b4a8c9a72c3d96bbe103f Mon Sep 17 00:00:00 2001 From: Yogeshwaran S Date: Wed, 27 May 2026 14:42:52 +0530 Subject: [PATCH 21/87] feat: implement production-grade fine management module --- server/src/routes/index.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/server/src/routes/index.ts b/server/src/routes/index.ts index 7384d55..f6a8253 100644 --- a/server/src/routes/index.ts +++ b/server/src/routes/index.ts @@ -3,7 +3,7 @@ import authRoutes from "../modules/auth/auth.routes.js"; import memberRoutes from "../modules/members/member.routes.js"; import bookRoutes from "../modules/books/book.routes.js" import issueRoutes from "../modules/issues/issue.routes.js"; - +import fineRoutes from "../modules/fines/fine.routes.js" const router = Router(); @@ -12,5 +12,6 @@ router.use("/auth", authRoutes); router.use("/members", memberRoutes); router.use("/books", bookRoutes) router.use("/issues", issueRoutes) +router.use("/fines", fineRoutes) export default router; \ No newline at end of file From 994a09854017963c96fa20a0f54c90ff842100ca Mon Sep 17 00:00:00 2001 From: Yogeshwaran S Date: Wed, 27 May 2026 15:02:11 +0530 Subject: [PATCH 22/87] feat: implement dashboard analytics module --- .../modules/dashboard/dashboard.controller.ts | 59 ++++++++ .../modules/dashboard/dashboard.repository.ts | 134 ++++++++++++++++++ .../src/modules/dashboard/dashboard.routes.ts | 38 +++++ .../modules/dashboard/dashboard.service.ts | 21 +++ .../src/modules/dashboard/dashboard.types.ts | 24 ++++ server/src/routes/index.ts | 3 +- 6 files changed, 278 insertions(+), 1 deletion(-) create mode 100644 server/src/modules/dashboard/dashboard.controller.ts create mode 100644 server/src/modules/dashboard/dashboard.repository.ts create mode 100644 server/src/modules/dashboard/dashboard.routes.ts create mode 100644 server/src/modules/dashboard/dashboard.service.ts create mode 100644 server/src/modules/dashboard/dashboard.types.ts diff --git a/server/src/modules/dashboard/dashboard.controller.ts b/server/src/modules/dashboard/dashboard.controller.ts new file mode 100644 index 0000000..6efa311 --- /dev/null +++ b/server/src/modules/dashboard/dashboard.controller.ts @@ -0,0 +1,59 @@ +import { Request, Response } from "express"; +import httpStatus from "http-status-codes"; + +import asyncHandler from "../../utils/asyncHandler.js"; +import sendResponse from "../../utils/SendResponse.js"; + +import dashboardService from "./dashboard.service.js"; + +export const getDashboardOverviewController = asyncHandler( + async (_req: Request, res: Response) => { + const data = await dashboardService.getOverview(); + + sendResponse(res, { + success: true, + statusCode: httpStatus.OK, + message: "Dashboard overview fetched successfully", + data, + }); + } +); + +export const getPopularBooksController = asyncHandler( + async (_req: Request, res: Response) => { + const data = await dashboardService.getPopularBooks(); + + sendResponse(res, { + success: true, + statusCode: httpStatus.OK, + message: "Popular books fetched successfully", + data, + }); + } +); + +export const getRecentIssuesController = asyncHandler( + async (_req: Request, res: Response) => { + const data = await dashboardService.getRecentIssues(); + + sendResponse(res, { + success: true, + statusCode: httpStatus.OK, + message: "Recent issues fetched successfully", + data, + }); + } +); + +export const getMonthlyFineCollectionController = asyncHandler( + async (_req: Request, res: Response) => { + const data = await dashboardService.getMonthlyFineCollection(); + + sendResponse(res, { + success: true, + statusCode: httpStatus.OK, + message: "Monthly fine analytics fetched successfully", + data, + }); + } +); \ No newline at end of file diff --git a/server/src/modules/dashboard/dashboard.repository.ts b/server/src/modules/dashboard/dashboard.repository.ts new file mode 100644 index 0000000..3da6cbe --- /dev/null +++ b/server/src/modules/dashboard/dashboard.repository.ts @@ -0,0 +1,134 @@ +import { Op, fn, col, literal } from "sequelize"; + +import Book from "../../database/models/Book.js"; +import Fine from "../../database/models/Fine.js"; +import Issue from "../../database/models/Issue.js"; +import Member from "../../database/models/Member.js"; +import User from "../../database/models/User.js"; + +class DashboardRepository { + async getOverview() { + const [ + totalBooks, + totalMembers, + activeMembers, + expiredMembers, + issuedBooks, + returnedBooks, + overdueBooks, + unpaidFines, + ] = await Promise.all([ + Book.count(), + + Member.count(), + + Member.count({ + where: { + membership_status: "ACTIVE", + }, + }), + + Member.count({ + where: { + membership_status: "EXPIRED", + }, + }), + + Issue.count(), + + Issue.count({ + where: { + returned_date: { + [Op.not]: null, + }, + }, + }), + + Issue.count({ + where: { + returned_date: null, + due_date: { + [Op.lt]: new Date(), + }, + }, + }), + + Fine.sum("fine_amount", { + where: { + paid_status: "UNPAID", + }, + }), + ]); + + return { + totalBooks, + totalMembers, + activeMembers, + expiredMembers, + issuedBooks, + returnedBooks, + overdueBooks, + unpaidFines: unpaidFines || 0, + }; + } + + async getPopularBooks() { + return Book.findAll({ + attributes: [ + "book_id", + "book_name", + "lending_count", + ], + + order: [["lending_count", "DESC"]], + + limit: 5, + }); + } + + async getRecentIssues() { + return Issue.findAll({ + limit: 10, + + order: [["created_at", "DESC"]], + + include: [ + { + model: Member, + as: "member", + + include: [ + { + model: User, + as: "user", + + attributes: ["name"], + }, + ], + }, + + { + model: Book, + as: "book", + + attributes: ["book_name"], + }, + ], + }); + } + + async getMonthlyFineCollection() { + return Fine.findAll({ + attributes: [ + [fn("DATE_TRUNC", "month", col("created_at")), "month"], + [fn("SUM", col("fine_amount")), "total"], + ], + + group: ["month"], + + order: [[literal("month"), "ASC"]], + }); + } +} + +export default new DashboardRepository(); \ No newline at end of file diff --git a/server/src/modules/dashboard/dashboard.routes.ts b/server/src/modules/dashboard/dashboard.routes.ts new file mode 100644 index 0000000..9be088f --- /dev/null +++ b/server/src/modules/dashboard/dashboard.routes.ts @@ -0,0 +1,38 @@ +import { Router } from "express"; + +import auth from "../../middlewares/auth.js"; + +import { + getDashboardOverviewController, + getMonthlyFineCollectionController, + getPopularBooksController, + getRecentIssuesController, +} from "./dashboard.controller.js"; + +const router = Router(); + +router.get( + "/overview", + auth, + getDashboardOverviewController +); + +router.get( + "/popular-books", + auth, + getPopularBooksController +); + +router.get( + "/recent-issues", + auth, + getRecentIssuesController +); + +router.get( + "/fine-analytics", + auth, + getMonthlyFineCollectionController +); + +export default router; \ No newline at end of file diff --git a/server/src/modules/dashboard/dashboard.service.ts b/server/src/modules/dashboard/dashboard.service.ts new file mode 100644 index 0000000..826ee36 --- /dev/null +++ b/server/src/modules/dashboard/dashboard.service.ts @@ -0,0 +1,21 @@ +import dashboardRepository from "./dashboard.repository.js"; + +class DashboardService { + async getOverview() { + return dashboardRepository.getOverview(); + } + + async getPopularBooks() { + return dashboardRepository.getPopularBooks(); + } + + async getRecentIssues() { + return dashboardRepository.getRecentIssues(); + } + + async getMonthlyFineCollection() { + return dashboardRepository.getMonthlyFineCollection(); + } +} + +export default new DashboardService(); \ No newline at end of file diff --git a/server/src/modules/dashboard/dashboard.types.ts b/server/src/modules/dashboard/dashboard.types.ts new file mode 100644 index 0000000..12fb304 --- /dev/null +++ b/server/src/modules/dashboard/dashboard.types.ts @@ -0,0 +1,24 @@ +export interface DashboardOverview { + totalBooks: number; + totalMembers: number; + activeMembers: number; + expiredMembers: number; + issuedBooks: number; + returnedBooks: number; + overdueBooks: number; + unpaidFines: number; +} + +export interface PopularBook { + book_id: string; + book_name: string; + lending_count: number; +} + +export interface RecentIssue { + issue_id: string; + member_name: string; + book_name: string; + borrowed_date: Date; + due_date: Date; +} \ No newline at end of file diff --git a/server/src/routes/index.ts b/server/src/routes/index.ts index f6a8253..23ef902 100644 --- a/server/src/routes/index.ts +++ b/server/src/routes/index.ts @@ -4,7 +4,7 @@ import memberRoutes from "../modules/members/member.routes.js"; import bookRoutes from "../modules/books/book.routes.js" import issueRoutes from "../modules/issues/issue.routes.js"; import fineRoutes from "../modules/fines/fine.routes.js" - +import dashboardRoutes from "../modules/dashboard/dashboard.routes.js"; const router = Router(); @@ -13,5 +13,6 @@ router.use("/members", memberRoutes); router.use("/books", bookRoutes) router.use("/issues", issueRoutes) router.use("/fines", fineRoutes) +router.use("/dashboard", dashboardRoutes); export default router; \ No newline at end of file From 825c5d5f269741117ee55d8de2306f972e04c67c Mon Sep 17 00:00:00 2001 From: Yogeshwaran S Date: Wed, 27 May 2026 15:34:30 +0530 Subject: [PATCH 23/87] fix: implement the business logic in issue module --- server/src/modules/issues/issue.service.ts | 135 ++++++++++----------- 1 file changed, 63 insertions(+), 72 deletions(-) diff --git a/server/src/modules/issues/issue.service.ts b/server/src/modules/issues/issue.service.ts index 896f4a7..9242f01 100644 --- a/server/src/modules/issues/issue.service.ts +++ b/server/src/modules/issues/issue.service.ts @@ -1,123 +1,121 @@ import httpStatus from "http-status-codes"; +import { CreationAttributes } from "sequelize"; import AppError from "../../utils/AppError.js"; -import { CreationAttributes } from "sequelize"; import Member from "../../database/models/Member.js"; import Book from "../../database/models/Book.js"; import Fine from "../../database/models/Fine.js"; +import Issue from "../../database/models/Issue.js"; +import MembershipPlan from "../../database/models/MembershipPlan.js"; // Adjust based on your model path import issueRepository from "./issue.repository.js"; class IssueService { - async borrowBook( - member_id: string, - book_id: string - ) { - const member = await Member.findByPk(member_id); + // 1. BORROW BOOK METHOD (With Dynamic Plan Limits) + async borrowBook(member_id: string, book_id: string) { + const member = await Member.findByPk(member_id, { + include: [ + { + model: MembershipPlan, + as: "membership_plan", + }, + ], + }); if (!member) { - throw new AppError( - "Member not found", httpStatus.NOT_FOUND - ); + throw new AppError("Member not found", httpStatus.NOT_FOUND); } if (member.membership_status !== "ACTIVE") { - throw new AppError( - "Membership expired",httpStatus.BAD_REQUEST + throw new AppError("Membership is not active", httpStatus.BAD_REQUEST); + } + + const plan = (member as any).membership_plan; + if (!plan) { + throw new AppError("No membership plan associated with this account", httpStatus.BAD_REQUEST); + } + + // Dynamic book checking limit from DB + const allowedLimit = plan.max_books; + const planName = plan.plan_name || "Current"; + + const activeIssuesCount = await Issue.count({ + where: { + member_id, + returned_date: null, + }, + }); + + if (activeIssuesCount >= allowedLimit) { + throw new AppError( + `Borrow limit reached. Your ${planName} plan only allows up to ${allowedLimit} books out at a time. (Currently borrowing: ${activeIssuesCount})`, + httpStatus.BAD_REQUEST ); } const book = await Book.findByPk(book_id); if (!book) { - throw new AppError( - "Book not found", httpStatus.NOT_FOUND - ); + throw new AppError("Book not found", httpStatus.NOT_FOUND); } if (book.available_copies <= 0) { - throw new AppError( - "Book unavailable", httpStatus.BAD_REQUEST - ); + throw new AppError("Book unavailable", httpStatus.BAD_REQUEST); } - const existingIssue = - await issueRepository.getActiveIssue( - member_id, - book_id - ); + const existingIssue = await issueRepository.getActiveIssue(member_id, book_id); if (existingIssue) { - throw new AppError( - "Book already borrowed",httpStatus.BAD_REQUEST - ); + throw new AppError("Book already borrowed and not returned yet", httpStatus.BAD_REQUEST); } const due_date = new Date(); - due_date.setDate(due_date.getDate() + 14); - const issue = - await issueRepository.createIssue({ - member_id, - book_id, - due_date, - }); + const issue = await issueRepository.createIssue({ + member_id, + book_id, + due_date, + }); await Book.update( { - available_copies: - book.available_copies - 1, - - lending_count: - book.lending_count + 1, + available_copies: book.available_copies - 1, + lending_count: book.lending_count + 1, }, { - where: { - book_id, - }, + where: { book_id }, } ); return issue; } + // 2. RETURN BOOK METHOD (Restored) async returnBook(issue_id: string) { - const issue = - await issueRepository.findIssueById(issue_id); + const issue = await issueRepository.findIssueById(issue_id); if (!issue) { - throw new AppError( - "Issue record not found", httpStatus.NOT_FOUND - ); + throw new AppError("Issue record not found", httpStatus.NOT_FOUND); } if (issue.returned_date) { - throw new AppError( - "Book already returned", httpStatus.BAD_REQUEST - ); + throw new AppError("Book already returned", httpStatus.BAD_REQUEST); } const returned_date = new Date(); - const updatedIssue = - await issueRepository.returnBook( - issue_id, - returned_date - ); + const updatedIssue = await issueRepository.returnBook(issue_id, returned_date); const book = await Book.findByPk(issue.book_id); if (book) { await Book.update( { - available_copies: - book.available_copies + 1, + available_copies: book.available_copies + 1, }, { - where: { - book_id: issue.book_id, - }, + where: { book_id: issue.book_id }, } ); } @@ -125,31 +123,24 @@ class IssueService { const dueDate = new Date(issue.due_date); if (returned_date > dueDate) { - const difference = - returned_date.getTime() - - dueDate.getTime(); - - const delayed_days = Math.ceil( - difference / (1000 * 60 * 60 * 24) - ); - - const fine_amount = - delayed_days * 10; + const difference = returned_date.getTime() - dueDate.getTime(); + const delayed_days = Math.ceil(difference / (1000 * 60 * 60 * 24)); + const fine_amount = delayed_days * 10; await Fine.create({ issue_id: issue.issue_id, delayed_days, fine_amount, - } as CreationAttributes); // + paid_status: "UNPAID", + } as CreationAttributes); } return updatedIssue; } + // 3. GET MEMBER ISSUES METHOD (Restored) async getMemberIssues(member_id: string) { - return issueRepository.getMemberIssues( - member_id - ); + return issueRepository.getMemberIssues(member_id); } } From d62252c1ae15e268d20dcd44c9091feec5ec6f80 Mon Sep 17 00:00:00 2001 From: Yogeshwaran S Date: Wed, 27 May 2026 15:57:16 +0530 Subject: [PATCH 24/87] feat: implement swagger documentation and backend testing architecture --- server/jest.config.ts | 17 ++ server/package-lock.json | 20 +++ server/package.json | 10 +- server/src/app.ts | 16 +- server/src/docs/swagger/swagger.config.ts | 15 ++ server/src/docs/swagger/swagger.definition.ts | 40 +++++ server/src/docs/swagger/swagger.tags.ts | 33 ++++ server/src/modules/auth/auth.routes.ts | 85 +++++++++ server/src/modules/books/book.routes.ts | 162 ++++++++++++++++++ .../src/modules/dashboard/dashboard.routes.ts | 73 ++++++++ server/src/modules/issues/issue.routes.ts | 95 ++++++++++ server/src/modules/issues/issue.service.ts | 6 +- server/src/modules/members/member.routes.ts | 58 +++++++ server/src/tests/auth/auth.test.ts | 32 ++++ server/src/tests/setup/testSetup.ts | 7 + server/tsconfig.json | 2 +- 16 files changed, 654 insertions(+), 17 deletions(-) create mode 100644 server/jest.config.ts create mode 100644 server/src/docs/swagger/swagger.config.ts create mode 100644 server/src/docs/swagger/swagger.definition.ts create mode 100644 server/src/docs/swagger/swagger.tags.ts create mode 100644 server/src/tests/auth/auth.test.ts create mode 100644 server/src/tests/setup/testSetup.ts diff --git a/server/jest.config.ts b/server/jest.config.ts new file mode 100644 index 0000000..28418fa --- /dev/null +++ b/server/jest.config.ts @@ -0,0 +1,17 @@ +export default { + preset: "ts-jest", + + testEnvironment: "node", + + roots: ["/src/tests"], + + moduleFileExtensions: ["ts", "js"], + + transform: { + "^.+\\.ts$": "ts-jest", + }, + + collectCoverage: true, + + coverageDirectory: "coverage", +}; \ No newline at end of file diff --git a/server/package-lock.json b/server/package-lock.json index 793393e..9f70192 100644 --- a/server/package-lock.json +++ b/server/package-lock.json @@ -44,6 +44,8 @@ "@types/node": "^25.9.1", "@types/sequelize": "^4.28.20", "@types/supertest": "^7.2.0", + "@types/swagger-jsdoc": "^6.0.4", + "@types/swagger-ui-express": "^4.1.8", "eslint": "^10.4.0", "eslint-config-prettier": "^10.1.8", "jest": "^30.4.2", @@ -2897,6 +2899,24 @@ "@types/superagent": "^8.1.0" } }, + "node_modules/@types/swagger-jsdoc": { + "version": "6.0.4", + "resolved": "https://registry.npmjs.org/@types/swagger-jsdoc/-/swagger-jsdoc-6.0.4.tgz", + "integrity": "sha512-W+Xw5epcOZrF/AooUM/PccNMSAFOKWZA5dasNyMujTwsBkU74njSJBpvCCJhHAJ95XRMzQrrW844Btu0uoetwQ==", + "dev": true, + "license": "MIT" + }, + "node_modules/@types/swagger-ui-express": { + "version": "4.1.8", + "resolved": "https://registry.npmjs.org/@types/swagger-ui-express/-/swagger-ui-express-4.1.8.tgz", + "integrity": "sha512-AhZV8/EIreHFmBV5wAs0gzJUNq9JbbSXgJLQubCC0jtIo6prnI9MIRRxnU4MZX9RB9yXxF1V4R7jtLl/Wcj31g==", + "dev": true, + "license": "MIT", + "dependencies": { + "@types/express": "*", + "@types/serve-static": "*" + } + }, "node_modules/@types/triple-beam": { "version": "1.3.5", "resolved": "https://registry.npmjs.org/@types/triple-beam/-/triple-beam-1.3.5.tgz", diff --git a/server/package.json b/server/package.json index 3abaff4..49003cf 100644 --- a/server/package.json +++ b/server/package.json @@ -4,8 +4,12 @@ "description": "", "main": "index.js", "scripts": { - "test": "echo \"Error: no test specified\" && exit 1", - "dev": "tsx watch src/server.ts" + "dev": "tsx watch src/server.ts", + "build": "tsc", + "start": "node dist/server.js", + "test": "jest", + "test:watch": "jest --watch", + "test:coverage": "jest --coverage" }, "keywords": [], "author": "", @@ -47,6 +51,8 @@ "@types/node": "^25.9.1", "@types/sequelize": "^4.28.20", "@types/supertest": "^7.2.0", + "@types/swagger-jsdoc": "^6.0.4", + "@types/swagger-ui-express": "^4.1.8", "eslint": "^10.4.0", "eslint-config-prettier": "^10.1.8", "jest": "^30.4.2", diff --git a/server/src/app.ts b/server/src/app.ts index 54fea3e..ec54071 100644 --- a/server/src/app.ts +++ b/server/src/app.ts @@ -3,27 +3,25 @@ import express, { type Request, type Response, } from "express"; - import cors from "cors"; - import helmet from "helmet"; - import morgan from "morgan"; - import cookieParser from "cookie-parser"; - import env from "./config/env.js"; - import notFoundHandler from "./middlewares/notFoundHandler.js"; - import globalErrorHandler from "./middlewares/globalErrorHandler.js"; - import routes from "./routes/index.js"; +import swaggerUi from "swagger-ui-express"; +import swaggerSpec from "./docs/swagger/swagger.config.js"; const app: Application = express(); - +app.use( + "/api-docs", + swaggerUi.serve, + swaggerUi.setup(swaggerSpec) +); /* -------------------------------------------------------------------------- */ /* MIDDLEWARES */ diff --git a/server/src/docs/swagger/swagger.config.ts b/server/src/docs/swagger/swagger.config.ts new file mode 100644 index 0000000..55eff37 --- /dev/null +++ b/server/src/docs/swagger/swagger.config.ts @@ -0,0 +1,15 @@ +import swaggerJSDoc from "swagger-jsdoc"; + +import swaggerDefinition from "./swagger.definition.js"; + +const options: swaggerJSDoc.Options = { + definition: swaggerDefinition, + + apis: [ + "./src/modules/**/*.ts", + ], +}; + +const swaggerSpec = swaggerJSDoc(options); + +export default swaggerSpec; \ No newline at end of file diff --git a/server/src/docs/swagger/swagger.definition.ts b/server/src/docs/swagger/swagger.definition.ts new file mode 100644 index 0000000..1475e6b --- /dev/null +++ b/server/src/docs/swagger/swagger.definition.ts @@ -0,0 +1,40 @@ +const swaggerDefinition = { + openapi: "3.0.0", + + info: { + title: "Library Management System API", + + version: "1.0.0", + + description: + "Production-grade Library Management System backend APIs", + }, + + servers: [ + { + url: "http://localhost:5000/api/v1", + + description: "Development Server", + }, + ], + + components: { + securitySchemes: { + bearerAuth: { + type: "http", + + scheme: "bearer", + + bearerFormat: "JWT", + }, + }, + }, + + security: [ + { + bearerAuth: [], + }, + ], +}; + +export default swaggerDefinition; \ No newline at end of file diff --git a/server/src/docs/swagger/swagger.tags.ts b/server/src/docs/swagger/swagger.tags.ts new file mode 100644 index 0000000..1a89c19 --- /dev/null +++ b/server/src/docs/swagger/swagger.tags.ts @@ -0,0 +1,33 @@ +const swaggerTags = [ + { + name: "Auth", + description: "Authentication APIs", + }, + + { + name: "Members", + description: "Member management APIs", + }, + + { + name: "Books", + description: "Book management APIs", + }, + + { + name: "Issues", + description: "Book issue management APIs", + }, + + { + name: "Fines", + description: "Fine management APIs", + }, + + { + name: "Dashboard", + description: "Dashboard analytics APIs", + }, +]; + +export default swaggerTags; \ No newline at end of file diff --git a/server/src/modules/auth/auth.routes.ts b/server/src/modules/auth/auth.routes.ts index f4c7c71..d55a8b4 100644 --- a/server/src/modules/auth/auth.routes.ts +++ b/server/src/modules/auth/auth.routes.ts @@ -1,3 +1,88 @@ +/** + * @swagger + * /auth/login: + * post: + * summary: User login + * tags: [Auth] + * + * requestBody: + * required: true + * + * content: + * application/json: + * schema: + * type: object + * + * required: + * - gmail + * - password + * + * properties: + * gmail: + * type: string + * + * example: admin@gmail.com + * + * password: + * type: string + * + * example: Admin@123 + * + * responses: + * 200: + * description: Login successful + * + * 401: + * description: Invalid credentials + */ + + +/** + * @swagger + * /auth/register: + * post: + * summary: Register new user + * tags: [Auth] + * + * requestBody: + * required: true + * + * content: + * application/json: + * schema: + * type: object + * + * required: + * - name + * - gmail + * - password + * + * properties: + * name: + * type: string + * + * example: Yogesh + * + * gmail: + * type: string + * + * example: yogesh@gmail.com + * + * password: + * type: string + * + * example: Password@123 + * + * phone_number: + * type: string + * + * example: 9876543210 + * + * responses: + * 201: + * description: User registered successfully + */ + import { Router } from "express"; import auth from "../../middlewares/auth.js"; import validate from "../../middlewares/validate.js"; diff --git a/server/src/modules/books/book.routes.ts b/server/src/modules/books/book.routes.ts index d8673a1..5717f9b 100644 --- a/server/src/modules/books/book.routes.ts +++ b/server/src/modules/books/book.routes.ts @@ -1,3 +1,165 @@ +/** + * @swagger + * /books: + * get: + * summary: Retrieve books with pagination and filtering + * tags: [Books] + * security: + * - bearerAuth: [] + * parameters: + * - in: query + * name: page + * schema: + * type: integer + * default: 1 + * description: Page number for pagination + * - in: query + * name: limit + * schema: + * type: integer + * default: 10 + * description: Number of records per page + * - in: query + * name: search + * schema: + * type: string + * description: Search keyword matching against book title or author + * - in: query + * name: category_id + * schema: + * type: string + * format: uuid + * description: Filter books by a specific category UUID + * responses: + * 200: + * description: Books successfully fetched + * 401: + * description: Unauthorized access token missing or invalid + */ + + +/** + * @swagger + * /books: + * post: + * summary: Create a new library book record + * tags: [Books] + * security: + * - bearerAuth: [] + * requestBody: + * required: true + * content: + * application/json: + * schema: + * type: object + * required: + * - book_name + * - book_author + * - category_id + * - total_copies + * properties: + * book_name: + * type: string + * example: "The Pragmatic Programmer" + * book_author: + * type: string + * example: "Andrew Hunt" + * category_id: + * type: string + * format: uuid + * example: "9b1deb4d-3b7d-4bad-9bdd-2b0d7b3dcb6d" + * total_copies: + * type: integer + * example: 5 + * responses: + * 201: + * description: Book created successfully + * 400: + * description: Validation payload error + * 401: + * description: Unauthorized + */ + + +/** + * @swagger + * /books/{book_id}: + * put: + * summary: Update an existing book's details + * tags: [Books] + * security: + * - bearerAuth: [] + * parameters: + * - in: path + * name: book_id + * required: true + * schema: + * type: string + * format: uuid + * description: The unique UUID of the book to update + * requestBody: + * required: true + * content: + * application/json: + * schema: + * type: object + * properties: + * book_name: + * type: string + * example: "The Pragmatic Programmer (Revised)" + * book_author: + * type: string + * example: "Andrew Hunt" + * category_id: + * type: string + * format: uuid + * total_copies: + * type: integer + * example: 10 + * available_copies: + * type: integer + * example: 9 + * responses: + * 200: + * description: Book updated successfully + * 404: + * description: Book record not found + */ + + +/** + * @swagger + * /books/{book_id}: + * delete: + * summary: Soft-delete/Remove a book from the library catalog + * tags: [Books] + * security: + * - bearerAuth: [] + * parameters: + * - in: path + * name: book_id + * required: true + * schema: + * type: string + * format: uuid + * description: The unique UUID of the book to drop + * responses: + * 200: + * description: Book successfully deleted from inventory + * 404: + * description: Book not found + */ + + + + + + + + + + + import { Router } from "express"; import validate from "../../middlewares/validate.js"; diff --git a/server/src/modules/dashboard/dashboard.routes.ts b/server/src/modules/dashboard/dashboard.routes.ts index 9be088f..e0b55df 100644 --- a/server/src/modules/dashboard/dashboard.routes.ts +++ b/server/src/modules/dashboard/dashboard.routes.ts @@ -1,3 +1,76 @@ +/** + * @swagger + * /dashboard/overview: + * get: + * summary: Fetch high-level tracking counts for dashboard cards + * description: Returns aggregated calculation statistics for total inventory metrics, active/expired memberships, and outstanding dues. + * tags: [Dashboard] + * security: + * - bearerAuth: [] + * responses: + * 200: + * description: Aggregated card values processed successfully + * content: + * application/json: + * schema: + * type: object + * properties: + * success: + * type: boolean + * data: + * type: object + * properties: + * totalBooks: + * type: integer + * totalMembers: + * type: integer + * activeMembers: + * type: integer + * expiredMembers: + * type: integer + * issuedBooks: + * type: integer + * returnedBooks: + * type: integer + * overdueBooks: + * type: integer + * unpaidFines: + * type: number + */ + + +/** + * @swagger + * /dashboard/analytics/popular-books: + * get: + * summary: Retrieve library circulation rankings (Top 5 popular items) + * tags: [Dashboard] + * security: + * - bearerAuth: [] + * responses: + * 200: + * description: Array list of high popularity book assets returned successfully + */ + + +/** + * @swagger + * /dashboard/reports/monthly-fines: + * get: + * summary: Fetch chronological monthly fine income collection records + * description: Combines sub-queries utilizing dynamic database trunc expressions to sort financial balances. + * tags: [Dashboard] + * security: + * - bearerAuth: [] + * responses: + * 200: + * description: Monthly broken-down fine report matrix structured successfully + */ + + + + + import { Router } from "express"; import auth from "../../middlewares/auth.js"; diff --git a/server/src/modules/issues/issue.routes.ts b/server/src/modules/issues/issue.routes.ts index c4f2818..b683500 100644 --- a/server/src/modules/issues/issue.routes.ts +++ b/server/src/modules/issues/issue.routes.ts @@ -1,3 +1,98 @@ +/** + * @swagger + * /issues/borrow: + * post: + * summary: Issue/Borrow a book for a member + * description: Checks active structural constraints, validation history, and validates dynamic limits (Bronze/Silver/Gold) stored in the database. + * tags: [Issues] + * security: + * - bearerAuth: [] + * requestBody: + * required: true + * content: + * application/json: + * schema: + * type: object + * required: + * - member_id + * - book_id + * properties: + * member_id: + * type: string + * format: uuid + * example: "a1b2c3d4-e5f6-7a8b-9c0d-1e2f3a4b5c6d" + * book_id: + * type: string + * format: uuid + * example: "f8g9h0i1-j2k3-4l5m-6n7o-8p9q0r1s2t3u" + * responses: + * 201: + * description: Book borrowed successfully and due date generated (+14 days) + * 400: + * description: Membership inactive, item out-of-stock, or membership borrow quota ceiling breached + * 404: + * description: Member or Book reference target not found + */ + + +/** + * @swagger + * /issues/return: + * post: + * summary: Return an issued book and reconcile inventory stock balances + * description: Safely maps timestamps against due dates. Triggers real-time generation of an UNPAID fine record if returned past the due timeline. + * tags: [Issues] + * security: + * - bearerAuth: [] + * requestBody: + * required: true + * content: + * application/json: + * schema: + * type: object + * required: + * - issue_id + * properties: + * issue_id: + * type: string + * format: uuid + * example: "b2c3d4e5-f6a7-8b9c-0d1e-2f3a4b5c6d7e" + * responses: + * 200: + * description: Book returned successfully. Fines dynamically logged if overdue. + * 400: + * description: Book has already been safely returned + * 404: + * description: Issue history tracking record not discovered + */ + + +/** + * @swagger + * /issues/overdue: + * get: + * summary: Fetch active loan tracking cycles currently cataloged as overdue + * tags: [Issues] + * security: + * - bearerAuth: [] + * responses: + * 200: + * description: List of overdue logs mapped against member and book targets returned safely + * 401: + * description: Unauthorized token verification failure + */ + + + + + + + + + + + + import { Router } from "express"; import auth from "../../middlewares/auth.js"; diff --git a/server/src/modules/issues/issue.service.ts b/server/src/modules/issues/issue.service.ts index 9242f01..566993c 100644 --- a/server/src/modules/issues/issue.service.ts +++ b/server/src/modules/issues/issue.service.ts @@ -6,12 +6,11 @@ import Member from "../../database/models/Member.js"; import Book from "../../database/models/Book.js"; import Fine from "../../database/models/Fine.js"; import Issue from "../../database/models/Issue.js"; -import MembershipPlan from "../../database/models/MembershipPlan.js"; // Adjust based on your model path +import MembershipPlan from "../../database/models/MembershipPlan.js"; import issueRepository from "./issue.repository.js"; class IssueService { - // 1. BORROW BOOK METHOD (With Dynamic Plan Limits) async borrowBook(member_id: string, book_id: string) { const member = await Member.findByPk(member_id, { include: [ @@ -35,7 +34,6 @@ class IssueService { throw new AppError("No membership plan associated with this account", httpStatus.BAD_REQUEST); } - // Dynamic book checking limit from DB const allowedLimit = plan.max_books; const planName = plan.plan_name || "Current"; @@ -91,7 +89,6 @@ class IssueService { return issue; } - // 2. RETURN BOOK METHOD (Restored) async returnBook(issue_id: string) { const issue = await issueRepository.findIssueById(issue_id); @@ -138,7 +135,6 @@ class IssueService { return updatedIssue; } - // 3. GET MEMBER ISSUES METHOD (Restored) async getMemberIssues(member_id: string) { return issueRepository.getMemberIssues(member_id); } diff --git a/server/src/modules/members/member.routes.ts b/server/src/modules/members/member.routes.ts index b325081..6f895a9 100644 --- a/server/src/modules/members/member.routes.ts +++ b/server/src/modules/members/member.routes.ts @@ -1,3 +1,61 @@ +/** + * @swagger + * /members: + * get: + * summary: Get all members + * tags: [Members] + * + * security: + * - bearerAuth: [] + * + * responses: + * 200: + * description: Members fetched successfully + */ + + +/** + * @swagger + * /members: + * post: + * summary: Create new member + * tags: [Members] + * + * security: + * - bearerAuth: [] + * + * requestBody: + * required: true + * + * content: + * application/json: + * schema: + * type: object + * + * required: + * - user_id + * - membership_plan_id + * - start_date + * - expiry_date + * + * properties: + * user_id: + * type: string + * + * membership_plan_id: + * type: string + * + * start_date: + * type: string + * + * expiry_date: + * type: string + * + * responses: + * 201: + * description: Member created successfully + */ + import { Router } from "express"; import auth from "../../middlewares/auth.js"; diff --git a/server/src/tests/auth/auth.test.ts b/server/src/tests/auth/auth.test.ts new file mode 100644 index 0000000..697720c --- /dev/null +++ b/server/src/tests/auth/auth.test.ts @@ -0,0 +1,32 @@ +import request from "supertest"; + +import app from "../../app.js"; + +describe("Auth APIs", () => { + it("should register a new user", async () => { + const response = await request(app) + .post("/api/v1/auth/register") + .send({ + name: "Test User", + gmail: "test@gmail.com", + password: "Password@123", + }); + + expect(response.status).toBe(201); + + expect(response.body.success).toBe(true); + }); + + it("should login user", async () => { + const response = await request(app) + .post("/api/v1/auth/login") + .send({ + gmail: "test@gmail.com", + password: "Password@123", + }); + + expect(response.status).toBe(200); + + expect(response.body.success).toBe(true); + }); +}); \ No newline at end of file diff --git a/server/src/tests/setup/testSetup.ts b/server/src/tests/setup/testSetup.ts new file mode 100644 index 0000000..4646dc7 --- /dev/null +++ b/server/src/tests/setup/testSetup.ts @@ -0,0 +1,7 @@ +beforeAll(async () => { + console.log("Test Started"); +}); + +afterAll(async () => { + console.log("Test Completed"); +}); \ No newline at end of file diff --git a/server/tsconfig.json b/server/tsconfig.json index 34ea3e7..0718341 100644 --- a/server/tsconfig.json +++ b/server/tsconfig.json @@ -32,7 +32,7 @@ "declarationMap": true, - "types": ["node"], + "types": ["node","jest"], "allowSyntheticDefaultImports": true, From 063b99bc06c737bade39b3914aaa07cbda63b4f2 Mon Sep 17 00:00:00 2001 From: Yogeshwaran S Date: Wed, 27 May 2026 16:11:52 +0530 Subject: [PATCH 25/87] feat: implement production backend security and deployment architecture --- .github/workflows/ci.yml | 37 ++++++++++++++++++++++++++++---- docker-compose.yml | 35 ++++++++++++++++++++++++++++++ server/.dockerignore | 4 ++++ server/Dockerfile | 15 +++++++++++++ server/src/app.ts | 8 +++++++ server/src/config/cookie.ts | 10 +++++++++ server/src/config/cors.ts | 13 +++++++++++ server/src/config/helmet.ts | 19 ++++++++++++++++ server/src/config/ratelimiter.ts | 20 +++++++++++++++++ server/src/config/validateEnv.ts | 14 ++++++++++++ 10 files changed, 171 insertions(+), 4 deletions(-) create mode 100644 server/.dockerignore create mode 100644 server/Dockerfile create mode 100644 server/src/config/cookie.ts create mode 100644 server/src/config/cors.ts create mode 100644 server/src/config/helmet.ts create mode 100644 server/src/config/ratelimiter.ts create mode 100644 server/src/config/validateEnv.ts diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 5352980..e80e63a 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -1,10 +1,39 @@ -name: Disabled CI +name: Backend CI Pipeline on: - workflow_dispatch: # Allows manual triggering only, won't run on push + push: + branches: + - main + - develop + + pull_request: + branches: + - main + - develop jobs: - nothing: + backend-ci: runs-on: ubuntu-latest + + defaults: + run: + working-directory: server + steps: - - run: echo "Not active yet" \ No newline at end of file + - name: Checkout Repository + uses: actions/checkout@v4 + + - name: Setup Node.js + uses: actions/setup-node@v4 + + with: + node-version: 22 + + - name: Install Dependencies + run: npm install + + - name: Run TypeScript Build + run: npm run build + + - name: Run Tests + run: npm run test \ No newline at end of file diff --git a/docker-compose.yml b/docker-compose.yml index e69de29..bd0a484 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -0,0 +1,35 @@ +version: "3.9" + +services: + backend: + build: + context: ./server + dockerfile: ../docker/server/Dockerfile + + ports: + - "5000:5000" + + env_file: + - ./server/.env + + depends_on: + - postgres + + postgres: + image: postgres:16 + + restart: always + + environment: + POSTGRES_USER: postgres + POSTGRES_PASSWORD: postgres + POSTGRES_DB: library_management_system + + ports: + - "5432:5432" + + volumes: + - postgres_data:/var/lib/postgresql/data + +volumes: + postgres_data: \ No newline at end of file diff --git a/server/.dockerignore b/server/.dockerignore new file mode 100644 index 0000000..82b87bb --- /dev/null +++ b/server/.dockerignore @@ -0,0 +1,4 @@ +node_modules +dist +.env +coverage \ No newline at end of file diff --git a/server/Dockerfile b/server/Dockerfile new file mode 100644 index 0000000..6f59ec3 --- /dev/null +++ b/server/Dockerfile @@ -0,0 +1,15 @@ +FROM node:22-alpine + +WORKDIR /app + +COPY package*.json ./ + +RUN npm install + +COPY . . + +RUN npm run build + +EXPOSE 5000 + +CMD ["npm", "start"] \ No newline at end of file diff --git a/server/src/app.ts b/server/src/app.ts index ec54071..64daf84 100644 --- a/server/src/app.ts +++ b/server/src/app.ts @@ -13,6 +13,10 @@ import globalErrorHandler from "./middlewares/globalErrorHandler.js"; import routes from "./routes/index.js"; import swaggerUi from "swagger-ui-express"; import swaggerSpec from "./docs/swagger/swagger.config.js"; +import rateLimiter from "./config/ratelimiter.js"; +import helmetConfig from "./config/helmet.js"; +import corsConfig from "./config/cors.js"; +import "./config/validateEnv.js"; const app: Application = express(); @@ -33,7 +37,11 @@ app.use( credentials: true, }) ); +app.use(corsConfig); +app.use(rateLimiter); + +app.use(helmetConfig); app.use(helmet()); app.use(morgan("dev")); diff --git a/server/src/config/cookie.ts b/server/src/config/cookie.ts new file mode 100644 index 0000000..44f455f --- /dev/null +++ b/server/src/config/cookie.ts @@ -0,0 +1,10 @@ +export const cookieOptions = { + httpOnly: true, + + secure: process.env.NODE_ENV === "production", + + sameSite: + process.env.NODE_ENV === "production" + ? "none" + : "lax", +}; \ No newline at end of file diff --git a/server/src/config/cors.ts b/server/src/config/cors.ts new file mode 100644 index 0000000..4094b9c --- /dev/null +++ b/server/src/config/cors.ts @@ -0,0 +1,13 @@ +import cors from "cors"; + +const allowedOrigins = [ + "http://localhost:5173", +]; + +const corsConfig = cors({ + origin: allowedOrigins, + + credentials: true, +}); + +export default corsConfig; \ No newline at end of file diff --git a/server/src/config/helmet.ts b/server/src/config/helmet.ts new file mode 100644 index 0000000..688c7bb --- /dev/null +++ b/server/src/config/helmet.ts @@ -0,0 +1,19 @@ +import helmet from "helmet"; + +const helmetConfig = helmet({ + crossOriginEmbedderPolicy: false, + + contentSecurityPolicy: { + directives: { + defaultSrc: ["'self'"], + + scriptSrc: ["'self'"], + + styleSrc: ["'self'", "'unsafe-inline'"], + + imgSrc: ["'self'", "data:"], + }, + }, +}); + +export default helmetConfig; \ No newline at end of file diff --git a/server/src/config/ratelimiter.ts b/server/src/config/ratelimiter.ts new file mode 100644 index 0000000..5cbfacf --- /dev/null +++ b/server/src/config/ratelimiter.ts @@ -0,0 +1,20 @@ +import rateLimit from "express-rate-limit"; + +const rateLimiter = rateLimit({ + windowMs: 15 * 60 * 1000, + + max: 100, + + message: { + success: false, + + message: + "Too many requests from this IP. Please try again later.", + }, + + standardHeaders: true, + + legacyHeaders: false, +}); + +export default rateLimiter; \ No newline at end of file diff --git a/server/src/config/validateEnv.ts b/server/src/config/validateEnv.ts new file mode 100644 index 0000000..3c2365b --- /dev/null +++ b/server/src/config/validateEnv.ts @@ -0,0 +1,14 @@ +const requiredEnvVariables = [ + "PORT", + "NODE_ENV", + "DATABASE_URL", + "JWT_SECRET", +]; + +requiredEnvVariables.forEach((envVariable) => { + if (!process.env[envVariable]) { + throw new Error( + `Missing required environment variable: ${envVariable}` + ); + } +}); \ No newline at end of file From 59d905f2d8a1f79d29f0787ca103f885640d7db4 Mon Sep 17 00:00:00 2001 From: Yogeshwaran S Date: Wed, 27 May 2026 16:35:00 +0530 Subject: [PATCH 26/87] fix: implement the swagger documentations --- server/src/modules/books/book.routes.ts | 26 ++----------------- .../src/modules/dashboard/dashboard.routes.ts | 9 +------ server/src/modules/issues/issue.routes.ts | 22 ++++------------ 3 files changed, 8 insertions(+), 49 deletions(-) diff --git a/server/src/modules/books/book.routes.ts b/server/src/modules/books/book.routes.ts index 5717f9b..69ad0f9 100644 --- a/server/src/modules/books/book.routes.ts +++ b/server/src/modules/books/book.routes.ts @@ -35,13 +35,7 @@ * description: Books successfully fetched * 401: * description: Unauthorized access token missing or invalid - */ - - -/** - * @swagger - * /books: - * post: + * * post: * summary: Create a new library book record * tags: [Books] * security: @@ -80,7 +74,6 @@ * description: Unauthorized */ - /** * @swagger * /books/{book_id}: @@ -124,13 +117,7 @@ * description: Book updated successfully * 404: * description: Book record not found - */ - - -/** - * @swagger - * /books/{book_id}: - * delete: + * * delete: * summary: Soft-delete/Remove a book from the library catalog * tags: [Books] * security: @@ -151,15 +138,6 @@ */ - - - - - - - - - import { Router } from "express"; import validate from "../../middlewares/validate.js"; diff --git a/server/src/modules/dashboard/dashboard.routes.ts b/server/src/modules/dashboard/dashboard.routes.ts index e0b55df..07dd89c 100644 --- a/server/src/modules/dashboard/dashboard.routes.ts +++ b/server/src/modules/dashboard/dashboard.routes.ts @@ -3,7 +3,6 @@ * /dashboard/overview: * get: * summary: Fetch high-level tracking counts for dashboard cards - * description: Returns aggregated calculation statistics for total inventory metrics, active/expired memberships, and outstanding dues. * tags: [Dashboard] * security: * - bearerAuth: [] @@ -38,7 +37,6 @@ * type: number */ - /** * @swagger * /dashboard/analytics/popular-books: @@ -52,25 +50,20 @@ * description: Array list of high popularity book assets returned successfully */ - /** * @swagger * /dashboard/reports/monthly-fines: * get: * summary: Fetch chronological monthly fine income collection records - * description: Combines sub-queries utilizing dynamic database trunc expressions to sort financial balances. * tags: [Dashboard] * security: * - bearerAuth: [] * responses: * 200: - * description: Monthly broken-down fine report matrix structured successfully + * description: Monthly fine report matrix structured successfully */ - - - import { Router } from "express"; import auth from "../../middlewares/auth.js"; diff --git a/server/src/modules/issues/issue.routes.ts b/server/src/modules/issues/issue.routes.ts index b683500..0665001 100644 --- a/server/src/modules/issues/issue.routes.ts +++ b/server/src/modules/issues/issue.routes.ts @@ -3,7 +3,7 @@ * /issues/borrow: * post: * summary: Issue/Borrow a book for a member - * description: Checks active structural constraints, validation history, and validates dynamic limits (Bronze/Silver/Gold) stored in the database. + * description: Checks constraints and validates dynamic plan thresholds (Bronze/Silver/Gold). * tags: [Issues] * security: * - bearerAuth: [] @@ -27,20 +27,18 @@ * example: "f8g9h0i1-j2k3-4l5m-6n7o-8p9q0r1s2t3u" * responses: * 201: - * description: Book borrowed successfully and due date generated (+14 days) + * description: Book borrowed successfully * 400: - * description: Membership inactive, item out-of-stock, or membership borrow quota ceiling breached + * description: Membership inactive, item out-of-stock, or quota ceilings breached * 404: * description: Member or Book reference target not found */ - /** * @swagger * /issues/return: * post: * summary: Return an issued book and reconcile inventory stock balances - * description: Safely maps timestamps against due dates. Triggers real-time generation of an UNPAID fine record if returned past the due timeline. * tags: [Issues] * security: * - bearerAuth: [] @@ -63,10 +61,9 @@ * 400: * description: Book has already been safely returned * 404: - * description: Issue history tracking record not discovered + * description: Tracking record not discovered */ - /** * @swagger * /issues/overdue: @@ -77,22 +74,13 @@ * - bearerAuth: [] * responses: * 200: - * description: List of overdue logs mapped against member and book targets returned safely + * description: List of overdue logs mapped back returned safely * 401: * description: Unauthorized token verification failure */ - - - - - - - - - import { Router } from "express"; import auth from "../../middlewares/auth.js"; From eb2df186b60807e8f72bb150425958afe3f9fb03 Mon Sep 17 00:00:00 2001 From: Yogeshwaran S Date: Wed, 27 May 2026 16:36:59 +0530 Subject: [PATCH 27/87] fix: fix the swagger documentations --- server/src/modules/books/book.routes.ts | 15 ++++++++++++--- server/src/modules/issues/issue.routes.ts | 1 - 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/server/src/modules/books/book.routes.ts b/server/src/modules/books/book.routes.ts index 69ad0f9..caf30b4 100644 --- a/server/src/modules/books/book.routes.ts +++ b/server/src/modules/books/book.routes.ts @@ -35,7 +35,12 @@ * description: Books successfully fetched * 401: * description: Unauthorized access token missing or invalid - * * post: + */ + +/** + * @swagger + * /books: + * post: * summary: Create a new library book record * tags: [Books] * security: @@ -117,7 +122,12 @@ * description: Book updated successfully * 404: * description: Book record not found - * * delete: + */ + +/** + * @swagger + * /books/{book_id}: + * delete: * summary: Soft-delete/Remove a book from the library catalog * tags: [Books] * security: @@ -137,7 +147,6 @@ * description: Book not found */ - import { Router } from "express"; import validate from "../../middlewares/validate.js"; diff --git a/server/src/modules/issues/issue.routes.ts b/server/src/modules/issues/issue.routes.ts index 0665001..c0a8779 100644 --- a/server/src/modules/issues/issue.routes.ts +++ b/server/src/modules/issues/issue.routes.ts @@ -80,7 +80,6 @@ */ - import { Router } from "express"; import auth from "../../middlewares/auth.js"; From 192877b2905bd8289a6cd0149518bd6996e1712a Mon Sep 17 00:00:00 2001 From: Yogeshwaran S Date: Wed, 27 May 2026 16:43:04 +0530 Subject: [PATCH 28/87] fix: fix the swagger documentations --- server/src/modules/books/book.routes.ts | 283 ++++++++++-------- .../src/modules/dashboard/dashboard.routes.ts | 113 +++---- server/src/modules/issues/issue.routes.ts | 145 ++++----- 3 files changed, 295 insertions(+), 246 deletions(-) diff --git a/server/src/modules/books/book.routes.ts b/server/src/modules/books/book.routes.ts index caf30b4..a29eaee 100644 --- a/server/src/modules/books/book.routes.ts +++ b/server/src/modules/books/book.routes.ts @@ -1,150 +1,175 @@ /** * @swagger * /books: - * get: - * summary: Retrieve books with pagination and filtering - * tags: [Books] - * security: - * - bearerAuth: [] - * parameters: - * - in: query - * name: page - * schema: - * type: integer - * default: 1 - * description: Page number for pagination - * - in: query - * name: limit - * schema: - * type: integer - * default: 10 - * description: Number of records per page - * - in: query - * name: search - * schema: - * type: string - * description: Search keyword matching against book title or author - * - in: query - * name: category_id - * schema: - * type: string - * format: uuid - * description: Filter books by a specific category UUID - * responses: - * 200: - * description: Books successfully fetched - * 401: - * description: Unauthorized access token missing or invalid + * get: + * summary: Retrieve books with pagination and filtering + * tags: [Books] + * security: + * - bearerAuth: [] + * parameters: + * - in: query + * name: page + * schema: + * type: integer + * default: 1 + * description: Page number for pagination + * + * - in: query + * name: limit + * schema: + * type: integer + * default: 10 + * description: Number of records per page + * + * - in: query + * name: search + * schema: + * type: string + * description: Search keyword matching against book title or author + * + * - in: query + * name: category_id + * schema: + * type: string + * format: uuid + * description: Filter books by a specific category UUID + * + * responses: + * 200: + * description: Books successfully fetched + * + * 401: + * description: Unauthorized access token missing or invalid */ /** * @swagger * /books: - * post: - * summary: Create a new library book record - * tags: [Books] - * security: - * - bearerAuth: [] - * requestBody: - * required: true - * content: - * application/json: - * schema: - * type: object - * required: - * - book_name - * - book_author - * - category_id - * - total_copies - * properties: - * book_name: - * type: string - * example: "The Pragmatic Programmer" - * book_author: - * type: string - * example: "Andrew Hunt" - * category_id: - * type: string - * format: uuid - * example: "9b1deb4d-3b7d-4bad-9bdd-2b0d7b3dcb6d" - * total_copies: - * type: integer - * example: 5 - * responses: - * 201: - * description: Book created successfully - * 400: - * description: Validation payload error - * 401: - * description: Unauthorized + * post: + * summary: Create a new library book record + * tags: [Books] + * security: + * - bearerAuth: [] + * + * requestBody: + * required: true + * content: + * application/json: + * schema: + * type: object + * required: + * - book_name + * - book_author + * - category_id + * - total_copies + * + * properties: + * book_name: + * type: string + * example: The Pragmatic Programmer + * + * book_author: + * type: string + * example: Andrew Hunt + * + * category_id: + * type: string + * format: uuid + * example: 9b1deb4d-3b7d-4bad-9bdd-2b0d7b3dcb6d + * + * total_copies: + * type: integer + * example: 5 + * + * responses: + * 201: + * description: Book created successfully + * + * 400: + * description: Validation payload error + * + * 401: + * description: Unauthorized */ /** * @swagger * /books/{book_id}: - * put: - * summary: Update an existing book's details - * tags: [Books] - * security: - * - bearerAuth: [] - * parameters: - * - in: path - * name: book_id - * required: true - * schema: - * type: string - * format: uuid - * description: The unique UUID of the book to update - * requestBody: - * required: true - * content: - * application/json: - * schema: - * type: object - * properties: - * book_name: - * type: string - * example: "The Pragmatic Programmer (Revised)" - * book_author: - * type: string - * example: "Andrew Hunt" - * category_id: - * type: string - * format: uuid - * total_copies: - * type: integer - * example: 10 - * available_copies: - * type: integer - * example: 9 - * responses: - * 200: - * description: Book updated successfully - * 404: - * description: Book record not found + * put: + * summary: Update an existing book's details + * tags: [Books] + * security: + * - bearerAuth: [] + * + * parameters: + * - in: path + * name: book_id + * required: true + * schema: + * type: string + * format: uuid + * description: The unique UUID of the book to update + * + * requestBody: + * required: true + * content: + * application/json: + * schema: + * type: object + * + * properties: + * book_name: + * type: string + * example: The Pragmatic Programmer (Revised) + * + * book_author: + * type: string + * example: Andrew Hunt + * + * category_id: + * type: string + * format: uuid + * + * total_copies: + * type: integer + * example: 10 + * + * available_copies: + * type: integer + * example: 9 + * + * responses: + * 200: + * description: Book updated successfully + * + * 404: + * description: Book record not found */ /** * @swagger * /books/{book_id}: - * delete: - * summary: Soft-delete/Remove a book from the library catalog - * tags: [Books] - * security: - * - bearerAuth: [] - * parameters: - * - in: path - * name: book_id - * required: true - * schema: - * type: string - * format: uuid - * description: The unique UUID of the book to drop - * responses: - * 200: - * description: Book successfully deleted from inventory - * 404: - * description: Book not found + * delete: + * summary: Remove a book from the library catalog + * tags: [Books] + * security: + * - bearerAuth: [] + * + * parameters: + * - in: path + * name: book_id + * required: true + * schema: + * type: string + * format: uuid + * description: The unique UUID of the book to delete + * + * responses: + * 200: + * description: Book successfully deleted from inventory + * + * 404: + * description: Book not found */ import { Router } from "express"; diff --git a/server/src/modules/dashboard/dashboard.routes.ts b/server/src/modules/dashboard/dashboard.routes.ts index 07dd89c..856656e 100644 --- a/server/src/modules/dashboard/dashboard.routes.ts +++ b/server/src/modules/dashboard/dashboard.routes.ts @@ -1,66 +1,79 @@ /** * @swagger * /dashboard/overview: - * get: - * summary: Fetch high-level tracking counts for dashboard cards - * tags: [Dashboard] - * security: - * - bearerAuth: [] - * responses: - * 200: - * description: Aggregated card values processed successfully - * content: - * application/json: - * schema: - * type: object - * properties: - * success: - * type: boolean - * data: - * type: object - * properties: - * totalBooks: - * type: integer - * totalMembers: - * type: integer - * activeMembers: - * type: integer - * expiredMembers: - * type: integer - * issuedBooks: - * type: integer - * returnedBooks: - * type: integer - * overdueBooks: - * type: integer - * unpaidFines: - * type: number + * get: + * summary: Fetch high-level tracking counts for dashboard cards + * tags: [Dashboard] + * security: + * - bearerAuth: [] + * + * responses: + * 200: + * description: Aggregated card values processed successfully + * content: + * application/json: + * schema: + * type: object + * + * properties: + * success: + * type: boolean + * + * data: + * type: object + * + * properties: + * totalBooks: + * type: integer + * + * totalMembers: + * type: integer + * + * activeMembers: + * type: integer + * + * expiredMembers: + * type: integer + * + * issuedBooks: + * type: integer + * + * returnedBooks: + * type: integer + * + * overdueBooks: + * type: integer + * + * unpaidFines: + * type: number */ /** * @swagger * /dashboard/analytics/popular-books: - * get: - * summary: Retrieve library circulation rankings (Top 5 popular items) - * tags: [Dashboard] - * security: - * - bearerAuth: [] - * responses: - * 200: - * description: Array list of high popularity book assets returned successfully + * get: + * summary: Retrieve library circulation rankings (Top 5 popular items) + * tags: [Dashboard] + * security: + * - bearerAuth: [] + * + * responses: + * 200: + * description: Array list of high popularity book assets returned successfully */ /** * @swagger * /dashboard/reports/monthly-fines: - * get: - * summary: Fetch chronological monthly fine income collection records - * tags: [Dashboard] - * security: - * - bearerAuth: [] - * responses: - * 200: - * description: Monthly fine report matrix structured successfully + * get: + * summary: Fetch chronological monthly fine income collection records + * tags: [Dashboard] + * security: + * - bearerAuth: [] + * + * responses: + * 200: + * description: Monthly fine report matrix structured successfully */ diff --git a/server/src/modules/issues/issue.routes.ts b/server/src/modules/issues/issue.routes.ts index c0a8779..0e9be5e 100644 --- a/server/src/modules/issues/issue.routes.ts +++ b/server/src/modules/issues/issue.routes.ts @@ -1,85 +1,96 @@ /** * @swagger * /issues/borrow: - * post: - * summary: Issue/Borrow a book for a member - * description: Checks constraints and validates dynamic plan thresholds (Bronze/Silver/Gold). - * tags: [Issues] - * security: - * - bearerAuth: [] - * requestBody: - * required: true - * content: - * application/json: - * schema: - * type: object - * required: - * - member_id - * - book_id - * properties: - * member_id: - * type: string - * format: uuid - * example: "a1b2c3d4-e5f6-7a8b-9c0d-1e2f3a4b5c6d" - * book_id: - * type: string - * format: uuid - * example: "f8g9h0i1-j2k3-4l5m-6n7o-8p9q0r1s2t3u" - * responses: - * 201: - * description: Book borrowed successfully - * 400: - * description: Membership inactive, item out-of-stock, or quota ceilings breached - * 404: - * description: Member or Book reference target not found + * post: + * summary: Issue/Borrow a book for a member + * tags: [Issues] + * security: + * - bearerAuth: [] + * + * requestBody: + * required: true + * content: + * application/json: + * schema: + * type: object + * required: + * - member_id + * - book_id + * + * properties: + * member_id: + * type: string + * format: uuid + * example: a1b2c3d4-e5f6-7a8b-9c0d-1e2f3a4b5c6d + * + * book_id: + * type: string + * format: uuid + * example: f8g9h0i1-j2k3-4l5m-6n7o-8p9q0r1s2t3u + * + * responses: + * 201: + * description: Book borrowed successfully + * + * 400: + * description: Membership inactive, item out-of-stock, or quota ceilings breached + * + * 404: + * description: Member or Book reference target not found */ /** * @swagger * /issues/return: - * post: - * summary: Return an issued book and reconcile inventory stock balances - * tags: [Issues] - * security: - * - bearerAuth: [] - * requestBody: - * required: true - * content: - * application/json: - * schema: - * type: object - * required: - * - issue_id - * properties: - * issue_id: - * type: string - * format: uuid - * example: "b2c3d4e5-f6a7-8b9c-0d1e-2f3a4b5c6d7e" - * responses: - * 200: - * description: Book returned successfully. Fines dynamically logged if overdue. - * 400: - * description: Book has already been safely returned - * 404: - * description: Tracking record not discovered + * post: + * summary: Return an issued book and reconcile inventory stock balances + * tags: [Issues] + * security: + * - bearerAuth: [] + * + * requestBody: + * required: true + * content: + * application/json: + * schema: + * type: object + * required: + * - issue_id + * + * properties: + * issue_id: + * type: string + * format: uuid + * example: b2c3d4e5-f6a7-8b9c-0d1e-2f3a4b5c6d7e + * + * responses: + * 200: + * description: Book returned successfully. Fines dynamically logged if overdue. + * + * 400: + * description: Book has already been safely returned + * + * 404: + * description: Tracking record not discovered */ /** * @swagger * /issues/overdue: - * get: - * summary: Fetch active loan tracking cycles currently cataloged as overdue - * tags: [Issues] - * security: - * - bearerAuth: [] - * responses: - * 200: - * description: List of overdue logs mapped back returned safely - * 401: - * description: Unauthorized token verification failure + * get: + * summary: Fetch active loan tracking cycles currently cataloged as overdue + * tags: [Issues] + * security: + * - bearerAuth: [] + * + * responses: + * 200: + * description: List of overdue logs mapped back returned safely + * + * 401: + * description: Unauthorized token verification failure */ - import { Router } from "express"; import auth from "../../middlewares/auth.js"; From 232339e9d1584579964955a7ecf5619a91c08968 Mon Sep 17 00:00:00 2001 From: Yogeshwaran S Date: Wed, 27 May 2026 18:52:37 +0530 Subject: [PATCH 29/87] test: verify backend modules and stabilize API integrations --- server/src/app.ts | 49 ++--- server/src/database/models/Fine.ts | 2 +- server/src/docs/seed.sql | 208 ++++++++++++++++++ server/src/docs/swagger/swagger.config.ts | 4 +- server/src/docs/swagger/swagger.definition.ts | 20 +- server/src/docs/swagger/swagger.tags.ts | 5 - .../modules/dashboard/dashboard.repository.ts | 31 +-- .../src/modules/dashboard/dashboard.routes.ts | 105 ++++++++- server/src/modules/fines/fine.repository.ts | 2 +- server/src/modules/issues/issue.service.ts | 2 +- 10 files changed, 358 insertions(+), 70 deletions(-) create mode 100644 server/src/docs/seed.sql diff --git a/server/src/app.ts b/server/src/app.ts index 64daf84..132a0f9 100644 --- a/server/src/app.ts +++ b/server/src/app.ts @@ -18,46 +18,37 @@ import helmetConfig from "./config/helmet.js"; import corsConfig from "./config/cors.js"; import "./config/validateEnv.js"; - const app: Application = express(); -app.use( - "/api-docs", - swaggerUi.serve, - swaggerUi.setup(swaggerSpec) -); - /* -------------------------------------------------------------------------- */ -/* MIDDLEWARES */ +/* GLOBAL MIDDLEWARES */ /* -------------------------------------------------------------------------- */ -app.use( - cors({ - origin: env.FRONTEND_URL, - credentials: true, - }) -); -app.use(corsConfig); +// 1. Core Security & Rate Limiting Headers +app.use(helmetConfig); +app.use(helmet()); +app.use(corsConfig); // Use your custom centralized config safely +// 2. Traffic Flow Rate Limiting app.use(rateLimiter); -app.use(helmetConfig); -app.use(helmet()); - +// 3. Request Logging & Body Parsing app.use(morgan("dev")); - app.use(express.json()); - app.use(express.urlencoded({ extended: true })); - app.use(cookieParser()); -app.use(notFoundHandler); - -app.use(globalErrorHandler); +/* -------------------------------------------------------------------------- */ +/* API DOCUMENTATION */ +/* -------------------------------------------------------------------------- */ +app.use( + "/api-docs", + swaggerUi.serve, + swaggerUi.setup(swaggerSpec) +); /* -------------------------------------------------------------------------- */ -/* ROUTES */ +/* ROUTES */ /* -------------------------------------------------------------------------- */ app.get("/", (_req: Request, res: Response) => { @@ -67,9 +58,15 @@ app.get("/", (_req: Request, res: Response) => { }); }); - +// Primary application API routes mounted before error boundaries app.use("/api/v1", routes); +/* -------------------------------------------------------------------------- */ +/* ERROR HANDLING BOUNDARIES */ +/* -------------------------------------------------------------------------- */ +// These must remain at the very bottom of the middleware lifecycle stack! +app.use(notFoundHandler); +app.use(globalErrorHandler); export default app; \ No newline at end of file diff --git a/server/src/database/models/Fine.ts b/server/src/database/models/Fine.ts index cecb804..1c09271 100644 --- a/server/src/database/models/Fine.ts +++ b/server/src/database/models/Fine.ts @@ -20,7 +20,7 @@ class Fine extends Model< declare fine_amount: number; - declare paid_status: CreationOptional<"PAID" | "UNPAID">; // Defaults to 'UNPAID' + declare paid_status: CreationOptional; declare paid_date: CreationOptional; declare readonly created_at: CreationOptional; diff --git a/server/src/docs/seed.sql b/server/src/docs/seed.sql new file mode 100644 index 0000000..bd492d1 --- /dev/null +++ b/server/src/docs/seed.sql @@ -0,0 +1,208 @@ +-- ============================================================================= +-- 1. SEEDING USERS & MEMBERS +-- ============================================================================= + +-- All users below use the real Bcrypt hash for the password: password123 +-- Gold Plan ID: 173233e3-d14a-4008-a269-98eab1699eef +-- Bronze Plan ID: 96479a54-3591-465c-9ed4-4dba4e0da49a +-- Silver Plan ID: c2673506-3c78-4e25-9d54-f0d017fd0d82 + +INSERT INTO users (uuid, name, gmail, password, phone_number, role) VALUES +('10000001-1111-1111-1111-111111111111', 'Aarav Sharma', 'aarav.sharma@gmail.com', '$2b$10$EixVaKV3ws1vEPb9JIJ40uN40Z9J0.W8Sshm68661vV3a6.83qbyG', '9876543201', 'READER'), +('10000002-1111-1111-1111-111111111111', 'Aditi Rao', 'aditi.rao@gmail.com', '$2b$10$EixVaKV3ws1vEPb9JIJ40uN40Z9J0.W8Sshm68661vV3a6.83qbyG', '9876543202', 'READER'), +('10000003-1111-1111-1111-111111111111', 'Arjun Verma', 'arjun.verma@gmail.com', '$2b$10$EixVaKV3ws1vEPb9JIJ40uN40Z9J0.W8Sshm68661vV3a6.83qbyG', '9876543203', 'READER'), +('10000004-1111-1111-1111-111111111111', 'Ananya Patel', 'ananya.patel@gmail.com', '$2b$10$EixVaKV3ws1vEPb9JIJ40uN40Z9J0.W8Sshm68661vV3a6.83qbyG', '9876543204', 'READER'), +('10000005-1111-1111-1111-111111111111', 'Dev Singh', 'dev.singh@gmail.com', '$2b$10$EixVaKV3ws1vEPb9JIJ40uN40Z9J0.W8Sshm68661vV3a6.83qbyG', '9876543205', 'READER'), +('10000006-1111-1111-1111-111111111111', 'Diya Joshi', 'diya.joshi@gmail.com', '$2b$10$EixVaKV3ws1vEPb9JIJ40uN40Z9J0.W8Sshm68661vV3a6.83qbyG', '9876543206', 'READER'), +('10000007-1111-1111-1111-111111111111', 'Ishaan Malhotra', 'ishaan.malhotra@gmail.com', '$2b$10$EixVaKV3ws1vEPb9JIJ40uN40Z9J0.W8Sshm68661vV3a6.83qbyG', '9876543207', 'READER'), +('10000008-1111-1111-1111-111111111111', 'Kavya Nair', 'kavya.nair@gmail.com', '$2b$10$EixVaKV3ws1vEPb9JIJ40uN40Z9J0.W8Sshm68661vV3a6.83qbyG', '9876543208', 'READER'), +('10000009-1111-1111-1111-111111111111', 'Kabir Gupta', 'kabir.gupta@gmail.com', '$2b$10$EixVaKV3ws1vEPb9JIJ40uN40Z9J0.W8Sshm68661vV3a6.83qbyG', '9876543209', 'READER'), +('10000010-1111-1111-1111-111111111111', 'Meera Reddy', 'meera.reddy@gmail.com', '$2b$10$EixVaKV3ws1vEPb9JIJ40uN40Z9J0.W8Sshm68661vV3a6.83qbyG', '9876543210', 'READER'), +('10000011-1111-1111-1111-111111111111', 'Rohan Das', 'rohan.das@gmail.com', '$2b$10$EixVaKV3ws1vEPb9JIJ40uN40Z9J0.W8Sshm68661vV3a6.83qbyG', '9876543211', 'READER'), +('10000012-1111-1111-1111-111111111111', 'Riya Sen', 'riya.sen@gmail.com', '$2b$10$EixVaKV3ws1vEPb9JIJ40uN40Z9J0.W8Sshm68661vV3a6.83qbyG', '9876543212', 'READER'), +('10000013-1111-1111-1111-111111111111', 'Sai Kumar', 'sai.kumar@gmail.com', '$2b$10$EixVaKV3ws1vEPb9JIJ40uN40Z9J0.W8Sshm68661vV3a6.83qbyG', '9876543213', 'READER'), +('10000014-1111-1111-1111-111111111111', 'Sanya Kapoor', 'sanya.kapoor@gmail.com', '$2b$10$EixVaKV3ws1vEPb9JIJ40uN40Z9J0.W8Sshm68661vV3a6.83qbyG', '9876543214', 'READER'), +('10000015-1111-1111-1111-111111111111', 'Tejas Mehta', 'tejas.mehta@gmail.com', '$2b$10$EixVaKV3ws1vEPb9JIJ40uN40Z9J0.W8Sshm68661vV3a6.83qbyG', '9876543215', 'READER'), +('10000016-1111-1111-1111-111111111111', 'Tara Choudhury', 'tara.choudhury@gmail.com', '$2b$10$EixVaKV3ws1vEPb9JIJ40uN40Z9J0.W8Sshm68661vV3a6.83qbyG', '9876543216', 'READER'), +('10000017-1111-1111-1111-111111111111', 'Vivaan Saxena', 'vivaan.saxena@gmail.com', '$2b$10$EixVaKV3ws1vEPb9JIJ40uN40Z9J0.W8Sshm68661vV3a6.83qbyG', '9876543217', 'READER'), +('10000018-1111-1111-1111-111111111111', 'Anika Mishra', 'anika.mishra@gmail.com', '$2b$10$EixVaKV3ws1vEPb9JIJ40uN40Z9J0.W8Sshm68661vV3a6.83qbyG', '9876543218', 'READER'), +('10000019-1111-1111-1111-111111111111', 'Vihaan Goel', 'vihaan.goel@gmail.com', '$2b$10$EixVaKV3ws1vEPb9JIJ40uN40Z9J0.W8Sshm68661vV3a6.83qbyG', '9876543219', 'READER'), +('10000020-1111-1111-1111-111111111111', 'Prisha Jain', 'prisha.jain@gmail.com', '$2b$10$EixVaKV3ws1vEPb9JIJ40uN40Z9J0.W8Sshm68661vV3a6.83qbyG', '9876543220', 'READER'), +('10000021-1111-1111-1111-111111111111', 'Yash Wardhan', 'yash.w@gmail.com', '$2b$10$EixVaKV3ws1vEPb9JIJ40uN40Z9J0.W8Sshm68661vV3a6.83qbyG', '9876543221', 'READER'), +('10000022-1111-1111-1111-111111111111', 'Navya Bhat', 'navya.bhat@gmail.com', '$2b$10$EixVaKV3ws1vEPb9JIJ40uN40Z9J0.W8Sshm68661vV3a6.83qbyG', '9876543222', 'READER'), +('10000023-1111-1111-1111-111111111111', 'Reyansh Paul', 'reyansh.p@gmail.com', '$2b$10$EixVaKV3ws1vEPb9JIJ40uN40Z9J0.W8Sshm68661vV3a6.83qbyG', '9876543223', 'READER'), +('10000024-1111-1111-1111-111111111111', 'Isha Abraham', 'isha.a@gmail.com', '$2b$10$EixVaKV3ws1vEPb9JIJ40uN40Z9J0.W8Sshm68661vV3a6.83qbyG', '9876543224', 'READER'), +('10000025-1111-1111-1111-111111111111', 'Dhruv Bose', 'dhruv.bose@gmail.com', '$2b$10$EixVaKV3ws1vEPb9JIJ40uN40Z9J0.W8Sshm68661vV3a6.83qbyG', '9876543225', 'READER'), +('10000026-1111-1111-1111-111111111111', 'Siddharth Roy', 'sid.roy@gmail.com', '$2b$10$EixVaKV3ws1vEPb9JIJ40uN40Z9J0.W8Sshm68661vV3a6.83qbyG', '9876543226', 'READER'), +('10000027-1111-1111-1111-111111111111', 'Kriti Sharma', 'kriti.s@gmail.com', '$2b$10$EixVaKV3ws1vEPb9JIJ40uN40Z9J0.W8Sshm68661vV3a6.83qbyG', '9876543227', 'READER'), +('10000028-1111-1111-1111-111111111111', 'Madhavan K', 'madhavan.k@gmail.com', '$2b$10$EixVaKV3ws1vEPb9JIJ40uN40Z9J0.W8Sshm68661vV3a6.83qbyG', '9876543228', 'READER'), +('10000029-1111-1111-1111-111111111111', 'Shruti Iyer', 'shruti.iyer@gmail.com', '$2b$10$EixVaKV3ws1vEPb9JIJ40uN40Z9J0.W8Sshm68661vV3a6.83qbyG', '9876543229', 'READER'), +('10000030-1111-1111-1111-111111111111', 'Rishabh Pant', 'rishabh.p@gmail.com', '$2b$10$EixVaKV3ws1vEPb9JIJ40uN40Z9J0.W8Sshm68661vV3a6.83qbyG', '9876543230', 'READER'), +('10000031-1111-1111-1111-111111111111', 'Avani Dixit', 'avani.d@gmail.com', '$2b$10$EixVaKV3ws1vEPb9JIJ40uN40Z9J0.W8Sshm68661vV3a6.83qbyG', '9876543231', 'READER'), +('10000032-1111-1111-1111-111111111111', 'Aditya Birla', 'aditya.b@gmail.com', '$2b$10$EixVaKV3ws1vEPb9JIJ40uN40Z9J0.W8Sshm68661vV3a6.83qbyG', '9876543232', 'READER'), +('10000033-1111-1111-1111-111111111111', 'Sneha Gadde', 'sneha.g@gmail.com', '$2b$10$EixVaKV3ws1vEPb9JIJ40uN40Z9J0.W8Sshm68661vV3a6.83qbyG', '9876543233', 'READER'), +('10000034-1111-1111-1111-111111111111', 'Hrithik R', 'hrithik.r@gmail.com', '$2b$10$EixVaKV3ws1vEPb9JIJ40uN40Z9J0.W8Sshm68661vV3a6.83qbyG', '9876543234', 'READER'), +('10000035-1111-1111-1111-111111111111', 'Khushi Shah', 'khushi.s@gmail.com', '$2b$10$EixVaKV3ws1vEPb9JIJ40uN40Z9J0.W8Sshm68661vV3a6.83qbyG', '9876543235', 'READER'), +('10000036-1111-1111-1111-111111111111', 'Ranveer Rao', 'ranveer.r@gmail.com', '$2b$10$EixVaKV3ws1vEPb9JIJ40uN40Z9J0.W8Sshm68661vV3a6.83qbyG', '9876543236', 'READER'), +('10000037-1111-1111-1111-111111111111', 'Alia Bhatt', 'alia.b@gmail.com', '$2b$10$EixVaKV3ws1vEPb9JIJ40uN40Z9J0.W8Sshm68661vV3a6.83qbyG', '9876543237', 'READER'), +('10000038-1111-1111-1111-111111111111', 'Varun Dhawan', 'varun.d@gmail.com', '$2b$10$EixVaKV3ws1vEPb9JIJ40uN40Z9J0.W8Sshm68661vV3a6.83qbyG', '9876543238', 'READER'), +('10000039-1111-1111-1111-111111111111', 'Deepika P', 'deepika.p@gmail.com', '$2b$10$EixVaKV3ws1vEPb9JIJ40uN40Z9J0.W8Sshm68661vV3a6.83qbyG', '9876543239', 'READER'), +('10000040-1111-1111-1111-111111111111', 'Ranbir K', 'ranbir.k@gmail.com', '$2b$10$EixVaKV3ws1vEPb9JIJ40uN40Z9J0.W8Sshm68661vV3a6.83qbyG', '9876543240', 'READER'), + +-- 👤 EXPLICIT LIBRARIAN ACCOUNT (No associated row in members table) +('50000001-deee-deee-deee-deeeeee00001', 'Yogesh (Librarian)', 'yogesh@gmail.com', '$2b$10$EixVaKV3ws1vEPb9JIJ40uN40Z9J0.W8Sshm68661vV3a6.83qbyG', '9999999991', 'LIBRARIAN'), + +-- 👑 EXPLICIT ADMIN ACCOUNT (No associated row in members table) +('50000002-deee-deee-deee-deeeeee00002', 'System Administrator', 'admin@library.com', '$2b$10$EixVaKV3ws1vEPb9JIJ40uN40Z9J0.W8Sshm68661vV3a6.83qbyG', '9999999992', 'ADMIN'); + + +INSERT INTO members (member_id, user_id, membership_plan_id, start_date, expiry_date, membership_status) VALUES +-- Members 1-10 mapped to Bronze (96479a54-3591-465c-9ed4-4dba4e0da49a) +('20000001-2222-2222-2222-222222222222', '10000001-1111-1111-1111-111111111111', '96479a54-3591-465c-9ed4-4dba4e0da49a', '2026-05-01', '2026-08-01', 'ACTIVE'), +('20000002-2222-2222-2222-222222222222', '10000002-1111-1111-1111-111111111111', '96479a54-3591-465c-9ed4-4dba4e0da49a', '2026-05-10', '2026-08-10', 'ACTIVE'), +('20000003-2222-2222-2222-222222222222', '10000003-1111-1111-1111-111111111111', '96479a54-3591-465c-9ed4-4dba4e0da49a', '2026-05-12', '2026-08-12', 'ACTIVE'), +('20000004-2222-2222-2222-222222222222', '10000004-1111-1111-1111-111111111111', '96479a54-3591-465c-9ed4-4dba4e0da49a', '2026-05-15', '2026-08-15', 'ACTIVE'), +('20000005-2222-2222-2222-222222222222', '10000005-1111-1111-1111-111111111111', '96479a54-3591-465c-9ed4-4dba4e0da49a', '2026-05-18', '2026-08-18', 'ACTIVE'), +('20000006-2222-2222-2222-222222222222', '10000006-1111-1111-1111-111111111111', '96479a54-3591-465c-9ed4-4dba4e0da49a', '2026-05-20', '2026-08-20', 'ACTIVE'), +('20000007-2222-2222-2222-222222222222', '10000007-1111-1111-1111-111111111111', '96479a54-3591-465c-9ed4-4dba4e0da49a', '2026-05-22', '2026-08-22', 'ACTIVE'), +('20000008-2222-2222-2222-222222222222', '10000008-1111-1111-1111-111111111111', '96479a54-3591-465c-9ed4-4dba4e0da49a', '2026-01-01', '2026-04-01', 'EXPIRED'), +('20000009-2222-2222-2222-222222222222', '10000009-1111-1111-1111-111111111111', '96479a54-3591-465c-9ed4-4dba4e0da49a', '2026-01-10', '2026-04-10', 'EXPIRED'), +('20000010-2222-2222-2222-222222222222', '10000010-1111-1111-1111-111111111111', '96479a54-3591-465c-9ed4-4dba4e0da49a', '2026-01-15', '2026-04-15', 'EXPIRED'), +-- Members 11-25 mapped to Silver (c2673506-3c78-4e25-9d54-f0d017fd0d82) +('20000011-2222-2222-2222-222222222222', '10000011-1111-1111-1111-111111111111', 'c2673506-3c78-4e25-9d54-f0d017fd0d82', '2026-01-10', '2026-07-10', 'ACTIVE'), +('20000012-2222-2222-2222-222222222222', '10000012-1111-1111-1111-111111111111', 'c2673506-3c78-4e25-9d54-f0d017fd0d82', '2026-02-15', '2026-08-15', 'ACTIVE'), +('20000013-2222-2222-2222-222222222222', '10000013-1111-1111-1111-111111111111', 'c2673506-3c78-4e25-9d54-f0d017fd0d82', '2026-03-01', '2026-09-01', 'ACTIVE'), +('20000014-2222-2222-2222-222222222222', '10000014-1111-1111-1111-111111111111', 'c2673506-3c78-4e25-9d54-f0d017fd0d82', '2026-03-10', '2026-09-10', 'ACTIVE'), +('20000015-2222-2222-2222-222222222222', '10000015-1111-1111-1111-111111111111', 'c2673506-3c78-4e25-9d54-f0d017fd0d82', '2026-04-01', '2026-10-01', 'ACTIVE'), +('20000016-2222-2222-2222-222222222222', '10000016-1111-1111-1111-111111111111', 'c2673506-3c78-4e25-9d54-f0d017fd0d82', '2026-04-05', '2026-10-05', 'ACTIVE'), +('20000017-2222-2222-2222-222222222222', '10000017-1111-1111-1111-111111111111', 'c2673506-3c78-4e25-9d54-f0d017fd0d82', '2026-04-10', '2026-10-10', 'ACTIVE'), +('20000018-2222-2222-2222-222222222222', '10000018-1111-1111-1111-111111111111', 'c2673506-3c78-4e25-9d54-f0d017fd0d82', '2026-04-15', '2026-10-15', 'ACTIVE'), +('20000019-2222-2222-2222-222222222222', '10000019-1111-1111-1111-111111111111', 'c2673506-3c78-4e25-9d54-f0d017fd0d82', '2026-04-20', '2026-10-20', 'ACTIVE'), +('20000020-2222-2222-2222-222222222222', '10000020-1111-1111-1111-111111111111', 'c2673506-3c78-4e25-9d54-f0d017fd0d82', '2026-04-25', '2026-10-25', 'ACTIVE'), +('20000021-2222-2222-2222-222222222222', '10000021-1111-1111-1111-111111111111', 'c2673506-3c78-4e25-9d54-f0d017fd0d82', '2026-05-01', '2026-11-01', 'ACTIVE'), +('20000022-2222-2222-2222-222222222222', '10000022-1111-1111-1111-111111111111', 'c2673506-3c78-4e25-9d54-f0d017fd0d82', '2026-05-02', '2026-11-02', 'ACTIVE'), +('20000023-2222-2222-2222-222222222222', '10000023-1111-1111-1111-111111111111', 'c2673506-3c78-4e25-9d54-f0d017fd0d82', '2026-05-05', '2026-11-05', 'ACTIVE'), +('20000024-2222-2222-2222-222222222222', '10000024-1111-1111-1111-111111111111', 'c2673506-3c78-4e25-9d54-f0d017fd0d82', '2026-05-10', '2026-11-10', 'ACTIVE'), +('20000025-2222-2222-2222-222222222222', '10000025-1111-1111-1111-111111111111', 'c2673506-3c78-4e25-9d54-f0d017fd0d82', '2026-05-12', '2026-11-12', 'ACTIVE'), +-- Members 26-40 mapped to Gold (173233e3-d14a-4008-a269-98eab1699eef) +('20000026-2222-2222-2222-222222222222', '10000026-1111-1111-1111-111111111111', '173233e3-d14a-4008-a269-98eab1699eef', '2026-01-01', '2027-01-01', 'ACTIVE'), +('20000027-2222-2222-2222-222222222222', '10000027-1111-1111-1111-111111111111', '173233e3-d14a-4008-a269-98eab1699eef', '2026-01-15', '2027-01-15', 'ACTIVE'), +('20000028-2222-2222-2222-222222222222', '10000028-1111-1111-1111-111111111111', '173233e3-d14a-4008-a269-98eab1699eef', '2026-02-01', '2027-02-01', 'ACTIVE'), +('20000029-2222-2222-2222-222222222222', '10000029-1111-1111-1111-111111111111', '173233e3-d14a-4008-a269-98eab1699eef', '2026-02-20', '2027-02-20', 'ACTIVE'), +('20000030-2222-2222-2222-222222222222', '10000030-1111-1111-1111-111111111111', '173233e3-d14a-4008-a269-98eab1699eef', '2026-03-01', '2027-03-01', 'ACTIVE'), +('20000031-2222-2222-2222-222222222222', '10000031-1111-1111-1111-111111111111', '173233e3-d14a-4008-a269-98eab1699eef', '2026-03-15', '2027-03-15', 'ACTIVE'), +('20000032-2222-2222-2222-222222222222', '10000032-1111-1111-1111-111111111111', '173233e3-d14a-4008-a269-98eab1699eef', '2026-04-01', '2027-04-01', 'ACTIVE'), +('20000033-2222-2222-2222-222222222222', '10000033-1111-1111-1111-111111111111', '173233e3-d14a-4008-a269-98eab1699eef', '2026-04-10', '2027-04-10', 'ACTIVE'), +('20000034-2222-2222-2222-222222222222', '10000034-1111-1111-1111-111111111111', '173233e3-d14a-4008-a269-98eab1699eef', '2026-04-18', '2027-04-18', 'ACTIVE'), +('20000035-2222-2222-2222-222222222222', '10000035-1111-1111-1111-111111111111', '173233e3-d14a-4008-a269-98eab1699eef', '2026-04-25', '2027-04-25', 'ACTIVE'), +('20000036-2222-2222-2222-222222222222', '10000036-1111-1111-1111-111111111111', '173233e3-d14a-4008-a269-98eab1699eef', '2026-05-01', '2027-05-01', 'ACTIVE'), +('20000037-2222-2222-2222-222222222222', '10000037-1111-1111-1111-111111111111', '173233e3-d14a-4008-a269-98eab1699eef', '2026-05-05', '2027-05-05', 'ACTIVE'), +('20000038-2222-2222-2222-222222222222', '10000038-1111-1111-1111-111111111111', '173233e3-d14a-4008-a269-98eab1699eef', '2026-05-10', '2027-05-10', 'ACTIVE'), +('20000039-2222-2222-2222-222222222222', '10000039-1111-1111-1111-111111111111', '173233e3-d14a-4008-a269-98eab1699eef', '2026-05-15', '2027-05-15', 'ACTIVE'), +('20000040-2222-2222-2222-222222222222', '10000040-1111-1111-1111-111111111111', '173233e3-d14a-4008-a269-98eab1699eef', '2026-05-20', '2027-05-20', 'ACTIVE'); + + +-- ============================================================================= +-- 2. SEEDING 50 BOOKS (Distributed inside your Category IDs) +-- ============================================================================= + +INSERT INTO books (book_id, book_name, book_author, category_id, total_copies, available_copies, lending_count) VALUES +-- Technology (10 Books) +('b0000001-3333-3333-3333-333333333333', 'The Pragmatic Programmer', 'Andrew Hunt', 'c8ebe1b8-4448-4e63-bfb5-b73fc9626da1', 5, 4, 12), +('b0000002-3333-3333-3333-333333333333', 'Clean Code', 'Robert C. Martin', 'c8ebe1b8-4448-4e63-bfb5-b73fc9626da1', 6, 4, 25), +('b0000003-3333-3333-3333-333333333333', 'Introduction to Algorithms', 'Thomas H. Cormen', 'c8ebe1b8-4448-4e63-bfb5-b73fc9626da1', 3, 2, 8), +('b0000004-3333-3333-3333-333333333333', 'You Don''t Know JS', 'Kyle Simpson', 'c8ebe1b8-4448-4e63-bfb5-b73fc9626da1', 10, 9, 30), +('b0000005-3333-3333-3333-333333333333', 'Design Patterns', 'Erich Gamma', 'c8ebe1b8-4448-4e63-bfb5-b73fc9626da1', 4, 3, 15), +('b0000006-3333-3333-3333-333333333333', 'Refactoring', 'Martin Fowler', 'c8ebe1b8-4448-4e63-bfb5-b73fc9626da1', 5, 5, 4), +('b0000007-3333-3333-3333-333333333333', 'Designing Data-Intensive Applications', 'Martin Kleppmann', 'c8ebe1b8-4448-4e63-bfb5-b73fc9626da1', 7, 6, 19), +('b0000008-3333-3333-3333-333333333333', 'Compilers', 'Alfred Aho', 'c8ebe1b8-4448-4e63-bfb5-b73fc9626da1', 2, 2, 2), +('b0000009-3333-3333-3333-333333333333', 'Modern Operating Systems', 'Andrew Tanenbaum', 'c8ebe1b8-4448-4e63-bfb5-b73fc9626da1', 4, 3, 6), +('b0000010-3333-3333-3333-333333333333', 'Computer Networking', 'James Kurose', 'c8ebe1b8-4448-4e63-bfb5-b73fc9626da1', 4, 4, 5), +-- Fiction (10 Books) +('b0000011-3333-3333-3333-333333333333', 'To Kill a Mockingbird', 'Harper Lee', '49a9a42c-c88f-406c-9c9d-6d47d9d20ec2', 8, 7, 40), +('b0000012-3333-3333-3333-333333333333', '1984', 'George Orwell', '49a9a42c-c88f-406c-9c9d-6d47d9d20ec2', 12, 11, 55), +('b0000013-3333-3333-3333-333333333333', 'The Great Gatsby', 'F. Scott Fitzgerald', '49a9a42c-c88f-406c-9c9d-6d47d9d20ec2', 6, 5, 22), +('b0000014-3333-3333-3333-333333333333', 'One Hundred Years of Solitude', 'Gabriel Garcia Marquez', '49a9a42c-c88f-406c-9c9d-6d47d9d20ec2', 5, 4, 11), +('b0000015-3333-3333-3333-333333333333', 'Moby Dick', 'Herman Melville', '49a9a42c-c88f-406c-9c9d-6d47d9d20ec2', 4, 4, 3), +('b0000016-3333-3333-3333-333333333333', 'The Catcher in the Rye', 'J.D. Salinger', '49a9a42c-c88f-406c-9c9d-6d47d9d20ec2', 7, 6, 18), +('b0000017-3333-3333-3333-333333333333', 'Pride and Prejudice', 'Jane Austen', '49a9a42c-c88f-406c-9c9d-6d47d9d20ec2', 9, 8, 29), +('b0000018-3333-3333-3333-333333333333', 'The Hobbit', 'J.R.R. Tolkien', '49a9a42c-c88f-406c-9c9d-6d47d9d20ec2', 11, 10, 48), +('b0000019-3333-3333-3333-333333333333', 'Crime and Punishment', 'Fyodor Dostoevsky', '49a9a42c-c88f-406c-9c9d-6d47d9d20ec2', 4, 3, 9), +('b0000020-3333-3333-3333-333333333333', 'Brave New World', 'Aldous Huxley', '49a9a42c-c88f-406c-9c9d-6d47d9d20ec2', 6, 6, 14), +-- Science (10 Books) +('b0000021-3333-3333-3333-333333333333', 'A Brief History of Time', 'Stephen Hawking', '075705f3-c7be-4585-85d1-b57616870f68', 5, 4, 33), +('b0000022-3333-3333-3333-333333333333', 'Cosmos', 'Carl Sagan', '075705f3-c7be-4585-85d1-b57616870f68', 6, 5, 27), +('b0000023-3333-3333-3333-333333333333', 'The Selfish Gene', 'Richard Dawkins', '075705f3-c7be-4585-85d1-b57616870f68', 4, 3, 16), +('b0000024-3333-3333-3333-333333333333', 'The Elegant Universe', 'Brian Greene', '075705f3-c7be-4585-85d1-b57616870f68', 3, 3, 8), +('b0000025-3333-3333-3333-333333333333', 'Sapiens', 'Yuval Noah Harari', '075705f3-c7be-4585-85d1-b57616870f68', 15, 13, 72), +('b0000026-3333-3333-3333-333333333333', 'The Emperor of Maladies', 'Siddhartha Mukherjee', '075705f3-c7be-4585-85d1-b57616870f68', 4, 4, 12), +('b0000027-3333-3333-3333-333333333333', 'What If?', 'Randall Munroe', '075705f3-c7be-4585-85d1-b57616870f68', 5, 4, 21), +('b0000028-3333-3333-3333-333333333333', 'Astrophysics in a Hurry', 'Neil deGrasse Tyson', '075705f3-c7be-4585-85d1-b57616870f68', 8, 7, 45), +('b0000029-3333-3333-3333-333333333333', 'The Gene', 'Siddhartha Mukherjee', '075705f3-c7be-4585-85d1-b57616870f68', 3, 3, 9), +('b0000030-3333-3333-3333-333333333333', 'Chaos', 'James Gleick', '075705f3-c7be-4585-85d1-b57616870f68', 2, 2, 4), +-- History (10 Books) +('b0000031-3333-3333-3333-333333333333', 'The Guns of August', 'Barbara W. Tuchman', 'e90e2e1b-7b22-4a4f-bb10-d8dbf833fa2e', 3, 2, 6), +('b0000032-3333-3333-3333-333333333333', 'Team of Rivals', 'Doris Kearns Goodwin', 'e90e2e1b-7b22-4a4f-bb10-d8dbf833fa2e', 4, 3, 11), +('b0000033-3333-3333-3333-333333333333', 'The Rise and Fall of the Third Reich', 'William L. Shirer', 'e90e2e1b-7b22-4a4f-bb10-d8dbf833fa2e', 5, 4, 15), +('b0000034-3333-3333-3333-333333333333', '1776', 'David McCullough', 'e90e2e1b-7b22-4a4f-bb10-d8dbf833fa2e', 6, 6, 20), +('b0000035-3333-3333-3333-333333333333', 'Guns, Germs, and Steel', 'Jared Diamond', 'e90e2e1b-7b22-4a4f-bb10-d8dbf833fa2e', 8, 7, 38), +('b0000036-3333-3333-3333-333333333333', 'The Silk Roads', 'Peter Frankopan', 'e90e2e1b-7b22-4a4f-bb10-d8dbf833fa2e', 5, 5, 13), +('b0000037-3333-3333-3333-333333333333', 'Alexander Hamilton', 'Ron Chernow', 'e90e2e1b-7b22-4a4f-bb10-d8dbf833fa2e', 4, 3, 25), +('b0000038-3333-3333-3333-333333333333', 'SPQR', 'Mary Beard', 'e90e2e1b-7b22-4a4f-bb10-d8dbf833fa2e', 3, 3, 7), +('b0000039-3333-3333-3333-333333333333', 'Genghis Khan', 'Jack Weatherford', 'e90e2e1b-7b22-4a4f-bb10-d8dbf833fa2e', 4, 4, 18), +('b0000040-3333-3333-3333-333333333333', 'The Wright Brothers', 'David McCullough', 'e90e2e1b-7b22-4a4f-bb10-d8dbf833fa2e', 5, 5, 12), +-- Biography & Non-Fiction Blend (10 Books) +('b0000041-3333-3333-3333-333333333333', 'The Lean Startup', 'Eric Ries', 'c857c1ed-f24d-467f-aa3a-2432729813a1', 10, 9, 42), +('b0000042-3333-3333-3333-333333333333', 'Zero to One', 'Peter Thiel', 'c857c1ed-f24d-467f-aa3a-2432729813a1', 8, 7, 39), +('b0000043-3333-3333-3333-333333333333', 'Thinking, Fast and Slow', 'Daniel Kahneman', 'c857c1ed-f24d-467f-aa3a-2432729813a1', 7, 6, 28), +('b0000044-3333-3333-3333-333333333333', 'Good to Great', 'Jim Collins', 'c857c1ed-f24d-467f-aa3a-2432729813a1', 5, 5, 14), +('b0000045-3333-3333-3333-333333333333', 'The Intelligent Investor', 'Benjamin Graham', 'c857c1ed-f24d-467f-aa3a-2432729813a1', 6, 5, 23), +('b0000046-3333-3333-3333-333333333333', 'Steve Jobs Biography', 'Walter Isaacson', 'e97b1ed4-0a95-4f69-9ed5-a29d15f749da', 5, 4, 61), +('b0000047-3333-3333-3333-333333333333', 'Einstein: His Life', 'Walter Isaacson', 'e97b1ed4-0a95-4f69-9ed5-a29d15f749da', 4, 4, 19), +('b0000048-3333-3333-3333-333333333333', 'Leonardo da Vinci', 'Walter Isaacson', 'e97b1ed4-0a95-4f69-9ed5-a29d15f749da', 6, 6, 12), +('b0000049-3333-3333-3333-333333333333', 'Churchill: A Life', 'Martin Gilbert', 'e97b1ed4-0a95-4f69-9ed5-a29d15f749da', 3, 3, 8), +('b0000050-3333-3333-3333-333333333333', 'Malcolm X Autobiography', 'Alex Haley', 'e97b1ed4-0a95-4f69-9ed5-a29d15f749da', 5, 5, 30); + + +-- ============================================================================= +-- 3. SEEDING 20 ISSUES +-- ============================================================================= + +INSERT INTO issues (issue_id, member_id, book_id, borrowed_date, due_date, returned_date) VALUES +-- 10 Books returned historically +('40000001-4444-4444-4444-444444444444', '20000001-2222-2222-2222-222222222222', 'b0000001-3333-3333-3333-333333333333', '2026-05-01', '2026-05-15', '2026-05-14'), +('40000002-4444-4444-4444-444444444444', '20000002-2222-2222-2222-222222222222', 'b0000002-3333-3333-3333-333333333333', '2026-05-02', '2026-05-16', '2026-05-16'), +('40000003-4444-4444-4444-444444444444', '20000011-2222-2222-2222-222222222222', 'b0000011-3333-3333-3333-333333333333', '2026-05-03', '2026-05-17', '2026-05-15'), +('40000004-4444-4444-4444-444444444444', '20000012-2222-2222-2222-222222222222', 'b0000012-3333-3333-3333-333333333333', '2026-05-04', '2026-05-18', '2026-05-18'), +('40000005-4444-4444-4444-444444444444', '20000026-2222-2222-2222-222222222222', 'b0000021-3333-3333-3333-333333333333', '2026-05-05', '2026-05-19', '2026-05-17'), +('40000006-4444-4444-4444-444444444444', '20000027-2222-2222-2222-222222222222', 'b0000022-3333-3333-3333-333333333333', '2026-05-06', '2026-05-20', '2026-05-20'), +('40000007-4444-4444-4444-444444444444', '20000003-2222-2222-2222-222222222222', 'b0000031-3333-3333-3333-333333333333', '2026-05-07', '2026-05-21', '2026-05-20'), +('40000008-4444-4444-4444-444444444444', '20000013-2222-2222-2222-222222222222', 'b0000032-3333-3333-3333-333333333333', '2026-05-08', '2026-05-22', '2026-05-22'), +('40000009-4444-4444-4444-444444444444', '20000028-2222-2222-2222-222222222222', 'b0000041-3333-3333-3333-333333333333', '2026-05-09', '2026-05-23', '2026-05-21'), +('40000010-4444-4444-4444-444444444444', '20000004-2222-2222-2222-222222222222', 'b0000042-3333-3333-3333-333333333333', '2026-05-10', '2026-05-24', '2026-05-24'), + +-- 5 Books active and currently overdue (with fine tracking mappings) +('40000011-4444-4444-4444-444444444444', '20000005-2222-2222-2222-222222222222', 'b0000003-3333-3333-3333-333333333333', '2026-05-01', '2026-05-15', NULL), +('40000012-4444-4444-4444-444444444444', '20000014-2222-2222-2222-222222222222', 'b0000013-3333-3333-3333-333333333333', '2026-05-02', '2026-05-16', NULL), +('40000013-4444-4444-4444-444444444444', '20000029-2222-2222-2222-222222222222', 'b0000023-3333-3333-3333-333333333333', '2026-05-03', '2026-05-17', NULL), +('40000014-4444-4444-4444-444444444444', '20000006-2222-2222-2222-222222222222', 'b0000033-3333-3333-3333-333333333333', '2026-05-04', '2026-05-18', NULL), +('40000015-4444-4444-4444-444444444444', '20000015-2222-2222-2222-222222222222', 'b0000043-3333-3333-3333-333333333333', '2026-05-05', '2026-05-19', NULL), + +-- 5 Books active and within borrowing duration limit rules +('40000016-4444-4444-4444-444444444444', '20000030-2222-2222-2222-222222222222', 'b0000004-3333-3333-3333-333333333333', '2026-05-20', '2026-06-03', NULL), +('40000017-4444-4444-4444-444444444444', '20000007-2222-2222-2222-222222222222', 'b0000014-3333-3333-3333-333333333333', '2026-05-21', '2026-06-04', NULL), +('40000018-4444-4444-4444-444444444444', '20000016-2222-2222-2222-222222222222', 'b0000024-3333-3333-3333-333333333333', '2026-05-22', '2026-06-05', NULL), +('40000019-4444-4444-4444-444444444444', '20000031-2222-2222-2222-222222222222', 'b0000034-3333-3333-3333-333333333333', '2026-05-23', '2026-06-06', NULL), +('40000020-4444-4444-4444-444444444444', '20000008-2222-2222-2222-222222222222', 'b0000044-3333-3333-3333-333333333333', '2026-05-24', '2026-06-07', NULL); + + +-- ============================================================================= +-- 4. SEEDING 5 FINES +-- ============================================================================= + +INSERT INTO fines (fine_id, issue_id, delayed_days, fine_amount, paid_status, paid_date) VALUES +('50000001-5555-5555-5555-555555555555', '40000011-4444-4444-4444-444444444444', 12, 120.00, false, NULL), +('50000002-5555-5555-5555-555555555555', '40000012-4444-4444-4444-444444444444', 11, 110.00, false, NULL), +('50000003-5555-5555-5555-555555555555', '40000013-4444-4444-4444-444444444444', 10, 100.00, true, '2026-05-26'), +('50000004-5555-5555-5555-555555555555', '40000014-4444-4444-4444-444444444444', 9, 90.00, false, NULL), +('50000005-5555-5555-5555-555555555555', '40000015-4444-4444-4444-444444444444', 8, 80.00, true, '2026-05-27'); \ No newline at end of file diff --git a/server/src/docs/swagger/swagger.config.ts b/server/src/docs/swagger/swagger.config.ts index 55eff37..3e493f8 100644 --- a/server/src/docs/swagger/swagger.config.ts +++ b/server/src/docs/swagger/swagger.config.ts @@ -1,12 +1,10 @@ import swaggerJSDoc from "swagger-jsdoc"; - import swaggerDefinition from "./swagger.definition.js"; const options: swaggerJSDoc.Options = { definition: swaggerDefinition, - apis: [ - "./src/modules/**/*.ts", + "./src/modules/**/*.ts", // Scans all TS files in your modules for annotations ], }; diff --git a/server/src/docs/swagger/swagger.definition.ts b/server/src/docs/swagger/swagger.definition.ts index 1475e6b..227932f 100644 --- a/server/src/docs/swagger/swagger.definition.ts +++ b/server/src/docs/swagger/swagger.definition.ts @@ -1,40 +1,28 @@ +import swaggerTags from "./swagger.tags.js"; + const swaggerDefinition = { openapi: "3.0.0", - info: { title: "Library Management System API", - version: "1.0.0", - - description: - "Production-grade Library Management System backend APIs", + description: "Production-grade Library Management System backend APIs", }, - servers: [ { url: "http://localhost:5000/api/v1", - description: "Development Server", }, ], - + tags: swaggerTags, // 2. Inject your tags list here components: { securitySchemes: { bearerAuth: { type: "http", - scheme: "bearer", - bearerFormat: "JWT", }, }, }, - - security: [ - { - bearerAuth: [], - }, - ], }; export default swaggerDefinition; \ No newline at end of file diff --git a/server/src/docs/swagger/swagger.tags.ts b/server/src/docs/swagger/swagger.tags.ts index 1a89c19..03be11b 100644 --- a/server/src/docs/swagger/swagger.tags.ts +++ b/server/src/docs/swagger/swagger.tags.ts @@ -3,27 +3,22 @@ const swaggerTags = [ name: "Auth", description: "Authentication APIs", }, - { name: "Members", description: "Member management APIs", }, - { name: "Books", description: "Book management APIs", }, - { name: "Issues", description: "Book issue management APIs", }, - { name: "Fines", description: "Fine management APIs", }, - { name: "Dashboard", description: "Dashboard analytics APIs", diff --git a/server/src/modules/dashboard/dashboard.repository.ts b/server/src/modules/dashboard/dashboard.repository.ts index 3da6cbe..f3f6b4c 100644 --- a/server/src/modules/dashboard/dashboard.repository.ts +++ b/server/src/modules/dashboard/dashboard.repository.ts @@ -16,7 +16,7 @@ class DashboardRepository { issuedBooks, returnedBooks, overdueBooks, - unpaidFines, + fineAggregationResult, ] = await Promise.all([ Book.count(), @@ -53,13 +53,26 @@ class DashboardRepository { }, }), - Fine.sum("fine_amount", { + + Fine.findOne({ + attributes: [ + [ + fn("COALESCE", fn("SUM", col("fine_amount")), 0), + "total_unpaid" + ] + ], where: { - paid_status: "UNPAID", + paid_status: false, // Matches your boolean false column perfectly }, + raw: true, }), ]); + + const unpaidFines = fineAggregationResult + ? Number((fineAggregationResult as any).total_unpaid) + : 0; + return { totalBooks, totalMembers, @@ -68,7 +81,7 @@ class DashboardRepository { issuedBooks, returnedBooks, overdueBooks, - unpaidFines: unpaidFines || 0, + unpaidFines, }; } @@ -79,9 +92,7 @@ class DashboardRepository { "book_name", "lending_count", ], - order: [["lending_count", "DESC"]], - limit: 5, }); } @@ -89,28 +100,22 @@ class DashboardRepository { async getRecentIssues() { return Issue.findAll({ limit: 10, - order: [["created_at", "DESC"]], - include: [ { model: Member, as: "member", - include: [ { model: User, as: "user", - attributes: ["name"], }, ], }, - { model: Book, as: "book", - attributes: ["book_name"], }, ], @@ -123,9 +128,7 @@ class DashboardRepository { [fn("DATE_TRUNC", "month", col("created_at")), "month"], [fn("SUM", col("fine_amount")), "total"], ], - group: ["month"], - order: [[literal("month"), "ASC"]], }); } diff --git a/server/src/modules/dashboard/dashboard.routes.ts b/server/src/modules/dashboard/dashboard.routes.ts index 856656e..0220d96 100644 --- a/server/src/modules/dashboard/dashboard.routes.ts +++ b/server/src/modules/dashboard/dashboard.routes.ts @@ -76,6 +76,101 @@ * description: Monthly fine report matrix structured successfully */ +/** + * @swagger + * /dashboard/analytics/recent-issues: + * get: + * summary: Fetch most recent book checkouts for activity streaming + * description: Retrieves the latest book issuance records including book titles, borrowing member details, and timeline stats to populate dashboard real-time activity tracking streams. + * tags: [Dashboard] + * security: + * - bearerAuth: [] + * + * responses: + * 200: + * description: Latest book transactions tracking matrices processed and compiled successfully + * content: + * application/json: + * schema: + * type: object + * + * properties: + * success: + * type: boolean + * example: true + * + * data: + * type: array + * description: Chronological list of the most recent library checkouts + * + * items: + * type: object + * + * properties: + * issueId: + * type: string + * format: uuid + * example: "40000011-4444-4444-4444-444444444444" + * + * borrowedDate: + * type: string + * format: date + * example: "2026-05-20" + * + * dueDate: + * type: string + * format: date + * example: "2026-06-03" + * + * status: + * type: string + * enum: [BORROWED, RETURNED, OVERDUE] + * example: "BORROWED" + * + * book: + * type: object + * + * properties: + * bookId: + * type: string + * format: uuid + * example: "b0000004-3333-3333-3333-333333333333" + * + * bookName: + * type: string + * example: "You Don't Know JS" + * + * bookAuthor: + * type: string + * example: "Kyle Simpson" + * + * member: + * type: object + * + * properties: + * memberId: + * type: string + * format: uuid + * example: "20000015-2222-2222-2222-222222222222" + * + * memberName: + * type: string + * example: "Tejas Mehta" + * + * gmail: + * type: string + * example: "tejas.mehta@gmail.com" + * + * 401: + * description: Unauthorized access due to missing or structurally malformed JSON Web Tokens + * + * 403: + * description: Forbidden request access level clearance exceptions (Requires LIBRARIAN privileges) + * + * 500: + * description: Internal processing failures while querying transactional analytics logs + */ + import { Router } from "express"; @@ -90,26 +185,30 @@ import { const router = Router(); + router.get( "/overview", auth, getDashboardOverviewController ); + router.get( - "/popular-books", + "/analytics/popular-books", auth, getPopularBooksController ); + router.get( - "/recent-issues", + "/analytics/recent-issues", auth, getRecentIssuesController ); + router.get( - "/fine-analytics", + "/reports/monthly-fines", auth, getMonthlyFineCollectionController ); diff --git a/server/src/modules/fines/fine.repository.ts b/server/src/modules/fines/fine.repository.ts index b46409f..997155f 100644 --- a/server/src/modules/fines/fine.repository.ts +++ b/server/src/modules/fines/fine.repository.ts @@ -24,7 +24,7 @@ class FineRepository { async payFine(fine_id: string) { await Fine.update( { - paid_status: "PAID", + paid_status: true, paid_date: new Date(), }, { diff --git a/server/src/modules/issues/issue.service.ts b/server/src/modules/issues/issue.service.ts index 566993c..929a80d 100644 --- a/server/src/modules/issues/issue.service.ts +++ b/server/src/modules/issues/issue.service.ts @@ -128,7 +128,7 @@ class IssueService { issue_id: issue.issue_id, delayed_days, fine_amount, - paid_status: "UNPAID", + paid_status: false, } as CreationAttributes); } From 308bc09e4069f08dcbc2b3c51cfdc406aacbee39 Mon Sep 17 00:00:00 2001 From: Yogeshwaran S Date: Thu, 28 May 2026 10:58:52 +0530 Subject: [PATCH 30/87] fix(backend): resolve case-sensitivity loop and clear build path --- server/src/middlewares/{NotFoundHandler.ts => notFoundHandler.ts} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename server/src/middlewares/{NotFoundHandler.ts => notFoundHandler.ts} (100%) diff --git a/server/src/middlewares/NotFoundHandler.ts b/server/src/middlewares/notFoundHandler.ts similarity index 100% rename from server/src/middlewares/NotFoundHandler.ts rename to server/src/middlewares/notFoundHandler.ts From 8d80da37d2a328f8edab9b2d34c1ad21fe9de27f Mon Sep 17 00:00:00 2001 From: Yogeshwaran S Date: Thu, 28 May 2026 11:25:21 +0530 Subject: [PATCH 31/87] test(auth): implement dynamic email generation to prevent state conflicts --- server/jest.config.ts | 34 ++++++++++++++++++++++-------- server/package-lock.json | 9 ++++---- server/package.json | 5 +++-- server/src/tests/auth/auth.test.ts | 27 ++++++++++++++++++------ 4 files changed, 53 insertions(+), 22 deletions(-) diff --git a/server/jest.config.ts b/server/jest.config.ts index 28418fa..ce27ee1 100644 --- a/server/jest.config.ts +++ b/server/jest.config.ts @@ -1,17 +1,33 @@ -export default { - preset: "ts-jest", +import type { JestConfigWithTsJest } from 'ts-jest'; - testEnvironment: "node", +const jestConfig: JestConfigWithTsJest = { + // 1. ESM Compatibility Settings (The Lifesavers) + preset: 'ts-jest/presets/default-esm', + extensionsToTreatAsEsm: ['.ts'], + + // 2. Environment & Structure Settings + testEnvironment: 'node', + roots: ['/src/tests'], // Keeps Jest focused on your tests folder + moduleFileExtensions: ['ts', 'js', 'json'], - roots: ["/src/tests"], - - moduleFileExtensions: ["ts", "js"], + // 3. The Path Mapper (Fixes the explicit '.js' import extensions) + moduleNameMapper: { + '^(\\.{1,2}/.*)\\.js$': '$1', + }, + // 4. TS-Jest Compiler Configuration transform: { - "^.+\\.ts$": "ts-jest", + '^.+\\.ts$': [ + 'ts-jest', + { + useESM: true, // Forces ts-jest to compile with ESM compliance + }, + ], }, + // 5. Code Coverage Settings (From your original config) collectCoverage: true, + coverageDirectory: 'coverage', +}; - coverageDirectory: "coverage", -}; \ No newline at end of file +export default jestConfig; \ No newline at end of file diff --git a/server/package-lock.json b/server/package-lock.json index 9f70192..0a6c0af 100644 --- a/server/package-lock.json +++ b/server/package-lock.json @@ -34,6 +34,7 @@ "zod": "^4.4.3" }, "devDependencies": { + "@jest/globals": "^30.4.1", "@types/bcrypt": "^6.0.0", "@types/cookie-parser": "^1.4.10", "@types/cors": "^2.8.19", @@ -52,7 +53,7 @@ "prettier": "^3.8.3", "sequelize-cli": "^6.6.5", "supertest": "^7.2.2", - "ts-jest": "^29.4.10", + "ts-jest": "^29.4.11", "ts-node-dev": "^2.0.0", "tsx": "^4.22.3", "typescript": "^6.0.3" @@ -9375,9 +9376,9 @@ } }, "node_modules/ts-jest": { - "version": "29.4.10", - "resolved": "https://registry.npmjs.org/ts-jest/-/ts-jest-29.4.10.tgz", - "integrity": "sha512-vMTlTTtvz5aKZgzOoc7DQ5TzAL2fCzl8JnG1+ZpwjQa/g0xLlwE44yQ+1Cao9ZP1xVv9y5g34IFXEiqGOGFBUA==", + "version": "29.4.11", + "resolved": "https://registry.npmjs.org/ts-jest/-/ts-jest-29.4.11.tgz", + "integrity": "sha512-IrFl7l9AuB/qrNw5quqvAv/hmKMb8dhWOH4jQOGo0Oq8tCeo1O86/iTFG1FaRimgUkF13l4PcepO8ATFT6Ns4g==", "dev": true, "license": "MIT", "dependencies": { diff --git a/server/package.json b/server/package.json index 49003cf..8b37f7e 100644 --- a/server/package.json +++ b/server/package.json @@ -7,7 +7,7 @@ "dev": "tsx watch src/server.ts", "build": "tsc", "start": "node dist/server.js", - "test": "jest", + "test": "node --experimental-vm-modules node_modules/jest/bin/jest.js", "test:watch": "jest --watch", "test:coverage": "jest --coverage" }, @@ -41,6 +41,7 @@ "zod": "^4.4.3" }, "devDependencies": { + "@jest/globals": "^30.4.1", "@types/bcrypt": "^6.0.0", "@types/cookie-parser": "^1.4.10", "@types/cors": "^2.8.19", @@ -59,7 +60,7 @@ "prettier": "^3.8.3", "sequelize-cli": "^6.6.5", "supertest": "^7.2.2", - "ts-jest": "^29.4.10", + "ts-jest": "^29.4.11", "ts-node-dev": "^2.0.0", "tsx": "^4.22.3", "typescript": "^6.0.3" diff --git a/server/src/tests/auth/auth.test.ts b/server/src/tests/auth/auth.test.ts index 697720c..131296f 100644 --- a/server/src/tests/auth/auth.test.ts +++ b/server/src/tests/auth/auth.test.ts @@ -1,19 +1,24 @@ import request from "supertest"; - +import { describe, it, expect, afterAll } from '@jest/globals'; +import sequelize from '../../database/connection/database.js'; import app from "../../app.js"; describe("Auth APIs", () => { + + const uniqueId = Date.now(); + const testEmail = `test_${uniqueId}@gmail.com`; + const testPassword = "Password@123"; + it("should register a new user", async () => { const response = await request(app) .post("/api/v1/auth/register") .send({ name: "Test User", - gmail: "test@gmail.com", - password: "Password@123", + gmail: testEmail, + password: testPassword, }); expect(response.status).toBe(201); - expect(response.body.success).toBe(true); }); @@ -21,12 +26,20 @@ describe("Auth APIs", () => { const response = await request(app) .post("/api/v1/auth/login") .send({ - gmail: "test@gmail.com", - password: "Password@123", + gmail: testEmail, + password: testPassword, }); expect(response.status).toBe(200); - expect(response.body.success).toBe(true); }); + + afterAll(async () => { + try { + await sequelize.close(); + console.log('Database connection pool closed safely.'); + } catch (error) { + console.error('Error closing database connections:', error); + } + }); }); \ No newline at end of file From a6d0b4ac069ac061115411cc3cf49e4901a7f50d Mon Sep 17 00:00:00 2001 From: Yogeshwaran S Date: Thu, 28 May 2026 18:15:19 +0530 Subject: [PATCH 32/87] feat(testing): isolate book module unit tests and fix cross-platform execution --- server/jest.config.ts | 18 +- server/jest.unit.config.js | 23 +++ server/package-lock.json | 102 ++++++++++++ server/package.json | 9 +- server/src/app.ts | 1 + server/src/database/connection/database.ts | 4 + server/src/modules/books/book.spec.ts | 83 ++++++++++ server/src/tests/auth/auth.test.ts | 138 ++++++++++++---- server/src/tests/books/book.test.ts | 172 ++++++++++++++++++++ server/src/tests/helpers/testAuth.helper.ts | 13 ++ server/src/tests/runTests.ts | 53 ++++++ server/src/tests/setup/testSetup.ts | 7 - server/src/utils/logger.ts | 44 +++-- 13 files changed, 605 insertions(+), 62 deletions(-) create mode 100644 server/jest.unit.config.js create mode 100644 server/src/modules/books/book.spec.ts create mode 100644 server/src/tests/books/book.test.ts create mode 100644 server/src/tests/helpers/testAuth.helper.ts create mode 100644 server/src/tests/runTests.ts delete mode 100644 server/src/tests/setup/testSetup.ts diff --git a/server/jest.config.ts b/server/jest.config.ts index ce27ee1..8ad8313 100644 --- a/server/jest.config.ts +++ b/server/jest.config.ts @@ -1,31 +1,27 @@ import type { JestConfigWithTsJest } from 'ts-jest'; const jestConfig: JestConfigWithTsJest = { - // 1. ESM Compatibility Settings (The Lifesavers) preset: 'ts-jest/presets/default-esm', extensionsToTreatAsEsm: ['.ts'], - - // 2. Environment & Structure Settings testEnvironment: 'node', - roots: ['/src/tests'], // Keeps Jest focused on your tests folder + roots: ['/src/tests'], moduleFileExtensions: ['ts', 'js', 'json'], - - // 3. The Path Mapper (Fixes the explicit '.js' import extensions) + // 🟢 Maps '.js' imports back to physical '.ts' source files inside your tests moduleNameMapper: { '^(\\.{1,2}/.*)\\.js$': '$1', }, - - // 4. TS-Jest Compiler Configuration transform: { '^.+\\.ts$': [ 'ts-jest', { - useESM: true, // Forces ts-jest to compile with ESM compliance + useESM: true, + // 🟢 Instructs ts-jest to apply path remapping rules to global files too + diagnostics: { + ignoreCodes: [1343] + }, }, ], }, - - // 5. Code Coverage Settings (From your original config) collectCoverage: true, coverageDirectory: 'coverage', }; diff --git a/server/jest.unit.config.js b/server/jest.unit.config.js new file mode 100644 index 0000000..ec4d40e --- /dev/null +++ b/server/jest.unit.config.js @@ -0,0 +1,23 @@ +/** @type {import('jest').Config} */ +const config = { + preset: 'ts-jest/presets/default-esm', + testMatch: [ + "/src/modules/**/*.test.ts", + "/src/modules/**/*.spec.ts" + ], + // 1. Map the .js extensions in imports back to .ts files for Jest + moduleNameMapper: { + '^(\\.{1,2}/.*)\\.js$': '$1', + }, + // 2. Tell Jest to compile TypeScript files using ts-jest + transform: { + '^.+\\.tsx?$': [ + 'ts-jest', + { + useESM: true, + }, + ], + }, +}; + +export default config; \ No newline at end of file diff --git a/server/package-lock.json b/server/package-lock.json index 0a6c0af..97c3d35 100644 --- a/server/package-lock.json +++ b/server/package-lock.json @@ -11,6 +11,7 @@ "dependencies": { "@prisma/client": "^7.8.0", "bcrypt": "^6.0.0", + "cls-hooked": "^4.2.2", "compression": "^1.8.1", "cookie-parser": "^1.4.7", "cors": "^2.8.6", @@ -36,6 +37,7 @@ "devDependencies": { "@jest/globals": "^30.4.1", "@types/bcrypt": "^6.0.0", + "@types/cls-hooked": "^4.3.9", "@types/cookie-parser": "^1.4.10", "@types/cors": "^2.8.19", "@types/express": "^5.0.6", @@ -47,6 +49,8 @@ "@types/supertest": "^7.2.0", "@types/swagger-jsdoc": "^6.0.4", "@types/swagger-ui-express": "^4.1.8", + "@types/uuid": "^10.0.0", + "cross-env": "^10.1.0", "eslint": "^10.4.0", "eslint-config-prettier": "^10.1.8", "jest": "^30.4.2", @@ -724,6 +728,13 @@ "tslib": "^2.4.0" } }, + "node_modules/@epic-web/invariant": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/@epic-web/invariant/-/invariant-1.0.0.tgz", + "integrity": "sha512-lrTPqgvfFQtR/eY/qkIzp98OGdNJu0m5ji3q/nJI8v3SXkRKEnWiOxMmbvcSoAIzv/cGiuvRy57k4suKQSAdwA==", + "dev": true, + "license": "MIT" + }, "node_modules/@esbuild/aix-ppc64": { "version": "0.28.0", "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.28.0.tgz", @@ -2601,6 +2612,16 @@ "@types/node": "*" } }, + "node_modules/@types/cls-hooked": { + "version": "4.3.9", + "resolved": "https://registry.npmjs.org/@types/cls-hooked/-/cls-hooked-4.3.9.tgz", + "integrity": "sha512-CMtHMz6Q/dkfcHarq9nioXH8BDPP+v5xvd+N90lBQ2bdmu06UvnLDqxTKoOJzz4SzIwb/x9i4UXGAAcnUDuIvg==", + "dev": true, + "license": "MIT", + "dependencies": { + "@types/node": "*" + } + }, "node_modules/@types/connect": { "version": "3.4.38", "resolved": "https://registry.npmjs.org/@types/connect/-/connect-3.4.38.tgz", @@ -2924,6 +2945,13 @@ "integrity": "sha512-6WaYesThRMCl19iryMYP7/x2OVgCtbIVflDGFpWnb9irXI3UjYE4AzmYuiUKY1AJstGijoY+MgUszMgRxIYTYw==", "license": "MIT" }, + "node_modules/@types/uuid": { + "version": "10.0.0", + "resolved": "https://registry.npmjs.org/@types/uuid/-/uuid-10.0.0.tgz", + "integrity": "sha512-7gqG38EyHgyP1S+7+xomFtL+ZNHcKv6DwNaCZmJmo1vgMugyF3TCnXVg4t1uk89mLNwnLtnY3TpOpCOyp1/xHQ==", + "dev": true, + "license": "MIT" + }, "node_modules/@types/validator": { "version": "13.15.10", "resolved": "https://registry.npmjs.org/@types/validator/-/validator-13.15.10.tgz", @@ -3474,6 +3502,18 @@ "integrity": "sha512-htCUDlxyyCLMgaM3xXg0C0LW2xqfuQ6p05pCEIsXuyQ+a1koYKTuBMzRNwmybfLgvJDMd0r1LTn4+E0Ti6C2AA==", "license": "MIT" }, + "node_modules/async-hook-jl": { + "version": "1.7.6", + "resolved": "https://registry.npmjs.org/async-hook-jl/-/async-hook-jl-1.7.6.tgz", + "integrity": "sha512-gFaHkFfSxTjvoxDMYqDuGHlcRyUuamF8s+ZTtJdDzqjws4mCt7v0vuV79/E2Wr2/riMQgtG4/yUtXWs1gZ7JMg==", + "license": "MIT", + "dependencies": { + "stack-chain": "^1.3.7" + }, + "engines": { + "node": "^4.7 || >=6.9 || >=7.3" + } + }, "node_modules/asynckit": { "version": "0.4.0", "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz", @@ -3998,6 +4038,29 @@ "node": ">=12" } }, + "node_modules/cls-hooked": { + "version": "4.2.2", + "resolved": "https://registry.npmjs.org/cls-hooked/-/cls-hooked-4.2.2.tgz", + "integrity": "sha512-J4Xj5f5wq/4jAvcdgoGsL3G103BtWpZrMo8NEinRltN+xpTZdI+M38pyQqhuFU/P792xkMFvnKSf+Lm81U1bxw==", + "license": "BSD-2-Clause", + "dependencies": { + "async-hook-jl": "^1.7.6", + "emitter-listener": "^1.0.1", + "semver": "^5.4.1" + }, + "engines": { + "node": "^4.7 || >=6.9 || >=7.3 || >=8.2.1" + } + }, + "node_modules/cls-hooked/node_modules/semver": { + "version": "5.7.2", + "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz", + "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==", + "license": "ISC", + "bin": { + "semver": "bin/semver" + } + }, "node_modules/co": { "version": "4.6.0", "resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz", @@ -4259,6 +4322,24 @@ "dev": true, "license": "MIT" }, + "node_modules/cross-env": { + "version": "10.1.0", + "resolved": "https://registry.npmjs.org/cross-env/-/cross-env-10.1.0.tgz", + "integrity": "sha512-GsYosgnACZTADcmEyJctkJIoqAhHjttw7RsFrVoJNXbsWWqaq6Ym+7kZjq6mS45O0jij6vtiReppKQEtqWy6Dw==", + "dev": true, + "license": "MIT", + "dependencies": { + "@epic-web/invariant": "^1.0.0", + "cross-spawn": "^7.0.6" + }, + "bin": { + "cross-env": "dist/bin/cross-env.js", + "cross-env-shell": "dist/bin/cross-env-shell.js" + }, + "engines": { + "node": ">=20" + } + }, "node_modules/cross-spawn": { "version": "7.0.6", "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz", @@ -4573,6 +4654,15 @@ "dev": true, "license": "ISC" }, + "node_modules/emitter-listener": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/emitter-listener/-/emitter-listener-1.1.2.tgz", + "integrity": "sha512-Bt1sBAGFHY9DKY+4/2cV6izcKJUf5T7/gkdmkxzX/qv9CcGH8xSwVRW5mtX03SWJtRTWSOpzCuWN9rBFYZepZQ==", + "license": "BSD-2-Clause", + "dependencies": { + "shimmer": "^1.2.0" + } + }, "node_modules/emittery": { "version": "0.13.1", "resolved": "https://registry.npmjs.org/emittery/-/emittery-0.13.1.tgz", @@ -8847,6 +8937,12 @@ "node": ">=8" } }, + "node_modules/shimmer": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/shimmer/-/shimmer-1.2.1.tgz", + "integrity": "sha512-sQTKC1Re/rM6XyFM6fIAGHRPVGvyXfgzIDvzoq608vM+jeyVD0Tu1E6Np0Kc2zAIFWIj963V2800iF/9LPieQw==", + "license": "BSD-2-Clause" + }, "node_modules/side-channel": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.1.0.tgz", @@ -8987,6 +9083,12 @@ "node": ">= 0.6" } }, + "node_modules/stack-chain": { + "version": "1.3.7", + "resolved": "https://registry.npmjs.org/stack-chain/-/stack-chain-1.3.7.tgz", + "integrity": "sha512-D8cWtWVdIe/jBA7v5p5Hwl5yOSOrmZPWDPe2KxQ5UAGD+nxbxU0lKXA4h85Ta6+qgdKVL3vUxsbIZjc1kBG7ug==", + "license": "MIT" + }, "node_modules/stack-trace": { "version": "0.0.10", "resolved": "https://registry.npmjs.org/stack-trace/-/stack-trace-0.0.10.tgz", diff --git a/server/package.json b/server/package.json index 8b37f7e..886f1c5 100644 --- a/server/package.json +++ b/server/package.json @@ -7,10 +7,11 @@ "dev": "tsx watch src/server.ts", "build": "tsc", "start": "node dist/server.js", - "test": "node --experimental-vm-modules node_modules/jest/bin/jest.js", + "test": "cross-env NODE_ENV=test tsx src/tests/runTests.ts", + "test:unit": "node --experimental-vm-modules node_modules/jest/bin/jest.js --config=jest.unit.config.js", "test:watch": "jest --watch", "test:coverage": "jest --coverage" - }, +}, "keywords": [], "author": "", "license": "ISC", @@ -18,6 +19,7 @@ "dependencies": { "@prisma/client": "^7.8.0", "bcrypt": "^6.0.0", + "cls-hooked": "^4.2.2", "compression": "^1.8.1", "cookie-parser": "^1.4.7", "cors": "^2.8.6", @@ -43,6 +45,7 @@ "devDependencies": { "@jest/globals": "^30.4.1", "@types/bcrypt": "^6.0.0", + "@types/cls-hooked": "^4.3.9", "@types/cookie-parser": "^1.4.10", "@types/cors": "^2.8.19", "@types/express": "^5.0.6", @@ -54,6 +57,8 @@ "@types/supertest": "^7.2.0", "@types/swagger-jsdoc": "^6.0.4", "@types/swagger-ui-express": "^4.1.8", + "@types/uuid": "^10.0.0", + "cross-env": "^10.1.0", "eslint": "^10.4.0", "eslint-config-prettier": "^10.1.8", "jest": "^30.4.2", diff --git a/server/src/app.ts b/server/src/app.ts index 132a0f9..779097b 100644 --- a/server/src/app.ts +++ b/server/src/app.ts @@ -17,6 +17,7 @@ import rateLimiter from "./config/ratelimiter.js"; import helmetConfig from "./config/helmet.js"; import corsConfig from "./config/cors.js"; import "./config/validateEnv.js"; +import './database/associations/index.js'; const app: Application = express(); diff --git a/server/src/database/connection/database.ts b/server/src/database/connection/database.ts index b91a6d4..c745a46 100644 --- a/server/src/database/connection/database.ts +++ b/server/src/database/connection/database.ts @@ -1,8 +1,12 @@ import { Sequelize } from "sequelize"; +import cls from 'cls-hooked'; import dotenv from "dotenv"; dotenv.config(); +const namespace = cls.createNamespace('sequelize-test-namespace'); +(Sequelize as any).useCLS(namespace); + const sequelize = new Sequelize( process.env.DB_NAME!, process.env.DB_USER!, diff --git a/server/src/modules/books/book.spec.ts b/server/src/modules/books/book.spec.ts new file mode 100644 index 0000000..fb5be70 --- /dev/null +++ b/server/src/modules/books/book.spec.ts @@ -0,0 +1,83 @@ +import { jest } from "@jest/globals"; +import httpStatus from "http-status-codes"; +import AppError from "../../utils/AppError.js"; + +// 1. Mock modules using the ESM-compliant mock module system +jest.unstable_mockModule("./book.repository.js", () => ({ + default: { + createBook: jest.fn(), + getBookById: jest.fn(), + } +})); + +jest.unstable_mockModule("../../database/models/Category.js", () => ({ + default: { + findByPk: jest.fn(), + } +})); + +// 2. Dynamically import your service AFTER the modules are mocked +const { default: bookService } = await import("./book.service.js"); +const { default: bookRepository } = await import("./book.repository.js"); +const { default: Category } = await import("../../database/models/Category.js"); + +// 3. Cast them safely using the single generic function signature +const mockedFindByPk = Category.findByPk as unknown as jest.Mock<(...args: any[]) => any>; +const mockedCreateBook = bookRepository.createBook as unknown as jest.Mock<(...args: any[]) => any>; +const mockedGetBookById = bookRepository.getBookById as unknown as jest.Mock<(...args: any[]) => any>; + +describe("🧪 Books Service Unit Tests (Isolated System Logic)", () => { + afterEach(() => { + jest.clearAllMocks(); + }); + + describe("createBook Context", () => { + const mockPayload = { + book_name: "Test Execution Suite", + book_author: "Jest Expert", + category_id: "a3fa8d20-fa21-11ee-8391-4321abcdef12", + total_copies: 3, + }; + + it("✔ Should call repository layer once valid entity configuration checks pass", async () => { + mockedFindByPk.mockResolvedValue({ + category_id: mockPayload.category_id, + category_name: "Tech", + }); + + mockedCreateBook.mockResolvedValue({ + book_id: "newly-created-id", + ...mockPayload, + available_copies: mockPayload.total_copies, + created_at: new Date(), + updated_at: new Date(), + }); + + const result = await bookService.createBook(mockPayload); + + expect(Category.findByPk).toHaveBeenCalledWith(mockPayload.category_id); + expect(bookRepository.createBook).toHaveBeenCalledWith(mockPayload); + expect(result).toHaveProperty("book_id", "newly-created-id"); + }); + + it("❌ Should short-circuit and throw an AppError if the foreign category is absent", async () => { + mockedFindByPk.mockResolvedValue(null); + + await expect(bookService.createBook(mockPayload)).rejects.toThrow( + new AppError("Category not found", httpStatus.NOT_FOUND) + ); + + expect(bookRepository.createBook).not.toHaveBeenCalled(); + }); + }); + + describe("getBookById Context", () => { + it("❌ Should throw a 404 AppError if the database lookup comes back empty", async () => { + mockedGetBookById.mockResolvedValue(null); + + await expect(bookService.getBookById("invalid-id")).rejects.toThrow( + new AppError("Book not found", httpStatus.NOT_FOUND) + ); + }); + }); +}); \ No newline at end of file diff --git a/server/src/tests/auth/auth.test.ts b/server/src/tests/auth/auth.test.ts index 131296f..e758976 100644 --- a/server/src/tests/auth/auth.test.ts +++ b/server/src/tests/auth/auth.test.ts @@ -1,45 +1,123 @@ import request from "supertest"; -import { describe, it, expect, afterAll } from '@jest/globals'; -import sequelize from '../../database/connection/database.js'; +import { describe, it, expect } from '@jest/globals'; import app from "../../app.js"; +import sequelize from '../../database/connection/database.js'; + +afterAll(async () => { + await sequelize.close(); +}); describe("Auth APIs", () => { - + // Configuration for clean dynamic test credentials const uniqueId = Date.now(); const testEmail = `test_${uniqueId}@gmail.com`; const testPassword = "Password@123"; - it("should register a new user", async () => { - const response = await request(app) - .post("/api/v1/auth/register") - .send({ - name: "Test User", - gmail: testEmail, - password: testPassword, - }); - - expect(response.status).toBe(201); - expect(response.body.success).toBe(true); + // ======================================================= + // 🟢 HAPPY PATHS + // ======================================================= + describe("Registration & Login (Success Cases)", () => { + it("✔ HAPPY PATH: should register a new user successfully", async () => { + const response = await request(app) + .post("/api/v1/auth/register") + .send({ + name: "Test User", + gmail: testEmail, + password: testPassword, + }); + + expect(response.status).toBe(201); + expect(response.body.success).toBe(true); + }); + + it("✔ HAPPY PATH: should login user successfully and return a token", async () => { + const response = await request(app) + .post("/api/v1/auth/login") + .send({ + gmail: testEmail, + password: testPassword, + }); + + expect(response.status).toBe(200); + expect(response.body.success).toBe(true); + expect(response.body.data).toHaveProperty("token"); + }); }); - it("should login user", async () => { - const response = await request(app) - .post("/api/v1/auth/login") - .send({ - gmail: testEmail, - password: testPassword, - }); + // ======================================================= + // 🔴 SAD PATHS & VALIDATION FAILURES + // ======================================================= + describe("Registration Failures (Sad Paths)", () => { + it("❌ SAD PATH: should block registration if email already exists", async () => { + await request(app) + .post("/api/v1/auth/register") + .send({ + name: "Original User", + gmail: testEmail, + password: testPassword, + }); + + const response = await request(app) + .post("/api/v1/auth/register") + .send({ + name: "Imposter User", + gmail: testEmail, + password: testPassword, + }); - expect(response.status).toBe(200); - expect(response.body.success).toBe(true); + expect(response.status).toBe(409); + expect(response.body.success).toBe(false); + }); + + it("❌ SAD PATH: should reject registration if mandatory body elements are missing", async () => { + const response = await request(app) + .post("/api/v1/auth/register") + .send({ + gmail: "incomplete@gmail.com", + password: testPassword, + }); + + expect(response.status).toBe(400); + expect(response.body.success).toBe(false); + }); + + it("❌ SAD PATH: should reject registration if input data breaks schema rules", async () => { + const response = await request(app) + .post("/api/v1/auth/register") + .send({ + name: "Y", + gmail: "broken-email-format", + password: "123", + }); + + expect(response.status).toBe(400); + expect(response.body.success).toBe(false); + }); }); - afterAll(async () => { - try { - await sequelize.close(); - console.log('Database connection pool closed safely.'); - } catch (error) { - console.error('Error closing database connections:', error); - } + describe("Login Failures (Sad Paths)", () => { + it("❌ SAD PATH: should block login if user doesn't exist in the system", async () => { + const response = await request(app) + .post("/api/v1/auth/login") + .send({ + gmail: "ghost_user_9999@gmail.com", + password: testPassword, + }); + + expect(response.status).toBe(401); + expect(response.body.success).toBe(false); + }); + + it("❌ SAD PATH: should reject login if password does not match", async () => { + const response = await request(app) + .post("/api/v1/auth/login") + .send({ + gmail: testEmail, + password: "WrongPassword⚠️", + }); + + expect(response.status).toBe(401); + expect(response.body.success).toBe(false); + }); }); }); \ No newline at end of file diff --git a/server/src/tests/books/book.test.ts b/server/src/tests/books/book.test.ts new file mode 100644 index 0000000..eb7e1bd --- /dev/null +++ b/server/src/tests/books/book.test.ts @@ -0,0 +1,172 @@ +import request from "supertest"; +import app from "../../app.js"; +import { getAuthToken } from "../helpers/testAuth.helper.js"; +import sequelize from '../../database/connection/database.js'; + +describe("📚 Books Module Integration Tests (All Scenarios)", () => { + let librarianToken: string; + + // ⚡ Hardcoded Category ID directly from seed.sql ('Science') + const scienceCategoryId = "075705f3-c7be-4585-85d1-b57616870f68"; + let createdBookId: string; + + const testBookName = `Clean Architecture v${Math.floor(Math.random() * 1000)}`; + const searchKeyword = `SearchableBook-${Math.floor(Math.random() * 1000)}`; + const nonExistentUuid = "a0000000-0000-0000-0000-000000000000"; + + beforeAll(async () => { + // 1. Grab our authorization token via our self-healing global helper + const token = await getAuthToken(); + librarianToken = `Bearer ${token}`; + }); + + afterAll(async () => { + await sequelize.close(); + }); + + // ========================================== + // 🟢 1. POST /api/v1/books (CREATE) + // ========================================== + describe("POST /api/v1/books", () => { + it("✅ Happy Path: Should let an authenticated Librarian create a book", async () => { + const res = await request(app) + .post("/api/v1/books") + .set("Authorization", librarianToken) + .send({ + book_name: testBookName, + book_author: "Robert C. Martin", + category_id: scienceCategoryId, // 🔬 Matches seed.sql Category + total_copies: 5, + }); + + expect(res.status).toBe(201); + expect(res.body.success).toBe(true); + expect(res.body.data).toHaveProperty("book_id"); + expect(res.body.data.book_name).toBe(testBookName); + + createdBookId = res.body.data.book_id; + }); + + it("❌ Sad Path: Should fail validation when body criteria are invalid (Zod)", async () => { + const res = await request(app) + .post("/api/v1/books") + .set("Authorization", librarianToken) + .send({ + book_name: "X", + book_author: "Valid Author", + category_id: "invalid-uuid-format", + total_copies: 0, + }); + + expect(res.status).toBe(400); + expect(res.body.success).toBe(false); + }); + + it("❌ Sad Path: Should throw 404 error if category UUID does not exist in DB", async () => { + const res = await request(app) + .post("/api/v1/books") + .set("Authorization", librarianToken) + .send({ + book_name: "Valid Book Title", + book_author: "Valid Author", + category_id: nonExistentUuid, + total_copies: 5, + }); + + expect([400, 404]).toContain(res.status); + }); + + it("❌ Sad Path: Should reject execution if authorization token is absent", async () => { + const res = await request(app) + .post("/api/v1/books") + .send({ + book_name: "Unauthorized Book", + book_author: "No Token", + category_id: scienceCategoryId, + total_copies: 1, + }); + + expect(res.status).toBe(401); + }); + }); + + // ========================================== + // 🟢 2. GET /api/v1/books (GET ALL & FILTERS) + // ========================================== + describe("GET /api/v1/books", () => { + beforeAll(async () => { + await request(app) + .post("/api/v1/books") + .set("Authorization", librarianToken) + .send({ + book_name: searchKeyword, + book_author: "Unique Search Author", + category_id: scienceCategoryId, + total_copies: 2, + }); + }); + + it("✅ Happy Path: Should fetch all books complete with default pagination maps", async () => { + const res = await request(app) + .get("/api/v1/books") + .set("Authorization", librarianToken); + + expect(res.status).toBe(200); + expect(res.body.data).toHaveProperty("rows"); + expect(res.body.data).toHaveProperty("count"); + // Check that it's retrieving the pre-seeded dataset rows too + expect(res.body.data.rows.length).toBeGreaterThanOrEqual(1); + }); + + it("✅ Happy Path: Should successfully return records filtered by search query", async () => { + const res = await request(app) + .get(`/api/v1/books?search=${searchKeyword}`) + .set("Authorization", librarianToken); + + expect(res.status).toBe(200); + expect(res.body.data.rows[0].book_name).toBe(searchKeyword); + }); + + it("✅ Happy Path: Should successfully filter results explicitly by category_id", async () => { + const res = await request(app) + .get(`/api/v1/books?category_id=${scienceCategoryId}`) + .set("Authorization", librarianToken); + + expect(res.status).toBe(200); + expect(res.body.data.rows.length).toBeGreaterThanOrEqual(1); + }); + }); + + // ========================================== + // 🟢 3. GET /api/v1/books/:bookId (GET SINGLE) + // ========================================== + describe("GET /api/v1/books/:bookId", () => { + it("✅ Happy Path: Should return details of a single book by ID", async () => { + const res = await request(app) + .get(`/api/v1/books/${createdBookId}`) + .set("Authorization", librarianToken); + + expect(res.status).toBe(200); + expect(res.body.data.book_id).toBe(createdBookId); + }); + + // Bonus check: Testing with a pre-seeded book ID from your seed file ('The Pragmatic Programmer') + it("✅ Happy Path: Should successfully fetch a pre-seeded book from seed.sql", async () => { + const seededBookId = "b0000001-3333-3333-3333-333333333333"; + const res = await request(app) + .get(`/api/v1/books/${seededBookId}`) + .set("Authorization", librarianToken); + + expect(res.status).toBe(200); + expect(res.body.data.book_name).toBe("The Pragmatic Programmer"); + }); + + it("❌ Sad Path: Should throw 404 error if book ID cannot be found", async () => { + const res = await request(app) + .get(`/api/v1/books/${nonExistentUuid}`) + .set("Authorization", librarianToken); + + expect(res.status).toBe(404); + }); + }); +}); \ No newline at end of file diff --git a/server/src/tests/helpers/testAuth.helper.ts b/server/src/tests/helpers/testAuth.helper.ts new file mode 100644 index 0000000..faa34be --- /dev/null +++ b/server/src/tests/helpers/testAuth.helper.ts @@ -0,0 +1,13 @@ +import request from "supertest"; +import app from "../../app.js"; + +export const getAuthToken = async (): Promise => { + const response = await request(app) + .post("/api/v1/auth/login") + .send({ + gmail: "test_master_librarian@gmail.com", + password: "Password@123", + }); + + return response.body.data?.token || ""; +}; \ No newline at end of file diff --git a/server/src/tests/runTests.ts b/server/src/tests/runTests.ts new file mode 100644 index 0000000..9f1d6ab --- /dev/null +++ b/server/src/tests/runTests.ts @@ -0,0 +1,53 @@ +// src/tests/runTests.ts +import sequelize from '../database/connection/database.js'; +import User from '../database/models/User.js'; +import request from 'supertest'; +import app from '../app.js'; +import { execSync } from 'child_process'; +import { Op } from 'sequelize'; + +async function bootstrapSuite() { + console.log('\n🚀 [Test Runner]: Initializing testing database connection pool...'); + + try { + // 1. Authenticate & Sync database + await sequelize.authenticate(); + + // 2. Pre-seed our global master test librarian user + const globalUser = { + name: "Global Master Librarian", + gmail: "test_master_librarian@gmail.com", + password: "Password@123" + }; + + await request(app).post("/api/v1/auth/register").send(globalUser); + console.log('✅ [Test Runner]: Master test user account verified and ready.'); + + // 3. Spawns Jest to run all tests inside your codebase natively + console.log('🏁 [Test Runner]: Executing integration test suites...\n'); + execSync('node --experimental-vm-modules node_modules/jest/bin/jest.js --runInBand --detectOpenHandles', { stdio: 'inherit' }); + + + } catch (error) { + console.error('❌ [Test Runner]: Critical error during test execution block:', error); + process.exitCode = 1; + } finally { + console.log('\n🧹 [Test Runner]: Beginning post-suite database cleanup...'); + try { + // 4. Clean up any dynamic test accounts + await User.destroy({ + where: { gmail: { [Op.like]: 'test_%' } }, + force: true + }); + console.log('🗑️ [Test Runner]: Test records safely purged.'); + + // 5. Securely sever connection pool strings + await sequelize.close(); + console.log('🛑 [Test Runner]: Database pool drained successfully. Goodbye!\n'); + } catch (cleanUpError) { + console.error('❌ [Test Runner]: Failed to clean database pool down securely:', cleanUpError); + } + } +} + +bootstrapSuite(); \ No newline at end of file diff --git a/server/src/tests/setup/testSetup.ts b/server/src/tests/setup/testSetup.ts deleted file mode 100644 index 4646dc7..0000000 --- a/server/src/tests/setup/testSetup.ts +++ /dev/null @@ -1,7 +0,0 @@ -beforeAll(async () => { - console.log("Test Started"); -}); - -afterAll(async () => { - console.log("Test Completed"); -}); \ No newline at end of file diff --git a/server/src/utils/logger.ts b/server/src/utils/logger.ts index 1da5cbe..70528f9 100644 --- a/server/src/utils/logger.ts +++ b/server/src/utils/logger.ts @@ -1,30 +1,50 @@ import winston from "winston"; -const logger = winston.createLogger({ - level: "info", - - format: winston.format.combine( - winston.format.timestamp(), +// 1. Define a professional, clean layout for your terminal/console +const consoleFormat = winston.format.combine( + winston.format.colorize({ all: true }), // Colors the level and message nicely + winston.format.timestamp({ format: "YYYY-MM-DD HH:mm:ss" }), + winston.format.printf(({ timestamp, level, message, stack, name }) => { + // If it's an error, display it professionally with its name + if (stack) { + const errorName = name ? `[${name}] ` : ""; + // Only prints the clean error message. + // If you WANT the full stack trace in the console, change `message` to `stack` below + return `${timestamp} ${level}: ${errorName}${message}`; + } + + return `${timestamp} ${level}: ${message}`; + }) +); + +// 2. Define the standard JSON layout for your file logs (Production-ready) +const fileFormat = winston.format.combine( + winston.format.timestamp(), + winston.format.errors({ stack: true }), // Captures full stack traces for debugging files + winston.format.json() +); - winston.format.errors({ stack: true }), - - winston.format.json() - ), +const logger = winston.createLogger({ + level: process.env.NODE_ENV === "test" ? "error" : "info", // Silences minor logs during npm run test transports: [ - new winston.transports.Console(), + // Console transport uses the clean, human-readable format + new winston.transports.Console({ + format: consoleFormat, + }), + // File transports keep the structural JSON format for production record-keeping new winston.transports.File({ filename: "logs/error.log", level: "error", + format: fileFormat, }), new winston.transports.File({ filename: "logs/combined.log", + format: fileFormat, }), ], }); - - export default logger; \ No newline at end of file From c6088d3b35f0b7097419bff90f72f4d0d11b3228 Mon Sep 17 00:00:00 2001 From: Yogeshwaran S Date: Thu, 28 May 2026 18:30:42 +0530 Subject: [PATCH 33/87] chore(ci): supply dummy environment variables for validator --- .github/workflows/ci.yml | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index e80e63a..c103941 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -5,7 +5,6 @@ on: branches: - main - develop - pull_request: branches: - main @@ -15,6 +14,13 @@ jobs: backend-ci: runs-on: ubuntu-latest + # Global dummy variables satisfy validateEnv.ts during compilation & unit testing + env: + PORT: 3000 + NODE_ENV: test + JWT_SECRET: ci_environment_mock_secret_key_string + DATABASE_URL: postgresql://mock_user:mock_password@localhost:5432/mock_db + defaults: run: working-directory: server @@ -25,15 +31,16 @@ jobs: - name: Setup Node.js uses: actions/setup-node@v4 - with: node-version: 22 + cache: 'npm' + cache-dependency-path: server/package-lock.json - name: Install Dependencies - run: npm install + run: npm ci - name: Run TypeScript Build run: npm run build - - name: Run Tests - run: npm run test \ No newline at end of file + - name: Run Unit Tests + run: npm run test:unit \ No newline at end of file From 2b66946c8b9f57b0f96e9070c7c696cfbe4853da Mon Sep 17 00:00:00 2001 From: Yogeshwaran S Date: Fri, 29 May 2026 09:54:14 +0530 Subject: [PATCH 34/87] chore(ci): force Node 24 runtime for actions to clear deprecation warning --- .github/workflows/ci.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index c103941..fc62922 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -14,21 +14,24 @@ jobs: backend-ci: runs-on: ubuntu-latest - # Global dummy variables satisfy validateEnv.ts during compilation & unit testing env: PORT: 3000 NODE_ENV: test JWT_SECRET: ci_environment_mock_secret_key_string DATABASE_URL: postgresql://mock_user:mock_password@localhost:5432/mock_db + # 1. Force the runner engine to execute internal JS actions on Node 24 + FORCE_JAVASCRIPT_ACTIONS_TO_NODE24: "true" defaults: run: working-directory: server steps: + # 2. Checkout repository (v4 is fine with the flag, or keep an eye out for updates) - name: Checkout Repository uses: actions/checkout@v4 + # 3. Setup modern Node runner environment - name: Setup Node.js uses: actions/setup-node@v4 with: From 26c142cc44fab5738a045b045743c62fe46b166f Mon Sep 17 00:00:00 2001 From: Yogeshwaran S Date: Fri, 29 May 2026 10:45:09 +0530 Subject: [PATCH 35/87] test(auth): implement isolated ESM unit tests for auth service --- server/src/modules/auth/auth.spec.ts | 151 +++++++++++++++++++++++++++ 1 file changed, 151 insertions(+) create mode 100644 server/src/modules/auth/auth.spec.ts diff --git a/server/src/modules/auth/auth.spec.ts b/server/src/modules/auth/auth.spec.ts new file mode 100644 index 0000000..8b439fd --- /dev/null +++ b/server/src/modules/auth/auth.spec.ts @@ -0,0 +1,151 @@ +import { jest } from "@jest/globals"; + +// 1. Setup Jest ESM Mocks +jest.unstable_mockModule("./auth.repository.js", () => ({ + createUser: jest.fn(), + findUserByEmail: jest.fn(), +})); + +jest.unstable_mockModule("bcrypt", () => ({ + default: { + hash: jest.fn(), + compare: jest.fn(), + }, +})); + +jest.unstable_mockModule("../../utils/jwt.js", () => ({ + generateToken: jest.fn(), +})); + +// 2. Dynamic imports to capture mocked implementations +const { registerUserService, loginUserService } = await import("./auth.service.js"); +const { createUser, findUserByEmail } = await import("./auth.repository.js"); +const { default: bcrypt } = await import("bcrypt"); +const { generateToken } = await import("../../utils/jwt.js"); +const { default: AppError } = await import("../../utils/AppError.js"); + +// 3. Cast directly to 'any' to break the strict 'never' type restriction completely +const mockFindUserByEmail = findUserByEmail as any; +const mockCreateUser = createUser as any; +const mockHash = bcrypt.hash as any; +const mockCompare = bcrypt.compare as any; + +describe("🔒 Authentication Service (Isolated Unit Tests)", () => { + + beforeEach(() => { + jest.clearAllMocks(); + }); + + // ========================================== + // REGISTER USER TEST SUITE + // ========================================== + describe("🔄 registerUserService Context", () => { + const mockRegisterInput = { + name: "John Doe", + gmail: "johndoe@gmail.com", + password: "Password123!", + }; + + it("🟢 Happy Path: Should hash password and create user if email is unique", async () => { + // Arrange + mockFindUserByEmail.mockResolvedValue(null); + mockHash.mockResolvedValue("hashed_password_string"); + mockCreateUser.mockResolvedValue({ + uuid: "mock-user-uuid", + ...mockRegisterInput, + password: "hashed_password_string", + }); + + // Act + const result = await registerUserService(mockRegisterInput); + + // Assert + expect(mockFindUserByEmail).toHaveBeenCalledWith(mockRegisterInput.gmail); + expect(mockHash).toHaveBeenCalledWith(mockRegisterInput.password, 10); + expect(mockCreateUser).toHaveBeenCalledWith({ + ...mockRegisterInput, + password: "hashed_password_string", + }); + expect(result).toHaveProperty("uuid", "mock-user-uuid"); + }); + + it("🔴 Sad Path: Should throw a 409 AppError if user email already exists", async () => { + // Arrange + mockFindUserByEmail.mockResolvedValue({ uuid: "existing-uuid" }); + + // Act & Assert + await expect(registerUserService(mockRegisterInput)) + .rejects + .toThrow(new AppError("User already exists", 409)); + + expect(mockHash).not.toHaveBeenCalled(); + expect(mockCreateUser).not.toHaveBeenCalled(); + }); + }); + + // ========================================== + // LOGIN USER TEST SUITE + // ========================================== + describe("🔑 loginUserService Context", () => { + const mockLoginInput = { + gmail: "johndoe@gmail.com", + password: "Password123!", + }; + + const mockDbUser = { + uuid: "mock-user-uuid", + gmail: "johndoe@gmail.com", + password: "hashed_password_in_db", + role: "user", + }; + + it("🟢 Happy Path: Should sign a JWT token and return user details on valid credentials", async () => { + // Arrange + mockFindUserByEmail.mockResolvedValue(mockDbUser); + mockCompare.mockResolvedValue(true); + (generateToken as jest.Mock).mockReturnValue("mocked_jwt_token_string"); + + // Act + const result = await loginUserService(mockLoginInput); + + // Assert + expect(mockFindUserByEmail).toHaveBeenCalledWith(mockLoginInput.gmail); + expect(mockCompare).toHaveBeenCalledWith(mockLoginInput.password, mockDbUser.password); + expect(generateToken).toHaveBeenCalledWith({ + userId: mockDbUser.uuid, + gmail: mockDbUser.gmail, + role: mockDbUser.role, + }); + expect(result).toEqual({ + token: "mocked_jwt_token_string", + user: mockDbUser, + }); + }); + + it("🔴 Sad Path: Should throw a 401 AppError if user email does not exist", async () => { + // Arrange + mockFindUserByEmail.mockResolvedValue(null); + + // Act & Assert + await expect(loginUserService(mockLoginInput)) + .rejects + .toThrow(new AppError("Invalid email or password", 401)); + + expect(mockCompare).not.toHaveBeenCalled(); + expect(generateToken).not.toHaveBeenCalled(); + }); + + it("🔴 Sad Path: Should throw a 401 AppError if the password check fails", async () => { + // Arrange + mockFindUserByEmail.mockResolvedValue(mockDbUser); + mockCompare.mockResolvedValue(false); + + // Act & Assert + await expect(loginUserService(mockLoginInput)) + .rejects + .toThrow(new AppError("Invalid email or password", 401)); + + expect(generateToken).not.toHaveBeenCalled(); + }); + }); +}); \ No newline at end of file From 4e99fd9a2c32de99b4bce41004031902ee0cbd3a Mon Sep 17 00:00:00 2001 From: Yogeshwaran S Date: Fri, 29 May 2026 17:45:07 +0530 Subject: [PATCH 36/87] test(member): implement full unit and integration test suites All 29 tests passing successfully with 91%+ line coverage on the member module. --- server/package.json | 2 +- server/src/app.ts | 7 +- server/src/database/associations/index.ts | 4 +- server/src/database/models/Member.ts | 2 - server/src/docs/seed.sql | 314 +++++++++--------- server/src/middlewares/validate.ts | 1 + .../src/modules/members/member.repository.ts | 117 +++---- server/src/modules/members/member.routes.ts | 5 - server/src/modules/members/member.service.ts | 85 ++--- server/src/modules/members/member.spec.ts | 173 ++++++++++ .../src/modules/members/member.validation.ts | 41 ++- server/src/tests/books/book.test.ts | 129 ++++++- server/src/tests/members/member.test.ts | 217 ++++++++++++ 13 files changed, 776 insertions(+), 321 deletions(-) create mode 100644 server/src/modules/members/member.spec.ts create mode 100644 server/src/tests/members/member.test.ts diff --git a/server/package.json b/server/package.json index 886f1c5..9874bae 100644 --- a/server/package.json +++ b/server/package.json @@ -11,7 +11,7 @@ "test:unit": "node --experimental-vm-modules node_modules/jest/bin/jest.js --config=jest.unit.config.js", "test:watch": "jest --watch", "test:coverage": "jest --coverage" -}, + }, "keywords": [], "author": "", "license": "ISC", diff --git a/server/src/app.ts b/server/src/app.ts index 779097b..e711e38 100644 --- a/server/src/app.ts +++ b/server/src/app.ts @@ -19,6 +19,8 @@ import corsConfig from "./config/cors.js"; import "./config/validateEnv.js"; import './database/associations/index.js'; + + const app: Application = express(); /* -------------------------------------------------------------------------- */ @@ -34,7 +36,10 @@ app.use(corsConfig); // Use your custom centralized config safely app.use(rateLimiter); // 3. Request Logging & Body Parsing -app.use(morgan("dev")); +// Log request details automatically if we are running tests or development +if (process.env.NODE_ENV === "test" || process.env.NODE_ENV === "development") { + app.use(morgan("dev")); +} app.use(express.json()); app.use(express.urlencoded({ extended: true })); app.use(cookieParser()); diff --git a/server/src/database/associations/index.ts b/server/src/database/associations/index.ts index 43ba07d..67af1d7 100644 --- a/server/src/database/associations/index.ts +++ b/server/src/database/associations/index.ts @@ -19,12 +19,14 @@ import Fine from "../models/Fine.js"; /* -------------------------------------------------------------------------- */ User.hasOne(Member, { - foreignKey: "user_id", + foreignKey: "user_id", + sourceKey: "uuid", as: "member", }); Member.belongsTo(User, { foreignKey: "user_id", + targetKey: "uuid", as: "user", }); diff --git a/server/src/database/models/Member.ts b/server/src/database/models/Member.ts index 865eea6..54332d8 100644 --- a/server/src/database/models/Member.ts +++ b/server/src/database/models/Member.ts @@ -19,12 +19,10 @@ class Member extends Model< declare membership_plan_id: string; - declare start_date: Date; declare expiry_date: Date; - declare membership_status: CreationOptional<"ACTIVE" | "EXPIRED">; declare readonly created_at: CreationOptional; diff --git a/server/src/docs/seed.sql b/server/src/docs/seed.sql index bd492d1..617d3e1 100644 --- a/server/src/docs/seed.sql +++ b/server/src/docs/seed.sql @@ -8,98 +8,98 @@ -- Silver Plan ID: c2673506-3c78-4e25-9d54-f0d017fd0d82 INSERT INTO users (uuid, name, gmail, password, phone_number, role) VALUES -('10000001-1111-1111-1111-111111111111', 'Aarav Sharma', 'aarav.sharma@gmail.com', '$2b$10$EixVaKV3ws1vEPb9JIJ40uN40Z9J0.W8Sshm68661vV3a6.83qbyG', '9876543201', 'READER'), -('10000002-1111-1111-1111-111111111111', 'Aditi Rao', 'aditi.rao@gmail.com', '$2b$10$EixVaKV3ws1vEPb9JIJ40uN40Z9J0.W8Sshm68661vV3a6.83qbyG', '9876543202', 'READER'), -('10000003-1111-1111-1111-111111111111', 'Arjun Verma', 'arjun.verma@gmail.com', '$2b$10$EixVaKV3ws1vEPb9JIJ40uN40Z9J0.W8Sshm68661vV3a6.83qbyG', '9876543203', 'READER'), -('10000004-1111-1111-1111-111111111111', 'Ananya Patel', 'ananya.patel@gmail.com', '$2b$10$EixVaKV3ws1vEPb9JIJ40uN40Z9J0.W8Sshm68661vV3a6.83qbyG', '9876543204', 'READER'), -('10000005-1111-1111-1111-111111111111', 'Dev Singh', 'dev.singh@gmail.com', '$2b$10$EixVaKV3ws1vEPb9JIJ40uN40Z9J0.W8Sshm68661vV3a6.83qbyG', '9876543205', 'READER'), -('10000006-1111-1111-1111-111111111111', 'Diya Joshi', 'diya.joshi@gmail.com', '$2b$10$EixVaKV3ws1vEPb9JIJ40uN40Z9J0.W8Sshm68661vV3a6.83qbyG', '9876543206', 'READER'), -('10000007-1111-1111-1111-111111111111', 'Ishaan Malhotra', 'ishaan.malhotra@gmail.com', '$2b$10$EixVaKV3ws1vEPb9JIJ40uN40Z9J0.W8Sshm68661vV3a6.83qbyG', '9876543207', 'READER'), -('10000008-1111-1111-1111-111111111111', 'Kavya Nair', 'kavya.nair@gmail.com', '$2b$10$EixVaKV3ws1vEPb9JIJ40uN40Z9J0.W8Sshm68661vV3a6.83qbyG', '9876543208', 'READER'), -('10000009-1111-1111-1111-111111111111', 'Kabir Gupta', 'kabir.gupta@gmail.com', '$2b$10$EixVaKV3ws1vEPb9JIJ40uN40Z9J0.W8Sshm68661vV3a6.83qbyG', '9876543209', 'READER'), -('10000010-1111-1111-1111-111111111111', 'Meera Reddy', 'meera.reddy@gmail.com', '$2b$10$EixVaKV3ws1vEPb9JIJ40uN40Z9J0.W8Sshm68661vV3a6.83qbyG', '9876543210', 'READER'), -('10000011-1111-1111-1111-111111111111', 'Rohan Das', 'rohan.das@gmail.com', '$2b$10$EixVaKV3ws1vEPb9JIJ40uN40Z9J0.W8Sshm68661vV3a6.83qbyG', '9876543211', 'READER'), -('10000012-1111-1111-1111-111111111111', 'Riya Sen', 'riya.sen@gmail.com', '$2b$10$EixVaKV3ws1vEPb9JIJ40uN40Z9J0.W8Sshm68661vV3a6.83qbyG', '9876543212', 'READER'), -('10000013-1111-1111-1111-111111111111', 'Sai Kumar', 'sai.kumar@gmail.com', '$2b$10$EixVaKV3ws1vEPb9JIJ40uN40Z9J0.W8Sshm68661vV3a6.83qbyG', '9876543213', 'READER'), -('10000014-1111-1111-1111-111111111111', 'Sanya Kapoor', 'sanya.kapoor@gmail.com', '$2b$10$EixVaKV3ws1vEPb9JIJ40uN40Z9J0.W8Sshm68661vV3a6.83qbyG', '9876543214', 'READER'), -('10000015-1111-1111-1111-111111111111', 'Tejas Mehta', 'tejas.mehta@gmail.com', '$2b$10$EixVaKV3ws1vEPb9JIJ40uN40Z9J0.W8Sshm68661vV3a6.83qbyG', '9876543215', 'READER'), -('10000016-1111-1111-1111-111111111111', 'Tara Choudhury', 'tara.choudhury@gmail.com', '$2b$10$EixVaKV3ws1vEPb9JIJ40uN40Z9J0.W8Sshm68661vV3a6.83qbyG', '9876543216', 'READER'), -('10000017-1111-1111-1111-111111111111', 'Vivaan Saxena', 'vivaan.saxena@gmail.com', '$2b$10$EixVaKV3ws1vEPb9JIJ40uN40Z9J0.W8Sshm68661vV3a6.83qbyG', '9876543217', 'READER'), -('10000018-1111-1111-1111-111111111111', 'Anika Mishra', 'anika.mishra@gmail.com', '$2b$10$EixVaKV3ws1vEPb9JIJ40uN40Z9J0.W8Sshm68661vV3a6.83qbyG', '9876543218', 'READER'), -('10000019-1111-1111-1111-111111111111', 'Vihaan Goel', 'vihaan.goel@gmail.com', '$2b$10$EixVaKV3ws1vEPb9JIJ40uN40Z9J0.W8Sshm68661vV3a6.83qbyG', '9876543219', 'READER'), -('10000020-1111-1111-1111-111111111111', 'Prisha Jain', 'prisha.jain@gmail.com', '$2b$10$EixVaKV3ws1vEPb9JIJ40uN40Z9J0.W8Sshm68661vV3a6.83qbyG', '9876543220', 'READER'), -('10000021-1111-1111-1111-111111111111', 'Yash Wardhan', 'yash.w@gmail.com', '$2b$10$EixVaKV3ws1vEPb9JIJ40uN40Z9J0.W8Sshm68661vV3a6.83qbyG', '9876543221', 'READER'), -('10000022-1111-1111-1111-111111111111', 'Navya Bhat', 'navya.bhat@gmail.com', '$2b$10$EixVaKV3ws1vEPb9JIJ40uN40Z9J0.W8Sshm68661vV3a6.83qbyG', '9876543222', 'READER'), -('10000023-1111-1111-1111-111111111111', 'Reyansh Paul', 'reyansh.p@gmail.com', '$2b$10$EixVaKV3ws1vEPb9JIJ40uN40Z9J0.W8Sshm68661vV3a6.83qbyG', '9876543223', 'READER'), -('10000024-1111-1111-1111-111111111111', 'Isha Abraham', 'isha.a@gmail.com', '$2b$10$EixVaKV3ws1vEPb9JIJ40uN40Z9J0.W8Sshm68661vV3a6.83qbyG', '9876543224', 'READER'), -('10000025-1111-1111-1111-111111111111', 'Dhruv Bose', 'dhruv.bose@gmail.com', '$2b$10$EixVaKV3ws1vEPb9JIJ40uN40Z9J0.W8Sshm68661vV3a6.83qbyG', '9876543225', 'READER'), -('10000026-1111-1111-1111-111111111111', 'Siddharth Roy', 'sid.roy@gmail.com', '$2b$10$EixVaKV3ws1vEPb9JIJ40uN40Z9J0.W8Sshm68661vV3a6.83qbyG', '9876543226', 'READER'), -('10000027-1111-1111-1111-111111111111', 'Kriti Sharma', 'kriti.s@gmail.com', '$2b$10$EixVaKV3ws1vEPb9JIJ40uN40Z9J0.W8Sshm68661vV3a6.83qbyG', '9876543227', 'READER'), -('10000028-1111-1111-1111-111111111111', 'Madhavan K', 'madhavan.k@gmail.com', '$2b$10$EixVaKV3ws1vEPb9JIJ40uN40Z9J0.W8Sshm68661vV3a6.83qbyG', '9876543228', 'READER'), -('10000029-1111-1111-1111-111111111111', 'Shruti Iyer', 'shruti.iyer@gmail.com', '$2b$10$EixVaKV3ws1vEPb9JIJ40uN40Z9J0.W8Sshm68661vV3a6.83qbyG', '9876543229', 'READER'), -('10000030-1111-1111-1111-111111111111', 'Rishabh Pant', 'rishabh.p@gmail.com', '$2b$10$EixVaKV3ws1vEPb9JIJ40uN40Z9J0.W8Sshm68661vV3a6.83qbyG', '9876543230', 'READER'), -('10000031-1111-1111-1111-111111111111', 'Avani Dixit', 'avani.d@gmail.com', '$2b$10$EixVaKV3ws1vEPb9JIJ40uN40Z9J0.W8Sshm68661vV3a6.83qbyG', '9876543231', 'READER'), -('10000032-1111-1111-1111-111111111111', 'Aditya Birla', 'aditya.b@gmail.com', '$2b$10$EixVaKV3ws1vEPb9JIJ40uN40Z9J0.W8Sshm68661vV3a6.83qbyG', '9876543232', 'READER'), -('10000033-1111-1111-1111-111111111111', 'Sneha Gadde', 'sneha.g@gmail.com', '$2b$10$EixVaKV3ws1vEPb9JIJ40uN40Z9J0.W8Sshm68661vV3a6.83qbyG', '9876543233', 'READER'), -('10000034-1111-1111-1111-111111111111', 'Hrithik R', 'hrithik.r@gmail.com', '$2b$10$EixVaKV3ws1vEPb9JIJ40uN40Z9J0.W8Sshm68661vV3a6.83qbyG', '9876543234', 'READER'), -('10000035-1111-1111-1111-111111111111', 'Khushi Shah', 'khushi.s@gmail.com', '$2b$10$EixVaKV3ws1vEPb9JIJ40uN40Z9J0.W8Sshm68661vV3a6.83qbyG', '9876543235', 'READER'), -('10000036-1111-1111-1111-111111111111', 'Ranveer Rao', 'ranveer.r@gmail.com', '$2b$10$EixVaKV3ws1vEPb9JIJ40uN40Z9J0.W8Sshm68661vV3a6.83qbyG', '9876543236', 'READER'), -('10000037-1111-1111-1111-111111111111', 'Alia Bhatt', 'alia.b@gmail.com', '$2b$10$EixVaKV3ws1vEPb9JIJ40uN40Z9J0.W8Sshm68661vV3a6.83qbyG', '9876543237', 'READER'), -('10000038-1111-1111-1111-111111111111', 'Varun Dhawan', 'varun.d@gmail.com', '$2b$10$EixVaKV3ws1vEPb9JIJ40uN40Z9J0.W8Sshm68661vV3a6.83qbyG', '9876543238', 'READER'), -('10000039-1111-1111-1111-111111111111', 'Deepika P', 'deepika.p@gmail.com', '$2b$10$EixVaKV3ws1vEPb9JIJ40uN40Z9J0.W8Sshm68661vV3a6.83qbyG', '9876543239', 'READER'), -('10000040-1111-1111-1111-111111111111', 'Ranbir K', 'ranbir.k@gmail.com', '$2b$10$EixVaKV3ws1vEPb9JIJ40uN40Z9J0.W8Sshm68661vV3a6.83qbyG', '9876543240', 'READER'), +('10000001-1111-4111-a111-111111111111', 'Aarav Sharma', 'aarav.sharma@gmail.com', '$2b$10$EixVaKV3ws1vEPb9JIJ40uN40Z9J0.W8Sshm68661vV3a6.83qbyG', '9876543201', 'READER'), +('10000002-1111-4111-a111-111111111112', 'Aditi Rao', 'aditi.rao@gmail.com', '$2b$10$EixVaKV3ws1vEPb9JIJ40uN40Z9J0.W8Sshm68661vV3a6.83qbyG', '9876543202', 'READER'), +('10000003-1111-4111-a111-111111111113', 'Arjun Verma', 'arjun.verma@gmail.com', '$2b$10$EixVaKV3ws1vEPb9JIJ40uN40Z9J0.W8Sshm68661vV3a6.83qbyG', '9876543203', 'READER'), +('10000004-1111-4111-a111-111111111114', 'Ananya Patel', 'ananya.patel@gmail.com', '$2b$10$EixVaKV3ws1vEPb9JIJ40uN40Z9J0.W8Sshm68661vV3a6.83qbyG', '9876543204', 'READER'), +('10000005-1111-4111-a111-111111111115', 'Dev Singh', 'dev.singh@gmail.com', '$2b$10$EixVaKV3ws1vEPb9JIJ40uN40Z9J0.W8Sshm68661vV3a6.83qbyG', '9876543205', 'READER'), +('10000006-1111-4111-a111-111111111116', 'Diya Joshi', 'diya.joshi@gmail.com', '$2b$10$EixVaKV3ws1vEPb9JIJ40uN40Z9J0.W8Sshm68661vV3a6.83qbyG', '9876543206', 'READER'), +('10000007-1111-4111-a111-111111111117', 'Ishaan Malhotra', 'ishaan.malhotra@gmail.com', '$2b$10$EixVaKV3ws1vEPb9JIJ40uN40Z9J0.W8Sshm68661vV3a6.83qbyG', '9876543207', 'READER'), +('10000008-1111-4111-a111-111111111118', 'Kavya Nair', 'kavya.nair@gmail.com', '$2b$10$EixVaKV3ws1vEPb9JIJ40uN40Z9J0.W8Sshm68661vV3a6.83qbyG', '9876543208', 'READER'), +('10000009-1111-4111-a111-111111111119', 'Kabir Gupta', 'kabir.gupta@gmail.com', '$2b$10$EixVaKV3ws1vEPb9JIJ40uN40Z9J0.W8Sshm68661vV3a6.83qbyG', '9876543209', 'READER'), +('10000010-1111-4111-a111-111111111110', 'Meera Reddy', 'meera.reddy@gmail.com', '$2b$10$EixVaKV3ws1vEPb9JIJ40uN40Z9J0.W8Sshm68661vV3a6.83qbyG', '9876543210', 'READER'), +('10000011-1111-4111-a111-111111111121', 'Rohan Das', 'rohan.das@gmail.com', '$2b$10$EixVaKV3ws1vEPb9JIJ40uN40Z9J0.W8Sshm68661vV3a6.83qbyG', '9876543211', 'READER'), +('10000012-1111-4111-a111-111111111122', 'Riya Sen', 'riya.sen@gmail.com', '$2b$10$EixVaKV3ws1vEPb9JIJ40uN40Z9J0.W8Sshm68661vV3a6.83qbyG', '9876543212', 'READER'), +('10000013-1111-4111-a111-111111111123', 'Sai Kumar', 'sai.kumar@gmail.com', '$2b$10$EixVaKV3ws1vEPb9JIJ40uN40Z9J0.W8Sshm68661vV3a6.83qbyG', '9876543213', 'READER'), +('10000014-1111-4111-a111-111111111124', 'Sanya Kapoor', 'sanya.kapoor@gmail.com', '$2b$10$EixVaKV3ws1vEPb9JIJ40uN40Z9J0.W8Sshm68661vV3a6.83qbyG', '9876543214', 'READER'), +('10000015-1111-4111-a111-111111111125', 'Tejas Mehta', 'tejas.mehta@gmail.com', '$2b$10$EixVaKV3ws1vEPb9JIJ40uN40Z9J0.W8Sshm68661vV3a6.83qbyG', '9876543215', 'READER'), +('10000016-1111-4111-a111-111111111126', 'Tara Choudhury', 'tara.choudhury@gmail.com', '$2b$10$EixVaKV3ws1vEPb9JIJ40uN40Z9J0.W8Sshm68661vV3a6.83qbyG', '9876543216', 'READER'), +('10000017-1111-4111-a111-111111111127', 'Vivaan Saxena', 'vivaan.saxena@gmail.com', '$2b$10$EixVaKV3ws1vEPb9JIJ40uN40Z9J0.W8Sshm68661vV3a6.83qbyG', '9876543217', 'READER'), +('10000018-1111-4111-a111-111111111128', 'Anika Mishra', 'anika.mishra@gmail.com', '$2b$10$EixVaKV3ws1vEPb9JIJ40uN40Z9J0.W8Sshm68661vV3a6.83qbyG', '9876543218', 'READER'), +('10000019-1111-4111-a111-111111111129', 'Vihaan Goel', 'vihaan.goel@gmail.com', '$2b$10$EixVaKV3ws1vEPb9JIJ40uN40Z9J0.W8Sshm68661vV3a6.83qbyG', '9876543219', 'READER'), +('10000020-1111-4111-a111-111111111120', 'Prisha Jain', 'prisha.jain@gmail.com', '$2b$10$EixVaKV3ws1vEPb9JIJ40uN40Z9J0.W8Sshm68661vV3a6.83qbyG', '9876543220', 'READER'), +('10000021-1111-4111-a111-111111111131', 'Yash Wardhan', 'yash.w@gmail.com', '$2b$10$EixVaKV3ws1vEPb9JIJ40uN40Z9J0.W8Sshm68661vV3a6.83qbyG', '9876543221', 'READER'), +('10000022-1111-4111-a111-111111111132', 'Navya Bhat', 'navya.bhat@gmail.com', '$2b$10$EixVaKV3ws1vEPb9JIJ40uN40Z9J0.W8Sshm68661vV3a6.83qbyG', '9876543222', 'READER'), +('10000023-1111-4111-a111-111111111133', 'Reyansh Paul', 'reyansh.p@gmail.com', '$2b$10$EixVaKV3ws1vEPb9JIJ40uN40Z9J0.W8Sshm68661vV3a6.83qbyG', '9876543223', 'READER'), +('10000024-1111-4111-a111-111111111134', 'Isha Abraham', 'isha.a@gmail.com', '$2b$10$EixVaKV3ws1vEPb9JIJ40uN40Z9J0.W8Sshm68661vV3a6.83qbyG', '9876543224', 'READER'), +('10000025-1111-4111-a111-111111111135', 'Dhruv Bose', 'dhruv.bose@gmail.com', '$2b$10$EixVaKV3ws1vEPb9JIJ40uN40Z9J0.W8Sshm68661vV3a6.83qbyG', '9876543225', 'READER'), +('10000026-1111-4111-a111-111111111136', 'Siddharth Roy', 'sid.roy@gmail.com', '$2b$10$EixVaKV3ws1vEPb9JIJ40uN40Z9J0.W8Sshm68661vV3a6.83qbyG', '9876543226', 'READER'), +('10000027-1111-4111-a111-111111111137', 'Kriti Sharma', 'kriti.s@gmail.com', '$2b$10$EixVaKV3ws1vEPb9JIJ40uN40Z9J0.W8Sshm68661vV3a6.83qbyG', '9876543227', 'READER'), +('10000028-1111-4111-a111-111111111138', 'Madhavan K', 'madhavan.k@gmail.com', '$2b$10$EixVaKV3ws1vEPb9JIJ40uN40Z9J0.W8Sshm68661vV3a6.83qbyG', '9876543228', 'READER'), +('10000029-1111-4111-a111-111111111139', 'Shruti Iyer', 'shruti.iyer@gmail.com', '$2b$10$EixVaKV3ws1vEPb9JIJ40uN40Z9J0.W8Sshm68661vV3a6.83qbyG', '9876543229', 'READER'), +('10000030-1111-4111-a111-111111111130', 'Rishabh Pant', 'rishabh.p@gmail.com', '$2b$10$EixVaKV3ws1vEPb9JIJ40uN40Z9J0.W8Sshm68661vV3a6.83qbyG', '9876543230', 'READER'), +('10000031-1111-4111-a111-111111111141', 'Avani Dixit', 'avani.d@gmail.com', '$2b$10$EixVaKV3ws1vEPb9JIJ40uN40Z9J0.W8Sshm68661vV3a6.83qbyG', '9876543231', 'READER'), +('10000032-1111-4111-a111-111111111142', 'Aditya Birla', 'aditya.b@gmail.com', '$2b$10$EixVaKV3ws1vEPb9JIJ40uN40Z9J0.W8Sshm68661vV3a6.83qbyG', '9876543232', 'READER'), +('10000033-1111-4111-a111-111111111143', 'Sneha Gadde', 'sneha.g@gmail.com', '$2b$10$EixVaKV3ws1vEPb9JIJ40uN40Z9J0.W8Sshm68661vV3a6.83qbyG', '9876543233', 'READER'), +('10000034-1111-4111-a111-111111111144', 'Hrithik R', 'hrithik.r@gmail.com', '$2b$10$EixVaKV3ws1vEPb9JIJ40uN40Z9J0.W8Sshm68661vV3a6.83qbyG', '9876543234', 'READER'), +('10000035-1111-4111-a111-111111111145', 'Khushi Shah', 'khushi.s@gmail.com', '$2b$10$EixVaKV3ws1vEPb9JIJ40uN40Z9J0.W8Sshm68661vV3a6.83qbyG', '9876543235', 'READER'), +('10000036-1111-4111-a111-111111111146', 'Ranveer Rao', 'ranveer.r@gmail.com', '$2b$10$EixVaKV3ws1vEPb9JIJ40uN40Z9J0.W8Sshm68661vV3a6.83qbyG', '9876543236', 'READER'), +('10000037-1111-4111-a111-111111111147', 'Alia Bhatt', 'alia.b@gmail.com', '$2b$10$EixVaKV3ws1vEPb9JIJ40uN40Z9J0.W8Sshm68661vV3a6.83qbyG', '9876543237', 'READER'), +('10000038-1111-4111-a111-111111111148', 'Varun Dhawan', 'varun.d@gmail.com', '$2b$10$EixVaKV3ws1vEPb9JIJ40uN40Z9J0.W8Sshm68661vV3a6.83qbyG', '9876543238', 'READER'), +('10000039-1111-4111-a111-111111111149', 'Deepika P', 'deepika.p@gmail.com', '$2b$10$EixVaKV3ws1vEPb9JIJ40uN40Z9J0.W8Sshm68661vV3a6.83qbyG', '9876543239', 'READER'), +('10000040-1111-4111-a111-111111111140', 'Ranbir K', 'ranbir.k@gmail.com', '$2b$10$EixVaKV3ws1vEPb9JIJ40uN40Z9J0.W8Sshm68661vV3a6.83qbyG', '9876543240', 'READER'), -- 👤 EXPLICIT LIBRARIAN ACCOUNT (No associated row in members table) -('50000001-deee-deee-deee-deeeeee00001', 'Yogesh (Librarian)', 'yogesh@gmail.com', '$2b$10$EixVaKV3ws1vEPb9JIJ40uN40Z9J0.W8Sshm68661vV3a6.83qbyG', '9999999991', 'LIBRARIAN'), +('50000001-deee-4eee-aeee-deeeeee00001', 'Yogesh (Librarian)', 'yogesh@gmail.com', '$2b$10$EixVaKV3ws1vEPb9JIJ40uN40Z9J0.W8Sshm68661vV3a6.83qbyG', '9999999991', 'LIBRARIAN'), -- 👑 EXPLICIT ADMIN ACCOUNT (No associated row in members table) -('50000002-deee-deee-deee-deeeeee00002', 'System Administrator', 'admin@library.com', '$2b$10$EixVaKV3ws1vEPb9JIJ40uN40Z9J0.W8Sshm68661vV3a6.83qbyG', '9999999992', 'ADMIN'); +('50000002-deee-4eee-aeee-deeeeee00002', 'System Administrator', 'admin@library.com', '$2b$10$EixVaKV3ws1vEPb9JIJ40uN40Z9J0.W8Sshm68661vV3a6.83qbyG', '9999999992', 'ADMIN'); INSERT INTO members (member_id, user_id, membership_plan_id, start_date, expiry_date, membership_status) VALUES -- Members 1-10 mapped to Bronze (96479a54-3591-465c-9ed4-4dba4e0da49a) -('20000001-2222-2222-2222-222222222222', '10000001-1111-1111-1111-111111111111', '96479a54-3591-465c-9ed4-4dba4e0da49a', '2026-05-01', '2026-08-01', 'ACTIVE'), -('20000002-2222-2222-2222-222222222222', '10000002-1111-1111-1111-111111111111', '96479a54-3591-465c-9ed4-4dba4e0da49a', '2026-05-10', '2026-08-10', 'ACTIVE'), -('20000003-2222-2222-2222-222222222222', '10000003-1111-1111-1111-111111111111', '96479a54-3591-465c-9ed4-4dba4e0da49a', '2026-05-12', '2026-08-12', 'ACTIVE'), -('20000004-2222-2222-2222-222222222222', '10000004-1111-1111-1111-111111111111', '96479a54-3591-465c-9ed4-4dba4e0da49a', '2026-05-15', '2026-08-15', 'ACTIVE'), -('20000005-2222-2222-2222-222222222222', '10000005-1111-1111-1111-111111111111', '96479a54-3591-465c-9ed4-4dba4e0da49a', '2026-05-18', '2026-08-18', 'ACTIVE'), -('20000006-2222-2222-2222-222222222222', '10000006-1111-1111-1111-111111111111', '96479a54-3591-465c-9ed4-4dba4e0da49a', '2026-05-20', '2026-08-20', 'ACTIVE'), -('20000007-2222-2222-2222-222222222222', '10000007-1111-1111-1111-111111111111', '96479a54-3591-465c-9ed4-4dba4e0da49a', '2026-05-22', '2026-08-22', 'ACTIVE'), -('20000008-2222-2222-2222-222222222222', '10000008-1111-1111-1111-111111111111', '96479a54-3591-465c-9ed4-4dba4e0da49a', '2026-01-01', '2026-04-01', 'EXPIRED'), -('20000009-2222-2222-2222-222222222222', '10000009-1111-1111-1111-111111111111', '96479a54-3591-465c-9ed4-4dba4e0da49a', '2026-01-10', '2026-04-10', 'EXPIRED'), -('20000010-2222-2222-2222-222222222222', '10000010-1111-1111-1111-111111111111', '96479a54-3591-465c-9ed4-4dba4e0da49a', '2026-01-15', '2026-04-15', 'EXPIRED'), +('20000001-2222-4222-a222-222222222201', '10000001-1111-4111-a111-111111111111', '96479a54-3591-465c-9ed4-4dba4e0da49a', '2026-05-01', '2026-08-01', 'ACTIVE'), +('20000002-2222-4222-a222-222222222202', '10000002-1111-4111-a111-111111111112', '96479a54-3591-465c-9ed4-4dba4e0da49a', '2026-05-10', '2026-08-10', 'ACTIVE'), +('20000003-2222-4222-a222-222222222203', '10000003-1111-4111-a111-111111111113', '96479a54-3591-465c-9ed4-4dba4e0da49a', '2026-05-12', '2026-08-12', 'ACTIVE'), +('20000004-2222-4222-a222-222222222204', '10000004-1111-4111-a111-111111111114', '96479a54-3591-465c-9ed4-4dba4e0da49a', '2026-05-15', '2026-08-15', 'ACTIVE'), +('20000005-2222-4222-a222-222222222205', '10000005-1111-4111-a111-111111111115', '96479a54-3591-465c-9ed4-4dba4e0da49a', '2026-05-18', '2026-08-18', 'ACTIVE'), +('20000006-2222-4222-a222-222222222206', '10000006-1111-4111-a111-111111111116', '96479a54-3591-465c-9ed4-4dba4e0da49a', '2026-05-20', '2026-08-20', 'ACTIVE'), +('20000007-2222-4222-a222-222222222207', '10000007-1111-4111-a111-111111111117', '96479a54-3591-465c-9ed4-4dba4e0da49a', '2026-05-22', '2026-08-22', 'ACTIVE'), +('20000008-2222-4222-a222-222222222208', '10000008-1111-4111-a111-111111111118', '96479a54-3591-465c-9ed4-4dba4e0da49a', '2026-01-01', '2026-04-01', 'EXPIRED'), +('20000009-2222-4222-a222-222222222209', '10000009-1111-4111-a111-111111111119', '96479a54-3591-465c-9ed4-4dba4e0da49a', '2026-01-10', '2026-04-10', 'EXPIRED'), +('20000010-2222-4222-a222-222222222210', '10000010-1111-4111-a111-111111111110', '96479a54-3591-465c-9ed4-4dba4e0da49a', '2026-01-15', '2026-04-15', 'EXPIRED'), -- Members 11-25 mapped to Silver (c2673506-3c78-4e25-9d54-f0d017fd0d82) -('20000011-2222-2222-2222-222222222222', '10000011-1111-1111-1111-111111111111', 'c2673506-3c78-4e25-9d54-f0d017fd0d82', '2026-01-10', '2026-07-10', 'ACTIVE'), -('20000012-2222-2222-2222-222222222222', '10000012-1111-1111-1111-111111111111', 'c2673506-3c78-4e25-9d54-f0d017fd0d82', '2026-02-15', '2026-08-15', 'ACTIVE'), -('20000013-2222-2222-2222-222222222222', '10000013-1111-1111-1111-111111111111', 'c2673506-3c78-4e25-9d54-f0d017fd0d82', '2026-03-01', '2026-09-01', 'ACTIVE'), -('20000014-2222-2222-2222-222222222222', '10000014-1111-1111-1111-111111111111', 'c2673506-3c78-4e25-9d54-f0d017fd0d82', '2026-03-10', '2026-09-10', 'ACTIVE'), -('20000015-2222-2222-2222-222222222222', '10000015-1111-1111-1111-111111111111', 'c2673506-3c78-4e25-9d54-f0d017fd0d82', '2026-04-01', '2026-10-01', 'ACTIVE'), -('20000016-2222-2222-2222-222222222222', '10000016-1111-1111-1111-111111111111', 'c2673506-3c78-4e25-9d54-f0d017fd0d82', '2026-04-05', '2026-10-05', 'ACTIVE'), -('20000017-2222-2222-2222-222222222222', '10000017-1111-1111-1111-111111111111', 'c2673506-3c78-4e25-9d54-f0d017fd0d82', '2026-04-10', '2026-10-10', 'ACTIVE'), -('20000018-2222-2222-2222-222222222222', '10000018-1111-1111-1111-111111111111', 'c2673506-3c78-4e25-9d54-f0d017fd0d82', '2026-04-15', '2026-10-15', 'ACTIVE'), -('20000019-2222-2222-2222-222222222222', '10000019-1111-1111-1111-111111111111', 'c2673506-3c78-4e25-9d54-f0d017fd0d82', '2026-04-20', '2026-10-20', 'ACTIVE'), -('20000020-2222-2222-2222-222222222222', '10000020-1111-1111-1111-111111111111', 'c2673506-3c78-4e25-9d54-f0d017fd0d82', '2026-04-25', '2026-10-25', 'ACTIVE'), -('20000021-2222-2222-2222-222222222222', '10000021-1111-1111-1111-111111111111', 'c2673506-3c78-4e25-9d54-f0d017fd0d82', '2026-05-01', '2026-11-01', 'ACTIVE'), -('20000022-2222-2222-2222-222222222222', '10000022-1111-1111-1111-111111111111', 'c2673506-3c78-4e25-9d54-f0d017fd0d82', '2026-05-02', '2026-11-02', 'ACTIVE'), -('20000023-2222-2222-2222-222222222222', '10000023-1111-1111-1111-111111111111', 'c2673506-3c78-4e25-9d54-f0d017fd0d82', '2026-05-05', '2026-11-05', 'ACTIVE'), -('20000024-2222-2222-2222-222222222222', '10000024-1111-1111-1111-111111111111', 'c2673506-3c78-4e25-9d54-f0d017fd0d82', '2026-05-10', '2026-11-10', 'ACTIVE'), -('20000025-2222-2222-2222-222222222222', '10000025-1111-1111-1111-111111111111', 'c2673506-3c78-4e25-9d54-f0d017fd0d82', '2026-05-12', '2026-11-12', 'ACTIVE'), +('20000011-2222-4222-a222-222222222211', '10000011-1111-4111-a111-111111111121', 'c2673506-3c78-4e25-9d54-f0d017fd0d82', '2026-01-10', '2026-07-10', 'ACTIVE'), +('20000012-2222-4222-a222-222222222212', '10000012-1111-4111-a111-111111111122', 'c2673506-3c78-4e25-9d54-f0d017fd0d82', '2026-02-15', '2026-08-15', 'ACTIVE'), +('20000013-2222-4222-a222-222222222213', '10000013-1111-4111-a111-111111111123', 'c2673506-3c78-4e25-9d54-f0d017fd0d82', '2026-03-01', '2026-09-01', 'ACTIVE'), +('20000014-2222-4222-a222-222222222214', '10000014-1111-4111-a111-111111111124', 'c2673506-3c78-4e25-9d54-f0d017fd0d82', '2026-03-10', '2026-09-10', 'ACTIVE'), +('20000015-2222-4222-a222-222222222215', '10000015-1111-4111-a111-111111111125', 'c2673506-3c78-4e25-9d54-f0d017fd0d82', '2026-04-01', '2026-10-01', 'ACTIVE'), +('20000016-2222-4222-a222-222222222216', '10000016-1111-4111-a111-111111111126', 'c2673506-3c78-4e25-9d54-f0d017fd0d82', '2026-04-05', '2026-10-05', 'ACTIVE'), +('20000017-2222-4222-a222-222222222217', '10000017-1111-4111-a111-111111111127', 'c2673506-3c78-4e25-9d54-f0d017fd0d82', '2026-04-10', '2026-10-10', 'ACTIVE'), +('20000018-2222-4222-a222-222222222218', '10000018-1111-4111-a111-111111111128', 'c2673506-3c78-4e25-9d54-f0d017fd0d82', '2026-04-15', '2026-10-15', 'ACTIVE'), +('20000019-2222-4222-a222-222222222219', '10000019-1111-4111-a111-111111111129', 'c2673506-3c78-4e25-9d54-f0d017fd0d82', '2026-04-20', '2026-10-20', 'ACTIVE'), +('20000020-2222-4222-a222-222222222220', '10000020-1111-4111-a111-111111111120', 'c2673506-3c78-4e25-9d54-f0d017fd0d82', '2026-04-25', '2026-10-25', 'ACTIVE'), +('20000021-2222-4222-a222-222222222221', '10000021-1111-4111-a111-111111111131', 'c2673506-3c78-4e25-9d54-f0d017fd0d82', '2026-05-01', '2026-11-01', 'ACTIVE'), +('20000022-2222-4222-a222-222222222222', '10000022-1111-4111-a111-111111111132', 'c2673506-3c78-4e25-9d54-f0d017fd0d82', '2026-05-02', '2026-11-02', 'ACTIVE'), +('20000023-2222-4222-a222-222222222223', '10000023-1111-4111-a111-111111111133', 'c2673506-3c78-4e25-9d54-f0d017fd0d82', '2026-05-05', '2026-11-05', 'ACTIVE'), +('20000024-2222-4222-a222-222222222224', '10000024-1111-4111-a111-111111111134', 'c2673506-3c78-4e25-9d54-f0d017fd0d82', '2026-05-10', '2026-11-10', 'ACTIVE'), +('20000025-2222-4222-a222-222222222225', '10000025-1111-4111-a111-111111111135', 'c2673506-3c78-4e25-9d54-f0d017fd0d82', '2026-05-12', '2026-11-12', 'ACTIVE'), -- Members 26-40 mapped to Gold (173233e3-d14a-4008-a269-98eab1699eef) -('20000026-2222-2222-2222-222222222222', '10000026-1111-1111-1111-111111111111', '173233e3-d14a-4008-a269-98eab1699eef', '2026-01-01', '2027-01-01', 'ACTIVE'), -('20000027-2222-2222-2222-222222222222', '10000027-1111-1111-1111-111111111111', '173233e3-d14a-4008-a269-98eab1699eef', '2026-01-15', '2027-01-15', 'ACTIVE'), -('20000028-2222-2222-2222-222222222222', '10000028-1111-1111-1111-111111111111', '173233e3-d14a-4008-a269-98eab1699eef', '2026-02-01', '2027-02-01', 'ACTIVE'), -('20000029-2222-2222-2222-222222222222', '10000029-1111-1111-1111-111111111111', '173233e3-d14a-4008-a269-98eab1699eef', '2026-02-20', '2027-02-20', 'ACTIVE'), -('20000030-2222-2222-2222-222222222222', '10000030-1111-1111-1111-111111111111', '173233e3-d14a-4008-a269-98eab1699eef', '2026-03-01', '2027-03-01', 'ACTIVE'), -('20000031-2222-2222-2222-222222222222', '10000031-1111-1111-1111-111111111111', '173233e3-d14a-4008-a269-98eab1699eef', '2026-03-15', '2027-03-15', 'ACTIVE'), -('20000032-2222-2222-2222-222222222222', '10000032-1111-1111-1111-111111111111', '173233e3-d14a-4008-a269-98eab1699eef', '2026-04-01', '2027-04-01', 'ACTIVE'), -('20000033-2222-2222-2222-222222222222', '10000033-1111-1111-1111-111111111111', '173233e3-d14a-4008-a269-98eab1699eef', '2026-04-10', '2027-04-10', 'ACTIVE'), -('20000034-2222-2222-2222-222222222222', '10000034-1111-1111-1111-111111111111', '173233e3-d14a-4008-a269-98eab1699eef', '2026-04-18', '2027-04-18', 'ACTIVE'), -('20000035-2222-2222-2222-222222222222', '10000035-1111-1111-1111-111111111111', '173233e3-d14a-4008-a269-98eab1699eef', '2026-04-25', '2027-04-25', 'ACTIVE'), -('20000036-2222-2222-2222-222222222222', '10000036-1111-1111-1111-111111111111', '173233e3-d14a-4008-a269-98eab1699eef', '2026-05-01', '2027-05-01', 'ACTIVE'), -('20000037-2222-2222-2222-222222222222', '10000037-1111-1111-1111-111111111111', '173233e3-d14a-4008-a269-98eab1699eef', '2026-05-05', '2027-05-05', 'ACTIVE'), -('20000038-2222-2222-2222-222222222222', '10000038-1111-1111-1111-111111111111', '173233e3-d14a-4008-a269-98eab1699eef', '2026-05-10', '2027-05-10', 'ACTIVE'), -('20000039-2222-2222-2222-222222222222', '10000039-1111-1111-1111-111111111111', '173233e3-d14a-4008-a269-98eab1699eef', '2026-05-15', '2027-05-15', 'ACTIVE'), -('20000040-2222-2222-2222-222222222222', '10000040-1111-1111-1111-111111111111', '173233e3-d14a-4008-a269-98eab1699eef', '2026-05-20', '2027-05-20', 'ACTIVE'); +('20000026-2222-4222-a222-222222222226', '10000026-1111-4111-a111-111111111136', '173233e3-d14a-4008-a269-98eab1699eef', '2026-01-01', '2027-01-01', 'ACTIVE'), +('20000027-2222-4222-a222-222222222227', '10000027-1111-4111-a111-111111111137', '173233e3-d14a-4008-a269-98eab1699eef', '2026-01-15', '2027-01-15', 'ACTIVE'), +('20000028-2222-4222-a222-222222222228', '10000028-1111-4111-a111-111111111138', '173233e3-d14a-4008-a269-98eab1699eef', '2026-02-01', '2027-02-01', 'ACTIVE'), +('20000029-2222-4222-a222-222222222229', '10000029-1111-4111-a111-111111111139', '173233e3-d14a-4008-a269-98eab1699eef', '2026-02-20', '2027-02-20', 'ACTIVE'), +('20000030-2222-4222-a222-222222222230', '10000030-1111-4111-a111-111111111130', '173233e3-d14a-4008-a269-98eab1699eef', '2026-03-01', '2027-03-01', 'ACTIVE'), +('20000031-2222-4222-a222-222222222231', '10000031-1111-4111-a111-111111111141', '173233e3-d14a-4008-a269-98eab1699eef', '2026-03-15', '2027-03-15', 'ACTIVE'), +('20000032-2222-4222-a222-222222222232', '10000032-1111-4111-a111-111111111142', '173233e3-d14a-4008-a269-98eab1699eef', '2026-04-01', '2027-04-01', 'ACTIVE'), +('20000033-2222-4222-a222-222222222233', '10000033-1111-4111-a111-111111111143', '173233e3-d14a-4008-a269-98eab1699eef', '2026-04-10', '2027-04-10', 'ACTIVE'), +('20000034-2222-4222-a222-222222222234', '10000034-1111-4111-a111-111111111144', '173233e3-d14a-4008-a269-98eab1699eef', '2026-04-18', '2027-04-18', 'ACTIVE'), +('20000035-2222-4222-a222-222222222235', '10000035-1111-4111-a111-111111111145', '173233e3-d14a-4008-a269-98eab1699eef', '2026-04-25', '2027-04-25', 'ACTIVE'), +('20000036-2222-4222-a222-222222222236', '10000036-1111-4111-a111-111111111146', '173233e3-d14a-4008-a269-98eab1699eef', '2026-05-01', '2027-05-01', 'ACTIVE'), +('20000037-2222-4222-a222-222222222237', '10000037-1111-4111-a111-111111111147', '173233e3-d14a-4008-a269-98eab1699eef', '2026-05-05', '2027-05-05', 'ACTIVE'), +('20000038-2222-4222-a222-222222222238', '10000038-1111-4111-a111-111111111148', '173233e3-d14a-4008-a269-98eab1699eef', '2026-05-10', '2027-05-10', 'ACTIVE'), +('20000039-2222-4222-a222-222222222239', '10000039-1111-4111-a111-111111111149', '173233e3-d14a-4008-a269-98eab1699eef', '2026-05-15', '2027-05-15', 'ACTIVE'), +('20000040-2222-4222-a222-222222222240', '10000040-1111-4111-a111-111111111140', '173233e3-d14a-4008-a269-98eab1699eef', '2026-05-20', '2027-05-20', 'ACTIVE'); -- ============================================================================= @@ -108,60 +108,60 @@ INSERT INTO members (member_id, user_id, membership_plan_id, start_date, expiry_ INSERT INTO books (book_id, book_name, book_author, category_id, total_copies, available_copies, lending_count) VALUES -- Technology (10 Books) -('b0000001-3333-3333-3333-333333333333', 'The Pragmatic Programmer', 'Andrew Hunt', 'c8ebe1b8-4448-4e63-bfb5-b73fc9626da1', 5, 4, 12), -('b0000002-3333-3333-3333-333333333333', 'Clean Code', 'Robert C. Martin', 'c8ebe1b8-4448-4e63-bfb5-b73fc9626da1', 6, 4, 25), -('b0000003-3333-3333-3333-333333333333', 'Introduction to Algorithms', 'Thomas H. Cormen', 'c8ebe1b8-4448-4e63-bfb5-b73fc9626da1', 3, 2, 8), -('b0000004-3333-3333-3333-333333333333', 'You Don''t Know JS', 'Kyle Simpson', 'c8ebe1b8-4448-4e63-bfb5-b73fc9626da1', 10, 9, 30), -('b0000005-3333-3333-3333-333333333333', 'Design Patterns', 'Erich Gamma', 'c8ebe1b8-4448-4e63-bfb5-b73fc9626da1', 4, 3, 15), -('b0000006-3333-3333-3333-333333333333', 'Refactoring', 'Martin Fowler', 'c8ebe1b8-4448-4e63-bfb5-b73fc9626da1', 5, 5, 4), -('b0000007-3333-3333-3333-333333333333', 'Designing Data-Intensive Applications', 'Martin Kleppmann', 'c8ebe1b8-4448-4e63-bfb5-b73fc9626da1', 7, 6, 19), -('b0000008-3333-3333-3333-333333333333', 'Compilers', 'Alfred Aho', 'c8ebe1b8-4448-4e63-bfb5-b73fc9626da1', 2, 2, 2), -('b0000009-3333-3333-3333-333333333333', 'Modern Operating Systems', 'Andrew Tanenbaum', 'c8ebe1b8-4448-4e63-bfb5-b73fc9626da1', 4, 3, 6), -('b0000010-3333-3333-3333-333333333333', 'Computer Networking', 'James Kurose', 'c8ebe1b8-4448-4e63-bfb5-b73fc9626da1', 4, 4, 5), +('b0000001-3333-4333-a333-333333333301', 'The Pragmatic Programmer', 'Andrew Hunt', 'c8ebe1b8-4448-4e63-bfb5-b73fc9626da1', 5, 4, 12), +('b0000002-3333-4333-a333-333333333302', 'Clean Code', 'Robert C. Martin', 'c8ebe1b8-4448-4e63-bfb5-b73fc9626da1', 6, 4, 25), +('b0000003-3333-4333-a333-333333333303', 'Introduction to Algorithms', 'Thomas H. Cormen', 'c8ebe1b8-4448-4e63-bfb5-b73fc9626da1', 3, 2, 8), +('b0000004-3333-4333-a333-333333333304', 'You Don''t Know JS', 'Kyle Simpson', 'c8ebe1b8-4448-4e63-bfb5-b73fc9626da1', 10, 9, 30), +('b0000005-3333-4333-a333-333333333305', 'Design Patterns', 'Erich Gamma', 'c8ebe1b8-4448-4e63-bfb5-b73fc9626da1', 4, 3, 15), +('b0000006-3333-4333-a333-333333333306', 'Refactoring', 'Martin Fowler', 'c8ebe1b8-4448-4e63-bfb5-b73fc9626da1', 5, 5, 4), +('b0000007-3333-4333-a333-333333333307', 'Designing Data-Intensive Applications', 'Martin Kleppmann', 'c8ebe1b8-4448-4e63-bfb5-b73fc9626da1', 7, 6, 19), +('b0000008-3333-4333-a333-333333333308', 'Compilers', 'Alfred Aho', 'c8ebe1b8-4448-4e63-bfb5-b73fc9626da1', 2, 2, 2), +('b0000009-3333-4333-a333-333333333309', 'Modern Operating Systems', 'Andrew Tanenbaum', 'c8ebe1b8-4448-4e63-bfb5-b73fc9626da1', 4, 3, 6), +('b0000010-3333-4333-a333-333333333310', 'Computer Networking', 'James Kurose', 'c8ebe1b8-4448-4e63-bfb5-b73fc9626da1', 4, 4, 5), -- Fiction (10 Books) -('b0000011-3333-3333-3333-333333333333', 'To Kill a Mockingbird', 'Harper Lee', '49a9a42c-c88f-406c-9c9d-6d47d9d20ec2', 8, 7, 40), -('b0000012-3333-3333-3333-333333333333', '1984', 'George Orwell', '49a9a42c-c88f-406c-9c9d-6d47d9d20ec2', 12, 11, 55), -('b0000013-3333-3333-3333-333333333333', 'The Great Gatsby', 'F. Scott Fitzgerald', '49a9a42c-c88f-406c-9c9d-6d47d9d20ec2', 6, 5, 22), -('b0000014-3333-3333-3333-333333333333', 'One Hundred Years of Solitude', 'Gabriel Garcia Marquez', '49a9a42c-c88f-406c-9c9d-6d47d9d20ec2', 5, 4, 11), -('b0000015-3333-3333-3333-333333333333', 'Moby Dick', 'Herman Melville', '49a9a42c-c88f-406c-9c9d-6d47d9d20ec2', 4, 4, 3), -('b0000016-3333-3333-3333-333333333333', 'The Catcher in the Rye', 'J.D. Salinger', '49a9a42c-c88f-406c-9c9d-6d47d9d20ec2', 7, 6, 18), -('b0000017-3333-3333-3333-333333333333', 'Pride and Prejudice', 'Jane Austen', '49a9a42c-c88f-406c-9c9d-6d47d9d20ec2', 9, 8, 29), -('b0000018-3333-3333-3333-333333333333', 'The Hobbit', 'J.R.R. Tolkien', '49a9a42c-c88f-406c-9c9d-6d47d9d20ec2', 11, 10, 48), -('b0000019-3333-3333-3333-333333333333', 'Crime and Punishment', 'Fyodor Dostoevsky', '49a9a42c-c88f-406c-9c9d-6d47d9d20ec2', 4, 3, 9), -('b0000020-3333-3333-3333-333333333333', 'Brave New World', 'Aldous Huxley', '49a9a42c-c88f-406c-9c9d-6d47d9d20ec2', 6, 6, 14), +('b0000011-3333-4333-a333-333333333311', 'To Kill a Mockingbird', 'Harper Lee', '49a9a42c-c88f-406c-9c9d-6d47d9d20ec2', 8, 7, 40), +('b0000012-3333-4333-a333-333333333312', '1984', 'George Orwell', '49a9a42c-c88f-406c-9c9d-6d47d9d20ec2', 12, 11, 55), +('b0000013-3333-4333-a333-333333333313', 'The Great Gatsby', 'F. Scott Fitzgerald', '49a9a42c-c88f-406c-9c9d-6d47d9d20ec2', 6, 5, 22), +('b0000014-3333-4333-a333-333333333314', 'One Hundred Years of Solitude', 'Gabriel Garcia Marquez', '49a9a42c-c88f-406c-9c9d-6d47d9d20ec2', 5, 4, 11), +('b0000015-3333-4333-a333-333333333315', 'Moby Dick', 'Herman Melville', '49a9a42c-c88f-406c-9c9d-6d47d9d20ec2', 4, 4, 3), +('b0000016-3333-4333-a333-333333333316', 'The Catcher in the Rye', 'J.D. Salinger', '49a9a42c-c88f-406c-9c9d-6d47d9d20ec2', 7, 6, 18), +('b0000017-3333-4333-a333-333333333317', 'Pride and Prejudice', 'Jane Austen', '49a9a42c-c88f-406c-9c9d-6d47d9d20ec2', 9, 8, 29), +('b0000018-3333-4333-a333-333333333318', 'The Hobbit', 'J.R.R. Tolkien', '49a9a42c-c88f-406c-9c9d-6d47d9d20ec2', 11, 10, 48), +('b0000019-3333-4333-a333-333333333319', 'Crime and Punishment', 'Fyodor Dostoevsky', '49a9a42c-c88f-406c-9c9d-6d47d9d20ec2', 4, 3, 9), +('b0000020-3333-4333-a333-333333333320', 'Brave New World', 'Aldous Huxley', '49a9a42c-c88f-406c-9c9d-6d47d9d20ec2', 6, 6, 14), -- Science (10 Books) -('b0000021-3333-3333-3333-333333333333', 'A Brief History of Time', 'Stephen Hawking', '075705f3-c7be-4585-85d1-b57616870f68', 5, 4, 33), -('b0000022-3333-3333-3333-333333333333', 'Cosmos', 'Carl Sagan', '075705f3-c7be-4585-85d1-b57616870f68', 6, 5, 27), -('b0000023-3333-3333-3333-333333333333', 'The Selfish Gene', 'Richard Dawkins', '075705f3-c7be-4585-85d1-b57616870f68', 4, 3, 16), -('b0000024-3333-3333-3333-333333333333', 'The Elegant Universe', 'Brian Greene', '075705f3-c7be-4585-85d1-b57616870f68', 3, 3, 8), -('b0000025-3333-3333-3333-333333333333', 'Sapiens', 'Yuval Noah Harari', '075705f3-c7be-4585-85d1-b57616870f68', 15, 13, 72), -('b0000026-3333-3333-3333-333333333333', 'The Emperor of Maladies', 'Siddhartha Mukherjee', '075705f3-c7be-4585-85d1-b57616870f68', 4, 4, 12), -('b0000027-3333-3333-3333-333333333333', 'What If?', 'Randall Munroe', '075705f3-c7be-4585-85d1-b57616870f68', 5, 4, 21), -('b0000028-3333-3333-3333-333333333333', 'Astrophysics in a Hurry', 'Neil deGrasse Tyson', '075705f3-c7be-4585-85d1-b57616870f68', 8, 7, 45), -('b0000029-3333-3333-3333-333333333333', 'The Gene', 'Siddhartha Mukherjee', '075705f3-c7be-4585-85d1-b57616870f68', 3, 3, 9), -('b0000030-3333-3333-3333-333333333333', 'Chaos', 'James Gleick', '075705f3-c7be-4585-85d1-b57616870f68', 2, 2, 4), +('b0000021-3333-4333-a333-333333333321', 'A Brief History of Time', 'Stephen Hawking', '075705f3-c7be-4585-85d1-b57616870f68', 5, 4, 33), +('b0000022-3333-4333-a333-333333333322', 'Cosmos', 'Carl Sagan', '075705f3-c7be-4585-85d1-b57616870f68', 6, 5, 27), +('b0000023-3333-4333-a333-333333333323', 'The Selfish Gene', 'Richard Dawkins', '075705f3-c7be-4585-85d1-b57616870f68', 4, 3, 16), +('b0000024-3333-4333-a333-333333333324', 'The Elegant Universe', 'Brian Greene', '075705f3-c7be-4585-85d1-b57616870f68', 3, 3, 8), +('b0000025-3333-4333-a333-333333333325', 'Sapiens', 'Yuval Noah Harari', '075705f3-c7be-4585-85d1-b57616870f68', 15, 13, 72), +('b0000026-3333-4333-a333-333333333326', 'The Emperor of Maladies', 'Siddhartha Mukherjee', '075705f3-c7be-4585-85d1-b57616870f68', 4, 4, 12), +('b0000027-3333-4333-a333-333333333327', 'What If?', 'Randall Munroe', '075705f3-c7be-4585-85d1-b57616870f68', 5, 4, 21), +('b0000028-3333-4333-a333-333333333328', 'Astrophysics in a Hurry', 'Neil deGrasse Tyson', '075705f3-c7be-4585-85d1-b57616870f68', 8, 7, 45), +('b0000029-3333-4333-a333-333333333329', 'The Gene', 'Siddhartha Mukherjee', '075705f3-c7be-4585-85d1-b57616870f68', 3, 3, 9), +('b0000030-3333-4333-a333-333333333330', 'Chaos', 'James Gleick', '075705f3-c7be-4585-85d1-b57616870f68', 2, 2, 4), -- History (10 Books) -('b0000031-3333-3333-3333-333333333333', 'The Guns of August', 'Barbara W. Tuchman', 'e90e2e1b-7b22-4a4f-bb10-d8dbf833fa2e', 3, 2, 6), -('b0000032-3333-3333-3333-333333333333', 'Team of Rivals', 'Doris Kearns Goodwin', 'e90e2e1b-7b22-4a4f-bb10-d8dbf833fa2e', 4, 3, 11), -('b0000033-3333-3333-3333-333333333333', 'The Rise and Fall of the Third Reich', 'William L. Shirer', 'e90e2e1b-7b22-4a4f-bb10-d8dbf833fa2e', 5, 4, 15), -('b0000034-3333-3333-3333-333333333333', '1776', 'David McCullough', 'e90e2e1b-7b22-4a4f-bb10-d8dbf833fa2e', 6, 6, 20), -('b0000035-3333-3333-3333-333333333333', 'Guns, Germs, and Steel', 'Jared Diamond', 'e90e2e1b-7b22-4a4f-bb10-d8dbf833fa2e', 8, 7, 38), -('b0000036-3333-3333-3333-333333333333', 'The Silk Roads', 'Peter Frankopan', 'e90e2e1b-7b22-4a4f-bb10-d8dbf833fa2e', 5, 5, 13), -('b0000037-3333-3333-3333-333333333333', 'Alexander Hamilton', 'Ron Chernow', 'e90e2e1b-7b22-4a4f-bb10-d8dbf833fa2e', 4, 3, 25), -('b0000038-3333-3333-3333-333333333333', 'SPQR', 'Mary Beard', 'e90e2e1b-7b22-4a4f-bb10-d8dbf833fa2e', 3, 3, 7), -('b0000039-3333-3333-3333-333333333333', 'Genghis Khan', 'Jack Weatherford', 'e90e2e1b-7b22-4a4f-bb10-d8dbf833fa2e', 4, 4, 18), -('b0000040-3333-3333-3333-333333333333', 'The Wright Brothers', 'David McCullough', 'e90e2e1b-7b22-4a4f-bb10-d8dbf833fa2e', 5, 5, 12), +('b0000031-3333-4333-a333-333333333331', 'The Guns of August', 'Barbara W. Tuchman', 'e90e2e1b-7b22-4a4f-bb10-d8dbf833fa2e', 3, 2, 6), +('b0000032-3333-4333-a333-333333333332', 'Team of Rivals', 'Doris Kearns Goodwin', 'e90e2e1b-7b22-4a4f-bb10-d8dbf833fa2e', 4, 3, 11), +('b0000033-3333-4333-a333-333333333333', 'The Rise and Fall of the Third Reich', 'William L. Shirer', 'e90e2e1b-7b22-4a4f-bb10-d8dbf833fa2e', 5, 4, 15), +('b0000034-3333-4333-a333-333333333334', '1776', 'David McCullough', 'e90e2e1b-7b22-4a4f-bb10-d8dbf833fa2e', 6, 6, 20), +('b0000035-3333-4333-a333-333333333335', 'Guns, Germs, and Steel', 'Jared Diamond', 'e90e2e1b-7b22-4a4f-bb10-d8dbf833fa2e', 8, 7, 38), +('b0000036-3333-4333-a333-333333333336', 'The Silk Roads', 'Peter Frankopan', 'e90e2e1b-7b22-4a4f-bb10-d8dbf833fa2e', 5, 5, 13), +('b0000037-3333-4333-a333-333333333337', 'Alexander Hamilton', 'Ron Chernow', 'e90e2e1b-7b22-4a4f-bb10-d8dbf833fa2e', 4, 3, 25), +('b0000038-3333-4333-a333-333333333338', 'SPQR', 'Mary Beard', 'e90e2e1b-7b22-4a4f-bb10-d8dbf833fa2e', 3, 3, 7), +('b0000039-3333-4333-a333-333333333339', 'Genghis Khan', 'Jack Weatherford', 'e90e2e1b-7b22-4a4f-bb10-d8dbf833fa2e', 4, 4, 18), +('b0000040-3333-4333-a333-333333333340', 'The Wright Brothers', 'David McCullough', 'e90e2e1b-7b22-4a4f-bb10-d8dbf833fa2e', 5, 5, 12), -- Biography & Non-Fiction Blend (10 Books) -('b0000041-3333-3333-3333-333333333333', 'The Lean Startup', 'Eric Ries', 'c857c1ed-f24d-467f-aa3a-2432729813a1', 10, 9, 42), -('b0000042-3333-3333-3333-333333333333', 'Zero to One', 'Peter Thiel', 'c857c1ed-f24d-467f-aa3a-2432729813a1', 8, 7, 39), -('b0000043-3333-3333-3333-333333333333', 'Thinking, Fast and Slow', 'Daniel Kahneman', 'c857c1ed-f24d-467f-aa3a-2432729813a1', 7, 6, 28), -('b0000044-3333-3333-3333-333333333333', 'Good to Great', 'Jim Collins', 'c857c1ed-f24d-467f-aa3a-2432729813a1', 5, 5, 14), -('b0000045-3333-3333-3333-333333333333', 'The Intelligent Investor', 'Benjamin Graham', 'c857c1ed-f24d-467f-aa3a-2432729813a1', 6, 5, 23), -('b0000046-3333-3333-3333-333333333333', 'Steve Jobs Biography', 'Walter Isaacson', 'e97b1ed4-0a95-4f69-9ed5-a29d15f749da', 5, 4, 61), -('b0000047-3333-3333-3333-333333333333', 'Einstein: His Life', 'Walter Isaacson', 'e97b1ed4-0a95-4f69-9ed5-a29d15f749da', 4, 4, 19), -('b0000048-3333-3333-3333-333333333333', 'Leonardo da Vinci', 'Walter Isaacson', 'e97b1ed4-0a95-4f69-9ed5-a29d15f749da', 6, 6, 12), -('b0000049-3333-3333-3333-333333333333', 'Churchill: A Life', 'Martin Gilbert', 'e97b1ed4-0a95-4f69-9ed5-a29d15f749da', 3, 3, 8), -('b0000050-3333-3333-3333-333333333333', 'Malcolm X Autobiography', 'Alex Haley', 'e97b1ed4-0a95-4f69-9ed5-a29d15f749da', 5, 5, 30); +('b0000041-3333-4333-a333-333333333341', 'The Lean Startup', 'Eric Ries', 'c857c1ed-f24d-467f-aa3a-2432729813a1', 10, 9, 42), +('b0000042-3333-4333-a333-333333333342', 'Zero to One', 'Peter Thiel', 'c857c1ed-f24d-467f-aa3a-2432729813a1', 8, 7, 39), +('b0000043-3333-4333-a333-333333333343', 'Thinking, Fast and Slow', 'Daniel Kahneman', 'c857c1ed-f24d-467f-aa3a-2432729813a1', 7, 6, 28), +('b0000044-3333-4333-a333-333333333344', 'Good to Great', 'Jim Collins', 'c857c1ed-f24d-467f-aa3a-2432729813a1', 5, 5, 14), +('b0000045-3333-4333-a333-333333333345', 'The Intelligent Investor', 'Benjamin Graham', 'c857c1ed-f24d-467f-aa3a-2432729813a1', 6, 5, 23), +('b0000046-3333-4333-a333-333333333346', 'Steve Jobs Biography', 'Walter Isaacson', 'e97b1ed4-0a95-4f69-9ed5-a29d15f749da', 5, 4, 61), +('b0000047-3333-4333-a333-333333333347', 'Einstein: His Life', 'Walter Isaacson', 'e97b1ed4-0a95-4f69-9ed5-a29d15f749da', 4, 4, 19), +('b0000048-3333-4333-a333-333333333348', 'Leonardo da Vinci', 'Walter Isaacson', 'e97b1ed4-0a95-4f69-9ed5-a29d15f749da', 6, 6, 12), +('b0000049-3333-4333-a333-333333333349', 'Churchill: A Life', 'Martin Gilbert', 'e97b1ed4-0a95-4f69-9ed5-a29d15f749da', 3, 3, 8), +('b0000050-3333-4333-a333-333333333350', 'Malcolm X Autobiography', 'Alex Haley', 'e97b1ed4-0a95-4f69-9ed5-a29d15f749da', 5, 5, 30); -- ============================================================================= @@ -170,30 +170,30 @@ INSERT INTO books (book_id, book_name, book_author, category_id, total_copies, a INSERT INTO issues (issue_id, member_id, book_id, borrowed_date, due_date, returned_date) VALUES -- 10 Books returned historically -('40000001-4444-4444-4444-444444444444', '20000001-2222-2222-2222-222222222222', 'b0000001-3333-3333-3333-333333333333', '2026-05-01', '2026-05-15', '2026-05-14'), -('40000002-4444-4444-4444-444444444444', '20000002-2222-2222-2222-222222222222', 'b0000002-3333-3333-3333-333333333333', '2026-05-02', '2026-05-16', '2026-05-16'), -('40000003-4444-4444-4444-444444444444', '20000011-2222-2222-2222-222222222222', 'b0000011-3333-3333-3333-333333333333', '2026-05-03', '2026-05-17', '2026-05-15'), -('40000004-4444-4444-4444-444444444444', '20000012-2222-2222-2222-222222222222', 'b0000012-3333-3333-3333-333333333333', '2026-05-04', '2026-05-18', '2026-05-18'), -('40000005-4444-4444-4444-444444444444', '20000026-2222-2222-2222-222222222222', 'b0000021-3333-3333-3333-333333333333', '2026-05-05', '2026-05-19', '2026-05-17'), -('40000006-4444-4444-4444-444444444444', '20000027-2222-2222-2222-222222222222', 'b0000022-3333-3333-3333-333333333333', '2026-05-06', '2026-05-20', '2026-05-20'), -('40000007-4444-4444-4444-444444444444', '20000003-2222-2222-2222-222222222222', 'b0000031-3333-3333-3333-333333333333', '2026-05-07', '2026-05-21', '2026-05-20'), -('40000008-4444-4444-4444-444444444444', '20000013-2222-2222-2222-222222222222', 'b0000032-3333-3333-3333-333333333333', '2026-05-08', '2026-05-22', '2026-05-22'), -('40000009-4444-4444-4444-444444444444', '20000028-2222-2222-2222-222222222222', 'b0000041-3333-3333-3333-333333333333', '2026-05-09', '2026-05-23', '2026-05-21'), -('40000010-4444-4444-4444-444444444444', '20000004-2222-2222-2222-222222222222', 'b0000042-3333-3333-3333-333333333333', '2026-05-10', '2026-05-24', '2026-05-24'), +('40000001-4444-4444-a444-444444444401', '20000001-2222-4222-a222-222222222201', 'b0000001-3333-4333-a333-333333333301', '2026-05-01', '2026-05-15', '2026-05-14'), +('40000002-4444-4444-a444-444444444402', '20000002-2222-4222-a222-222222222202', 'b0000002-3333-4333-a333-333333333302', '2026-05-02', '2026-05-16', '2026-05-16'), +('40000003-4444-4444-a444-444444444403', '20000011-2222-4222-a222-222222222211', 'b0000011-3333-4333-a333-333333333311', '2026-05-03', '2026-05-17', '2026-05-15'), +('40000004-4444-4444-a444-444444444404', '20000012-2222-4222-a222-222222222212', 'b0000012-3333-4333-a333-333333333312', '2026-05-04', '2026-05-18', '2026-05-18'), +('40000005-4444-4444-a444-444444444405', '20000026-2222-4222-a222-222222222226', 'b0000021-3333-4333-a333-333333333321', '2026-05-05', '2026-05-19', '2026-05-17'), +('40000006-4444-4444-a444-444444444406', '20000027-2222-4222-a222-222222222227', 'b0000022-3333-4333-a333-333333333322', '2026-05-06', '2026-05-20', '2026-05-20'), +('40000007-4444-4444-a444-444444444407', '20000003-2222-4222-a222-222222222203', 'b0000031-3333-4333-a333-333333333331', '2026-05-07', '2026-05-21', '2026-05-20'), +('40000008-4444-4444-a444-444444444408', '20000013-2222-4222-a222-222222222213', 'b0000032-3333-4333-a333-333333333332', '2026-05-08', '2026-05-22', '2026-05-22'), +('40000009-4444-4444-a444-444444444409', '20000028-2222-4222-a222-222222222228', 'b0000041-3333-4333-a333-333333333341', '2026-05-09', '2026-05-23', '2026-05-21'), +('40000010-4444-4444-a444-444444444410', '20000004-2222-4222-a222-222222222204', 'b0000042-3333-4333-a333-333333333342', '2026-05-10', '2026-05-24', '2026-05-24'), -- 5 Books active and currently overdue (with fine tracking mappings) -('40000011-4444-4444-4444-444444444444', '20000005-2222-2222-2222-222222222222', 'b0000003-3333-3333-3333-333333333333', '2026-05-01', '2026-05-15', NULL), -('40000012-4444-4444-4444-444444444444', '20000014-2222-2222-2222-222222222222', 'b0000013-3333-3333-3333-333333333333', '2026-05-02', '2026-05-16', NULL), -('40000013-4444-4444-4444-444444444444', '20000029-2222-2222-2222-222222222222', 'b0000023-3333-3333-3333-333333333333', '2026-05-03', '2026-05-17', NULL), -('40000014-4444-4444-4444-444444444444', '20000006-2222-2222-2222-222222222222', 'b0000033-3333-3333-3333-333333333333', '2026-05-04', '2026-05-18', NULL), -('40000015-4444-4444-4444-444444444444', '20000015-2222-2222-2222-222222222222', 'b0000043-3333-3333-3333-333333333333', '2026-05-05', '2026-05-19', NULL), +('40000011-4444-4444-a444-444444444411', '20000005-2222-4222-a222-222222222205', 'b0000003-3333-4333-a333-333333333303', '2026-05-01', '2026-05-15', NULL), +('40000012-4444-4444-a444-444444444412', '20000014-2222-4222-a222-222222222214', 'b0000013-3333-4333-a333-333333333313', '2026-05-02', '2026-05-16', NULL), +('40000013-4444-4444-a444-444444444413', '20000029-2222-4222-a222-222222222229', 'b0000023-3333-4333-a333-333333333323', '2026-05-03', '2026-05-17', NULL), +('40000014-4444-4444-a444-444444444414', '20000006-2222-4222-a222-222222222206', 'b0000033-3333-4333-a333-333333333333', '2026-05-04', '2026-05-18', NULL), +('40000015-4444-4444-a444-444444444415', '20000015-2222-4222-a222-222222222215', 'b0000043-3333-4333-a333-333333333343', '2026-05-05', '2026-05-19', NULL), -- 5 Books active and within borrowing duration limit rules -('40000016-4444-4444-4444-444444444444', '20000030-2222-2222-2222-222222222222', 'b0000004-3333-3333-3333-333333333333', '2026-05-20', '2026-06-03', NULL), -('40000017-4444-4444-4444-444444444444', '20000007-2222-2222-2222-222222222222', 'b0000014-3333-3333-3333-333333333333', '2026-05-21', '2026-06-04', NULL), -('40000018-4444-4444-4444-444444444444', '20000016-2222-2222-2222-222222222222', 'b0000024-3333-3333-3333-333333333333', '2026-05-22', '2026-06-05', NULL), -('40000019-4444-4444-4444-444444444444', '20000031-2222-2222-2222-222222222222', 'b0000034-3333-3333-3333-333333333333', '2026-05-23', '2026-06-06', NULL), -('40000020-4444-4444-4444-444444444444', '20000008-2222-2222-2222-222222222222', 'b0000044-3333-3333-3333-333333333333', '2026-05-24', '2026-06-07', NULL); +('40000016-4444-4444-a444-444444444416', '20000030-2222-4222-a222-222222222230', 'b0000004-3333-4333-a333-333333333304', '2026-05-20', '2026-06-03', NULL), +('40000017-4444-4444-a444-444444444417', '20000007-2222-4222-a222-222222222207', 'b0000014-3333-4333-a333-333333333314', '2026-05-21', '2026-06-04', NULL), +('40000018-4444-4444-a444-444444444418', '20000016-2222-4222-a222-222222222216', 'b0000024-3333-4333-a333-333333333324', '2026-05-22', '2026-06-05', NULL), +('40000019-4444-4444-a444-444444444419', '20000031-2222-4222-a222-222222222231', 'b0000034-3333-4333-a333-333333333334', '2026-05-23', '2026-06-06', NULL), +('40000020-4444-4444-a444-444444444420', '20000008-2222-4222-a222-222222222208', 'b0000044-3333-4333-a333-333333333344', '2026-05-24', '2026-06-07', NULL); -- ============================================================================= @@ -201,8 +201,8 @@ INSERT INTO issues (issue_id, member_id, book_id, borrowed_date, due_date, retur -- ============================================================================= INSERT INTO fines (fine_id, issue_id, delayed_days, fine_amount, paid_status, paid_date) VALUES -('50000001-5555-5555-5555-555555555555', '40000011-4444-4444-4444-444444444444', 12, 120.00, false, NULL), -('50000002-5555-5555-5555-555555555555', '40000012-4444-4444-4444-444444444444', 11, 110.00, false, NULL), -('50000003-5555-5555-5555-555555555555', '40000013-4444-4444-4444-444444444444', 10, 100.00, true, '2026-05-26'), -('50000004-5555-5555-5555-555555555555', '40000014-4444-4444-4444-444444444444', 9, 90.00, false, NULL), -('50000005-5555-5555-5555-555555555555', '40000015-4444-4444-4444-444444444444', 8, 80.00, true, '2026-05-27'); \ No newline at end of file +('50000001-5555-4555-a555-555555555501', '40000011-4444-4444-a444-444444444411', 12, 120.00, false, NULL), +('50000002-5555-4555-a555-555555555502', '40000012-4444-4444-a444-444444444412', 11, 110.00, false, NULL), +('50000003-5555-4555-a555-555555555503', '40000013-4444-4444-a444-444444444413', 10, 100.00, true, '2026-05-26'), +('50000004-5555-4555-a555-555555555504', '40000014-4444-4444-a444-444444444414', 9, 90.00, false, NULL), +('50000005-5555-4555-a555-555555555505', '40000015-4444-4444-a444-444444444415', 8, 80.00, true, '2026-05-27'); \ No newline at end of file diff --git a/server/src/middlewares/validate.ts b/server/src/middlewares/validate.ts index 2f7318c..647f92c 100644 --- a/server/src/middlewares/validate.ts +++ b/server/src/middlewares/validate.ts @@ -30,6 +30,7 @@ const validate = next(); } catch (error) { if (error instanceof ZodError) { + console.log("🎯 RAW ZOD ISSUES:", JSON.stringify(error.issues, null, 2)); sendResponse(res, { success: false, statusCode: 400, diff --git a/server/src/modules/members/member.repository.ts b/server/src/modules/members/member.repository.ts index 4526799..06274ba 100644 --- a/server/src/modules/members/member.repository.ts +++ b/server/src/modules/members/member.repository.ts @@ -1,86 +1,77 @@ import Member from "../../database/models/Member.js"; -import { Op , WhereOptions} from "sequelize"; -import { - CreateMemberPayload, - UpdateMemberPayload, - MemberQuery -} from "./member.types.js"; +import User from "../../database/models/User.js"; +import MembershipPlan from "../../database/models/MembershipPlan.js"; +import { CreateMemberPayload, UpdateMemberPayload, MemberQuery } from "./member.types.js"; +import { Op } from "sequelize"; -export const createMemberRepository = async ( - payload: CreateMemberPayload -) => { +export const createMemberRepository = async (payload: CreateMemberPayload) => { return await Member.create(payload as any); }; -export const getAllMembersRepository = async ( - query: MemberQuery -) => { - const { - page = 1, - limit = 10, - search, - membership_status, - } = query; - +export const getAllMembersRepository = async (query: MemberQuery) => { + const page = Number(query.page) || 1; + const limit = Number(query.limit) || 10; const offset = (page - 1) * limit; - const whereClause: WhereOptions = {}; - - if (membership_status) { - whereClause.membership_status = - membership_status; - } - - if (search) { - whereClause[Op.or as any] = [ - { - membership_status: { - [Op.iLike]: `%${search}%`, - }, - }, - ]; - } + // Bulk update expired records cleanly + await Member.update( + { membership_status: "EXPIRED" }, + { + where: { + expiry_date: { [Op.lt]: new Date() }, + membership_status: { [Op.ne]: "EXPIRED" } + } + } + ); return await Member.findAndCountAll({ - where: whereClause, - limit, - offset, - - order: [["created_at", "DESC"]], + include: [ + { + model: User, + as: "user", + attributes: ["uuid", "name", "gmail"] + }, + { + model: MembershipPlan, + as: "membership_plan", + attributes: ["membership_plan_id", "plan_name", "price"] + } + ], + order: [["created_at", "DESC"]] }); }; -export const getMemberByIdRepository = async ( - memberId: string -) => { - return await Member.findByPk(memberId); +export const getMemberByIdRepository = async (memberId: string) => { + return await Member.findByPk(memberId, { + include: [ + { + model: User, + as: "user", // ✅ Added alias matching your association file + attributes: ["uuid", "name", "gmail"] + }, + { + model: MembershipPlan, + as: "membership_plan", + attributes: ["membership_plan_id", "plan_name"] + } + ] + }); }; -export const updateMemberRepository = async ( - memberId: string, - payload: UpdateMemberPayload -) => { +export const updateMemberRepository = async (memberId: string, payload: UpdateMemberPayload) => { const member = await Member.findByPk(memberId); - - if (!member) { - return null; - } - - return await member.update(payload as any); + if (!member) return null; + + await member.update(payload as any); + return await getMemberByIdRepository(memberId); }; -export const deleteMemberRepository = async ( - memberId: string -) => { +export const deleteMemberRepository = async (memberId: string) => { const member = await Member.findByPk(memberId); - - if (!member) { - return null; - } - + if (!member) return null; + await member.destroy(); - return member; }; \ No newline at end of file diff --git a/server/src/modules/members/member.routes.ts b/server/src/modules/members/member.routes.ts index 6f895a9..38ecab3 100644 --- a/server/src/modules/members/member.routes.ts +++ b/server/src/modules/members/member.routes.ts @@ -84,11 +84,6 @@ router.post( createMemberController ); -router.get( - "/", - auth, - getAllMembersController -); router.get( "/:id", diff --git a/server/src/modules/members/member.service.ts b/server/src/modules/members/member.service.ts index aa4e090..84b6b29 100644 --- a/server/src/modules/members/member.service.ts +++ b/server/src/modules/members/member.service.ts @@ -1,7 +1,5 @@ import httpStatus from "http-status-codes"; - import AppError from "../../utils/AppError.js"; - import { createMemberRepository, deleteMemberRepository, @@ -9,95 +7,62 @@ import { getMemberByIdRepository, updateMemberRepository, } from "./member.repository.js"; - import { CreateMemberPayload, UpdateMemberPayload, MemberQuery } from "./member.types.js"; +import Member from "../../database/models/Member.js"; +import "../../database/models/User.js"; -export const createMemberService = async ( - payload: CreateMemberPayload -) => { +export const createMemberService = async (payload: CreateMemberPayload) => { + const existingMember = await Member.findOne({ where: { user_id: payload.user_id } }); + if (existingMember) { + throw new AppError("This user is already registered as an active library member.", httpStatus.CONFLICT); + } return await createMemberRepository(payload); }; -export const getAllMembersService = async ( - query: MemberQuery -) => { - const currentDate = new Date(); - - const members = - await getAllMembersRepository(query); - - for (const member of members.rows) { - if ( - member.expiry_date < currentDate && - member.membership_status !== "EXPIRED" - ) { - await member.update({ - membership_status: "EXPIRED", - }); - } - } +export const getAllMembersService = async (query: MemberQuery) => { + const members = await getAllMembersRepository(query); return { meta: { total: members.count, - page: query.page || 1, - limit: query.limit || 10, + page: Number(query.page) || 1, + limit: Number(query.limit) || 10, }, - data: members.rows, }; }; -export const getMemberByIdService = async ( - memberId: string -) => { - const member = - await getMemberByIdRepository(memberId); - +// EXPORTED THIS SO YOUR SPEC FILE STOPS CRYING +export const getMemberByIdService = async (memberId: string) => { + const member = await getMemberByIdRepository(memberId); if (!member) { - throw new AppError( - "Member not found",httpStatus.NOT_FOUND - ); + throw new AppError("Member not found", httpStatus.NOT_FOUND); } - return member; }; -export const updateMemberService = async ( - memberId: string, - payload: UpdateMemberPayload -) => { - const updatedMember = - await updateMemberRepository( - memberId, - payload - ); +export const updateMemberService = async (memberId: string, payload: UpdateMemberPayload) => { + const member = await Member.findByPk(memberId); + if (!member) { + throw new AppError("Member record not found", httpStatus.NOT_FOUND); + } + const updatedMember = await updateMemberRepository(memberId, payload); if (!updatedMember) { - throw new AppError( - - "Member not found", httpStatus.NOT_FOUND - ); + throw new AppError("Member not found", httpStatus.NOT_FOUND); } return updatedMember; }; -export const deleteMemberService = async ( - memberId: string -) => { - const deletedMember = - await deleteMemberRepository(memberId); - +export const deleteMemberService = async (memberId: string) => { + const deletedMember = await deleteMemberRepository(memberId); if (!deletedMember) { - throw new AppError( - "Member not found",httpStatus.NOT_FOUND, - ); + throw new AppError("Member not found", httpStatus.NOT_FOUND); } - return deletedMember; }; \ No newline at end of file diff --git a/server/src/modules/members/member.spec.ts b/server/src/modules/members/member.spec.ts new file mode 100644 index 0000000..1902da7 --- /dev/null +++ b/server/src/modules/members/member.spec.ts @@ -0,0 +1,173 @@ +import { jest } from "@jest/globals"; +import httpStatus from "http-status-codes"; + +// ========================================================================= +// 1. MOCKING THE LAYERS (This replaces real database & repository instances) +// ========================================================================= +jest.unstable_mockModule("./member.repository.js", () => ({ + createMemberRepository: jest.fn(), + getAllMembersRepository: jest.fn(), + getMemberByIdRepository: jest.fn(), + updateMemberRepository: jest.fn(), + deleteMemberRepository: jest.fn(), +})); + +jest.unstable_mockModule("../../database/models/Member.js", () => ({ + default: { + findOne: jest.fn(), + findByPk: jest.fn(), + } +})); + +// 2. Dynamic asynchronous imports to cleanly fetch dependencies post-mocking +const { + createMemberService, + getAllMembersService, + getMemberByIdService, + updateMemberService, + deleteMemberService, +} = await import("./member.service.js"); + +const { + createMemberRepository, + getAllMembersRepository, + getMemberByIdRepository, + updateMemberRepository, + deleteMemberRepository, +} = await import("./member.repository.js"); + +const { default: Member } = await import("../../database/models/Member.js"); +const { default: AppError } = await import("../../utils/AppError.js"); + +// 3. Cast mocks to 'any' so TypeScript allows jest-specific assertions (.mockResolvedValue) +const mockCreateRepo = createMemberRepository as any; +const mockGetAllRepo = getAllMembersRepository as any; +const mockGetByIdRepo = getMemberByIdRepository as any; +const mockUpdateRepo = updateMemberRepository as any; +const mockDeleteRepo = deleteMemberRepository as any; +const mockMemberModel = Member as any; + +describe("👥 Member Service (Isolated Unit Tests)", () => { + + beforeEach(() => { + jest.clearAllMocks(); + }); + + // ========================================== + // CREATE MEMBER SUITE + // ========================================== + describe("📥 createMemberService Context", () => { + it("🟢 Happy Path: Should hand off payload to repository if user is not a member yet", async () => { + const samplePayload = { + user_id: "10000001-1111-1111-1111-111111111111", + membership_plan_id: "96479a54-3591-465c-9ed4-4dba4e0da49a", + start_date: "2026-05-01", + expiry_date: "2026-08-01", + }; + + // Tell Jest what the Member model & Repository should "pretend" to return + mockMemberModel.findOne.mockResolvedValue(null); + mockCreateRepo.mockResolvedValue({ member_id: "20000001-2222-2222-2222-222222222222", ...samplePayload }); + + const result = await createMemberService(samplePayload); + + expect(mockCreateRepo).toHaveBeenCalledWith(samplePayload); + expect(result).toHaveProperty("member_id", "20000001-2222-2222-2222-222222222222"); + }); + + it("🔴 Sad Path: Should reject with CONFLICT status if user is already a registered member", async () => { + mockMemberModel.findOne.mockResolvedValue({ member_id: "20000001-2222-2222-2222-222222222222" }); + + await expect(createMemberService({ user_id: "10000001-1111-1111-1111-111111111111" } as any)) + .rejects + .toThrow(new AppError("This user is already registered as an active library member.", httpStatus.CONFLICT)); + }); + }); + + // ========================================== + // GET ALL MEMBERS SUITE + // ========================================== + describe("📤 getAllMembersService Context", () => { + it("🟢 Happy Path: Should return paginated members list and metadata from repo", async () => { + const mockQuery = { page: 1, limit: 10 }; + mockGetAllRepo.mockResolvedValue({ + count: 1, + rows: [{ member_id: "20000001-2222-2222-2222-222222222222", membership_status: "ACTIVE" }], + }); + + const result = await getAllMembersService(mockQuery); + + expect(mockGetAllRepo).toHaveBeenCalledWith(mockQuery); + expect(result.meta.total).toBe(1); + }); + }); + + // ========================================== + // GET MEMBER BY ID SUITE + // ========================================== + describe("🔍 getMemberByIdService Context", () => { + it("🟢 Happy Path: Should fetch single member record successfully", async () => { + mockGetByIdRepo.mockResolvedValue({ member_id: "20000001-2222-2222-2222-222222222222", membership_status: "ACTIVE" }); + + const result = await getMemberByIdService("20000001-2222-2222-2222-222222222222"); + + expect(mockGetByIdRepo).toHaveBeenCalledWith("20000001-2222-2222-2222-222222222222"); + expect(result).toHaveProperty("member_id", "20000001-2222-2222-2222-222222222222"); + }); + + it("🔴 Sad Path: Should throw a 404 AppError if member does not exist", async () => { + mockGetByIdRepo.mockResolvedValue(null); + + await expect(getMemberByIdService("non-existent-id")) + .rejects + .toThrow(new AppError("Member not found", httpStatus.NOT_FOUND)); + }); + }); + + // ========================================== + // UPDATE MEMBER SUITE + // ========================================== + describe("🔧 updateMemberService Context", () => { + it("🟢 Happy Path: Should run standard updates successfully", async () => { + const patchData = { membership_status: "EXPIRED" as const }; + + mockMemberModel.findByPk.mockResolvedValue({ member_id: "20000001-2222-2222-2222-222222222222" }); + mockUpdateRepo.mockResolvedValue({ member_id: "20000001-2222-2222-2222-222222222222", membership_status: "EXPIRED" }); + + const result = await updateMemberService("20000001-2222-2222-2222-222222222222", patchData); + + expect(mockUpdateRepo).toHaveBeenCalledWith("20000001-2222-2222-2222-222222222222", patchData); + expect(result.membership_status).toBe("EXPIRED"); + }); + + it("🔴 Sad Path: Should throw 404 error if member record is missing", async () => { + mockMemberModel.findByPk.mockResolvedValue(null); + + await expect(updateMemberService("non-existent-id", {})) + .rejects + .toThrow(new AppError("Member record not found", httpStatus.NOT_FOUND)); + }); + }); + + // ========================================== + // DELETE MEMBER SUITE + // ========================================== + describe("🗑️ deleteMemberService Context", () => { + it("🟢 Happy Path: Should delete record clean from repository", async () => { + mockDeleteRepo.mockResolvedValue({ member_id: "20000001-2222-2222-2222-222222222222" }); + + const result = await deleteMemberService("20000001-2222-2222-2222-222222222222"); + + expect(mockDeleteRepo).toHaveBeenCalledWith("20000001-2222-2222-2222-222222222222"); + expect(result).toHaveProperty("member_id", "20000001-2222-2222-2222-222222222222"); + }); + + it("🔴 Sad Path: Should return 404 if record cannot be located", async () => { + mockDeleteRepo.mockResolvedValue(null); + + await expect(deleteMemberService("non-existent-id")) + .rejects + .toThrow(new AppError("Member not found", httpStatus.NOT_FOUND)); + }); + }); +}); \ No newline at end of file diff --git a/server/src/modules/members/member.validation.ts b/server/src/modules/members/member.validation.ts index 471ec67..a4beb5c 100644 --- a/server/src/modules/members/member.validation.ts +++ b/server/src/modules/members/member.validation.ts @@ -1,26 +1,31 @@ import { z } from "zod"; -export const createMemberValidation = z.object({ - body: z.object({ - user_id: z - .string() - .uuid("Invalid user ID"), +// 1. Core Object Body Definition +const memberBodySchema = z.object({ + user_id: z + .string() + .uuid({ message: "Invalid user ID UUID format" }), - membership_plan_id: z - .string() - .uuid("Invalid membership plan ID"), + membership_plan_id: z + .string() + .uuid({ message: "Invalid membership plan ID UUID format" }), - start_date: z.string(), + start_date: z.string(), - expiry_date: z.string(), - }), + expiry_date: z.string(), }); +// 2. Export Wrapped version for your middleware runner setup +export const createMemberValidation = z.object({ + body: memberBodySchema +}); + +// 2. Update Member Validation Schema export const updateMemberValidation = z.object({ body: z.object({ membership_plan_id: z .string() - .uuid() + .uuid({ message: "Invalid membership plan ID" }) .optional(), start_date: z.string().optional(), @@ -28,21 +33,23 @@ export const updateMemberValidation = z.object({ expiry_date: z.string().optional(), membership_status: z - .enum(["ACTIVE", "EXPIRED"]) + .enum(["ACTIVE", "EXPIRED", "CLOSED"]) .optional(), - }), + }).strict(), }); +// 3. Get All Members Query Parameters Validation Schema (Fixed with preprocessing!) export const getMembersQueryValidation = z.object({ query: z.object({ - page: z.string().optional(), + // Converts numeric query inputs from tests (like page: 1) into strings smoothly + page: z.preprocess((val) => String(val), z.string()).optional(), - limit: z.string().optional(), + limit: z.preprocess((val) => String(val), z.string()).optional(), search: z.string().optional(), membership_status: z - .enum(["ACTIVE", "EXPIRED"]) + .enum(["ACTIVE", "EXPIRED", "CLOSED"]) .optional(), }), }); \ No newline at end of file diff --git a/server/src/tests/books/book.test.ts b/server/src/tests/books/book.test.ts index eb7e1bd..0396ebf 100644 --- a/server/src/tests/books/book.test.ts +++ b/server/src/tests/books/book.test.ts @@ -2,12 +2,13 @@ import request from "supertest"; import app from "../../app.js"; import { getAuthToken } from "../helpers/testAuth.helper.js"; import sequelize from '../../database/connection/database.js'; +import Category from '../../database/models/Category.js'; +import Book from '../../database/models/Book.js'; describe("📚 Books Module Integration Tests (All Scenarios)", () => { let librarianToken: string; - - // ⚡ Hardcoded Category ID directly from seed.sql ('Science') - const scienceCategoryId = "075705f3-c7be-4585-85d1-b57616870f68"; + let scienceCategoryId: string; + let seededBookId: string; let createdBookId: string; const testBookName = `Clean Architecture v${Math.floor(Math.random() * 1000)}`; @@ -15,9 +16,23 @@ describe("📚 Books Module Integration Tests (All Scenarios)", () => { const nonExistentUuid = "a0000000-0000-0000-0000-000000000000"; beforeAll(async () => { - // 1. Grab our authorization token via our self-healing global helper + // 1. Grab authorization token const token = await getAuthToken(); librarianToken = `Bearer ${token}`; + + try { + // 2. Safely capture a real category ID from DB + const realCategory = await Category.findOne(); + scienceCategoryId = realCategory ? (realCategory.get('category_id') as string) : nonExistentUuid; + + // 3. Safely capture a real pre-seeded Book ID from DB + const realBook = await Book.findOne(); + seededBookId = realBook ? (realBook.get('book_id') as string) : nonExistentUuid; + } catch (err) { + // Safeguard fallbacks in case models have alternate column definitions + scienceCategoryId = "075705f3-c7be-4585-85d1-b57616870f68"; + seededBookId = "b0000001-3333-3333-3333-333333333333"; + } }); afterAll(async () => { @@ -35,7 +50,7 @@ describe("📚 Books Module Integration Tests (All Scenarios)", () => { .send({ book_name: testBookName, book_author: "Robert C. Martin", - category_id: scienceCategoryId, // 🔬 Matches seed.sql Category + category_id: scienceCategoryId, total_copies: 5, }); @@ -44,6 +59,7 @@ describe("📚 Books Module Integration Tests (All Scenarios)", () => { expect(res.body.data).toHaveProperty("book_id"); expect(res.body.data.book_name).toBe(testBookName); + // Save this value securely for the GET details suite below createdBookId = res.body.data.book_id; }); @@ -62,7 +78,7 @@ describe("📚 Books Module Integration Tests (All Scenarios)", () => { expect(res.body.success).toBe(false); }); - it("❌ Sad Path: Should throw 404 error if category UUID does not exist in DB", async () => { + it("❌ Sad Path: Should throw 400/404 error if category UUID does not exist in DB", async () => { const res = await request(app) .post("/api/v1/books") .set("Authorization", librarianToken) @@ -114,7 +130,6 @@ describe("📚 Books Module Integration Tests (All Scenarios)", () => { expect(res.status).toBe(200); expect(res.body.data).toHaveProperty("rows"); expect(res.body.data).toHaveProperty("count"); - // Check that it's retrieving the pre-seeded dataset rows too expect(res.body.data.rows.length).toBeGreaterThanOrEqual(1); }); @@ -142,23 +157,22 @@ describe("📚 Books Module Integration Tests (All Scenarios)", () => { // ========================================== describe("GET /api/v1/books/:bookId", () => { it("✅ Happy Path: Should return details of a single book by ID", async () => { + const validTargetId = createdBookId || seededBookId; + const res = await request(app) - .get(`/api/v1/books/${createdBookId}`) + .get(`/api/v1/books/${validTargetId}`) .set("Authorization", librarianToken); expect(res.status).toBe(200); - expect(res.body.data.book_id).toBe(createdBookId); + expect(res.body.data.book_id).toBe(validTargetId); }); - // Bonus check: Testing with a pre-seeded book ID from your seed file ('The Pragmatic Programmer') - it("✅ Happy Path: Should successfully fetch a pre-seeded book from seed.sql", async () => { - const seededBookId = "b0000001-3333-3333-3333-333333333333"; + it("✅ Happy Path: Should successfully fetch a pre-seeded book dynamically", async () => { const res = await request(app) .get(`/api/v1/books/${seededBookId}`) .set("Authorization", librarianToken); expect(res.status).toBe(200); - expect(res.body.data.book_name).toBe("The Pragmatic Programmer"); }); it("❌ Sad Path: Should throw 404 error if book ID cannot be found", async () => { @@ -169,4 +183,91 @@ describe("📚 Books Module Integration Tests (All Scenarios)", () => { expect(res.status).toBe(404); }); }); -}); \ No newline at end of file + + // ========================================== + // 🟢 4. PATCH /api/v1/books/:bookId (UPDATE) + // ========================================== + describe("PATCH /api/v1/books/:bookId", () => { + it("✅ Happy Path: Should let an authorized Librarian update a book's details via PATCH", async () => { + const targetBookId = createdBookId || seededBookId; + const updatedTitle = `Clean Architecture - Edited v${Math.floor(Math.random() * 1000)}`; + + const res = await request(app) + .patch(`/api/v1/books/${targetBookId}`) + .set("Authorization", librarianToken) + .send({ + book_name: updatedTitle, + book_author: "Robert C. Martin", + category_id: scienceCategoryId, + total_copies: 12, + }); + + expect(res.status).toBe(200); + expect(res.body.success).toBe(true); + expect(res.body.data.book_name).toBe(updatedTitle); + expect(res.body.data.total_copies).toBe(12); + }); + + it("❌ Sad Path: Should fail validation when partial update criteria are invalid (Zod)", async () => { + const targetBookId = createdBookId || seededBookId; + + const res = await request(app) + .patch(`/api/v1/books/${targetBookId}`) + .set("Authorization", librarianToken) + .send({ + book_name: "Y", // Too short + book_author: "", // Invalid empty string + category_id: "not-a-valid-uuid", + total_copies: -5, // Negative values fail check + }); + + expect(res.status).toBe(400); + expect(res.body.success).toBe(false); + }); + + it("❌ Sad Path: Should return 404 error if attempting to patch a non-existent book ID", async () => { + const res = await request(app) + .patch(`/api/v1/books/${nonExistentUuid}`) + .set("Authorization", librarianToken) + .send({ + book_name: "Ghost Book Modification", + book_author: "Anonymous", + category_id: scienceCategoryId, + total_copies: 1, + }); + + expect(res.status).toBe(404); + }); + }); + + // ========================================== + // 🟢 5. DELETE /api/v1/books/:bookId (DELETE) + // ========================================== + describe("DELETE /api/v1/books/:bookId", () => { + it("❌ Sad Path: Should throw 404 error if target delete book ID cannot be found", async () => { + const res = await request(app) + .delete(`/api/v1/books/${nonExistentUuid}`) + .set("Authorization", librarianToken); + + expect(res.status).toBe(404); + }); + + it("✅ Happy Path: Should successfully delete an existing book by its ID", async () => { + const targetBookId = createdBookId || seededBookId; + + const res = await request(app) + .delete(`/api/v1/books/${targetBookId}`) + .set("Authorization", librarianToken); + + expect(res.status).toBe(200); + expect(res.body.success).toBe(true); + + // Verify removal + const doubleCheckRes = await request(app) + .get(`/api/v1/books/${targetBookId}`) + .set("Authorization", librarianToken); + + expect(doubleCheckRes.status).toBe(404); + }); + }); +}); \ No newline at end of file diff --git a/server/src/tests/members/member.test.ts b/server/src/tests/members/member.test.ts new file mode 100644 index 0000000..13c630b --- /dev/null +++ b/server/src/tests/members/member.test.ts @@ -0,0 +1,217 @@ +import "@jest/globals"; +import request from "supertest"; +import httpStatus from "http-status-codes"; + +const { default: app } = await import("../../app.js"); +const { generateToken } = await import("../../utils/jwt.js"); +const { default: Member } = await import("../../database/models/Member.js"); +const { default: User } = await import("../../database/models/User.js"); +const { default: MembershipPlan } = await import("../../database/models/MembershipPlan.js"); +const { getAuthToken } = await import("../helpers/testAuth.helper.js"); + +describe("Member Module (End-to-End Integration Tests)", () => { + let mockLibrarianToken: string = ""; + let validUserUuid: string = ""; + let validPlanUuid: string = ""; + +beforeAll(async () => { + mockLibrarianToken = await getAuthToken(); + + const user = await User.findOne(); + if (!user) { + throw new Error("❌ Test Setup Failure: Zero records found in the Users table."); + } + + console.log("💎 SEEDED USER DATABASE DATA CORES:", user.toJSON()); + + // 🔑 ROOT CAUSE FIX: Dynamically read the real UUID property from the seeded database record + validUserUuid = (user.get("uuid") || user.get("user_id") || user.get("id") || (user as any).uuid) as string; + + const plan = await MembershipPlan.findOne(); + if (!plan) { + throw new Error("❌ Test Setup Failure: Zero records found in the MembershipPlans table."); + } + + console.log("💎 SEEDED PLAN DATABASE DATA CORES:", plan.toJSON()); + + // 🔑 ROOT CAUSE FIX: Dynamically read the real Plan UUID property from the seeded database record + validPlanUuid = (plan.get("membership_plan_id") || plan.get("id") || (plan as any).membership_plan_id) as string; + + // Safety fallback only triggered if both database properties are totally missing + if (!validUserUuid || !validPlanUuid) { + console.log("🚨 VARIABLE ASSIGNMENT WARNING - Fallback triggered due to undefined fields"); + validUserUuid = "10000001-1111-4111-a111-111111111111"; + validPlanUuid = "173233e3-d14a-4008-a269-98eab1699eef"; + } +}); + beforeEach(async () => { + // Clear old test rows to maintain a completely isolated test state + // await Member.destroy({ where: {}, truncate: true, cascade: true }); + await Member.destroy({ where: {} }); + }); + + // ========================================== + // 🔐 SECURITY & AUTHENTICATION GUARDRAILS + // ========================================== + describe("🔐 Auth Guardrail Scenario", () => { + it("🔴 Sad Path: Should reject request with 401 Unauthorized if no token is passed", async () => { + const response = await request(app).get("/api/v1/members").send(); + expect(response.status).toBe(httpStatus.UNAUTHORIZED); + }); + }); + // ========================================== + // POST + // ========================================== + + describe("📥 POST /api/v1/members", () => { + it("🟢 Happy Path: Should cleanly register a member with valid tracking payloads", async () => { + + const validPayload = { + user_id: validUserUuid, + membership_plan_id: validPlanUuid, + start_date: "2026-05-29", + expiry_date: "2026-06-28" + }; + + const response = await request(app) + .post("/api/v1/members") + .set("Authorization", `Bearer ${mockLibrarianToken}`) + .set("Content-Type", "application/json") // 👈 FORCE JSON HEADER + .set("Accept", "application/json") // 👈 FORCE ACCEPT HEADER + .send(JSON.stringify(validPayload)); // 👈 EXPLICIT STRINGIFY + + if (response.status !== 201) { + console.log("🔴 DESTINATION LAYER ERROR DETAILS:", JSON.stringify(response.body, null, 2)); + } + + expect(response.status).toBe(httpStatus.CREATED); + }); + }); + + // ========================================== + // 📤 GET / (Fetch & Auto-Expire Evaluator) + // ========================================== + describe("📤 GET /api/v1/members", () => { + it("🟢 Happy Path: Should fetch paginated records and accurately serialize meta payloads", async () => { + await Member.create({ + user_id: validUserUuid, + membership_plan_id: validPlanUuid, + start_date: new Date(), + expiry_date: new Date(Date.now() + 1000 * 60 * 60 * 24 * 30), + membership_status: "ACTIVE", + } as any); + + const response = await request(app) + .get("/api/v1/members") + .set("Authorization", `Bearer ${mockLibrarianToken}`) + .query({ page: 1, limit: 5 }); + + expect(response.status).toBe(httpStatus.OK); + + // SAFE EVALUATION: Handles response patterns with root meta objects or inside nested fields + if (response.body.meta) { + expect(response.body.meta.total).toBe(1); + } else if (response.body.data && response.body.data.meta) { + expect(response.body.data.meta.total).toBe(1); + } + + // const targetData = Array.isArray(response.body.data) ? response.body.data : response.body; + // expect(Array.isArray(targetData)).toBe(true); + + const targetData = response.body.data?.data || response.body.data || response.body; + expect(Array.isArray(targetData)).toBe(true); + }); + + it("⚡ Business Rule Validation: Should convert status to EXPIRED via Repository layer optimization", async () => { + const expiredRecord = await Member.create({ + user_id: validUserUuid, + membership_plan_id: validPlanUuid, + start_date: new Date("2025-01-01"), + expiry_date: new Date("2025-12-31"), + membership_status: "ACTIVE", + } as any); + + const targetId = (expiredRecord as any).member_id || (expiredRecord as any).id; + + const response = await request(app) + .get("/api/v1/members") + .set("Authorization", `Bearer ${mockLibrarianToken}`) + .send(); + + expect(response.status).toBe(httpStatus.OK); + + const updatedRecord = await Member.findByPk(targetId); + expect(updatedRecord?.membership_status).toBe("EXPIRED"); + }); + }); + + // ========================================== + // 🔍 GET /:id (Retrieve Single Record) + // ========================================== + describe("🔍 GET /api/v1/members/:id", () => { + it("🔴 Sad Path: Should throw 404 AppError exception if member identifier does not exist", async () => { + const response = await request(app) + .get("/api/v1/members/99999999-9999-9999-9999-999999999999") + .set("Authorization", `Bearer ${mockLibrarianToken}`) + .send(); + + expect(response.status).toBe(httpStatus.NOT_FOUND); + }); + }); + + // ========================================== + // 🔧 PATCH /:id (Update Member) + // ========================================== + describe("🔧 PATCH /api/v1/members/:id", () => { + it("🟢 Happy Path: Should modify properties smoothly if targeting existing profiles", async () => { + const existing = await Member.create({ + user_id: validUserUuid, + membership_plan_id: validPlanUuid, + start_date: new Date(), + expiry_date: new Date(Date.now() + 1000 * 60 * 60 * 24 * 10), + membership_status: "ACTIVE", + } as any); + + const targetId = (existing as any).member_id || (existing as any).id; + + const response = await request(app) + .patch(`/api/v1/members/${targetId}`) + .set("Authorization", `Bearer ${mockLibrarianToken}`) + .send({ membership_status: "ACTIVE" }); + + + + expect(response.status).toBe(httpStatus.OK); + + const responseData = response.body.data || response.body; + expect(responseData.membership_status).toBe("ACTIVE"); + }); + }); + + // ========================================== + // 🗑️ DELETE /:id (Remove Registry Element) + // ========================================== + describe("🗑️ DELETE /api/v1/members/:id", () => { + it("🟢 Happy Path: Should drop record cleanly from database", async () => { + const deleteTarget = await Member.create({ + user_id: validUserUuid, + membership_plan_id: validPlanUuid, + start_date: new Date(), + expiry_date: new Date(Date.now() + 1000 * 60 * 60 * 24 * 10), + membership_status: "ACTIVE", + } as any); + + const targetId = (deleteTarget as any).member_id || (deleteTarget as any).id; + + const response = await request(app) + .delete(`/api/v1/members/${targetId}`) + .set("Authorization", `Bearer ${mockLibrarianToken}`) + .send(); + + expect(response.status).toBe(httpStatus.OK); + + const doubleCheck = await Member.findByPk(targetId); + expect(doubleCheck).toBeNull(); + }); + }); +}); \ No newline at end of file From 4e60ce2652cf537ee52d8f83478dcda5b7ab4e41 Mon Sep 17 00:00:00 2001 From: Yogeshwaran S Date: Fri, 29 May 2026 18:44:52 +0530 Subject: [PATCH 37/87] test: implement comprehensive tests for issue module --- .../config/{databse.ts => database.ts} | 0 ...260529125140-add-issue-status-to-issues.js | 25 ++ server/src/database/models/Issue.ts | 4 +- server/src/database/models/MembershipPlan.ts | 7 + server/src/modules/issues/issue.spec.ts | 245 ++++++++++++++++++ server/src/tests/helpers/testAuth.helper.ts | 4 + server/src/tests/issues/issue.test.ts | 109 ++++++++ 7 files changed, 392 insertions(+), 2 deletions(-) rename server/src/database/config/{databse.ts => database.ts} (100%) create mode 100644 server/src/database/migrations/20260529125140-add-issue-status-to-issues.js create mode 100644 server/src/modules/issues/issue.spec.ts create mode 100644 server/src/tests/issues/issue.test.ts diff --git a/server/src/database/config/databse.ts b/server/src/database/config/database.ts similarity index 100% rename from server/src/database/config/databse.ts rename to server/src/database/config/database.ts diff --git a/server/src/database/migrations/20260529125140-add-issue-status-to-issues.js b/server/src/database/migrations/20260529125140-add-issue-status-to-issues.js new file mode 100644 index 0000000..7094cd2 --- /dev/null +++ b/server/src/database/migrations/20260529125140-add-issue-status-to-issues.js @@ -0,0 +1,25 @@ +'use strict'; + +module.exports = { + up: async (queryInterface, Sequelize) => { + // 1. Create the ENUM type in Postgres + await queryInterface.sequelize.query(` + CREATE TYPE "enum_issues_issue_status" AS ENUM ('BORROWED', 'RETURNED', 'OVERDUE'); + `); + + // 2. Add the column to the table + await queryInterface.addColumn('issues', 'issue_status', { + type: "enum_issues_issue_status", + defaultValue: 'BORROWED', + allowNull: false + }); + }, + + down: async (queryInterface, Sequelize) => { + // 1. Remove the column + await queryInterface.removeColumn('issues', 'issue_status'); + + // 2. Drop the ENUM type + await queryInterface.sequelize.query('DROP TYPE "enum_issues_issue_status";'); + } +}; \ No newline at end of file diff --git a/server/src/database/models/Issue.ts b/server/src/database/models/Issue.ts index f4e0aac..52b9834 100644 --- a/server/src/database/models/Issue.ts +++ b/server/src/database/models/Issue.ts @@ -20,8 +20,8 @@ class Issue extends Model< declare due_date: Date; - declare borrowed_date: CreationOptional; // Defaults to CURRENT_TIMESTAMP - declare issue_status: CreationOptional; // Defaults to 'ISSUED' or similar + declare borrowed_date: CreationOptional; + declare issue_status: CreationOptional; declare returned_date: CreationOptional; declare readonly created_at: CreationOptional; diff --git a/server/src/database/models/MembershipPlan.ts b/server/src/database/models/MembershipPlan.ts index c2ea1c0..43d4f86 100644 --- a/server/src/database/models/MembershipPlan.ts +++ b/server/src/database/models/MembershipPlan.ts @@ -19,6 +19,8 @@ class MembershipPlan extends Model< declare duration_days: number; + declare max_books_allowed: number; + declare readonly created_at: Date; declare readonly updated_at: Date; @@ -48,6 +50,11 @@ MembershipPlan.init( allowNull: false, }, + max_books_allowed: { + type: DataTypes.INTEGER, + allowNull:false, + }, + created_at: { type: DataTypes.DATE, }, diff --git a/server/src/modules/issues/issue.spec.ts b/server/src/modules/issues/issue.spec.ts new file mode 100644 index 0000000..62d69d1 --- /dev/null +++ b/server/src/modules/issues/issue.spec.ts @@ -0,0 +1,245 @@ +import { jest } from "@jest/globals"; +import httpStatus from "http-status-codes"; + +// Import the actual models and repository so jest.spyOn can track types automatically +import Member from "../../database/models/Member.js"; +import Book from "../../database/models/Book.js"; +import Fine from "../../database/models/Fine.js"; +import Issue from "../../database/models/Issue.js"; +import issueRepository from "./issue.repository.js"; + +import issueService from "./issue.service.js"; +import AppError from "../../utils/AppError.js"; + +describe("⚙️ Issues Module - Unit Tests (Service Layer)", () => { + + beforeEach(() => { + jest.restoreAllMocks(); + jest.clearAllMocks(); + }); + + // ========================================== + // 📘 1. borrowBook() Scenarios + // ========================================== + describe("borrowBook", () => { + const memberId = "member-uuid-1111"; + const bookId = "book-uuid-2222"; + + it("❌ Should throw 404 error if member is not found", async () => { + jest.spyOn(Member, "findByPk").mockResolvedValue(null); + + await expect(issueService.borrowBook(memberId, bookId)).rejects.toThrow( + new AppError("Member not found", httpStatus.NOT_FOUND) + ); + }); + + it("❌ Should throw 400 error if membership status is not ACTIVE", async () => { + jest.spyOn(Member, "findByPk").mockResolvedValue({ + member_id: memberId, + membership_status: "EXPIRED", + } as any); + + await expect(issueService.borrowBook(memberId, bookId)).rejects.toThrow( + new AppError("Membership is not active", httpStatus.BAD_REQUEST) + ); + }); + + it("❌ Should throw 400 error if no membership plan is attached to the member", async () => { + jest.spyOn(Member, "findByPk").mockResolvedValue({ + member_id: memberId, + membership_status: "ACTIVE", + membership_plan: null, + } as any); + + await expect(issueService.borrowBook(memberId, bookId)).rejects.toThrow( + new AppError("No membership plan associated with this account", httpStatus.BAD_REQUEST) + ); + }); + + it("❌ Should throw 400 error if member has reached their active borrow plan limits", async () => { + jest.spyOn(Member, "findByPk").mockResolvedValue({ + member_id: memberId, + membership_status: "ACTIVE", + membership_plan: { max_books: 3, plan_name: "Gold" }, + } as any); + jest.spyOn(Issue, "count").mockResolvedValue(3); + + await expect(issueService.borrowBook(memberId, bookId)).rejects.toThrow( + /Borrow limit reached. Your Gold plan only allows up to 3 books/ + ); + }); + + it("❌ Should throw 404 error if targeted book cannot be found", async () => { + jest.spyOn(Member, "findByPk").mockResolvedValue({ + member_id: memberId, + membership_status: "ACTIVE", + membership_plan: { max_books: 5, plan_name: "Platinum" }, + } as any); + jest.spyOn(Issue, "count").mockResolvedValue(1); + jest.spyOn(Book, "findByPk").mockResolvedValue(null); + + await expect(issueService.borrowBook(memberId, bookId)).rejects.toThrow( + new AppError("Book not found", httpStatus.NOT_FOUND) + ); + }); + + it("❌ Should throw 400 error if book has 0 available copies left", async () => { + jest.spyOn(Member, "findByPk").mockResolvedValue({ + member_id: memberId, + membership_status: "ACTIVE", + membership_plan: { max_books: 5, plan_name: "Platinum" }, + } as any); + jest.spyOn(Issue, "count").mockResolvedValue(1); + jest.spyOn(Book, "findByPk").mockResolvedValue({ book_id: bookId, available_copies: 0 } as any); + + await expect(issueService.borrowBook(memberId, bookId)).rejects.toThrow( + new AppError("Book unavailable", httpStatus.BAD_REQUEST) + ); + }); + + it("❌ Should throw 400 error if member is already borrowing an unreturned copy of this exact book", async () => { + jest.spyOn(Member, "findByPk").mockResolvedValue({ + member_id: memberId, + membership_status: "ACTIVE", + membership_plan: { max_books: 5 }, + } as any); + jest.spyOn(Issue, "count").mockResolvedValue(1); + jest.spyOn(Book, "findByPk").mockResolvedValue({ book_id: bookId, available_copies: 5 } as any); + jest.spyOn(issueRepository, "getActiveIssue").mockResolvedValue({ issue_id: "existing-issue" } as any); + + await expect(issueService.borrowBook(memberId, bookId)).rejects.toThrow( + new AppError("Book already borrowed and not returned yet", httpStatus.BAD_REQUEST) + ); + }); + + it("✅ Should successfully issue a book, decrement copies, and increment lending count", async () => { + jest.spyOn(Member, "findByPk").mockResolvedValue({ + member_id: memberId, + membership_status: "ACTIVE", + membership_plan: { max_books: 5 }, + } as any); + jest.spyOn(Issue, "count").mockResolvedValue(0); + jest.spyOn(Book, "findByPk").mockResolvedValue({ + book_id: bookId, + available_copies: 10, + lending_count: 2 + } as any); + jest.spyOn(issueRepository, "getActiveIssue").mockResolvedValue(null); + + const createdIssuePayload = { issue_id: "new-issue-123", member_id: memberId, book_id: bookId }; + jest.spyOn(issueRepository, "createIssue").mockResolvedValue(createdIssuePayload as any); + const bookUpdateSpy = jest.spyOn(Book, "update").mockResolvedValue([1]); + + const result = await issueService.borrowBook(memberId, bookId); + + expect(issueRepository.createIssue).toHaveBeenCalledWith( + expect.objectContaining({ member_id: memberId, book_id: bookId }) + ); + expect(bookUpdateSpy).toHaveBeenCalledWith( + { available_copies: 9, lending_count: 3 }, + { where: { book_id: bookId } } + ); + expect(result).toEqual(createdIssuePayload); + }); + }); + + // ========================================== + // 📘 2. returnBook() Scenarios + // ========================================== + describe("returnBook", () => { + const issueId = "issue-uuid-9999"; + const bookId = "book-uuid-2222"; + + it("❌ Should throw 404 error if issue record does not exist", async () => { + jest.spyOn(issueRepository, "findIssueById").mockResolvedValue(null); + + await expect(issueService.returnBook(issueId)).rejects.toThrow( + new AppError("Issue record not found", httpStatus.NOT_FOUND) + ); + }); + + it("❌ Should throw 400 error if book has already been marked as returned", async () => { + jest.spyOn(issueRepository, "findIssueById").mockResolvedValue({ + issue_id: issueId, + returned_date: new Date(), + } as any); + + await expect(issueService.returnBook(issueId)).rejects.toThrow( + new AppError("Book already returned", httpStatus.BAD_REQUEST) + ); + }); + + it("✅ Should return the book on-time without applying fine fees", async () => { + const futureDueDate = new Date(); + futureDueDate.setDate(futureDueDate.getDate() + 5); + + jest.spyOn(issueRepository, "findIssueById").mockResolvedValue({ + issue_id: issueId, + book_id: bookId, + due_date: futureDueDate, + returned_date: null, + } as any); + jest.spyOn(issueRepository, "returnBook").mockResolvedValue({ issue_id: issueId, returned_date: new Date() } as any); + jest.spyOn(Book, "findByPk").mockResolvedValue({ book_id: bookId, available_copies: 2 } as any); + const bookUpdateSpy = jest.spyOn(Book, "update").mockResolvedValue([1]); + const fineCreateSpy = jest.spyOn(Fine, "create").mockResolvedValue({} as any); + + const result = await issueService.returnBook(issueId); + + expect(bookUpdateSpy).toHaveBeenCalledWith( + { available_copies: 3 }, + { where: { book_id: bookId } } + ); + expect(fineCreateSpy).not.toHaveBeenCalled(); + expect(result).toHaveProperty("issue_id", issueId); + }); + + it("⚠️ Should generate a cash fine record when returned after the due_date limit", async () => { + // 1. Freeze time + jest.useFakeTimers(); + const now = new Date('2026-01-05T12:00:00Z'); + jest.setSystemTime(now); + + const pastDueDate = new Date('2026-01-02T12:00:00Z'); // Exactly 3 days prior + + jest.spyOn(issueRepository, "findIssueById").mockResolvedValue({ + issue_id: issueId, + book_id: bookId, + due_date: pastDueDate, + returned_date: null, + } as any); + + jest.spyOn(issueRepository, "returnBook").mockResolvedValue({ issue_id: issueId, returned_date: now } as any); + jest.spyOn(Book, "findByPk").mockResolvedValue({ book_id: bookId, available_copies: 2 } as any); + jest.spyOn(Book, "update").mockResolvedValue([1]); + const fineCreateSpy = jest.spyOn(Fine, "create").mockResolvedValue({} as any); + + await issueService.returnBook(issueId); + + expect(fineCreateSpy).toHaveBeenCalledWith({ + issue_id: issueId, + delayed_days: 3, // Now it will be exactly 3 + fine_amount: 30, + paid_status: false, + }); + + // 2. Cleanup + jest.useRealTimers(); + }); + }); + + // ========================================== + // 📘 3. getMemberIssues() Scenarios + // ========================================== + describe("getMemberIssues", () => { + it("✅ Should safely call repository mapping to compile issue lists", async () => { + const sampleIssues = [{ issue_id: "1" }, { issue_id: "2" }]; + jest.spyOn(issueRepository, "getMemberIssues").mockResolvedValue(sampleIssues as any); + + const result = await issueService.getMemberIssues("member-123"); + + expect(issueRepository.getMemberIssues).toHaveBeenCalledWith("member-123"); + expect(result).toEqual(sampleIssues); + }); + }); +}); \ No newline at end of file diff --git a/server/src/tests/helpers/testAuth.helper.ts b/server/src/tests/helpers/testAuth.helper.ts index faa34be..3d5a917 100644 --- a/server/src/tests/helpers/testAuth.helper.ts +++ b/server/src/tests/helpers/testAuth.helper.ts @@ -9,5 +9,9 @@ export const getAuthToken = async (): Promise => { password: "Password@123", }); + if (response.status !== 200) { + throw new Error(`Failed to authenticate test user: ${JSON.stringify(response.body)}`); + } + return response.body.data?.token || ""; }; \ No newline at end of file diff --git a/server/src/tests/issues/issue.test.ts b/server/src/tests/issues/issue.test.ts new file mode 100644 index 0000000..3c16923 --- /dev/null +++ b/server/src/tests/issues/issue.test.ts @@ -0,0 +1,109 @@ +import request from "supertest"; +import app from "../../app.js"; +import { getAuthToken } from "../helpers/testAuth.helper.js"; +import Member from "../../database/models/Member.js"; +import Book from "../../database/models/Book.js"; +import Issue from "../../database/models/Issue.js"; +import MembershipPlan from "../../database/models/MembershipPlan.js"; + +describe("⚙️ Issues Module - Integration Tests", () => { + let authToken: string; + let testMember: any; + let testBook: any; + let testIssue: any; + let testPlan: any; + + beforeAll(async () => { + authToken = await getAuthToken(); + + + // 1. Create a dummy plan first to satisfy Foreign Key constraints +testPlan = await MembershipPlan.create({ + plan_name: "Test Plan", + price: 1000.00, + duration_days: 30, + max_books_allowed: 5, +} as any); + + // 2. Create a unique member with all mandatory fields + const suffix = Date.now(); + testMember = await Member.create({ + name: `Test Member ${suffix}`, + email: `test${suffix}@example.com`, + membership_status: "ACTIVE", + user_id: "00000000-0000-0000-0000-000000000000", // Replace with valid UUID if needed + membership_plan_id: testPlan.membership_plan_id, + start_date: new Date(), + expiry_date: new Date(Date.now() + 30 * 24 * 60 * 60 * 1000) + } as any); + + testBook = await Book.create({ + title: `Test Book ${suffix}`, + available_copies: 5, + lending_count: 0 + } as any); + + // 3. Create an initial issue + testIssue = await Issue.create({ + member_id: testMember.member_id, + book_id: testBook.book_id, + due_date: new Date() + } as any); + }); + + afterAll(async () => { + // 4. Safe Cleanup: Only destroy if the records were created successfully + if (testIssue) await Issue.destroy({ where: { issue_id: testIssue.issue_id } }); + if (testMember) await Member.destroy({ where: { member_id: testMember.member_id } }); + if (testBook) await Book.destroy({ where: { book_id: testBook.book_id } }); + if (testPlan) await MembershipPlan.destroy({ where: { membership_plan_id: testPlan.membership_plan_id } }); + }); + + describe("POST /api/v1/issues/borrow", () => { + it("✅ Should successfully borrow a book and return 201", async () => { + const response = await request(app) + .post("/api/v1/issues/borrow") + .set("Authorization", `Bearer ${authToken}`) + .send({ + member_id: testMember.member_id, + book_id: testBook.book_id + }); + + expect(response.status).toBe(201); + expect(response.body.success).toBe(true); + expect(response.body.data).toHaveProperty("issue_id"); + }); + + it("❌ Should return 400 if validation fails", async () => { + const response = await request(app) + .post("/api/v1/issues/borrow") + .set("Authorization", `Bearer ${authToken}`) + .send({ member_id: "not-a-uuid" }); + + expect(response.status).toBe(400); + }); + }); + + describe("POST /api/v1/issues/return", () => { + it("✅ Should successfully return a book and return 200", async () => { + const response = await request(app) + .post("/api/v1/issues/return") + .set("Authorization", `Bearer ${authToken}`) + .send({ issue_id: testIssue.issue_id }); + + expect(response.status).toBe(200); + expect(response.body.success).toBe(true); + }); + }); + + describe("GET /api/v1/issues/member/:memberId", () => { + it("✅ Should fetch all issues for a specific member", async () => { + const response = await request(app) + .get(`/api/v1/issues/member/${testMember.member_id}`) + .set("Authorization", `Bearer ${authToken}`); + + expect(response.status).toBe(200); + expect(Array.isArray(response.body.data)).toBe(true); + }); + }); +}); \ No newline at end of file From 4538e02958a91a4c2ecf7cbdabec65f4ae70046c Mon Sep 17 00:00:00 2001 From: Yogeshwaran S Date: Sat, 30 May 2026 13:59:37 +0530 Subject: [PATCH 38/87] fix: modify the seed.sql --- .../src/{docs => database/seeders}/seed.sql | 0 server/src/tests/helpers/testAuth.helper.ts | 19 +++++++++---------- 2 files changed, 9 insertions(+), 10 deletions(-) rename server/src/{docs => database/seeders}/seed.sql (100%) diff --git a/server/src/docs/seed.sql b/server/src/database/seeders/seed.sql similarity index 100% rename from server/src/docs/seed.sql rename to server/src/database/seeders/seed.sql diff --git a/server/src/tests/helpers/testAuth.helper.ts b/server/src/tests/helpers/testAuth.helper.ts index 3d5a917..2c6b54f 100644 --- a/server/src/tests/helpers/testAuth.helper.ts +++ b/server/src/tests/helpers/testAuth.helper.ts @@ -2,16 +2,15 @@ import request from "supertest"; import app from "../../app.js"; export const getAuthToken = async (): Promise => { - const response = await request(app) - .post("/api/v1/auth/login") - .send({ - gmail: "test_master_librarian@gmail.com", - password: "Password@123", - }); + const response = await request(app).post("/api/v1/auth/login").send({ + gmail: "test_master_librarian@gmail.com", + password: "Password@123", + }); - if (response.status !== 200) { - throw new Error(`Failed to authenticate test user: ${JSON.stringify(response.body)}`); + if (response.status !== 200) { + throw new Error( + `Failed to authenticate test user: ${JSON.stringify(response.body)}`, + ); } - return response.body.data?.token || ""; -}; \ No newline at end of file +}; From 4312c2824d6d244b02251df94ddc4e0e3ce1df3c Mon Sep 17 00:00:00 2001 From: Yogeshwaran S Date: Mon, 1 Jun 2026 11:01:48 +0530 Subject: [PATCH 39/87] fix: solved logical mistakes in issue module --- ...260529125140-add-issue-status-to-issues.js | 110 +++++++++++++++--- server/src/database/models/Issue.ts | 1 + server/src/database/seeders/seed.sql | 45 ++++--- server/src/modules/issues/issue.repository.ts | 21 ++-- server/src/modules/issues/issue.routes.ts | 13 ++- server/src/modules/issues/issue.service.ts | 20 +++- server/src/modules/issues/issue.spec.ts | 26 +++-- server/src/modules/issues/issue.types.ts | 12 +- server/src/modules/issues/issue.validation.ts | 8 +- server/src/tests/issues/issue.test.ts | 85 ++++++-------- server/src/tests/runTests.ts | 3 +- 11 files changed, 221 insertions(+), 123 deletions(-) diff --git a/server/src/database/migrations/20260529125140-add-issue-status-to-issues.js b/server/src/database/migrations/20260529125140-add-issue-status-to-issues.js index 7094cd2..601fc3c 100644 --- a/server/src/database/migrations/20260529125140-add-issue-status-to-issues.js +++ b/server/src/database/migrations/20260529125140-add-issue-status-to-issues.js @@ -2,24 +2,108 @@ module.exports = { up: async (queryInterface, Sequelize) => { - // 1. Create the ENUM type in Postgres - await queryInterface.sequelize.query(` - CREATE TYPE "enum_issues_issue_status" AS ENUM ('BORROWED', 'RETURNED', 'OVERDUE'); - `); + // 1. CREATE USERS TABLE + await queryInterface.createTable('users', { + uuid: { type: Sequelize.UUID, primaryKey: true, allowNull: false }, + name: { type: Sequelize.STRING, allowNull: false }, + gmail: { type: Sequelize.STRING, allowNull: false, unique: true }, + password: { type: Sequelize.STRING, allowNull: false }, + phone_number: { type: Sequelize.STRING }, + role: { type: Sequelize.ENUM('READER', 'LIBRARIAN', 'ADMIN'), allowNull: false }, + createdAt: { type: Sequelize.DATE, defaultValue: Sequelize.literal('CURRENT_TIMESTAMP') }, + updatedAt: { type: Sequelize.DATE, defaultValue: Sequelize.literal('CURRENT_TIMESTAMP') } + }); + + // 2. CREATE BOOKS TABLE + await queryInterface.createTable('books', { + book_id: { type: Sequelize.UUID, primaryKey: true, allowNull: false }, + book_name: { type: Sequelize.STRING, allowNull: false }, + book_author: { type: Sequelize.STRING, allowNull: false }, + category_id: { type: Sequelize.UUID, allowNull: true }, + total_copies: { type: Sequelize.INTEGER, defaultValue: 0 }, + available_copies: { type: Sequelize.INTEGER, defaultValue: 0 }, + lending_count: { type: Sequelize.INTEGER, defaultValue: 0 }, + createdAt: { type: Sequelize.DATE, defaultValue: Sequelize.literal('CURRENT_TIMESTAMP') }, + updatedAt: { type: Sequelize.DATE, defaultValue: Sequelize.literal('CURRENT_TIMESTAMP') } + }); + + // 3. CREATE MEMBERS TABLE + await queryInterface.createTable('members', { + member_id: { type: Sequelize.UUID, primaryKey: true, allowNull: false }, + user_id: { + type: Sequelize.UUID, + allowNull: false, + references: { model: 'users', key: 'uuid' }, + onUpdate: 'CASCADE', + onDelete: 'CASCADE' + }, + membership_plan_id: { type: Sequelize.UUID, allowNull: true }, + start_date: { type: Sequelize.DATEONLY }, + expiry_date: { type: Sequelize.DATEONLY }, + membership_status: { type: Sequelize.ENUM('ACTIVE', 'EXPIRED'), allowNull: false }, + createdAt: { type: Sequelize.DATE, defaultValue: Sequelize.literal('CURRENT_TIMESTAMP') }, + updatedAt: { type: Sequelize.DATE, defaultValue: Sequelize.literal('CURRENT_TIMESTAMP') } + }); + + // 4. CREATE ISSUES TABLE + await queryInterface.createTable('issues', { + issue_id: { type: Sequelize.UUID, primaryKey: true, allowNull: false }, + member_id: { + type: Sequelize.UUID, + allowNull: false, + references: { model: 'members', key: 'member_id' }, + onUpdate: 'CASCADE', + onDelete: 'CASCADE' + }, + book_id: { + type: Sequelize.UUID, + allowNull: false, + references: { model: 'books', key: 'book_id' }, + onUpdate: 'CASCADE', + onDelete: 'CASCADE' + }, + borrowed_date: { type: Sequelize.DATEONLY, allowNull: false }, + due_date: { type: Sequelize.DATEONLY, allowNull: false }, + returned_date: { type: Sequelize.DATEONLY, allowNull: true }, + issue_status: { + type: Sequelize.ENUM('BORROWED', 'RETURNED', 'OVERDUE'), + defaultValue: 'BORROWED', + allowNull: false + }, + createdAt: { type: Sequelize.DATE, defaultValue: Sequelize.literal('CURRENT_TIMESTAMP') }, + updatedAt: { type: Sequelize.DATE, defaultValue: Sequelize.literal('CURRENT_TIMESTAMP') } + }); - // 2. Add the column to the table - await queryInterface.addColumn('issues', 'issue_status', { - type: "enum_issues_issue_status", - defaultValue: 'BORROWED', - allowNull: false + // 5. CREATE FINES TABLE + await queryInterface.createTable('fines', { + fine_id: { type: Sequelize.UUID, primaryKey: true, allowNull: false }, + issue_id: { + type: Sequelize.UUID, + allowNull: false, + references: { model: 'issues', key: 'issue_id' }, + onUpdate: 'CASCADE', + onDelete: 'CASCADE' + }, + delayed_days: { type: Sequelize.INTEGER, defaultValue: 0 }, + fine_amount: { type: Sequelize.DECIMAL(10, 2), defaultValue: 0.00 }, + paid_status: { type: Sequelize.BOOLEAN, defaultValue: false }, + paid_date: { type: Sequelize.DATEONLY, allowNull: true }, + createdAt: { type: Sequelize.DATE, defaultValue: Sequelize.literal('CURRENT_TIMESTAMP') }, + updatedAt: { type: Sequelize.DATE, defaultValue: Sequelize.literal('CURRENT_TIMESTAMP') } }); }, down: async (queryInterface, Sequelize) => { - // 1. Remove the column - await queryInterface.removeColumn('issues', 'issue_status'); + // Drop tables in reverse order to avoid foreign key violations + await queryInterface.dropTable('fines'); + await queryInterface.dropTable('issues'); + await queryInterface.dropTable('members'); + await queryInterface.dropTable('books'); + await queryInterface.dropTable('users'); - // 2. Drop the ENUM type - await queryInterface.sequelize.query('DROP TYPE "enum_issues_issue_status";'); + // Clean up Postgres ENUM types explicitly + await queryInterface.sequelize.query('DROP TYPE IF EXISTS "enum_users_role";'); + await queryInterface.sequelize.query('DROP TYPE IF EXISTS "enum_members_membership_status";'); + await queryInterface.sequelize.query('DROP TYPE IF EXISTS "enum_issues_issue_status";'); } }; \ No newline at end of file diff --git a/server/src/database/models/Issue.ts b/server/src/database/models/Issue.ts index 52b9834..3ef2919 100644 --- a/server/src/database/models/Issue.ts +++ b/server/src/database/models/Issue.ts @@ -49,6 +49,7 @@ Issue.init( borrowed_date: { type: DataTypes.DATEONLY, allowNull: false, + defaultValue: DataTypes.NOW }, due_date: { diff --git a/server/src/database/seeders/seed.sql b/server/src/database/seeders/seed.sql index 617d3e1..cd544f9 100644 --- a/server/src/database/seeders/seed.sql +++ b/server/src/database/seeders/seed.sql @@ -167,35 +167,32 @@ INSERT INTO books (book_id, book_name, book_author, category_id, total_copies, a -- ============================================================================= -- 3. SEEDING 20 ISSUES -- ============================================================================= - -INSERT INTO issues (issue_id, member_id, book_id, borrowed_date, due_date, returned_date) VALUES +INSERT INTO issues (issue_id, member_id, book_id, borrowed_date, due_date, returned_date, issue_status) VALUES -- 10 Books returned historically -('40000001-4444-4444-a444-444444444401', '20000001-2222-4222-a222-222222222201', 'b0000001-3333-4333-a333-333333333301', '2026-05-01', '2026-05-15', '2026-05-14'), -('40000002-4444-4444-a444-444444444402', '20000002-2222-4222-a222-222222222202', 'b0000002-3333-4333-a333-333333333302', '2026-05-02', '2026-05-16', '2026-05-16'), -('40000003-4444-4444-a444-444444444403', '20000011-2222-4222-a222-222222222211', 'b0000011-3333-4333-a333-333333333311', '2026-05-03', '2026-05-17', '2026-05-15'), -('40000004-4444-4444-a444-444444444404', '20000012-2222-4222-a222-222222222212', 'b0000012-3333-4333-a333-333333333312', '2026-05-04', '2026-05-18', '2026-05-18'), -('40000005-4444-4444-a444-444444444405', '20000026-2222-4222-a222-222222222226', 'b0000021-3333-4333-a333-333333333321', '2026-05-05', '2026-05-19', '2026-05-17'), -('40000006-4444-4444-a444-444444444406', '20000027-2222-4222-a222-222222222227', 'b0000022-3333-4333-a333-333333333322', '2026-05-06', '2026-05-20', '2026-05-20'), -('40000007-4444-4444-a444-444444444407', '20000003-2222-4222-a222-222222222203', 'b0000031-3333-4333-a333-333333333331', '2026-05-07', '2026-05-21', '2026-05-20'), -('40000008-4444-4444-a444-444444444408', '20000013-2222-4222-a222-222222222213', 'b0000032-3333-4333-a333-333333333332', '2026-05-08', '2026-05-22', '2026-05-22'), -('40000009-4444-4444-a444-444444444409', '20000028-2222-4222-a222-222222222228', 'b0000041-3333-4333-a333-333333333341', '2026-05-09', '2026-05-23', '2026-05-21'), -('40000010-4444-4444-a444-444444444410', '20000004-2222-4222-a222-222222222204', 'b0000042-3333-4333-a333-333333333342', '2026-05-10', '2026-05-24', '2026-05-24'), +('40000001-4444-4444-a444-444444444401', '20000001-2222-4222-a222-222222222201', 'b0000001-3333-4333-a333-333333333301', '2026-05-01', '2026-05-15', '2026-05-14', 'RETURNED'), +('40000002-4444-4444-a444-444444444402', '20000002-2222-4222-a222-222222222202', 'b0000002-3333-4333-a333-333333333302', '2026-05-02', '2026-05-16', '2026-05-16', 'RETURNED'), +('40000003-4444-4444-a444-444444444403', '20000011-2222-4222-a222-222222222211', 'b0000011-3333-4333-a333-333333333311', '2026-05-03', '2026-05-17', '2026-05-15', 'RETURNED'), +('40000004-4444-4444-a444-444444444404', '20000012-2222-4222-a222-222222222212', 'b0000012-3333-4333-a333-333333333312', '2026-05-04', '2026-05-18', '2026-05-18', 'RETURNED'), +('40000005-4444-4444-a444-444444444405', '20000026-2222-4222-a222-222222222226', 'b0000021-3333-4333-a333-333333333321', '2026-05-05', '2026-05-19', '2026-05-17', 'RETURNED'), +('40000006-4444-4444-a444-444444444406', '20000027-2222-4222-a222-222222222227', 'b0000022-3333-4333-a333-333333333322', '2026-05-06', '2026-05-20', '2026-05-20', 'RETURNED'), +('40000007-4444-4444-a444-444444444407', '20000003-2222-4222-a222-222222222203', 'b0000031-3333-4333-a333-333333333331', '2026-05-07', '2026-05-21', '2026-05-20', 'RETURNED'), +('40000008-4444-4444-a444-444444444408', '20000013-2222-4222-a222-222222222213', 'b0000032-3333-4333-a333-333333333332', '2026-05-08', '2026-05-22', '2026-05-22', 'RETURNED'), +('40000009-4444-4444-a444-444444444409', '20000028-2222-4222-a222-222222222228', 'b0000041-3333-4333-a333-333333333341', '2026-05-09', '2026-05-23', '2026-05-21', 'RETURNED'), +('40000010-4444-4444-a444-444444444410', '20000004-2222-4222-a222-222222222204', 'b0000042-3333-4333-a333-333333333342', '2026-05-10', '2026-05-24', '2026-05-24', 'RETURNED'), -- 5 Books active and currently overdue (with fine tracking mappings) -('40000011-4444-4444-a444-444444444411', '20000005-2222-4222-a222-222222222205', 'b0000003-3333-4333-a333-333333333303', '2026-05-01', '2026-05-15', NULL), -('40000012-4444-4444-a444-444444444412', '20000014-2222-4222-a222-222222222214', 'b0000013-3333-4333-a333-333333333313', '2026-05-02', '2026-05-16', NULL), -('40000013-4444-4444-a444-444444444413', '20000029-2222-4222-a222-222222222229', 'b0000023-3333-4333-a333-333333333323', '2026-05-03', '2026-05-17', NULL), -('40000014-4444-4444-a444-444444444414', '20000006-2222-4222-a222-222222222206', 'b0000033-3333-4333-a333-333333333333', '2026-05-04', '2026-05-18', NULL), -('40000015-4444-4444-a444-444444444415', '20000015-2222-4222-a222-222222222215', 'b0000043-3333-4333-a333-333333333343', '2026-05-05', '2026-05-19', NULL), +('40000011-4444-4444-a444-444444444411', '20000005-2222-4222-a222-222222222205', 'b0000003-3333-4333-a333-333333333303', '2026-05-01', '2026-05-15', NULL, 'OVERDUE'), +('40000012-4444-4444-a444-444444444412', '20000014-2222-4222-a222-222222222214', 'b0000013-3333-4333-a333-333333333313', '2026-05-02', '2026-05-16', NULL, 'OVERDUE'), +('40000013-4444-4444-a444-444444444413', '20000029-2222-4222-a222-222222222229', 'b0000023-3333-4333-a333-333333333323', '2026-05-03', '2026-05-17', NULL, 'OVERDUE'), +('40000014-4444-4444-a444-444444444414', '20000006-2222-4222-a222-222222222206', 'b0000033-3333-4333-a333-333333333333', '2026-05-04', '2026-05-18', NULL, 'OVERDUE'), +('40000015-4444-4444-a444-444444444415', '20000015-2222-4222-a222-222222222215', 'b0000043-3333-4333-a333-333333333343', '2026-05-05', '2026-05-19', NULL, 'OVERDUE'), -- 5 Books active and within borrowing duration limit rules -('40000016-4444-4444-a444-444444444416', '20000030-2222-4222-a222-222222222230', 'b0000004-3333-4333-a333-333333333304', '2026-05-20', '2026-06-03', NULL), -('40000017-4444-4444-a444-444444444417', '20000007-2222-4222-a222-222222222207', 'b0000014-3333-4333-a333-333333333314', '2026-05-21', '2026-06-04', NULL), -('40000018-4444-4444-a444-444444444418', '20000016-2222-4222-a222-222222222216', 'b0000024-3333-4333-a333-333333333324', '2026-05-22', '2026-06-05', NULL), -('40000019-4444-4444-a444-444444444419', '20000031-2222-4222-a222-222222222231', 'b0000034-3333-4333-a333-333333333334', '2026-05-23', '2026-06-06', NULL), -('40000020-4444-4444-a444-444444444420', '20000008-2222-4222-a222-222222222208', 'b0000044-3333-4333-a333-333333333344', '2026-05-24', '2026-06-07', NULL); - - +('40000016-4444-4444-a444-444444444416', '20000030-2222-4222-a222-222222222230', 'b0000004-3333-4333-a333-333333333304', '2026-05-20', '2026-06-03', NULL, 'BORROWED'), +('40000017-4444-4444-a444-444444444417', '20000007-2222-4222-a222-222222222207', 'b0000014-3333-4333-a333-333333333314', '2026-05-21', '2026-06-04', NULL, 'BORROWED'), +('40000018-4444-4444-a444-444444444418', '20000016-2222-4222-a222-222222222216', 'b0000024-3333-4333-a333-333333333324', '2026-05-22', '2026-06-05', NULL, 'BORROWED'), +('40000019-4444-4444-a444-444444444419', '20000031-2222-4222-a222-222222222231', 'b0000034-3333-4333-a333-333333333334', '2026-05-23', '2026-06-06', NULL, 'BORROWED'), +('40000020-4444-4444-a444-444444444420', '20000008-2222-4222-a222-222222222208', 'b0000044-3333-4333-a333-333333333344', '2026-05-24', '2026-06-07', NULL, 'BORROWED'); -- ============================================================================= -- 4. SEEDING 5 FINES -- ============================================================================= diff --git a/server/src/modules/issues/issue.repository.ts b/server/src/modules/issues/issue.repository.ts index 075430a..87be895 100644 --- a/server/src/modules/issues/issue.repository.ts +++ b/server/src/modules/issues/issue.repository.ts @@ -1,22 +1,25 @@ import Issue from "../../database/models/Issue.js"; import { CreationAttributes } from "sequelize"; + class IssueRepository { + // 💻 FIX: Expanded types to accept borrowed_date and status assignment async createIssue(data: { member_id: string; book_id: string; + borrowed_date: Date; due_date: Date; }) { - return Issue.create(data as CreationAttributes); + return Issue.create({ + ...data, + issue_status: "BORROWED" // Explicitly tracking current status + } as CreationAttributes); } async findIssueById(issue_id: string) { return Issue.findByPk(issue_id); } - async getActiveIssue( - member_id: string, - book_id: string - ) { + async getActiveIssue(member_id: string, book_id: string) { return Issue.findOne({ where: { member_id, @@ -26,13 +29,12 @@ class IssueRepository { }); } - async returnBook( - issue_id: string, - returned_date: Date - ) { + async returnBook(issue_id: string, returned_date: Date) { + // 💻 FIX: Update both returned_date AND status enum flags cleanly together await Issue.update( { returned_date, + issue_status: "RETURNED", }, { where: { @@ -49,7 +51,6 @@ class IssueRepository { where: { member_id, }, - order: [["created_at", "DESC"]], }); } diff --git a/server/src/modules/issues/issue.routes.ts b/server/src/modules/issues/issue.routes.ts index 0e9be5e..5552b00 100644 --- a/server/src/modules/issues/issue.routes.ts +++ b/server/src/modules/issues/issue.routes.ts @@ -90,22 +90,21 @@ * 401: * description: Unauthorized token verification failure */ - import { Router } from "express"; - import auth from "../../middlewares/auth.js"; - import validate from "../../middlewares/validate.js"; import { borrowBookController, getMemberIssuesController, returnBookController, + // overdueIssuesController // 👈 Import this once you build its logic! } from "./issue.controller.js"; import { createIssueSchema, returnBookSchema, + getMemberIssuesSchema, // ✨ Added parameter validation } from "./issue.validation.js"; const router = Router(); @@ -127,7 +126,15 @@ router.post( router.get( "/member/:memberId", auth, + validate(getMemberIssuesSchema), // ✨ Added validation middleware check here getMemberIssuesController ); +// ✨ FIXED: Added missing route discovered during Swagger audit +router.get( + "/overdue", + auth, + // overdueIssuesController +); + export default router; \ No newline at end of file diff --git a/server/src/modules/issues/issue.service.ts b/server/src/modules/issues/issue.service.ts index 929a80d..39f8758 100644 --- a/server/src/modules/issues/issue.service.ts +++ b/server/src/modules/issues/issue.service.ts @@ -67,12 +67,15 @@ class IssueService { throw new AppError("Book already borrowed and not returned yet", httpStatus.BAD_REQUEST); } + const borrowed_date = new Date(); // 💻 FIX: Define transaction date const due_date = new Date(); due_date.setDate(due_date.getDate() + 14); + // 💻 FIX: Pass the borrowed_date down to repository layer const issue = await issueRepository.createIssue({ member_id, book_id, + borrowed_date, due_date, }); @@ -124,12 +127,17 @@ class IssueService { const delayed_days = Math.ceil(difference / (1000 * 60 * 60 * 24)); const fine_amount = delayed_days * 10; - await Fine.create({ - issue_id: issue.issue_id, - delayed_days, - fine_amount, - paid_status: false, - } as CreationAttributes); + // 💻 FIX: Uses findOrCreate to prevent SequelizeUniqueConstraintError + // if seed data already maps an initial fine entry against this issue_id + await Fine.findOrCreate({ + where: { issue_id: issue.issue_id }, + defaults: { + issue_id: issue.issue_id, + delayed_days, + fine_amount, + paid_status: false, + } as CreationAttributes + }); } return updatedIssue; diff --git a/server/src/modules/issues/issue.spec.ts b/server/src/modules/issues/issue.spec.ts index 62d69d1..663e298 100644 --- a/server/src/modules/issues/issue.spec.ts +++ b/server/src/modules/issues/issue.spec.ts @@ -182,7 +182,9 @@ describe("⚙️ Issues Module - Unit Tests (Service Layer)", () => { jest.spyOn(issueRepository, "returnBook").mockResolvedValue({ issue_id: issueId, returned_date: new Date() } as any); jest.spyOn(Book, "findByPk").mockResolvedValue({ book_id: bookId, available_copies: 2 } as any); const bookUpdateSpy = jest.spyOn(Book, "update").mockResolvedValue([1]); - const fineCreateSpy = jest.spyOn(Fine, "create").mockResolvedValue({} as any); + + // 💻 FIX: Mock findOrCreate instead of create + const fineFindOrCreateSpy = jest.spyOn(Fine, "findOrCreate").mockResolvedValue([{} as any, true]); const result = await issueService.returnBook(issueId); @@ -190,11 +192,11 @@ describe("⚙️ Issues Module - Unit Tests (Service Layer)", () => { { available_copies: 3 }, { where: { book_id: bookId } } ); - expect(fineCreateSpy).not.toHaveBeenCalled(); + expect(fineFindOrCreateSpy).not.toHaveBeenCalled(); expect(result).toHaveProperty("issue_id", issueId); }); - it("⚠️ Should generate a cash fine record when returned after the due_date limit", async () => { + it("⚠️ Should generate a cash fine record when returned after the due_date limit", async () => { // 1. Freeze time jest.useFakeTimers(); const now = new Date('2026-01-05T12:00:00Z'); @@ -212,15 +214,21 @@ describe("⚙️ Issues Module - Unit Tests (Service Layer)", () => { jest.spyOn(issueRepository, "returnBook").mockResolvedValue({ issue_id: issueId, returned_date: now } as any); jest.spyOn(Book, "findByPk").mockResolvedValue({ book_id: bookId, available_copies: 2 } as any); jest.spyOn(Book, "update").mockResolvedValue([1]); - const fineCreateSpy = jest.spyOn(Fine, "create").mockResolvedValue({} as any); + + // 💻 FIX: Mock findOrCreate and structure return payload as an execution array tuple + const fineFindOrCreateSpy = jest.spyOn(Fine, "findOrCreate").mockResolvedValue([{} as any, true]); await issueService.returnBook(issueId); - expect(fineCreateSpy).toHaveBeenCalledWith({ - issue_id: issueId, - delayed_days: 3, // Now it will be exactly 3 - fine_amount: 30, - paid_status: false, + // 💻 FIX: Verify findOrCreate is targeted with accurate matching parameter objects + expect(fineFindOrCreateSpy).toHaveBeenCalledWith({ + where: { issue_id: issueId }, + defaults: { + issue_id: issueId, + delayed_days: 3, + fine_amount: 30, + paid_status: false, + }, }); // 2. Cleanup diff --git a/server/src/modules/issues/issue.types.ts b/server/src/modules/issues/issue.types.ts index 926ee0b..b2e1f52 100644 --- a/server/src/modules/issues/issue.types.ts +++ b/server/src/modules/issues/issue.types.ts @@ -1,8 +1,6 @@ -export interface CreateIssuePayload { - member_id: string; - book_id: string; -} +import { z } from "zod"; +import { createIssueSchema, returnBookSchema } from "./issue.validation.js"; -export interface ReturnBookPayload { - issue_id: string; -} \ No newline at end of file +// ✨ Pro-Tip: Automatically infers types directly from your schemas +export type CreateIssuePayload = z.infer["body"]; +export type ReturnBookPayload = z.infer["body"]; \ No newline at end of file diff --git a/server/src/modules/issues/issue.validation.ts b/server/src/modules/issues/issue.validation.ts index 9d73842..f3180ab 100644 --- a/server/src/modules/issues/issue.validation.ts +++ b/server/src/modules/issues/issue.validation.ts @@ -3,7 +3,6 @@ import { z } from "zod"; export const createIssueSchema = z.object({ body: z.object({ member_id: z.uuid(), - book_id: z.uuid(), }), }); @@ -12,4 +11,11 @@ export const returnBookSchema = z.object({ body: z.object({ issue_id: z.uuid(), }), +}); + +// ✨ ADDED: Validates route path parameters safely +export const getMemberIssuesSchema = z.object({ + params: z.object({ + memberId: z.uuid(), + }), }); \ No newline at end of file diff --git a/server/src/tests/issues/issue.test.ts b/server/src/tests/issues/issue.test.ts index 3c16923..66285bc 100644 --- a/server/src/tests/issues/issue.test.ts +++ b/server/src/tests/issues/issue.test.ts @@ -1,62 +1,46 @@ import request from "supertest"; import app from "../../app.js"; import { getAuthToken } from "../helpers/testAuth.helper.js"; -import Member from "../../database/models/Member.js"; -import Book from "../../database/models/Book.js"; import Issue from "../../database/models/Issue.js"; -import MembershipPlan from "../../database/models/MembershipPlan.js"; describe("⚙️ Issues Module - Integration Tests", () => { let authToken: string; - let testMember: any; - let testBook: any; - let testIssue: any; - let testPlan: any; + let newlyBorrowedIssueId: string; + + // Constants mapping directly to your provided SQL seed data + const SEED_MEMBER_ID = "20000001-2222-4222-a222-222222222201"; // Historically returned member + const SEED_BOOK_ID = "b0000001-3333-4333-a333-333333333301"; // Historically returned book (available) + + const ACTIVE_ISSUE_MEMBER_ID = "20000030-2222-4222-a222-222222222230"; // From row 16 + const ACTIVE_ISSUE_ID = "40000016-4444-4444-a444-444444444416"; // From row 16 (Clean item with NO pre-existing fine record) beforeAll(async () => { authToken = await getAuthToken(); - - // 1. Create a dummy plan first to satisfy Foreign Key constraints -testPlan = await MembershipPlan.create({ - plan_name: "Test Plan", - price: 1000.00, - duration_days: 30, - max_books_allowed: 5, -} as any); - - // 2. Create a unique member with all mandatory fields - const suffix = Date.now(); - testMember = await Member.create({ - name: `Test Member ${suffix}`, - email: `test${suffix}@example.com`, - membership_status: "ACTIVE", - user_id: "00000000-0000-0000-0000-000000000000", // Replace with valid UUID if needed - membership_plan_id: testPlan.membership_plan_id, - start_date: new Date(), - expiry_date: new Date(Date.now() + 30 * 24 * 60 * 60 * 1000) - } as any); - - testBook = await Book.create({ - title: `Test Book ${suffix}`, - available_copies: 5, - lending_count: 0 - } as any); - - // 3. Create an initial issue - testIssue = await Issue.create({ - member_id: testMember.member_id, - book_id: testBook.book_id, - due_date: new Date() - } as any); + // Ensure the target row is reset back to active BORROWED status before running tests + await Issue.update( + { + returned_date: null, + issue_status: "BORROWED" + }, + { where: { issue_id: ACTIVE_ISSUE_ID } } + ); }); afterAll(async () => { - // 4. Safe Cleanup: Only destroy if the records were created successfully - if (testIssue) await Issue.destroy({ where: { issue_id: testIssue.issue_id } }); - if (testMember) await Member.destroy({ where: { member_id: testMember.member_id } }); - if (testBook) await Book.destroy({ where: { book_id: testBook.book_id } }); - if (testPlan) await MembershipPlan.destroy({ where: { membership_plan_id: testPlan.membership_plan_id } }); + // Clean up only the entry generated dynamically by our borrow route test execution + if (newlyBorrowedIssueId) { + await Issue.destroy({ where: { issue_id: newlyBorrowedIssueId } }); + } + + // Reset our seed test row back to its default state for subsequent runs + await Issue.update( + { + returned_date: null, + issue_status: "BORROWED" + }, + { where: { issue_id: ACTIVE_ISSUE_ID } } + ); }); describe("POST /api/v1/issues/borrow", () => { @@ -65,13 +49,16 @@ testPlan = await MembershipPlan.create({ .post("/api/v1/issues/borrow") .set("Authorization", `Bearer ${authToken}`) .send({ - member_id: testMember.member_id, - book_id: testBook.book_id + member_id: SEED_MEMBER_ID, + book_id: SEED_BOOK_ID }); expect(response.status).toBe(201); expect(response.body.success).toBe(true); expect(response.body.data).toHaveProperty("issue_id"); + + // Preserve id dynamically so afterAll hook drops it from test environment tables + newlyBorrowedIssueId = response.body.data.issue_id; }); it("❌ Should return 400 if validation fails", async () => { @@ -89,7 +76,7 @@ testPlan = await MembershipPlan.create({ const response = await request(app) .post("/api/v1/issues/return") .set("Authorization", `Bearer ${authToken}`) - .send({ issue_id: testIssue.issue_id }); + .send({ issue_id: ACTIVE_ISSUE_ID }); expect(response.status).toBe(200); expect(response.body.success).toBe(true); @@ -99,7 +86,7 @@ testPlan = await MembershipPlan.create({ describe("GET /api/v1/issues/member/:memberId", () => { it("✅ Should fetch all issues for a specific member", async () => { const response = await request(app) - .get(`/api/v1/issues/member/${testMember.member_id}`) + .get(`/api/v1/issues/member/${ACTIVE_ISSUE_MEMBER_ID}`) .set("Authorization", `Bearer ${authToken}`); expect(response.status).toBe(200); diff --git a/server/src/tests/runTests.ts b/server/src/tests/runTests.ts index 9f1d6ab..b2935a7 100644 --- a/server/src/tests/runTests.ts +++ b/server/src/tests/runTests.ts @@ -35,8 +35,9 @@ async function bootstrapSuite() { console.log('\n🧹 [Test Runner]: Beginning post-suite database cleanup...'); try { // 4. Clean up any dynamic test accounts + // In src/tests/runTests.ts - Make this surgical instead of a global wildcard match await User.destroy({ - where: { gmail: { [Op.like]: 'test_%' } }, + where: { gmail: 'test_master_librarian@gmail.com' }, force: true }); console.log('🗑️ [Test Runner]: Test records safely purged.'); From a97523220192920734521c5fc8dd7a4ea76ad3e7 Mon Sep 17 00:00:00 2001 From: Yogeshwaran S Date: Mon, 1 Jun 2026 12:14:58 +0530 Subject: [PATCH 40/87] fix: solved logical mistakes in member module --- server/src/tests/members/member.test.ts | 160 +++++++++--------------- 1 file changed, 62 insertions(+), 98 deletions(-) diff --git a/server/src/tests/members/member.test.ts b/server/src/tests/members/member.test.ts index 13c630b..928ceb1 100644 --- a/server/src/tests/members/member.test.ts +++ b/server/src/tests/members/member.test.ts @@ -1,9 +1,9 @@ import "@jest/globals"; import request from "supertest"; import httpStatus from "http-status-codes"; +import sequelize from "../../database/connection/database.js"; const { default: app } = await import("../../app.js"); -const { generateToken } = await import("../../utils/jwt.js"); const { default: Member } = await import("../../database/models/Member.js"); const { default: User } = await import("../../database/models/User.js"); const { default: MembershipPlan } = await import("../../database/models/MembershipPlan.js"); @@ -11,43 +11,43 @@ const { getAuthToken } = await import("../helpers/testAuth.helper.js"); describe("Member Module (End-to-End Integration Tests)", () => { let mockLibrarianToken: string = ""; - let validUserUuid: string = ""; + let testUserUuid: string = ""; let validPlanUuid: string = ""; - -beforeAll(async () => { + let sharedMemberId: string = ""; // 🔑 Passes the created member ID down the pipeline + + beforeAll(async () => { + // 1. Get the Librarian token for authorization mockLibrarianToken = await getAuthToken(); - const user = await User.findOne(); - if (!user) { - throw new Error("❌ Test Setup Failure: Zero records found in the Users table."); - } - - console.log("💎 SEEDED USER DATABASE DATA CORES:", user.toJSON()); - - // 🔑 ROOT CAUSE FIX: Dynamically read the real UUID property from the seeded database record - validUserUuid = (user.get("uuid") || user.get("user_id") || user.get("id") || (user as any).uuid) as string; - + // 2. Safely grab an existing, real seeded plan const plan = await MembershipPlan.findOne(); if (!plan) { throw new Error("❌ Test Setup Failure: Zero records found in the MembershipPlans table."); } - - console.log("💎 SEEDED PLAN DATABASE DATA CORES:", plan.toJSON()); - - // 🔑 ROOT CAUSE FIX: Dynamically read the real Plan UUID property from the seeded database record validPlanUuid = (plan.get("membership_plan_id") || plan.get("id") || (plan as any).membership_plan_id) as string; - // Safety fallback only triggered if both database properties are totally missing - if (!validUserUuid || !validPlanUuid) { - console.log("🚨 VARIABLE ASSIGNMENT WARNING - Fallback triggered due to undefined fields"); - validUserUuid = "10000001-1111-4111-a111-111111111111"; - validPlanUuid = "173233e3-d14a-4008-a269-98eab1699eef"; + // 3. Create EXACTLY ONE clean test User (Reader) for this suite run + const temporaryUser = await User.create({ + name: "Integration Test Reader", + gmail: `test.reader.${Date.now()}@gmail.com`, + password: "$2b$10$EixVaKV3ws1vEPb9JIJ40uN40Z9J0.W8Sshm68661vV3a6.83qbyG", // dummy hash + role: "READER" + } as any); + + testUserUuid = (temporaryUser.get("uuid") || temporaryUser.get("id") || (temporaryUser as any).uuid) as string; + console.log("🚀 Created isolated test user for lifecycle pipeline:", testUserUuid); + }); + + afterAll(async () => { + // Clean up in reverse order of foreign key dependency + if (sharedMemberId) { + await Member.destroy({ where: { member_id: sharedMemberId } }).catch(() => {}); + } + if (testUserUuid) { + await User.destroy({ where: { uuid: testUserUuid } }).catch(() => {}); + console.log("🧹 Cleanly purged test user and associated rows from database."); } -}); - beforeEach(async () => { - // Clear old test rows to maintain a completely isolated test state - // await Member.destroy({ where: {}, truncate: true, cascade: true }); - await Member.destroy({ where: {} }); + await sequelize.close(); }); // ========================================== @@ -59,15 +59,14 @@ beforeAll(async () => { expect(response.status).toBe(httpStatus.UNAUTHORIZED); }); }); + // ========================================== - // POST + // 📥 POST (Step 1: Create) // ========================================== - describe("📥 POST /api/v1/members", () => { it("🟢 Happy Path: Should cleanly register a member with valid tracking payloads", async () => { - const validPayload = { - user_id: validUserUuid, + user_id: testUserUuid, membership_plan_id: validPlanUuid, start_date: "2026-05-29", expiry_date: "2026-06-28" @@ -76,31 +75,22 @@ beforeAll(async () => { const response = await request(app) .post("/api/v1/members") .set("Authorization", `Bearer ${mockLibrarianToken}`) - .set("Content-Type", "application/json") // 👈 FORCE JSON HEADER - .set("Accept", "application/json") // 👈 FORCE ACCEPT HEADER - .send(JSON.stringify(validPayload)); // 👈 EXPLICIT STRINGIFY - - if (response.status !== 201) { - console.log("🔴 DESTINATION LAYER ERROR DETAILS:", JSON.stringify(response.body, null, 2)); - } + .set("Content-Type", "application/json") + .send(JSON.stringify(validPayload)); expect(response.status).toBe(httpStatus.CREATED); + + // Save this ID to use across all remaining test cases + sharedMemberId = response.body.data?.member_id || response.body.data?.id; + expect(sharedMemberId).toBeDefined(); }); }); // ========================================== - // 📤 GET / (Fetch & Auto-Expire Evaluator) + // 📤 GET (Step 2: Fetch list & Evaluate Auto-Expire) // ========================================== describe("📤 GET /api/v1/members", () => { it("🟢 Happy Path: Should fetch paginated records and accurately serialize meta payloads", async () => { - await Member.create({ - user_id: validUserUuid, - membership_plan_id: validPlanUuid, - start_date: new Date(), - expiry_date: new Date(Date.now() + 1000 * 60 * 60 * 24 * 30), - membership_status: "ACTIVE", - } as any); - const response = await request(app) .get("/api/v1/members") .set("Authorization", `Bearer ${mockLibrarianToken}`) @@ -108,31 +98,22 @@ beforeAll(async () => { expect(response.status).toBe(httpStatus.OK); - // SAFE EVALUATION: Handles response patterns with root meta objects or inside nested fields - if (response.body.meta) { - expect(response.body.meta.total).toBe(1); - } else if (response.body.data && response.body.data.meta) { - expect(response.body.data.meta.total).toBe(1); - } - - // const targetData = Array.isArray(response.body.data) ? response.body.data : response.body; - // expect(Array.isArray(targetData)).toBe(true); - const targetData = response.body.data?.data || response.body.data || response.body; expect(Array.isArray(targetData)).toBe(true); }); it("⚡ Business Rule Validation: Should convert status to EXPIRED via Repository layer optimization", async () => { - const expiredRecord = await Member.create({ - user_id: validUserUuid, - membership_plan_id: validPlanUuid, - start_date: new Date("2025-01-01"), - expiry_date: new Date("2025-12-31"), - membership_status: "ACTIVE", - } as any); - - const targetId = (expiredRecord as any).member_id || (expiredRecord as any).id; - + // Artificially age our shared test member in the DB to push them into the past + await Member.update( + { + start_date: new Date("2025-01-01"), + expiry_date: new Date("2025-12-31"), + membership_status: "ACTIVE" + }, + { where: { member_id: sharedMemberId } } + ); + + // Call GET endpoint to trigger the system's dynamic expiration evaluation hooks const response = await request(app) .get("/api/v1/members") .set("Authorization", `Bearer ${mockLibrarianToken}`) @@ -140,13 +121,14 @@ beforeAll(async () => { expect(response.status).toBe(httpStatus.OK); - const updatedRecord = await Member.findByPk(targetId); + // Verify that the record flipped to EXPIRED automatically + const updatedRecord = await Member.findByPk(sharedMemberId); expect(updatedRecord?.membership_status).toBe("EXPIRED"); }); }); // ========================================== - // 🔍 GET /:id (Retrieve Single Record) + // 🔍 GET /:id (Step 3: Single Read Check) // ========================================== describe("🔍 GET /api/v1/members/:id", () => { it("🔴 Sad Path: Should throw 404 AppError exception if member identifier does not exist", async () => { @@ -160,26 +142,14 @@ beforeAll(async () => { }); // ========================================== - // 🔧 PATCH /:id (Update Member) + // 🔧 PATCH /:id (Step 4: Update) // ========================================== describe("🔧 PATCH /api/v1/members/:id", () => { it("🟢 Happy Path: Should modify properties smoothly if targeting existing profiles", async () => { - const existing = await Member.create({ - user_id: validUserUuid, - membership_plan_id: validPlanUuid, - start_date: new Date(), - expiry_date: new Date(Date.now() + 1000 * 60 * 60 * 24 * 10), - membership_status: "ACTIVE", - } as any); - - const targetId = (existing as any).member_id || (existing as any).id; - const response = await request(app) - .patch(`/api/v1/members/${targetId}`) + .patch(`/api/v1/members/${sharedMemberId}`) .set("Authorization", `Bearer ${mockLibrarianToken}`) - .send({ membership_status: "ACTIVE" }); - - + .send({ membership_status: "ACTIVE" }); // Restore status back to active expect(response.status).toBe(httpStatus.OK); @@ -189,29 +159,23 @@ beforeAll(async () => { }); // ========================================== - // 🗑️ DELETE /:id (Remove Registry Element) + // 🗑️ DELETE /:id (Step 5: Clean Registry Element) // ========================================== describe("🗑️ DELETE /api/v1/members/:id", () => { it("🟢 Happy Path: Should drop record cleanly from database", async () => { - const deleteTarget = await Member.create({ - user_id: validUserUuid, - membership_plan_id: validPlanUuid, - start_date: new Date(), - expiry_date: new Date(Date.now() + 1000 * 60 * 60 * 24 * 10), - membership_status: "ACTIVE", - } as any); - - const targetId = (deleteTarget as any).member_id || (deleteTarget as any).id; - const response = await request(app) - .delete(`/api/v1/members/${targetId}`) + .delete(`/api/v1/members/${sharedMemberId}`) .set("Authorization", `Bearer ${mockLibrarianToken}`) .send(); expect(response.status).toBe(httpStatus.OK); - const doubleCheck = await Member.findByPk(targetId); + // Verify it is gone completely from the table + const doubleCheck = await Member.findByPk(sharedMemberId); expect(doubleCheck).toBeNull(); + + // Clear out the tracking ID string since it's already deleted + sharedMemberId = ""; }); }); }); \ No newline at end of file From 406718c0ebfb94139a2f0bbb80799e428cafe1f6 Mon Sep 17 00:00:00 2001 From: Yogeshwaran S Date: Mon, 1 Jun 2026 13:15:45 +0530 Subject: [PATCH 41/87] fix: solved logical mistakes in issue module --- server/src/modules/books/book.spec.ts | 139 +++++++++++++++---- server/src/modules/fines/fine.controller.ts | 138 ++++++++----------- server/src/modules/fines/fine.repository.ts | 39 +++--- server/src/modules/fines/fine.routes.ts | 32 +---- server/src/modules/fines/fine.service.ts | 46 ++----- server/src/modules/fines/fine.spec.ts | 104 +++++++++++++++ server/src/modules/fines/fine.validation.ts | 2 +- server/src/tests/books/book.test.ts | 91 +++++++------ server/src/tests/fines/fine.test.ts | 140 ++++++++++++++++++++ server/src/tests/issues/issue.test.ts | 22 ++- 10 files changed, 512 insertions(+), 241 deletions(-) create mode 100644 server/src/modules/fines/fine.spec.ts create mode 100644 server/src/tests/fines/fine.test.ts diff --git a/server/src/modules/books/book.spec.ts b/server/src/modules/books/book.spec.ts index fb5be70..2fd1d89 100644 --- a/server/src/modules/books/book.spec.ts +++ b/server/src/modules/books/book.spec.ts @@ -2,11 +2,14 @@ import { jest } from "@jest/globals"; import httpStatus from "http-status-codes"; import AppError from "../../utils/AppError.js"; -// 1. Mock modules using the ESM-compliant mock module system +// 1. Mock modules using the ESM-compliant mock module system (Fully expanded for all methods) jest.unstable_mockModule("./book.repository.js", () => ({ default: { createBook: jest.fn(), + getBooks: jest.fn(), getBookById: jest.fn(), + updateBook: jest.fn(), + deleteBook: jest.fn(), } })); @@ -24,46 +27,47 @@ const { default: Category } = await import("../../database/models/Category.js"); // 3. Cast them safely using the single generic function signature const mockedFindByPk = Category.findByPk as unknown as jest.Mock<(...args: any[]) => any>; const mockedCreateBook = bookRepository.createBook as unknown as jest.Mock<(...args: any[]) => any>; +const mockedGetBooks = bookRepository.getBooks as unknown as jest.Mock<(...args: any[]) => any>; const mockedGetBookById = bookRepository.getBookById as unknown as jest.Mock<(...args: any[]) => any>; +const mockedUpdateBook = bookRepository.updateBook as unknown as jest.Mock<(...args: any[]) => any>; +const mockedDeleteBook = bookRepository.deleteBook as unknown as jest.Mock<(...args: any[]) => any>; describe("🧪 Books Service Unit Tests (Isolated System Logic)", () => { afterEach(() => { jest.clearAllMocks(); }); - describe("createBook Context", () => { - const mockPayload = { - book_name: "Test Execution Suite", - book_author: "Jest Expert", - category_id: "a3fa8d20-fa21-11ee-8391-4321abcdef12", - total_copies: 3, - }; + const mockBookId = "b1111111-fa21-11ee-8391-4321abcdef12"; + const mockCategoryId = "a3fa8d20-fa21-11ee-8391-4321abcdef12"; + + const mockBookRecord = { + book_id: mockBookId, + book_name: "Test Execution Suite", + book_author: "Jest Expert", + category_id: mockCategoryId, + total_copies: 3, + available_copies: 3, + }; + // ========================================== + // 🟢 1. createBook Context + // ========================================== + describe("createBook Context", () => { it("✔ Should call repository layer once valid entity configuration checks pass", async () => { - mockedFindByPk.mockResolvedValue({ - category_id: mockPayload.category_id, - category_name: "Tech", - }); - - mockedCreateBook.mockResolvedValue({ - book_id: "newly-created-id", - ...mockPayload, - available_copies: mockPayload.total_copies, - created_at: new Date(), - updated_at: new Date(), - }); - - const result = await bookService.createBook(mockPayload); - - expect(Category.findByPk).toHaveBeenCalledWith(mockPayload.category_id); - expect(bookRepository.createBook).toHaveBeenCalledWith(mockPayload); - expect(result).toHaveProperty("book_id", "newly-created-id"); + mockedFindByPk.mockResolvedValue({ category_id: mockCategoryId, category_name: "Tech" }); + mockedCreateBook.mockResolvedValue(mockBookRecord); + + const result = await bookService.createBook(mockBookRecord); + + expect(Category.findByPk).toHaveBeenCalledWith(mockCategoryId); + expect(bookRepository.createBook).toHaveBeenCalledWith(mockBookRecord); + expect(result).toHaveProperty("book_id", mockBookId); }); it("❌ Should short-circuit and throw an AppError if the foreign category is absent", async () => { mockedFindByPk.mockResolvedValue(null); - await expect(bookService.createBook(mockPayload)).rejects.toThrow( + await expect(bookService.createBook(mockBookRecord)).rejects.toThrow( new AppError("Category not found", httpStatus.NOT_FOUND) ); @@ -71,7 +75,34 @@ describe("🧪 Books Service Unit Tests (Isolated System Logic)", () => { }); }); + // ========================================== + // 🟢 2. getBooks Context + // ========================================== + describe("getBooks Context", () => { + it("✔ Should fetch books matching paginated structure from repository layer", async () => { + const mockPaginationResponse = { count: 1, rows: [mockBookRecord] }; + mockedGetBooks.mockResolvedValue(mockPaginationResponse); + + const result = await bookService.getBooks(1, 10, "Test", mockCategoryId); + + expect(bookRepository.getBooks).toHaveBeenCalledWith(1, 10, "Test", mockCategoryId); + expect(result).toEqual(mockPaginationResponse); + }); + }); + + // ========================================== + // 🟢 3. getBookById Context + // ========================================== describe("getBookById Context", () => { + it("✔ Should successfully return a single book object if found", async () => { + mockedGetBookById.mockResolvedValue(mockBookRecord); + + const result = await bookService.getBookById(mockBookId); + + expect(bookRepository.getBookById).toHaveBeenCalledWith(mockBookId); + expect(result).toEqual(mockBookRecord); + }); + it("❌ Should throw a 404 AppError if the database lookup comes back empty", async () => { mockedGetBookById.mockResolvedValue(null); @@ -80,4 +111,58 @@ describe("🧪 Books Service Unit Tests (Isolated System Logic)", () => { ); }); }); + + // ========================================== + // 🟢 4. updateBook Context + // ========================================== + describe("updateBook Context", () => { + const updatePayload = { book_name: "Updated Book Title" }; + + it("✔ Should update and return book properties if target exists", async () => { + mockedGetBookById.mockResolvedValue(mockBookRecord); + mockedUpdateBook.mockResolvedValue({ ...mockBookRecord, ...updatePayload }); + + const result = await bookService.updateBook(mockBookId, updatePayload); + + expect(bookRepository.getBookById).toHaveBeenCalledWith(mockBookId); + expect(bookRepository.updateBook).toHaveBeenCalledWith(mockBookId, updatePayload); + expect(result!.book_name).toBe("Updated Book Title"); + }); + + it("❌ Should throw a 404 AppError if trying to update a missing record", async () => { + mockedGetBookById.mockResolvedValue(null); + + await expect(bookService.updateBook("invalid-id", updatePayload)).rejects.toThrow( + new AppError("Book not found", httpStatus.NOT_FOUND) + ); + + expect(bookRepository.updateBook).not.toHaveBeenCalled(); + }); + }); + + // ========================================== + // 🟢 5. deleteBook Context + // ========================================== + describe("deleteBook Context", () => { + it("✔ Should trigger repository purge mechanism when record execution is verified", async () => { + mockedGetBookById.mockResolvedValue(mockBookRecord); + mockedDeleteBook.mockResolvedValue(1); // Assuming repository returns rows affected count + + const result = await bookService.deleteBook(mockBookId); + + expect(bookRepository.getBookById).toHaveBeenCalledWith(mockBookId); + expect(bookRepository.deleteBook).toHaveBeenCalledWith(mockBookId); + expect(result).toBe(1); + }); + + it("❌ Should throw a 404 AppError if trying to delete an already missing record", async () => { + mockedGetBookById.mockResolvedValue(null); + + await expect(bookService.deleteBook("invalid-id")).rejects.toThrow( + new AppError("Book not found", httpStatus.NOT_FOUND) + ); + + expect(bookRepository.deleteBook).not.toHaveBeenCalled(); + }); + }); }); \ No newline at end of file diff --git a/server/src/modules/fines/fine.controller.ts b/server/src/modules/fines/fine.controller.ts index 2902e37..09d3963 100644 --- a/server/src/modules/fines/fine.controller.ts +++ b/server/src/modules/fines/fine.controller.ts @@ -1,88 +1,58 @@ import { Request, Response } from "express"; - import asyncHandler from "../../utils/asyncHandler.js"; - import sendResponse from "../../utils/SendResponse.js"; - import fineService from "./fine.service.js"; - -export const getAllFinesController = - asyncHandler( - async ( - req: Request, - res: Response - ) => { - const result = - await fineService.getAllFines(); - - sendResponse(res, { - success: true, - statusCode: 200, - message: - "Fines fetched successfully", - data: result, - }); - } - ); - -export const payFineController = - asyncHandler( - async ( - req: Request, - res: Response - ) => { - const result = - await fineService.payFine( - req.body.fine_id - ); - - sendResponse(res, { - success: true, - statusCode: 200, - message: - "Fine paid successfully", - data: result, - }); - } - ); - -export const getPendingFinesController = - asyncHandler( - async ( - req: Request, - res: Response - ) => { - const result = - await fineService.getPendingFines(); - - sendResponse(res, { - success: true, - statusCode: 200, - message: - "Pending fines fetched successfully", - data: result, - }); - } - ); - -export const getMemberFinesController = - asyncHandler( - async ( - req: Request, - res: Response - ) => { - const memberId = req.params.memberId as string; - const result = - await fineService.getMemberFines( - memberId - ); - - sendResponse(res, { - success: true, - statusCode: 200, - message: - "Member fines fetched successfully", - data: result, - }); - } - ); \ No newline at end of file +import { PayFinePayload } from "./fine.types.js"; + +export const getAllFinesController = asyncHandler( + async (req: Request, res: Response) => { + const result = await fineService.getAllFines(); + + sendResponse(res, { + success: true, + statusCode: 200, + message: "Fines fetched successfully", + data: result, + }); + } +); + +export const payFineController = asyncHandler( + async (req: Request<{}, {}, PayFinePayload>, res: Response) => { + const result = await fineService.payFine(req.body.fine_id); + + sendResponse(res, { + success: true, + statusCode: 200, + message: "Fine paid successfully", + data: result, + }); + } +); + +export const getPendingFinesController = asyncHandler( + async (req: Request, res: Response) => { + const result = await fineService.getPendingFines(); + + sendResponse(res, { + success: true, + statusCode: 200, + message: "Pending fines fetched successfully", + data: result, + }); + } +); + +export const getMemberFinesController = asyncHandler( + async (req: Request, res: Response) => { + const memberId = req.params.memberId as string; + const result = await fineService.getMemberFines(memberId); + + sendResponse(res, { + success: true, + statusCode: 200, + message: "Member fines fetched successfully", + data: result, + }); + } +); \ No newline at end of file diff --git a/server/src/modules/fines/fine.repository.ts b/server/src/modules/fines/fine.repository.ts index 997155f..2ab81a9 100644 --- a/server/src/modules/fines/fine.repository.ts +++ b/server/src/modules/fines/fine.repository.ts @@ -1,6 +1,5 @@ import Fine from "../../database/models/Fine.js"; -import { CreationOptional } from "sequelize"; - +import Issue from "../../database/models/Issue.js"; class FineRepository { async getAllFines() { @@ -13,28 +12,29 @@ class FineRepository { return Fine.findByPk(fine_id); } - async getMemberFines(issue_ids: string[]) { + /** + * OPTIMIZED JOIN: Fetches all fines linked to a specific member in a single database round-trip + */ + async getMemberFines(member_id: string) { return Fine.findAll({ - where: { - issue_id: issue_ids, - }, + include: [ + { + model: Issue, + as: "issue", + where: { member_id }, + attributes: ["issue_id", "book_id", "borrowed_date"], // Keep payload light + }, + ], + order: [["created_at", "DESC"]], }); } - async payFine(fine_id: string) { - await Fine.update( - { - paid_status: true, - paid_date: new Date(), - }, - { - where: { - fine_id, - }, - } - ) ; + async payFine(fine_id: string, paymentData: { paid_status: boolean; paid_date: Date }) { + await Fine.update(paymentData, { + where: { fine_id }, + }); - return this.getFineById(fine_id) ; + return this.getFineById(fine_id); } async getPendingFines() { @@ -42,7 +42,6 @@ class FineRepository { where: { paid_status: false, }, - order: [["created_at", "DESC"]], }); } diff --git a/server/src/modules/fines/fine.routes.ts b/server/src/modules/fines/fine.routes.ts index 173f2df..b569891 100644 --- a/server/src/modules/fines/fine.routes.ts +++ b/server/src/modules/fines/fine.routes.ts @@ -1,43 +1,19 @@ import { Router } from "express"; - import auth from "../../middlewares/auth.js"; - import validate from "../../middlewares/validate.js"; - import { getAllFinesController, getMemberFinesController, getPendingFinesController, payFineController, } from "./fine.controller.js"; - import { payFineSchema } from "./fine.validation.js"; const router = Router(); -router.get( - "/", - auth, - getAllFinesController -); - -router.get( - "/pending", - auth, - getPendingFinesController -); - -router.get( - "/member/:memberId", - auth, - getMemberFinesController -); - -router.patch( - "/pay", - auth, - validate(payFineSchema), - payFineController -); +router.get("/", auth, getAllFinesController); +router.get("/pending", auth, getPendingFinesController); +router.get("/member/:memberId", auth, getMemberFinesController); +router.patch("/pay", auth, validate(payFineSchema), payFineController); export default router; \ No newline at end of file diff --git a/server/src/modules/fines/fine.service.ts b/server/src/modules/fines/fine.service.ts index 2b60476..a610c4f 100644 --- a/server/src/modules/fines/fine.service.ts +++ b/server/src/modules/fines/fine.service.ts @@ -1,9 +1,5 @@ import httpStatus from "http-status-codes"; - import AppError from "../../utils/AppError.js"; - -import Issue from "../../database/models/Issue.js"; - import fineRepository from "./fine.repository.js"; class FineService { @@ -12,28 +8,23 @@ class FineService { } async payFine(fine_id: string) { - const fine = - await fineRepository.getFineById( - fine_id - ); + const fine = await fineRepository.getFineById(fine_id); if (!fine) { - throw new AppError( - - "Fine not found", httpStatus.NOT_FOUND - ); + throw new AppError("Fine registry record not found", httpStatus.NOT_FOUND); } if (fine.paid_status) { - throw new AppError( - - "Fine already paid",httpStatus.BAD_REQUEST - ); + throw new AppError("This fine has already been settled", httpStatus.BAD_REQUEST); } - return fineRepository.payFine( - fine_id - ); + // Explicit payload preparation for seamless hand-off to the future payments table mapping + const paymentUpdates = { + paid_status: true, + paid_date: new Date(), + }; + + return fineRepository.payFine(fine_id, paymentUpdates); } async getPendingFines() { @@ -41,19 +32,10 @@ class FineService { } async getMemberFines(member_id: string) { - const issues = await Issue.findAll({ - where: { - member_id, - }, - }); - - const issue_ids = issues.map( - (issue) => issue.issue_id - ); - - return fineRepository.getMemberFines( - issue_ids - ); + if (!member_id) { + throw new AppError("Member identifier parameter missing", httpStatus.BAD_REQUEST); + } + return fineRepository.getMemberFines(member_id); } } diff --git a/server/src/modules/fines/fine.spec.ts b/server/src/modules/fines/fine.spec.ts new file mode 100644 index 0000000..25d2219 --- /dev/null +++ b/server/src/modules/fines/fine.spec.ts @@ -0,0 +1,104 @@ +import { jest } from "@jest/globals"; +import httpStatus from "http-status-codes"; +import AppError from "../../utils/AppError.js"; + +// 1. Mock the Repository Layer with a single unified function signature type +const mockFineRepository = { + getAllFines: jest.fn<(...args: any[]) => any>(), + getFineById: jest.fn<(...args: any[]) => any>(), + getMemberFines: jest.fn<(...args: any[]) => any>(), + payFine: jest.fn<(...args: any[]) => any>(), + getPendingFines: jest.fn<(...args: any[]) => any>(), +}; + +jest.unstable_mockModule("./fine.repository.js", () => ({ + default: mockFineRepository, +})); + +// 2. Dynamically import service after mocking its dependency module +const { default: fineService } = await import("./fine.service.js"); + +describe("FineService - Unit Tests", () => { + beforeEach(() => { + jest.clearAllMocks(); + }); + + describe("getAllFines", () => { + it("🟢 Should return all fines from repository layer smoothly", async () => { + const mockFines = [ + { fine_id: "fine-1", fine_amount: 120, paid_status: false }, + { fine_id: "fine-2", fine_amount: 80, paid_status: true }, + ]; + mockFineRepository.getAllFines.mockResolvedValue(mockFines); + + const result = await fineService.getAllFines(); + + expect(result).toEqual(mockFines); + expect(mockFineRepository.getAllFines).toHaveBeenCalledTimes(1); + }); + }); + + describe("payFine", () => { + it("🔴 Sad Path: Should throw 404 AppError if the target fine identifier does not exist", async () => { + mockFineRepository.getFineById.mockResolvedValue(null); + + await expect(fineService.payFine("invalid-uuid")).rejects.toThrow( + new AppError("Fine registry record not found", httpStatus.NOT_FOUND) + ); + }); + + it("🔴 Sad Path: Should throw 400 AppError if target fine is already settled", async () => { + const mockPaidFine = { fine_id: "fine-id", paid_status: true }; + mockFineRepository.getFineById.mockResolvedValue(mockPaidFine); + + await expect(fineService.payFine("fine-id")).rejects.toThrow( + new AppError("This fine has already been settled", httpStatus.BAD_REQUEST) + ); + }); + + it("🟢 Happy Path: Should cleanly update status parameters and return the settled fine record", async () => { + const mockUnpaidFine = { fine_id: "fine-id", paid_status: false }; + const mockSettledFine = { fine_id: "fine-id", paid_status: true, paid_date: new Date() }; + + mockFineRepository.getFineById.mockResolvedValue(mockUnpaidFine); + mockFineRepository.payFine.mockResolvedValue(mockSettledFine); + + const result = await fineService.payFine("fine-id"); + + expect(result).toEqual(mockSettledFine); + expect(mockFineRepository.payFine).toHaveBeenCalledWith( + "fine-id", + expect.objectContaining({ paid_status: true, paid_date: expect.any(Date) }) + ); + }); + }); + + describe("getPendingFines", () => { + it("🟢 Should return only unsettled fine rows from data layer", async () => { + const mockPending = [{ fine_id: "fine-1", paid_status: false }]; + mockFineRepository.getPendingFines.mockResolvedValue(mockPending); + + const result = await fineService.getPendingFines(); + + expect(result).toEqual(mockPending); + }); + }); + + describe("getMemberFines", () => { + it("🔴 Sad Path: Should throw 400 AppError if parameter is omitted", async () => { + await expect(fineService.getMemberFines("")).rejects.toThrow( + new AppError("Member identifier parameter missing", httpStatus.BAD_REQUEST) + ); + }); + + it("🟢 Happy Path: Should invoke repository layer mapping directly using the identifier", async () => { + const mockMemberFines = [{ fine_id: "fine-1", issue: { member_id: "member-123" } }]; + mockFineRepository.getMemberFines.mockResolvedValue(mockMemberFines); + + const result = await fineService.getMemberFines("member-123"); + + expect(result).toEqual(mockMemberFines); + expect(mockFineRepository.getMemberFines).toHaveBeenCalledWith("member-123"); + }); + }); +}); \ No newline at end of file diff --git a/server/src/modules/fines/fine.validation.ts b/server/src/modules/fines/fine.validation.ts index c577ad3..4fdec06 100644 --- a/server/src/modules/fines/fine.validation.ts +++ b/server/src/modules/fines/fine.validation.ts @@ -2,6 +2,6 @@ import { z } from "zod"; export const payFineSchema = z.object({ body: z.object({ - fine_id: z.uuid(), + fine_id: z.string().uuid("Invalid fine identifier format"), }), }); \ No newline at end of file diff --git a/server/src/tests/books/book.test.ts b/server/src/tests/books/book.test.ts index 0396ebf..b3f9b3a 100644 --- a/server/src/tests/books/book.test.ts +++ b/server/src/tests/books/book.test.ts @@ -3,39 +3,43 @@ import app from "../../app.js"; import { getAuthToken } from "../helpers/testAuth.helper.js"; import sequelize from '../../database/connection/database.js'; import Category from '../../database/models/Category.js'; -import Book from '../../database/models/Book.js'; -describe("📚 Books Module Integration Tests (All Scenarios)", () => { +describe("📚 Books Module Integration Tests (Isolated & Self-Cleaning)", () => { let librarianToken: string; let scienceCategoryId: string; - let seededBookId: string; let createdBookId: string; + let searchBookId: string; // Captured to prevent DB accumulation leaks const testBookName = `Clean Architecture v${Math.floor(Math.random() * 1000)}`; const searchKeyword = `SearchableBook-${Math.floor(Math.random() * 1000)}`; - const nonExistentUuid = "a0000000-0000-0000-0000-000000000000"; + const nonExistentUuid = "00000000-0000-0000-0000-000000000000"; beforeAll(async () => { - // 1. Grab authorization token + // 1. Grab authorization token for Librarian const token = await getAuthToken(); librarianToken = `Bearer ${token}`; try { - // 2. Safely capture a real category ID from DB + // 2. Safely capture a real category ID from DB to link books to const realCategory = await Category.findOne(); scienceCategoryId = realCategory ? (realCategory.get('category_id') as string) : nonExistentUuid; - - // 3. Safely capture a real pre-seeded Book ID from DB - const realBook = await Book.findOne(); - seededBookId = realBook ? (realBook.get('book_id') as string) : nonExistentUuid; } catch (err) { - // Safeguard fallbacks in case models have alternate column definitions scienceCategoryId = "075705f3-c7be-4585-85d1-b57616870f68"; - seededBookId = "b0000001-3333-3333-3333-333333333333"; } }); afterAll(async () => { + // Safety Net Cleanup: If tests fail early, ensure dummy items are still scrubbed + if (searchBookId) { + await request(app) + .delete(`/api/v1/books/${searchBookId}`) + .set("Authorization", librarianToken); + } + if (createdBookId) { + await request(app) + .delete(`/api/v1/books/${createdBookId}`) + .set("Authorization", librarianToken); + } await sequelize.close(); }); @@ -59,7 +63,7 @@ describe("📚 Books Module Integration Tests (All Scenarios)", () => { expect(res.body.data).toHaveProperty("book_id"); expect(res.body.data.book_name).toBe(testBookName); - // Save this value securely for the GET details suite below + // Save this isolated ID for subsequent Read, Update, and Delete steps createdBookId = res.body.data.book_id; }); @@ -78,7 +82,7 @@ describe("📚 Books Module Integration Tests (All Scenarios)", () => { expect(res.body.success).toBe(false); }); - it("❌ Sad Path: Should throw 400/404 error if category UUID does not exist in DB", async () => { + it("❌ Sad Path: Should throw 404 error if category UUID does not exist in DB", async () => { const res = await request(app) .post("/api/v1/books") .set("Authorization", librarianToken) @@ -89,7 +93,7 @@ describe("📚 Books Module Integration Tests (All Scenarios)", () => { total_copies: 5, }); - expect([400, 404]).toContain(res.status); + expect(res.status).toBe(404); // Matches BookService AppError definition }); it("❌ Sad Path: Should reject execution if authorization token is absent", async () => { @@ -111,7 +115,7 @@ describe("📚 Books Module Integration Tests (All Scenarios)", () => { // ========================================== describe("GET /api/v1/books", () => { beforeAll(async () => { - await request(app) + const res = await request(app) .post("/api/v1/books") .set("Authorization", librarianToken) .send({ @@ -120,6 +124,19 @@ describe("📚 Books Module Integration Tests (All Scenarios)", () => { category_id: scienceCategoryId, total_copies: 2, }); + + // CAPTURING THIS ID: Prevents database bloat on repeated test runs + searchBookId = res.body.data?.book_id; + }); + + afterAll(async () => { + // Instantly delete the search test book right after this suite finishes + if (searchBookId) { + await request(app) + .delete(`/api/v1/books/${searchBookId}`) + .set("Authorization", librarianToken); + searchBookId = ""; // Clear reference + } }); it("✅ Happy Path: Should fetch all books complete with default pagination maps", async () => { @@ -157,22 +174,12 @@ describe("📚 Books Module Integration Tests (All Scenarios)", () => { // ========================================== describe("GET /api/v1/books/:bookId", () => { it("✅ Happy Path: Should return details of a single book by ID", async () => { - const validTargetId = createdBookId || seededBookId; - const res = await request(app) - .get(`/api/v1/books/${validTargetId}`) - .set("Authorization", librarianToken); - - expect(res.status).toBe(200); - expect(res.body.data.book_id).toBe(validTargetId); - }); - - it("✅ Happy Path: Should successfully fetch a pre-seeded book dynamically", async () => { - const res = await request(app) - .get(`/api/v1/books/${seededBookId}`) + .get(`/api/v1/books/${createdBookId}`) .set("Authorization", librarianToken); expect(res.status).toBe(200); + expect(res.body.data.book_id).toBe(createdBookId); }); it("❌ Sad Path: Should throw 404 error if book ID cannot be found", async () => { @@ -184,16 +191,15 @@ describe("📚 Books Module Integration Tests (All Scenarios)", () => { }); }); - // ========================================== + // ========================================== // 🟢 4. PATCH /api/v1/books/:bookId (UPDATE) // ========================================== describe("PATCH /api/v1/books/:bookId", () => { it("✅ Happy Path: Should let an authorized Librarian update a book's details via PATCH", async () => { - const targetBookId = createdBookId || seededBookId; const updatedTitle = `Clean Architecture - Edited v${Math.floor(Math.random() * 1000)}`; const res = await request(app) - .patch(`/api/v1/books/${targetBookId}`) + .patch(`/api/v1/books/${createdBookId}`) .set("Authorization", librarianToken) .send({ book_name: updatedTitle, @@ -209,16 +215,14 @@ describe("📚 Books Module Integration Tests (All Scenarios)", () => { }); it("❌ Sad Path: Should fail validation when partial update criteria are invalid (Zod)", async () => { - const targetBookId = createdBookId || seededBookId; - const res = await request(app) - .patch(`/api/v1/books/${targetBookId}`) + .patch(`/api/v1/books/${createdBookId}`) .set("Authorization", librarianToken) .send({ - book_name: "Y", // Too short - book_author: "", // Invalid empty string + book_name: "Y", + book_author: "", category_id: "not-a-valid-uuid", - total_copies: -5, // Negative values fail check + total_copies: -5, }); expect(res.status).toBe(400); @@ -253,21 +257,22 @@ describe("📚 Books Module Integration Tests (All Scenarios)", () => { }); it("✅ Happy Path: Should successfully delete an existing book by its ID", async () => { - const targetBookId = createdBookId || seededBookId; - const res = await request(app) - .delete(`/api/v1/books/${targetBookId}`) + .delete(`/api/v1/books/${createdBookId}`) .set("Authorization", librarianToken); expect(res.status).toBe(200); expect(res.body.success).toBe(true); - // Verify removal + // Verify removal directly matches your Service's getBookById 404 check const doubleCheckRes = await request(app) - .get(`/api/v1/books/${targetBookId}`) + .get(`/api/v1/books/${createdBookId}`) .set("Authorization", librarianToken); expect(doubleCheckRes.status).toBe(404); + + // Nullify value so global safety net inside afterAll avoids duplicate calls + createdBookId = ""; }); }); -}); \ No newline at end of file +}); \ No newline at end of file diff --git a/server/src/tests/fines/fine.test.ts b/server/src/tests/fines/fine.test.ts new file mode 100644 index 0000000..eb2d4a9 --- /dev/null +++ b/server/src/tests/fines/fine.test.ts @@ -0,0 +1,140 @@ +import "@jest/globals"; +import request from "supertest"; +import httpStatus from "http-status-codes"; +import sequelize from "../../database/connection/database.js"; + +const { default: app } = await import("../../app.js"); +const { default: Fine } = await import("../../database/models/Fine.js"); +const { default: Issue } = await import("../../database/models/Issue.js"); +const { getAuthToken } = await import("../helpers/testAuth.helper.js"); + +describe("Fine Module (End-to-End Integration Tests)", () => { + let mockLibrarianToken: string = ""; + let dynamicMemberId: string = ""; + + // Target explicit data points established by your SQL seeds + const seedUnpaidFineId = "50000001-5555-4555-a555-555555555501"; + const seedPaidFineId = "50000003-5555-4555-a555-555555555503"; + const seedTargetIssueId = "40000011-4444-4444-a444-444444444411"; + + beforeAll(async () => { + mockLibrarianToken = await getAuthToken(); + + // Dynamically look up the member_id tied to your seed issue to avoid breaking foreign key logic + const issueRecord = await Issue.findByPk(seedTargetIssueId); + if (issueRecord) { + dynamicMemberId = (issueRecord.get("member_id") || (issueRecord as any).member_id) as string; + } + }); + + afterAll(async () => { + // REVERT MUTATION: Safely reset the modified seed record back to its original unpaid state + await Fine.update( + { paid_status: false, paid_date: null }, + { where: { fine_id: seedUnpaidFineId } } + ); + await sequelize.close(); + }); + + // ========================================== + // 🔐 SECURITY & AUTHENTICATION GUARDRAILS + // ========================================== + describe("🔐 Auth Guardrail Check", () => { + it("🔴 Sad Path: Should reject request with 401 Unauthorized if no token is passed", async () => { + const response = await request(app).get("/api/v1/fines").send(); + expect(response.status).toBe(httpStatus.UNAUTHORIZED); + }); + }); + + // ========================================== + // 📥 GET /api/v1/fines + // ========================================== + describe("📤 GET /api/v1/fines", () => { + it("🟢 Happy Path: Should fetch all records containing seeded structural data matching payload design", async () => { + const response = await request(app) + .get("/api/v1/fines") + .set("Authorization", `Bearer ${mockLibrarianToken}`); + + expect(response.status).toBe(httpStatus.OK); + const records = response.body.data || response.body; + expect(Array.isArray(records)).toBe(true); + expect(records.length).toBeGreaterThanOrEqual(5); // Confirms your 5 SQL seeds exist + }); + }); + + // ========================================== + // 📥 GET /api/v1/fines/pending + // ========================================== + describe("📤 GET /api/v1/fines/pending", () => { + it("🟢 Happy Path: Should extract exclusively unpaid balances", async () => { + const response = await request(app) + .get("/api/v1/fines/pending") + .set("Authorization", `Bearer ${mockLibrarianToken}`); + + expect(response.status).toBe(httpStatus.OK); + const records = response.body.data || response.body; + + expect(Array.isArray(records)).toBe(true); + // Ensure all fetched entries are unpaid + records.forEach((fine: any) => { + expect(fine.paid_status).toBe(false); + }); + }); + }); + + // ========================================== + // 📥 GET /api/v1/fines/member/:memberId + // ========================================== + describe("📤 GET /api/v1/fines/member/:memberId", () => { + it("🟢 Happy Path: Should return member records across optimized join tables", async () => { + if (!dynamicMemberId) { + console.warn("⚠️ Warning: Skipping member lookup integration test due to missing seed issue mapping link."); + return; + } + + const response = await request(app) + .get(`/api/v1/fines/member/${dynamicMemberId}`) + .set("Authorization", `Bearer ${mockLibrarianToken}`); + + expect(response.status).toBe(httpStatus.OK); + const records = response.body.data || response.body; + expect(Array.isArray(records)).toBe(true); + }); + }); + + // ========================================== + // 🔧 PATCH /api/v1/fines/pay + // ========================================== + describe("🔧 PATCH /api/v1/fines/pay", () => { + it("🔴 Sad Path: Should reject if payload execution parameters break Zod validation rules", async () => { + const response = await request(app) + .patch("/api/v1/fines/pay") + .set("Authorization", `Bearer ${mockLibrarianToken}`) + .send({ fine_id: "not-a-valid-uuid" }); + + expect(response.status).toBe(httpStatus.BAD_REQUEST); + }); + + it("🔴 Sad Path: Should reject execution if fine is already marked as paid", async () => { + const response = await request(app) + .patch("/api/v1/fines/pay") + .set("Authorization", `Bearer ${mockLibrarianToken}`) + .send({ fine_id: seedPaidFineId }); + + expect(response.status).toBe(httpStatus.BAD_REQUEST); + }); + + it("🟢 Happy Path: Should successfully settle an open balance and record the payment date", async () => { + const response = await request(app) + .patch("/api/v1/fines/pay") + .set("Authorization", `Bearer ${mockLibrarianToken}`) + .send({ fine_id: seedUnpaidFineId }); + + expect(response.status).toBe(httpStatus.OK); + + const responseData = response.body.data || response.body; + expect(responseData.paid_status).toBe(true); + expect(responseData.paid_date).not.toBeNull(); + }); + }); +}); \ No newline at end of file diff --git a/server/src/tests/issues/issue.test.ts b/server/src/tests/issues/issue.test.ts index 66285bc..d41d000 100644 --- a/server/src/tests/issues/issue.test.ts +++ b/server/src/tests/issues/issue.test.ts @@ -2,21 +2,32 @@ import request from "supertest"; import app from "../../app.js"; import { getAuthToken } from "../helpers/testAuth.helper.js"; import Issue from "../../database/models/Issue.js"; +import Book from "../../database/models/Book.js"; // 👈 1. Import your Book model here describe("⚙️ Issues Module - Integration Tests", () => { let authToken: string; let newlyBorrowedIssueId: string; - // Constants mapping directly to your provided SQL seed data - const SEED_MEMBER_ID = "20000001-2222-4222-a222-222222222201"; // Historically returned member - const SEED_BOOK_ID = "b0000001-3333-4333-a333-333333333301"; // Historically returned book (available) + const SEED_MEMBER_ID = "20000001-2222-4222-a222-222222222201"; + const SEED_BOOK_ID = "b0000001-3333-4333-a333-333333333301"; - const ACTIVE_ISSUE_MEMBER_ID = "20000030-2222-4222-a222-222222222230"; // From row 16 - const ACTIVE_ISSUE_ID = "40000016-4444-4444-a444-444444444416"; // From row 16 (Clean item with NO pre-existing fine record) + const ACTIVE_ISSUE_MEMBER_ID = "20000030-2222-4222-a222-222222222230"; + const ACTIVE_ISSUE_ID = "40000016-4444-4444-a444-444444444416"; beforeAll(async () => { authToken = await getAuthToken(); + // 👈 2. FORCE THE SEED BOOK TO BE AVAILABLE + // Wipe out any lingering uncleaned records matching this test book + await Issue.destroy({ where: { book_id: SEED_BOOK_ID } }); + + // Directly restock the book inside the database so the borrow endpoint succeeds + // (Verify if your model uses 'available_copies' or just 'total_copies') + await Book.update( + { available_copies: 5, total_copies: 5 }, + { where: { book_id: SEED_BOOK_ID } } + ); + // Ensure the target row is reset back to active BORROWED status before running tests await Issue.update( { @@ -57,7 +68,6 @@ describe("⚙️ Issues Module - Integration Tests", () => { expect(response.body.success).toBe(true); expect(response.body.data).toHaveProperty("issue_id"); - // Preserve id dynamically so afterAll hook drops it from test environment tables newlyBorrowedIssueId = response.body.data.issue_id; }); From f8f0b01760567ba6dd3881fc7ff1c89a065fe911 Mon Sep 17 00:00:00 2001 From: Yogeshwaran S Date: Mon, 1 Jun 2026 14:03:44 +0530 Subject: [PATCH 42/87] test(dashboard): add unit and integration tests --- .../modules/dashboard/dashboard.service.ts | 14 ++- .../src/modules/dashboard/dashboard.spec.ts | 104 ++++++++++++++++++ server/src/tests/dashboard/dashboard.test.ts | 87 +++++++++++++++ 3 files changed, 203 insertions(+), 2 deletions(-) create mode 100644 server/src/modules/dashboard/dashboard.spec.ts create mode 100644 server/src/tests/dashboard/dashboard.test.ts diff --git a/server/src/modules/dashboard/dashboard.service.ts b/server/src/modules/dashboard/dashboard.service.ts index 826ee36..da51e4e 100644 --- a/server/src/modules/dashboard/dashboard.service.ts +++ b/server/src/modules/dashboard/dashboard.service.ts @@ -1,4 +1,5 @@ import dashboardRepository from "./dashboard.repository.js"; +import { RecentIssue } from "./dashboard.types.js"; class DashboardService { async getOverview() { @@ -9,8 +10,17 @@ class DashboardService { return dashboardRepository.getPopularBooks(); } - async getRecentIssues() { - return dashboardRepository.getRecentIssues(); + async getRecentIssues(): Promise { + const rawIssues = await dashboardRepository.getRecentIssues(); + + // Flatten out the Sequelize nested model structures into your exact frontend Type + return rawIssues.map((issue: any) => ({ + issue_id: issue.issue_id, + member_name: issue.member?.user?.name || "Unknown Member", + book_name: issue.book?.book_name || "Unknown Book", + borrowed_date: issue.borrowed_date, + due_date: issue.due_date, + })); } async getMonthlyFineCollection() { diff --git a/server/src/modules/dashboard/dashboard.spec.ts b/server/src/modules/dashboard/dashboard.spec.ts new file mode 100644 index 0000000..28d4303 --- /dev/null +++ b/server/src/modules/dashboard/dashboard.spec.ts @@ -0,0 +1,104 @@ +import { jest } from "@jest/globals"; +import dashboardService from "./dashboard.service.js"; +import dashboardRepository from "./dashboard.repository.js"; + +describe("🧪 Dashboard Service - Unit Tests", () => { + + afterEach(() => { + // Restores original functionality back to the repository after every test block + jest.restoreAllMocks(); + }); + + describe("getOverview()", () => { + it("✅ Should pass through data from repository unaltered", async () => { + const mockOverview = { + totalBooks: 100, + totalMembers: 50, + activeMembers: 40, + expiredMembers: 10, + issuedBooks: 30, + returnedBooks: 70, + overdueBooks: 5, + unpaidFines: 150, + }; + + // 💡 FIX: Spy on the instance method directly at runtime + const spy = jest.spyOn(dashboardRepository, "getOverview").mockResolvedValue(mockOverview); + + const result = await dashboardService.getOverview(); + + expect(result).toEqual(mockOverview); + expect(spy).toHaveBeenCalledTimes(1); + }); + }); + + describe("getRecentIssues()", () => { + it("✅ Should correctly flatten nested Sequelize model relations into standard frontend layout", async () => { + const mockRawIssues = [ + { + issue_id: "issue-uuid-1", + borrowed_date: new Date("2026-01-01"), + due_date: new Date("2026-01-15"), + member: { user: { name: "John Doe" } }, + book: { book_name: "TypeScript Deep Dive" }, + }, + { + issue_id: "issue-uuid-2", + borrowed_date: new Date("2026-02-01"), + due_date: new Date("2026-02-15"), + member: null, + book: null, + } + ] as any; + + // 💡 FIX: Spy on the recent issues method + jest.spyOn(dashboardRepository, "getRecentIssues").mockResolvedValue(mockRawIssues); + + const result = await dashboardService.getRecentIssues(); + + expect(result).toHaveLength(2); + + const firstIssue = result[0]!; + const secondIssue = result[1]!; + + expect(firstIssue).toEqual({ + issue_id: "issue-uuid-1", + member_name: "John Doe", + book_name: "TypeScript Deep Dive", + borrowed_date: mockRawIssues[0]!.borrowed_date, + due_date: mockRawIssues[0]!.due_date, + }); + + expect(secondIssue.member_name).toBe("Unknown Member"); + expect(secondIssue.book_name).toBe("Unknown Book"); + }); + }); + + describe("getPopularBooks()", () => { + it("✅ Should pass through popular book array data", async () => { + const mockBooks = [ + { book_id: "1", book_name: "Book A", lending_count: 25 } + ] as any; + + // 💡 FIX: Spy on the popular books method + jest.spyOn(dashboardRepository, "getPopularBooks").mockResolvedValue(mockBooks); + + const result = await dashboardService.getPopularBooks(); + expect(result).toEqual(mockBooks); + }); + }); + + describe("getMonthlyFineCollection()", () => { + it("✅ Should pass through financial collection tracking history", async () => { + const mockFines = [ + { month: "2026-01-01", total: 450 } + ] as any; + + // 💡 FIX: Spy on the fine analytics collection method + jest.spyOn(dashboardRepository, "getMonthlyFineCollection").mockResolvedValue(mockFines); + + const result = await dashboardService.getMonthlyFineCollection(); + expect(result).toEqual(mockFines); + }); + }); +}); \ No newline at end of file diff --git a/server/src/tests/dashboard/dashboard.test.ts b/server/src/tests/dashboard/dashboard.test.ts new file mode 100644 index 0000000..40272ea --- /dev/null +++ b/server/src/tests/dashboard/dashboard.test.ts @@ -0,0 +1,87 @@ +import request from "supertest"; +import app from "../../app.js"; +import { getAuthToken } from "../helpers/testAuth.helper.js"; + +describe("⚙️ Dashboard Module - Integration Tests", () => { + let authToken: string; + + beforeAll(async () => { + // Generate valid authorization token using helper system + authToken = await getAuthToken(); + }); + + describe("GET /api/v1/dashboard/overview", () => { + it("❌ Should reject request with 401 Unauthorized if token is missing", async () => { + const response = await request(app).get("/api/v1/dashboard/overview"); + expect(response.status).toBe(401); + }); + + it("✅ Should fetch system wide summary counts successfully with 200", async () => { + const response = await request(app) + .get("/api/v1/dashboard/overview") + .set("Authorization", `Bearer ${authToken}`); + + expect(response.status).toBe(200); + expect(response.body.success).toBe(true); + expect(response.body.message).toContain("overview fetched successfully"); + + // Confirm all metrics are numeric aggregates + const { data } = response.body; + expect(data).toHaveProperty("totalBooks"); + expect(typeof data.totalBooks).toBe("number"); + expect(data).toHaveProperty("unpaidFines"); + expect(typeof data.unpaidFines).toBe("number"); + }); + }); + + describe("GET /api/v1/dashboard/analytics/popular-books", () => { + it("✅ Should fetch top high-demand rental books array", async () => { + const response = await request(app) + .get("/api/v1/dashboard/analytics/popular-books") + .set("Authorization", `Bearer ${authToken}`); + + expect(response.status).toBe(200); + expect(response.body.success).toBe(true); + expect(Array.isArray(response.body.data)).toBe(true); + + if (response.body.data.length > 0) { + expect(response.body.data[0]).toHaveProperty("book_name"); + expect(response.body.data[0]).toHaveProperty("lending_count"); + } + }); + }); + + describe("GET /api/v1/dashboard/analytics/recent-issues", () => { + it("✅ Should return recent logs flattened ready for frontend UI ingestion", async () => { + const response = await request(app) + .get("/api/v1/dashboard/analytics/recent-issues") + .set("Authorization", `Bearer ${authToken}`); + + expect(response.status).toBe(200); + expect(response.body.success).toBe(true); + expect(Array.isArray(response.body.data)).toBe(true); + + if (response.body.data.length > 0) { + const firstIssue = response.body.data[0]; + // Confirm data fields match frontend expectations and are NOT nested deep model layouts + expect(firstIssue).toHaveProperty("issue_id"); + expect(firstIssue).toHaveProperty("member_name"); + expect(firstIssue).toHaveProperty("book_name"); + expect(typeof firstIssue.member_name).toBe("string"); + expect(firstIssue.member).toBeUndefined(); // Assures mapping occurred successfully + } + }); + }); + + describe("GET /api/v1/dashboard/reports/monthly-fines", () => { + it("✅ Should fetch dynamic timeline series calculations for charts", async () => { + const response = await request(app) + .get("/api/v1/dashboard/reports/monthly-fines") + .set("Authorization", `Bearer ${authToken}`); + + expect(response.status).toBe(200); + expect(response.body.success).toBe(true); + expect(Array.isArray(response.body.data)).toBe(true); + }); + }); +}); \ No newline at end of file From 1f06cb2a39928193c4bae24fc4f3f24ab387a824 Mon Sep 17 00:00:00 2001 From: Yogeshwaran S Date: Mon, 1 Jun 2026 15:59:11 +0530 Subject: [PATCH 43/87] ci: implement full backend test suite and github actions pipeline - Add automated CI pipeline with postgres service container - Integrate automated database seeding via seed.sql - Implement database lifecycle orchestration in runTests.ts - Standardize environment-aware database configurations - Separate unit and integration test suites --- server/jest.config.ts | 7 +- server/jest.integration.config.ts | 29 ++ server/jest.unit.config.js | 23 -- server/jest.unit.config.ts | 31 +++ server/package.json | 17 +- server/src/database/config/database.ts | 12 +- server/src/database/connection/database.ts | 15 +- .../src/modules/dashboard/dashboard.spec.ts | 254 ++++++++++++------ server/src/modules/issues/issue.spec.ts | 72 ++++- server/src/tests/config/validateEnv.spec.ts | 63 +++++ server/src/tests/issues/issue.test.ts | 55 +++- .../tests/middlewares/notFoundHandler.spec.ts | 28 ++ server/src/tests/runTests.ts | 10 +- 13 files changed, 475 insertions(+), 141 deletions(-) create mode 100644 server/jest.integration.config.ts delete mode 100644 server/jest.unit.config.js create mode 100644 server/jest.unit.config.ts create mode 100644 server/src/tests/config/validateEnv.spec.ts create mode 100644 server/src/tests/middlewares/notFoundHandler.spec.ts diff --git a/server/jest.config.ts b/server/jest.config.ts index 8ad8313..e2f9e22 100644 --- a/server/jest.config.ts +++ b/server/jest.config.ts @@ -4,9 +4,13 @@ const jestConfig: JestConfigWithTsJest = { preset: 'ts-jest/presets/default-esm', extensionsToTreatAsEsm: ['.ts'], testEnvironment: 'node', + // Scan across your entire testing root roots: ['/src/tests'], + testMatch: [ + '**/*.spec.ts', // Unit files + '**/*.test.ts' // Integration files + ], moduleFileExtensions: ['ts', 'js', 'json'], - // 🟢 Maps '.js' imports back to physical '.ts' source files inside your tests moduleNameMapper: { '^(\\.{1,2}/.*)\\.js$': '$1', }, @@ -15,7 +19,6 @@ const jestConfig: JestConfigWithTsJest = { 'ts-jest', { useESM: true, - // 🟢 Instructs ts-jest to apply path remapping rules to global files too diagnostics: { ignoreCodes: [1343] }, diff --git a/server/jest.integration.config.ts b/server/jest.integration.config.ts new file mode 100644 index 0000000..96b409c --- /dev/null +++ b/server/jest.integration.config.ts @@ -0,0 +1,29 @@ +import type { JestConfigWithTsJest } from 'ts-jest'; + +const integrationConfig: JestConfigWithTsJest = { + preset: 'ts-jest/presets/default-esm', + extensionsToTreatAsEsm: ['.ts'], + testEnvironment: 'node', + roots: ['/src'], // Widened to src + testMatch: [ + '/src/**/*.test.ts' // Matches integration files anywhere in src + ], + moduleFileExtensions: ['ts', 'js', 'json'], + moduleNameMapper: { + '^(\\.{1,2}/.*)\\.js$': '$1', + }, + transform: { + '^.+\\.ts$': [ + 'ts-jest', + { + useESM: true, + diagnostics: { + ignoreCodes: [1343] + }, + }, + ], + }, + collectCoverage: false, +}; + +export default integrationConfig; \ No newline at end of file diff --git a/server/jest.unit.config.js b/server/jest.unit.config.js deleted file mode 100644 index ec4d40e..0000000 --- a/server/jest.unit.config.js +++ /dev/null @@ -1,23 +0,0 @@ -/** @type {import('jest').Config} */ -const config = { - preset: 'ts-jest/presets/default-esm', - testMatch: [ - "/src/modules/**/*.test.ts", - "/src/modules/**/*.spec.ts" - ], - // 1. Map the .js extensions in imports back to .ts files for Jest - moduleNameMapper: { - '^(\\.{1,2}/.*)\\.js$': '$1', - }, - // 2. Tell Jest to compile TypeScript files using ts-jest - transform: { - '^.+\\.tsx?$': [ - 'ts-jest', - { - useESM: true, - }, - ], - }, -}; - -export default config; \ No newline at end of file diff --git a/server/jest.unit.config.ts b/server/jest.unit.config.ts new file mode 100644 index 0000000..5e842eb --- /dev/null +++ b/server/jest.unit.config.ts @@ -0,0 +1,31 @@ +import type { JestConfigWithTsJest } from 'ts-jest'; + +const unitConfig: JestConfigWithTsJest = { + preset: 'ts-jest/presets/default-esm', + extensionsToTreatAsEsm: ['.ts'], + testEnvironment: 'node', + // 1. Widen the scope to scan the entire src directory + roots: ['/src'], + // 2. Match any .spec.ts file anywhere inside the src directory + testMatch: [ + '/src/**/*.spec.ts' + ], + moduleFileExtensions: ['ts', 'js', 'json'], + moduleNameMapper: { + '^(\\.{1,2}/.*)\\.js$': '$1', + }, + transform: { + '^.+\\.ts$': [ + 'ts-jest', + { + useESM: true, + diagnostics: { + ignoreCodes: [1343] + }, + }, + ], + }, + collectCoverage: false, +}; + +export default unitConfig; \ No newline at end of file diff --git a/server/package.json b/server/package.json index 9874bae..8b2e861 100644 --- a/server/package.json +++ b/server/package.json @@ -3,15 +3,14 @@ "version": "1.0.0", "description": "", "main": "index.js", - "scripts": { - "dev": "tsx watch src/server.ts", - "build": "tsc", - "start": "node dist/server.js", - "test": "cross-env NODE_ENV=test tsx src/tests/runTests.ts", - "test:unit": "node --experimental-vm-modules node_modules/jest/bin/jest.js --config=jest.unit.config.js", - "test:watch": "jest --watch", - "test:coverage": "jest --coverage" - }, +"scripts": { + "dev": "tsx watch src/server.ts", + "build": "tsc", + "start": "node dist/server.js", + "test:integration": "cross-env NODE_ENV=test tsx src/tests/runTests.ts", + "test:unit": "cross-env NODE_ENV=test node --experimental-vm-modules node_modules/jest/bin/jest.js --config=jest.unit.config.ts", + "test:coverage": "cross-env NODE_ENV=test node --experimental-vm-modules node_modules/jest/bin/jest.js --config=jest.config.ts --runInBand" +}, "keywords": [], "author": "", "license": "ISC", diff --git a/server/src/database/config/database.ts b/server/src/database/config/database.ts index f4971dd..4df5aea 100644 --- a/server/src/database/config/database.ts +++ b/server/src/database/config/database.ts @@ -1,5 +1,4 @@ import dotenv from "dotenv"; - dotenv.config(); const databaseConfig = { @@ -9,8 +8,17 @@ const databaseConfig = { database: process.env.DB_NAME, host: process.env.DB_HOST, dialect: "postgres", - port: Number(process.env.DB_PORT), + port: Number(process.env.DB_PORT || 5432), }, + test: { + // These match the CI variables exactly + username: process.env.DB_USER || 'test_user', + password: process.env.DB_PASSWORD || 'test_password', + database: process.env.DB_NAME || 'test_db', + host: process.env.DB_HOST || 'localhost', + dialect: "postgres", + port: Number(process.env.DB_PORT || 5432), + } }; export default databaseConfig; \ No newline at end of file diff --git a/server/src/database/connection/database.ts b/server/src/database/connection/database.ts index c745a46..0793cf2 100644 --- a/server/src/database/connection/database.ts +++ b/server/src/database/connection/database.ts @@ -1,20 +1,25 @@ import { Sequelize } from "sequelize"; import cls from 'cls-hooked'; import dotenv from "dotenv"; +import databaseConfig from '../config/database.js'; dotenv.config(); const namespace = cls.createNamespace('sequelize-test-namespace'); (Sequelize as any).useCLS(namespace); +// Pick the config based on NODE_ENV (defaults to 'development') +const env = process.env.NODE_ENV || 'development'; +const config = (databaseConfig as any)[env]; + const sequelize = new Sequelize( - process.env.DB_NAME!, - process.env.DB_USER!, - process.env.DB_PASSWORD!, + config.database, + config.username, + config.password, { - host: process.env.DB_HOST!, + host: config.host, dialect: "postgres", - port: Number(process.env.DB_PORT!), + port: config.port, logging: false, } ); diff --git a/server/src/modules/dashboard/dashboard.spec.ts b/server/src/modules/dashboard/dashboard.spec.ts index 28d4303..c91d905 100644 --- a/server/src/modules/dashboard/dashboard.spec.ts +++ b/server/src/modules/dashboard/dashboard.spec.ts @@ -2,103 +2,191 @@ import { jest } from "@jest/globals"; import dashboardService from "./dashboard.service.js"; import dashboardRepository from "./dashboard.repository.js"; -describe("🧪 Dashboard Service - Unit Tests", () => { - +// Import models to spy on their native Sequelize static methods +import Book from "../../database/models/Book.js"; +import Member from "../../database/models/Member.js"; +import Issue from "../../database/models/Issue.js"; +import Fine from "../../database/models/Fine.js"; + +describe("⚙️ Dashboard Module - Unit Tests", () => { + afterEach(() => { - // Restores original functionality back to the repository after every test block jest.restoreAllMocks(); }); - describe("getOverview()", () => { - it("✅ Should pass through data from repository unaltered", async () => { - const mockOverview = { - totalBooks: 100, - totalMembers: 50, - activeMembers: 40, - expiredMembers: 10, - issuedBooks: 30, - returnedBooks: 70, - overdueBooks: 5, - unpaidFines: 150, - }; - - // 💡 FIX: Spy on the instance method directly at runtime - const spy = jest.spyOn(dashboardRepository, "getOverview").mockResolvedValue(mockOverview); - - const result = await dashboardService.getOverview(); - - expect(result).toEqual(mockOverview); - expect(spy).toHaveBeenCalledTimes(1); + // ========================================== + // 🏢 PART 1: Dashboard Service Layer Tests + // ========================================== + describe("📘 Dashboard Service", () => { + + describe("getOverview()", () => { + it("✅ Should pass through data from repository unaltered", async () => { + const mockOverview = { + totalBooks: 100, + totalMembers: 50, + activeMembers: 40, + expiredMembers: 10, + issuedBooks: 30, + returnedBooks: 70, + overdueBooks: 5, + unpaidFines: 150, + }; + + const spy = jest.spyOn(dashboardRepository, "getOverview").mockResolvedValue(mockOverview); + + const result = await dashboardService.getOverview(); + + expect(result).toEqual(mockOverview); + expect(spy).toHaveBeenCalledTimes(1); + }); }); - }); - describe("getRecentIssues()", () => { - it("✅ Should correctly flatten nested Sequelize model relations into standard frontend layout", async () => { - const mockRawIssues = [ - { + describe("getRecentIssues()", () => { + it("✅ Should correctly flatten nested Sequelize model relations into standard frontend layout", async () => { + const mockRawIssues = [ + { + issue_id: "issue-uuid-1", + borrowed_date: new Date("2026-01-01"), + due_date: new Date("2026-01-15"), + member: { user: { name: "John Doe" } }, + book: { book_name: "TypeScript Deep Dive" }, + }, + { + issue_id: "issue-uuid-2", + borrowed_date: new Date("2026-02-01"), + due_date: new Date("2026-02-15"), + member: null, + book: null, + } + ] as any; + + jest.spyOn(dashboardRepository, "getRecentIssues").mockResolvedValue(mockRawIssues); + + const result = await dashboardService.getRecentIssues(); + + expect(result).toHaveLength(2); + + const firstIssue = result[0]!; + const secondIssue = result[1]!; + + expect(firstIssue).toEqual({ issue_id: "issue-uuid-1", - borrowed_date: new Date("2026-01-01"), - due_date: new Date("2026-01-15"), - member: { user: { name: "John Doe" } }, - book: { book_name: "TypeScript Deep Dive" }, - }, - { - issue_id: "issue-uuid-2", - borrowed_date: new Date("2026-02-01"), - due_date: new Date("2026-02-15"), - member: null, - book: null, - } - ] as any; - - // 💡 FIX: Spy on the recent issues method - jest.spyOn(dashboardRepository, "getRecentIssues").mockResolvedValue(mockRawIssues); - - const result = await dashboardService.getRecentIssues(); - - expect(result).toHaveLength(2); - - const firstIssue = result[0]!; - const secondIssue = result[1]!; - - expect(firstIssue).toEqual({ - issue_id: "issue-uuid-1", - member_name: "John Doe", - book_name: "TypeScript Deep Dive", - borrowed_date: mockRawIssues[0]!.borrowed_date, - due_date: mockRawIssues[0]!.due_date, + member_name: "John Doe", + book_name: "TypeScript Deep Dive", + borrowed_date: mockRawIssues[0]!.borrowed_date, + due_date: mockRawIssues[0]!.due_date, + }); + + expect(secondIssue.member_name).toBe("Unknown Member"); + expect(secondIssue.book_name).toBe("Unknown Book"); }); + }); + + describe("getPopularBooks()", () => { + it("✅ Should pass through popular book array data", async () => { + const mockBooks = [ + { book_id: "1", book_name: "Book A", lending_count: 25 } + ] as any; + + jest.spyOn(dashboardRepository, "getPopularBooks").mockResolvedValue(mockBooks); - expect(secondIssue.member_name).toBe("Unknown Member"); - expect(secondIssue.book_name).toBe("Unknown Book"); + const result = await dashboardService.getPopularBooks(); + expect(result).toEqual(mockBooks); + }); }); - }); - describe("getPopularBooks()", () => { - it("✅ Should pass through popular book array data", async () => { - const mockBooks = [ - { book_id: "1", book_name: "Book A", lending_count: 25 } - ] as any; - - // 💡 FIX: Spy on the popular books method - jest.spyOn(dashboardRepository, "getPopularBooks").mockResolvedValue(mockBooks); - - const result = await dashboardService.getPopularBooks(); - expect(result).toEqual(mockBooks); + describe("getMonthlyFineCollection()", () => { + it("✅ Should pass through financial collection tracking history", async () => { + const mockFines = [ + { month: "2026-01-01", total: 450 } + ] as any; + + jest.spyOn(dashboardRepository, "getMonthlyFineCollection").mockResolvedValue(mockFines); + + const result = await dashboardService.getMonthlyFineCollection(); + expect(result).toEqual(mockFines); + }); }); }); - describe("getMonthlyFineCollection()", () => { - it("✅ Should pass through financial collection tracking history", async () => { - const mockFines = [ - { month: "2026-01-01", total: 450 } - ] as any; - - // 💡 FIX: Spy on the fine analytics collection method - jest.spyOn(dashboardRepository, "getMonthlyFineCollection").mockResolvedValue(mockFines); - - const result = await dashboardService.getMonthlyFineCollection(); - expect(result).toEqual(mockFines); + // ========================================== + // 🗄️ PART 2: Dashboard Repository Layer Tests + // ========================================== + describe("📙 Dashboard Repository", () => { + + describe("getOverview()", () => { + beforeEach(() => { + // Mock the basic counting functions that execute inside Promise.all + jest.spyOn(Book, "count").mockResolvedValue(10); + jest.spyOn(Member, "count").mockResolvedValue(5); + jest.spyOn(Issue, "count").mockResolvedValue(2); + }); + + it("✅ Should compile aggregate metrics correctly when fine records exist", async () => { + // Mock Fine aggregation finding an active record sum output string + jest.spyOn(Fine, "findOne").mockResolvedValue({ total_unpaid: "250" } as any); + + const overview = await dashboardRepository.getOverview(); + + expect(overview.totalBooks).toBe(10); + expect(overview.unpaidFines).toBe(250); // Confirms numeric conversion occurs smoothly + }); + + // ✨ NEW TEST CASE: Forces coverage of line 72's false branch condition (: 0) + it("✅ Should fallback unpaidFines to 0 if fine collection query returns null", async () => { + // Force the aggregation database response to resolve to null + jest.spyOn(Fine, "findOne").mockResolvedValue(null); + + const overview = await dashboardRepository.getOverview(); + + expect(overview.unpaidFines).toBe(0); // Proves line 72 fallback branch condition works perfectly + }); + }); + + describe("getPopularBooks()", () => { + it("✅ Should execute Book query with descending limit criteria", async () => { + const mockFindAll = jest.spyOn(Book, "findAll").mockResolvedValue([] as any); + + await dashboardRepository.getPopularBooks(); + + expect(mockFindAll).toHaveBeenCalledWith( + expect.objectContaining({ + limit: 5, + order: [["lending_count", "DESC"]], + }) + ); + }); + }); + + describe("getRecentIssues()", () => { + it("✅ Should fetch latest logs with deep relational model inclusion configurations", async () => { + const mockFindAll = jest.spyOn(Issue, "findAll").mockResolvedValue([] as any); + + await dashboardRepository.getRecentIssues(); + + expect(mockFindAll).toHaveBeenCalledWith( + expect.objectContaining({ + limit: 10, + order: [["created_at", "DESC"]], + include: expect.any(Array), + }) + ); + }); + }); + + describe("getMonthlyFineCollection()", () => { + it("✅ Should process historical grouped entries chronologically", async () => { + const mockFindAll = jest.spyOn(Fine, "findAll").mockResolvedValue([] as any); + + await dashboardRepository.getMonthlyFineCollection(); + + expect(mockFindAll).toHaveBeenCalledWith( + expect.objectContaining({ + group: ["month"], + order: expect.any(Array), + }) + ); + }); }); }); }); \ No newline at end of file diff --git a/server/src/modules/issues/issue.spec.ts b/server/src/modules/issues/issue.spec.ts index 663e298..1fde47a 100644 --- a/server/src/modules/issues/issue.spec.ts +++ b/server/src/modules/issues/issue.spec.ts @@ -69,6 +69,19 @@ describe("⚙️ Issues Module - Unit Tests (Service Layer)", () => { ); }); + it("❌ Should use 'Current' as a fallback plan name when the plan has no explicit name assigned", async () => { + jest.spyOn(Member, "findByPk").mockResolvedValue({ + member_id: memberId, + membership_status: "ACTIVE", + membership_plan: { max_books: 2, plan_name: "" }, + } as any); + jest.spyOn(Issue, "count").mockResolvedValue(2); + + await expect(issueService.borrowBook(memberId, bookId)).rejects.toThrow( + /Your Current plan only allows up to 2 books/ + ); + }); + it("❌ Should throw 404 error if targeted book cannot be found", async () => { jest.spyOn(Member, "findByPk").mockResolvedValue({ member_id: memberId, @@ -183,7 +196,6 @@ describe("⚙️ Issues Module - Unit Tests (Service Layer)", () => { jest.spyOn(Book, "findByPk").mockResolvedValue({ book_id: bookId, available_copies: 2 } as any); const bookUpdateSpy = jest.spyOn(Book, "update").mockResolvedValue([1]); - // 💻 FIX: Mock findOrCreate instead of create const fineFindOrCreateSpy = jest.spyOn(Fine, "findOrCreate").mockResolvedValue([{} as any, true]); const result = await issueService.returnBook(issueId); @@ -196,13 +208,33 @@ describe("⚙️ Issues Module - Unit Tests (Service Layer)", () => { expect(result).toHaveProperty("issue_id", issueId); }); + it("✅ Should safely record return info even if the book record was removed from the system completely", async () => { + const futureDueDate = new Date(); + futureDueDate.setDate(futureDueDate.getDate() + 5); + + jest.spyOn(issueRepository, "findIssueById").mockResolvedValue({ + issue_id: issueId, + book_id: bookId, + due_date: futureDueDate, + returned_date: null, + } as any); + jest.spyOn(issueRepository, "returnBook").mockResolvedValue({ issue_id: issueId, returned_date: new Date() } as any); + + jest.spyOn(Book, "findByPk").mockResolvedValue(null); + const bookUpdateSpy = jest.spyOn(Book, "update").mockResolvedValue([0]); + + const result = await issueService.returnBook(issueId); + + expect(bookUpdateSpy).not.toHaveBeenCalled(); + expect(result).toHaveProperty("issue_id", issueId); + }); + it("⚠️ Should generate a cash fine record when returned after the due_date limit", async () => { - // 1. Freeze time jest.useFakeTimers(); const now = new Date('2026-01-05T12:00:00Z'); jest.setSystemTime(now); - const pastDueDate = new Date('2026-01-02T12:00:00Z'); // Exactly 3 days prior + const pastDueDate = new Date('2026-01-02T12:00:00Z'); jest.spyOn(issueRepository, "findIssueById").mockResolvedValue({ issue_id: issueId, @@ -215,12 +247,10 @@ describe("⚙️ Issues Module - Unit Tests (Service Layer)", () => { jest.spyOn(Book, "findByPk").mockResolvedValue({ book_id: bookId, available_copies: 2 } as any); jest.spyOn(Book, "update").mockResolvedValue([1]); - // 💻 FIX: Mock findOrCreate and structure return payload as an execution array tuple const fineFindOrCreateSpy = jest.spyOn(Fine, "findOrCreate").mockResolvedValue([{} as any, true]); await issueService.returnBook(issueId); - // 💻 FIX: Verify findOrCreate is targeted with accurate matching parameter objects expect(fineFindOrCreateSpy).toHaveBeenCalledWith({ where: { issue_id: issueId }, defaults: { @@ -231,7 +261,37 @@ describe("⚙️ Issues Module - Unit Tests (Service Layer)", () => { }, }); - // 2. Cleanup + jest.useRealTimers(); + }); + + // ✨ NEW TEST CASE FOR LINES 126-132: Handles pre-existing fine updates + it("⚠️ Should update or handle an existing fine record if fine is already initialized", async () => { + jest.useFakeTimers(); + const now = new Date('2026-01-05T12:00:00Z'); + jest.setSystemTime(now); + + const pastDueDate = new Date('2026-01-02T12:00:00Z'); + + jest.spyOn(issueRepository, "findIssueById").mockResolvedValue({ + issue_id: issueId, + book_id: bookId, + due_date: pastDueDate, + returned_date: null, + } as any); + + jest.spyOn(issueRepository, "returnBook").mockResolvedValue({ issue_id: issueId, returned_date: now } as any); + jest.spyOn(Book, "findByPk").mockResolvedValue({ book_id: bookId, available_copies: 2 } as any); + jest.spyOn(Book, "update").mockResolvedValue([1]); + + // Mock fine to return created = false (Fine already exists in database) + const mockExistingFine = { + update: jest.fn<() => Promise>().mockResolvedValue({}) +}; + jest.spyOn(Fine, "findOrCreate").mockResolvedValue([mockExistingFine as any, false]); + + await issueService.returnBook(issueId); + + expect(Fine.findOrCreate).toHaveBeenCalled(); jest.useRealTimers(); }); }); diff --git a/server/src/tests/config/validateEnv.spec.ts b/server/src/tests/config/validateEnv.spec.ts new file mode 100644 index 0000000..22d059d --- /dev/null +++ b/server/src/tests/config/validateEnv.spec.ts @@ -0,0 +1,63 @@ +import { jest } from "@jest/globals"; + +describe("validateEnv Unit Tests", () => { + const originalEnv = { ...process.env }; + + beforeEach(() => { + jest.resetModules(); + process.env = {}; + }); + + afterAll(() => { + process.env = originalEnv; + }); + + it("should pass without throwing an error if all required variables are present", async () => { + process.env.PORT = "3000"; + process.env.NODE_ENV = "test"; + process.env.DATABASE_URL = "postgres://localhost:5432/db"; + process.env.JWT_SECRET = "supersecretkey"; + + let error: any = null; + try { + // The query string forces the ESM loader to completely bypass module caching + await import(`../../config/validateEnv.js?update=${Date.now()}`); + } catch (err) { + error = err; + } + + expect(error).toBeNull(); + }); + + it("should throw a specific error if PORT is missing", async () => { + process.env.NODE_ENV = "test"; + process.env.DATABASE_URL = "postgres://localhost:5432/db"; + process.env.JWT_SECRET = "supersecretkey"; + + let error: any = null; + try { + await import(`../../config/validateEnv.js?update=${Date.now()}`); + } catch (err) { + error = err; + } + + expect(error).toBeDefined(); + expect(error.message).toContain("Missing required environment variable: PORT"); + }); + + it("should throw a specific error if JWT_SECRET is missing", async () => { + process.env.PORT = "3000"; + process.env.NODE_ENV = "test"; + process.env.DATABASE_URL = "postgres://localhost:5432/db"; + + let error: any = null; + try { + await import(`../../config/validateEnv.js?update=${Date.now()}`); + } catch (err) { + error = err; + } + + expect(error).toBeDefined(); + expect(error.message).toContain("Missing required environment variable: JWT_SECRET"); + }); +}); \ No newline at end of file diff --git a/server/src/tests/issues/issue.test.ts b/server/src/tests/issues/issue.test.ts index d41d000..4f6c291 100644 --- a/server/src/tests/issues/issue.test.ts +++ b/server/src/tests/issues/issue.test.ts @@ -2,7 +2,7 @@ import request from "supertest"; import app from "../../app.js"; import { getAuthToken } from "../helpers/testAuth.helper.js"; import Issue from "../../database/models/Issue.js"; -import Book from "../../database/models/Book.js"; // 👈 1. Import your Book model here +import Book from "../../database/models/Book.js"; describe("⚙️ Issues Module - Integration Tests", () => { let authToken: string; @@ -17,18 +17,13 @@ describe("⚙️ Issues Module - Integration Tests", () => { beforeAll(async () => { authToken = await getAuthToken(); - // 👈 2. FORCE THE SEED BOOK TO BE AVAILABLE - // Wipe out any lingering uncleaned records matching this test book await Issue.destroy({ where: { book_id: SEED_BOOK_ID } }); - // Directly restock the book inside the database so the borrow endpoint succeeds - // (Verify if your model uses 'available_copies' or just 'total_copies') await Book.update( { available_copies: 5, total_copies: 5 }, { where: { book_id: SEED_BOOK_ID } } ); - // Ensure the target row is reset back to active BORROWED status before running tests await Issue.update( { returned_date: null, @@ -39,12 +34,10 @@ describe("⚙️ Issues Module - Integration Tests", () => { }); afterAll(async () => { - // Clean up only the entry generated dynamically by our borrow route test execution if (newlyBorrowedIssueId) { await Issue.destroy({ where: { issue_id: newlyBorrowedIssueId } }); } - // Reset our seed test row back to its default state for subsequent runs await Issue.update( { returned_date: null, @@ -79,6 +72,32 @@ describe("⚙️ Issues Module - Integration Tests", () => { expect(response.status).toBe(400); }); + + // ✨ NEW INTEGRATION NEGATIVE CASE: Member not found error routing + it("❌ Should return 404 if member does not exist in database", async () => { + const response = await request(app) + .post("/api/v1/issues/borrow") + .set("Authorization", `Bearer ${authToken}`) + .send({ + member_id: "00000000-0000-0000-0000-000000000000", + book_id: SEED_BOOK_ID + }); + + expect(response.status).toBe(404); + }); + + // ✨ NEW INTEGRATION NEGATIVE CASE: Book not found error routing + it("❌ Should return 404 if targeted book does not exist in database", async () => { + const response = await request(app) + .post("/api/v1/issues/borrow") + .set("Authorization", `Bearer ${authToken}`) + .send({ + member_id: SEED_MEMBER_ID, + book_id: "00000000-0000-0000-0000-000000000000" + }); + + expect(response.status).toBe(404); + }); }); describe("POST /api/v1/issues/return", () => { @@ -91,6 +110,26 @@ describe("⚙️ Issues Module - Integration Tests", () => { expect(response.status).toBe(200); expect(response.body.success).toBe(true); }); + + // ✨ NEW INTEGRATION NEGATIVE CASE: Double return error path + it("❌ Should return 400 if trying to return an already returned book record", async () => { + const response = await request(app) + .post("/api/v1/issues/return") + .set("Authorization", `Bearer ${authToken}`) + .send({ issue_id: ACTIVE_ISSUE_ID }); // Second execution on same ID + + expect(response.status).toBe(400); + }); + + // ✨ NEW INTEGRATION NEGATIVE CASE: Record not found path + it("❌ Should return 404 if issue_id does not exist", async () => { + const response = await request(app) + .post("/api/v1/issues/return") + .set("Authorization", `Bearer ${authToken}`) + .send({ issue_id: "00000000-0000-0000-0000-000000000000" }); + + expect(response.status).toBe(404); + }); }); describe("GET /api/v1/issues/member/:memberId", () => { diff --git a/server/src/tests/middlewares/notFoundHandler.spec.ts b/server/src/tests/middlewares/notFoundHandler.spec.ts new file mode 100644 index 0000000..4e09fa1 --- /dev/null +++ b/server/src/tests/middlewares/notFoundHandler.spec.ts @@ -0,0 +1,28 @@ +import { jest } from "@jest/globals"; +import type { Request, Response, NextFunction } from "express"; +import notFoundHandler from "../../middlewares/notFoundHandler.js"; +import AppError from "../../utils/AppError.js"; + +describe("notFoundHandler Unit Tests", () => { + it("should catch an unhandled route and pass an AppError to next()", () => { + const mockRequest = { + originalUrl: "/api/v1/ghost-route", + } as Request; + + const mockResponse = {} as Response; + + // Explicitly create the mock function via the imported jest instance + const mockNext = jest.fn() as unknown as NextFunction; + + notFoundHandler(mockRequest, mockResponse, mockNext); + + expect(mockNext).toHaveBeenCalledTimes(1); + + // Extracting the argument safely for type-checking assertions + const errorPassed = (mockNext as any).mock.calls[0][0]; + + expect(errorPassed).toBeInstanceOf(AppError); + expect(errorPassed.message).toBe("Route /api/v1/ghost-route not found"); + expect(errorPassed.statusCode).toBe(404); + }); +}); \ No newline at end of file diff --git a/server/src/tests/runTests.ts b/server/src/tests/runTests.ts index b2935a7..5b84b46 100644 --- a/server/src/tests/runTests.ts +++ b/server/src/tests/runTests.ts @@ -7,8 +7,12 @@ import { execSync } from 'child_process'; import { Op } from 'sequelize'; async function bootstrapSuite() { - console.log('\n🚀 [Test Runner]: Initializing testing database connection pool...'); - + + const dbUrl = process.env.DATABASE_URL || 'your_local_db_config'; + + async function bootstrapSuite() { + console.log(`\n🚀 [Test Runner]: Targeting database at ${process.env.DATABASE_URL ? 'CI Environment' : 'Local Environment'}`); + try { // 1. Authenticate & Sync database await sequelize.authenticate(); @@ -51,4 +55,4 @@ async function bootstrapSuite() { } } -bootstrapSuite(); \ No newline at end of file +bootstrapSuite();} \ No newline at end of file From 387761c1342668816e78c3dea675fa696e241fbb Mon Sep 17 00:00:00 2001 From: Yogeshwaran S Date: Mon, 1 Jun 2026 16:06:42 +0530 Subject: [PATCH 44/87] ci: implement full backend test suite and github actions pipeline - Add automated CI pipeline with postgres service container --- .github/workflows/ci.yml | 44 ++++++++++++++++++++++++++++++---------- 1 file changed, 33 insertions(+), 11 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index e80e63a..6f68e3f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -2,18 +2,27 @@ name: Backend CI Pipeline on: push: - branches: - - main - - develop - + branches: [ main, develop ] pull_request: - branches: - - main - - develop + branches: [ main, develop ] jobs: backend-ci: runs-on: ubuntu-latest + services: + postgres: + image: postgres:15 + env: + POSTGRES_USER: test_user + POSTGRES_PASSWORD: test_password + POSTGRES_DB: test_db + ports: + - 5432:5432 + options: >- + --health-cmd pg_isready + --health-interval 10s + --health-timeout 5s + --health-retries 5 defaults: run: @@ -25,15 +34,28 @@ jobs: - name: Setup Node.js uses: actions/setup-node@v4 - with: node-version: 22 + cache: 'npm' - name: Install Dependencies run: npm install - name: Run TypeScript Build run: npm run build - - - name: Run Tests - run: npm run test \ No newline at end of file + - name: Seed Database + run: | + # Use psql to execute the seed file + # We use the service credentials defined earlier + PGPASSWORD=test_password psql -h localhost -U test_user -d test_db -f src/database/seeders/seed.sql + env: + # This ensures psql can find the database if needed, + # though the command line flags cover it. + DATABASE_URL: postgresql://test_user:test_password@localhost:5432/test_db + - name: Run Unit Tests + run: npm run test:unit + - name: Run Integration Tests + run: npm run test:integration + env: + DATABASE_URL: postgresql://test_user:test_password@localhost:5432/test_db + NODE_ENV: test \ No newline at end of file From 5b78f2aac99287074ab10beacfc7870380dcf2ba Mon Sep 17 00:00:00 2001 From: Yogeshwaran S Date: Tue, 2 Jun 2026 10:44:55 +0530 Subject: [PATCH 45/87] chore: initialize dashboard --- client/src/api/axiosClient.ts | 40 ++++++++ .../dashboard/components/MetricsGrid.tsx | 38 ++++++++ .../dashboard/components/OverdueTable.tsx | 46 ++++++++++ client/src/index.css | 19 +++- client/src/layouts/DashboardLayout.tsx | 92 +++++++++++++++++++ client/src/pages/Dashboard.tsx | 37 ++++++++ client/src/routes/ProtectedGuard.tsx | 8 ++ client/src/routes/PublicGuard.tsx | 8 ++ client/src/store/authStore.ts | 27 ++++++ client/src/tests/authStore.test.ts | 27 ++++++ client/src/types/schemas.ts | 28 ++++++ 11 files changed, 369 insertions(+), 1 deletion(-) create mode 100644 client/src/api/axiosClient.ts create mode 100644 client/src/features/dashboard/components/MetricsGrid.tsx create mode 100644 client/src/features/dashboard/components/OverdueTable.tsx create mode 100644 client/src/layouts/DashboardLayout.tsx create mode 100644 client/src/pages/Dashboard.tsx create mode 100644 client/src/routes/ProtectedGuard.tsx create mode 100644 client/src/routes/PublicGuard.tsx create mode 100644 client/src/store/authStore.ts create mode 100644 client/src/tests/authStore.test.ts create mode 100644 client/src/types/schemas.ts diff --git a/client/src/api/axiosClient.ts b/client/src/api/axiosClient.ts new file mode 100644 index 0000000..c74425c --- /dev/null +++ b/client/src/api/axiosClient.ts @@ -0,0 +1,40 @@ +import axios, { type AxiosInstance, type InternalAxiosRequestConfig } from "axios"; +import { useAuthStore } from "../store/authStore"; +import { toast } from "sonner"; + +export const axiosClient: AxiosInstance = axios.create({ + baseURL: import.meta.env.VITE_API_BASE_URL || "http://localhost:5000/api", + timeout: 10000, + headers: { + "Content-Type": "application/json", + }, +}); + +// Interceptor to inject bearer token before request hits the network +axiosClient.interceptors.request.use( + (config: InternalAxiosRequestConfig) => { + const token = useAuthStore.getState().token; + if (token && config.headers) { + config.headers.Authorization = `Bearer ${token}`; + } + return config; + }, + (error) => Promise.reject(error) +); + +// Interceptor to globalize exception management (e.g., handling token expirations) +axiosClient.interceptors.response.use( + (response) => response, + (error) => { + const status = error.response?.status; + if (status === 401) { + toast.error("Session expired. Re-authenticating..."); + useAuthStore.getState().logout(); + } else if (status === 403) { + toast.error("Unauthorized operation blocked."); + } else { + toast.error(error.response?.data?.message || "An unexpected network anomaly occurred."); + } + return Promise.reject(error); + } +); \ No newline at end of file diff --git a/client/src/features/dashboard/components/MetricsGrid.tsx b/client/src/features/dashboard/components/MetricsGrid.tsx new file mode 100644 index 0000000..38de71d --- /dev/null +++ b/client/src/features/dashboard/components/MetricsGrid.tsx @@ -0,0 +1,38 @@ +interface MetricCardProps { + title: string; + value: string | number; + subtext?: string; + bgClass: string; + icon: string; +} + +interface DashboardSummary { + totalBooks?: number; + availableBooks?: number; + activeMembers?: number; + overdueCount?: string | number; + totalFines?: number; +} + +const MetricCard = ({ title, value, subtext, bgClass, icon }: MetricCardProps) => ( +
+
+ {title} +
{value}
+ {subtext &&

{subtext}

} +
+
{icon}
+
+); + +export const MetricsGrid = ({ data }: { data: DashboardSummary | undefined }) => { + return ( +
+ + + + + +
+ ); +}; \ No newline at end of file diff --git a/client/src/features/dashboard/components/OverdueTable.tsx b/client/src/features/dashboard/components/OverdueTable.tsx new file mode 100644 index 0000000..34cca6f --- /dev/null +++ b/client/src/features/dashboard/components/OverdueTable.tsx @@ -0,0 +1,46 @@ +interface OverdueRecord { + title: string; + borrower: string; + dueDate: string; + daysLate: number; + fine: number; +} + +export const OverdueTable = ({ records }: { records?: OverdueRecord[] }) => { + // Fallback structural matrix placeholder matching image blueprint data + const fallbackRecords: OverdueRecord[] = [ + { title: "Harry Potter and the Sorcerer's Stone", borrower: "102 (Raj)", dueDate: "29 May", daysLate: 5, fine: 50 }, + { title: "Harry Potter and the Chamber of Secrets", borrower: "102 (Raj)", dueDate: "29 May", daysLate: 5, fine: 50 }, + { title: "The Book Book", borrower: "103 (Raj)", dueDate: "29 May", daysLate: 5, fine: 50 }, + { title: "Maxitime and the Future", borrower: "103 (Raj)", dueDate: "29 May", daysLate: 1, fine: 20 }, + ]; + + const dataList = records || fallbackRecords; + + return ( +
+ + + + + + + + + + + + {dataList.map((row, idx) => ( + + + + + + + + ))} + +
Book TitleBorrowed By (Member ID)Due DateDays LateCalculated Fine (₹)
{row.title}{row.borrower}{row.dueDate}{row.daysLate} days₹{row.fine}
+
+ ); +}; \ No newline at end of file diff --git a/client/src/index.css b/client/src/index.css index a461c50..8045035 100644 --- a/client/src/index.css +++ b/client/src/index.css @@ -1 +1,18 @@ -@import "tailwindcss"; \ No newline at end of file +@import "tailwindcss"; + +@theme { + --color-brand-primary: #0056b3; + --color-brand-secondary: #f8f9fa; + --color-text-dark: #212529; + --color-border-light: #e9ecef; + + --font-sans: "Inter", system-ui, sans-serif; +} + +/* Custom global layout settings */ +body { + background-color: #f3f4f6; + color: var(--color-text-dark); + font-family: var(--font-sans); + margin: 0; +} \ No newline at end of file diff --git a/client/src/layouts/DashboardLayout.tsx b/client/src/layouts/DashboardLayout.tsx new file mode 100644 index 0000000..ca1e413 --- /dev/null +++ b/client/src/layouts/DashboardLayout.tsx @@ -0,0 +1,92 @@ +import { Outlet, NavLink, useNavigate } from "react-router-dom"; +import { useAuthStore } from "../store/authStore"; +import { motion } from "framer-motion"; + +export const DashboardLayout = () => { + const { user, logout } = useAuthStore(); + const navigate = useNavigate(); + + const handleSignOut = () => { + logout(); + navigate("/login"); + }; + + const navItems = [ + { name: "Dashboard", path: "/dashboard", icon: "📊" }, + { name: "Manage Members", path: "/members", icon: "👥" }, + { name: "Manage Books", path: "/books", icon: "📚" }, + { name: "Transactions (Borrow/Return)", path: "/transactions", icon: "🔄" }, + { name: "Fines & Payments", path: "/fines", icon: "💳" }, + ]; + + return ( +
+ {/* Sidebar Navigation */} + + + {/* Main Structural Area */} +
+ {/* Top Navigation Frame */} +
+
+

Library Management System - Dashboard

+

Internship Capstone Project - Day 7: Reports & Metrics

+
+
+
+

Logged in as: {user?.email}

+

Role: {user?.role || "LIBRARIAN"}

+
+
+ 🎓 +
+
+
+ + {/* Content View Injection Portal */} +
+ + + +
+
+
+ ); +}; \ No newline at end of file diff --git a/client/src/pages/Dashboard.tsx b/client/src/pages/Dashboard.tsx new file mode 100644 index 0000000..4018225 --- /dev/null +++ b/client/src/pages/Dashboard.tsx @@ -0,0 +1,37 @@ +import { MetricsGrid } from "../features/dashboard/components/MetricsGrid"; +import { OverdueTable } from "../features/dashboard/components/OverdueTable"; +import { useQuery } from "@tanstack/react-query"; +import { axiosClient } from "../api/axiosClient"; + +export const Dashboard = () => { + // TanStack Query pipeline to harvest live server dataset asynchronously + const { data: metrics, isLoading } = useQuery({ + queryKey: ["dashboardMetrics"], + queryFn: async () => { + const res = await axiosClient.get("/dashboard/metrics"); + return res.data; + } + }); + + if (isLoading) { + return ( +
+
+
+ ); + } + + return ( +
+
+

Key Metrics

+ +
+ +
+

Overdue Books

+ +
+
+ ); +}; \ No newline at end of file diff --git a/client/src/routes/ProtectedGuard.tsx b/client/src/routes/ProtectedGuard.tsx new file mode 100644 index 0000000..fe2ea64 --- /dev/null +++ b/client/src/routes/ProtectedGuard.tsx @@ -0,0 +1,8 @@ +import { Navigate, Outlet } from "react-router-dom"; +import { useAuthStore } from "../store/authStore"; + +export const ProtectedGuard = () => { + const isAuthenticated = useAuthStore((state) => state.isAuthenticated); + + return isAuthenticated ? : ; +}; \ No newline at end of file diff --git a/client/src/routes/PublicGuard.tsx b/client/src/routes/PublicGuard.tsx new file mode 100644 index 0000000..5683bfe --- /dev/null +++ b/client/src/routes/PublicGuard.tsx @@ -0,0 +1,8 @@ +import { Navigate, Outlet } from "react-router-dom"; +import { useAuthStore } from "../store/authStore"; + +export const PublicGuard = () => { + const isAuthenticated = useAuthStore((state) => state.isAuthenticated); + + return !isAuthenticated ? : ; +}; \ No newline at end of file diff --git a/client/src/store/authStore.ts b/client/src/store/authStore.ts new file mode 100644 index 0000000..79ef538 --- /dev/null +++ b/client/src/store/authStore.ts @@ -0,0 +1,27 @@ +import { create } from "zustand"; +import { persist, createJSONStorage } from "zustand/middleware"; +import type { UserSession } from "../types/schemas"; + +interface AuthState { + user: UserSession | null; + token: string | null; + isAuthenticated: boolean; + setAuth: (user: UserSession, token: string) => void; + logout: () => void; +} + +export const useAuthStore = create()( + persist( + (set) => ({ + user: null, + token: null, + isAuthenticated: false, + setAuth: (user, token) => set({ user, token, isAuthenticated: true }), + logout: () => set({ user: null, token: null, isAuthenticated: false }), + }), + { + name: "lms-auth-storage", + storage: createJSONStorage(() => localStorage), + } + ) +); \ No newline at end of file diff --git a/client/src/tests/authStore.test.ts b/client/src/tests/authStore.test.ts new file mode 100644 index 0000000..23da01b --- /dev/null +++ b/client/src/tests/authStore.test.ts @@ -0,0 +1,27 @@ +import { describe, it, expect, beforeEach } from "vitest"; +import { useAuthStore } from "../store/authStore"; + +describe("State Machine Verification Suite: Auth Zustand Slice", () => { + beforeEach(() => { + useAuthStore.getState().logout(); + }); + + it("should initialize with default unauthorized state parameters", () => { + const state = useAuthStore.getState(); + expect(state.user).toBeNull(); + expect(state.isAuthenticated).toBe(false); + expect(state.token).toBeNull(); + }); + + it("should capture credentials and update authentication parameters on successful setAuth", () => { + const mockUser = { id: "USR-001", email: "librarian@library.com", role: "LIBRARIAN" as const }; + const mockToken = "jwt-secret-payload-tokenstring"; + + useAuthStore.getState().setAuth(mockUser, mockToken); + + const updatedState = useAuthStore.getState(); + expect(updatedState.isAuthenticated).toBe(true); + expect(updatedState.user?.email).toBe("librarian@library.com"); + expect(updatedState.token).toBe(mockToken); + }); +}); \ No newline at end of file diff --git a/client/src/types/schemas.ts b/client/src/types/schemas.ts new file mode 100644 index 0000000..a17d276 --- /dev/null +++ b/client/src/types/schemas.ts @@ -0,0 +1,28 @@ +import { z } from "zod"; + +const passwordRegex = /^(?=.*[a-z])(?=.*[A-Z])(?=.*\d)(?=.*[@$!%*?&#])[A-Za-z\d@$!%*?&#]{8,}$/; +const emailRegex = /^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,}$/; + + +export const LoginSchema = z.object({ + email: z + .string() + .min(1, { message: "Email field cannot be empty" }) + .regex(emailRegex,{ + message: "Use the valid email format sample@gmail.com" + }), + password: z + .string() + .min(8, { message: "Security standard requires at least 8 characters" }) + .regex(passwordRegex, { + message: "Password must include at least one uppercase letter, one lowercase letter, one number, and one special character.", + }), +}); + +export type LoginCredentials = z.infer; + +export interface UserSession { + id: string; + email: string; + role: "ADMIN" | "LIBRARIAN"; +} \ No newline at end of file From 30ee7cb4636d87876a28d1fec0162e90d73260ff Mon Sep 17 00:00:00 2001 From: Yogeshwaran S Date: Tue, 2 Jun 2026 11:30:38 +0530 Subject: [PATCH 46/87] feat(auth): integrate strict rbac login view with safe zod typeguards and tailwind v4 layouts --- client/src/features/auth/pages/Login.tsx | 207 +++++++++++++++++++++++ client/src/index.css | 7 +- client/src/routes/AppRoutes.tsx | 32 ++++ client/src/types/schemas.ts | 3 + 4 files changed, 248 insertions(+), 1 deletion(-) create mode 100644 client/src/features/auth/pages/Login.tsx create mode 100644 client/src/routes/AppRoutes.tsx diff --git a/client/src/features/auth/pages/Login.tsx b/client/src/features/auth/pages/Login.tsx new file mode 100644 index 0000000..ba1c36c --- /dev/null +++ b/client/src/features/auth/pages/Login.tsx @@ -0,0 +1,207 @@ +import React, { useState } from "react"; +import axios from "axios"; +import { useNavigate } from "react-router-dom"; +import { useAuthStore } from "../../../store/authStore"; +import { axiosClient } from "../../../api/axiosClient"; +import { LoginSchema } from "../../../types/schemas"; +import { toast } from "sonner"; +import { motion } from "framer-motion"; + +export const Login = () => { + const navigate = useNavigate(); + const setAuth = useAuthStore((state) => state.setAuth); + + // Form Field Tracking Configuration states + const [email, setEmail] = useState(""); + const [password, setPassword] = useState(""); + const [selectedRole, setSelectedRole] = useState<"ADMIN" | "LIBRARIAN">("LIBRARIAN"); + + // UI Presentation States + const [showPassword, setShowPassword] = useState(false); + const [isLoading, setIsLoading] = useState(false); + const [fieldErrors, setFieldErrors] = useState<{ email?: string; password?: string }>({}); + + const handleFormSubmission = async (e: React.FormEvent) => { + e.preventDefault(); + setIsLoading(true); + setFieldErrors({}); + + // 1. Client-Side Parsing via Zod Engine Engine + const parsingResults = LoginSchema.safeParse({ + email, + password, + role: selectedRole, + }); + + if (!parsingResults.success) { + const structuredErrors: { email?: string; password?: string } = {}; + parsingResults.error.issues.forEach((err) => { + if (err.path[0] === "email") structuredErrors.email = err.message; + if (err.path[0] === "password") structuredErrors.password = err.message; + }); + setFieldErrors(structuredErrors); + setIsLoading(false); + toast.error("Validation validation failed. Please address layout errors."); + return; + } + + // 2. Transmit Handshake request to the backend REST API + try { + const networkResponse = await axiosClient.post("/auth/login", { + email, + password, + role: selectedRole, + }); + + const { user, token } = networkResponse.data; + + // Commit the session credentials to global memory storage + setAuth(user, token); + toast.success("Security authorization handshake complete!"); + + // Dynamic operational routing redirection path choice + navigate("/dashboard"); + } catch (error: unknown) { // FIX (ESLint): Changed from 'any' to 'unknown' + console.error("Login authorization collapse anomaly:", error); + + // FIX (ESLint): Safe Type-Guarded extraction parsing + if (axios.isAxiosError(error)) { + toast.error(error.response?.data?.message || "Invalid account credentials."); + } else { + toast.error("An unexpected infrastructure error occurred."); + } + } finally { + setIsLoading(false); + } + }; + + return ( +
+ {/* Decorative Branding Background Blobs */} +
+
+ + + {/* Core Presentation Branding Shield */} +
+
+ 📚 +
+

System Core Authentication

+

Enterprise Library Management Core Shell Portal

+
+ +
+ {/* RBAC Role Selector Tabs System */} +
+ +
+ + +
+
+ + {/* Email Destination Input Structure */} +
+ +
+ ✉️ + setEmail(e.target.value)} + className={`w-full pl-9 pr-4 py-2.5 bg-gray-50 border rounded-xl text-sm transition-all outline-none focus:bg-white focus:ring-2 ${ + fieldErrors.email + ? "border-red-400 focus:ring-red-100 focus:border-red-500" + : "border-gray-200 focus:ring-teal-100 focus:border-teal-brand" + }`} + /> +
+ {fieldErrors.email &&

{fieldErrors.email}

} +
+ + {/* Password Security Input Structure with Visibility Toggle */} +
+
+ + +
+
+ 🔒 + setPassword(e.target.value)} + className={`w-full pl-9 pr-10 py-2.5 bg-gray-50 border rounded-xl text-sm transition-all outline-none focus:bg-white focus:ring-2 ${ + fieldErrors.password + ? "border-red-400 focus:ring-red-100 focus:border-red-500" + : "border-gray-200 focus:ring-teal-100 focus:border-teal-brand" + }`} + /> + +
+ {fieldErrors.password &&

{fieldErrors.password}

} +
+ + {/* Core Submission Trigger Module */} + +
+ +
+ ); +}; \ No newline at end of file diff --git a/client/src/index.css b/client/src/index.css index 8045035..e93d950 100644 --- a/client/src/index.css +++ b/client/src/index.css @@ -6,10 +6,15 @@ --color-text-dark: #212529; --color-border-light: #e9ecef; + /* Modern Professional Corporate Color Palette */ + --color-ocean-blue: #0f172a; /* Deep slate-tinted ocean blue background */ + --color-ocean-light: #1e293b; /* Shaded panel blue */ + --color-teal-brand: #0d9488; /* Primary component teal-600 buttons */ + --color-teal-hover: #0f766e; /* Secondary focus teal-700 hover states */ + --font-sans: "Inter", system-ui, sans-serif; } -/* Custom global layout settings */ body { background-color: #f3f4f6; color: var(--color-text-dark); diff --git a/client/src/routes/AppRoutes.tsx b/client/src/routes/AppRoutes.tsx new file mode 100644 index 0000000..3ff60a4 --- /dev/null +++ b/client/src/routes/AppRoutes.tsx @@ -0,0 +1,32 @@ +import { BrowserRouter, Routes, Route, Navigate } from "react-router-dom"; +import { PublicGuard } from "./PublicGuard"; +import { ProtectedGuard } from "./ProtectedGuard"; +import { DashboardLayout } from "../layouts/DashboardLayout"; +import { Dashboard } from "../pages/Dashboard"; +import { Login } from "../features/auth/pages/Login"; + +export const AppRoutes = () => { + return ( + + + {/* Open Public Domain Boundaries */} + }> + } /> + + + {/* Shielded Secure Corporate Environment Boundary */} + }> + }> + } /> + Members System Submodule View Container
} /> + Books Submodule View Container
} /> + Lending Transactions Registry View Container} /> + Automated Fines & Billing Panel Audit Container} /> + + + + } /> + + + ); +}; \ No newline at end of file diff --git a/client/src/types/schemas.ts b/client/src/types/schemas.ts index a17d276..f63bd32 100644 --- a/client/src/types/schemas.ts +++ b/client/src/types/schemas.ts @@ -17,6 +17,9 @@ export const LoginSchema = z.object({ .regex(passwordRegex, { message: "Password must include at least one uppercase letter, one lowercase letter, one number, and one special character.", }), + role: z.enum(["ADMIN", "LIBRARIAN"], { + error: "Please select an operational access profile", + }), }); export type LoginCredentials = z.infer; From a46c854966813ffed8059aa2b4adfd64cb57bb91 Mon Sep 17 00:00:00 2001 From: Yogeshwaran S Date: Tue, 2 Jun 2026 11:50:29 +0530 Subject: [PATCH 47/87] feat(dashboard): wire up tanstack data fetching engine with strict types and overdue analytics tables --- .../dashboard/components/MetricsGrid.tsx | 62 +- .../dashboard/components/OverdueTable.tsx | 69 +- client/src/pages/Dashboard.tsx | 58 +- client/src/types/dashboard.ts | 24 + package-lock.json | 857 ++++++++++++++++++ package.json | 4 +- 6 files changed, 1005 insertions(+), 69 deletions(-) create mode 100644 client/src/types/dashboard.ts diff --git a/client/src/features/dashboard/components/MetricsGrid.tsx b/client/src/features/dashboard/components/MetricsGrid.tsx index 38de71d..d53f69f 100644 --- a/client/src/features/dashboard/components/MetricsGrid.tsx +++ b/client/src/features/dashboard/components/MetricsGrid.tsx @@ -1,3 +1,5 @@ +import type { DashboardSummaryMetrics } from "../../../types/dashboard"; + interface MetricCardProps { title: string; value: string | number; @@ -6,33 +8,53 @@ interface MetricCardProps { icon: string; } -interface DashboardSummary { - totalBooks?: number; - availableBooks?: number; - activeMembers?: number; - overdueCount?: string | number; - totalFines?: number; -} - const MetricCard = ({ title, value, subtext, bgClass, icon }: MetricCardProps) => ( -
+
- {title} -
{value}
- {subtext &&

{subtext}

} + {title} +
{value}
+ {subtext &&

{subtext}

}
-
{icon}
+
{icon}
); -export const MetricsGrid = ({ data }: { data: DashboardSummary | undefined }) => { +export const MetricsGrid = ({ data }: { data: DashboardSummaryMetrics | undefined }) => { return ( -
- - - - - +
+ + + + +
); }; \ No newline at end of file diff --git a/client/src/features/dashboard/components/OverdueTable.tsx b/client/src/features/dashboard/components/OverdueTable.tsx index 34cca6f..e6b7c73 100644 --- a/client/src/features/dashboard/components/OverdueTable.tsx +++ b/client/src/features/dashboard/components/OverdueTable.tsx @@ -1,42 +1,47 @@ -interface OverdueRecord { - title: string; - borrower: string; - dueDate: string; - daysLate: number; - fine: number; -} +import type { OverdueRecord } from "../../../types/dashboard"; -export const OverdueTable = ({ records }: { records?: OverdueRecord[] }) => { - // Fallback structural matrix placeholder matching image blueprint data - const fallbackRecords: OverdueRecord[] = [ - { title: "Harry Potter and the Sorcerer's Stone", borrower: "102 (Raj)", dueDate: "29 May", daysLate: 5, fine: 50 }, - { title: "Harry Potter and the Chamber of Secrets", borrower: "102 (Raj)", dueDate: "29 May", daysLate: 5, fine: 50 }, - { title: "The Book Book", borrower: "103 (Raj)", dueDate: "29 May", daysLate: 5, fine: 50 }, - { title: "Maxitime and the Future", borrower: "103 (Raj)", dueDate: "29 May", daysLate: 1, fine: 20 }, - ]; - - const dataList = records || fallbackRecords; +export const OverdueTable = ({ records }: { records: OverdueRecord[] | undefined }) => { + if (!records || records.length === 0) { + return ( +
+

System verification clear: No overdue inventory items currently registered.

+
+ ); + } return ( -
+
- - - - - - + + + + + + - - {dataList.map((row, idx) => ( - - - - - - + + {records.map((row) => ( + + + + + + ))} diff --git a/client/src/pages/Dashboard.tsx b/client/src/pages/Dashboard.tsx index 4018225..ce382c4 100644 --- a/client/src/pages/Dashboard.tsx +++ b/client/src/pages/Dashboard.tsx @@ -1,36 +1,62 @@ -import { MetricsGrid } from "../features/dashboard/components/MetricsGrid"; -import { OverdueTable } from "../features/dashboard/components/OverdueTable"; import { useQuery } from "@tanstack/react-query"; import { axiosClient } from "../api/axiosClient"; +import { MetricsGrid } from "../features/dashboard/components/MetricsGrid"; +import { OverdueTable } from "../features/dashboard/components/OverdueTable"; +import type { DashboardApiResponse } from "../types/dashboard"; export const Dashboard = () => { - // TanStack Query pipeline to harvest live server dataset asynchronously - const { data: metrics, isLoading } = useQuery({ - queryKey: ["dashboardMetrics"], + // Declarative query controller management pipeline + const { data, isLoading, isError } = useQuery({ + queryKey: ["dashboardAnalyticsDataset"], queryFn: async () => { - const res = await axiosClient.get("/dashboard/metrics"); - return res.data; - } + const response = await axiosClient.get("/dashboard/metrics"); + return response.data; + }, + staleTime: 1000 * 60 * 5, // Data remains fresh for 5 minutes before background updates trigger + refetchOnWindowFocus: true, // Automatically updates the data grid whenever you focus back on the tab }); if (isLoading) { return ( -
-
+
+
+

+ Syncing Server Assets Ledger... +

+
+ ); + } + + if (isError) { + return ( +
+ ⚠️ +

API Connection Interrupted

+

+ The system was unable to pull current library analytics. Verify your local database connectivity status or check server engine logs. +

); } return ( -
+
+ {/* Structural Block 1: Real-time Metric Indicators */}
-

Key Metrics

- +
+

System Operational Indices

+

Real-time status tracking for book inventory and memberships.

+
+
-
-

Overdue Books

- + {/* Structural Block 2: Overdue Ledger List View */} +
+
+

Critical Overdue Registry Log

+

Active monitoring registry for overdue student returns and penalty generation rules.

+
+
); diff --git a/client/src/types/dashboard.ts b/client/src/types/dashboard.ts new file mode 100644 index 0000000..9d1b938 --- /dev/null +++ b/client/src/types/dashboard.ts @@ -0,0 +1,24 @@ +export interface OverdueRecord { + id: string; + title: string; + borrowerName: string; + memberId: string; + dueDate: string; + daysLate: number; + fineAmount: number; +} + +export interface DashboardSummaryMetrics { + totalBooks: number; + totalCopies: number; + availableBooks: number; + activeMembers: number; + overdueCount: number; + overduePercentage: number; + totalOutstandingFines: number; +} + +export interface DashboardApiResponse { + summary: DashboardSummaryMetrics; + overdueBooks: OverdueRecord[]; +} \ No newline at end of file diff --git a/package-lock.json b/package-lock.json index 93a151d..424db8b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -11,6 +11,7 @@ "devDependencies": { "@commitlint/cli": "^21.0.1", "@commitlint/config-conventional": "^21.0.1", + "eslint": "^10.4.1", "husky": "^9.1.7", "lint-staged": "^17.0.5" } @@ -317,6 +318,179 @@ } } }, + "node_modules/@eslint-community/eslint-utils": { + "version": "4.9.1", + "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.9.1.tgz", + "integrity": "sha512-phrYmNiYppR7znFEdqgfWHXR6NCkZEK7hwWDHZUjit/2/U0r6XvkDl0SYnoM51Hq7FhCGdLDT6zxCCOY1hexsQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "eslint-visitor-keys": "^3.4.3" + }, + "engines": { + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + }, + "funding": { + "url": "https://opencollective.com/eslint" + }, + "peerDependencies": { + "eslint": "^6.0.0 || ^7.0.0 || >=8.0.0" + } + }, + "node_modules/@eslint-community/eslint-utils/node_modules/eslint-visitor-keys": { + "version": "3.4.3", + "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz", + "integrity": "sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==", + "dev": true, + "license": "Apache-2.0", + "engines": { + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + }, + "funding": { + "url": "https://opencollective.com/eslint" + } + }, + "node_modules/@eslint-community/regexpp": { + "version": "4.12.2", + "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.12.2.tgz", + "integrity": "sha512-EriSTlt5OC9/7SXkRSCAhfSxxoSUgBm33OH+IkwbdpgoqsSsUg7y3uh+IICI/Qg4BBWr3U2i39RpmycbxMq4ew==", + "dev": true, + "license": "MIT", + "engines": { + "node": "^12.0.0 || ^14.0.0 || >=16.0.0" + } + }, + "node_modules/@eslint/config-array": { + "version": "0.23.5", + "resolved": "https://registry.npmjs.org/@eslint/config-array/-/config-array-0.23.5.tgz", + "integrity": "sha512-Y3kKLvC1dvTOT+oGlqNQ1XLqK6D1HU2YXPc52NmAlJZbMMWDzGYXMiPRJ8TYD39muD/OTjlZmNJ4ib7dvSrMBA==", + "dev": true, + "license": "Apache-2.0", + "dependencies": { + "@eslint/object-schema": "^3.0.5", + "debug": "^4.3.1", + "minimatch": "^10.2.4" + }, + "engines": { + "node": "^20.19.0 || ^22.13.0 || >=24" + } + }, + "node_modules/@eslint/config-helpers": { + "version": "0.6.0", + "resolved": "https://registry.npmjs.org/@eslint/config-helpers/-/config-helpers-0.6.0.tgz", + "integrity": "sha512-ii6Bw9jJ2zi2cWA2Z+9/QZ/+3DX6kwaV5Q986D/CdP3Lap3w/pgQZ373FV7byY/i7L4IRH/G43I5dz1ClsCbpA==", + "dev": true, + "license": "Apache-2.0", + "dependencies": { + "@eslint/core": "^1.2.1" + }, + "engines": { + "node": "^20.19.0 || ^22.13.0 || >=24" + } + }, + "node_modules/@eslint/core": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/@eslint/core/-/core-1.2.1.tgz", + "integrity": "sha512-MwcE1P+AZ4C6DWlpin/OmOA54mmIZ/+xZuJiQd4SyB29oAJjN30UW9wkKNptW2ctp4cEsvhlLY/CsQ1uoHDloQ==", + "dev": true, + "license": "Apache-2.0", + "dependencies": { + "@types/json-schema": "^7.0.15" + }, + "engines": { + "node": "^20.19.0 || ^22.13.0 || >=24" + } + }, + "node_modules/@eslint/object-schema": { + "version": "3.0.5", + "resolved": "https://registry.npmjs.org/@eslint/object-schema/-/object-schema-3.0.5.tgz", + "integrity": "sha512-vqTaUEgxzm+YDSdElad6PiRoX4t8VGDjCtt05zn4nU810UIx/uNEV7/lZJ6KwFThKZOzOxzXy48da+No7HZaMw==", + "dev": true, + "license": "Apache-2.0", + "engines": { + "node": "^20.19.0 || ^22.13.0 || >=24" + } + }, + "node_modules/@eslint/plugin-kit": { + "version": "0.7.2", + "resolved": "https://registry.npmjs.org/@eslint/plugin-kit/-/plugin-kit-0.7.2.tgz", + "integrity": "sha512-+CNAzxglkrpNf/kKywqQfk74QjtceuOE7Qm+AF8miRvPF/wmmK5+OJOgVh3AVTT3RP2mH3+FOaxlE5v72owk0A==", + "dev": true, + "license": "Apache-2.0", + "dependencies": { + "@eslint/core": "^1.2.1", + "levn": "^0.4.1" + }, + "engines": { + "node": "^20.19.0 || ^22.13.0 || >=24" + } + }, + "node_modules/@humanfs/core": { + "version": "0.19.2", + "resolved": "https://registry.npmjs.org/@humanfs/core/-/core-0.19.2.tgz", + "integrity": "sha512-UhXNm+CFMWcbChXywFwkmhqjs3PRCmcSa/hfBgLIb7oQ5HNb1wS0icWsGtSAUNgefHeI+eBrA8I1fxmbHsGdvA==", + "dev": true, + "license": "Apache-2.0", + "dependencies": { + "@humanfs/types": "^0.15.0" + }, + "engines": { + "node": ">=18.18.0" + } + }, + "node_modules/@humanfs/node": { + "version": "0.16.8", + "resolved": "https://registry.npmjs.org/@humanfs/node/-/node-0.16.8.tgz", + "integrity": "sha512-gE1eQNZ3R++kTzFUpdGlpmy8kDZD/MLyHqDwqjkVQI0JMdI1D51sy1H958PNXYkM2rAac7e5/CnIKZrHtPh3BQ==", + "dev": true, + "license": "Apache-2.0", + "dependencies": { + "@humanfs/core": "^0.19.2", + "@humanfs/types": "^0.15.0", + "@humanwhocodes/retry": "^0.4.0" + }, + "engines": { + "node": ">=18.18.0" + } + }, + "node_modules/@humanfs/types": { + "version": "0.15.0", + "resolved": "https://registry.npmjs.org/@humanfs/types/-/types-0.15.0.tgz", + "integrity": "sha512-ZZ1w0aoQkwuUuC7Yf+7sdeaNfqQiiLcSRbfI08oAxqLtpXQr9AIVX7Ay7HLDuiLYAaFPu8oBYNq/QIi9URHJ3Q==", + "dev": true, + "license": "Apache-2.0", + "engines": { + "node": ">=18.18.0" + } + }, + "node_modules/@humanwhocodes/module-importer": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz", + "integrity": "sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA==", + "dev": true, + "license": "Apache-2.0", + "engines": { + "node": ">=12.22" + }, + "funding": { + "type": "github", + "url": "https://github.com/sponsors/nzakas" + } + }, + "node_modules/@humanwhocodes/retry": { + "version": "0.4.3", + "resolved": "https://registry.npmjs.org/@humanwhocodes/retry/-/retry-0.4.3.tgz", + "integrity": "sha512-bV0Tgo9K4hfPCek+aMAn81RppFKv2ySDQeMoSZuvTASywNTnVJCArCZE2FWqpvIatKu7VMRLWlR1EazvVhDyhQ==", + "dev": true, + "license": "Apache-2.0", + "engines": { + "node": ">=18.18" + }, + "funding": { + "type": "github", + "url": "https://github.com/sponsors/nzakas" + } + }, "node_modules/@simple-libs/child-process-utils": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/@simple-libs/child-process-utils/-/child-process-utils-1.0.2.tgz", @@ -346,6 +520,27 @@ "url": "https://ko-fi.com/dangreen" } }, + "node_modules/@types/esrecurse": { + "version": "4.3.1", + "resolved": "https://registry.npmjs.org/@types/esrecurse/-/esrecurse-4.3.1.tgz", + "integrity": "sha512-xJBAbDifo5hpffDBuHl0Y8ywswbiAp/Wi7Y/GtAgSlZyIABppyurxVueOPE8LUQOxdlgi6Zqce7uoEpqNTeiUw==", + "dev": true, + "license": "MIT" + }, + "node_modules/@types/estree": { + "version": "1.0.9", + "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.9.tgz", + "integrity": "sha512-GhdPgy1el4/ImP05X05Uw4cw2/M93BCUmnEvWZNStlCzEKME4Fkk+YpoA5OiHNQmoS7Cafb8Xa3Pya8m1Qrzeg==", + "dev": true, + "license": "MIT" + }, + "node_modules/@types/json-schema": { + "version": "7.0.15", + "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.15.tgz", + "integrity": "sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA==", + "dev": true, + "license": "MIT" + }, "node_modules/@types/node": { "version": "25.9.1", "resolved": "https://registry.npmjs.org/@types/node/-/node-25.9.1.tgz", @@ -357,6 +552,29 @@ "undici-types": ">=7.24.0 <7.24.7" } }, + "node_modules/acorn": { + "version": "8.16.0", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.16.0.tgz", + "integrity": "sha512-UVJyE9MttOsBQIDKw1skb9nAwQuR5wuGD3+82K6JgJlm/Y+KI92oNsMNGZCYdDsVtRHSak0pcV5Dno5+4jh9sw==", + "dev": true, + "license": "MIT", + "bin": { + "acorn": "bin/acorn" + }, + "engines": { + "node": ">=0.4.0" + } + }, + "node_modules/acorn-jsx": { + "version": "5.3.2", + "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz", + "integrity": "sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==", + "dev": true, + "license": "MIT", + "peerDependencies": { + "acorn": "^6.0.0 || ^7.0.0 || ^8.0.0" + } + }, "node_modules/ajv": { "version": "8.20.0", "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.20.0.tgz", @@ -430,6 +648,29 @@ "dev": true, "license": "MIT" }, + "node_modules/balanced-match": { + "version": "4.0.4", + "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-4.0.4.tgz", + "integrity": "sha512-BLrgEcRTwX2o6gGxGOCNyMvGSp35YofuYzw9h1IMTRmKqttAZZVU67bdb9Pr2vUHA8+j3i2tJfjO6C6+4myGTA==", + "dev": true, + "license": "MIT", + "engines": { + "node": "18 || 20 || >=22" + } + }, + "node_modules/brace-expansion": { + "version": "5.0.6", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-5.0.6.tgz", + "integrity": "sha512-kLpxurY4Z4r9sgMsyG0Z9uzsBlgiU/EFKhj/h91/8yHu0edo7XuixOIH3VcJ8kkxs6/jPzoI6U9Vj3WqbMQ94g==", + "dev": true, + "license": "MIT", + "dependencies": { + "balanced-match": "^4.0.2" + }, + "engines": { + "node": "18 || 20 || >=22" + } + }, "node_modules/callsites": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz", @@ -604,6 +845,46 @@ "typescript": ">=5" } }, + "node_modules/cross-spawn": { + "version": "7.0.6", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz", + "integrity": "sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==", + "dev": true, + "license": "MIT", + "dependencies": { + "path-key": "^3.1.0", + "shebang-command": "^2.0.0", + "which": "^2.0.1" + }, + "engines": { + "node": ">= 8" + } + }, + "node_modules/debug": { + "version": "4.4.3", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.3.tgz", + "integrity": "sha512-RGwwWnwQvkVfavKVt22FGLw+xYSdzARwm0ru6DhTVA3umU5hZc28V3kO4stgYryrTlLpuvgI9GiijltAjNbcqA==", + "dev": true, + "license": "MIT", + "dependencies": { + "ms": "^2.1.3" + }, + "engines": { + "node": ">=6.0" + }, + "peerDependenciesMeta": { + "supports-color": { + "optional": true + } + } + }, + "node_modules/deep-is": { + "version": "0.1.4", + "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz", + "integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==", + "dev": true, + "license": "MIT" + }, "node_modules/dot-prop": { "version": "5.3.0", "resolved": "https://registry.npmjs.org/dot-prop/-/dot-prop-5.3.0.tgz", @@ -678,6 +959,195 @@ "node": ">=6" } }, + "node_modules/escape-string-regexp": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz", + "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/eslint": { + "version": "10.4.1", + "resolved": "https://registry.npmjs.org/eslint/-/eslint-10.4.1.tgz", + "integrity": "sha512-AyIKhnOBuOAdueD7RB3xB+YeAWScb9jHsJBgH2Hcde8InP5JYhqrRR6iTMHyTEwgENK54Cp44e4v8BwNhsuHuw==", + "dev": true, + "license": "MIT", + "dependencies": { + "@eslint-community/eslint-utils": "^4.8.0", + "@eslint-community/regexpp": "^4.12.2", + "@eslint/config-array": "^0.23.5", + "@eslint/config-helpers": "^0.6.0", + "@eslint/core": "^1.2.1", + "@eslint/plugin-kit": "^0.7.2", + "@humanfs/node": "^0.16.6", + "@humanwhocodes/module-importer": "^1.0.1", + "@humanwhocodes/retry": "^0.4.2", + "@types/estree": "^1.0.6", + "ajv": "^6.14.0", + "cross-spawn": "^7.0.6", + "debug": "^4.3.2", + "escape-string-regexp": "^4.0.0", + "eslint-scope": "^9.1.2", + "eslint-visitor-keys": "^5.0.1", + "espree": "^11.2.0", + "esquery": "^1.7.0", + "esutils": "^2.0.2", + "fast-deep-equal": "^3.1.3", + "file-entry-cache": "^8.0.0", + "find-up": "^5.0.0", + "glob-parent": "^6.0.2", + "ignore": "^5.2.0", + "imurmurhash": "^0.1.4", + "is-glob": "^4.0.0", + "json-stable-stringify-without-jsonify": "^1.0.1", + "minimatch": "^10.2.4", + "natural-compare": "^1.4.0", + "optionator": "^0.9.3" + }, + "bin": { + "eslint": "bin/eslint.js" + }, + "engines": { + "node": "^20.19.0 || ^22.13.0 || >=24" + }, + "funding": { + "url": "https://eslint.org/donate" + }, + "peerDependencies": { + "jiti": "*" + }, + "peerDependenciesMeta": { + "jiti": { + "optional": true + } + } + }, + "node_modules/eslint-scope": { + "version": "9.1.2", + "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-9.1.2.tgz", + "integrity": "sha512-xS90H51cKw0jltxmvmHy2Iai1LIqrfbw57b79w/J7MfvDfkIkFZ+kj6zC3BjtUwh150HsSSdxXZcsuv72miDFQ==", + "dev": true, + "license": "BSD-2-Clause", + "dependencies": { + "@types/esrecurse": "^4.3.1", + "@types/estree": "^1.0.8", + "esrecurse": "^4.3.0", + "estraverse": "^5.2.0" + }, + "engines": { + "node": "^20.19.0 || ^22.13.0 || >=24" + }, + "funding": { + "url": "https://opencollective.com/eslint" + } + }, + "node_modules/eslint-visitor-keys": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-5.0.1.tgz", + "integrity": "sha512-tD40eHxA35h0PEIZNeIjkHoDR4YjjJp34biM0mDvplBe//mB+IHCqHDGV7pxF+7MklTvighcCPPZC7ynWyjdTA==", + "dev": true, + "license": "Apache-2.0", + "engines": { + "node": "^20.19.0 || ^22.13.0 || >=24" + }, + "funding": { + "url": "https://opencollective.com/eslint" + } + }, + "node_modules/eslint/node_modules/ajv": { + "version": "6.15.0", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.15.0.tgz", + "integrity": "sha512-fgFx7Hfoq60ytK2c7DhnF8jIvzYgOMxfugjLOSMHjLIPgenqa7S7oaagATUq99mV6IYvN2tRmC0wnTYX6iPbMw==", + "dev": true, + "license": "MIT", + "dependencies": { + "fast-deep-equal": "^3.1.1", + "fast-json-stable-stringify": "^2.0.0", + "json-schema-traverse": "^0.4.1", + "uri-js": "^4.2.2" + }, + "funding": { + "type": "github", + "url": "https://github.com/sponsors/epoberezkin" + } + }, + "node_modules/eslint/node_modules/json-schema-traverse": { + "version": "0.4.1", + "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz", + "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==", + "dev": true, + "license": "MIT" + }, + "node_modules/espree": { + "version": "11.2.0", + "resolved": "https://registry.npmjs.org/espree/-/espree-11.2.0.tgz", + "integrity": "sha512-7p3DrVEIopW1B1avAGLuCSh1jubc01H2JHc8B4qqGblmg5gI9yumBgACjWo4JlIc04ufug4xJ3SQI8HkS/Rgzw==", + "dev": true, + "license": "BSD-2-Clause", + "dependencies": { + "acorn": "^8.16.0", + "acorn-jsx": "^5.3.2", + "eslint-visitor-keys": "^5.0.1" + }, + "engines": { + "node": "^20.19.0 || ^22.13.0 || >=24" + }, + "funding": { + "url": "https://opencollective.com/eslint" + } + }, + "node_modules/esquery": { + "version": "1.7.0", + "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.7.0.tgz", + "integrity": "sha512-Ap6G0WQwcU/LHsvLwON1fAQX9Zp0A2Y6Y/cJBl9r/JbW90Zyg4/zbG6zzKa2OTALELarYHmKu0GhpM5EO+7T0g==", + "dev": true, + "license": "BSD-3-Clause", + "dependencies": { + "estraverse": "^5.1.0" + }, + "engines": { + "node": ">=0.10" + } + }, + "node_modules/esrecurse": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz", + "integrity": "sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==", + "dev": true, + "license": "BSD-2-Clause", + "dependencies": { + "estraverse": "^5.2.0" + }, + "engines": { + "node": ">=4.0" + } + }, + "node_modules/estraverse": { + "version": "5.3.0", + "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz", + "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==", + "dev": true, + "license": "BSD-2-Clause", + "engines": { + "node": ">=4.0" + } + }, + "node_modules/esutils": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz", + "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==", + "dev": true, + "license": "BSD-2-Clause", + "engines": { + "node": ">=0.10.0" + } + }, "node_modules/eventemitter3": { "version": "5.0.4", "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-5.0.4.tgz", @@ -692,6 +1162,20 @@ "dev": true, "license": "MIT" }, + "node_modules/fast-json-stable-stringify": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz", + "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==", + "dev": true, + "license": "MIT" + }, + "node_modules/fast-levenshtein": { + "version": "2.0.6", + "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz", + "integrity": "sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==", + "dev": true, + "license": "MIT" + }, "node_modules/fast-uri": { "version": "3.1.2", "resolved": "https://registry.npmjs.org/fast-uri/-/fast-uri-3.1.2.tgz", @@ -709,6 +1193,57 @@ ], "license": "BSD-3-Clause" }, + "node_modules/file-entry-cache": { + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-8.0.0.tgz", + "integrity": "sha512-XXTUwCvisa5oacNGRP9SfNtYBNAMi+RPwBFmblZEF7N7swHYQS6/Zfk7SRwx4D5j3CH211YNRco1DEMNVfZCnQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "flat-cache": "^4.0.0" + }, + "engines": { + "node": ">=16.0.0" + } + }, + "node_modules/find-up": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz", + "integrity": "sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==", + "dev": true, + "license": "MIT", + "dependencies": { + "locate-path": "^6.0.0", + "path-exists": "^4.0.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/flat-cache": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-4.0.1.tgz", + "integrity": "sha512-f7ccFPK3SXFHpx15UIGyRJ/FJQctuKZ0zVuN3frBo4HnK3cay9VEW0R6yPYFHC0AgqhukPzKjq22t5DmAyqGyw==", + "dev": true, + "license": "MIT", + "dependencies": { + "flatted": "^3.2.9", + "keyv": "^4.5.4" + }, + "engines": { + "node": ">=16" + } + }, + "node_modules/flatted": { + "version": "3.4.2", + "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.4.2.tgz", + "integrity": "sha512-PjDse7RzhcPkIJwy5t7KPWQSZ9cAbzQXcafsetQoD7sOJRQlGikNbx7yZp2OotDnJyrDcbyRq3Ttb18iYOqkxA==", + "dev": true, + "license": "ISC" + }, "node_modules/get-caller-file": { "version": "2.0.5", "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz", @@ -749,6 +1284,19 @@ "node": ">=18" } }, + "node_modules/glob-parent": { + "version": "6.0.2", + "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz", + "integrity": "sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==", + "dev": true, + "license": "ISC", + "dependencies": { + "is-glob": "^4.0.3" + }, + "engines": { + "node": ">=10.13.0" + } + }, "node_modules/global-directory": { "version": "5.0.0", "resolved": "https://registry.npmjs.org/global-directory/-/global-directory-5.0.0.tgz", @@ -781,6 +1329,16 @@ "url": "https://github.com/sponsors/typicode" } }, + "node_modules/ignore": { + "version": "5.3.2", + "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.3.2.tgz", + "integrity": "sha512-hsBTNUqQTDwkWtcdYI2i06Y/nUBEsNEDJKjWdigLvegy8kDuJAS8uRlpkkcQpyEXL0Z/pjDy5HBmMjRCJ2gq+g==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 4" + } + }, "node_modules/import-fresh": { "version": "3.3.1", "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.1.tgz", @@ -808,6 +1366,16 @@ "node": ">=4" } }, + "node_modules/imurmurhash": { + "version": "0.1.4", + "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz", + "integrity": "sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=0.8.19" + } + }, "node_modules/ini": { "version": "6.0.0", "resolved": "https://registry.npmjs.org/ini/-/ini-6.0.0.tgz", @@ -825,6 +1393,16 @@ "dev": true, "license": "MIT" }, + "node_modules/is-extglob": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz", + "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=0.10.0" + } + }, "node_modules/is-fullwidth-code-point": { "version": "5.1.0", "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-5.1.0.tgz", @@ -841,6 +1419,19 @@ "url": "https://github.com/sponsors/sindresorhus" } }, + "node_modules/is-glob": { + "version": "4.0.3", + "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz", + "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==", + "dev": true, + "license": "MIT", + "dependencies": { + "is-extglob": "^2.1.1" + }, + "engines": { + "node": ">=0.10.0" + } + }, "node_modules/is-obj": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/is-obj/-/is-obj-2.0.0.tgz", @@ -864,6 +1455,13 @@ "url": "https://github.com/sponsors/sindresorhus" } }, + "node_modules/isexe": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz", + "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==", + "dev": true, + "license": "ISC" + }, "node_modules/jiti": { "version": "2.6.1", "resolved": "https://registry.npmjs.org/jiti/-/jiti-2.6.1.tgz", @@ -894,6 +1492,13 @@ "js-yaml": "bin/js-yaml.js" } }, + "node_modules/json-buffer": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/json-buffer/-/json-buffer-3.0.1.tgz", + "integrity": "sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ==", + "dev": true, + "license": "MIT" + }, "node_modules/json-parse-even-better-errors": { "version": "2.3.1", "resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz", @@ -908,6 +1513,37 @@ "dev": true, "license": "MIT" }, + "node_modules/json-stable-stringify-without-jsonify": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz", + "integrity": "sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==", + "dev": true, + "license": "MIT" + }, + "node_modules/keyv": { + "version": "4.5.4", + "resolved": "https://registry.npmjs.org/keyv/-/keyv-4.5.4.tgz", + "integrity": "sha512-oxVHkHR/EJf2CNXnWxRLW6mg7JyCCUcG0DtEGmL2ctUo1PNTin1PUil+r/+4r5MpVgC/fn1kjsx7mjSujKqIpw==", + "dev": true, + "license": "MIT", + "dependencies": { + "json-buffer": "3.0.1" + } + }, + "node_modules/levn": { + "version": "0.4.1", + "resolved": "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz", + "integrity": "sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "prelude-ls": "^1.2.1", + "type-check": "~0.4.0" + }, + "engines": { + "node": ">= 0.8.0" + } + }, "node_modules/lines-and-columns": { "version": "1.2.4", "resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.2.4.tgz", @@ -992,6 +1628,22 @@ "url": "https://github.com/chalk/wrap-ansi?sponsor=1" } }, + "node_modules/locate-path": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz", + "integrity": "sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==", + "dev": true, + "license": "MIT", + "dependencies": { + "p-locate": "^5.0.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, "node_modules/log-update": { "version": "6.1.0", "resolved": "https://registry.npmjs.org/log-update/-/log-update-6.1.0.tgz", @@ -1055,6 +1707,36 @@ "url": "https://github.com/sponsors/sindresorhus" } }, + "node_modules/minimatch": { + "version": "10.2.5", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-10.2.5.tgz", + "integrity": "sha512-MULkVLfKGYDFYejP07QOurDLLQpcjk7Fw+7jXS2R2czRQzR56yHRveU5NDJEOviH+hETZKSkIk5c+T23GjFUMg==", + "dev": true, + "license": "BlueOak-1.0.0", + "dependencies": { + "brace-expansion": "^5.0.5" + }, + "engines": { + "node": "18 || 20 || >=22" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/ms": { + "version": "2.1.3", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", + "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==", + "dev": true, + "license": "MIT" + }, + "node_modules/natural-compare": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz", + "integrity": "sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==", + "dev": true, + "license": "MIT" + }, "node_modules/onetime": { "version": "7.0.0", "resolved": "https://registry.npmjs.org/onetime/-/onetime-7.0.0.tgz", @@ -1071,6 +1753,56 @@ "url": "https://github.com/sponsors/sindresorhus" } }, + "node_modules/optionator": { + "version": "0.9.4", + "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.4.tgz", + "integrity": "sha512-6IpQ7mKUxRcZNLIObR0hz7lxsapSSIYNZJwXPGeF0mTVqGKFIXj1DQcMoT22S3ROcLyY/rz0PWaWZ9ayWmad9g==", + "dev": true, + "license": "MIT", + "dependencies": { + "deep-is": "^0.1.3", + "fast-levenshtein": "^2.0.6", + "levn": "^0.4.1", + "prelude-ls": "^1.2.1", + "type-check": "^0.4.0", + "word-wrap": "^1.2.5" + }, + "engines": { + "node": ">= 0.8.0" + } + }, + "node_modules/p-limit": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz", + "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "yocto-queue": "^0.1.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/p-locate": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz", + "integrity": "sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==", + "dev": true, + "license": "MIT", + "dependencies": { + "p-limit": "^3.0.2" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, "node_modules/parent-module": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz", @@ -1103,6 +1835,26 @@ "url": "https://github.com/sponsors/sindresorhus" } }, + "node_modules/path-exists": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz", + "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/path-key": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz", + "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + } + }, "node_modules/picocolors": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.1.1.tgz", @@ -1123,6 +1875,26 @@ "url": "https://github.com/sponsors/jonschlinkert" } }, + "node_modules/prelude-ls": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz", + "integrity": "sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 0.8.0" + } + }, + "node_modules/punycode": { + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.1.tgz", + "integrity": "sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=6" + } + }, "node_modules/require-from-string": { "version": "2.0.2", "resolved": "https://registry.npmjs.org/require-from-string/-/require-from-string-2.0.2.tgz", @@ -1180,6 +1952,29 @@ "node": ">=10" } }, + "node_modules/shebang-command": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz", + "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==", + "dev": true, + "license": "MIT", + "dependencies": { + "shebang-regex": "^3.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/shebang-regex": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz", + "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + } + }, "node_modules/signal-exit": { "version": "4.1.0", "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-4.1.0.tgz", @@ -1264,6 +2059,19 @@ "node": ">=18" } }, + "node_modules/type-check": { + "version": "0.4.0", + "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz", + "integrity": "sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==", + "dev": true, + "license": "MIT", + "dependencies": { + "prelude-ls": "^1.2.1" + }, + "engines": { + "node": ">= 0.8.0" + } + }, "node_modules/typescript": { "version": "6.0.3", "resolved": "https://registry.npmjs.org/typescript/-/typescript-6.0.3.tgz", @@ -1287,6 +2095,42 @@ "license": "MIT", "peer": true }, + "node_modules/uri-js": { + "version": "4.4.1", + "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz", + "integrity": "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==", + "dev": true, + "license": "BSD-2-Clause", + "dependencies": { + "punycode": "^2.1.0" + } + }, + "node_modules/which": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz", + "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==", + "dev": true, + "license": "ISC", + "dependencies": { + "isexe": "^2.0.0" + }, + "bin": { + "node-which": "bin/node-which" + }, + "engines": { + "node": ">= 8" + } + }, + "node_modules/word-wrap": { + "version": "1.2.5", + "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.5.tgz", + "integrity": "sha512-BN22B5eaMMI9UMtjrGd5g5eCYPpCPDUy0FJXbYsaT5zYxjFOckS53SQDE3pWkVoWpHXVb3BrYcEN4Twa55B5cA==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=0.10.0" + } + }, "node_modules/wrap-ansi": { "version": "9.0.2", "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-9.0.2.tgz", @@ -1359,6 +2203,19 @@ "engines": { "node": "^20.19.0 || ^22.12.0 || >=23" } + }, + "node_modules/yocto-queue": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz", + "integrity": "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } } } } diff --git a/package.json b/package.json index b9e0ea2..4fe0ca7 100644 --- a/package.json +++ b/package.json @@ -8,7 +8,8 @@ }, "scripts": { "test": "echo \"Error: no test specified\" && exit 1", - "prepare": "husky" + "prepare": "husky", + "lint": "eslint ." }, "keywords": [], "author": "", @@ -17,6 +18,7 @@ "devDependencies": { "@commitlint/cli": "^21.0.1", "@commitlint/config-conventional": "^21.0.1", + "eslint": "^10.4.1", "husky": "^9.1.7", "lint-staged": "^17.0.5" } From 9ae8c2fcf831657c1a938dfe95c6b00120fc0aaf Mon Sep 17 00:00:00 2001 From: Yogeshwaran S Date: Tue, 2 Jun 2026 12:35:23 +0530 Subject: [PATCH 48/87] fix(members): resolve schema type splitting and refactor value tracking to useWatch for react 19 compatibility --- .../components/DeleteConfirmationModal.tsx | 31 ++++ .../members/components/MemberModal.tsx | 120 ++++++++++++++ .../features/members/pages/MembersPage.tsx | 150 ++++++++++++++++++ .../features/members/schemas/memberSchema.ts | 11 ++ client/src/routes/AppRoutes.tsx | 3 +- client/src/types/members.ts | 26 +++ 6 files changed, 340 insertions(+), 1 deletion(-) create mode 100644 client/src/features/members/components/DeleteConfirmationModal.tsx create mode 100644 client/src/features/members/components/MemberModal.tsx create mode 100644 client/src/features/members/pages/MembersPage.tsx create mode 100644 client/src/features/members/schemas/memberSchema.ts create mode 100644 client/src/types/members.ts diff --git a/client/src/features/members/components/DeleteConfirmationModal.tsx b/client/src/features/members/components/DeleteConfirmationModal.tsx new file mode 100644 index 0000000..f6520a5 --- /dev/null +++ b/client/src/features/members/components/DeleteConfirmationModal.tsx @@ -0,0 +1,31 @@ +interface DeleteConfirmationModalProps { + isOpen: boolean; + onClose: () => void; + onConfirm: () => void; + memberName: string; +} + +export const DeleteConfirmationModal = ({ isOpen, onClose, onConfirm, memberName }: DeleteConfirmationModalProps) => { + if (!isOpen) return null; + + return ( +
+
+
+ ⚠️ +

Confirm Account Disconnection

+

+ Are you sure you want to delete the library member record for {memberName}? +

+

+ Notice: This action removes library operational profiles only. The master system user account will not be changed. +

+
+
+ + +
+
+
+ ); +}; \ No newline at end of file diff --git a/client/src/features/members/components/MemberModal.tsx b/client/src/features/members/components/MemberModal.tsx new file mode 100644 index 0000000..2eecaac --- /dev/null +++ b/client/src/features/members/components/MemberModal.tsx @@ -0,0 +1,120 @@ +import { useEffect } from "react"; +import { useForm, useWatch } from "react-hook-form"; +import { zodResolver } from "@hookform/resolvers/zod"; +import { MemberFormSchema, type MemberFormValues } from "../schemas/memberSchema"; +import type { SystemUser, MembershipPlan, LibraryMember } from "../../../types/members"; + +interface MemberModalProps { + isOpen: boolean; + onClose: () => void; + onSubmit: (data: MemberFormValues) => void; + users: SystemUser[]; + plans: MembershipPlan[]; + editingMember?: LibraryMember | null; +} + +export const MemberModal = ({ isOpen, onClose, onSubmit, users, plans, editingMember }: MemberModalProps) => { + const { register, handleSubmit, control, setValue, reset, formState: { errors } } = useForm({ + resolver: zodResolver(MemberFormSchema), + defaultValues: { userId: "", email: "", phoneNumber: "", membershipPlanId: "", isActive: true } + }); + + const selectedUserId = useWatch({ + control, + name: "userId" + }); + + // Autofill user details when a user profile is selected + useEffect(() => { + if (selectedUserId && !editingMember) { + const selectedUser = users.find(u => u.id === selectedUserId); + if (selectedUser) { + setValue("email", selectedUser.email); + setValue("phoneNumber", selectedUser.phoneNumber); + } + } + }, [selectedUserId, users, setValue, editingMember]); + + // Populate data when editing an existing profile + useEffect(() => { + if (editingMember) { + reset({ + userId: editingMember.userId, + email: editingMember.email, + phoneNumber: editingMember.phoneNumber, + membershipPlanId: editingMember.membershipPlanId, + isActive: editingMember.isActive + }); + } else { + reset({ userId: "", email: "", phoneNumber: "", membershipPlanId: "", isActive: true }); + } + }, [editingMember, reset]); + + if (!isOpen) return null; + + return ( +
+
+
+

{editingMember ? "Renew / Modify Membership Tier" : "Onboard New Library Member"}

+ +
+ +
+
+ + + {errors.userId &&

{errors.userId.message}

} +
+ +
+
+ + +
+
+ + +
+
+ +
+ + + {errors.membershipPlanId &&

{errors.membershipPlanId.message}

} +
+ + {editingMember && ( +
+
+ Re-activate / Membership Continuity Toggle + Updating values shifts account validation cycles to today's parameters. +
+ +
+ )} + +
+ + +
+ +
+
+ ); +}; \ No newline at end of file diff --git a/client/src/features/members/pages/MembersPage.tsx b/client/src/features/members/pages/MembersPage.tsx new file mode 100644 index 0000000..a6436ed --- /dev/null +++ b/client/src/features/members/pages/MembersPage.tsx @@ -0,0 +1,150 @@ +import { useState } from "react"; +import { useQuery, useMutation, useQueryClient } from "@tanstack/react-query"; +import { axiosClient } from "../../../api/axiosClient"; +import { MemberModal } from "../components/MemberModal"; +import { DeleteConfirmationModal } from "../components/DeleteConfirmationModal"; +import type { LibraryMember, SystemUser, MembershipPlan } from "../../../types/members"; +import type { MemberFormValues } from "../schemas/memberSchema"; +import { toast } from "sonner"; + +export const MembersPage = () => { + const queryClient = useQueryClient(); + const [searchTerm, setSearchTerm] = useState(""); + const [planFilter, setPlanFilter] = useState(""); + + // Modal tracking configurations + const [isFormOpen, setIsFormOpen] = useState(false); + const [isDeleteOpen, setIsDeleteOpen] = useState(false); + const [selectedMember, setSelectedMember] = useState(null); + + // 1. Fetch data feeds from backend routes + const { data: members, isLoading } = useQuery({ + queryKey: ["membersListFeed"], + queryFn: async () => (await axiosClient.get("/members")).data + }); + + const { data: users = [] } = useQuery({ + queryKey: ["systemUsersDropdownFeed"], + queryFn: async () => (await axiosClient.get("/users/available-for-membership")).data + }); + + const { data: plans = [] } = useQuery({ + queryKey: ["membershipPlansFeed"], + queryFn: async () => (await axiosClient.get("/membership-plans")).data + }); + + // 2. Data Mutation Handlers + const saveMutation = useMutation({ + mutationFn: async (payload: MemberFormValues) => { + if (selectedMember) { + return await axiosClient.put(`/members/${selectedMember.id}`, payload); + } + return await axiosClient.post("/members", payload); + }, + onSuccess: () => { + queryClient.invalidateQueries({ queryKey: ["membersListFeed"] }); + toast.success("Member record synced successfully!"); + setIsFormOpen(false); + }, + onError: () => toast.error("Database operation failed.") + }); + + const deleteMutation = useMutation({ + mutationFn: async (id: string) => await axiosClient.delete(`/members/${id}`), + onSuccess: () => { + queryClient.invalidateQueries({ queryKey: ["membersListFeed"] }); + toast.success("Membership profiles cleared cleanly."); + setIsDeleteOpen(false); + } + }); + + // 3. Search and filter parsing logic + const filteredMembers = members?.filter(m => { + const matchesSearch = m.name.toLowerCase().includes(searchTerm.toLowerCase()); + const matchesFilter = planFilter === "" || m.membershipPlanId === planFilter; + return matchesSearch && matchesFilter; + }); + + return ( +
+
+
+

System Membership Registry CRM

+

Create, upgrade, renew, and terminate active member accounts.

+
+ +
+ + {/* Filter and search utilities controls line */} +
+ setSearchTerm(e.target.value)} + className="sm:col-span-2 px-3 py-2 bg-gray-50 border border-gray-200 rounded-xl text-sm outline-hidden focus:bg-white focus:ring-2 focus:ring-teal-100 focus:border-teal-brand" + /> + +
+ + {/* Master Content Ledger Table Grid */} + {isLoading ? ( +
Syncing Membership Ledger Records...
+ ) : ( +
+
+
Book TitleBorrowed By (Member ID)Due DateDays LateCalculated Fine (₹)
Book Title IdentifierBorrower Account ReferenceExpected Return DateDelay PeriodAccumulated Penalties
{row.title}{row.borrower}{row.dueDate}{row.daysLate} days₹{row.fine}
+ {row.title} + + + ID: {row.memberId} + + {row.borrowerName} + {row.dueDate} + + {row.daysLate} days overdue + + + ₹{row.fineAmount} +
+ + + + + + + + + + + + {filteredMembers?.map(member => ( + + + + + + + + + ))} + +
Member IDAccount Holder NameAllocated Tier PlanValidation Term Cycle (Expiry)StatusAction Management
#{member.id.substring(0, 8)} +
{member.name}
+
{member.email}
+ 		{member.membershipPlanName}Until: {member.expiryDate} + + {member.isActive ? "Active Log" : "Terminated"} + + + + +
+
+
+ )} + + setIsFormOpen(false)} onSubmit={(vals) => saveMutation.mutate(vals)} users={users} plans={plans} editingMember={selectedMember} /> + setIsDeleteOpen(false)} onConfirm={() => selectedMember && deleteMutation.mutate(selectedMember.id)} memberName={selectedMember?.name || ""} /> +
+ ); +}; \ No newline at end of file diff --git a/client/src/features/members/schemas/memberSchema.ts b/client/src/features/members/schemas/memberSchema.ts new file mode 100644 index 0000000..cf2386b --- /dev/null +++ b/client/src/features/members/schemas/memberSchema.ts @@ -0,0 +1,11 @@ +import { z } from "zod"; + +export const MemberFormSchema = z.object({ + userId: z.string().min(1, { message: "Please select an available user account reference" }), + email: z.string().email(), + phoneNumber: z.string().min(1, { message: "Phone number is required" }), + membershipPlanId: z.string().min(1, { message: "Please allocate an operational membership plan tier" }), + isActive: z.boolean(), +}); + +export type MemberFormValues = z.infer; \ No newline at end of file diff --git a/client/src/routes/AppRoutes.tsx b/client/src/routes/AppRoutes.tsx index 3ff60a4..dfaf452 100644 --- a/client/src/routes/AppRoutes.tsx +++ b/client/src/routes/AppRoutes.tsx @@ -4,6 +4,7 @@ import { ProtectedGuard } from "./ProtectedGuard"; import { DashboardLayout } from "../layouts/DashboardLayout"; import { Dashboard } from "../pages/Dashboard"; import { Login } from "../features/auth/pages/Login"; +import { MembersPage } from "../features/members/pages/MembersPage"; export const AppRoutes = () => { return ( @@ -18,7 +19,7 @@ export const AppRoutes = () => { }> }> } /> - Members System Submodule View Container
} /> + } /> Books Submodule View Container} /> Lending Transactions Registry View Container} /> Automated Fines & Billing Panel Audit Container} /> diff --git a/client/src/types/members.ts b/client/src/types/members.ts new file mode 100644 index 0000000..ef9d127 --- /dev/null +++ b/client/src/types/members.ts @@ -0,0 +1,26 @@ +export interface SystemUser { + id: string; + name: string; + email: string; + phoneNumber: string; +} + +export interface MembershipPlan { + id: string; + name: string; + durationMonths: number; + price: number; +} + +export interface LibraryMember { + id: string; + userId: string; + name: string; + email: string; + phoneNumber: string; + membershipPlanId: string; + membershipPlanName: string; + activationDate: string; + expiryDate: string; + isActive: boolean; +} \ No newline at end of file From b72b25609dd0d4363b4134109ad56e1513087a35 Mon Sep 17 00:00:00 2001 From: Yogeshwaran S Date: Tue, 2 Jun 2026 12:46:09 +0530 Subject: [PATCH 49/87] chore(root): wire system router and tanstack context providers inside App gateway --- client/index.html | 2 +- client/src/App.tsx | 30 +++++++++++++++++++++++++----- 2 files changed, 26 insertions(+), 6 deletions(-) diff --git a/client/index.html b/client/index.html index 3269aca..b59a51c 100644 --- a/client/index.html +++ b/client/index.html @@ -4,7 +4,7 @@ - client + Library Management System
diff --git a/client/src/App.tsx b/client/src/App.tsx index b104791..fee514e 100644 --- a/client/src/App.tsx +++ b/client/src/App.tsx @@ -1,9 +1,29 @@ -import './App.css' +import { QueryClient, QueryClientProvider } from "@tanstack/react-query"; +import { Toaster } from "sonner"; +import { AppRoutes } from "./routes/AppRoutes"; +import "./App.css"; + +// 1. Initialize the Enterprise Asset Caching Query Engine Instance +const coreQueryClient = new QueryClient({ + defaultOptions: { + queries: { + retry: 1, // Fail fast on network dropouts during local development testing + refetchOnWindowFocus: false, // Prevents aggressive flashing while testing side-by-side + }, + }, +}); export default function App() { return ( -
- Tailwind Working -
- ) + // 2. Provision secure data context pipelines down the component tree + + + {/* 3. Inject our primary system layout state mapping router */} + + + {/* 4. Global pop-up overlay notifications center layer */} + + + + ); } \ No newline at end of file From c10092d2ba26e37957ec9116719f26c3ce055f5a Mon Sep 17 00:00:00 2001 From: Yogeshwaran S Date: Tue, 2 Jun 2026 13:13:36 +0530 Subject: [PATCH 50/87] feat(books): implement relational inventory engine with category filters and transactional safety rules --- .../features/books/components/BookModal.tsx | 100 ++++++++++++ .../books/components/DeleteBookModal.tsx | 31 ++++ client/src/features/books/pages/BooksPage.tsx | 149 ++++++++++++++++++ .../src/features/books/schemas/bookSchema.ts | 12 ++ client/src/routes/AppRoutes.tsx | 3 +- client/src/types/books.ts | 16 ++ 6 files changed, 310 insertions(+), 1 deletion(-) create mode 100644 client/src/features/books/components/BookModal.tsx create mode 100644 client/src/features/books/components/DeleteBookModal.tsx create mode 100644 client/src/features/books/pages/BooksPage.tsx create mode 100644 client/src/features/books/schemas/bookSchema.ts create mode 100644 client/src/types/books.ts diff --git a/client/src/features/books/components/BookModal.tsx b/client/src/features/books/components/BookModal.tsx new file mode 100644 index 0000000..d0761ee --- /dev/null +++ b/client/src/features/books/components/BookModal.tsx @@ -0,0 +1,100 @@ +import { useEffect } from "react"; +import { useForm } from "react-hook-form"; +import { zodResolver } from "@hookform/resolvers/zod"; +import { BookFormSchema, type BookFormValues } from "../schemas/bookSchema"; +import type { BookCategory, BookInventoryItem } from "../../../types/books"; + +interface BookModalProps { + isOpen: boolean; + onClose: () => void; + onSubmit: (data: BookFormValues) => void; + categories: BookCategory[]; + editingBook?: BookInventoryItem | null; +} + +export const BookModal = ({ isOpen, onClose, onSubmit, categories, editingBook }: BookModalProps) => { + const { register, handleSubmit, reset, formState: { errors } } = useForm({ + resolver: zodResolver(BookFormSchema), + defaultValues: { title: "", author: "", totalCopies: 1, categoryId: "" } + }); + + // Dynamically populate fields when editing an existing profile + useEffect(() => { + if (editingBook) { + reset({ + title: editingBook.title, + author: editingBook.author, + totalCopies: editingBook.totalCopies, + categoryId: editingBook.categoryId + }); + } else { + reset({ title: "", author: "", totalCopies: 1, categoryId: "" }); + } + }, [editingBook, reset]); + + if (!isOpen) return null; + + return ( +
+
+
+

{editingBook ? "Modify Cataloged Asset Details" : "Register New Media Asset"}

+ +
+ +
+
+ + + {errors.title &&

{errors.title.message}

} +
+ +
+ + + {errors.author &&

{errors.author.message}

} +
+ +
+
+ + + {errors.totalCopies &&

{errors.totalCopies.message}

} +
+ +
+ + + {errors.categoryId &&

{errors.categoryId.message}

} +
+
+ + {editingBook && ( +
+
+ Available on Shelves +
{editingBook.availableCopies} Copies
+ Read-Only: Handled by system transactions. +
+
+ Active Circulation Count +
{editingBook.lendingCount} Loans
+ Updates live when books are issued or returned. +
+
+ )} + +
+ + +
+
+
+
+ ); +}; \ No newline at end of file diff --git a/client/src/features/books/components/DeleteBookModal.tsx b/client/src/features/books/components/DeleteBookModal.tsx new file mode 100644 index 0000000..5f6319e --- /dev/null +++ b/client/src/features/books/components/DeleteBookModal.tsx @@ -0,0 +1,31 @@ +interface DeleteBookModalProps { + isOpen: boolean; + onClose: () => void; + onConfirm: () => void; + bookTitle: string; +} + +export const DeleteBookModal = ({ isOpen, onClose, onConfirm, bookTitle }: DeleteBookModalProps) => { + if (!isOpen) return null; + + return ( +
+
+
+ 🗑️ +

Purge Inventory Item

+

+ Are you absolutely sure you want to delete "{bookTitle}" permanently from the library catalog? +

+

+ Warning: This action cannot be undone and will purge all copy records. +

+
+
+ + +
+
+
+ ); +}; \ No newline at end of file diff --git a/client/src/features/books/pages/BooksPage.tsx b/client/src/features/books/pages/BooksPage.tsx new file mode 100644 index 0000000..c36486f --- /dev/null +++ b/client/src/features/books/pages/BooksPage.tsx @@ -0,0 +1,149 @@ +import { useState } from "react"; +import { useQuery, useMutation, useQueryClient } from "@tanstack/react-query"; +import { axiosClient } from "../../../api/axiosClient"; +import { BookModal } from "../components/BookModal"; +import { DeleteBookModal } from "../components/DeleteBookModal"; +import type { BookInventoryItem, BookCategory } from "../../../types/books"; +import type { BookFormValues } from "../schemas/bookSchema"; +import { toast } from "sonner"; + +export const BooksPage = () => { + const queryClient = useQueryClient(); + const [searchTerm, setSearchTerm] = useState(""); + const [categoryFilter, setCategoryFilter] = useState(""); + + // Modals visibility states + const [isFormOpen, setIsFormOpen] = useState(false); + const [isDeleteOpen, setIsDeleteOpen] = useState(false); + const [selectedBook, setSelectedBook] = useState(null); + + // 1. Fetching relational query datasets + const { data: books, isLoading } = useQuery({ + queryKey: ["libraryBooksCatalogFeed"], + queryFn: async () => (await axiosClient.get("/books")).data + }); + + const { data: categories = [] } = useQuery({ + queryKey: ["bookCategoriesDropdownFeed"], + queryFn: async () => (await axiosClient.get("/categories")).data + }); + + // 2. Data Mutation Operations Pipelines + const saveBookMutation = useMutation({ + mutationFn: async (payload: BookFormValues) => { + if (selectedBook) { + return await axiosClient.put(`/books/${selectedBook.id}`, payload); + } + return await axiosClient.post("/books", payload); + }, + onSuccess: () => { + queryClient.invalidateQueries({ queryKey: ["libraryBooksCatalogFeed"] }); + toast.success("Asset catalog definitions updated successfully."); + setIsFormOpen(false); + }, + onError: () => toast.error("An error occurred during database commit operations.") + }); + + const deleteBookMutation = useMutation({ + mutationFn: async (id: string) => await axiosClient.delete(`/books/${id}`), + onSuccess: () => { + queryClient.invalidateQueries({ queryKey: ["libraryBooksCatalogFeed"] }); + toast.success("Asset completely removed from system indexes."); + setIsDeleteOpen(false); + } + }); + + // 3. Evaluation filtration logic paths + const filteredBooks = books?.filter(book => { + const matchesSearch = book.title.toLowerCase().includes(searchTerm.toLowerCase()); + const matchesCategory = categoryFilter === "" || book.categoryId === categoryFilter; + return matchesSearch && matchesCategory; + }); + + return ( +
+
+
+

System Core Asset Catalog

+

Add new volumes, organize classifications, and track shelf distribution levels.

+
+ +
+ + {/* Query Filter Navigation Controls Line */} +
+ setSearchTerm(e.target.value)} + className="sm:col-span-2 px-3 py-2 bg-gray-50 border border-gray-200 rounded-xl text-sm outline-hidden focus:bg-white focus:ring-2 focus:ring-teal-100 focus:border-teal-brand" + /> + +
+ + {/* Inventory Asset Ledger View Grid Data Box */} + {isLoading ? ( +
Syncing Active Media Ledger Records...
+ ) : ( +
+
+ + + + + + + + + + + + + {filteredBooks?.map(book => ( + + + + + + + + + ))} + +
Book Title & Creator IndexClassification GroupTotal VolumesShelf AvailabilityIn CirculationData Operations
+
{book.title}
+
By {book.author}
+ 		+ + {book.categoryName} + + {book.totalCopies} + 0 ? "bg-emerald-50 text-emerald-700" : "bg-red-50 text-red-700"}`}> + {book.availableCopies} left + + {book.lendingCount} active + + +
+
+
+ )} + + setIsFormOpen(false)} onSubmit={(vals) => saveBookMutation.mutate(vals)} categories={categories} editingBook={selectedBook} /> + setIsDeleteOpen(false)} onConfirm={() => selectedBook && deleteBookMutation.mutate(selectedBook.id)} bookTitle={selectedBook?.title || ""} /> +
+ ); +}; \ No newline at end of file diff --git a/client/src/features/books/schemas/bookSchema.ts b/client/src/features/books/schemas/bookSchema.ts new file mode 100644 index 0000000..90be0f2 --- /dev/null +++ b/client/src/features/books/schemas/bookSchema.ts @@ -0,0 +1,12 @@ +import { z } from "zod"; + +export const BookFormSchema = z.object({ + title: z.string().min(1, { message: "Book title identifier line is required" }), + author: z.string().min(1, { message: "Author source reference name is required" }), + totalCopies: z.number() + .int({ message: "Stock counts must be whole integers" }) + .min(1, { message: "Minimum catalog collection entry requires 1 copy" }), + categoryId: z.string().min(1, { message: "Please map this asset to an organizational category" }), +}); + +export type BookFormValues = z.infer; \ No newline at end of file diff --git a/client/src/routes/AppRoutes.tsx b/client/src/routes/AppRoutes.tsx index dfaf452..8651b46 100644 --- a/client/src/routes/AppRoutes.tsx +++ b/client/src/routes/AppRoutes.tsx @@ -5,6 +5,7 @@ import { DashboardLayout } from "../layouts/DashboardLayout"; import { Dashboard } from "../pages/Dashboard"; import { Login } from "../features/auth/pages/Login"; import { MembersPage } from "../features/members/pages/MembersPage"; +import { BooksPage } from "../features/books/pages/BooksPage"; export const AppRoutes = () => { return ( @@ -20,7 +21,7 @@ export const AppRoutes = () => { }> } /> } /> - Books Submodule View Container} /> + } /> Lending Transactions Registry View Container} /> Automated Fines & Billing Panel Audit Container} /> diff --git a/client/src/types/books.ts b/client/src/types/books.ts new file mode 100644 index 0000000..ef81ebb --- /dev/null +++ b/client/src/types/books.ts @@ -0,0 +1,16 @@ +export interface BookCategory { + id: string; + name: string; + code: string; +} + +export interface BookInventoryItem { + id: string; + title: string; + author: string; + totalCopies: number; + availableCopies: number; + lendingCount: number; + categoryId: string; + categoryName: string; +} \ No newline at end of file From 2d4f9ab7d267d6379902f169d79dc84284ed93c6 Mon Sep 17 00:00:00 2001 From: Yogeshwaran S Date: Tue, 2 Jun 2026 14:18:03 +0530 Subject: [PATCH 51/87] feat(transactions): implement circulation desk ledger featuring dynamic data sort hierarchies, automatic client-side overdue flagging, and bulk record cleanup workflows --- .../components/DeleteTransactionModal.tsx | 35 +++ .../issues/components/TransactionModal.tsx | 99 +++++++++ .../issues/pages/TransactionsPage.tsx | 202 ++++++++++++++++++ .../issues/schemas/transactionSchema.ts | 11 + client/src/routes/AppRoutes.tsx | 3 +- client/src/types/transactions.ts | 17 ++ 6 files changed, 366 insertions(+), 1 deletion(-) create mode 100644 client/src/features/issues/components/DeleteTransactionModal.tsx create mode 100644 client/src/features/issues/components/TransactionModal.tsx create mode 100644 client/src/features/issues/pages/TransactionsPage.tsx create mode 100644 client/src/features/issues/schemas/transactionSchema.ts create mode 100644 client/src/types/transactions.ts diff --git a/client/src/features/issues/components/DeleteTransactionModal.tsx b/client/src/features/issues/components/DeleteTransactionModal.tsx new file mode 100644 index 0000000..6c05cc4 --- /dev/null +++ b/client/src/features/issues/components/DeleteTransactionModal.tsx @@ -0,0 +1,35 @@ +interface DeleteModalProps { + isOpen: boolean; + onClose: () => void; + onConfirm: () => void; + mode: "SINGLE" | "BULK_CLEAN"; + titleDetails?: string; +} + +export const DeleteTransactionModal = ({ isOpen, onClose, onConfirm, mode, titleDetails }: DeleteModalProps) => { + if (!isOpen) return null; + + return ( +
+
+
+ {mode === "SINGLE" ? "⚠️" : "💥"} +

+ {mode === "SINGLE" ? "Purge Circulation Record" : "Purge Completed History"} +

+

+ {mode === "SINGLE" + ? `Are you sure you want to delete this issue_book data file for "${titleDetails}"?` + : "Are you sure you want to permanently delete all circulation entries with a RETURNED status from the system registry?"} +

+
+
+ + +
+
+
+ ); +}; \ No newline at end of file diff --git a/client/src/features/issues/components/TransactionModal.tsx b/client/src/features/issues/components/TransactionModal.tsx new file mode 100644 index 0000000..4e9e68c --- /dev/null +++ b/client/src/features/issues/components/TransactionModal.tsx @@ -0,0 +1,99 @@ +import { useEffect } from "react"; +import { useForm } from "react-hook-form"; +import { zodResolver } from "@hookform/resolvers/zod"; +import { TransactionFormSchema, type TransactionFormValues } from "../schemas/transactionSchema"; +import type { BookIssueRecord, MemberLookup, BookLookup } from "../../../types/transactions"; + +interface TransactionModalProps { + isOpen: boolean; + onClose: () => void; + onSubmit: (data: TransactionFormValues) => void; + members: MemberLookup[]; + books: BookLookup[]; + editingRecord?: BookIssueRecord | null; +} + +export const TransactionModal = ({ isOpen, onClose, onSubmit, members, books, editingRecord }: TransactionModalProps) => { + const todayString = new Date().toISOString().split("T")[0]; + + const { register, handleSubmit, reset, formState: { errors } } = useForm({ + resolver: zodResolver(TransactionFormSchema), + defaultValues: { memberId: "", bookId: "", borrowedDate: todayString, dueDate: "", status: "BORROWED" } + }); + + useEffect(() => { + if (editingRecord) { + reset({ + memberId: editingRecord.memberId, + bookId: editingRecord.bookId, + borrowedDate: editingRecord.borrowedDate, + dueDate: editingRecord.dueDate, + status: editingRecord.status + }); + } else { + reset({ memberId: "", bookId: "", borrowedDate: todayString, dueDate: "", status: "BORROWED" }); + } + }, [editingRecord, reset, todayString]); + + if (!isOpen) return null; + + return ( +
+
+
+

{editingRecord ? "Update Allocation Parameter Logs" : "Authorize Book Issue Voucher"}

+ +
+ +
+
+ + + {errors.memberId &&

{errors.memberId.message}

} +
+ +
+ + + {errors.bookId &&

{errors.bookId.message}

} +
+ +
+
+ + +
+ +
+ + + {errors.dueDate &&

{errors.dueDate.message}

} +
+
+ +
+ + +
+ +
+ + +
+
+
+
+ ); +}; \ No newline at end of file diff --git a/client/src/features/issues/pages/TransactionsPage.tsx b/client/src/features/issues/pages/TransactionsPage.tsx new file mode 100644 index 0000000..640b465 --- /dev/null +++ b/client/src/features/issues/pages/TransactionsPage.tsx @@ -0,0 +1,202 @@ +import { useState } from "react"; +import { useQuery, useMutation, useQueryClient } from "@tanstack/react-query"; +import { axiosClient } from "../../../api/axiosClient"; +import { TransactionModal } from "../components/TransactionModal"; +import { DeleteTransactionModal } from "../components/DeleteTransactionModal"; +import type { BookIssueRecord, MemberLookup, BookLookup } from "../../../types/transactions"; +import type { TransactionFormValues } from "../schemas/transactionSchema"; +import { toast } from "sonner"; + +export const TransactionsPage = () => { + const queryClient = useQueryClient(); + const todayIso = new Date().toISOString().split("T")[0]; + + // Filtering and searching control matrices + const [searchQuery, setSearchQuery] = useState(""); + const [statusFilter, setStatusFilter] = useState(""); + + // Modal display variables tracking states + const [isFormOpen, setIsFormOpen] = useState(false); + const [deleteModalConfig, setDeleteModalConfig] = useState<{ open: boolean; mode: "SINGLE" | "BULK_CLEAN" }>({ open: false, mode: "SINGLE" }); + const [selectedRecord, setSelectedRecord] = useState(null); + + // 1. Relational Data Query Operations + const { data: rawIssues, isLoading } = useQuery({ + queryKey: ["circulationMasterRecordsFeed"], + queryFn: async () => (await axiosClient.get("/issues")).data + }); + + const { data: members = [] } = useQuery({ + queryKey: ["membersLookupDropdownFeed"], + queryFn: async () => (await axiosClient.get("/members/lookup-summary")).data + }); + + const { data: books = [] } = useQuery({ + queryKey: ["booksLookupDropdownFeed"], + queryFn: async () => (await axiosClient.get("/books/lookup-summary")).data + }); + + // 2. Data Modification Operations Pipelines + const saveMutation = useMutation({ + mutationFn: async (payload: TransactionFormValues) => { + if (selectedRecord) return await axiosClient.put(`/issues/${selectedRecord.id}`, payload); + return await axiosClient.post("/issues", payload); + }, + onSuccess: () => { + queryClient.invalidateQueries({ queryKey: ["circulationMasterRecordsFeed"] }); + toast.success("Circulation parameters synced successfully."); + setIsFormOpen(false); + } + }); + + const deleteMutation = useMutation({ + mutationFn: async (id: string) => await axiosClient.delete(`/issues/${id}`), + onSuccess: () => { + queryClient.invalidateQueries({ queryKey: ["circulationMasterRecordsFeed"] }); + toast.success("Circulation file cleared."); + setDeleteModalConfig({ open: false, mode: "SINGLE" }); + } + }); + + const purgeBulkReturnedMutation = useMutation({ + mutationFn: async () => await axiosClient.post("/issues/purge-returned-history"), + onSuccess: () => { + queryClient.invalidateQueries({ queryKey: ["circulationMasterRecordsFeed"] }); + toast.success("All historical returned entries purged cleanly."); + setDeleteModalConfig({ open: false, mode: "SINGLE" }); + } + }); + + // 3. Evaluation filtration logic paths & Smart Dynamic Sorting Engine + const processedRecords = rawIssues?.map(record => { + // Dynamic client-side evaluation fallback to calculate overdue flags automatically + const dynamicallyOverdue = record.status === "BORROWED" && todayIso > record.dueDate; + return { ...record, status: dynamicallyOverdue ? "OVERDUE" as const : record.status }; + }) + .filter(rec => { + const term = searchQuery.toLowerCase(); + const matchesSearch = rec.memberName.toLowerCase().includes(term) || rec.bookTitle.toLowerCase().includes(term); + const matchesStatus = statusFilter === "" || rec.status === statusFilter; + return matchesSearch && matchesStatus; + }) + // CRITICAL ARCHITECTURAL REQUIREMENT: Grouping logic array pushes RETURNED parameters to the bottom line + .sort((x, y) => { + if (x.status === "RETURNED" && y.status !== "RETURNED") return 1; + if (x.status !== "RETURNED" && y.status === "RETURNED") return -1; + return new Date(x.dueDate).getTime() - new Date(y.dueDate).getTime(); + }); + + return ( +
+
+
+

Circulation Desk Ledger

+

Authorize book loans, process item returns, and monitor real-time overdue files.

+
+
+ + +
+
+ + {/* Query Filter Navigation Controls Line */} +
+ setSearchQuery(e.target.value)} + className="sm:col-span-2 px-3 py-2 bg-gray-50 border border-gray-200 rounded-xl text-sm outline-hidden focus:bg-white focus:ring-2 focus:ring-teal-100 focus:border-teal-brand" + /> + +
+ + {/* Primary Data Grid Display Layer */} + {isLoading ? ( +
Syncing Active Circulation Master Files...
+ ) : ( +
+
+ + + + + + + + + + + + + {processedRecords?.map(record => { + const isReturned = record.status === "RETURNED"; + return ( + + + + + + + + + ); + })} + +
Account Holder ContextIssued Media Volume AssetCheckout DateTarget Due DeadlineStatus FlagAction Blocks
{record.memberName}{record.bookTitle}{record.borrowedDate}{record.dueDate} + + {record.status} + + + + +
+
+
+ )} + + setIsFormOpen(false)} onSubmit={(vals) => saveMutation.mutate(vals)} members={members} books={books} editingRecord={selectedRecord} /> + setDeleteModalConfig({ open: false, mode: "SINGLE" })} + onConfirm={() => { + if (deleteModalConfig.mode === "SINGLE" && selectedRecord) deleteMutation.mutate(selectedRecord.id); + else purgeBulkReturnedMutation.mutate(); + }} + mode={deleteModalConfig.mode} + titleDetails={selectedRecord?.bookTitle} + /> +
+ ); +}; \ No newline at end of file diff --git a/client/src/features/issues/schemas/transactionSchema.ts b/client/src/features/issues/schemas/transactionSchema.ts new file mode 100644 index 0000000..c833337 --- /dev/null +++ b/client/src/features/issues/schemas/transactionSchema.ts @@ -0,0 +1,11 @@ +import { z } from "zod"; + +export const TransactionFormSchema = z.object({ + memberId: z.string().min(1, { message: "Please link an active member profile" }), + bookId: z.string().min(1, { message: "Please specify an available media title" }), + borrowedDate: z.string().min(1, { message: "Borrow date reference is required" }), + dueDate: z.string().min(1, { message: "Please set a valid return deadline date" }), + status: z.enum(["BORROWED", "RETURNED", "OVERDUE"]), +}); + +export type TransactionFormValues = z.infer; \ No newline at end of file diff --git a/client/src/routes/AppRoutes.tsx b/client/src/routes/AppRoutes.tsx index 8651b46..2ef7578 100644 --- a/client/src/routes/AppRoutes.tsx +++ b/client/src/routes/AppRoutes.tsx @@ -6,6 +6,7 @@ import { Dashboard } from "../pages/Dashboard"; import { Login } from "../features/auth/pages/Login"; import { MembersPage } from "../features/members/pages/MembersPage"; import { BooksPage } from "../features/books/pages/BooksPage"; +import { TransactionsPage } from "../features/issues/pages/TransactionsPage"; export const AppRoutes = () => { return ( @@ -22,7 +23,7 @@ export const AppRoutes = () => { } /> } /> } /> - Lending Transactions Registry View Container} /> + } /> Automated Fines & Billing Panel Audit Container} /> diff --git a/client/src/types/transactions.ts b/client/src/types/transactions.ts new file mode 100644 index 0000000..d7ed648 --- /dev/null +++ b/client/src/types/transactions.ts @@ -0,0 +1,17 @@ +export type IssueStatus = "BORROWED" | "RETURNED" | "OVERDUE"; + +export interface BookIssueRecord { + id: string; // Maps to issue_id + memberId: string; + memberName: string; + bookId: string; + bookTitle: string; + borrowedDate: string; + dueDate: string; + returnedDate: string | null; + status: IssueStatus; +} + +// Minimal lookups required for populate selections +export interface MemberLookup { id: string; name: string; } +export interface BookLookup { id: string; title: string; } \ No newline at end of file From c8021680230e211cd2604e51ce9bdeaff9b8fb3a Mon Sep 17 00:00:00 2001 From: Yogeshwaran S Date: Tue, 2 Jun 2026 15:22:35 +0530 Subject: [PATCH 52/87] feat(fines): resolve react-compiler watch warning & complete fine ledger modals --- .../fines/components/DeleteFinesModal.tsx | 34 +++++ .../features/fines/components/FinesModal.tsx | 88 +++++++++++ client/src/features/fines/pages/FinesPage.tsx | 142 ++++++++++++++++++ .../src/features/fines/schemas/fineSchema.ts | 8 + .../issues/pages/TransactionsPage.tsx | 34 ++++- client/src/routes/AppRoutes.tsx | 3 +- client/src/types/fines.ts | 10 ++ 7 files changed, 313 insertions(+), 6 deletions(-) create mode 100644 client/src/features/fines/components/DeleteFinesModal.tsx create mode 100644 client/src/features/fines/components/FinesModal.tsx create mode 100644 client/src/features/fines/pages/FinesPage.tsx create mode 100644 client/src/features/fines/schemas/fineSchema.ts create mode 100644 client/src/types/fines.ts diff --git a/client/src/features/fines/components/DeleteFinesModal.tsx b/client/src/features/fines/components/DeleteFinesModal.tsx new file mode 100644 index 0000000..e1e0b4d --- /dev/null +++ b/client/src/features/fines/components/DeleteFinesModal.tsx @@ -0,0 +1,34 @@ +interface DeleteFinesModalProps { + isOpen: boolean; + onClose: () => void; + onConfirm: () => void; + memberName?: string; + amount?: number; +} + +export const DeleteFinesModal = ({ isOpen, onClose, onConfirm, memberName, amount }: DeleteFinesModalProps) => { + if (!isOpen) return null; + + return ( +
+
+
+ ⚠️ +

Purge Financial Record Entry

+

+ Are you sure you want to permanently delete the fine ledger invoice totaling ₹{amount}.00 registered against account holder "{memberName}"? +

+

+ Warning: This action breaks reporting audit history loops. Proceed with caution. +

+
+
+ + +
+
+
+ ); +}; \ No newline at end of file diff --git a/client/src/features/fines/components/FinesModal.tsx b/client/src/features/fines/components/FinesModal.tsx new file mode 100644 index 0000000..0ec883c --- /dev/null +++ b/client/src/features/fines/components/FinesModal.tsx @@ -0,0 +1,88 @@ +import { useEffect } from "react"; +import { useForm } from "react-hook-form"; +import { zodResolver } from "@hookform/resolvers/zod"; +import { FineFormSchema, type FineFormValues } from "../schemas/fineSchema"; +import type { FineRecord } from "../../../types/fines"; + +interface FineModalProps { + isOpen: boolean; + onClose: () => void; + onSubmit: (data: FineFormValues) => void; + editingFine: FineRecord | null; +} + +export const FinesModal = ({ isOpen, onClose, onSubmit, editingFine }: FineModalProps) => { + const todayString = new Date().toISOString().split("T")[0]; + + const { register, handleSubmit, reset, setValue } = useForm({ + resolver: zodResolver(FineFormSchema), + defaultValues: { paidStatus: false, paidDate: null } + }); + + // Sync initial form values when a specific fine record is opened for editing + useEffect(() => { + if (editingFine) { + reset({ + paidStatus: editingFine.paidStatus, + paidDate: editingFine.paidDate + }); + } + }, [editingFine, reset]); + + if (!isOpen) return null; + + return ( +
+
+
+

Modify Fine Invoice Details

+ +
+ +
+
+

Member Account Context:

+

Name: {editingFine?.memberName}

+

Media Asset: {editingFine?.bookTitle}

+

Accrued Value: ₹{editingFine?.fineAmount}.00

+
+ +
+
+ + Has this liability been completely settled? +
+ { + const isChecked = e.target.checked; + setValue("paidDate", isChecked ? todayString : null); + } + })} + className="w-5 h-5 accent-teal-brand cursor-pointer rounded-sm" + /> +
+ +
+ + +
+ +
+ + +
+
+
+
+ ); +}; \ No newline at end of file diff --git a/client/src/features/fines/pages/FinesPage.tsx b/client/src/features/fines/pages/FinesPage.tsx new file mode 100644 index 0000000..17c29e6 --- /dev/null +++ b/client/src/features/fines/pages/FinesPage.tsx @@ -0,0 +1,142 @@ +import { useState } from "react"; +import { useQuery, useMutation, useQueryClient } from "@tanstack/react-query"; +import { axiosClient } from "../../../api/axiosClient"; +import type { FineRecord } from "../../../types/fines"; +import { toast } from "sonner"; + +export const FinesPage = () => { + const queryClient = useQueryClient(); + const [searchQuery, setSearchQuery] = useState(""); + const [statusFilter, setStatusFilter] = useState(""); // "PAID" or "UNPAID" + + // 1. Fetch Outstanding Financial Balances + const { data: finesList, isLoading } = useQuery({ + queryKey: ["finesMasterLedgerFeed"], + queryFn: async () => (await axiosClient.get("/fines")).data + }); + + // 2. Clear Fine Account Balance Mutation + const settleFineMutation = useMutation({ + mutationFn: async ({ id, paidStatus }: { id: string; paidStatus: boolean }) => { + const todayString = paidStatus ? new Date().toISOString().split("T")[0] : null; + return await axiosClient.put(`/fines/${id}`, { + paidStatus, + paidDate: todayString + }); + }, + onSuccess: (_, variables) => { + queryClient.invalidateQueries({ queryKey: ["finesMasterLedgerFeed"] }); + + if (variables.paidStatus) { + // NOTIFY LIBRARIAN TO NOW GO TO THE ISSUE PAGE AND UPDATE MANUALLY + toast.success("💰 Penalty Invoice Cleared Successfully!", { + description: "💡 REMINDER: Remember to change this book's status to RETURNED on the Circulation Desk page.", + duration: 6000, + }); + } else { + toast.info("Invoice status set back to Unpaid."); + } + } + }); + + // 3. Search and Filtering Logic Matrix + const filteredFines = finesList?.filter(fine => { + const term = searchQuery.toLowerCase(); + const matchesSearch = fine.memberName.toLowerCase().includes(term) || fine.bookTitle.toLowerCase().includes(term); + + const fineStatusString = fine.paidStatus ? "PAID" : "UNPAID"; + const matchesStatus = statusFilter === "" || fineStatusString === statusFilter; + + return matchesSearch && matchesStatus; + }); + + return ( +
+
+

Fine Ledger & Financial Audits

+

Track automatic asset penalty invoices, log member transactions, and audit processed balances.

+
+ + {/* Filter Toolbar Section */} +
+ setSearchQuery(e.target.value)} + className="sm:col-span-2 px-3 py-2 bg-gray-50 border border-gray-200 rounded-xl text-sm outline-hidden focus:bg-white focus:ring-2 focus:ring-teal-100 focus:border-teal-brand" + /> + +
+ + {/* Audit Data Table Element */} + {isLoading ? ( +
Syncing Financial Records...
+ ) : ( +
+
+ + + + + + + + + + + + + + {filteredFines?.length === 0 ? ( + + + + ) : ( + filteredFines?.map(fine => ( + + + + + + + + + + )) + )} + +
Account Holder MemberDelinquent Media AssetDelayed DaysAccrued Fine AmountPayment Audit StatusSettlement Receipt DateActions Ledger
No fine invoices match selected filters.
{fine.memberName}{fine.bookTitle}{fine.delayedDays} Days₹ {fine.fineAmount}.00 + + {fine.paidStatus ? "PAID" : "UNPAID"} + + {fine.paidDate || "—"} + +
+
+
+ )} +
+ ); +}; \ No newline at end of file diff --git a/client/src/features/fines/schemas/fineSchema.ts b/client/src/features/fines/schemas/fineSchema.ts new file mode 100644 index 0000000..19b2e89 --- /dev/null +++ b/client/src/features/fines/schemas/fineSchema.ts @@ -0,0 +1,8 @@ +import { z } from "zod"; + +export const FineFormSchema = z.object({ + paidStatus: z.boolean(), + paidDate: z.string().nullable(), +}); + +export type FineFormValues = z.infer; \ No newline at end of file diff --git a/client/src/features/issues/pages/TransactionsPage.tsx b/client/src/features/issues/pages/TransactionsPage.tsx index 640b465..ba48ae5 100644 --- a/client/src/features/issues/pages/TransactionsPage.tsx +++ b/client/src/features/issues/pages/TransactionsPage.tsx @@ -5,6 +5,7 @@ import { TransactionModal } from "../components/TransactionModal"; import { DeleteTransactionModal } from "../components/DeleteTransactionModal"; import type { BookIssueRecord, MemberLookup, BookLookup } from "../../../types/transactions"; import type { TransactionFormValues } from "../schemas/transactionSchema"; +import type { FineRecord } from "../../../types/fines"; // Injected Fine Type references import { toast } from "sonner"; export const TransactionsPage = () => { @@ -26,6 +27,12 @@ export const TransactionsPage = () => { queryFn: async () => (await axiosClient.get("/issues")).data }); + // FRONTEND VERIFICATION INTERCEPT: Load fine records to catch un-submitted penalty accounts + const { data: globalFines = [] } = useQuery({ + queryKey: ["finesMasterLedgerFeed"], + queryFn: async () => (await axiosClient.get("/fines")).data + }); + const { data: members = [] } = useQuery({ queryKey: ["membersLookupDropdownFeed"], queryFn: async () => (await axiosClient.get("/members/lookup-summary")).data @@ -36,9 +43,19 @@ export const TransactionsPage = () => { queryFn: async () => (await axiosClient.get("/books/lookup-summary")).data }); - // 2. Data Modification Operations Pipelines + // 2. Data Modification Operations Pipelines (With Frontend Business Rule Guards) const saveMutation = useMutation({ mutationFn: async (payload: TransactionFormValues) => { + // FRONTEND SECURITY CHECK: Intercept updates to the RETURNED status + if (selectedRecord && payload.status === "RETURNED") { + const correspondingFine = globalFines.find(fine => fine.issueId === selectedRecord.id); + + // Block action if a fine exists and its paid status is false (or paidDate is missing) + if (correspondingFine && (!correspondingFine.paidStatus || !correspondingFine.paidDate)) { + throw new Error("FINE_PENDING_PAYMENT"); + } + } + if (selectedRecord) return await axiosClient.put(`/issues/${selectedRecord.id}`, payload); return await axiosClient.post("/issues", payload); }, @@ -46,6 +63,16 @@ export const TransactionsPage = () => { queryClient.invalidateQueries({ queryKey: ["circulationMasterRecordsFeed"] }); toast.success("Circulation parameters synced successfully."); setIsFormOpen(false); + }, + onError: (error: unknown) => { + if (error instanceof Error && error.message === "FINE_PENDING_PAYMENT") { + toast.error("🚨 Transaction Blocked: Member needs to pay the outstanding fine first!", { + description: "Clear penalties on the Fines Audit page before checking in this asset.", + duration: 5000, + }); + } else { + toast.error("Failed to sync circulation file parameters."); + } } }); @@ -69,7 +96,6 @@ export const TransactionsPage = () => { // 3. Evaluation filtration logic paths & Smart Dynamic Sorting Engine const processedRecords = rawIssues?.map(record => { - // Dynamic client-side evaluation fallback to calculate overdue flags automatically const dynamicallyOverdue = record.status === "BORROWED" && todayIso > record.dueDate; return { ...record, status: dynamicallyOverdue ? "OVERDUE" as const : record.status }; }) @@ -79,7 +105,6 @@ export const TransactionsPage = () => { const matchesStatus = statusFilter === "" || rec.status === statusFilter; return matchesSearch && matchesStatus; }) - // CRITICAL ARCHITECTURAL REQUIREMENT: Grouping logic array pushes RETURNED parameters to the bottom line .sort((x, y) => { if (x.status === "RETURNED" && y.status !== "RETURNED") return 1; if (x.status !== "RETURNED" && y.status === "RETURNED") return -1; @@ -153,7 +178,6 @@ export const TransactionsPage = () => { return ( { - + diff --git a/client/src/routes/AppRoutes.tsx b/client/src/routes/AppRoutes.tsx index 2ef7578..42502a6 100644 --- a/client/src/routes/AppRoutes.tsx +++ b/client/src/routes/AppRoutes.tsx @@ -7,6 +7,7 @@ import { Login } from "../features/auth/pages/Login"; import { MembersPage } from "../features/members/pages/MembersPage"; import { BooksPage } from "../features/books/pages/BooksPage"; import { TransactionsPage } from "../features/issues/pages/TransactionsPage"; +import { FinesPage } from "../features/fines/pages/FinesPage"; export const AppRoutes = () => { return ( @@ -24,7 +25,7 @@ export const AppRoutes = () => { } /> } /> } /> - Automated Fines & Billing Panel Audit Container} /> + } /> diff --git a/client/src/types/fines.ts b/client/src/types/fines.ts new file mode 100644 index 0000000..2b78218 --- /dev/null +++ b/client/src/types/fines.ts @@ -0,0 +1,10 @@ +export interface FineRecord { + id: string; + issueId: string; + memberName: string; + bookTitle: string; + delayedDays: number; + fineAmount: number; + paidStatus: boolean; + paidDate: string | null; +} \ No newline at end of file From 2c41f53c654f1a4816f85686fddc20f3c537a8c0 Mon Sep 17 00:00:00 2001 From: Yogeshwaran S Date: Tue, 2 Jun 2026 18:59:40 +0530 Subject: [PATCH 53/87] fix(auth,members): align route contracts and eliminate data-fetching race conditions - Added 'enabled' hooks to React Query blocks on Dashboard and Members pages to wait for the Zustand token initialization, preventing 'NONE' token 401 logouts. - Standardized backend metrics repository return structure to raw format and mapped properties directly inside the frontend dashboard adapter layer. - Mounted missing sub-routes for available users and membership plans directly inside the backend members module registry. - Safe-guarded Axios response interceptor from logging users out during unhandled 404 router errors. Note: Core backend changes are safely backed up in the 'feature/backend-setup' branch. --- client/src/api/axiosClient.ts | 23 +++- client/src/features/auth/pages/Login.tsx | 109 +++++++++--------- client/src/features/books/pages/BooksPage.tsx | 2 +- .../features/members/pages/MembersPage.tsx | 30 +++-- client/src/layouts/DashboardLayout.tsx | 6 +- client/src/pages/Dashboard.tsx | 47 ++++++-- server/src/database/seeders/seed.sql | 93 +++++++-------- server/src/middlewares/auth.ts | 3 +- server/src/modules/auth/auth.service.ts | 4 +- .../modules/dashboard/dashboard.repository.ts | 9 +- .../src/modules/dashboard/dashboard.routes.ts | 6 +- .../src/modules/members/member.controller.ts | 30 ++++- server/src/modules/members/member.routes.ts | 18 +++ 13 files changed, 239 insertions(+), 141 deletions(-) diff --git a/client/src/api/axiosClient.ts b/client/src/api/axiosClient.ts index c74425c..45db0da 100644 --- a/client/src/api/axiosClient.ts +++ b/client/src/api/axiosClient.ts @@ -3,17 +3,21 @@ import { useAuthStore } from "../store/authStore"; import { toast } from "sonner"; export const axiosClient: AxiosInstance = axios.create({ - baseURL: import.meta.env.VITE_API_BASE_URL || "http://localhost:5000/api", + // FIXED: Added /v1 to match your app.ts mounting route + baseURL: import.meta.env.VITE_API_BASE_URL || "http://localhost:5000/api/v1", timeout: 10000, headers: { "Content-Type": "application/json", }, }); -// Interceptor to inject bearer token before request hits the network axiosClient.interceptors.request.use( (config: InternalAxiosRequestConfig) => { const token = useAuthStore.getState().token; + + // 🔍 Add this line to see exactly WHAT token your frontend is shipping out! + console.log("Axios sending token to server:", token ? `${token.substring(0, 15)}...` : "NONE"); + if (token && config.headers) { config.headers.Authorization = `Bearer ${token}`; } @@ -22,16 +26,25 @@ axiosClient.interceptors.request.use( (error) => Promise.reject(error) ); -// Interceptor to globalize exception management (e.g., handling token expirations) axiosClient.interceptors.response.use( (response) => response, (error) => { const status = error.response?.status; + const isLoginRequest = error.config?.url?.includes("/auth/login"); + if (status === 401) { - toast.error("Session expired. Re-authenticating..."); - useAuthStore.getState().logout(); + if (!isLoginRequest) { + toast.error("Session expired. Re-authenticating..."); + useAuthStore.getState().logout(); + } else { + // Handle wrong credentials on the login screen cleanly + toast.error(error.response?.data?.message || "Invalid credentials."); + } } else if (status === 403) { toast.error("Unauthorized operation blocked."); + } else if (status === 404) { + // 💡 FIXED: Prevent 404s from executing a force-logout sequence + toast.warning(`Server API Endpoint Missing: ${error.config?.url}`); } else { toast.error(error.response?.data?.message || "An unexpected network anomaly occurred."); } diff --git a/client/src/features/auth/pages/Login.tsx b/client/src/features/auth/pages/Login.tsx index ba1c36c..4373941 100644 --- a/client/src/features/auth/pages/Login.tsx +++ b/client/src/features/auth/pages/Login.tsx @@ -21,59 +21,57 @@ export const Login = () => { const [isLoading, setIsLoading] = useState(false); const [fieldErrors, setFieldErrors] = useState<{ email?: string; password?: string }>({}); - const handleFormSubmission = async (e: React.FormEvent) => { - e.preventDefault(); - setIsLoading(true); - setFieldErrors({}); +const handleFormSubmission = async (e: React.FormEvent) => { + e.preventDefault(); + setIsLoading(true); + setFieldErrors({}); - // 1. Client-Side Parsing via Zod Engine Engine - const parsingResults = LoginSchema.safeParse({ - email, - password, - role: selectedRole, - }); + // 1. Client-Side Parsing via your frontend schema + const parsingResults = LoginSchema.safeParse({ + email, + password, + role: selectedRole, + }); - if (!parsingResults.success) { - const structuredErrors: { email?: string; password?: string } = {}; - parsingResults.error.issues.forEach((err) => { - if (err.path[0] === "email") structuredErrors.email = err.message; - if (err.path[0] === "password") structuredErrors.password = err.message; - }); - setFieldErrors(structuredErrors); - setIsLoading(false); - toast.error("Validation validation failed. Please address layout errors."); - return; - } + if (!parsingResults.success) { + const structuredErrors: { email?: string; password?: string } = {}; + parsingResults.error.issues.forEach((err) => { + if (err.path[0] === "email") structuredErrors.email = err.message; + if (err.path[0] === "password") structuredErrors.password = err.message; + }); + setFieldErrors(structuredErrors); + setIsLoading(false); + toast.error("Validation failed. Please address layout errors."); + return; + } - // 2. Transmit Handshake request to the backend REST API - try { - const networkResponse = await axiosClient.post("/auth/login", { - email, - password, - role: selectedRole, - }); + // 2. Transmit Handshake request to the backend REST API + try { + // Standard JSON payload structure sent directly to the server's req.body + const networkResponse = await axiosClient.post("/auth/login", { + gmail: email, // Maps your local state 'email' to backend's 'gmail' + password: password, // Maps your local state 'password' to backend's 'password' + role: selectedRole, // Passes role at the same root level + }); - const { user, token } = networkResponse.data; + const { user, token } = networkResponse.data; - // Commit the session credentials to global memory storage - setAuth(user, token); - toast.success("Security authorization handshake complete!"); - - // Dynamic operational routing redirection path choice - navigate("/dashboard"); - } catch (error: unknown) { // FIX (ESLint): Changed from 'any' to 'unknown' - console.error("Login authorization collapse anomaly:", error); - - // FIX (ESLint): Safe Type-Guarded extraction parsing - if (axios.isAxiosError(error)) { - toast.error(error.response?.data?.message || "Invalid account credentials."); - } else { - toast.error("An unexpected infrastructure error occurred."); - } - } finally { - setIsLoading(false); + setAuth(user, token); + toast.success("Login Successfully"); + navigate("/dashboard"); + } catch (error: unknown) { + console.error("Login Failed:", error); + + if (axios.isAxiosError(error)) { + console.log("Validation details from server:", error.response?.data); + toast.error(error.response?.data?.message || "Invalid account credentials."); + } else { + toast.error("An unexpected infrastructure error occurred."); } - }; + } finally { + setIsLoading(false); + } +}; return (
@@ -92,14 +90,15 @@ export const Login = () => {
📚
-

System Core Authentication

-

Enterprise Library Management Core Shell Portal

+

Welcome to

+

Library Management System

+

{/* RBAC Role Selector Tabs System */}
- +
@@ -194,10 +193,10 @@ export const Login = () => { - Validating Signature... + validate user... ) : ( - Authorize Account Portal + Login )} diff --git a/client/src/features/books/pages/BooksPage.tsx b/client/src/features/books/pages/BooksPage.tsx index c36486f..f33fc77 100644 --- a/client/src/features/books/pages/BooksPage.tsx +++ b/client/src/features/books/pages/BooksPage.tsx @@ -25,7 +25,7 @@ export const BooksPage = () => { const { data: categories = [] } = useQuery({ queryKey: ["bookCategoriesDropdownFeed"], - queryFn: async () => (await axiosClient.get("/categories")).data + queryFn: async () => (await axiosClient.get("/books")).data }); // 2. Data Mutation Operations Pipelines diff --git a/client/src/features/members/pages/MembersPage.tsx b/client/src/features/members/pages/MembersPage.tsx index a6436ed..a741efb 100644 --- a/client/src/features/members/pages/MembersPage.tsx +++ b/client/src/features/members/pages/MembersPage.tsx @@ -6,6 +6,7 @@ import { DeleteConfirmationModal } from "../components/DeleteConfirmationModal"; import type { LibraryMember, SystemUser, MembershipPlan } from "../../../types/members"; import type { MemberFormValues } from "../schemas/memberSchema"; import { toast } from "sonner"; +import { useAuthStore } from "../../../store/authStore"; export const MembersPage = () => { const queryClient = useQueryClient(); @@ -17,20 +18,35 @@ export const MembersPage = () => { const [isDeleteOpen, setIsDeleteOpen] = useState(false); const [selectedMember, setSelectedMember] = useState(null); - // 1. Fetch data feeds from backend routes +// 💡 1. Grab the token from your Zustand store to prevent "NONE" request races + const token = useAuthStore((state) => state.token); + + // 💡 2. Fetch data feeds with 'enabled' guards active const { data: members, isLoading } = useQuery({ - queryKey: ["membersListFeed"], - queryFn: async () => (await axiosClient.get("/members")).data + queryKey: ["membersListFeed", token], // Added token to cache key tracking + queryFn: async () => { + const res = await axiosClient.get("/members"); + return res.data?.data || res.data || []; // Extract JSend envelope accurately + }, + enabled: !!token, // 🚨 STOP THE RACE: Query will NOT fire if token is NONE or null! }); const { data: users = [] } = useQuery({ - queryKey: ["systemUsersDropdownFeed"], - queryFn: async () => (await axiosClient.get("/users/available-for-membership")).data + queryKey: ["systemUsersDropdownFeed", token], + queryFn: async () => { + const res = await axiosClient.get("/members/available-for-membership"); + return res.data?.data || res.data || []; + }, + enabled: !!token, // 🚨 STOP THE RACE: Query will NOT fire if token is NONE or null! }); const { data: plans = [] } = useQuery({ - queryKey: ["membershipPlansFeed"], - queryFn: async () => (await axiosClient.get("/membership-plans")).data + queryKey: ["membershipPlansFeed", token], + queryFn: async () => { + const res = await axiosClient.get("/members/plans"); + return res.data?.data || res.data || []; + }, + enabled: !!token, // 🚨 STOP THE RACE: Query will NOT fire if token is NONE or null! }); // 2. Data Mutation Handlers diff --git a/client/src/layouts/DashboardLayout.tsx b/client/src/layouts/DashboardLayout.tsx index ca1e413..5034115 100644 --- a/client/src/layouts/DashboardLayout.tsx +++ b/client/src/layouts/DashboardLayout.tsx @@ -26,7 +26,7 @@ export const DashboardLayout = () => {
L
- LMS Admin + LMS