Merge remote-tracking branch 'origin/split-db-workspace' into move_views_to_diesel_split

[lemmy.git] / lemmy_db / src / views / site_view.rs

diff --git a/lemmy_db/src/views/site_view.rs b/lemmy_db/src/views/site_view.rs
index a56c8fe30169d74cee6acf73a18c5c5ff78e783e..7772ccdcef6b37da0ad2e81e25bc6a2c691a614a 100644 (file)
--- a/lemmy_db/src/views/site_view.rs
+++ b/lemmy_db/src/views/site_view.rs
@@ -1,7 +1,7 @@
-use crate::ToSafe;
+use crate::{aggregates::site_aggregates::SiteAggregates, ToSafe};
 use diesel::{result::Error, *};
 use lemmy_db_schema::{
-  schema::{site, user_},
+  schema::{site, site_aggregates, user_},
   source::{
     site::Site,
     user::{UserSafe, User_},
@@ -13,15 +13,25 @@ use serde::Serialize;
 pub struct SiteView {
   pub site: Site,
   pub creator: UserSafe,
+  pub counts: SiteAggregates,
 }
 
 impl SiteView {
   pub fn read(conn: &PgConnection) -> Result<Self, Error> {
-    let (site, creator) = site::table
+    let (site, creator, counts) = site::table
       .inner_join(user_::table)
-      .select((site::all_columns, User_::safe_columns_tuple()))
-      .first::<(Site, UserSafe)>(conn)?;
+      .inner_join(site_aggregates::table)
+      .select((
+        site::all_columns,
+        User_::safe_columns_tuple(),
+        site_aggregates::all_columns,
+      ))
+      .first::<(Site, UserSafe, SiteAggregates)>(conn)?;
 
-    Ok(SiteView { site, creator })
+    Ok(SiteView {
+      site,
+      creator,
+      counts,
+    })
   }
 }