Skip to content

Commit 37ae592

Browse files
committed
controllers/version: Reuse load_crate() fn
1 parent 1e6f1c0 commit 37ae592

File tree

1 file changed

+3
-10
lines changed

1 file changed

+3
-10
lines changed

src/controllers/version.rs

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,9 @@ use serde::de::Error;
88
use serde::{Deserialize, Deserializer};
99
use utoipa::IntoParams;
1010

11+
use crate::controllers::krate::load_crate;
1112
use crate::models::{Crate, Version};
12-
use crate::util::errors::{crate_not_found, AppResult};
13+
use crate::util::errors::AppResult;
1314

1415
#[derive(Deserialize, FromRequestParts, IntoParams)]
1516
#[into_params(parameter_in = Path)]
@@ -41,15 +42,7 @@ async fn version_and_crate(
4142
crate_name: &str,
4243
semver: &str,
4344
) -> AppResult<(Version, Crate)> {
44-
use diesel::prelude::*;
45-
use diesel_async::RunQueryDsl;
46-
47-
let krate: Crate = Crate::by_name(crate_name)
48-
.first(conn)
49-
.await
50-
.optional()?
51-
.ok_or_else(|| crate_not_found(crate_name))?;
52-
45+
let krate = load_crate(conn, crate_name).await?;
5346
let version = krate.find_version(conn, semver).await?;
5447

5548
Ok((version, krate))

0 commit comments

Comments
 (0)