[incubator-ponymail-foal] branch master updated: Use only recent mail volume for the list index (<=90 days ago)

[humbedooh]

This is an automated email from the ASF dual-hosted git repository.

humbedooh pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-ponymail-foal.git


The following commit(s) were added to refs/heads/master by this push:
     new 99dbcfe  Use only recent mail volume for the list index (<=90 days ago)
99dbcfe is described below

commit 99dbcfed93b6c8e7b873053ee45cd5e7add9e1d6
Author: Daniel Gruno <humbed...@apache.org>
AuthorDate: Wed Sep 15 19:13:48 2021 -0500

    Use only recent mail volume for the list index (<=90 days ago)
    
    This addresses #55 by only using recent volume for determining the busiest 
lists.
---
 server/plugins/background.py | 20 ++++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)

diff --git a/server/plugins/background.py b/server/plugins/background.py
index f7b27e9..3971464 100644
--- a/server/plugins/background.py
+++ b/server/plugins/background.py
@@ -30,6 +30,7 @@ import plugins.server
 import plugins.database
 
 PYPONY_RE_PREFIX = re.compile(r"^([a-zA-Z]+:\s*)+")
+ACTIVITY_TIMESPAN = "now-90d"  # How far back to look for "current" activity 
in lists
 
 
 class ProgTimer:
@@ -73,7 +74,7 @@ async def get_lists(database: plugins.configuration.DBConfig) 
-> dict:
     for ml in res["aggregations"]["per_list"]["buckets"]:
         list_name = ml["key"].strip("<>").replace(".", "@", 1)
         lists[list_name] = {
-            "count": ml["doc_count"],
+            "count": 0,   # We'll sort this later
             "private": False,
         }
 
@@ -90,9 +91,24 @@ async def get_lists(database: 
plugins.configuration.DBConfig) -> dict:
     for ml in res["aggregations"]["per_list"]["buckets"]:
         list_name = ml["key"].strip("<>").replace(".", "@", 1)
         lists[list_name] = {
-            "count": ml["doc_count"],
+            "count": 0,  # Sorting later
             "private": True,
         }
+
+    # Get 90 day activity, if any
+    s = Search(using=db.client, index=database.db_prefix + "-mbox")
+    s = s.filter('range', date = {'gte': ACTIVITY_TIMESPAN})
+    s.aggs.bucket("per_list", "terms", field="list_raw", size=limit)
+
+    res = await db.search(
+        index=database.db_prefix + "-mbox", body=s.to_dict(), size=0
+    )
+
+    for ml in res["aggregations"]["per_list"]["buckets"]:
+        list_name = ml["key"].strip("<>").replace(".", "@", 1)
+        if list_name in lists:
+            lists[list_name]["count"] = ml["doc_count"]
+
     await db.client.close()
 
     return lists