udata 10.8.1.dev36561__py2.py3-none-any.whl → 10.8.1.dev36604__py2.py3-none-any.whl

udata/core/dataservices/models.py

@@ -288,6 +288,7 @@ class Dataservice(Auditable, WithMetrics, Linkable, Owned, db.Document):
 
     __metrics_keys__ = [
         "discussions",
+        "discussions_open",
         "followers",
         "followers_by_months",
         "views",
@@ -310,7 +311,8 @@ class Dataservice(Auditable, WithMetrics, Linkable, Owned, db.Document):
         }
 
     def count_discussions(self):
-        self.metrics["discussions"] = Discussion.objects(subject=self, closed=None).count()
+        self.metrics["discussions"] = Discussion.objects(subject=self).count()
+        self.metrics["discussions_open"] = Discussion.objects(subject=self, closed=None).count()
         self.save(signal_kwargs={"ignores": ["post_save"]})
 
     def count_followers(self):

udata/core/dataset/models.py

@@ -611,6 +611,7 @@ class Dataset(Auditable, WithMetrics, DatasetBadgeMixin, Owned, Linkable, db.Doc
 
     __metrics_keys__ = [
         "discussions",
+        "discussions_open",
         "reuses",
         "reuses_by_months",
         "followers",
@@ -1086,7 +1087,8 @@ class Dataset(Auditable, WithMetrics, DatasetBadgeMixin, Owned, Linkable, db.Doc
     def count_discussions(self):
         from udata.models import Discussion
 
-        self.metrics["discussions"] = Discussion.objects(subject=self, closed=None).count()
+        self.metrics["discussions"] = Discussion.objects(subject=self).count()
+        self.metrics["discussions_open"] = Discussion.objects(subject=self, closed=None).count()
         self.save(signal_kwargs={"ignores": ["post_save"]})
 
     def count_reuses(self):

udata/core/reuse/models.py

@@ -151,6 +151,7 @@ class Reuse(db.Datetimed, Auditable, WithMetrics, ReuseBadgeMixin, Linkable, Own
 
     __metrics_keys__ = [
         "discussions",
+        "discussions_open",
         "datasets",
         "followers",
         "followers_by_months",
@@ -287,7 +288,8 @@ class Reuse(db.Datetimed, Auditable, WithMetrics, ReuseBadgeMixin, Linkable, Own
     def count_discussions(self):
         from udata.models import Discussion
 
-        self.metrics["discussions"] = Discussion.objects(subject=self, closed=None).count()
+        self.metrics["discussions"] = Discussion.objects(subject=self).count()
+        self.metrics["discussions_open"] = Discussion.objects(subject=self, closed=None).count()
         self.save(signal_kwargs={"ignores": ["post_save"]})
 
     def count_followers(self):

udata/migrations/2025-07-18-redo-count-discussion.py

@@ -0,0 +1,26 @@
+"""
+This migration does a `count_discussions` on all objets with discussions.
+It follows the change of `metrics.discussions` to track all discussions and not onyl the opened ones.
+"""
+
+import logging
+
+import click
+
+from udata.core.discussions.models import Discussion
+from udata.mongo import db as udata_db
+
+log = logging.getLogger(__name__)
+
+
+def migrate(db):
+    objects_with_discussions = Discussion.objects.aggregate(
+        [{"$group": {"_id": "$subject._ref", "_cls": {"$first": "$subject._cls"}}}]
+    )
+    with click.progressbar(objects_with_discussions) as objects_with_discussions:
+        for object in objects_with_discussions:
+            related_to = udata_db.resolve_model(object["_cls"]).objects.get(pk=object["_id"].id)
+            try:
+                related_to.count_discussions()
+            except Exception as err:
+                log.error(f"Cannot count discussions for {object['_cls']} {object['_id'].id} {err}")