udata 7.0.5.dev28140__py2.py3-none-any.whl → 7.0.6__py2.py3-none-any.whl

udata/tests/search/test_adapter.py

@@ -14,7 +14,7 @@ from udata.utils import clean_string
 from udata.search import reindex, as_task_param
 from udata.search.commands import index_model
 from udata.core.dataset.search import DatasetSearch
-from udata.core.dataset.factories import DatasetFactory, ResourceFactory, VisibleDatasetFactory
+from udata.core.dataset.factories import DatasetFactory, ResourceFactory, HiddenDatasetFactory
 from udata.tests.api import APITestCase
 
 from . import FakeSearch
@@ -104,35 +104,35 @@ class SearchAdaptorTest:
         assertHasArgument(parser, 'page_size', int)
 
 
-@pytest.mark.options(SEARCH_SERVICE_API_URL="smtg")
+@pytest.mark.options(SEARCH_SERVICE_API_URL="smtg/")
 class IndexingLifecycleTest(APITestCase):
 
     @patch('requests.delete')
     def test_producer_should_send_a_message_without_payload_if_not_indexable(self, mock_req):
-        fake_data = DatasetFactory(id='61fd30cb29ea95c7bc0e1211')
+        fake_data = HiddenDatasetFactory(id='61fd30cb29ea95c7bc0e1211')
 
         reindex.run(*as_task_param(fake_data))
 
         search_service_url = current_app.config['SEARCH_SERVICE_API_URL']
-        url = f'{search_service_url}{DatasetSearch.search_url}/{str(fake_data.id)}/unindex'
+        url = f'{search_service_url}{DatasetSearch.search_url}{str(fake_data.id)}/unindex'
         mock_req.assert_called_with(url)
 
     @patch('requests.post')
     def test_producer_should_send_a_message_with_payload_if_indexable(self, mock_req):
         resource = ResourceFactory(schema=Schema(url="http://localhost/my-schema"))
-        fake_data = VisibleDatasetFactory(id='61fd30cb29ea95c7bc0e1211', resources=[resource])
+        fake_data = DatasetFactory(id='61fd30cb29ea95c7bc0e1211', resources=[resource])
 
         reindex.run(*as_task_param(fake_data))
 
         expected_value = {
             'document': DatasetSearch.serialize(fake_data)
         }
-        url = f"{current_app.config['SEARCH_SERVICE_API_URL']}{DatasetSearch.search_url}/index"
+        url = f"{current_app.config['SEARCH_SERVICE_API_URL']}{DatasetSearch.search_url}index"
         mock_req.assert_called_with(url, json=expected_value)
 
     @patch('requests.Session.post')
     def test_index_model(self, mock_req):
-        fake_data = VisibleDatasetFactory(id='61fd30cb29ea95c7bc0e1211')
+        fake_data = DatasetFactory(id='61fd30cb29ea95c7bc0e1211')
 
         index_model(DatasetSearch, start=None, reindex=False, from_datetime=None)
 
@@ -146,7 +146,7 @@ class IndexingLifecycleTest(APITestCase):
     @patch('requests.post')
     @patch('requests.Session.post')
     def test_reindex_model(self, mock_session, mock_req):
-        fake_data = VisibleDatasetFactory(id='61fd30cb29ea95c7bc0e1211')
+        fake_data = DatasetFactory(id='61fd30cb29ea95c7bc0e1211')
 
         index_model(DatasetSearch, start=datetime.datetime(2022, 2, 20, 20, 2), reindex=True)
 
@@ -167,10 +167,10 @@ class IndexingLifecycleTest(APITestCase):
 
     @patch('requests.Session.post')
     def test_index_model_from_datetime(self, mock_req):
