Merge branch 'master' into production

src/modules/notifications/controllers/notifications.controller.ts

@@ -168,9 +168,18 @@ export class NotificationsController {
     return this.preferenceService.create(restaurantId, dto);
   }
 
-  //here
+  @UseGuards(AdminAuthGuard)
+  @ApiBearerAuth()
+  @Get('admin/notifications/sms-usage')
+  @ApiOperation({ summary: 'Get SMS usage for my restaurant' })
+  async getRestaurantSmsUsage(@RestId() restaurantId: string) {
+    const smsCount = await this.notificationService.getSmsCountByRestaurantId(restaurantId);
+    return { smsCount };
+  }
 
-  // @UseGuards(SuperAdminAuthGuard)
+  // super admin endpoints
+
+  @UseGuards(SuperAdminAuthGuard)
   @ApiBearerAuth()
   @Get('super-admin/notifications/sms-count')
   @ApiOperation({ summary: 'Get SMS count for each restaurant with pagination' })

src/modules/notifications/repositories/sms-log.repository.ts

@@ -59,5 +59,18 @@ export class SmsLogRepository extends EntityRepository<SmsLog> {
       },
     };
   }
+
+  async getSmsCountByRestaurantId(restaurantId: string): Promise<number> {
+    const result = await this.em.execute(
+      `
+      SELECT COUNT(sl.id)::int as "smsCount"
+      FROM sms_logs sl
+      WHERE sl.restaurant_id = ?
+      `,
+      [restaurantId],
+    );
+
+    return parseInt(result[0]?.smsCount || '0', 10);
+  }
 }
 

src/modules/notifications/services/notification.service.ts

@@ -275,4 +275,8 @@ export class NotificationService {
   ): Promise<PaginatedResult<{ restaurantId: string; restaurantName: string; smsCount: number }>> {
     return this.smsLogRepository.getSmsCountByRestaurant(page, limit);
   }
+
+  async getSmsCountByRestaurantId(restaurantId: string): Promise<number> {
+    return this.smsLogRepository.getSmsCountByRestaurantId(restaurantId);
+  }
 }