From 82ac15af6f143b000329fab61160320e2a12dd8f Mon Sep 17 00:00:00 2001
From: Kallesh B S <kalleshbs47@gmail.com>
Date: Sat, 27 Sep 2025 16:36:01 +0530
Subject: [PATCH] auth fix 2

---
 src/auth/auth.controller.ts                   |  4 ++--
 .../user-maintenance.service.ts               | 20 +++++++++----------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/auth/auth.controller.ts b/src/auth/auth.controller.ts
index 5b27c8d..182c034 100644
--- a/src/auth/auth.controller.ts
+++ b/src/auth/auth.controller.ts
@@ -187,7 +187,7 @@ export class AuthController {
   }
 
   @UseGuards(JwtAuthGuard, RolesGuard)
-  @Roles('sa')
+  @Roles('ua', 'sa', 'ca')
   @Post('1/sendmail')
   @HttpCode(200)
   async sendMaila(@Body() body: SendMailDTO, @Req() req: Request) {
@@ -204,7 +204,7 @@ export class AuthController {
 
 
   @UseGuards(JwtAuthGuard, RolesGuard)
-  @Roles('psa')
+  @Roles('pua','psa','pca')
   @Post('2/sendmail')
   @HttpCode(200)
   async sendMailb(@Body() body: SendMailDTO, @Req() req: Request) {
diff --git a/src/pg/user-maintenance/user-maintenance.service.ts b/src/pg/user-maintenance/user-maintenance.service.ts
index b4226f3..45bcfbd 100644
--- a/src/pg/user-maintenance/user-maintenance.service.ts
+++ b/src/pg/user-maintenance/user-maintenance.service.ts
@@ -539,34 +539,34 @@ export class UserMaintenanceService {
             const reducedRows = mappedRows.reduce((acc, curr) => {
                 let existing;
 
-                if (curr.Service_Provider_Name && curr.SPID) {
+                if (curr.SERVICE_PROVIDER_NAME && curr.SPID) {
                     existing = acc.find(
                         (item) =>
-                            item.Service_Provider_Name === curr.Service_Provider_Name &&
+                            item.SERVICE_PROVIDER_NAME === curr.SERVICE_PROVIDER_NAME &&
                             item.SPID === curr.SPID
                     );
-                } else if (curr.Preparer_Name && curr.CLIENTID) {
+                } else if (curr.PREPARER_NAME && curr.CLIENTID) {
                     existing = acc.find(
                         (item) =>
-                            item.Preparer_Name === curr.Preparer_Name &&
+                            item.PREPARER_NAME === curr.PREPARER_NAME &&
                             item.CLIENTID === curr.CLIENTID
                     );
                 }
 
                 if (existing) {
                     existing.CARNETSTATUS.push(curr.CARNETSTATUS);
-                    existing.Carnet_Count.push(curr.Carnet_Count);
+                    existing.CARNET_COUNT.push(curr.CARNET_COUNT);
                 } else {
                     const newItem = {
                         CARNETSTATUS: [curr.CARNETSTATUS],
-                        Carnet_Count: [curr.Carnet_Count],
+                        Carnet_Count: [curr.CARNET_COUNT],
                     };
 
-                    if (curr.Service_Provider_Name && curr.SPID) {
-                        newItem['Service_Provider_Name'] = curr.Service_Provider_Name;
+                    if (curr.SERVICE_PROVIDER_NAME && curr.SPID) {
+                        newItem['SERVICE_PROVIDER_NAME'] = curr.SERVICE_PROVIDER_NAME;
                         newItem['SPID'] = curr.SPID;
-                    } else if (curr.Preparer_Name && curr.CLIENTID) {
-                        newItem['Preparer_Name'] = curr.Preparer_Name;
+                    } else if (curr.PREPARER_NAME && curr.CLIENTID) {
+                        newItem['PREPARER_NAME'] = curr.PREPARER_NAME;
                         newItem['CLIENTID'] = curr.CLIENTID;
                     }