-        VisibleDatasetFactory(id='61fd30cb29ea95c7bc0e1211',
-                              last_modified_internal=datetime.datetime(2020, 1, 1))
-        fake_data = VisibleDatasetFactory(id='61fd30cb29ea95c7bc0e1212',
-                                          last_modified_internal=datetime.datetime(2022, 1, 1))
+        DatasetFactory(id='61fd30cb29ea95c7bc0e1211',
+                       last_modified_internal=datetime.datetime(2020, 1, 1))
+        fake_data = DatasetFactory(id='61fd30cb29ea95c7bc0e1212',
+                                   last_modified_internal=datetime.datetime(2022, 1, 1))
 
         index_model(DatasetSearch, start=None, from_datetime=datetime.datetime(2023, 1, 1))
         mock_req.assert_not_called()

udata/tests/search/test_results.py

@@ -1,6 +1,6 @@
 from udata.tests.api import APITestCase
 from udata.search.result import SearchResult
-from udata.core.dataset.factories import VisibleDatasetFactory
+from udata.core.dataset.factories import DatasetFactory
 from udata.core.dataset.search import DatasetSearch
 from udata.models import Dataset
 
@@ -9,7 +9,7 @@ class ResultTest(APITestCase):
     def test_results_get_objects(self):
         data = []
         for _ in range(3):
-            random_dataset = VisibleDatasetFactory()
+            random_dataset = DatasetFactory()
             data.append(DatasetSearch.serialize(random_dataset))
 
         search_class = DatasetSearch.temp_search()
@@ -30,10 +30,10 @@ class ResultTest(APITestCase):
     def test_results_should_not_fail_on_missing_objects(self):
         data = []
         for _ in range(3):
-            random_dataset = VisibleDatasetFactory()
+            random_dataset = DatasetFactory()
             data.append(DatasetSearch.serialize(random_dataset))
 
-        to_delete_random_dataset = VisibleDatasetFactory()
+        to_delete_random_dataset = DatasetFactory()
         data.append(DatasetSearch.serialize(to_delete_random_dataset))
 
         search_class = DatasetSearch.temp_search()

udata/tests/site/test_site_api.py

@@ -5,7 +5,7 @@ from flask import url_for
 from udata.core.site.models import Site
 from udata.core.site.models import current_site
 from udata.core.site.factories import SiteFactory
-from udata.core.dataset.factories import VisibleDatasetFactory
+from udata.core.dataset.factories import DatasetFactory
 from udata.core.reuse.factories import VisibleReuseFactory
 from udata.core.user.factories import AdminFactory
 
@@ -22,7 +22,7 @@ class SiteAPITest(APITestCase):
     def test_get_home_datasets(self):
         site = SiteFactory.create(
             id=self.app.config['SITE_ID'],
-            settings__home_datasets=VisibleDatasetFactory.create_batch(3)
+            settings__home_datasets=DatasetFactory.create_batch(3)
         )
         current_site.reload()
 
@@ -46,7 +46,7 @@ class SiteAPITest(APITestCase):
         self.assertEqual(len(response.json), len(site.settings.home_reuses))
 
     def test_set_home_datasets(self):
-        ids = [d.id for d in VisibleDatasetFactory.create_batch(3)]
+        ids = [d.id for d in DatasetFactory.create_batch(3)]
 
         self.login(AdminFactory())
         response = self.put(url_for('api.home_datasets'), ids)

udata/tests/site/test_site_metrics.py

@@ -1,6 +1,6 @@
 import pytest
 
-from udata.core.dataset.factories import DatasetFactory, VisibleDatasetFactory, OrganizationFactory
+from udata.core.dataset.factories import DatasetFactory, HiddenDatasetFactory, OrganizationFactory
 from udata.core.reuse.factories import VisibleReuseFactory
 from udata.harvest.tests.factories import HarvestSourceFactory
 from udata.core.site.factories import SiteFactory
@@ -34,11 +34,11 @@ class SiteMetricTest:
             id=app.config['SITE_ID']
         )
         DatasetFactory.create_batch(2)
-        VisibleDatasetFactory.create_batch(3)
+        HiddenDatasetFactory.create_batch(3)
 
         site.count_datasets()
 
