pagination fix

Author: gugu

backend/src/entities/user-secret/application/data-structures/get-audit-log.ds.ts

@@ -1,4 +1,5 @@
 import { SecretActionEnum } from '../../../secret-access-log/secret-access-log.entity.js';
+import { PaginationDs } from '../../../table/application/data-structures/pagination.ds.js';
 
 export class GetAuditLogDS {
   userId: string;
@@ -23,10 +24,5 @@ export class AuditLogEntryDS {
 
 export class AuditLogListDS {
   data: AuditLogEntryDS[];
-  pagination: {
-    total: number;
-    page: number;
-    limit: number;
-    totalPages: number;
-  };
+  pagination: PaginationDs;
 }

backend/src/entities/user-secret/application/dto/audit-log.dto.ts

@@ -1,5 +1,6 @@
 import { ApiProperty } from '@nestjs/swagger';
 import { SecretActionEnum } from '../../../secret-access-log/secret-access-log.entity.js';
+import { PaginationDs } from '../../../table/application/data-structures/pagination.ds.js';
 
 export class AuditLogUserDto {
   @ApiProperty({
@@ -78,36 +79,6 @@ export class AuditLogEntryDto {
   errorMessage?: string;
 }
 
-export class AuditLogPaginationDto {
-  @ApiProperty({
-    type: Number,
-    description: 'Total number of audit log entries',
-    example: 150,
-  })
-  total: number;
-
-  @ApiProperty({
-    type: Number,
-    description: 'Current page number',
-    example: 1,
-  })
-  page: number;
-
-  @ApiProperty({
-    type: Number,
-    description: 'Number of entries per page',
-    example: 50,
-  })
-  limit: number;
-
-  @ApiProperty({
-    type: Number,
-    description: 'Total number of pages',
-    example: 3,
-  })
-  totalPages: number;
-}
-
 export class AuditLogResponseDto {
   @ApiProperty({
     type: AuditLogEntryDto,
@@ -117,8 +88,8 @@ export class AuditLogResponseDto {
   data: AuditLogEntryDto[];
 
   @ApiProperty({
-    type: AuditLogPaginationDto,
+    type: PaginationDs,
     description: 'Pagination information',
   })
-  pagination: AuditLogPaginationDto;
+  pagination: PaginationDs;
 }

backend/src/entities/user-secret/use-cases/get-secret-audit-log.use.case.ts

@@ -46,9 +46,9 @@ export class GetSecretAuditLogUseCase
       data: logs.map((log) => buildAuditLogEntryDS(log)),
       pagination: {
         total,
-        page,
-        limit,
-        totalPages: Math.ceil(total / limit),
+        currentPage: page,
+        perPage: limit,
+        lastPage: Math.ceil(total / limit),
       },
     };
   }

backend/test/ava-tests/non-saas-tests/non-saas-secrets-e2e.test.ts

@@ -485,8 +485,6 @@ test.serial(`${currentTest}?page=1&limit=2 - should paginate audit log`, async (
     .set('Content-Type', 'application/json')
     .set('Accept', 'application/json');
 
-  const connectionId = JSON.parse(createdConnection.text).id;
-
   const response = await request(app.getHttpServer())
     .get('/secrets/test-api-key/audit-log?page=1&limit=2')
     .set('Cookie', token)