From f14f4498fb95b059c5673f0ca6049e6155829f67 Mon Sep 17 00:00:00 2001 From: Geometrically Date: Sat, 23 Jan 2021 11:32:32 -0700 Subject: [PATCH 1/2] Hotfix everything broken --- src/database/models/mod_item.rs | 11 +++++++++-- src/database/models/version_item.rs | 12 +++++++++--- 2 files changed, 18 insertions(+), 5 deletions(-) diff --git a/src/database/models/mod_item.rs b/src/database/models/mod_item.rs index c97222e1e..f8a801bac 100644 --- a/src/database/models/mod_item.rs +++ b/src/database/models/mod_item.rs @@ -516,8 +516,15 @@ impl Mod { where E: sqlx::Executor<'a, Database = sqlx::Postgres> + Copy, { - // TODO: this could be optimized - futures::future::try_join_all(mod_ids.into_iter().map(|id| Self::get_full(id, exec))).await + let mut mods = Vec::new(); + + for mod_id in mod_ids { + mods.push(Self::get_full(mod_id, exec).await?) + } + + Ok(versions) + /*// TODO: this could be optimized + futures::future::try_join_all(mod_ids.into_iter().map(|id| Self::get_full(id, exec))).await*/ } } diff --git a/src/database/models/version_item.rs b/src/database/models/version_item.rs index 66ac1e989..ef4629b6e 100644 --- a/src/database/models/version_item.rs +++ b/src/database/models/version_item.rs @@ -568,9 +568,15 @@ impl Version { where E: sqlx::Executor<'a, Database = sqlx::Postgres> + Copy, { - // TODO: this could be optimized - futures::future::try_join_all(version_ids.into_iter().map(|id| Self::get_full(id, exec))) - .await + let mut versions = Vec::new(); + + for version_id in version_ids { + versions.push(Self::get_full(version_id, exec).await?) + } + + Ok(versions) + /* futures::future::try_join_all(version_ids.into_iter().map(|id| Self::get_full(id, exec))) + .await*/ } } From 53854310511cea96de63de015544855fd3f79b62 Mon Sep 17 00:00:00 2001 From: Geometrically Date: Sat, 23 Jan 2021 11:37:25 -0700 Subject: [PATCH 2/2] make compile --- src/database/models/mod_item.rs | 2 +- src/database/models/version_item.rs | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/database/models/mod_item.rs b/src/database/models/mod_item.rs index f8a801bac..e7bd44ab5 100644 --- a/src/database/models/mod_item.rs +++ b/src/database/models/mod_item.rs @@ -522,7 +522,7 @@ impl Mod { mods.push(Self::get_full(mod_id, exec).await?) } - Ok(versions) + Ok(mods) /*// TODO: this could be optimized futures::future::try_join_all(mod_ids.into_iter().map(|id| Self::get_full(id, exec))).await*/ } diff --git a/src/database/models/version_item.rs b/src/database/models/version_item.rs index ef4629b6e..9f7802cf3 100644 --- a/src/database/models/version_item.rs +++ b/src/database/models/version_item.rs @@ -575,8 +575,8 @@ impl Version { } Ok(versions) - /* futures::future::try_join_all(version_ids.into_iter().map(|id| Self::get_full(id, exec))) - .await*/ + /* futures::future::try_join_all(version_ids.into_iter().map(|id| Self::get_full(id, exec))) + .await*/ } }