-        assert site.get_metrics()['datasets'] == 3
+        assert site.get_metrics()['datasets'] == 2
 
     def test_resources_metric(self, app):
         site = SiteFactory.create(

udata/tests/site/test_site_rdf.py

@@ -6,7 +6,7 @@ from rdflib import URIRef, Literal, Graph
 from rdflib.namespace import RDF, FOAF
 from rdflib.resource import Resource
 
-from udata.core.dataset.factories import VisibleDatasetFactory
+from udata.core.dataset.factories import DatasetFactory
 from udata.core.dataset.models import Dataset
 from udata.core.organization.factories import OrganizationFactory
 from udata.core.site.factories import SiteFactory
@@ -26,7 +26,7 @@ class CatalogTest:
         site = SiteFactory()
         home_url = url_for('api.site', _external=True)
         uri = url_for('api.site_rdf_catalog', _external=True)
-        datasets = VisibleDatasetFactory.create_batch(3)
+        datasets = DatasetFactory.create_batch(3)
         catalog = build_catalog(site, datasets)
         graph = catalog.graph
 
@@ -59,8 +59,8 @@ class CatalogTest:
         site = SiteFactory()
         org = OrganizationFactory()
         user = UserFactory()
-        datasets = VisibleDatasetFactory.create_batch(2, owner=user)
-        datasets += VisibleDatasetFactory.create_batch(2, organization=org)
+        datasets = DatasetFactory.create_batch(2, owner=user)
+        datasets += DatasetFactory.create_batch(2, organization=org)
         catalog = build_catalog(site, datasets)
         graph = catalog.graph
 
@@ -82,7 +82,7 @@ class CatalogTest:
                             page=1, page_size=page_size, _external=True)
         uri_last = url_for('api.site_rdf_catalog_format', format='json',
                            page=2, page_size=page_size, _external=True)
-        VisibleDatasetFactory.create_batch(total)
+        DatasetFactory.create_batch(total)
 
         # First page
         datasets = Dataset.objects.paginate(1, page_size)
@@ -208,7 +208,7 @@ class SiteRdfViewsTest:
         assert_redirects(response, expected_url)
 
     def test_catalog_rdf_paginate(self, client):
-        VisibleDatasetFactory.create_batch(4)
+        DatasetFactory.create_batch(4)
         url = url_for('api.site_rdf_catalog_format', format='n3', page_size=3)
         next_url = url_for('api.site_rdf_catalog_format', format='n3',
                            page=2, page_size=3, _external=True)

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/tests/test_transfer.py

@@ -7,14 +7,15 @@ from udata.features.transfer.actions import request_transfer, accept_transfer
 from udata.features.transfer.notifications import (
     transfer_request_notifications
 )
-from udata.models import Member
-from udata.core.user.metrics import update_owner_metrics
-from udata.core.organization.metrics import update_org_metrics
+from udata.models import Member, Dataset
 
 from udata.utils import faker
-from udata.core.dataset.factories import VisibleDatasetFactory
+from udata.core.dataset.factories import DatasetFactory
 from udata.core.organization.factories import OrganizationFactory
-from udata.core.user.factories import UserFactory
+from udata.core.organization.metrics import update_org_metrics  # noqa needed to register signals
+from udata.core.user.factories import UserFactory 
+from udata.core.user.metrics import update_owner_metrics  # noqa needed to register signals
+from udata.tests.helpers import assert_emit
 
 
 pytestmark = pytest.mark.usefixtures('clean_db')
@@ -32,7 +33,7 @@ class TransferStartTest:
 
     def test_request_transfer_owner_to_user(self):
         user = UserFactory()
-        dataset = VisibleDatasetFactory(owner=user)
+        dataset = DatasetFactory(owner=user)
         recipient = UserFactory()
         comment = faker.sentence()
 
@@ -43,7 +44,7 @@ class TransferStartTest:
         user = UserFactory()
         member = Member(user=user, role='admin')
         org = OrganizationFactory(members=[member])
