IsManong

Author: CharlesCraft50

src/service-request/service-request.controller.ts

@@ -70,10 +70,10 @@ export class ServiceRequestController {
       success: true,
       data: result.data,
       message:
-        result.admin != false
+        result.isManong != false
           ? 'Proceed to the client’s location.'
           : 'Your Manong is on the way!',
-      admin: result.admin,
+      isManong: result.isManong,
     };
   }
 
@@ -106,7 +106,7 @@ export class ServiceRequestController {
         parseInt(limit),
       );
 
-    return { success: true, data: requests.data, admin: requests.admin };
+    return { success: true, data: requests.data, isManong: requests.isManong };
   }
 
   @UseGuards(JwtAuthGuard)

src/service-request/service-request.service.ts

@@ -175,7 +175,7 @@ export class ServiceRequestService {
       where = { userId };
     }
 
-    const admin = role == UserRole.admin || role == UserRole.manong;
+    const isManong = role == UserRole.manong;
 
     const requests = await this.prisma.serviceRequest.findMany({
       where: where,
@@ -216,7 +216,7 @@ export class ServiceRequestService {
         ...req,
         imagesPath: req.imagesPath,
       })),
-      admin: admin,
+      isManong: isManong,
     };
   }
 
@@ -486,7 +486,7 @@ export class ServiceRequestService {
       where = { userId };
     }
 
-    const admin = role == UserRole.admin || role == UserRole.manong;
+    const isManong = role == UserRole.manong;
 
     const ongoing = await this.prisma.serviceRequest.findFirst({
       where: { ...where, status: 'inprogress' },
@@ -513,7 +513,7 @@ export class ServiceRequestService {
 
     return {
       data: ongoing,
-      admin: admin,
+      isManong: isManong,
     };
   }