fix: pass correct page in gov pagination

webserver/src/dto/governance.rs

@@ -1,8 +1,6 @@
 use serde::{Deserialize, Serialize};
 use validator::Validate;
 
-use super::utils::Pagination;
-
 #[derive(Clone, Debug, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
 pub enum ProposalStatus {
@@ -23,15 +21,15 @@ pub enum ProposalKind {
 
 #[derive(Clone, Serialize, Deserialize, Validate)]
 pub struct ProposalQueryParams {
-    #[serde(flatten)]
-    pub pagination: Option<Pagination>,
+    #[validate(range(min = 1, max = 10000))]
+    pub page: Option<u64>,
     pub status: Option<ProposalStatus>,
     pub kind: Option<ProposalKind>,
     pub pattern: Option<String>,
 }
 
 #[derive(Clone, Serialize, Deserialize, Validate)]
 pub struct ProposalVotesQueryparams {
-    #[serde(flatten)]
-    pub pagination: Option<Pagination>,
+    #[validate(range(min = 1, max = 10000))]
+    pub page: Option<u64>,
 }

webserver/src/dto/mod.rs

@@ -1,3 +1,2 @@
 pub mod governance;
 pub mod pos;
-pub mod utils;

webserver/src/handler/governance.rs

@@ -16,7 +16,7 @@ pub async fn get_governance_proposals(
     Query(query): Query<ProposalQueryParams>,
     State(state): State<CommonState>,
 ) -> Result<Json<PaginatedResponse<Vec<Proposal>>>, ApiError> {
-    let page = query.pagination.map(|p| p.page).unwrap_or(1);
+    let page = query.page.unwrap_or(1);
     let (proposals, total_pages, total_items) = state
         .gov_service
         .find_governance_proposals(
@@ -57,7 +57,7 @@ pub async fn get_governance_proposal_votes(
     Query(query): Query<ProposalVotesQueryparams>,
     State(state): State<CommonState>,
 ) -> Result<Json<PaginatedResponse<Vec<ProposalVote>>>, ApiError> {
-    let page = query.pagination.map(|p| p.page).unwrap_or(1);
+    let page = query.page.unwrap_or(1);
     let (proposal_votes, total_pages, total_votes) = state
         .gov_service
         .find_governance_proposal_votes(proposal_id, page)