Skip to content

refactor: add PagerMeta field to PageResponse (#1683) #1685

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
+15 −7
Open

refactor: add PagerMeta field to PageResponse (#1683) #1685

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 15 additions & 7 deletions src/model/query/paginate/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,13 +74,13 @@ where
s.parse().map_err(serde::de::Error::custom)
}

use crate::controller::views::pagination::PagerMeta;

#[derive(Debug)]
pub struct PageResponse<T> {
pub page: Vec<T>,
pub total_pages: u64,
pub total_items: u64,
pub meta: PagerMeta,
}

use crate::Result as LocoResult;

/// Paginate function for fetching paginated data from the database.
Expand Down Expand Up @@ -165,8 +165,12 @@ where

let paginated_response = PageResponse {
page,
total_pages: total_pages_and_items.number_of_pages,
total_items: total_pages_and_items.number_of_items,
meta: PagerMeta {
page: pagination_query.page,
page_size: pagination_query.page_size,
total_pages: total_pages_and_items.number_of_pages,
total_items: total_pages_and_items.number_of_items,
},
};

Ok(paginated_response)
Expand Down Expand Up @@ -213,7 +217,11 @@ where

Ok(PageResponse {
page,
total_pages: total_pages_and_items.number_of_pages,
total_items: total_pages_and_items.number_of_items,
meta: PagerMeta {
page: pagination_query.page,
page_size: pagination_query.page_size,
total_pages: total_pages_and_items.number_of_pages,
total_items: total_pages_and_items.number_of_items,
},
})
}