Make functions work with both connection and pool (#3420)

[lemmy.git] / crates / db_views_actor / src / community_block_view.rs

diff --git a/crates/db_views_actor/src/community_block_view.rs b/crates/db_views_actor/src/community_block_view.rs
index 8f0cfca76342b5f5b5b0c88003ea95bb22b7c4fd..5c8903d9cfdffbdf1fe90c5af2b39a32b30f316f 100644 (file)
--- a/crates/db_views_actor/src/community_block_view.rs
+++ b/crates/db_views_actor/src/community_block_view.rs
@@ -1,49 +1,40 @@
-use diesel::{result::Error, *};
+use crate::structs::CommunityBlockView;
+use diesel::{result::Error, ExpressionMethods, QueryDsl};
+use diesel_async::RunQueryDsl;
 use lemmy_db_schema::{
   newtypes::PersonId,
   schema::{community, community_block, person},
-  source::{
-    community::{Community, CommunitySafe},
-    person::{Person, PersonSafe},
-  },
-  traits::{ToSafe, ViewToVec},
+  source::{community::Community, person::Person},
+  traits::JoinView,
+  utils::{get_conn, DbPool},
 };
-use serde::{Deserialize, Serialize};
 
-#[derive(Debug, Serialize, Deserialize, Clone)]
-pub struct CommunityBlockView {
-  pub person: PersonSafe,
-  pub community: CommunitySafe,
-}
-
-type CommunityBlockViewTuple = (PersonSafe, CommunitySafe);
+type CommunityBlockViewTuple = (Person, Community);
 
 impl CommunityBlockView {
-  pub fn for_person(conn: &PgConnection, person_id: PersonId) -> Result<Vec<Self>, Error> {
+  pub async fn for_person(pool: &mut DbPool<'_>, person_id: PersonId) -> Result<Vec<Self>, Error> {
+    let conn = &mut get_conn(pool).await?;
     let res = community_block::table
       .inner_join(person::table)
       .inner_join(community::table)
-      .select((
-        Person::safe_columns_tuple(),
-        Community::safe_columns_tuple(),
-      ))
+      .select((person::all_columns, community::all_columns))
       .filter(community_block::person_id.eq(person_id))
+      .filter(community::deleted.eq(false))
+      .filter(community::removed.eq(false))
       .order_by(community_block::published)
-      .load::<CommunityBlockViewTuple>(conn)?;
+      .load::<CommunityBlockViewTuple>(conn)
+      .await?;
 
-    Ok(Self::from_tuple_to_vec(res))
+    Ok(res.into_iter().map(Self::from_tuple).collect())
   }
 }
 
-impl ViewToVec for CommunityBlockView {
-  type DbTuple = CommunityBlockViewTuple;
-  fn from_tuple_to_vec(items: Vec<Self::DbTuple>) -> Vec<Self> {
-    items
-      .iter()
-      .map(|a| Self {
-        person: a.0.to_owned(),
-        community: a.1.to_owned(),
-      })
-      .collect::<Vec<Self>>()
+impl JoinView for CommunityBlockView {
+  type JoinTuple = CommunityBlockViewTuple;
+  fn from_tuple(a: Self::JoinTuple) -> Self {
+    Self {
+      person: a.0,
+      community: a.1,
+    }
   }
 }