Merge branch 'paritosh-main1' of http://git.wdipl.com/Mayank.Mishra/MinglarBackendNestJS into sprint1

src/modules/minglaradmin/handlers/hosthub/hosts/addPQQSuggestion.ts

@@ -4,7 +4,7 @@ import { PrismaService } from '../../../../../common/database/prisma.service';
 import { MinglarService } from '../../../services/minglar.service';
 import ApiError from '../../../../../common/utils/helper/ApiError';
 import { verifyMinglarAdminToken } from '../../../../../common/middlewares/jwt/authForMinglarAdmin';
-import { HOST_SUGGESTION_TITLES } from '../../../../../common/utils/constants/minglar.constant';
+// import { HOST_SUGGESTION_TITLES } from '../../../../../common/utils/constants/minglar.constant';
 
 const prismaService = new PrismaService();
 const minglarService = new MinglarService(prismaService);
@@ -67,10 +67,10 @@ export const handler = safeHandler(async (
   }
 
   // Validate title is one of the allowed types
-  const allowedTitles = Object.values(HOST_SUGGESTION_TITLES);
-  if (!allowedTitles.includes(title)) {
-    throw new ApiError(400, `Invalid title. Allowed values: ${allowedTitles.join(', ')}`);
-  }
+  // const allowedTitles = Object.values(HOST_SUGGESTION_TITLES);
+  // if (!allowedTitles.includes(title)) {
+  //   throw new ApiError(400, `Invalid title. Allowed values: ${allowedTitles.join(', ')}`);
+  // }
 
   // Add suggestion using service
   await minglarService.addPqqSuggestion(title, comments, activity_pqq_header_xid,user.id);

src/modules/minglaradmin/handlers/hosthub/onboarding/getAllActivityOfHost.ts

@@ -5,6 +5,7 @@ import { safeHandler } from '../../../../../common/utils/handlers/safeHandler';
 import ApiError from '../../../../../common/utils/helper/ApiError';
 import { PrePopulateService } from '../../../../prepopulate/services/prepopulate.service';
 import { MinglarService } from '../../../services/minglar.service';
+import { paginationService } from '../../../../../common/utils/pagination/pagination.service';
 
 const prismaService = new PrismaService();
 const minglarService = new MinglarService(prismaService);
@@ -30,11 +31,18 @@ export const handler = safeHandler(async (
 
     const hostXid = Number(event.pathParameters?.id)
 
+    // Get pagination params from event
+    const paginationParams = paginationService.getPaginationFromEvent(event);
+    const paginationOptions = paginationService.parsePaginationParams(paginationParams);
 
     // Read optional search query (supports ?search= or ?q=)
     const search = event.queryStringParameters?.search || event.queryStringParameters?.q || undefined;
 
-    const data = await minglarService.getAllHostActivityForMinglar(search ? String(search) : undefined, hostXid);
+    const result = await minglarService.getAllHostActivityForMinglar(
+        search ? String(search) : undefined,
+        hostXid,
+        paginationOptions
+    );
     
 
     return {
@@ -46,7 +54,7 @@ export const handler = safeHandler(async (
         body: JSON.stringify({
             success: true,
             message: 'Data retrieved successfully',
-            data,
+            ...result,
         }),
     };
 });

src/modules/minglaradmin/services/minglar.service.ts

@@ -255,48 +255,46 @@ export class MinglarService {
     });
   }
 
-  async getAllHostActivityForMinglar(search?: string, hostXid?: number) {
-
-    const where: any = {
+  async getAllHostActivityForMinglar(search?: string, hostXid?: number, paginationOptions?: { page: number; limit: number; skip: number }) {
+    const whereClause = {
       isActive: true,
-      hostXid: hostXid
+      ...(hostXid ? { hostXid } : {}), // Add only if provided
     };
 
-    if (search && search.trim() !== '') {
-      const q = search.trim();
-      where.OR = [
-        { activityTypeName: { contains: q, mode: 'insensitive' } },
-        { interests: { interestName: { contains: q, mode: 'insensitive' } } },
-      ];
-    }
-    const hostActivities = await this.prisma.activities.findMany({
-      where,
-      include: {
-        ActivitiesMedia: {
-          select: {
-            id: true,
-            mediaFileName: true,
-            mediaType: true,
-            displayOrder: true,
+    const [hostActivities, totalCount] = await Promise.all([
+      this.prisma.activities.findMany({
+        where: whereClause,
+        include: {
+          ActivitiesMedia: {
+            select: {
+              id: true,
+              mediaFileName: true,
+              mediaType: true,
+              displayOrder: true,
+            },
           },
-        },
-        ActivityAmDetails: {
-          select: {
-            accountManager: {
-              select: {
-                id: true,
-                firstName: true,
-                lastName: true,
-                profileImage: true,
-                emailAddress: true,
-                roleXid: true,
+          ActivityAmDetails: {
+            select: {
+              accountManager: {
+                select: {
+                  id: true,
+                  firstName: true,
+                  lastName: true,
+                  profileImage: true,
+                  emailAddress: true,
+                  roleXid: true,
+                },
               },
             },
           },
+          activityType: true,
         },
-        activityType: true,
-      },
-    });
+        skip: paginationOptions?.skip || 0,
+        take: paginationOptions?.limit || 10,
+        orderBy: { id: 'desc' },
+      }),
+      this.prisma.activities.count({ where: whereClause }),
+    ]);
 
     // Process each activity
     for (const activity of hostActivities) {
@@ -337,8 +335,12 @@ export class MinglarService {
       }
     }
 
-
-    return hostActivities;
+    const { paginationService } = require('@/common/utils/pagination/pagination.service');
+    return paginationService.createPaginatedResponse(
+      hostActivities,
+      totalCount,
+      paginationOptions || { page: 1, limit: 10, skip: 0 }
+    );
   }