From 27a6ae9a14881d0679c613b34d1bb54f72d90f1b Mon Sep 17 00:00:00 2001
From: Philippe Loctaux <p@philippeloctaux.com>
Date: Mon, 8 May 2023 20:00:49 +0200
Subject: [PATCH] apps: get all: remove ezidam inside

---
 crates/apps/src/database.rs            | 9 +++++++--
 crates/ezidam/src/routes/admin/apps.rs | 5 +----
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/crates/apps/src/database.rs b/crates/apps/src/database.rs
index 2bfc616..eb2734d 100644
--- a/crates/apps/src/database.rs
+++ b/crates/apps/src/database.rs
@@ -26,11 +26,16 @@ impl App {
         conn: impl SqliteExecutor<'_>,
         filter_get_archived: Option<bool>,
     ) -> Result<Vec<Self>, Error> {
-        Ok(DatabaseApps::get_all(conn, filter_get_archived)
+        let mut apps = DatabaseApps::get_all(conn, filter_get_archived)
             .await?
             .into_iter()
             .map(Self::from)
-            .collect::<Vec<_>>())
+            .collect::<Vec<_>>();
+
+        // Remove ezidam from list
+        apps.retain(|app| *app.id() != AppID("ezidam".into()));
+
+        Ok(apps)
     }
 
     pub async fn insert(
diff --git a/crates/ezidam/src/routes/admin/apps.rs b/crates/ezidam/src/routes/admin/apps.rs
index a34842b..89c8fd6 100644
--- a/crates/ezidam/src/routes/admin/apps.rs
+++ b/crates/ezidam/src/routes/admin/apps.rs
@@ -10,10 +10,7 @@ pub async fn admin_apps_list(
     admin: JwtAdmin,
     flash: Option<FlashMessage<'_>>,
 ) -> Result<Template> {
-    let mut apps = App::get_all(&mut *db, None).await?;
-
-    // Remove ezidam from list
-    apps.retain(|app| *app.id() != AppID("ezidam".into()));
+    let apps = App::get_all(&mut *db, None).await?;
 
     let page = Page::AdminAppsList(super::content::AdminAppsList {
         user: admin.0,