udata 9.1.4.dev31168__py2.py3-none-any.whl → 9.1.4.dev31191__py2.py3-none-any.whl

udata/commands/fixtures.py

@@ -26,6 +26,7 @@ from udata.core.organization.factories import OrganizationFactory
 from udata.core.organization.models import Member, Organization
 from udata.core.reuse.factories import ReuseFactory
 from udata.core.user.factories import UserFactory
+from udata.core.user.models import User
 
 log = logging.getLogger(__name__)
 
@@ -55,22 +56,21 @@ UNWANTED_KEYS: dict[str, list[str]] = {
         "quality",
     ],
     "resource": ["latest", "preview_url", "last_modified"],
-    "organization": ["members", "page", "uri", "logo_thumbnail"],
-    "reuse": ["datasets", "image_thumbnail", "page", "uri", "organization", "owner"],
+    "organization": ["class", "page", "uri", "logo_thumbnail"],
+    "reuse": ["datasets", "image_thumbnail", "page", "uri", "owner"],
     "community": [
         "dataset",
-        "organization",
         "owner",
         "latest",
         "last_modified",
         "preview_url",
     ],
-    "discussion": ["subject", "user", "url", "class"],
-    "message": ["posted_by"],
+    "discussion": ["subject", "url", "class"],
+    "user": ["uri", "page", "class", "avatar_thumbnail", "email"],
+    "posted_by": ["uri", "page", "class", "avatar_thumbnail", "email"],
     "dataservice": [
         "datasets",
         "license",
-        "organization",
         "owner",
         "self_api_url",
         "self_web_url",
@@ -80,6 +80,8 @@ UNWANTED_KEYS: dict[str, list[str]] = {
 
 def remove_unwanted_keys(obj: dict, filter_type: str) -> dict:
     """Remove UNWANTED_KEYS from a dict."""
+    if filter_type not in UNWANTED_KEYS:
+        return obj
     for unwanted_key in UNWANTED_KEYS[filter_type]:
         if unwanted_key in obj:
             del obj[unwanted_key]
@@ -150,6 +152,29 @@ def generate_fixtures_file(data_source: str, results_filename: str) -> None:
         print(f"Fixtures saved to file {results_filename}")
 
 
+def get_or_create(data, key, model, factory):
+    """Try getting the object. If it doesn't exist yet, create it with the provided factory."""
+    if key not in data or data[key] is None:
+        return
+    data[key] = remove_unwanted_keys(data[key], key)
+    obj = model.objects(id=data[key]["id"]).first()
+    if not obj:
+        obj = factory(**data[key])
+    return obj
+
+
+def get_or_create_organization(data):
+    return get_or_create(data, "organization", Organization, OrganizationFactory)
+
+
+def get_or_create_owner(data):
+    return get_or_create(data, "owner", User, UserFactory)
+
+
+def get_or_create_user(data):
+    return get_or_create(data, "user", User, UserFactory)
+
+
 @cli.command()
 @click.argument("source", default=DEFAULT_FIXTURE_FILE)
 def import_fixtures(source):
@@ -165,52 +190,45 @@ def import_fixtures(source):
             user = UserFactory()
             dataset = fixture["dataset"]
             dataset = remove_unwanted_keys(dataset, "dataset")
-            if not fixture["organization"]:
-                dataset = DatasetFactory(**dataset, owner=user)
-            else:
-                org = Organization.objects(id=fixture["organization"]["id"]).first()
-                if not org:
-                    organization = fixture["organization"]
-                    organization = remove_unwanted_keys(organization, "organization")
-                    org = OrganizationFactory(**organization, members=[Member(user=user)])
+            if fixture["organization"]:
+                organization = fixture["organization"]
+                organization["members"] = [
+                    Member(user=get_or_create_user(member), role=member["role"])
+                    for member in organization["members"]
+                ]
+                fixture["organization"] = organization
+                org = get_or_create_organization(fixture)
                 dataset = DatasetFactory(**dataset, organization=org)
+            else:
+                dataset = DatasetFactory(**dataset, owner=user)
             for resource in fixture["resources"]:
                 resource = remove_unwanted_keys(resource, "resource")
                 res = ResourceFactory(**resource)
                 dataset.add_resource(res)
             for reuse in fixture["reuses"]:
                 reuse = remove_unwanted_keys(reuse, "reuse")
-                ReuseFactory(**reuse, datasets=[dataset], owner=user)
+                reuse["owner"] = get_or_create_owner(reuse)
+                reuse["organization"] = get_or_create_organization(reuse)
+                ReuseFactory(**reuse, datasets=[dataset])
             for community in fixture["community_resources"]:
                 community = remove_unwanted_keys(community, "community")
-                CommunityResourceFactory(**community, dataset=dataset, owner=user)
+                community["owner"] = get_or_create_owner(community)
+                community["organization"] = get_or_create_organization(community)
+                CommunityResourceFactory(**community, dataset=dataset)
             for discussion in fixture["discussions"]:
                 discussion = remove_unwanted_keys(discussion, "discussion")
-                messages = discussion.pop("discussion")
-                for message in messages:
-                    message = remove_unwanted_keys(message, "message")
-                DiscussionFactory(
-                    **discussion,
-                    subject=dataset,
-                    user=user,
-                    discussion=[
-                        MessageDiscussionFactory(**message, posted_by=user) for message in messages
-                    ],
-                )
+                discussion["closed_by"] = get_or_create(discussion, "closed_by", User, UserFactory)
+                for message in discussion["discussion"]:
+                    message["posted_by"] = get_or_create(message, "posted_by", User, UserFactory)
+                discussion["discussion"] = [
+                    MessageDiscussionFactory(**message) for message in discussion["discussion"]
+                ]
+                discussion["user"] = get_or_create_user(discussion)
+                DiscussionFactory(**discussion, subject=dataset)
             for dataservice in fixture["dataservices"]:
                 dataservice = remove_unwanted_keys(dataservice, "dataservice")
-                if not dataservice["contact_point"]:
-                    DataserviceFactory(**dataservice, datasets=[dataset], organization=org)
-                else:
-                    contact_point = ContactPoint.objects(
-                        id=dataservice["contact_point"]["id"]
-                    ).first()
-                    if not contact_point:
-                        contact_point = ContactPointFactory(**dataservice["contact_point"])
-                    dataservice.pop("contact_point")
-                    DataserviceFactory(
-                        **dataservice,
-                        datasets=[dataset],
-                        organization=org,
-                        contact_point=contact_point,
-                    )
+                dataservice["contact_point"] = get_or_create(
+                    dataservice, "contact_point", ContactPoint, ContactPointFactory
+                )
+                dataservice["organization"] = get_or_create_organization(dataservice)
+                DataserviceFactory(**dataservice, datasets=[dataset])

udata/commands/tests/test_fixtures.py

@@ -27,21 +27,28 @@ class FixturesTest:
         """Test generating fixtures from the current env, then importing them back."""
         assert models.Dataset.objects.count() == 0  # Start with a clean slate.
         user = UserFactory()
-        org = OrganizationFactory(**{}, members=[Member(user=user)])
+        admin = UserFactory()
+        org = OrganizationFactory(
+            members=[Member(user=user, role="editor"), Member(user=admin, role="admin")]
+        )
         # Set the same slug we're 'exporting' from the FIXTURE_DATASET_SLUG config, see the
         # @pytest.mark.options above.
-        dataset = DatasetFactory(**{}, slug="some-test-dataset-slug", organization=org)
-        res = ResourceFactory(**{})
+        dataset = DatasetFactory(slug="some-test-dataset-slug", organization=org)
+        res = ResourceFactory()
         dataset.add_resource(res)
-        ReuseFactory(**{}, datasets=[dataset], owner=user)
-        CommunityResourceFactory(**{}, dataset=dataset, owner=user)
+        ReuseFactory(datasets=[dataset], owner=user)
+        CommunityResourceFactory(dataset=dataset, owner=user)
         DiscussionFactory(
             **{},
             subject=dataset,
             user=user,
-            discussion=[MessageDiscussionFactory(**{}, posted_by=user)],
+            discussion=[
+                MessageDiscussionFactory(posted_by=user),
+                MessageDiscussionFactory(posted_by=admin),
+            ],
+            closed_by=admin,
         )
-        DataserviceFactory(**{}, datasets=[dataset])
+        DataserviceFactory(datasets=[dataset], organization=org)
 
         with NamedTemporaryFile(mode="w+", delete=True) as fixtures_fd:
             # Get the fixtures from the local instance.
@@ -69,13 +76,25 @@ class FixturesTest:
             # Then load them in the database to make sure they're correct.
             result = cli("import-fixtures", fixtures_fd.name)
         assert models.Organization.objects(slug=org.slug).count() > 0
+        result_org = models.Organization.objects.get(slug=org.slug)
+        assert result_org.members[0].user.id == user.id
+        assert result_org.members[0].role == "editor"
+        assert result_org.members[1].user.id == admin.id
+        assert result_org.members[1].role == "admin"
         assert models.Dataset.objects.count() > 0
         assert models.Discussion.objects.count() > 0
+        result_discussion = models.Discussion.objects.first()
+        assert result_discussion.user.id == user.id
+        assert result_discussion.closed_by.id == admin.id
+        assert len(result_discussion.discussion) == 2
+        assert result_discussion.discussion[0].posted_by.id == user.id
+        assert result_discussion.discussion[1].posted_by.id == admin.id
         assert models.CommunityResource.objects.count() > 0
         assert models.User.objects.count() > 0
         assert models.Dataservice.objects.count() > 0
         # Make sure we also import the dataservice organization
-        assert models.Dataservice.objects(organization__exists=True).count() > 0
+        result_dataservice = models.Dataservice.objects.first()
+        assert result_dataservice.organization == org
 
     def test_import_fixtures_from_default_file(self, cli):
         """Test importing fixtures from udata.commands.fixture.DEFAULT_FIXTURE_FILE."""

udata/tests/api/test_tags_api.py

@@ -13,7 +13,7 @@ class TagsAPITest:
     def test_suggest_tags_api(self, api):
         """It should suggest tags"""
         for i in range(3):
-            tags = [faker.word(), faker.word(), "test", "test-{0}".format(i)]
+            tags = [faker.tag(), faker.tag(), "test", "test-{0}".format(i)]
             ReuseFactory(tags=tags, visible=True)
             DatasetFactory(tags=tags, visible=True)
 
@@ -33,7 +33,7 @@ class TagsAPITest:
     def test_suggest_tags_api_with_unicode(self, api):
         """It should suggest tags"""
         for i in range(3):
-            tags = [faker.word(), faker.word(), "testé", "testé-{0}".format(i)]
+            tags = [faker.tag(), faker.tag(), "testé", "testé-{0}".format(i)]
             ReuseFactory(tags=tags, visible=True)
             DatasetFactory(tags=tags, visible=True)
 

udata/utils.py

@@ -18,6 +18,8 @@ from faker.providers import BaseProvider
 from faker.providers.lorem.la import Provider as LoremProvider
 from flask import abort
 
+from udata import tags
+
 
 def get_by(lst, field, value):
     """Find an object in a list given a field value"""
@@ -277,6 +279,16 @@ PROVIDERS.remove("faker.providers.lorem")
 faker = Faker("fr_FR")  # Use a unicode/utf-8 based locale
 
 
+def tag() -> str:
+    fake_tag: str = faker.word()
+    while len(fake_tag) < tags.MIN_TAG_LENGTH:
+        fake_tag = faker.word()
+    return fake_tag
+
+
+faker.tag = tag
+
+
 def faker_provider(provider):
     faker.add_provider(provider)
     factory.Faker.add_provider(provider)

{udata-9.1.4.dev31168.dist-info → udata-9.1.4.dev31191.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: udata
-Version: 9.1.4.dev31168
+Version: 9.1.4.dev31191
 Summary: Open data portal
 Home-page: https://github.com/opendatateam/udata
 Author: Opendata Team
@@ -146,6 +146,7 @@ It is collectively taken care of by members of the
 - Fix circular import error [#3128](https://github.com/opendatateam/udata/pull/3128)
 - Add an option to specify the port when using `inv serve` [#3123](https://github.com/opendatateam/udata/pull/3123)
 - Add a new `related_to` filter parameter to the activities API endpoint [#3127](https://github.com/opendatateam/udata/pull/3127)
+- Properly import the `Discussion.closed_by` from the fixtures [#3125](https://github.com/opendatateam/udata/pull/3125)
 
 ## 9.1.3 (2024-08-01)
 

{udata-9.1.4.dev31168.dist-info → udata-9.1.4.dev31191.dist-info}/RECORD

@@ -20,7 +20,7 @@ udata/tasks.py,sha256=hLdmHV7ozeq803BRjU6X3DT3oVsZrV1beQILpbjsfQI,4978
 udata/terms.md,sha256=nFx978tUQ3vTEv6POykXaZvcQ5e_gcvmO4ZgcfbSWXo,187
 udata/tracking.py,sha256=WOcqA1RlHN8EPFuEc2kNau54mec4-pvi-wUFrMXevzg,345
 udata/uris.py,sha256=Nxy-kvj46FhRDNW7sebFI-X7nFJEP5ViwgGQvAHmBW0,3561
-udata/utils.py,sha256=AbPqkgtdjuQScOCoTcZl3eDiEmU0p-agr1lqvEJwaS0,8661
+udata/utils.py,sha256=a-iwHhbCgghIu0vi-D4-s8iHQSaXK6QwxGNGuksCm9w,8855
 udata/worker.py,sha256=K-Wafye5-uXP4kQlffRKws2J9YbJ6m6n2QjcVsY8Nsg,118
 udata/wsgi.py,sha256=MY8en9K9eDluvJYUxTdzqSDoYaDgCVZ69ZcUvxAvgqA,77
 udata/admin/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -42,7 +42,7 @@ udata/commands/__init__.py,sha256=Won_rW_hIU9TA3o4oNe6kI46l1fnDBM_oW0Hc1XS9F8,77
 udata/commands/cache.py,sha256=bLdrf_fCWFYX9ULlL2ADsZRwijkI4pArsJxfx24OivM,341
 udata/commands/db.py,sha256=x5ui77hoT-JcECneBhhXZtpH4g65gaj7SyeM0bnORhA,14694
 udata/commands/dcat.py,sha256=L1J1AxQCmMDmwdxzugQNfy4VZQYf1rI1wPhSdUaMB5E,3419
-udata/commands/fixtures.py,sha256=FPJhABW1UFx_vLqnklZHJFY6GtFtv8BIaqK9zDXKsKY,8423
+udata/commands/fixtures.py,sha256=37vzviUStMiPwuuctpjVkB2wbJl_xvCwABDQHqTwg8I,9157
 udata/commands/images.py,sha256=0rVojLik5DYgJ6W4uNEfMP2g2QUU2V761tj3z6lo8no,2050
 udata/commands/info.py,sha256=A5WMo3_N_rlt3cySVJrZqKWrbIowX97ZLKMIFQE5178,1545
 udata/commands/init.py,sha256=8CpH8MklzPkpxczs43lFM5ZNrHCJRbUtzHapgYNHs7M,1520
@@ -52,7 +52,7 @@ udata/commands/static.py,sha256=OUYPAR1giaPk52DK-v-nQYUSx-YQ4cF7YXLt1t5wtBU,2199
 udata/commands/test.py,sha256=0snHTDolowQK-DmAKnhF_mBuDOBMApAbEc35GEiwH0M,893
 udata/commands/worker.py,sha256=bjXQGCwkbZxkcxLMPA2Lr0nkNjXLpGNDMkkQXjwBLPI,3976
 udata/commands/tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-udata/commands/tests/test_fixtures.py,sha256=kFwqWA3Ha0mnCR5EE5aPz6jv3hfPheuwOMYkOvvBKyU,4120
+udata/commands/tests/test_fixtures.py,sha256=ZDps7ao6r86SV1Gv0Aftq4Ly1sdDnrUQGMNUz6LMTIo,5012
 udata/core/__init__.py,sha256=O7C9WWCXiLWnWPnPbFRszWhOmvRQiI4gD-5qkWvPGRo,385
 udata/core/owned.py,sha256=UEg5tp-ZunzC2avCdholpqibDIUZgFBsXS7BEcdnBy0,4567
 udata/core/activity/__init__.py,sha256=OaiFyq7HB4xL4SuMPD1N8IFNpntwx9ZayVzelciOieI,298
@@ -610,7 +610,7 @@ udata/tests/api/test_organizations_api.py,sha256=YcO2fWELdmPD4Oc8h5MTrLI-Gfbx16R
 udata/tests/api/test_reports_api.py,sha256=fCSz9NwMXBs6cxdXBVVI6y564AtovmZYw3xkgxQ9KE8,6217
 udata/tests/api/test_reuses_api.py,sha256=yDF7fssG4km6MfzBbBTrPaQ_Ay3E8W9OglSG_RHxlYk,18710
 udata/tests/api/test_swagger.py,sha256=eE6La9qdTYTIUFevRVPJgtj17Jq_8uOlsDwzCNR0LL8,760
-udata/tests/api/test_tags_api.py,sha256=wQR67DeRQvLn8fvgwUMpnT135xamo2fNSSqhEMm0v-g,2429
+udata/tests/api/test_tags_api.py,sha256=36zEBgthVEn6pctJ0kDgPmEaUr-iqRAHeZRcRG2LEXQ,2425
 udata/tests/api/test_topics_api.py,sha256=s4pqHTWl3ly8HQd2YmVclHFrjrf0212u5iDSOTSBbZg,9375
 udata/tests/api/test_transfer_api.py,sha256=5cp4-O-nxkxDibsVbsG2lZ2qAsTBX2BpoMPTm8bvT8k,3085
 udata/tests/api/test_user_api.py,sha256=Xtme7l_15rHjTqSzjxNLv5Q8I_T5_eY2rIgzuNVJlRk,14357
@@ -697,9 +697,9 @@ udata/translations/pt/LC_MESSAGES/udata.mo,sha256=WpPzAqVd2Onv_kz45ULUySKPLrpjcc
 udata/translations/pt/LC_MESSAGES/udata.po,sha256=18Op9RUITewoDRewlOdYzzq6gjsf1lsvepACV1d7zxs,44976
 udata/translations/sr/LC_MESSAGES/udata.mo,sha256=NIYRNhVoETZUvIvWm3cCW7DtMBAnS2vXzZjMF5ZzD_c,28500
 udata/translations/sr/LC_MESSAGES/udata.po,sha256=rQB-4V4WJ7bURj6g2j653vItr5TMHadcLQxec7_fDmg,51545
-udata-9.1.4.dev31168.dist-info/LICENSE,sha256=V8j_M8nAz8PvAOZQocyRDX7keai8UJ9skgmnwqETmdY,34520
-udata-9.1.4.dev31168.dist-info/METADATA,sha256=YZ2NedcM5hDUSpvuREmEnsk_Fr0O4r5Ftx1CXTD_eI0,129017
-udata-9.1.4.dev31168.dist-info/WHEEL,sha256=DZajD4pwLWue70CAfc7YaxT1wLUciNBvN_TTcvXpltE,110
-udata-9.1.4.dev31168.dist-info/entry_points.txt,sha256=3SKiqVy4HUqxf6iWspgMqH8d88Htk6KoLbG1BU-UddQ,451
-udata-9.1.4.dev31168.dist-info/top_level.txt,sha256=39OCg-VWFWOq4gCKnjKNu-s3OwFlZIu_dVH8Gl6ndHw,12
-udata-9.1.4.dev31168.dist-info/RECORD,,
+udata-9.1.4.dev31191.dist-info/LICENSE,sha256=V8j_M8nAz8PvAOZQocyRDX7keai8UJ9skgmnwqETmdY,34520
+udata-9.1.4.dev31191.dist-info/METADATA,sha256=hdGyZDlTnaExRiHPp-q6h0P-JeYSyTN8AJIHpysI_tg,129137
+udata-9.1.4.dev31191.dist-info/WHEEL,sha256=DZajD4pwLWue70CAfc7YaxT1wLUciNBvN_TTcvXpltE,110
+udata-9.1.4.dev31191.dist-info/entry_points.txt,sha256=3SKiqVy4HUqxf6iWspgMqH8d88Htk6KoLbG1BU-UddQ,451
+udata-9.1.4.dev31191.dist-info/top_level.txt,sha256=39OCg-VWFWOq4gCKnjKNu-s3OwFlZIu_dVH8Gl6ndHw,12
+udata-9.1.4.dev31191.dist-info/RECORD,,