From ebc5676f00547d903e79b6f7d7af80b5347b1645 Mon Sep 17 00:00:00 2001
From: Freek Bes <36384333+FreekBes@users.noreply.github.com>
Date: Sat, 16 Mar 2024 22:07:29 +0100
Subject: [PATCH] add query to get total number of active users

---
 useful/queries.sql | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/useful/queries.sql b/useful/queries.sql
index 19040ac..673e272 100644
--- a/useful/queries.sql
+++ b/useful/queries.sql
@@ -1,11 +1,17 @@
+--- Get the amount of users that ever used Improved Intra
+SELECT COUNT(users.intra_id) FROM users;
+
+--- Get the amount of active users in the past month
+SELECT COUNT(users.intra_id) FROM users LEFT JOIN user_tokens ON user_tokens.user_id = users.intra_id WHERE user_tokens.last_used_at > date_trunc('month', current_date - interval '1' month);
+
 --- Get the amount of users per campus
 SELECT COUNT(users.intra_id), campuses.name FROM users JOIN campuses ON campuses.intra_id = users.campus_id GROUP BY campuses.name ORDER BY campuses.name;
 
 --- Get the amount of active users per campus in the past month
-SELECT COUNT(users.intra_id), campuses.name FROM users JOIN campuses ON campuses.intra_id = users.campus_id LEFT JOIN settings ON settings.user_id = users.intra_id LEFT JOIN user_tokens ON user_tokens.user_id = users.intra_id WHERE user_tokens.last_used_at > date_trunc('month', current_date - interval '1'month) GROUP BY campuses.name ORDER BY campuses.name;
+SELECT COUNT(users.intra_id), campuses.name FROM users JOIN campuses ON campuses.intra_id = users.campus_id LEFT JOIN user_tokens ON user_tokens.user_id = users.intra_id WHERE user_tokens.last_used_at > date_trunc('month', current_date - interval '1' month) GROUP BY campuses.name ORDER BY campuses.name;
 
 --- Get an overview of active users in the past month
-SELECT users.login, users.created_at, user_tokens.last_used_at, settings.updated_ver, campuses.name FROM users JOIN campuses ON campuses.intra_id = users.campus_id LEFT JOIN settings ON settings.user_id = users.intra_id LEFT JOIN user_tokens ON user_tokens.user_id = users.intra_id WHERE user_tokens.last_used_at > date_trunc('month', current_date - interval '1'month) ORDER BY campuses.name;
+SELECT users.login, users.created_at, user_tokens.last_used_at, settings.updated_ver, campuses.name FROM users JOIN campuses ON campuses.intra_id = users.campus_id LEFT JOIN settings ON settings.user_id = users.intra_id LEFT JOIN user_tokens ON user_tokens.user_id = users.intra_id WHERE user_tokens.last_used_at > date_trunc('month', current_date - interval '1' month) ORDER BY campuses.name;
 
 --- See which staff used the extension
 SELECT users.login, users.created_at, user_tokens.last_used_at, settings.updated_ver, campuses.name FROM users JOIN campuses ON campuses.intra_id = users.campus_id LEFT JOIN settings ON settings.user_id = users.intra_id LEFT JOIN user_tokens ON user_tokens.user_id = users.intra_id WHERE staff='t' ORDER BY users.created_at;