Merge pull request #52 from vernu/dev

Dev

Author: vernu

api/src/gateway/gateway.controller.ts

@@ -113,13 +113,20 @@ export class GatewayController {
 
   @ApiOperation({ summary: 'Get received SMS from a device' })
   @ApiResponse({ status: 200, type: RetrieveSMSResponseDTO })
+  @ApiQuery({ name: 'page', required: false, type: Number, description: 'Page number (default: 1)' })
+  @ApiQuery({ name: 'limit', required: false, type: Number, description: 'Number of items per page (default: 50, max: 100)' })
   @UseGuards(AuthGuard, CanModifyDevice)
   // deprecate getReceivedSMS route in favor of get-received-sms
   @Get(['/devices/:id/getReceivedSMS', '/devices/:id/get-received-sms'])
   async getReceivedSMS(
     @Param('id') deviceId: string,
+    @Request() req,
   ): Promise<RetrieveSMSResponseDTO> {
-    const data = await this.gatewayService.getReceivedSMS(deviceId)
-    return { data }
+    // Extract page and limit from query params, with defaults and max values
+    const page = req.query.page ? parseInt(req.query.page, 10) : 1;
+    const limit = req.query.limit ? Math.min(parseInt(req.query.limit, 10), 100) : 50;
+    
+    const result = await this.gatewayService.getReceivedSMS(deviceId, page, limit)
+    return result;
   }
 }

api/src/gateway/gateway.dto.ts

@@ -195,11 +195,48 @@ export class RetrieveSMSDTO {
   updatedAt: Date
 }
 
+export class PaginationMetaDTO {
+  @ApiProperty({
+    type: Number,
+    required: true,
+    description: 'Current page number',
+  })
+  page: number;
+
+  @ApiProperty({
+    type: Number,
+    required: true,
+    description: 'Number of items per page',
+  })
+  limit: number;
+
+  @ApiProperty({
+    type: Number,
+    required: true,
+    description: 'Total number of items',
+  })
+  total: number;
+
+  @ApiProperty({
+    type: Number,
+    required: true,
+    description: 'Total number of pages',
+  })
+  totalPages: number;
+}
+
 export class RetrieveSMSResponseDTO {
   @ApiProperty({
     type: [RetrieveSMSDTO],
     required: true,
     description: 'The received SMS data',
   })
   data: RetrieveSMSDTO[]
+
+  @ApiProperty({
+    type: PaginationMetaDTO,
+    required: true,
+    description: 'Pagination metadata',
+  })
+  meta?: PaginationMetaDTO
 }

api/src/gateway/gateway.service.ts

@@ -437,7 +437,7 @@ export class GatewayService {
     return sms
   }
 
-  async getReceivedSMS(deviceId: string): Promise<RetrieveSMSDTO[]> {
+  async getReceivedSMS(deviceId: string, page = 1, limit = 50): Promise<{ data: any[], meta: any }> {
     const device = await this.deviceModel.findById(deviceId)
 
     if (!device) {
@@ -450,20 +450,47 @@ export class GatewayService {
       )
     }
 
+    // Calculate skip value for pagination
+    const skip = (page - 1) * limit;
+
+    // Get total count for pagination metadata
+    const total = await this.smsModel.countDocuments({
+      device: device._id,
+      type: SMSType.RECEIVED,
+    });
+
     // @ts-ignore
-    return await this.smsModel
+    const data = await this.smsModel
       .find(
         {
           device: device._id,
           type: SMSType.RECEIVED,
         },
         null,
-        { sort: { receivedAt: -1 }, limit: 200 },
+        { 
+          sort: { receivedAt: -1 }, 
+          limit: limit,
+          skip: skip 
+        },
       )
       .populate({
         path: 'device',
         select: '_id brand model buildId enabled',
       })
+      .lean() // Use lean() to return plain JavaScript objects instead of Mongoose documents
+
+    // Calculate pagination metadata
+    const totalPages = Math.ceil(total / limit);
+    
+    return {
+      meta: {
+        page,
+        limit,
+        total,
+        totalPages,
+      },
+      data,
+    };
   }
 
   async getStatsForUser(user: User) {

api/src/gateway/schemas/sms.schema.ts

@@ -62,3 +62,6 @@ export class SMS {
 }
 
 export const SMSSchema = SchemaFactory.createForClass(SMS)
+
+
+SMSSchema.index({ device: 1, type: 1, receivedAt: -1 })