lapeh 1.0.12 → 2.0.1

package/src/controllers/authController.ts

@@ -76,7 +76,7 @@ export async function login(req: Request, res: Response) {
     include: {
       user_roles: {
         include: {
-          roles: true,
+          role: true,
         },
       },
     },
@@ -102,8 +102,8 @@ export async function login(req: Request, res: Response) {
     return;
   }
   const primaryUserRole =
-    user.user_roles && user.user_roles.length > 0 && user.user_roles[0].roles
-      ? user.user_roles[0].roles.slug
+    user.user_roles && user.user_roles.length > 0 && user.user_roles[0].role
+      ? user.user_roles[0].role.slug
       : "user";
   const accessExpiresInSeconds = ACCESS_TOKEN_EXPIRES_IN_SECONDS;
   const accessExpiresAt = new Date(
@@ -145,7 +145,7 @@ export async function me(req: Request, res: Response) {
     include: {
       user_roles: {
         include: {
-          roles: true,
+          role: true,
         },
       },
     },
@@ -159,8 +159,8 @@ export async function me(req: Request, res: Response) {
     ...rest,
     id: user.id.toString(),
     role:
-      user.user_roles && user.user_roles.length > 0 && user.user_roles[0].roles
-        ? user.user_roles[0].roles.slug
+      user.user_roles && user.user_roles.length > 0 && user.user_roles[0].role
+        ? user.user_roles[0].role.slug
         : "user",
   });
 }
@@ -198,7 +198,7 @@ export async function refreshToken(req: Request, res: Response) {
       include: {
         user_roles: {
           include: {
-            roles: true,
+            role: true,
           },
         },
       },
@@ -208,8 +208,8 @@ export async function refreshToken(req: Request, res: Response) {
       return;
     }
     const primaryUserRole =
-      user.user_roles && user.user_roles.length > 0 && user.user_roles[0].roles
-        ? user.user_roles[0].roles.slug
+      user.user_roles && user.user_roles.length > 0 && user.user_roles[0].role
+        ? user.user_roles[0].role.slug
         : "user";
     const accessExpiresInSeconds = ACCESS_TOKEN_EXPIRES_IN_SECONDS;
     const accessExpiresAt = new Date(

package/src/controllers/petController.ts

@@ -0,0 +1,132 @@
+
+import { Request, Response } from "express";
+import { prisma } from "../prisma";
+import { sendSuccess, sendError } from "../utils/response";
+import { createPetSchema, updatePetSchema } from "../schema/pet-schema";
+import { getPagination, buildPaginationMeta } from "../utils/pagination";
+
+export async function index(req: Request, res: Response) {
+  const { page, perPage, skip, take } = getPagination(req.query);
+  const search = req.query.search as string;
+
+  const where: any = {};
+  if (search) {
+    where.OR = [
+      { name: { contains: search, mode: "insensitive" } },
+      { species: { contains: search, mode: "insensitive" } },
+    ];
+  }
+
+  const [data, total] = await Promise.all([
+    prisma.pets.findMany({
+      where,
+      skip,
+      take,
+      orderBy: { created_at: "desc" },
+    }),
+    prisma.pets.count({ where }),
+  ]);
+
+  const serialized = data.map((item: any) => ({
+    ...item,
+    id: item.id.toString(),
+  }));
+
+  const meta = buildPaginationMeta(page, perPage, total);
+
+  sendSuccess(res, 200, "Pets retrieved successfully", {
+    data: serialized,
+    meta,
+  });
+}
+
+export async function show(req: Request, res: Response) {
+  const { id } = req.params;
+  const pet = await prisma.pets.findUnique({
+    where: { id: BigInt(id) },
+  });
+
+  if (!pet) {
+    sendError(res, 404, "Pet not found");
+    return;
+  }
+
+  sendSuccess(res, 200, "Pet retrieved successfully", {
+    ...pet,
+    id: pet.id.toString(),
+  });
+}
+
+export async function store(req: Request, res: Response) {
+  const parsed = createPetSchema.safeParse(req.body);
+  if (!parsed.success) {
+    const errors = parsed.error.flatten().fieldErrors;
+    sendError(res, 422, "Validation error", errors);
+    return;
+  }
+
+  const pet = await prisma.pets.create({
+    data: {
+      ...parsed.data,
+      created_at: new Date(),
+      updated_at: new Date(),
+    },
+  });
+
+  sendSuccess(res, 201, "Pet created successfully", {
+    ...pet,
+    id: pet.id.toString(),
+  });
+}
+
+export async function update(req: Request, res: Response) {
+  const { id } = req.params;
+  const parsed = updatePetSchema.safeParse(req.body);
+
+  if (!parsed.success) {
+    const errors = parsed.error.flatten().fieldErrors;
+    sendError(res, 422, "Validation error", errors);
+    return;
+  }
+
+  const existing = await prisma.pets.findUnique({
+    where: { id: BigInt(id) },
+  });
+
+  if (!existing) {
+    sendError(res, 404, "Pet not found");
+    return;
+  }
+
+  const updated = await prisma.pets.update({
+    where: { id: BigInt(id) },
+    data: {
+      ...parsed.data,
+      updated_at: new Date(),
+    },
+  });
+
+  sendSuccess(res, 200, "Pet updated successfully", {
+    ...updated,
+    id: updated.id.toString(),
+  });
+}
+
+export async function destroy(req: Request, res: Response) {
+  const { id } = req.params;
+  
+  const existing = await prisma.pets.findUnique({
+    where: { id: BigInt(id) },
+  });
+
+  if (!existing) {
+    sendError(res, 404, "Pet not found");
+    return;
+  }
+
+  await prisma.pets.delete({
+    where: { id: BigInt(id) },
+  });
+
+  sendSuccess(res, 200, "Pet deleted successfully", null);
+}

package/src/models/core.model

@@ -0,0 +1,163 @@
+model cache {
+  key        String @id @db.VarChar(255)
+  value      String @db.Text
+  expiration Int
+}
+
+model cache_locks {
+  key        String @id @db.VarChar(255)
+  owner      String @db.VarChar(255)
+  expiration Int
+}
+
+model failed_jobs {
+  id         BigInt   @id @default(autoincrement())
+  uuid       String   @unique @db.VarChar(255)
+  connection String   @db.Text
+  queue      String   @db.Text
+  payload    String   @db.Text
+  exception  String   @db.Text
+  failed_at  DateTime @default(now()) @db.Timestamp(0)
+}
+
+model job_batches {
+  id             String @id @db.VarChar(255)
+  name           String @db.VarChar(255)
+  total_jobs     Int
+  pending_jobs   Int
+  failed_jobs    Int
+  failed_job_ids String @db.Text
+  options        String? @db.Text
+  cancelled_at   Int?
+  created_at     Int
+  finished_at    Int?
+}
+
+model jobs {
+  id           BigInt @id @default(autoincrement())
+  queue        String @db.VarChar(255)
+  payload      String @db.Text
+  attempts     Int    @db.SmallInt
+  reserved_at  Int?
+  available_at Int
+  created_at   Int
+
+  @@index([queue])
+}
+
+model migrations {
+  id        Int    @id @default(autoincrement())
+  migration String @db.VarChar(255)
+  batch     Int
+}
+
+model password_reset_tokens {
+  email      String    @id @db.VarChar(255)
+  token      String    @db.VarChar(255)
+  created_at DateTime? @db.Timestamp(0)
+}
+
+model personal_access_tokens {
+  id             BigInt    @id @default(autoincrement())
+  tokenable_type String    @db.VarChar(255)
+  tokenable_id   BigInt
+  name           String    @db.Text
+  token          String    @unique @db.VarChar(64)
+  abilities      String?   @db.Text
+  last_used_at   DateTime? @db.Timestamp(0)
+  expires_at     DateTime? @db.Timestamp(0)
+  created_at     DateTime? @db.Timestamp(0)
+  updated_at     DateTime? @db.Timestamp(0)
+
+  @@index([expires_at])
+  @@index([tokenable_type, tokenable_id])
+}
+
+model sessions {
+  id            String  @id @db.VarChar(255)
+  user_id       BigInt?
+  ip_address    String? @db.VarChar(45)
+  user_agent    String? @db.Text
+  payload       String  @db.Text
+  last_activity Int
+
+  @@index([last_activity])
+  @@index([user_id])
+}
+
+model users {
+  id                BigInt    @id @default(autoincrement())
+  uuid              String    @unique @db.Uuid
+  name              String    @db.VarChar(255)
+  email             String    @unique @db.VarChar(255)
+  avatar            String?   @db.VarChar(255)
+  avatar_url        String?   @db.VarChar(255)
+  email_verified_at DateTime? @db.Timestamp(0)
+  password          String    @db.VarChar(255)
+  remember_token    String?   @db.VarChar(100)
+  created_at        DateTime? @db.Timestamp(0)
+  updated_at        DateTime? @db.Timestamp(0)
+
+  user_roles       user_roles[]
+  user_permissions user_permissions[]
+}
+
+model roles {
+  id          BigInt    @id @default(autoincrement())
+  name        String    @db.VarChar(255)
+  slug        String    @unique @db.VarChar(255)
+  description String?   @db.Text
+  created_at  DateTime? @db.Timestamp(0)
+  updated_at  DateTime? @db.Timestamp(0)
+
+  user_roles       user_roles[]
+  role_permissions role_permissions[]
+}
+
+model permissions {
+  id          BigInt    @id @default(autoincrement())
+  name        String    @db.VarChar(255)
+  slug        String    @unique @db.VarChar(255)
+  description String?   @db.Text
+  created_at  DateTime? @db.Timestamp(0)
+  updated_at  DateTime? @db.Timestamp(0)
+
+  role_permissions role_permissions[]
+  user_permissions user_permissions[]
+}
+
+model user_roles {
+  id         BigInt    @id @default(autoincrement())
+  user_id    BigInt
+  role_id    BigInt
+  created_at DateTime? @db.Timestamp(0)
+
+  user users @relation(fields: [user_id], references: [id], onDelete: Cascade, onUpdate: NoAction)
+  role roles @relation(fields: [role_id], references: [id], onDelete: Cascade, onUpdate: NoAction)
+
+  @@unique([user_id, role_id])
+}
+
+model role_permissions {
+  id            BigInt    @id @default(autoincrement())
+  role_id       BigInt
+  permission_id BigInt
+  created_at    DateTime? @db.Timestamp(0)
+
+  role       roles       @relation(fields: [role_id], references: [id], onDelete: Cascade, onUpdate: NoAction)
+  permission permissions @relation(fields: [permission_id], references: [id], onDelete: Cascade, onUpdate: NoAction)
+
+  @@unique([role_id, permission_id])
+}
+
+model user_permissions {
+  id            BigInt    @id @default(autoincrement())
+  user_id       BigInt
+  permission_id BigInt
+  created_at    DateTime? @db.Timestamp(0)
+
+  user       users       @relation(fields: [user_id], references: [id], onDelete: Cascade, onUpdate: NoAction)
+  permission permissions @relation(fields: [permission_id], references: [id], onDelete: Cascade, onUpdate: NoAction)
+
+  @@unique([user_id, permission_id])
+}

package/src/models/pets.model

@@ -0,0 +1,9 @@
+
+model pets {
+  id         BigInt    @id @default(autoincrement())
+  name       String    @db.VarChar(255)
+  species    String    @db.VarChar(100)
+  age        Int       @db.SmallInt
+  created_at DateTime? @db.Timestamp(0)
+  updated_at DateTime? @db.Timestamp(0)
+}

package/src/prisma.ts

@@ -1,4 +1,4 @@
-import { PrismaClient } from "../generated/prisma/client";
+import { PrismaClient } from "../generated/prisma";
 import { PrismaPg } from "@prisma/adapter-pg";
 import { PrismaMariaDb } from "@prisma/adapter-mariadb";
 

package/src/redis.ts

@@ -38,12 +38,10 @@ redis.on("error", (err) => {
     // Replace the global redis instance with mock
     // Note: This is a runtime switch. Existing listeners might be lost if we don't handle carefully.
     // However, for a simple fallback, we can just use the mock for future calls.
-    
-    // Better approach: Since we exported 'redis' as a const (reference), we can't reassign it easily 
+    // Better approach: Since we exported 'redis' as a const (reference), we can't reassign it easily
     // if other modules already imported it.
     // BUT, ioredis instance itself is an EventEmitter.
-    
-    // Strategy: We keep 'redis' as the main interface. 
+    // Strategy: We keep 'redis' as the main interface.
     // If real redis fails, we just don't set isRedisConnected to true for the *real* one.
     // But wait, the user wants 'bundle redis'.
     // The best way is to detect failure during init and SWAP the implementation.
@@ -63,6 +61,7 @@ let activeRedis = redis; // Start with real redis attempt
 export async function initRedis() {
   if (process.env.NO_REDIS === "true") {
     activeRedis = mockRedis;
+    console.log("✅ Redis: Active (Source: Zero-Config Redis [NO_REDIS=true])");
     if (process.env.NODE_ENV === "production") {
       console.warn(
         "⚠️  WARNING: Running in PRODUCTION with in-memory Redis mock. Data will be lost on restart and not shared between instances."
@@ -75,9 +74,18 @@ export async function initRedis() {
     await redis.connect();
     activeRedis = redis; // Keep using real redis
     isRedisConnected = true;
+
+    // Determine source label
+    const sourceLabel = process.env.REDIS_URL
+      ? redisUrl
+      : "Zero-Config Redis (Localhost)";
+
+    console.log(`✅ Redis: Active (Source: ${sourceLabel})`);
   } catch (err) {
     // Connection failed, switch to mock
-    // console.log("Redis failed, using in-memory mock");
+    console.log(
+      `⚠️  Redis: Connection failed to ${redisUrl}, switching to fallback (Source: Zero-Config Redis [Mock])`
+    );
     activeRedis = mockRedis;
     isRedisConnected = true; // Mock is always "connected"
     if (process.env.NODE_ENV === "production") {
@@ -118,4 +126,4 @@ export async function delCache(key: string) {
 }
 
 // Export the proxy as 'redis' so consumers use it transparently
-export { redisProxy as redis };
+export { redisProxy as redis };

package/src/routes/pets.ts

@@ -0,0 +1,12 @@
+import { Router } from "express";
+import * as PetController from "../controllers/petController";
+
+const router = Router();
+
+router.get("/", PetController.index);
+router.get("/:id", PetController.show);
+router.post("/", PetController.store);
+router.put("/:id", PetController.update);
+router.delete("/:id", PetController.destroy);
+
+export default router;

package/src/schema/pet-schema.ts

@@ -0,0 +1,14 @@
+
+import { z } from "zod";
+
+export const createPetSchema = z.object({
+  name: z.string({ message: "Name is required" }),
+  species: z.string({ message: "Species is required" }),
+  age: z.number({ message: "Age is required" }).int().positive(),
+});
+
+export const updatePetSchema = z.object({
+  name: z.string().optional(),
+  species: z.string().optional(),
+  age: z.number().int().positive().optional(),
+});

package/src/server.ts

@@ -3,6 +3,7 @@ import cors from "cors";
 import helmet from "helmet";
 import { authRouter } from "./routes/auth";
 import { rbacRouter } from "./routes/rbac";
+import petRouter from "./routes/pets";
 import { visitorCounter } from "./middleware/visitor";
 import { errorHandler } from "./middleware/error";
 
@@ -28,5 +29,6 @@ app.use(visitorCounter);
 
 app.use("/api/auth", authRouter);
 app.use("/api/rbac", rbacRouter);
+app.use("/api/pets", petRouter);
 
 app.use(errorHandler);

package/src/models/schema.prisma

@@ -1,159 +0,0 @@
-
-model cache {
-  key        String @id @db.VarChar(255)
-  value      String
-  expiration Int
-}
-
-model cache_locks {
-  key        String @id @db.VarChar(255)
-  owner      String @db.VarChar(255)
-  expiration Int
-}
-
-model failed_jobs {
-  id         BigInt   @id @default(autoincrement())
-  uuid       String   @unique(map: "failed_jobs_uuid_unique") @db.VarChar(255)
-  connection String
-  queue      String
-  payload    String
-  exception  String
-  failed_at  DateTime @default(now()) @db.Timestamp(0)
-}
-
-model job_batches {
-  id             String  @id @db.VarChar(255)
-  name           String  @db.VarChar(255)
-  total_jobs     Int
-  pending_jobs   Int
-  failed_jobs    Int
-  failed_job_ids String
-  options        String?
-  cancelled_at   Int?
-  created_at     Int
-  finished_at    Int?
-}
-
-model jobs {
-  id           BigInt @id @default(autoincrement())
-  queue        String @db.VarChar(255)
-  payload      String
-  attempts     Int    @db.SmallInt
-  reserved_at  Int?
-  available_at Int
-  created_at   Int
-
-  @@index([queue], map: "jobs_queue_index")
-}
-
-model migrations {
-  id        Int    @id @default(autoincrement())
-  migration String @db.VarChar(255)
-  batch     Int
-}
-
-model password_reset_tokens {
-  email      String    @id @db.VarChar(255)
-  token      String    @db.VarChar(255)
-  created_at DateTime? @db.Timestamp(0)
-}
-
-model personal_access_tokens {
-  id             BigInt    @id @default(autoincrement())
-  tokenable_type String    @db.VarChar(255)
-  tokenable_id   BigInt
-  name           String
-  token          String    @unique(map: "personal_access_tokens_token_unique") @db.VarChar(64)
-  abilities      String?
-  last_used_at   DateTime? @db.Timestamp(0)
-  expires_at     DateTime? @db.Timestamp(0)
-  created_at     DateTime? @db.Timestamp(0)
-  updated_at     DateTime? @db.Timestamp(0)
-
-  @@index([expires_at], map: "personal_access_tokens_expires_at_index")
-  @@index([tokenable_type, tokenable_id], map: "personal_access_tokens_tokenable_type_tokenable_id_index")
-}
-
-model sessions {
-  id            String  @id @db.VarChar(255)
-  user_id       BigInt?
-  ip_address    String? @db.VarChar(45)
-  user_agent    String?
-  payload       String
-  last_activity Int
-
-  @@index([last_activity], map: "sessions_last_activity_index")
-  @@index([user_id], map: "sessions_user_id_index")
-}
-
-/// This table contains check constraints and requires additional setup for migrations. Visit https://pris.ly/d/check-constraints for more info.
-model users {
-  id                BigInt             @id @default(autoincrement())
-  uuid              String             @unique(map: "users_uuid_unique") @db.Uuid
-  name              String             @db.VarChar(255)
-  email             String             @unique(map: "users_email_unique") @db.VarChar(255)
-  avatar            String?            @db.VarChar(255)
-  avatar_url        String?            @db.VarChar(255)
-  email_verified_at DateTime?          @db.Timestamp(0)
-  password          String             @db.VarChar(255)
-  remember_token    String?            @db.VarChar(100)
-  created_at        DateTime?          @db.Timestamp(0)
-  updated_at        DateTime?          @db.Timestamp(0)
-  user_roles        user_roles[]
-  user_permissions  user_permissions[]
-}
-
-model roles {
-  id               BigInt             @id @default(autoincrement())
-  name             String             @db.VarChar(255)
-  slug             String             @unique @db.VarChar(255)
-  description      String?
-  created_at       DateTime?          @db.Timestamp(0)
-  updated_at       DateTime?          @db.Timestamp(0)
-  user_roles       user_roles[]
-  role_permissions role_permissions[]
-}
-
-model permissions {
-  id               BigInt             @id @default(autoincrement())
-  name             String             @db.VarChar(255)
-  slug             String             @unique @db.VarChar(255)
-  description      String?
-  created_at       DateTime?          @db.Timestamp(0)
-  updated_at       DateTime?          @db.Timestamp(0)
-  user_permissions user_permissions[]
-  role_permissions role_permissions[]
-}
-
-model user_roles {
-  id         BigInt    @id @default(autoincrement())
-  user_id    BigInt
-  role_id    BigInt
-  created_at DateTime? @db.Timestamp(0)
-  users      users     @relation(fields: [user_id], references: [id], onDelete: Cascade, onUpdate: NoAction)
-  roles      roles     @relation(fields: [role_id], references: [id], onDelete: Cascade, onUpdate: NoAction)
-
-  @@unique([user_id, role_id])
-}
-
-model role_permissions {
-  id            BigInt      @id @default(autoincrement())
-  role_id       BigInt
-  permission_id BigInt
-  created_at    DateTime?   @db.Timestamp(0)
-  roles         roles       @relation(fields: [role_id], references: [id], onDelete: Cascade, onUpdate: NoAction)
-  permissions   permissions @relation(fields: [permission_id], references: [id], onDelete: Cascade, onUpdate: NoAction)
-
-  @@unique([role_id, permission_id])
-}
-
-model user_permissions {
-  id            BigInt      @id @default(autoincrement())
-  user_id       BigInt
-  permission_id BigInt
-  created_at    DateTime?   @db.Timestamp(0)
-  users         users       @relation(fields: [user_id], references: [id], onDelete: Cascade, onUpdate: NoAction)
-  permissions   permissions @relation(fields: [permission_id], references: [id], onDelete: Cascade, onUpdate: NoAction)
-
-  @@unique([user_id, permission_id])
-}