@valentine-efagene/qshelter-common 2.0.5 → 2.0.7

package/dist/generated/client/models/UserRole.js

@@ -0,0 +1 @@
+export {};

package/dist/generated/client/models.d.ts

@@ -2,6 +2,7 @@ export type * from './models/User.js';
 export type * from './models/Role.js';
 export type * from './models/Permission.js';
 export type * from './models/RolePermission.js';
+export type * from './models/UserRole.js';
 export type * from './models/Tenant.js';
 export type * from './models/RefreshToken.js';
 export type * from './models/PasswordReset.js';

package/dist/index.d.ts

@@ -3,3 +3,4 @@ export * from './utils/errors';
 export * from './config';
 export { PrismaClient } from './generated/client/client';
 export * from './generated/client/models';
+export * from './prisma/user';

package/dist/index.js

@@ -3,3 +3,4 @@ export * from './utils/errors';
 export * from './config';
 export { PrismaClient } from './generated/client/client';
 export * from './generated/client/models';
+export * from './prisma/user';

package/dist/prisma/user.d.ts

@@ -0,0 +1,8 @@
+import { PrismaClient } from '../generated/client/client';
+/**
+ * Fetch a user and return a copy with a flattened `roles` array for quick access.
+ * Keeps `userRoles` intact on the returned object under the hood, but returns
+ * a top-level `roles` array of Role objects for convenience.
+ */
+export declare function getUserWithRoles(prisma: PrismaClient, userId: string): Promise<any>;
+export type { PrismaClient };

package/dist/prisma/user.js

@@ -0,0 +1,17 @@
+/**
+ * Fetch a user and return a copy with a flattened `roles` array for quick access.
+ * Keeps `userRoles` intact on the returned object under the hood, but returns
+ * a top-level `roles` array of Role objects for convenience.
+ */
+export async function getUserWithRoles(prisma, userId) {
+    const user = await prisma.user.findUnique({
+        where: { id: userId },
+        include: { userRoles: { include: { role: true } } },
+    });
+    if (!user)
+        return null;
+    const roles = user.userRoles?.map((ur) => ur.role) ?? [];
+    // Return a shallow copy of the user with `roles` fused in for quick access.
+    const { userRoles, ...rest } = user;
+    return { ...rest, roles };
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@valentine-efagene/qshelter-common",
-  "version": "2.0.5",
+  "version": "2.0.7",
   "description": "Shared database schemas and utilities for QShelter services",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/prisma/schema.prisma

@@ -19,30 +19,32 @@ datasource db {
 // =============================================================================
 
 model User {
-  id               String            @id @default(cuid())
-  email            String            @unique
-  password         String?
-  firstName        String?
-  lastName         String?
-  isActive         Boolean           @default(true)
-  isVerified       Boolean           @default(false)
-  googleId         String?           @unique
-  tenantId         String?
-  tenant           Tenant?           @relation(fields: [tenantId], references: [id], onDelete: SetNull)
-  roleId           String?
-  role             Role?             @relation(fields: [roleId], references: [id], onDelete: SetNull)
-  walletId         String?           @unique
-  wallet           Wallet?           @relation(fields: [walletId], references: [id])
-  createdAt        DateTime          @default(now())
-  updatedAt        DateTime          @updatedAt
-  emailVerifiedAt  DateTime?
-  lastLoginAt      DateTime?
-  refreshTokens    RefreshToken[]
-  passwordResets   PasswordReset[]
-  suspensions      UserSuspension[]
-  emailPreferences EmailPreference[]
-  deviceEndpoints  DeviceEndpoint[]
-  socials          Social[]
+  id                     String            @id @default(cuid())
+  email                  String            @unique
+  password               String?
+  phone                  String?           @unique
+  firstName              String?
+  lastName               String?
+  isActive               Boolean           @default(true)
+  isVerified             Boolean           @default(false)
+  googleId               String?           @unique
+  tenantId               String?
+  tenant                 Tenant?           @relation(fields: [tenantId], references: [id], onDelete: SetNull)
+  // Support multiple roles via explicit join table `UserRole`
+  userRoles              UserRole[]
+  walletId               String?           @unique
+  wallet                 Wallet?           @relation(fields: [walletId], references: [id])
+  createdAt              DateTime          @default(now())
+  updatedAt              DateTime          @updatedAt
+  emailVerifiedAt        DateTime?
+  emailVerificationToken String?
+  lastLoginAt            DateTime?
+  refreshTokens          RefreshToken[]
+  passwordResets         PasswordReset[]
+  suspensions            UserSuspension[]
+  emailPreferences       EmailPreference[]
+  deviceEndpoints        DeviceEndpoint[]
+  socials                Social[]
 
   // Relations to other domains
   properties    Property[]
@@ -54,7 +56,6 @@ model User {
 
   @@index([email])
   @@index([tenantId])
-  @@index([roleId])
   @@map("users")
 }
 
@@ -62,7 +63,7 @@ model Role {
   id          String           @id @default(cuid())
   name        String           @unique
   description String?
-  users       User[]
+  userRoles   UserRole[]
   permissions RolePermission[]
   createdAt   DateTime         @default(now())
   updatedAt   DateTime         @updatedAt
@@ -96,6 +97,17 @@ model RolePermission {
   @@map("role_permissions")
 }
 
+model UserRole {
+  userId    String
+  roleId    String
+  user      User     @relation(fields: [userId], references: [id], onDelete: Cascade)
+  role      Role     @relation(fields: [roleId], references: [id], onDelete: Cascade)
+  createdAt DateTime @default(now())
+
+  @@id([userId, roleId])
+  @@map("user_roles")
+}
+
 model Tenant {
   id        String   @id @default(cuid())
   name      String