From 60849355dbbc20de529887b84dcca8cee4fb6d35 Mon Sep 17 00:00:00 2001
From: Benjamin Barbeau <73616169+Ategon@users.noreply.github.com>
Date: Mon, 11 Dec 2023 09:38:17 -0500
Subject: [PATCH] Add voters to active users (#4235)
* Add voters to active users
* Edit formatting
* Edit formatting
* Edit formatting in down.sql
* Fix person table inner joins
* Remove post read from calculations
---
.../down.sql | 72 +++++++++++
.../up.sql | 114 ++++++++++++++++++
2 files changed, 186 insertions(+)
create mode 100644 migrations/2023-12-06-180359_edit_active_users/down.sql
create mode 100644 migrations/2023-12-06-180359_edit_active_users/up.sql
diff --git a/migrations/2023-12-06-180359_edit_active_users/down.sql b/migrations/2023-12-06-180359_edit_active_users/down.sql
new file mode 100644
index 000000000..dfdce712c
--- /dev/null
+++ b/migrations/2023-12-06-180359_edit_active_users/down.sql
@@ -0,0 +1,72 @@
+CREATE OR REPLACE FUNCTION community_aggregates_activity (i text)
+ RETURNS TABLE (
+ count_ bigint,
+ community_id_ integer)
+ LANGUAGE plpgsql
+ AS $$
+BEGIN
+ RETURN query
+ SELECT
+ count(*),
+ community_id
+ FROM (
+ SELECT
+ c.creator_id,
+ p.community_id
+ FROM
+ comment c
+ INNER JOIN post p ON c.post_id = p.id
+ INNER JOIN person pe ON c.creator_id = pe.id
+ WHERE
+ c.published > ('now'::timestamp - i::interval)
+ AND pe.bot_account = FALSE
+ UNION
+ SELECT
+ p.creator_id,
+ p.community_id
+ FROM
+ post p
+ INNER JOIN person pe ON p.creator_id = pe.id
+ WHERE
+ p.published > ('now'::timestamp - i::interval)
+ AND pe.bot_account = FALSE) a
+GROUP BY
+ community_id;
+END;
+$$;
+
+CREATE OR REPLACE FUNCTION site_aggregates_activity (i text)
+ RETURNS integer
+ LANGUAGE plpgsql
+ AS $$
+DECLARE
+ count_ integer;
+BEGIN
+ SELECT
+ count(*) INTO count_
+ FROM (
+ SELECT
+ c.creator_id
+ FROM
+ comment c
+ INNER JOIN person u ON c.creator_id = u.id
+ INNER JOIN person pe ON c.creator_id = pe.id
+ WHERE
+ c.published > ('now'::timestamp - i::interval)
+ AND u.local = TRUE
+ AND pe.bot_account = FALSE
+ UNION
+ SELECT
+ p.creator_id
+ FROM
+ post p
+ INNER JOIN person u ON p.creator_id = u.id
+ INNER JOIN person pe ON p.creator_id = pe.id
+ WHERE
+ p.published > ('now'::timestamp - i::interval)
+ AND u.local = TRUE
+ AND pe.bot_account = FALSE) a;
+ RETURN count_;
+END;
+$$;
+
diff --git a/migrations/2023-12-06-180359_edit_active_users/up.sql b/migrations/2023-12-06-180359_edit_active_users/up.sql
new file mode 100644
index 000000000..4fe7689fc
--- /dev/null
+++ b/migrations/2023-12-06-180359_edit_active_users/up.sql
@@ -0,0 +1,114 @@
+-- Edit community aggregates to include voters as active users
+CREATE OR REPLACE FUNCTION community_aggregates_activity (i text)
+ RETURNS TABLE (
+ count_ bigint,
+ community_id_ integer)
+ LANGUAGE plpgsql
+ AS $$
+BEGIN
+ RETURN query
+ SELECT
+ count(*),
+ community_id
+ FROM (
+ SELECT
+ c.creator_id,
+ p.community_id
+ FROM
+ comment c
+ INNER JOIN post p ON c.post_id = p.id
+ INNER JOIN person pe ON c.creator_id = pe.id
+ WHERE
+ c.published > ('now'::timestamp - i::interval)
+ AND pe.bot_account = FALSE
+ UNION
+ SELECT
+ p.creator_id,
+ p.community_id
+ FROM
+ post p
+ INNER JOIN person pe ON p.creator_id = pe.id
+ WHERE
+ p.published > ('now'::timestamp - i::interval)
+ AND pe.bot_account = FALSE
+ UNION
+ SELECT
+ pl.person_id,
+ p.community_id
+ FROM
+ post_like pl
+ INNER JOIN post p ON pl.post_id = p.id
+ INNER JOIN person pe ON pl.person_id = pe.id
+ WHERE
+ pl.published > ('now'::timestamp - i::interval)
+ AND pe.bot_account = FALSE
+ UNION
+ SELECT
+ cl.person_id,
+ p.community_id
+ FROM
+ comment_like cl
+ INNER JOIN post p ON cl.post_id = p.id
+ INNER JOIN person pe ON cl.person_id = pe.id
+ WHERE
+ cl.published > ('now'::timestamp - i::interval)
+ AND pe.bot_account = FALSE) a
+GROUP BY
+ community_id;
+END;
+$$;
+
+-- Edit site aggregates to include voters and people who have read posts as active users
+CREATE OR REPLACE FUNCTION site_aggregates_activity (i text)
+ RETURNS integer
+ LANGUAGE plpgsql
+ AS $$
+DECLARE
+ count_ integer;
+BEGIN
+ SELECT
+ count(*) INTO count_
+ FROM (
+ SELECT
+ c.creator_id
+ FROM
+ comment c
+ INNER JOIN person pe ON c.creator_id = pe.id
+ WHERE
+ c.published > ('now'::timestamp - i::interval)
+ AND pe.local = TRUE
+ AND pe.bot_account = FALSE
+ UNION
+ SELECT
+ p.creator_id
+ FROM
+ post p
+ INNER JOIN person pe ON p.creator_id = pe.id
+ WHERE
+ p.published > ('now'::timestamp - i::interval)
+ AND pe.local = TRUE
+ AND pe.bot_account = FALSE
+ UNION
+ SELECT
+ pl.person_id
+ FROM
+ post_like pl
+ INNER JOIN person pe ON pl.person_id = pe.id
+ WHERE
+ pl.published > ('now'::timestamp - i::interval)
+ AND pe.local = TRUE
+ AND pe.bot_account = FALSE
+ UNION
+ SELECT
+ cl.person_id
+ FROM
+ comment_like cl
+ INNER JOIN person pe ON cl.person_id = pe.id
+ WHERE
+ cl.published > ('now'::timestamp - i::interval)
+ AND pe.local = TRUE
+ AND pe.bot_account = FALSE) a;
+ RETURN count_;
+END;
+$$;
+
--
GitLab