Bommels05/Modrinth
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

get dependencies fix (#794)

Browse Source
This commit is contained in:
Wyatt Verchere 2023-12-12 18:57:51 -08:00 committed by GitHub
parent 90954dac49
commit 00e55b1874
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/routes/v2/projects.rs
View File

@ -200,7 +200,6 @@ pub async fn project_get(
// Call V3 project creation // Call V3 project creation
let response = v3::projects::project_get(req, info, pool.clone(), redis.clone(), session_queue) let response = v3::projects::project_get(req, info, pool.clone(), redis.clone(), session_queue)
.await .await
.or_else(v2_reroute::flatten_404_error)
.or_else(v2_reroute::flatten_404_error)?; .or_else(v2_reroute::flatten_404_error)?;
// Convert response to V2 format // Convert response to V2 format
@ -227,7 +226,6 @@ pub async fn project_get_check(
v3::projects::project_get_check(info, pool, redis) v3::projects::project_get_check(info, pool, redis)
.await .await
.or_else(v2_reroute::flatten_404_error) .or_else(v2_reroute::flatten_404_error)
.or_else(v2_reroute::flatten_404_error)
} }
#[derive(Serialize)] #[derive(Serialize)]
@ -248,7 +246,6 @@ pub async fn dependency_list(
v3::projects::dependency_list(req, info, pool, redis, session_queue) v3::projects::dependency_list(req, info, pool, redis, session_queue)
.await .await
.or_else(v2_reroute::flatten_404_error) .or_else(v2_reroute::flatten_404_error)
.or_else(v2_reroute::flatten_404_error)
} }
#[derive(Serialize, Deserialize, Validate)] #[derive(Serialize, Deserialize, Validate)]

4
src/routes/v3/projects.rs
View File

@ -29,6 +29,7 @@ use crate::util::validate::validation_errors_to_string;
use actix_web::{web, HttpRequest, HttpResponse}; use actix_web::{web, HttpRequest, HttpResponse};
use chrono::{DateTime, Utc}; use chrono::{DateTime, Utc};
use futures::TryStreamExt; use futures::TryStreamExt;
use itertools::Itertools;
use serde::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
use serde_json::json; use serde_json::json;
use sqlx::PgPool; use sqlx::PgPool;
@ -972,7 +973,6 @@ pub async fn dependency_list(
let dependencies = let dependencies =
database::Project::get_dependencies(project.inner.id, &**pool, &redis).await?; database::Project::get_dependencies(project.inner.id, &**pool, &redis).await?;
let project_ids = dependencies let project_ids = dependencies
.iter() .iter()
.filter_map(|x| { .filter_map(|x| {
@ -986,11 +986,13 @@ pub async fn dependency_list(
x.1 x.1
} }
}) })
.unique()
.collect::<Vec<_>>(); .collect::<Vec<_>>();
let dep_version_ids = dependencies let dep_version_ids = dependencies
.iter() .iter()
.filter_map(|x| x.0) .filter_map(|x| x.0)
.unique()
.collect::<Vec<db_models::VersionId>>(); .collect::<Vec<db_models::VersionId>>();
let (projects_result, versions_result) = futures::future::try_join( let (projects_result, versions_result) = futures::future::try_join(
database::Project::get_many_ids(&project_ids, &**pool, &redis), database::Project::get_many_ids(&project_ids, &**pool, &redis),