refactor: Remove old FetchSpecificationSchema from requests that fetc…

…h data and replace it in favour of generateEntityQuerySchema
Vizzuality · Sep 19, 2024 · 4a0b958 · 4a0b958
1 parent 95b9386
commit 4a0b958
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 10 deletions.
diff --git a/shared/contracts/sections.contract.ts b/shared/contracts/sections.contract.ts
@@ -1,15 +1,15 @@
 import { JSONAPIError } from '@shared/dto/errors/json-api.error';
 import { ApiPaginationResponse } from '@shared/dto/global/api-response.dto';
 import { Section } from '@shared/dto/sections/section.entity';
+import { generateEntityQuerySchema } from '@shared/schemas/query-param.schema';
 import { initContract } from '@ts-rest/core';
-import { FetchSpecificationSchema } from '@shared/schemas/query-param.schema';
 
 const contract = initContract();
 export const sectionContract = contract.router({
   searchSections: {
     method: 'GET',
     path: '/sections',
-    query: FetchSpecificationSchema,
+    query: generateEntityQuerySchema(Section),
     responses: {
       200: contract.type<ApiPaginationResponse<Section>>(),
       400: contract.type<JSONAPIError>(),

diff --git a/shared/contracts/users.contract.ts b/shared/contracts/users.contract.ts
@@ -15,7 +15,8 @@ import {
   CreateCustomWidgetSchema,
   UpdateCustomWidgetSchema,
 } from '@shared/schemas/widget.schemas';
-import { FetchSpecificationSchema } from '@shared/schemas/query-param.schema';
+import { generateEntityQuerySchema } from '@shared/schemas/query-param.schema';
+import { User } from '@shared/dto/users/user.entity';
 
 const contract = initContract();
 export const usersContract = contract.router({
@@ -37,7 +38,7 @@ export const usersContract = contract.router({
       400: contract.type<{ message: string }>(),
     },
     summary: 'Get all users',
-    query: FetchSpecificationSchema,
+    query: generateEntityQuerySchema(User),
   },
   findMe: {
     method: 'GET',
@@ -46,7 +47,7 @@ export const usersContract = contract.router({
       200: contract.type<ApiResponse<UserDto>>(),
       401: contract.type<JSONAPIError>(),
     },
-    query: FetchSpecificationSchema,
+    query: generateEntityQuerySchema(User),
   },
   updatePassword: {
     method: 'PATCH',
@@ -70,7 +71,7 @@ export const usersContract = contract.router({
       400: contract.type<JSONAPIError>(),
       401: contract.type<JSONAPIError>(),
     },
-    query: FetchSpecificationSchema,
+    query: generateEntityQuerySchema(User),
     summary: 'Get a user by id',
   },
   updateUser: {
@@ -111,7 +112,7 @@ export const usersContract = contract.router({
     method: 'GET',
     path: '/users/:userId/widgets',
     pathParams: z.object({ userId: z.string().uuid() }),
-    query: FetchSpecificationSchema,
+    query: generateEntityQuerySchema(CustomWidget),
     responses: {
       200: contract.type<ApiPaginationResponse<CustomWidget>>(),
       400: contract.type<JSONAPIError>(),

diff --git a/shared/schemas/query-param.schema.ts b/shared/schemas/query-param.schema.ts
@@ -40,9 +40,9 @@ const generateQuerySchema = <
   const sort = z.array(z.enum(config.sort as [SORT, ...SORT[]])).optional();
 
   return z.object({
-    pageSize: z.number().optional(),
-    pageNumber: z.number().optional(),
-    disablePagination: z.boolean().optional(),
+    pageSize: z.coerce.number().optional(),
+    pageNumber: z.coerce.number().optional(),
+    disablePagination: z.coerce.boolean().optional(),
     fields,
     omitFields,
     include,