eightequal/AstralRinth
1
0
Fork 0
forked from didirus/AstralRinth
Code Pull Requests Activity

Fix dep route again (#316)

Browse Source
This commit is contained in:
Geometrically
2022-03-05 13:09:19 -07:00
committed by GitHub
parent caed86d846
commit 18f34b4f83
2 changed files with 41 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/routes/projects.rs
View File

@@ -115,7 +115,7 @@ pub async fn dependency_list(
SELECT d.dependency_id, vd.mod_id, d.mod_dependency_id
FROM versions v
INNER JOIN dependencies d ON d.dependent_id = v.id
INNER JOIN versions vd ON d.dependency_id = vd.id
LEFT JOIN versions vd ON d.dependency_id = vd.id
WHERE v.mod_id = $1
",
id as database::models::ProjectId
@@ -125,14 +125,18 @@ pub async fn dependency_list(
Ok(e.right().map(|x| {
(
x.dependency_id.map(database::models::VersionId),
database::models::ProjectId(x.mod_id),
if x.mod_id == 0 {
None
} else {
Some(database::models::ProjectId(x.mod_id))
},
x.mod_dependency_id.map(database::models::ProjectId),
)
}))
})
.try_collect::<Vec<(
Option<database::models::VersionId>,
database::models::ProjectId,
Option<database::models::ProjectId>,
Option<database::models::ProjectId>,
)>>()
.await?;
@@ -143,13 +147,14 @@ pub async fn dependency_list(
.iter()
.map(|x| if x.0.is_none() {
if let Some(mod_dependency_id) = x.2 {
mod_dependency_id
Some(mod_dependency_id)
} else {
x.1
}
} else {
x.1
})
.flatten()
.collect(),
&**pool,
),