feat: Implement pagination for user media retrieval and update related structures
This commit is contained in:
@@ -33,16 +33,13 @@ impl MediaQueryBuilder {
|
||||
)))
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
impl QueryBuilder<ListMediaOptions> for MediaQueryBuilder {
|
||||
fn apply_options_to_query<'a>(
|
||||
pub fn apply_filters_to_query<'a>(
|
||||
&self,
|
||||
mut query: SqlxQueryBuilder<'a, sqlx::Postgres>,
|
||||
options: &'a ListMediaOptions,
|
||||
) -> CoreResult<SqlxQueryBuilder<'a, sqlx::Postgres>> {
|
||||
) -> CoreResult<(SqlxQueryBuilder<'a, sqlx::Postgres>, i64)> {
|
||||
let mut metadata_filter_count = 0;
|
||||
|
||||
if let Some(filter) = &options.filter {
|
||||
if let Some(mime) = &filter.mime_type {
|
||||
query.push(" AND media.mime_type = ");
|
||||
@@ -51,8 +48,7 @@ impl QueryBuilder<ListMediaOptions> for MediaQueryBuilder {
|
||||
|
||||
if let Some(metadata_filters) = &filter.metadata_filters {
|
||||
if !metadata_filters.is_empty() {
|
||||
metadata_filter_count = metadata_filters.len();
|
||||
|
||||
metadata_filter_count = metadata_filters.len() as i64;
|
||||
query.push(" JOIN media_metadata mm ON media.id = mm.media_id ");
|
||||
query.push(" AND ( ");
|
||||
|
||||
@@ -60,7 +56,6 @@ impl QueryBuilder<ListMediaOptions> for MediaQueryBuilder {
|
||||
if i > 0 {
|
||||
query.push(" OR ");
|
||||
}
|
||||
|
||||
query.push(" ( mm.tag_name = ");
|
||||
query.push_bind(&filter.tag_name);
|
||||
query.push(" AND mm.tag_value = ");
|
||||
@@ -71,34 +66,38 @@ impl QueryBuilder<ListMediaOptions> for MediaQueryBuilder {
|
||||
}
|
||||
}
|
||||
}
|
||||
Ok((query, metadata_filter_count))
|
||||
}
|
||||
|
||||
if metadata_filter_count > 0 {
|
||||
query.push(" GROUP BY media.id ");
|
||||
query.push(" HAVING COUNT(DISTINCT mm.tag_name) = ");
|
||||
query.push_bind(metadata_filter_count as i64);
|
||||
}
|
||||
|
||||
pub fn apply_sorting_to_query<'a>(
|
||||
&self,
|
||||
mut query: SqlxQueryBuilder<'a, sqlx::Postgres>,
|
||||
options: &'a ListMediaOptions,
|
||||
) -> CoreResult<SqlxQueryBuilder<'a, sqlx::Postgres>> {
|
||||
if let Some(sort) = &options.sort {
|
||||
let column = self.validate_sort_column(&sort.sort_by)?;
|
||||
|
||||
let direction = match sort.sort_order {
|
||||
SortOrder::Asc => "ASC",
|
||||
SortOrder::Desc => "DESC",
|
||||
};
|
||||
|
||||
let nulls_order = if direction == "ASC" {
|
||||
"NULLS LAST"
|
||||
} else {
|
||||
"NULLS FIRST"
|
||||
};
|
||||
|
||||
let order_by_clause = format!("ORDER BY {} {} {}", column, direction, nulls_order);
|
||||
query.push(order_by_clause);
|
||||
} else {
|
||||
query.push(" ORDER BY media.created_at DESC NULLS LAST ");
|
||||
}
|
||||
Ok(query)
|
||||
}
|
||||
|
||||
// --- 3. Apply Pagination (Future-Proofing Stub) ---
|
||||
pub fn apply_pagination_to_query<'a>(
|
||||
&self,
|
||||
mut query: SqlxQueryBuilder<'a, sqlx::Postgres>,
|
||||
options: &'a ListMediaOptions,
|
||||
) -> CoreResult<SqlxQueryBuilder<'a, sqlx::Postgres>> {
|
||||
if let Some(pagination) = &options.pagination {
|
||||
let limit = pagination.limit as i64;
|
||||
let offset = (pagination.page.saturating_sub(1) as i64) * limit;
|
||||
@@ -108,7 +107,6 @@ impl QueryBuilder<ListMediaOptions> for MediaQueryBuilder {
|
||||
query.push(" OFFSET ");
|
||||
query.push_bind(offset);
|
||||
}
|
||||
|
||||
Ok(query)
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user