Skip to content

controllers/krate/search: Add some type aliases #9709

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

Merged
merged 1 commit into from
Oct 21, 2024
Merged

controllers/krate/search: Add some type aliases #9709

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
27 changes: 13 additions & 14 deletions src/controllers/krate/search.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,7 @@ pub async fn search(app: AppState, req: Parts) -> AppResult<Json<Value>> {
pagination,
filter_params.make_query(&req, conn)?.count(),
);
let data: Paginated<(Crate, bool, i64, Option<i64>, f32)> =
let data: Paginated<Record> =
info_span!("db.query", message = "SELECT ..., COUNT(*) FROM crates")
.in_scope(|| query.load(conn))?;

Expand All @@ -202,7 +202,7 @@ pub async fn search(app: AppState, req: Parts) -> AppResult<Json<Value>> {
pagination,
filter_params.make_query(&req, conn)?.count(),
);
let data: Paginated<(Crate, bool, i64, Option<i64>, f32)> =
let data: Paginated<Record> =
info_span!("db.query", message = "SELECT ..., COUNT(*) FROM crates")
.in_scope(|| query.load(conn))?;
(
Expand Down Expand Up @@ -571,6 +571,7 @@ impl<'a> FilterParams<'a> {
}

mod seek {
use super::Record;
use crate::controllers::helpers::pagination::seek;
use crate::models::Crate;
use chrono::naive::serde::ts_microseconds;
Expand Down Expand Up @@ -611,10 +612,7 @@ mod seek {
);

impl Seek {
pub(crate) fn to_payload(
&self,
record: &(Crate, bool, i64, Option<i64>, f32),
) -> SeekPayload {
pub(crate) fn to_payload(&self, record: &Record) -> SeekPayload {
let (
Crate {
id,
Expand Down Expand Up @@ -648,15 +646,16 @@ mod seek {
}
}

type Record = (Crate, bool, i64, Option<i64>, f32);

type QuerySource = LeftJoinQuerySource<
InnerJoinQuerySource<crates::table, crate_downloads::table>,
recent_crate_downloads::table,
>;

type BoxedCondition<'a> = Box<
dyn BoxableExpression<
LeftJoinQuerySource<
InnerJoinQuerySource<crates::table, crate_downloads::table>,
recent_crate_downloads::table,
>,
diesel::pg::Pg,
SqlType = diesel::sql_types::Nullable<Bool>,
> + 'a,
dyn BoxableExpression<QuerySource, diesel::pg::Pg, SqlType = diesel::sql_types::Nullable<Bool>>
+ 'a,
>;

diesel::infix_operator!(Contains, "@>");