fix: issue with stats count on admin panel (#618)

* fix: create a dto for the query * fix: prettier --------- Co-authored-by: orig <[email protected]>
origranot · Dec 18, 2023 · 518def2 · 518def2
1 parent 1040ea6
commit 518def2
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 9 deletions.
diff --git a/apps/backend/src/core/users/dto/count-query.dto.ts b/apps/backend/src/core/users/dto/count-query.dto.ts
@@ -0,0 +1,18 @@
+import { IsOptional, IsBoolean, IsDateString, IsString, IsBooleanString, IsDate } from 'class-validator';
+import { Transform } from 'class-transformer';
+
+export class CountQueryDto {
+  @IsOptional()
+  @IsDate()
+  @Transform(({ value }) => (value ? new Date(value) : null))
+  startDate: Date;
+
+  @IsOptional()
+  @IsDate()
+  @Transform(({ value }) => (value ? new Date(value) : null))
+  endDate: Date;
+
+  @IsOptional()
+  @IsBooleanString()
+  verified: boolean;
+}
diff --git a/apps/backend/src/core/users/dto/index.ts b/apps/backend/src/core/users/dto/index.ts
@@ -1 +1,2 @@
 export * from './find-all-query.dto';
+export * from './count-query.dto';
diff --git a/apps/backend/src/core/users/users.controller.ts b/apps/backend/src/core/users/users.controller.ts
@@ -1,6 +1,6 @@
-import { Controller, Get, Param, Query, UseGuards } from '@nestjs/common';
+import { Controller, Get, Query, UseGuards } from '@nestjs/common';
 import { Role, User } from '@reduced.to/prisma';
-import { FindAllQueryDto } from './dto';
+import { FindAllQueryDto, CountQueryDto } from './dto';
 import { UsersService } from './users.service';
 import { JwtAuthGuard } from '../../auth/guards/jwt.guard';
 import { RolesGuard } from '../../auth/guards/roles.guard';
@@ -30,15 +30,11 @@ export class UsersController {
 
   @Get('count')
   @Roles(Role.ADMIN)
-  async count(@Query('startDate') startDate: Date, @Query('endDate') endDate: Date, @Query('verified') verified: boolean) {
-    // Create a filter object based on the query parameters
+  async count(@Query() { startDate, endDate, verified }: CountQueryDto) {
     const filter: Record<string, any> = {};
 
-    if (!isNaN(startDate.getTime()) && !isNaN(endDate.getTime())) {
-      filter.createdAt = {
-        gte: startDate,
-        lte: endDate,
-      };
+    if (startDate && endDate) {
+      filter.createdAt = { gte: startDate, lte: endDate };
     }
 
     if (typeof verified === 'boolean') {
Original file line number	Diff line number	Diff line change
		@@ -1 +1,2 @@
		export * from './find-all-query.dto';
		export * from './count-query.dto';