-        dataset = VisibleDatasetFactory(owner=user, organization=org)
+        dataset = DatasetFactory(owner=user, organization=org)
         recipient = UserFactory()
         comment = faker.sentence()
 
@@ -52,7 +53,7 @@ class TransferStartTest:
 
     def test_request_transfer_user_to_organization(self):
         user = UserFactory()
-        dataset = VisibleDatasetFactory(owner=user)
+        dataset = DatasetFactory(owner=user)
         recipient = OrganizationFactory()
         comment = faker.sentence()
 
@@ -61,7 +62,7 @@ class TransferStartTest:
 
     def test_request_transfer_not_authorized_not_owner(self):
         user = UserFactory()
-        dataset = VisibleDatasetFactory(owner=UserFactory())
+        dataset = DatasetFactory(owner=UserFactory())
         recipient = UserFactory()
         comment = faker.sentence()
 
@@ -73,7 +74,7 @@ class TransferStartTest:
         user = UserFactory()
         member = Member(user=user, role='editor')
         org = OrganizationFactory(members=[member])
-        dataset = VisibleDatasetFactory(organization=org)
+        dataset = DatasetFactory(organization=org)
         recipient = UserFactory()
         comment = faker.sentence()
 
@@ -83,7 +84,7 @@ class TransferStartTest:
 
     def test_request_transfer_to_self(self):
         user = UserFactory()
-        dataset = VisibleDatasetFactory(owner=user)
+        dataset = DatasetFactory(owner=user)
         comment = faker.sentence()
 
         login_user(user)
@@ -94,7 +95,7 @@ class TransferStartTest:
         user = UserFactory()
         member = Member(user=user, role='admin')
         org = OrganizationFactory(members=[member])
-        dataset = VisibleDatasetFactory(owner=user, organization=org)
+        dataset = DatasetFactory(owner=user, organization=org)
         comment = faker.sentence()
 
         login_user(user)
@@ -107,7 +108,7 @@ class TransferAcceptTest:
     def test_recipient_user_can_accept_transfer(self):
         owner = UserFactory()
         recipient = UserFactory()
-        subject = VisibleDatasetFactory(owner=owner)
+        subject = DatasetFactory(owner=owner)
         transfer = TransferFactory(owner=owner,
                                    recipient=recipient,
                                    subject=subject)
@@ -136,7 +137,7 @@ class TransferAcceptTest:
         owner = UserFactory()
         admin = UserFactory()
         org = OrganizationFactory(members=[Member(user=admin, role='admin')])
-        subject = VisibleDatasetFactory(owner=owner)
+        subject = DatasetFactory(owner=owner)
         transfer = TransferFactory(owner=owner,
                                    recipient=org,
                                    subject=subject)
@@ -172,7 +173,7 @@ class TransferAcceptTest:
         owner = UserFactory()
         editor = UserFactory()
         org = OrganizationFactory(members=[Member(user=editor, role='editor')])
-        subject = VisibleDatasetFactory(organization=org)
+        subject = DatasetFactory(organization=org)
         transfer = TransferFactory(owner=owner,
                                    recipient=org,
                                    subject=subject)
@@ -185,7 +186,7 @@ class TransferAcceptTest:
 class TransferNotificationsTest:
     def test_pending_transfer_request_for_user(self):
         user = UserFactory()
-        datasets = VisibleDatasetFactory.create_batch(2, owner=user)
+        datasets = DatasetFactory.create_batch(2, owner=user)
         recipient = UserFactory()
         comment = faker.sentence()
         transfers = {}
@@ -206,7 +207,7 @@ class TransferNotificationsTest:
 
     def test_pending_transfer_request_for_org(self):
         user = UserFactory()
-        datasets = VisibleDatasetFactory.create_batch(2, owner=user)
+        datasets = DatasetFactory.create_batch(2, owner=user)
         recipient = UserFactory()
         member = Member(user=recipient, role='editor')
         org = OrganizationFactory(members=[member])