udata 11.0.2.dev12__py3-none-any.whl → 11.0.2.dev14__py3-none-any.whl

udata/commands/fixtures.py

@@ -51,7 +51,6 @@ UNWANTED_KEYS: dict[str, list[str]] = {
         "last_update",
         "last_modified",
         "license",
-        "badges",
         "spatial",
         "quality",
         "permissions",

udata/core/dataset/api.py

@@ -115,6 +115,12 @@ class DatasetApiParser(ModelApiParser):
         self.parser.add_argument("granularity", type=str, location="args")
         self.parser.add_argument("temporal_coverage", type=str, location="args")
         self.parser.add_argument("organization", type=str, location="args")
+        self.parser.add_argument(
+            "badge",
+            type=str,
+            choices=list(Dataset.__badges__),
+            location="args",
+        )
         self.parser.add_argument(
             "organization_badge",
             type=str,
@@ -178,6 +184,8 @@ class DatasetApiParser(ModelApiParser):
             )
         if args.get("featured") is not None:
             datasets = datasets.filter(featured=args["featured"])
+        if args.get("badge"):
+            datasets = datasets.with_badge(args["badge"])
         if args.get("organization"):
             if not ObjectId.is_valid(args["organization"]):
                 api.abort(400, "Organization arg must be an identifier")

udata/core/dataset/constants.py

@@ -78,6 +78,11 @@ CHECKSUM_TYPES = ("sha1", "sha2", "sha256", "md5", "crc")
 DEFAULT_CHECKSUM_TYPE = "sha1"
 
 PIVOTAL_DATA = "pivotal-data"
+SPD = "spd"
+INSPIRE = "inspire"
+HVD = "hvd"
+SL = "sl"
+SR = "sr"
 CLOSED_FORMATS = ("pdf", "doc", "docx", "word", "xls", "excel", "xlsx")
 
 # Maximum acceptable Damerau-Levenshtein distance

udata/core/dataset/models.py

@@ -36,12 +36,17 @@ from .constants import (
     CLOSED_FORMATS,
     DEFAULT_LICENSE,
     DESCRIPTION_SHORT_SIZE_LIMIT,
+    HVD,
+    INSPIRE,
     LEGACY_FREQUENCIES,
     MAX_DISTANCE,
     PIVOTAL_DATA,
     RESOURCE_FILETYPES,
     RESOURCE_TYPES,
     SCHEMA_CACHE_DURATION,
+    SL,
+    SPD,
+    SR,
     UPDATE_FREQUENCIES,
 )
 from .exceptions import (
@@ -61,6 +66,11 @@ __all__ = (
 
 BADGES: dict[str, str] = {
     PIVOTAL_DATA: _("Pivotal data"),
+    SPD: _("Reference data public service"),
+    INSPIRE: _("Inspire"),
+    HVD: _("High value datasets"),
+    SL: _("Certified statistic series"),
+    SR: _("Statistical series of general interest"),
 }
 
 NON_ASSIGNABLE_SCHEMA_TYPES = ["datapackage"]
@@ -334,6 +344,9 @@ class DatasetQuerySet(OwnedQuerySet):
     def hidden(self):
         return self(db.Q(private=True) | db.Q(deleted__ne=None) | db.Q(archived__ne=None))
 
+    def with_badge(self, kind):
+        return self(badges__kind=kind)
+
 
 class Checksum(db.EmbeddedDocument):
     type = db.StringField(choices=CHECKSUM_TYPES, required=True)

udata/core/topic/activities.py

@@ -1,9 +1,17 @@
 from flask_security import current_user
 
+from udata.core.topic.models import TopicElement
 from udata.i18n import lazy_gettext as _
 from udata.models import Activity, Topic, db
 
-__all__ = ("UserCreatedTopic", "UserUpdatedTopic", "TopicRelatedActivity")
+__all__ = (
+    "UserCreatedTopic",
+    "UserUpdatedTopic",
+    "UserCreatedTopicElement",
+    "UserUpdatedTopicElement",
+    "UserDeletedTopicElement",
+    "TopicRelatedActivity",
+)
 
 
 class TopicRelatedActivity(object):
@@ -23,6 +31,26 @@ class UserUpdatedTopic(TopicRelatedActivity, Activity):
     label = _("updated a topic")
 
 
+class UserCreatedTopicElement(TopicRelatedActivity, Activity):
+    key = "topic:element:created"
+    icon = "fa fa-plus"
+    badge_type = "success"
+    label = _("added an element to a topic")
+
+
+class UserUpdatedTopicElement(TopicRelatedActivity, Activity):
+    key = "topic:element:updated"
+    icon = "fa fa-pencil"
+    label = _("updated an element in a topic")
+
+
+class UserDeletedTopicElement(TopicRelatedActivity, Activity):
+    key = "topic:element:deleted"
+    icon = "fa fa-remove"
+    badge_type = "error"
+    label = _("removed an element from a topic")
+
+
 @Topic.on_create.connect
 def on_user_created_topic(topic):
     if current_user and current_user.is_authenticated:
@@ -34,3 +62,31 @@ def on_user_updated_topic(topic, **kwargs):
     changed_fields = kwargs.get("changed_fields", [])
     if current_user and current_user.is_authenticated:
         UserUpdatedTopic.emit(topic, topic.organization, changed_fields)
+
+
+@TopicElement.on_create.connect
+def on_user_created_topic_element(topic_element):
+    if current_user and current_user.is_authenticated and topic_element.topic:
+        extras = {"element_id": str(topic_element.id)}
+        UserCreatedTopicElement.emit(
+            topic_element.topic, topic_element.topic.organization, extras=extras
+        )
+
+
+@TopicElement.on_update.connect
+def on_user_updated_topic_element(topic_element, **kwargs):
+    changed_fields = kwargs.get("changed_fields", [])
+    if current_user and current_user.is_authenticated and topic_element.topic:
+        extras = {"element_id": str(topic_element.id)}
+        UserUpdatedTopicElement.emit(
+            topic_element.topic, topic_element.topic.organization, changed_fields, extras=extras
+        )
+
+
+@TopicElement.on_delete.connect
+def on_user_deleted_topic_element(topic_element):
+    if current_user and current_user.is_authenticated and topic_element.topic:
+        extras = {"element_id": str(topic_element.id)}
+        UserDeletedTopicElement.emit(
+            topic_element.topic, topic_element.topic.organization, extras=extras
+        )

udata/core/topic/apiv2.py

@@ -130,16 +130,13 @@ class TopicElementsAPI(API):
             else:
                 element = TopicElement()
                 form.populate_obj(element)
+                element.topic = topic
                 element.save()
                 elements.append(element)
 
         if errors:
             apiv2.abort(400, errors=errors)
 
-        for element in elements:
-            element.topic = topic
-            element.save()
-
         topic.save()
 
         return topic, 201
@@ -157,6 +154,7 @@ class TopicElementsAPI(API):
         if not TopicEditPermission(topic).can():
             apiv2.abort(403, "Forbidden")
 
+        # TODO: this triggers performance issues on a huge topic (too many tasks, too many activities)
         topic.elements.delete()
 
         return None, 204

udata/core/topic/models.py

@@ -1,9 +1,11 @@
 from blinker import Signal
+from flask import url_for
 from mongoengine.signals import post_delete, post_save
 
 from udata.api_fields import field
 from udata.core.activity.models import Auditable
 from udata.core.dataset.models import Dataset
+from udata.core.linkable import Linkable
 from udata.core.owned import Owned, OwnedQuerySet
 from udata.core.reuse.models import Reuse
 from udata.models import SpatialCoverage, db
@@ -13,7 +15,7 @@ from udata.tasks import as_task_param
 __all__ = ("Topic", "TopicElement")
 
 
-class TopicElement(db.Document):
+class TopicElement(Auditable, db.Document):
     title = field(db.StringField(required=False))
     description = field(db.StringField(required=False))
     tags = field(db.ListField(db.StringField()))
@@ -31,9 +33,16 @@ class TopicElement(db.Document):
         "auto_create_index_on_save": True,
     }
 
+    after_save = Signal()
+    on_create = Signal()
+    on_update = Signal()
+    on_delete = Signal()
+
     @classmethod
     def post_save(cls, sender, document, **kwargs):
         """Trigger reindex when element is saved"""
+        # Call parent post_save for Auditable functionality
+        super().post_save(sender, document, **kwargs)
         if document.topic and document.element and hasattr(document.element, "id"):
             reindex.delay(*as_task_param(document.element))
 
@@ -42,9 +51,10 @@ class TopicElement(db.Document):
         """Trigger reindex when element is deleted"""
         if document.topic and document.element and hasattr(document.element, "id"):
             reindex.delay(*as_task_param(document.element))
+        cls.on_delete.send(document)
 
 
-class Topic(db.Datetimed, Auditable, db.Document, Owned):
+class Topic(db.Datetimed, Auditable, Linkable, db.Document, Owned):
     name = field(db.StringField(required=True))
     slug = field(
         db.SlugField(max_length=255, required=True, populate_from="name", update=True, follow=True),
@@ -108,6 +118,13 @@ class Topic(db.Datetimed, Auditable, db.Document, Owned):
         # Useful for Discussions to call self_web_url on their `subject`
         return None
 
+    def self_api_url(self, **kwargs):
+        return url_for(
+            "apiv2.topic",
+            topic=self._link_id(**kwargs),
+            **self._self_api_url_kwargs(**kwargs),
+        )
+
 
 post_save.connect(Topic.post_save, sender=Topic)
 post_save.connect(TopicElement.post_save, sender=TopicElement)