udata 10.4.2.dev35319__py2.py3-none-any.whl → 10.4.2.dev35397__py2.py3-none-any.whl

udata/core/activity/api.py

@@ -4,6 +4,7 @@ from bson import ObjectId
 from mongoengine.errors import DoesNotExist
 
 from udata.api import API, api, fields
+from udata.auth import current_user
 from udata.core.organization.api_fields import org_ref_fields
 from udata.core.user.api_fields import user_ref_fields
 from udata.models import Activity, db
@@ -77,7 +78,7 @@ class SiteActivityAPI(API):
     @api.expect(activity_parser)
     @api.marshal_with(activity_page_fields)
     def get(self):
-        """Fetch site activity, optionally filtered by user of org."""
+        """Fetch site activity, optionally filtered by user or org."""
         args = activity_parser.parse_args()
         qs = Activity.objects
 
@@ -96,10 +97,11 @@ class SiteActivityAPI(API):
         qs = qs.order_by("-created_at")
         qs = qs.paginate(args["page"], args["page_size"])
 
-        # Filter out DBRefs
+        # - Filter out DBRefs
         # Always return a result even not complete
         # But log the error (ie. visible in sentry, silent for user)
         # Can happen when someone manually delete an object in DB (ie. without proper purge)
+        # - Filter out private items (except for sysadmin users)
         safe_items = []
         for item in qs.queryset.items:
             try:
@@ -107,6 +109,11 @@ class SiteActivityAPI(API):
             except DoesNotExist as e:
                 log.error(e, exc_info=True)
             else:
+                if hasattr(item.related_to, "private") and (
+                    current_user.is_anonymous or not current_user.sysadmin
+                ):
+                    if item.related_to.private:
+                        continue
                 safe_items.append(item)
         qs.queryset.items = safe_items
 

udata/core/dataservices/activities.py

@@ -36,18 +36,18 @@ class UserDeletedDataservice(DataserviceRelatedActivity, Activity):
 
 @Dataservice.on_create.connect
 def on_user_created_dataservice(dataservice):
-    if not dataservice.private and current_user and current_user.is_authenticated:
+    if current_user and current_user.is_authenticated:
         UserCreatedDataservice.emit(dataservice, dataservice.organization)
 
 
 @Dataservice.on_update.connect
 def on_user_updated_dataservice(dataservice, **kwargs):
     changed_fields = kwargs.get("changed_fields", [])
-    if not dataservice.private and current_user and current_user.is_authenticated:
+    if current_user and current_user.is_authenticated:
         UserUpdatedDataservice.emit(dataservice, dataservice.organization, changed_fields)
 
 
 @Dataservice.on_delete.connect
 def on_user_deleted_dataservice(dataservice):
-    if not dataservice.private and current_user and current_user.is_authenticated:
+    if current_user and current_user.is_authenticated:
         UserDeletedDataservice.emit(dataservice, dataservice.organization)

udata/core/dataset/activities.py

@@ -55,7 +55,7 @@ class UserRemovedResourceFromDataset(DatasetRelatedActivity, Activity):
 
 @Dataset.on_resource_added.connect
 def on_user_added_resource_to_dataset(sender, document, **kwargs):
-    if not document.private and current_user and current_user.is_authenticated:
+    if current_user and current_user.is_authenticated:
         UserAddedResourceToDataset.emit(
             document, document.organization, None, {"resource_id": str(kwargs["resource_id"])}
         )
@@ -64,7 +64,7 @@ def on_user_added_resource_to_dataset(sender, document, **kwargs):
 @Dataset.on_resource_updated.connect
 def on_user_updated_resource(sender, document, **kwargs):
     changed_fields = kwargs.get("changed_fields", [])
