lapeh 2.4.12 → 2.6.2

package/prisma.config.ts

@@ -0,0 +1,14 @@
+import { defineConfig } from "@prisma/config";
+import * as dotenv from "dotenv";
+
+dotenv.config();
+
+export default defineConfig({
+  schema: "prisma/schema.prisma",
+  datasource: {
+    url: process.env.DATABASE_URL,
+  },
+  migrations: {
+    seed: 'ts-node prisma/seed.ts',
+  },
+});

package/scripts/compile-schema.js

@@ -2,16 +2,16 @@ const fs = require('fs');
 const path = require('path');
 
 const prismaDir = path.join(__dirname, '..', 'prisma');
-const modelsDir = path.join(__dirname, '..', 'src', 'models');
+const modulesDir = path.join(__dirname, '..', 'src', 'modules');
 const schemaFile = path.join(prismaDir, 'schema.prisma');
 const baseFile = path.join(prismaDir, 'base.prisma.template');
 
-// Ensure models directory exists
-if (!fs.existsSync(modelsDir)) {
-  fs.mkdirSync(modelsDir, { recursive: true });
+// Read base schema (datasource & generator)
+if (!fs.existsSync(baseFile)) {
+    console.error(`❌ Base schema template not found at ${baseFile}`);
+    process.exit(1);
 }
 
-// Read base schema (datasource & generator)
 let schemaContent = fs.readFileSync(baseFile, 'utf8');
 
 // Detect provider from datasource block
@@ -19,11 +19,28 @@ const providerMatch = schemaContent.match(/datasource\s+\w+\s+\{[\s\S]*?provider
 const provider = providerMatch ? providerMatch[1] : 'postgresql';
 const isMongo = provider === 'mongodb';
 
-// Read all .prisma files in src/models
-const modelFiles = fs.readdirSync(modelsDir).filter(file => file.endsWith('.prisma'));
+// Helper to find all .prisma files recursively
+function findPrismaFiles(dir, fileList = []) {
+  if (!fs.existsSync(dir)) return fileList;
+  const files = fs.readdirSync(dir);
+  files.forEach(file => {
+    const filePath = path.join(dir, file);
+    const stat = fs.statSync(filePath);
+    if (stat.isDirectory()) {
+      findPrismaFiles(filePath, fileList);
+    } else {
+      if (file.endsWith('.prisma')) {
+        fileList.push(filePath);
+      }
+    }
+  });
+  return fileList;
+}
+
+const modelFiles = findPrismaFiles(modulesDir);
 
-modelFiles.forEach(file => {
-  let content = fs.readFileSync(path.join(modelsDir, file), 'utf8');
+modelFiles.forEach(filePath => {
+  let content = fs.readFileSync(filePath, 'utf8');
   
   if (!isMongo) {
     // Transform MongoDB specific syntax to SQL compatible syntax
@@ -33,6 +50,7 @@ modelFiles.forEach(file => {
       // Remove @map("_id")
       .replace(/@map\("_id"\)/g, '')
       // Replace @default(auto()) with @default(uuid()) for Strings
+      // Note: This is a simple replacement, check your schema if you use auto() for Int
       .replace(/@default\(auto\(\)\)/g, '@default(uuid())');
   }
 
@@ -43,4 +61,4 @@ modelFiles.forEach(file => {
 fs.writeFileSync(schemaFile, schemaContent);
 
 console.log('✅ Prisma schema compiled successfully!');
-console.log(`   Merged ${modelFiles.length} model files from src/models/ into prisma/schema.prisma`);
+console.log(`   Merged ${modelFiles.length} model files from src/modules/ into prisma/schema.prisma`);

package/scripts/make-module.js

@@ -1,158 +1,100 @@
-const fs = require('fs');
-const path = require('path');
-
-const moduleName = process.argv[2];
-
-if (!moduleName) {
-  console.error('❌ Please specify the module name.');
-  console.error('   Usage: npm run make:module <name>');
-  console.error('   Example: npm run make:module product');
-  process.exit(1);
-}
-
-// Convert "product" -> "Product" (PascalCase) for Class names
-const PascalCaseName = moduleName.charAt(0).toUpperCase() + moduleName.slice(1);
-// Convert "product" -> "product" (camelCase) for variables/files
-const camelCaseName = moduleName.toLowerCase();
-
-const srcDir = path.join(__dirname, '..', 'src');
-
-// 1. Create Controller
-const controllerContent = `import { Request, Response } from 'express';
-import { ${PascalCaseName}Service } from '../services/${camelCaseName}Service';
-import { successResponse, errorResponse } from '../utils/response';
-
-export const ${PascalCaseName}Controller = {
-  async getAll(req: Request, res: Response) {
-    try {
-      const data = await ${PascalCaseName}Service.getAll();
-      return successResponse(res, data, '${PascalCaseName}s retrieved successfully');
-    } catch (error) {
-      return errorResponse(res, error as Error);
-    }
-  },
-
-  async getById(req: Request, res: Response) {
-    try {
-      const { id } = req.params;
-      const data = await ${PascalCaseName}Service.getById(id);
-      if (!data) return errorResponse(res, new Error('${PascalCaseName} not found'), 404);
-      return successResponse(res, data, '${PascalCaseName} retrieved successfully');
-    } catch (error) {
-      return errorResponse(res, error as Error);
-    }
-  },
-
-  async create(req: Request, res: Response) {
-    try {
-      const data = await ${PascalCaseName}Service.create(req.body);
-      return successResponse(res, data, '${PascalCaseName} created successfully', 201);
-    } catch (error) {
-      return errorResponse(res, error as Error);
-    }
-  },
-
-  async update(req: Request, res: Response) {
-    try {
-      const { id } = req.params;
-      const data = await ${PascalCaseName}Service.update(id, req.body);
-      return successResponse(res, data, '${PascalCaseName} updated successfully');
-    } catch (error) {
-      return errorResponse(res, error as Error);
-    }
-  },
-
-  async delete(req: Request, res: Response) {
-    try {
-      const { id } = req.params;
-      await ${PascalCaseName}Service.delete(id);
-      return successResponse(res, null, '${PascalCaseName} deleted successfully');
-    } catch (error) {
-      return errorResponse(res, error as Error);
-    }
-  }
-};
-`;
-
-// 2. Create Service
-const serviceContent = `// import prisma from '../prisma'; // Uncomment this line if you use Prisma
-
-export const ${PascalCaseName}Service = {
-  async getAll() {
-    // return prisma.${camelCaseName}.findMany();
-    return [{ id: 1, name: 'Sample ${PascalCaseName}' }]; // Placeholder
-  },
-
-  async getById(id: string) {
-    // return prisma.${camelCaseName}.findUnique({ where: { id } });
-    return { id, name: 'Sample ${PascalCaseName}' }; // Placeholder
-  },
-
-  async create(data: any) {
-    // return prisma.${camelCaseName}.create({ data });
-    return { id: Date.now(), ...data }; // Placeholder
-  },
-
-  async update(id: string, data: any) {
-    // return prisma.${camelCaseName}.update({ where: { id }, data });
-    return { id, ...data }; // Placeholder
-  },
-
-  async delete(id: string) {
-    // return prisma.${camelCaseName}.delete({ where: { id } });
-    return true; // Placeholder
-  }
-};
-`;
-
-// 3. Create Route
-const routeContent = `import { Router } from 'express';
-import { ${PascalCaseName}Controller } from '../controllers/${camelCaseName}Controller';
-import { authenticateToken } from '../middleware/auth';
-
-const router = Router();
-
-router.get('/', authenticateToken, ${PascalCaseName}Controller.getAll);
-router.get('/:id', authenticateToken, ${PascalCaseName}Controller.getById);
-router.post('/', authenticateToken, ${PascalCaseName}Controller.create);
-router.put('/:id', authenticateToken, ${PascalCaseName}Controller.update);
-router.delete('/:id', authenticateToken, ${PascalCaseName}Controller.delete);
-
-export default router;
-`;
-
-const paths = {
-  controller: path.join(srcDir, 'controllers', `${camelCaseName}Controller.ts`),
-  service: path.join(srcDir, 'services', `${camelCaseName}Service.ts`),
-  route: path.join(srcDir, 'routes', `${camelCaseName}.ts`),
-};
-
-// Helper to create directory if not exists
-function ensureDir(filePath) {
-  const dirname = path.dirname(filePath);
-  if (!fs.existsSync(dirname)) {
-    fs.mkdirSync(dirname, { recursive: true });
-  }
-}
-
-try {
-  ensureDir(paths.controller);
-  fs.writeFileSync(paths.controller, controllerContent);
-  console.log(`✅ Created Controller: src/controllers/${camelCaseName}Controller.ts`);
-
-  ensureDir(paths.service);
-  fs.writeFileSync(paths.service, serviceContent);
-  console.log(`✅ Created Service: src/services/${camelCaseName}Service.ts`);
-
-  ensureDir(paths.route);
-  fs.writeFileSync(paths.route, routeContent);
-  console.log(`✅ Created Route: src/routes/${camelCaseName}.ts`);
-
-  console.log('\n⚠️  Don\'t forget to register the new route in src/index.ts or src/server.ts!');
-  console.log(`   import ${camelCaseName}Routes from './routes/${camelCaseName}';`);
-  console.log(`   app.use('/${camelCaseName}s', ${camelCaseName}Routes);`);
-
-} catch (error) {
-  console.error('❌ Error creating module:', error);
-  process.exit(1);
-}
+const fs = require('fs');
+const path = require('path');
+
+const args = process.argv.slice(2);
+const moduleName = args[0];
+
+if (!moduleName) {
+  console.error('❌ Please specify the module name.');
+  console.error('   Usage: npm run make:module <ModuleName>');
+  process.exit(1);
+}
+
+// Capitalize first letter
+const name = moduleName.charAt(0).toUpperCase() + moduleName.slice(1);
+const lowerName = moduleName.toLowerCase();
+
+const moduleDir = path.join(__dirname, '..', 'src', 'modules', name);
+
+if (fs.existsSync(moduleDir)) {
+  console.error(`❌ Module ${name} already exists at ${moduleDir}`);
+  process.exit(1);
+}
+
+fs.mkdirSync(moduleDir, { recursive: true });
+
+// Controller
+const controllerContent = `import { Request, Response } from "express";
+import { sendSuccess } from "@lapeh/utils/response";
+// import * as ${name}Service from "./${lowerName}.service";
+
+export async function index(_req: Request, res: Response) {
+  sendSuccess(res, 200, "Index ${name}");
+}
+
+export async function show(req: Request, res: Response) {
+  const { id } = req.params;
+  sendSuccess(res, 200, "Show ${name} " + id);
+}
+
+export async function create(_req: Request, res: Response) {
+  sendSuccess(res, 201, "Create ${name}");
+}
+
+export async function update(req: Request, res: Response) {
+  const { id } = req.params;
+  sendSuccess(res, 200, "Update ${name} " + id);
+}
+
+export async function destroy(req: Request, res: Response) {
+  const { id } = req.params;
+  sendSuccess(res, 200, "Delete ${name} " + id);
+}
+`;
+
+fs.writeFileSync(path.join(moduleDir, `${lowerName}.controller.ts`), controllerContent);
+
+// Service (Optional but good for NestJS style)
+const serviceContent = `// import { prisma } from "@lapeh/core/database";
+
+export async function findAll() {
+  return [];
+}
+
+export async function findOne(_id: number) {
+  return null;
+}
+`;
+fs.writeFileSync(path.join(moduleDir, `${lowerName}.service.ts`), serviceContent);
+
+// Route Stub
+const routeContent = `import { Router } from "express";
+import * as ${name}Controller from "./${lowerName}.controller";
+
+const router = Router();
+
+router.get("/", ${name}Controller.index);
+router.get("/:id", ${name}Controller.show);
+router.post("/", ${name}Controller.create);
+router.put("/:id", ${name}Controller.update);
+router.delete("/:id", ${name}Controller.destroy);
+
+export default router;
+`;
+fs.writeFileSync(path.join(moduleDir, `${lowerName}.routes.ts`), routeContent);
+
+// Prisma Model
+const prismaContent = `model ${name} {
+  id        String   @id @default(uuid())
+  createdAt DateTime @default(now())
+  updatedAt DateTime @updatedAt
+}
+`;
+fs.writeFileSync(path.join(moduleDir, `${lowerName}.prisma`), prismaContent);
+
+console.log(`✅ Module ${name} created successfully at src/modules/${name}`);
+console.log(`   - ${lowerName}.controller.ts`);
+console.log(`   - ${lowerName}.service.ts`);
+console.log(`   - ${lowerName}.routes.ts`);
+console.log(`   - ${lowerName}.prisma`);
+console.log(`\n👉 Don't forget to register the route in src/routes/index.ts!`);

package/src/config/app.ts

@@ -0,0 +1,9 @@
+export const appConfig = {
+  name: 'Lapeh API',
+  timeout: 30000, // 30 seconds
+  compression: true,
+  rateLimit: {
+    windowMs: 15 * 60 * 1000, // 15 minutes
+    max: 100, // Limit each IP to 100 requests per windowMs
+  },
+};

package/src/config/cors.ts

@@ -0,0 +1,5 @@
+export const corsConfig = {
+  origin: process.env.CORS_ORIGIN || '*',
+  credentials: true,
+  exposedHeaders: ['x-access-token', 'x-access-expires-at'],
+};

package/src/routes/auth.ts

@@ -13,7 +13,7 @@ import {
   updatePassword,
   updateProfile,
   updateAvatar,
-} from "@/controllers/authController";
+} from "@/modules/Auth/auth.controller";
 import { requireAuth } from "@lapeh/middleware/auth";
 
 const authLimiter = rateLimit({

package/src/routes/pets.ts

@@ -1,5 +1,5 @@
 import { Router } from "express";
-import * as PetController from "@/controllers/petController";
+import * as PetController from "@/modules/Pets/pets.controller";
 import { parseMultipart } from "@lapeh/middleware/multipart";
 
 const router = Router();

package/src/routes/rbac.ts

@@ -15,7 +15,7 @@ import {
   removePermissionFromRole,
   assignPermissionToUser,
   removePermissionFromUser,
-} from "@/controllers/rbacController";
+} from "@/modules/Rbac/rbac.controller";
 
 export const rbacRouter = Router();
 

package/storage/logs/.0337f5062fe676994d1dc340156e089444e3d6e0-audit.json

@@ -19,6 +19,11 @@
             "date": 1766895868212,
             "name": "E:\\PROJECT\\ANY\\2026\\lapeh\\storage\\logs\\lapeh-2025-12-28.log",
             "hash": "43121130a6745af0345b445cc3497d27a18a857e350d002848a27b0c71a577ae"
+        },
+        {
+            "date": 1766942707900,
+            "name": "E:\\PROJECT\\ANY\\2026\\lapeh\\storage\\logs\\lapeh-2025-12-29.log",
+            "hash": "319d94eefcace8d4eefdee311691c27d9b3ba62fa6ed32782055dc864369d5c5"
         }
     ],
     "hashType": "sha256"

package/storage/logs/lapeh-2025-12-29.log

@@ -0,0 +1,94 @@
+[2025-12-29 00:25:08] WARN: Bad Request
+Errors: {
+  "field": "Required"
+}
+Meta: {"statusCode":400}
+[2025-12-29 00:25:16] INFO: GET /api/pets 200 - 17ms - ::ffff:127.0.0.1
+[2025-12-29 00:25:16] INFO: GET / 200 - 15ms - ::ffff:127.0.0.1
+[2025-12-29 00:25:16] INFO: GET /api/rbac/roles 200 - 16ms - ::ffff:127.0.0.1
+[2025-12-29 00:25:16] INFO: GET /api/pets 200 - 18ms - ::ffff:127.0.0.1
+[2025-12-29 00:25:16] INFO: GET /api/auth/me 200 - 15ms - ::ffff:127.0.0.1
+[2025-12-29 00:25:16] INFO: GET /api/pets?search=Fluffy 200 - 1ms - ::ffff:127.0.0.1
+[2025-12-29 00:25:16] WARN: GET /unknown 404 - 2ms - ::ffff:127.0.0.1
+[2025-12-29 00:25:16] INFO: GET /api/pets/1 200 - 1ms - ::ffff:127.0.0.1
+[2025-12-29 00:25:16] WARN: Pet not found
+Meta: {"statusCode":404}
+[2025-12-29 00:25:16] WARN: User not found
+Meta: {"statusCode":404}
+[2025-12-29 00:25:16] WARN: GET /api/pets/999 404 - 4ms - ::ffff:127.0.0.1
+[2025-12-29 00:25:16] WARN: GET /api/auth/me 404 - 7ms - ::ffff:127.0.0.1
+[2025-12-29 00:25:16] INFO: PUT /api/auth/profile 200 - 140ms - ::ffff:127.0.0.1
+[2025-12-29 00:25:16] INFO: POST /api/rbac/roles 201 - 166ms - ::ffff:127.0.0.1
+[2025-12-29 00:25:16] INFO: POST /api/pets 201 - 145ms - ::ffff:127.0.0.1
+[2025-12-29 00:25:16] INFO: POST /api/pets 201 - 150ms - ::ffff:127.0.0.1
+[2025-12-29 00:25:16] WARN: Validation error
+Errors: {
+  "species": [
+    "Required"
+  ],
+  "age": [
+    "Expected number, received nan"
+  ]
+}
+Meta: {"statusCode":422}
+[2025-12-29 00:25:16] INFO: POST /api/rbac/permissions 201 - 3ms - ::ffff:127.0.0.1
+[2025-12-29 00:25:16] WARN: POST /api/pets 422 - 3ms - ::ffff:127.0.0.1
+[2025-12-29 00:25:16] WARN: Validation error
+Errors: {
+  "species": [
+    "Required"
+  ],
+  "age": [
+    "Expected number, received nan"
+  ]
+}
+Meta: {"statusCode":422}
+[2025-12-29 00:25:16] INFO: GET /api/rbac/permissions 200 - 1ms - ::ffff:127.0.0.1
+[2025-12-29 00:25:16] INFO: PUT /api/pets/1 200 - 2ms - ::ffff:127.0.0.1
+[2025-12-29 00:25:16] WARN: POST /api/pets 422 - 9ms - ::ffff:127.0.0.1
+[2025-12-29 00:25:16] WARN: Pet not found
+Meta: {"statusCode":404}
+[2025-12-29 00:25:16] WARN: PUT /api/pets/999 404 - 3ms - ::ffff:127.0.0.1
+[2025-12-29 00:25:17] INFO: GET /api/pets/1 200 - 2ms - ::ffff:127.0.0.1
+[2025-12-29 00:25:17] INFO: POST /api/rbac/users/assign-role 200 - 2ms - ::ffff:127.0.0.1
+[2025-12-29 00:25:17] INFO: DELETE /api/pets/1 200 - 2ms - ::ffff:127.0.0.1
+[2025-12-29 00:25:17] WARN: Pet not found
+Meta: {"statusCode":404}
+[2025-12-29 00:25:17] WARN: GET /api/pets/999 404 - 2ms - ::ffff:127.0.0.1
+[2025-12-29 00:25:17] WARN: User not found
+Meta: {"statusCode":404}
+[2025-12-29 00:25:17] WARN: Pet not found
+Meta: {"statusCode":404}
+[2025-12-29 00:25:17] INFO: PUT /api/pets/1 200 - 1ms - ::ffff:127.0.0.1
+[2025-12-29 00:25:17] WARN: DELETE /api/pets/999 404 - 2ms - ::ffff:127.0.0.1
+[2025-12-29 00:25:17] WARN: POST /api/rbac/users/assign-role 404 - 6ms - ::ffff:127.0.0.1
+[2025-12-29 00:25:17] WARN: Pet not found
+Meta: {"statusCode":404}
+[2025-12-29 00:25:17] WARN: PUT /api/pets/999 404 - 2ms - ::ffff:127.0.0.1
+[2025-12-29 00:25:17] INFO: DELETE /api/pets/1 200 - 1ms - ::ffff:127.0.0.1
+[2025-12-29 00:25:17] WARN: Pet not found
+Meta: {"statusCode":404}
+[2025-12-29 00:25:17] WARN: DELETE /api/pets/999 404 - 1ms - ::ffff:127.0.0.1
+[2025-12-29 00:25:17] INFO: POST /api/auth/register 201 - 320ms - ::ffff:127.0.0.1
+[2025-12-29 00:25:17] WARN: Validation error
+Errors: {
+  "email": [
+    "The email has already been taken."
+  ]
+}
+Meta: {"statusCode":422}
+[2025-12-29 00:25:17] WARN: POST /api/auth/register 422 - 5ms - ::ffff:127.0.0.1
+[2025-12-29 00:25:17] INFO: PUT /api/auth/password 200 - 121ms - ::ffff:127.0.0.1
+[2025-12-29 00:25:17] INFO: POST /api/auth/login 200 - 68ms - ::ffff:127.0.0.1
+[2025-12-29 00:25:17] WARN: Invalid credentials
+Errors: {
+  "field": "currentPassword",
+  "message": "Current password is incorrect"
+}
+Meta: {"statusCode":401}
+[2025-12-29 00:25:17] WARN: PUT /api/auth/password 401 - 59ms - ::ffff:127.0.0.1
+[2025-12-29 00:25:17] INFO: POST /api/auth/refresh 200 - 2ms - ::ffff:127.0.0.1
+[2025-12-29 00:25:17] WARN: Invalid refresh token
+Meta: {"statusCode":401}
+[2025-12-29 00:25:17] WARN: POST /api/auth/refresh 401 - 2ms - ::ffff:127.0.0.1
+[2025-12-29 00:25:17] INFO: POST /api/auth/avatar 200 - 5ms - ::ffff:127.0.0.1