Cleanup syntax when retrieving items from the database.

Author: Frumple

src/database/common/project.rs

@@ -158,12 +158,13 @@ pub async fn refresh_common_projects(db_pool: &Pool) -> Result<()> {
 pub async fn get_common_projects(db_pool: &Pool) -> Result<Vec<CommonProject>> {
     let db_client = db_pool.get().await?;
 
-    let entities = common_project::get_common_projects()
+    let projects = common_project::get_common_projects()
         .bind(&db_client)
         .all()
-        .await?;
-
-    let projects = entities.into_iter().map(|x| x.into()).collect();
+        .await?
+        .into_iter()
+        .map(|x| x.into())
+        .collect();
 
     Ok(projects)
 }

src/database/common/search_result.rs

@@ -191,12 +191,13 @@ pub struct SearchResultHangar {
 pub async fn search_projects(db_pool: &Pool, params: &SearchParams) -> Result<Vec<SearchResult>> {
     let db_client = db_pool.get().await?;
 
-    let entities = search_result::search_projects()
+    let projects = search_result::search_projects()
         .params(&db_client, &params.clone().into())
         .all()
-        .await?;
-
-    let projects = entities.into_iter().map(|x| x.into()).collect();
+        .await?
+        .into_iter()
+        .map(|x| x.into())
+        .collect();
 
     Ok(projects)
 }

src/database/hangar/project.rs

@@ -129,12 +129,13 @@ pub async fn upsert_hangar_project(db_pool: &Pool, project: &HangarProject) -> R
 pub async fn get_hangar_projects(db_pool: &Pool) -> Result<Vec<HangarProject>> {
     let db_client = db_pool.get().await?;
 
-    let entities = hangar_project::get_hangar_projects()
+    let projects = hangar_project::get_hangar_projects()
         .bind(&db_client)
         .all()
-        .await?;
-
-    let projects = entities.into_iter().map(|x| x.into()).collect();
+        .await?
+        .into_iter()
+        .map(|x| x.into())
+        .collect();
 
     Ok(projects)
 }

src/database/modrinth/project.rs

@@ -132,12 +132,13 @@ pub async fn upsert_modrinth_project(db_pool: &Pool, project: &ModrinthProject)
 pub async fn get_modrinth_projects(db_pool: &Pool) -> Result<Vec<ModrinthProject>> {
     let db_client = db_pool.get().await?;
 
-    let entities = modrinth_project::get_modrinth_projects()
+    let projects = modrinth_project::get_modrinth_projects()
         .bind(&db_client)
         .all()
-        .await?;
-
-    let projects = entities.into_iter().map(|x| x.into()).collect();
+        .await?
+        .into_iter()
+        .map(|x| x.into())
+        .collect();
 
     Ok(projects)
 }

src/database/spigot/author.rs

@@ -64,12 +64,13 @@ pub async fn insert_spigot_author(db_pool: &Pool, author: &SpigotAuthor) -> Resu
 pub async fn get_spigot_authors(db_pool: &Pool) -> Result<Vec<SpigotAuthor>> {
     let db_client = db_pool.get().await?;
 
-    let entities = spigot_author::get_spigot_authors()
+    let authors = spigot_author::get_spigot_authors()
         .bind(&db_client)
         .all()
-        .await?;
-
-    let authors = entities.into_iter().map(|x| x.into()).collect();
+        .await?
+        .into_iter()
+        .map(|x| x.into())
+        .collect();
 
     Ok(authors)
 }

src/database/spigot/resource.rs

@@ -141,12 +141,13 @@ pub async fn upsert_spigot_resource(db_pool: &Pool, resource: &SpigotResource) -
 pub async fn get_spigot_resources(db_pool: &Pool) -> Result<Vec<SpigotResource>> {
     let db_client = db_pool.get().await?;
 
-    let entities = spigot_resource::get_spigot_resources()
+    let resources = spigot_resource::get_spigot_resources()
         .bind(&db_client)
         .all()
-        .await?;
-
-    let resources = entities.into_iter().map(|x| x.into()).collect();
+        .await?
+        .into_iter()
+        .map(|x| x.into())
+        .collect();
 
     Ok(resources)
 }