refactor(pagination): Add paginationAdapter and update API services to use it

Author: trieu04

src/lib/pagination.ts

@@ -0,0 +1,17 @@
+export interface PaginationParams {
+  page?: number;
+  limit?: number;
+  search?: string;
+}
+
+export function paginationAdapter(params: PaginationParams & object | undefined) {
+  if (!params) {
+    return params;
+  }
+  return {
+    ...params,
+    skip: params.page ? (params.page - 1) * (params.limit || 10) : undefined,
+    limit: params.limit,
+    search: params.search,
+  };
+}

src/services/apis/precipitation.api.ts

@@ -1,32 +1,14 @@
+import { paginationAdapter, PaginationParams } from "@/lib/pagination";
 import { apiService } from "@/services/api.service";
-import {
-  StationCreate,
-  StationRead,
-  StationUpdate,
-  StationPagination,
-  RainfallRecordCreate,
-  RainfallRecordRead,
-  RainfallRecordUpdate,
-  RainfallRecordPagination,
-  S2SFileRead,
-  S2SFileUpdate,
-  S2SFilePagination,
-  S2SFileUpload,
-} from "@/types/precipitation";
+import { RainfallRecordCreate, RainfallRecordPagination, RainfallRecordRead, RainfallRecordUpdate, S2SFilePagination, S2SFileRead, S2SFileUpdate, S2SFileUpload, StationCreate, StationPagination, StationRead, StationUpdate } from "@/types/precipitation";
 import { storageApi } from "./storage.api";
 
