udata 9.1.4.dev30983__py2.py3-none-any.whl → 9.1.4.dev31058__py2.py3-none-any.whl

udata/commands/fixtures.py

@@ -200,7 +200,7 @@ def import_fixtures(source):
             for dataservice in fixture["dataservices"]:
                 dataservice = remove_unwanted_keys(dataservice, "dataservice")
                 if not dataservice["contact_point"]:
-                    DataserviceFactory(**dataservice, datasets=[dataset])
+                    DataserviceFactory(**dataservice, datasets=[dataset], organization=org)
                 else:
                     contact_point = ContactPoint.objects(
                         id=dataservice["contact_point"]["id"]
@@ -209,5 +209,8 @@ def import_fixtures(source):
                         contact_point = ContactPointFactory(**dataservice["contact_point"])
                     dataservice.pop("contact_point")
                     DataserviceFactory(
-                        **dataservice, datasets=[dataset], contact_point=contact_point
+                        **dataservice,
+                        datasets=[dataset],
+                        organization=org,
+                        contact_point=contact_point,
                     )

udata/commands/tests/test_fixtures.py

@@ -51,6 +51,21 @@ class FixturesTest:
             fixtures_fd.flush()
             assert "Fixtures saved to file " in result.output
 
+            # Delete everything, so we can make sure the objects are imported.
+            models.Organization.drop_collection()
+            models.Dataset.drop_collection()
+            models.Discussion.drop_collection()
+            models.CommunityResource.drop_collection()
+            models.User.drop_collection()
+            models.Dataservice.drop_collection()
+
+            assert models.Organization.objects(slug=org.slug).count() == 0
+            assert models.Dataset.objects.count() == 0
+            assert models.Discussion.objects.count() == 0
+            assert models.CommunityResource.objects.count() == 0
+            assert models.User.objects.count() == 0
+            assert models.Dataservice.objects.count() == 0
+
             # 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
@@ -59,6 +74,8 @@ class FixturesTest:
         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
 
     def test_import_fixtures_from_default_file(self, cli):
         """Test importing fixtures from udata.commands.fixture.DEFAULT_FIXTURE_FILE."""

{udata-9.1.4.dev30983.dist-info → udata-9.1.4.dev31058.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: udata
-Version: 9.1.4.dev30983
+Version: 9.1.4.dev31058
 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
 ## Current (in progress)
 
 - Fix many linting issues reported by ruff [#3118](https://github.com/opendatateam/udata/pull/3118)
+- Import the dataservice's organization from the fixtures [#3121](https://github.com/opendatateam/udata/pull/3121)
 
 ## 9.1.3 (2024-08-01)
 

{udata-9.1.4.dev30983.dist-info → udata-9.1.4.dev31058.dist-info}/RECORD

@@ -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=vjfa7aK4RgCUrobvjdYkDdD4ZrmgEq0uut8bdi2rPYc,8314
+udata/commands/fixtures.py,sha256=FPJhABW1UFx_vLqnklZHJFY6GtFtv8BIaqK9zDXKsKY,8423
 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=RibGEIEfeDkUIuw_hDL2s6HJ2kpvrpsREdlyY_ZRUm8,3241
+udata/commands/tests/test_fixtures.py,sha256=kFwqWA3Ha0mnCR5EE5aPz6jv3hfPheuwOMYkOvvBKyU,4120
 udata/core/__init__.py,sha256=O7C9WWCXiLWnWPnPbFRszWhOmvRQiI4gD-5qkWvPGRo,385
 udata/core/owned.py,sha256=xcIg9fNndowuLs7BEkuxAsEdf6JApomU_Gl6L-SgTJI,4515
 udata/core/activity/__init__.py,sha256=OaiFyq7HB4xL4SuMPD1N8IFNpntwx9ZayVzelciOieI,298
@@ -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.dev30983.dist-info/LICENSE,sha256=V8j_M8nAz8PvAOZQocyRDX7keai8UJ9skgmnwqETmdY,34520
-udata-9.1.4.dev30983.dist-info/METADATA,sha256=99ViYDU6RrkTQpGiSfSYEhiNLJiJuZbMRnzT7hKLD9w,128480
-udata-9.1.4.dev30983.dist-info/WHEEL,sha256=DZajD4pwLWue70CAfc7YaxT1wLUciNBvN_TTcvXpltE,110
-udata-9.1.4.dev30983.dist-info/entry_points.txt,sha256=3SKiqVy4HUqxf6iWspgMqH8d88Htk6KoLbG1BU-UddQ,451
-udata-9.1.4.dev30983.dist-info/top_level.txt,sha256=39OCg-VWFWOq4gCKnjKNu-s3OwFlZIu_dVH8Gl6ndHw,12
-udata-9.1.4.dev30983.dist-info/RECORD,,
+udata-9.1.4.dev31058.dist-info/LICENSE,sha256=V8j_M8nAz8PvAOZQocyRDX7keai8UJ9skgmnwqETmdY,34520
+udata-9.1.4.dev31058.dist-info/METADATA,sha256=6dDsUziqmw9VvrmWsC39jXs747RDKVcVlquw2FPxQDg,128595
+udata-9.1.4.dev31058.dist-info/WHEEL,sha256=DZajD4pwLWue70CAfc7YaxT1wLUciNBvN_TTcvXpltE,110
+udata-9.1.4.dev31058.dist-info/entry_points.txt,sha256=3SKiqVy4HUqxf6iWspgMqH8d88Htk6KoLbG1BU-UddQ,451
+udata-9.1.4.dev31058.dist-info/top_level.txt,sha256=39OCg-VWFWOq4gCKnjKNu-s3OwFlZIu_dVH8Gl6ndHw,12
+udata-9.1.4.dev31058.dist-info/RECORD,,