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 2a774b0387ca6f54225a67eb3a5809bc2df4d8d1..5c8903d9cfdffbdf1fe90c5af2b39a32b30f316f 100644 (file)
--- a/crates/db_views_actor/src/community_block_view.rs
+++ b/crates/db_views_actor/src/community_block_view.rs
@@ -4,26 +4,20 @@ 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},
 };
 
-type CommunityBlockViewTuple = (PersonSafe, CommunitySafe);
+type CommunityBlockViewTuple = (Person, Community);
 
 impl CommunityBlockView {
-  pub async fn for_person(pool: &DbPool, 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))
@@ -31,19 +25,16 @@ impl CommunityBlockView {
       .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
-      .into_iter()
-      .map(|a| Self {
-        person: a.0,
-        community: a.1,
-      })
-      .collect::<Vec<Self>>()
+impl JoinView for CommunityBlockView {
+  type JoinTuple = CommunityBlockViewTuple;
+  fn from_tuple(a: Self::JoinTuple) -> Self {
+    Self {
+      person: a.0,
+      community: a.1,
+    }
   }
 }