-export interface PaginationParams {
-  page?: number;
-  limit?: number;
-  search?: string;
-}
-
 // Station API Functions
 export const precipitationApi = {
   // Stations
   stations: {
     list: (params?: PaginationParams) =>
-      apiService.get<StationPagination>("/precipitation/stations/", { params }),
+      apiService.get<StationPagination>("/precipitation/stations/", { params: paginationAdapter(params) }),
 
     create: (data: StationCreate) =>
       apiService.post<StationRead>("/precipitation/stations/", data),
@@ -44,7 +26,7 @@ export const precipitationApi = {
   // Rainfall Records
   rainfallRecords: {
     list: (params?: PaginationParams & { station_id?: number; start_date?: string; end_date?: string }) =>
-      apiService.get<RainfallRecordPagination>("/precipitation/rainfall-records/", { params }),
+      apiService.get<RainfallRecordPagination>("/precipitation/rainfall-records/", { params: paginationAdapter(params) }),
 
     create: (data: RainfallRecordCreate) =>
       apiService.post<RainfallRecordRead>("/precipitation/rainfall-records/", data),
@@ -59,7 +41,7 @@ export const precipitationApi = {
   // S2S Files
   s2sFiles: {
     list: (params?: PaginationParams & { data_type?: string; start_date?: string; end_date?: string }) =>
-      apiService.get<S2SFilePagination>("/precipitation/s2s-files/", { params }),
+      apiService.get<S2SFilePagination>("/precipitation/s2s-files/", { params: paginationAdapter(params) }),
 
     create: async (data: S2SFileUpload, onProgress?: (progress: number) => void) => {
       if (data.file) {

src/services/apis/reservoirs.api.ts

@@ -14,19 +14,14 @@ import {
   ReservoirOperationFileUpload,
 } from "@/types/reservoirs";
 import { storageApi } from "./storage.api";
-
-export interface PaginationParams {
-  page?: number;
-  limit?: number;
-  search?: string;
-}
+import { paginationAdapter, PaginationParams } from "@/lib/pagination";
 
 // Reservoirs API Functions
 export const reservoirsApi = {
   // Reservoirs
   reservoirs: {
     list: (params?: PaginationParams & { status?: string; location?: string }) =>
-      apiService.get<ReservoirPagination>("/reservoirs/reservoirs/", { params }),
+      apiService.get<ReservoirPagination>("/reservoirs/reservoirs/", { params: paginationAdapter(params) }),
 
     create: (data: ReservoirCreate) =>
       apiService.post<ReservoirRead>("/reservoirs/reservoirs/", data),
@@ -44,7 +39,7 @@ export const reservoirsApi = {
   // Reservoir Operations
   operations: {
     list: (params?: PaginationParams & { reservoir_id?: number; start_date?: string; end_date?: string }) =>
-      apiService.get<ReservoirOperationPagination>("/reservoirs/reservoir-operations/", { params }),
+      apiService.get<ReservoirOperationPagination>("/reservoirs/reservoir-operations/", { params: paginationAdapter(params) }),
 
     create: (data: ReservoirOperationCreate) =>
       apiService.post<ReservoirOperationRead>("/reservoirs/reservoir-operations/", data),
@@ -59,7 +54,7 @@ export const reservoirsApi = {
   // Reservoir Operation Files
   operationFiles: {
     list: (params?: PaginationParams & { reservoir_id?: number; data_type?: string; start_date?: string; end_date?: string }) =>
-      apiService.get<ReservoirOperationFilePagination>("/reservoirs/reservoir-operation-files/", { params }),
+      apiService.get<ReservoirOperationFilePagination>("/reservoirs/reservoir-operation-files/", { params: paginationAdapter(params) }),
 
     create: async (data: ReservoirOperationFileUpload, onProgress?: (progress: number) => void) => {
       if (data.file) {

src/services/apis/storms.api.ts

@@ -18,19 +18,14 @@ import {
   StormUpdate,
 } from "@/types/storms";
 import { storageApi } from "./storage.api";
-
-export interface PaginationParams {
-  page?: number;
-  limit?: number;
-  search?: string;
-}
+import { paginationAdapter, PaginationParams } from "@/lib/pagination";
 
 // Storms API Functions
 export const stormsApi = {
   // Storms
   storms: {
     list: (params?: PaginationParams) =>
-      apiService.get<PaginatedResult<StormRead>>("/storms/storms/", { params }),
+      apiService.get<PaginatedResult<StormRead>>("/storms/storms/", { params: paginationAdapter(params) }),
 
     create: (data: StormCreate) =>
       apiService.post<StormRead>("/storms/storms/", data),
@@ -101,7 +96,7 @@ export const stormsApi = {
   // NWP Data
   nwpData: {
     list: (params?: PaginationParams & { storm_id?: number }) =>
-      apiService.get<PaginatedResult<NWPDataRead>>("/storms/nwp-data/", { params }),
+      apiService.get<PaginatedResult<NWPDataRead>>("/storms/nwp-data/", { params: paginationAdapter(params) }),
 
     create: async (data: NWPDataCreate & { file?: File }, onProgress?: (progress: number) => void) => {
       if (data.file) {
@@ -153,7 +148,7 @@ export const stormsApi = {
   // HRES Data
   hresData: {
     list: (params?: PaginationParams & { storm_id?: number }) =>
-      apiService.get<PaginatedResult<HRESDataRead>>("/storms/hres-data/", { params }),
+      apiService.get<PaginatedResult<HRESDataRead>>("/storms/hres-data/", { params: paginationAdapter(params) }),
 
     create: async (data: HRESDataCreate & { file?: File }, onProgress?: (progress: number) => void) => {
       if (data.file) {
@@ -204,7 +199,7 @@ export const stormsApi = {
 
   stormLifecycle: {
     list: (params?: PaginationParams & { storm_ids?: number[]; start_date?: string; end_date?: string }) =>
-      apiService.get<PaginatedResult<StormLifecycleRead>>("/storms/storm-lifecycle/", { params }),
+      apiService.get<PaginatedResult<StormLifecycleRead>>("/storms/storm-lifecycle/", { params: paginationAdapter(params) }),
 
     create: (data: StormLifecycleCreate) =>
       apiService.post<StormLifecycleRead>("/storms/storm-lifecycle/", data),