udata 7.0.6.dev28248__py2.py3-none-any.whl → 7.0.6.dev28263__py2.py3-none-any.whl

udata/core/activity/api.py

@@ -37,7 +37,7 @@ activity_fields = api.model('Activity', {
         description='The key of the activity', required=True),
     'icon': fields.String(
         description='The icon of the activity', required=True),
-    'kwargs': fields.Raw(description='Some action specific context'),
+    'extras': fields.Raw(description='Extras attributes as key-value pairs'),
 })
 
 activity_page_fields = api.model('ActivityPage', fields.pager(activity_fields))

udata/core/activity/models.py

@@ -37,7 +37,7 @@ class Activity(db.Document, metaclass=EmitNewActivityMetaClass):
     related_to = db.ReferenceField(db.DomainModel, required=True)
     created_at = db.DateTimeField(default=datetime.utcnow, required=True)
 
-    kwargs = db.DictField()
+    extras = db.ExtrasField()
 
     on_new = Signal()
 
@@ -65,8 +65,9 @@ class Activity(db.Document, metaclass=EmitNewActivityMetaClass):
         return cls.on_new.connect(func, sender=cls)
 
     @classmethod
-    def emit(cls, related_to, organization=None, **kwargs):
+    def emit(cls, related_to, organization=None, extras=None):
         new_activity.send(cls,
                           related_to=related_to,
                           actor=current_user._get_current_object(),
-                          organization=organization)
+                          organization=organization,
+                          extras=extras)

udata/core/activity/tasks.py

@@ -9,22 +9,23 @@ log = logging.getLogger(__name__)
 
 
 @new_activity.connect
-def delay_activity(cls, related_to, actor, organization=None):
+def delay_activity(cls, related_to, actor, organization=None, extras=None):
     emit_activity.delay(
         cls.__name__,
         str(actor.id),
         related_to_cls=related_to.__class__.__name__,
         related_to_id=str(related_to.id),
         organization_id=str(organization.id) if organization else None,
+        extras=extras
     )
 
 
 @task
 def emit_activity(classname, actor_id, related_to_cls, related_to_id,
-                  organization_id=None):
-    log.debug('Emit new activity: %s %s %s %s %s',
+                  organization_id=None, extras=None):
+    log.debug('Emit new activity: %s %s %s %s %s %s',
               classname, actor_id, related_to_cls,
-              related_to_id, organization_id)
+              related_to_id, organization_id, extras)
     cls = db.resolve_model(classname)
     actor = User.objects.get(pk=actor_id)
     related_to = db.resolve_model(related_to_cls).objects.get(pk=related_to_id)
@@ -33,4 +34,4 @@ def emit_activity(classname, actor_id, related_to_cls, related_to_id,
     else:
         organization = None
     cls.objects.create(actor=actor, related_to=related_to,
-                       organization=organization)
+                       organization=organization, extras=extras)

udata/migrations/2024-03-22-migrate-activity-kwargs-to-extras.py

@@ -0,0 +1,16 @@
+"""
+Migrates `Activity.kwargs` to `Activity.extras`.
+"""
+import logging
+
+from mongoengine.connection import get_db
+
+log = logging.getLogger(__name__)
+
+def migrate(db):
+    log.info('Processing activity objects')
+
+    result = get_db().activity.update_many(filter={}, update={'$rename': {'kwargs': 'extras'}})
+
+    log.info(f'{result.modified_count} activity object(s) migrated')
+    log.info('Done')

udata/tests/test_activity.py

@@ -27,6 +27,18 @@ class ActivityTest(WebTestMixin, DBTestMixin, TestCase):
         self.assertEqual(len(activities), 1)
         self.assertIsInstance(activities[0], FakeActivity)
 