-    if not document.private and current_user and current_user.is_authenticated:
+    if current_user and current_user.is_authenticated:
         UserUpdatedResource.emit(
             document,
             document.organization,
@@ -75,7 +75,7 @@ def on_user_updated_resource(sender, document, **kwargs):
 
 @Dataset.on_resource_removed.connect
 def on_user_removed_resource_from_dataset(sender, document, **kwargs):
-    if not document.private and current_user and current_user.is_authenticated:
+    if current_user and current_user.is_authenticated:
         UserRemovedResourceFromDataset.emit(
             document, document.organization, None, {"resource_id": str(kwargs["resource_id"])}
         )
@@ -83,18 +83,18 @@ def on_user_removed_resource_from_dataset(sender, document, **kwargs):
 
 @Dataset.on_create.connect
 def on_user_created_dataset(dataset):
-    if not dataset.private and current_user and current_user.is_authenticated:
+    if current_user and current_user.is_authenticated:
         UserCreatedDataset.emit(dataset, dataset.organization)
 
 
 @Dataset.on_update.connect
 def on_user_updated_dataset(dataset, **kwargs):
     changed_fields = kwargs.get("changed_fields", [])
-    if not dataset.private and current_user and current_user.is_authenticated:
+    if current_user and current_user.is_authenticated:
         UserUpdatedDataset.emit(dataset, dataset.organization, changed_fields)
 
 
 @Dataset.on_delete.connect
 def on_user_deleted_dataset(dataset):
-    if not dataset.private and current_user and current_user.is_authenticated:
+    if current_user and current_user.is_authenticated:
         UserDeletedDataset.emit(dataset, dataset.organization)

udata/core/dataset/rdf.py

@@ -769,7 +769,7 @@ def dataset_from_rdf(graph: Graph, dataset=None, node=None, remote_url_prefix: s
     # Support dct:abstract if dct:description is missing (sometimes used instead)
     description = d.value(DCT.description) or d.value(DCT.abstract)
     dataset.description = sanitize_html(description)
-    dataset.frequency = frequency_from_rdf(d.value(DCT.accrualPeriodicity))
+    dataset.frequency = frequency_from_rdf(d.value(DCT.accrualPeriodicity)) or dataset.frequency
     roles = [  # Imbricated list of contact points for each role
         contact_points_from_rdf(d, rdf_entity, role, dataset)
         for rdf_entity, role in CONTACT_POINT_ENTITY_TO_ROLE.items()

udata/core/reuse/activities.py

@@ -33,18 +33,18 @@ class UserDeletedReuse(ReuseRelatedActivity, Activity):
 
 @Reuse.on_create.connect
 def on_user_created_reuse(reuse):
-    if not reuse.private and current_user and current_user.is_authenticated:
+    if current_user and current_user.is_authenticated:
         UserCreatedReuse.emit(reuse, reuse.organization)
 
 
 @Reuse.on_update.connect
 def on_user_updated_reuse(reuse, **kwargs):
     changed_fields = kwargs.get("changed_fields", [])
-    if not reuse.private and current_user and current_user.is_authenticated:
+    if current_user and current_user.is_authenticated:
         UserUpdatedReuse.emit(reuse, reuse.organization, changed_fields)
 
 
 @Reuse.on_delete.connect
 def on_user_deleted_reuse(reuse):
-    if not reuse.private and current_user and current_user.is_authenticated:
+    if current_user and current_user.is_authenticated:
         UserDeletedReuse.emit(reuse, reuse.organization)

udata/tests/api/test_activities_api.py

@@ -7,7 +7,7 @@ from udata.core.dataset.factories import DatasetFactory
 from udata.core.dataset.models import Dataset
 from udata.core.reuse.factories import ReuseFactory
 from udata.core.reuse.models import Reuse
-from udata.core.user.factories import UserFactory
+from udata.core.user.factories import AdminFactory, UserFactory
 from udata.mongo import db
 from udata.tests.helpers import assert200, assert400
 
@@ -67,3 +67,31 @@ class ActivityAPITest:
         assert200(response)
         len(response.json["data"]) == 1
         assert response.json["data"][0]["related_to"] == reuse.title
+
+    def test_activity_api_list_with_private(self, api) -> None:
+        """It should fetch an activity list from the API"""
+        activities: list[Activity] = [
+            FakeDatasetActivity.objects.create(
+                actor=UserFactory(), related_to=DatasetFactory(private=True)
+            ),
+            FakeReuseActivity.objects.create(
+                actor=UserFactory(), related_to=ReuseFactory(private=True)
+            ),
+        ]
+
+        # Anonymised user won't see activities about private documents
+        response: TestResponse = api.get(url_for("api.activity"))
+        assert200(response)
+        assert len(response.json["data"]) == 0
+
+        # Lambda user won't see activities about private documents
+        api.login()
+        response: TestResponse = api.get(url_for("api.activity"))
+        assert200(response)
+        assert len(response.json["data"]) == 0
+
+        # Sysadmin user will see activities about private documents
+        api.login(AdminFactory())
+        response: TestResponse = api.get(url_for("api.activity"))
+        assert200(response)
+        assert len(response.json["data"]) == len(activities)

{udata-10.4.2.dev35319.dist-info → udata-10.4.2.dev35397.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: udata
-Version: 10.4.2.dev35319
+Version: 10.4.2.dev35397
 Summary: Open data portal
 Home-page: https://github.com/opendatateam/udata
 Author: Opendata Team
@@ -142,8 +142,10 @@ It is collectively taken care of by members of the
 ## Current (in progress)
 
 - Add activities to dataservices and resources, add Auditable class to refactor improve code [#3308](https://github.com/opendatateam/udata/pull/3308)
+- Store activities for private objects [#3328](https://github.com/opendatateam/udata/pull/3328)
 - Do not crash if file doesn't exists during resource deletion [#3323](https://github.com/opendatateam/udata/pull/3323)
 - Show user domain in suggest [#3324](https://github.com/opendatateam/udata/pull/3324)
+- Keep the existing frequency if not found during harvesting [#3330](https://github.com/opendatateam/udata/pull/3330)
 
 ## 10.4.1 (2025-05-20)
 

{udata-10.4.2.dev35319.dist-info → udata-10.4.2.dev35397.dist-info}/RECORD

@@ -57,7 +57,7 @@ udata/core/__init__.py,sha256=O7C9WWCXiLWnWPnPbFRszWhOmvRQiI4gD-5qkWvPGRo,385
 udata/core/csv.py,sha256=qeRtSQXPT5n5EoWZ3_XfnOTW7ITnEzzHctODPeX63Uk,8543
 udata/core/owned.py,sha256=OQT7wdk7dAqGvWDiJRVkKJxerDc9_Io910nvLmfBAVI,5561
 udata/core/activity/__init__.py,sha256=U4e1qgBwiz3Lc7lbhIji3p1WVGsUg5GftfDrxFZQu5Q,352
-udata/core/activity/api.py,sha256=ECDnqDlOeWXtjumPZKTyOWHY8mMQr7KFQTF-tbO3jss,3944
+udata/core/activity/api.py,sha256=-2Vz5BiZ6302JDK0q1FXtuZvmTy6fyBU0DIWu1GRQ64,4283
 udata/core/activity/models.py,sha256=ipViQMB1UMgxd9nolueanEgOB31s9pihTqkDdfo11u4,3214
 udata/core/activity/signals.py,sha256=Io2A43as3yR-DZ5R3wzM_bTpn528pxWsZDUFZ9xtj2Y,191
 udata/core/activity/tasks.py,sha256=F3PY12dnpT5Z8VuYfuOyDP6VPKPJmq1Sm4lSiPfmUCA,1498
@@ -81,7 +81,7 @@ udata/core/contact_point/factories.py,sha256=YoW2PKKaemYO4lIy5MwpH36uXM_J3rE-Ihs
 udata/core/contact_point/forms.py,sha256=oBe1agSJFyx2QRgYzPRg2A7qVscaBTaKG4V-AyIwnF8,729
 udata/core/contact_point/models.py,sha256=Xqmqg7S13gcaKxiQT52WHeQEHTaUDDGIXInXyqNh4Po,854
 udata/core/dataservices/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-udata/core/dataservices/activities.py,sha256=0gYJACjhHThQyiXcLD2gX858QjepXu8EUM3nVEp656w,1703
+udata/core/dataservices/activities.py,sha256=CJK9DAohrG70YZAedHk3UdyIlF9cLaYeV6TR-aHosOs,1619
 udata/core/dataservices/api.py,sha256=7jOn3Ug63-5wjXP0d_zL0whdCQeHG_eQ1Y-wNhUuPLM,7388
 udata/core/dataservices/apiv2.py,sha256=XIqJq58uLtxtt52iKYo7Fl0ZXv9Sz72uA7JIGwP8Qos,995
 udata/core/dataservices/constants.py,sha256=LBCTQ44YvjTZfQVbxFiovPxapAknSJNOZKjMP8WeFy4,351
@@ -94,7 +94,7 @@ udata/core/dataservices/search.py,sha256=Wsr51jU14D9NrNP3ELTc8swwtFb-dakgc55cDrt
 udata/core/dataservices/tasks.py,sha256=d2tG1l6u8-eUKUYBOgnCsQLbLmLgJXU-DOzZWhhL6Qg,897
 udata/core/dataset/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 udata/core/dataset/actions.py,sha256=mX6xox0PiMrbcAPZ3VZsI26rfM-ciYfEXxN6sqqImKA,1222
-udata/core/dataset/activities.py,sha256=FD5A16cCyPvMY5lEEtQX3ENlaA1pao5Et8FbbHPpLgg,3195
+udata/core/dataset/activities.py,sha256=RtY06G6FiEMr8NY26kaYKCXwGdcGtBJv2U8kWgFTRxE,3048
 udata/core/dataset/api.py,sha256=jElQZuguc514Eb0cWdquEfosP1yB79hEQ52SV_SvLx8,33282
 udata/core/dataset/api_fields.py,sha256=SLuzWoPdMLPX28WQ9DRGUPKS27vlltiFeiTo6jXa55Q,17549
 udata/core/dataset/apiv2.py,sha256=YOCNqQh7_OODcrzqJqdAPc0CoB9vG0DVcFiJNl9yBwQ,20749
@@ -108,7 +108,7 @@ udata/core/dataset/forms.py,sha256=7KUxuFcEGT0MUe0cZCiZtsnZhvGgvEd68pe13NgeSMI,6
 udata/core/dataset/models.py,sha256=BiqwN1mLffc4_LqtQ6KcNK1BIh04cVKFhyOw3n3BIK8,41161
 udata/core/dataset/permissions.py,sha256=zXQ6kU-Ni3Pl5tDtat-ZPupug9InsNeCN7xRLc2Vcrc,1097
 udata/core/dataset/preview.py,sha256=IwCqiNTjjXbtA_SSKF52pwnzKKEz0GyYM95QNn2Dkog,2561
-udata/core/dataset/rdf.py,sha256=HkjzcWgq9AfPvUGMRI7-ufRrgnlfBmP8crbgRhg6Lz4,31789
+udata/core/dataset/rdf.py,sha256=6aqoZajpmA2nciZsG1pGeJr0HKgdxjtuGWvk8xXjfUI,31810
 udata/core/dataset/search.py,sha256=E7LqHBnq3sMefvmLwTpiw-Ovem2a3NJswHesRjctboE,5627
 udata/core/dataset/signals.py,sha256=WN4sV-lJlNsRkhcnhoy0SYJvCoYmK_5QFYZd1u-h4gs,161
 udata/core/dataset/tasks.py,sha256=BHE79WLdY8bhGqXRBbqsXdHF5uHv3ZlsKW2A8OYoElc,9997
@@ -174,7 +174,7 @@ udata/core/reports/api.py,sha256=2xKsYC93V3md2ahkZs--O_0dTWQTicES5_9jbfER3hM,155
 udata/core/reports/constants.py,sha256=LRZSX3unyqZeB4yQjK3ws_hGbJcXYk4bu1Rhnhi5DEs,1235
 udata/core/reports/models.py,sha256=AsW5p2ZIdR4c6vNzglEN7MX03It-t9u7ktOsVZqvzSs,2702
 udata/core/reuse/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-udata/core/reuse/activities.py,sha256=3eh3zS4eH_199rdwIW0vtrYdKAZ8W3qRbrt_CRLNZXY,1486
+udata/core/reuse/activities.py,sha256=5D7cV-hGZnzHsp8hohZqqgK3RSGQpfAqJ_Wfq_AYfM8,1420
 udata/core/reuse/api.py,sha256=931cn6CGVcHv0XhSAXyjHkKy-9nOGHaHdE3uMU8v9mc,10928
 udata/core/reuse/api_fields.py,sha256=c61Gl56UjiBpXS0Nbvcoi_QHdUmhnBtqWm6nNHRYKyc,1232
 udata/core/reuse/apiv2.py,sha256=nZe-v8713aXKuv2B578NdxfrIckjbxhS3zUXAKSIKTI,835
@@ -622,7 +622,7 @@ udata/tests/test_transfer.py,sha256=_0pBwYs3T7OSZ7bO3KmQ81SjwCJyT4EVf8YYHXOkwdk,
 udata/tests/test_uris.py,sha256=MxafZ0SyzSNRomVpZnH1ChzWaHOi1MQiXe1gmKnBc6o,8517
 udata/tests/test_utils.py,sha256=3BGnlvw-GOE6tLHQteo-uUeYuzq4rsjePOuytFGkpOg,7967
 udata/tests/api/__init__.py,sha256=y4sL7LD1-KwONHF0q_Rhk2W6BmGUlp7Uz2JnX3e27sk,1218
-udata/tests/api/test_activities_api.py,sha256=RjDDeNle3T-ydVnh6BRypqxAE_244-DXaKkuUCT0HVU,2823
+udata/tests/api/test_activities_api.py,sha256=WSBScq_gMaBJJchvmyoc_LnslXemgfvdDMtzgf8wDqg,3987
 udata/tests/api/test_auth_api.py,sha256=OMRlY0OQt60j5N4A-N3HdWTuffOjRlFHkz5a3jJFieI,25987
 udata/tests/api/test_base_api.py,sha256=2w_vz0eEuq3P3aN-ByvxGc3VZAo7XtgatFfcrzf2uEU,2244
 udata/tests/api/test_contact_points.py,sha256=X_RWD_xCfR8WchhHfKEt5mxMHY77OmTyguNKCsZftdE,5337
@@ -727,9 +727,9 @@ udata/translations/pt/LC_MESSAGES/udata.mo,sha256=ViV14tUmjSydHS0TWG_mFikKQfyUaT
 udata/translations/pt/LC_MESSAGES/udata.po,sha256=rzAD_MVoV54TmN3w1ECz3H2Ru5pM7hWMVH03SkY28Q8,47250
 udata/translations/sr/LC_MESSAGES/udata.mo,sha256=EHX1_D-Uglj38832G7BrA0QC5IuY3p8dKqi9T0DgPmE,29169
 udata/translations/sr/LC_MESSAGES/udata.po,sha256=3PMnbVhKVJh6Q8ABi1ZTZ8Dcf-sMjngLJZqLbonJoec,54225
-udata-10.4.2.dev35319.dist-info/LICENSE,sha256=V8j_M8nAz8PvAOZQocyRDX7keai8UJ9skgmnwqETmdY,34520
-udata-10.4.2.dev35319.dist-info/METADATA,sha256=Au8KhpPvrAdVMP-YYk8a1wOly-4_2_zAhZ1SoALR0V8,146838
-udata-10.4.2.dev35319.dist-info/WHEEL,sha256=Kh9pAotZVRFj97E15yTA4iADqXdQfIVTHcNaZTjxeGM,110
-udata-10.4.2.dev35319.dist-info/entry_points.txt,sha256=ETvkR4r6G1duBsh_V_fGWENQy17GTFuobi95MYBAl1A,498
-udata-10.4.2.dev35319.dist-info/top_level.txt,sha256=39OCg-VWFWOq4gCKnjKNu-s3OwFlZIu_dVH8Gl6ndHw,12
-udata-10.4.2.dev35319.dist-info/RECORD,,
+udata-10.4.2.dev35397.dist-info/LICENSE,sha256=V8j_M8nAz8PvAOZQocyRDX7keai8UJ9skgmnwqETmdY,34520
+udata-10.4.2.dev35397.dist-info/METADATA,sha256=CcVTBd3s795OqiP6v_xPJJC7uO20LFvmL0vtNN84afI,147052
+udata-10.4.2.dev35397.dist-info/WHEEL,sha256=Kh9pAotZVRFj97E15yTA4iADqXdQfIVTHcNaZTjxeGM,110
+udata-10.4.2.dev35397.dist-info/entry_points.txt,sha256=ETvkR4r6G1duBsh_V_fGWENQy17GTFuobi95MYBAl1A,498
+udata-10.4.2.dev35397.dist-info/top_level.txt,sha256=39OCg-VWFWOq4gCKnjKNu-s3OwFlZIu_dVH8Gl6ndHw,12
+udata-10.4.2.dev35397.dist-info/RECORD,,