+    def test_create_and_retrieve_with_extras(self):
+        FakeActivity.objects.create(actor=self.user, related_to=self.fake, extras={'some_key': 'some_value',
+                                                                                   'other_key': 'other_value'})
+
+        activities = Activity.objects(actor=self.user)
+
+        self.assertEqual(len(activities), 1)
+        self.assertEqual(activities[0].extras['some_key'], 'some_value')
+        self.assertEqual(activities[0].extras['other_key'], 'other_value')
+        self.assertIsInstance(activities[0], FakeActivity)
+
+
     def test_create_and_retrieve_for_org(self):
         org = OrganizationFactory()
         FakeActivity.objects.create(

{udata-7.0.6.dev28248.dist-info → udata-7.0.6.dev28263.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: udata
-Version: 7.0.6.dev28248
+Version: 7.0.6.dev28263
 Summary: Open data portal
 Home-page: https://github.com/opendatateam/udata
 Author: Opendata Team
@@ -141,6 +141,7 @@ It is collectively taken care of by members of the
 - Fix, do not fail on spatial coverage harvesting exception and allow literal spatial BBOX from Arcgis [2998](https://github.com/opendatateam/udata/pull/2998)
 - Mock calls to example.com [#3000](https://github.com/opendatateam/udata/pull/3000)
 - Fix duplicate logs in console commands [#2996](https://github.com/opendatateam/udata/pull/2996)
+- Refactor `Activity.kwargs` into `Activity.extras` to facilitate its usage [#2999](https://github.com/opendatateam/udata/pull/2999)
 
 ## 7.0.5 (2024-03-20)
 

{udata-7.0.6.dev28248.dist-info → udata-7.0.6.dev28263.dist-info}/RECORD

@@ -53,10 +53,10 @@ udata/commands/tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hS
 udata/commands/tests/fixtures.py,sha256=h78grSpZDgOwvmezyD3qBpiSnpxaQ9tDeQOr3sB8EiY,1581
 udata/core/__init__.py,sha256=n7TBP0lkYJl-BLoc67V5fyaawrWmsrWG_mLIF49UFOY,385
 udata/core/activity/__init__.py,sha256=4vB92owvzwn2VVxbFWGNcfESb6izDzvbj6lmLH4ssrU,299
-udata/core/activity/api.py,sha256=CeVU0ZtQZwQZMLh8Yt13LRGUohFo7iRf1bogbIoiI_4,3268
-udata/core/activity/models.py,sha256=z5qe7Hu3IoGCGeGyI31WaFPCg4C6q9BpUrTKK_ik4XI,2073
+udata/core/activity/api.py,sha256=ohDEbzhbsmJ6YHQh3Aa8wYctaDQGuwKdg0kjh3lC028,3276
+udata/core/activity/models.py,sha256=oxv8U45WNbzyZy8hgm8OGSn1zcRobOkhvOYTKpBwmrs,2119
 udata/core/activity/signals.py,sha256=nplrZFDDuGVXwLWpI_Lhe64mBRMRtwooJG1KcCH6Ses,191
-udata/core/activity/tasks.py,sha256=vBmxD96-svZpuEwIdm7vwgqMIZq0JgUv8e8dH1YaKLU,1168
+udata/core/activity/tasks.py,sha256=yKkDgBXYmVX-DS4P9hBgZcweEOU8mlihSj7pqQYOmkg,1242
 udata/core/badges/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 udata/core/badges/api.py,sha256=BVHULesVK3godViXVOFSjGPCLYmHqLXXywsf0EaJpr8,993
 udata/core/badges/commands.py,sha256=NMihQH6ABUlkYpR2lNFW4dkeaWOjpijW7voudww8zW4,1129
@@ -315,6 +315,7 @@ udata/migrations/2022-10-10-add-fs_uniquifier-to-user-model.py,sha256=ZKfrhPIeIr
 udata/migrations/2022-10-10-migrate-harvest-extras.py,sha256=HyBy7f1epYuBry68lUYTe7fMWoiyuIQ6xVwzwljtGqI,2254
 udata/migrations/2023-02-08-rename-internal-dates.py,sha256=AYewRwdVCfHsJ5APbhQWfihH-nerT3jOzQsSrXW9RQ0,1651
 udata/migrations/2024-01-29-fix-reuse-and-dataset-with-private-None.py,sha256=173Zf67G-oJgLwXeQUpzoCzcpAOu1ifcLb4eUMJ9nfU,590
+udata/migrations/2024-03-22-migrate-activity-kwargs-to-extras.py,sha256=n5-udd1IdaD-e3q5cZx9nC4uMUSyJyT1TkI6I4gFgh0,400
 udata/migrations/__init__.py,sha256=3YP8ppVG5Jx_u6fWJ099X6m3JDYsbd_wetpu4arl6_U,10882
 udata/models/__init__.py,sha256=1jVsYyZqtPKOuGgbhHmJd3rWJjAv5t7k51_j5C43m8c,5528
 udata/models/badges_field.py,sha256=NnHA6OT40UysQzO3qnxiDNLR-SCj19KlqD1c-p1DP2Q,984
@@ -545,7 +546,7 @@ udata/tests/helpers.py,sha256=aaifyevJ1Z8CZ8htRrl8OCG5hGcaHfj0lL8iMEKds9w,6022
 udata/tests/models.py,sha256=_V0smMb1Z6p3aZv6PorzNN-HiNt_B46Ox1fqXrTJEqk,238
 udata/tests/plugin.py,sha256=hI9Z5SIxUT8UhqZMLcNPzBqdM8-nUgtCW6Pbw2bnNsQ,11045
 udata/tests/schemas.json,sha256=ZRHijbvYaQBrKuTJzCY5ZeQXdIdaZkv3fo7VMbDjsNg,3483
-udata/tests/test_activity.py,sha256=4ZHRG9GYv5I2gtMYQAnhgONP9YBqwMdKKq9T2vua6-I,2674
+udata/tests/test_activity.py,sha256=spWfhueuLze0kD-pAnegiL3_Kv5io155jQuFI4sjN7I,3258
 udata/tests/test_discussions.py,sha256=zPvKOdcTNGXrvHFp9zqjhKE2fqgUkhb_1F98egXYCL0,31036
 udata/tests/test_i18n.py,sha256=BU9E7OoIkJw5tv5JYGLjDGBDsti2HuQ_3OWDKnBxnaM,3191
 udata/tests/test_linkchecker.py,sha256=KxV1-PuuuqogkHf3jP6JhRsc2QG2dFmFB-vSHOiHkuU,10374
@@ -659,9 +660,9 @@ udata/translations/pt/LC_MESSAGES/udata.mo,sha256=zCVMB-a4-mLM1jNyYMk58rgVRaVIwQ
 udata/translations/pt/LC_MESSAGES/udata.po,sha256=avfWczvlLBKSohyB55-4TLmUGMU_Rze4XmAo4OTk2v0,43513
 udata/translations/sr/LC_MESSAGES/udata.mo,sha256=ScuqdpaV4y1ZIpBAEfxeaKdzkyGZL0mJmKMoG6w0iRQ,28553
 udata/translations/sr/LC_MESSAGES/udata.po,sha256=QpgEXh1eHjztPa7oNLXd_sds1DC95A-STTtZyTE4m-E,50093
-udata-7.0.6.dev28248.dist-info/LICENSE,sha256=V8j_M8nAz8PvAOZQocyRDX7keai8UJ9skgmnwqETmdY,34520
-udata-7.0.6.dev28248.dist-info/METADATA,sha256=cvPvj6V8F4fFMpGW4I6qftu6DenALP-KUuylkJ27cBA,119755
-udata-7.0.6.dev28248.dist-info/WHEEL,sha256=-G_t0oGuE7UD0DrSpVZnq1hHMBV9DD2XkS5v7XpmTnk,110
-udata-7.0.6.dev28248.dist-info/entry_points.txt,sha256=ZqIUHhOth0MMQvMIeuhODbUCDwjR-Hvo7PaKrMwTKuQ,384
-udata-7.0.6.dev28248.dist-info/top_level.txt,sha256=39OCg-VWFWOq4gCKnjKNu-s3OwFlZIu_dVH8Gl6ndHw,12
-udata-7.0.6.dev28248.dist-info/RECORD,,
+udata-7.0.6.dev28263.dist-info/LICENSE,sha256=V8j_M8nAz8PvAOZQocyRDX7keai8UJ9skgmnwqETmdY,34520
+udata-7.0.6.dev28263.dist-info/METADATA,sha256=2zJTXq_j2szvACqYhZsB6GFJNzIZf1KQXM-EuVgcvvQ,119888
+udata-7.0.6.dev28263.dist-info/WHEEL,sha256=-G_t0oGuE7UD0DrSpVZnq1hHMBV9DD2XkS5v7XpmTnk,110
+udata-7.0.6.dev28263.dist-info/entry_points.txt,sha256=ZqIUHhOth0MMQvMIeuhODbUCDwjR-Hvo7PaKrMwTKuQ,384
+udata-7.0.6.dev28263.dist-info/top_level.txt,sha256=39OCg-VWFWOq4gCKnjKNu-s3OwFlZIu_dVH8Gl6ndHw,12
+udata-7.0.6.dev28263.dist-info/RECORD,,