udata 7.0.5.dev28098__py2.py3-none-any.whl → 7.0.5.dev28140__py2.py3-none-any.whl

udata/core/spatial/commands.py

@@ -141,6 +141,10 @@ def load(geozones_file, levels_file, drop=False):
             total = load_zones(GeoZone, json_geozones)
     log.info('Loaded {total} zones'.format(total=total))
 
+    log.info('Clean removed geozones in datasets')
+    count = fixup_removed_geozone()
+    log.info(f'{count} geozones removed from datasets')
+
 
 @grp.command()
 def migrate():
@@ -188,3 +192,19 @@ def migrate():
     '''.format(level_summary, **counter)), level_summary])
     log.info(summary)
     log.info('Done')
+
+def fixup_removed_geozone():
+    count = 0
+    all_datasets = Dataset.objects(spatial__zones__0__exists=True).timeout(False)
+    for dataset in all_datasets:
+        zones = dataset.spatial.zones
+        new_zones = [z for z in zones if getattr(z, 'name', None) is not None]
+
+        if len(new_zones) < len(zones):
+            log.debug(f"Removing deleted zones from dataset '{dataset.title}'")
+            count += len(zones) - len(new_zones)
+            dataset.spatial.zones = new_zones
+            dataset.save()
+
+    return count
+        

udata/translations/udata.pot

@@ -6,10 +6,10 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: udata 7.0.4.dev0\n"
+"Project-Id-Version: udata 7.0.5.dev0\n"
 "Report-Msgid-Bugs-To: i18n@opendata.team\n"
-"POT-Creation-Date: 2024-02-22 16:16+0100\n"
-"PO-Revision-Date: 2024-02-22 16:16+0100\n"
+"POT-Creation-Date: 2024-03-20 12:27+0100\n"
+"PO-Revision-Date: 2024-03-20 12:27+0100\n"
 "Last-Translator: Open Data Team <i18n@opendata.team>\n"
 "Language: en\n"
 "Language-Team: Open Data Team <i18n@opendata.team>\n"
@@ -43,7 +43,7 @@ msgstr ""
 msgid "Password reset instructions"
 msgstr ""
 
-#: udata/settings.py:421
+#: udata/settings.py:430
 msgid "This dataset has been archived"
 msgstr ""
 
@@ -178,7 +178,7 @@ msgstr ""
 
 #: udata/core/contact_point/forms.py:12 udata/core/jobs/forms.py:27
 #: udata/core/organization/forms.py:47 udata/core/post/forms.py:15
-#: udata/core/topic/forms.py:16 udata/harvest/forms.py:60
+#: udata/core/topic/forms.py:17 udata/harvest/forms.py:60
 #: udata/templates/api/admin.html:10
 msgid "Name"
 msgstr ""
@@ -189,7 +189,7 @@ msgstr ""
 
 #: udata/core/contact_point/forms.py:16 udata/core/dataset/forms.py:95
 #: udata/core/dataset/forms.py:153 udata/core/reuse/forms.py:38
-#: udata/core/topic/forms.py:14 udata/harvest/forms.py:69
+#: udata/core/topic/forms.py:15 udata/harvest/forms.py:69
 msgid "Publish as"
 msgstr ""
 
@@ -231,7 +231,7 @@ msgstr ""
 
 #: udata/core/dataset/forms.py:56 udata/core/dataset/forms.py:126
 #: udata/core/jobs/forms.py:28 udata/core/organization/forms.py:51
-#: udata/core/reuse/forms.py:21 udata/core/topic/forms.py:18
+#: udata/core/reuse/forms.py:21 udata/core/topic/forms.py:19
 #: udata/harvest/forms.py:62
 msgid "Description"
 msgstr ""
@@ -281,7 +281,7 @@ msgstr ""
 msgid "Related dataset"
 msgstr ""
 
-#: udata/core/dataset/forms.py:115
+#: udata/core/dataset/forms.py:115 udata/tests/api/test_datasets_api.py:681
 msgid "Wrong contact point id or contact point ownership mismatch"
 msgstr ""
 
@@ -322,16 +322,17 @@ msgid "The period covered by the data"
 msgstr ""
 
 #: udata/core/dataset/forms.py:144 udata/core/spatial/forms.py:83
+#: udata/core/topic/forms.py:25
 msgid "Spatial coverage"
 msgstr ""
 
-#: udata/core/dataset/forms.py:145
+#: udata/core/dataset/forms.py:145 udata/core/topic/forms.py:26
 msgid "The geographical area covered by the data."
 msgstr ""
 
 #: udata/core/dataset/forms.py:146 udata/core/post/forms.py:26
 #: udata/core/reuse/forms.py:29 udata/core/site/forms.py:13
-#: udata/core/topic/forms.py:23
+#: udata/core/topic/forms.py:28
 msgid "Tags"
 msgstr ""
 
@@ -340,7 +341,7 @@ msgid "Some taxonomy keywords"
 msgstr ""
 
 #: udata/core/dataset/forms.py:148 udata/core/reuse/forms.py:32
-#: udata/core/topic/forms.py:24
+#: udata/core/topic/forms.py:29
 msgid "Private"
 msgstr ""
 
@@ -480,47 +481,47 @@ msgstr ""
 msgid "Remote file"
 msgstr ""
 
-#: udata/core/dataset/models.py:187
+#: udata/core/dataset/models.py:189
 msgid "A schema must contains a name or an URL when a version is provided."
 msgstr ""
 
-#: udata/core/dataset/models.py:213 udata/tests/api/test_datasets_api.py:745
+#: udata/core/dataset/models.py:215 udata/tests/api/test_datasets_api.py:772
 msgid "Schema name \"{schema}\" is not an allowed value. Allowed values: {values}"
 msgstr ""
 
-#: udata/core/dataset/models.py:224 udata/tests/api/test_datasets_api.py:751
+#: udata/core/dataset/models.py:230 udata/tests/api/test_datasets_api.py:778
 msgid ""
 "Version \"{version}\" is not an allowed value for the schema \"{name}\". "
 "Allowed versions: {values}"
 msgstr ""
 
-#: udata/core/dataset/models.py:475 udata/core/dataset/rdf.py:397
+#: udata/core/dataset/models.py:483 udata/core/dataset/rdf.py:435
 #: udata/tests/dataset/test_dataset_rdf.py:499
 #: udata/tests/dataset/test_dataset_rdf.py:512
 msgid "Nameless resource"
 msgstr ""
 
-#: udata/core/dataset/models.py:550
+#: udata/core/dataset/models.py:558
 msgid "Future date of update"
 msgstr ""
 
-#: udata/core/dataset/models.py:563 udata/models/datetime_fields.py:59
+#: udata/core/dataset/models.py:571 udata/models/datetime_fields.py:59
 msgid "Creation date"
 msgstr ""
 
-#: udata/core/dataset/models.py:565 udata/models/datetime_fields.py:61
+#: udata/core/dataset/models.py:573 udata/models/datetime_fields.py:61
 msgid "Last modification date"
 msgstr ""
 
-#: udata/core/dataset/models.py:574
+#: udata/core/dataset/models.py:582
 msgid "Pivotal data"
 msgstr ""
 
-#: udata/core/dataset/models.py:613
+#: udata/core/dataset/models.py:621
 msgid "dataset"
 msgstr ""
 
-#: udata/core/dataset/rdf.py:395 udata/tests/dataset/test_dataset_rdf.py:486
+#: udata/core/dataset/rdf.py:433 udata/tests/dataset/test_dataset_rdf.py:486
 msgid "{format} resource"
 msgstr ""
 
@@ -623,37 +624,49 @@ msgstr ""
 msgid "Role"
 msgstr ""
 
-#: udata/core/organization/models.py:22
+#: udata/core/organization/models.py:23
 msgid "Administrator"
 msgstr ""
 
-#: udata/core/organization/models.py:23
+#: udata/core/organization/models.py:24
 msgid "Editor"
 msgstr ""
 
-#: udata/core/organization/models.py:29 udata/features/transfer/models.py:14
+#: udata/core/organization/models.py:30 udata/features/transfer/models.py:14
 #: udata/harvest/models.py:22 udata/harvest/models.py:32 udata/harvest/models.py:70
 msgid "Pending"
 msgstr ""
 
-#: udata/core/organization/models.py:30 udata/features/transfer/models.py:15
+#: udata/core/organization/models.py:31 udata/features/transfer/models.py:15
 #: udata/harvest/models.py:71
 msgid "Accepted"
 msgstr ""
 
-#: udata/core/organization/models.py:31 udata/features/transfer/models.py:16
+#: udata/core/organization/models.py:32 udata/features/transfer/models.py:16
 #: udata/harvest/models.py:72
 msgid "Refused"
 msgstr ""
 
-#: udata/core/organization/models.py:141
+#: udata/core/organization/models.py:145
 msgid "Public Service"
 msgstr ""
 
-#: udata/core/organization/models.py:142
+#: udata/core/organization/models.py:146
 msgid "Certified"
 msgstr ""
 
+#: udata/core/organization/models.py:147
+msgid "Association"
+msgstr ""
+
+#: udata/core/organization/models.py:148
+msgid "Company"
+msgstr ""
+
+#: udata/core/organization/models.py:149
+msgid "Local authority"
+msgstr ""
+
 #: udata/core/organization/tasks.py:52
 msgid "New membership request"
 msgstr ""
@@ -677,6 +690,21 @@ msgstr ""
 msgid "Your organization \"%(name)s\" has been identified as public service"
 msgstr ""
 
+#: udata/core/organization/tasks.py:126
+#, python-format
+msgid "Your organization \"%(name)s\" has been identified as a company"
+msgstr ""
+
+#: udata/core/organization/tasks.py:146
+#, python-format
+msgid "Your organization \"%(name)s\" has been identified as an association"
+msgstr ""
+
+#: udata/core/organization/tasks.py:166
+#, python-format
+msgid "Your organization \"%(name)s\" has been identified as a local authority"
+msgstr ""
+
 #: udata/core/post/forms.py:16
 msgid "Headline"
 msgstr ""
@@ -685,11 +713,11 @@ msgstr ""
 msgid "Content"
 msgstr ""
 
-#: udata/core/post/forms.py:19 udata/core/topic/forms.py:20
+#: udata/core/post/forms.py:19 udata/core/topic/forms.py:21
 msgid "Associated datasets"
 msgstr ""
 
-#: udata/core/post/forms.py:20 udata/core/topic/forms.py:21
+#: udata/core/post/forms.py:20 udata/core/topic/forms.py:22
 msgid "Associated reuses"
 msgstr ""
 
@@ -949,7 +977,7 @@ msgstr ""
 msgid "French arrondissement"
 msgstr ""
 
-#: udata/core/topic/forms.py:25
+#: udata/core/topic/forms.py:30
 msgid "Featured"
 msgstr ""
 
@@ -1025,54 +1053,54 @@ msgstr ""
 msgid "Not a valid UUID"
 msgstr ""
 
-#: udata/forms/fields.py:200 udata/tests/api/test_datasets_api.py:739
+#: udata/forms/fields.py:210 udata/tests/api/test_datasets_api.py:766
 msgid "Invalid URL"
 msgstr ""
 
-#: udata/forms/fields.py:404
+#: udata/forms/fields.py:414
 #, python-format
 msgid "Tag \"%(tag)s\" must be between %(min)d and %(max)d characters long."
 msgstr ""
 
-#: udata/forms/fields.py:444 udata/forms/fields.py:496
+#: udata/forms/fields.py:454 udata/forms/fields.py:506
 msgid "{0} does not exists"
 msgstr ""
 
-#: udata/forms/fields.py:470 udata/tests/forms/test_model_field.py:318
+#: udata/forms/fields.py:480 udata/tests/forms/test_model_field.py:318
 #: udata/tests/forms/test_model_field.py:332
 msgid "Missing \"id\" field"
 msgstr ""
 
-#: udata/forms/fields.py:477
+#: udata/forms/fields.py:487
 msgid "Expect a \"{0}\" class but \"{1}\" was found"
 msgstr ""
 
-#: udata/forms/fields.py:483 udata/tests/forms/test_model_field.py:43
+#: udata/forms/fields.py:493 udata/tests/forms/test_model_field.py:43
 #: udata/tests/forms/test_model_field.py:56
 msgid "Expect both class and identifier"
 msgstr ""
 
-#: udata/forms/fields.py:529
+#: udata/forms/fields.py:539
 msgid "Model for {0} not found"
 msgstr ""
 
-#: udata/forms/fields.py:564
+#: udata/forms/fields.py:574
 msgid "Unknown identifiers: {identifiers}"
 msgstr ""
 
-#: udata/forms/fields.py:699
+#: udata/forms/fields.py:709
 msgid "Unable to parse date range"
 msgstr ""
 
-#: udata/forms/fields.py:726 udata/forms/fields.py:749
+#: udata/forms/fields.py:736 udata/forms/fields.py:759
 msgid "You must be authenticated"
 msgstr ""
 
-#: udata/forms/fields.py:729
+#: udata/forms/fields.py:739
 msgid "You can only set yourself as owner"
 msgstr ""
 
-#: udata/forms/fields.py:752
+#: udata/forms/fields.py:762
 msgid "Permission denied for this organization"
 msgstr ""
 
@@ -1221,16 +1249,34 @@ msgstr ""
 msgid "Your account has now been deleted"
 msgstr ""
 
-#: udata/templates/mail/badge_added_certified.html:6
+#: udata/templates/mail/badge_added_association.html:6
 #, python-format
-msgid "%(user)s has certified your organization \"%(name)s\""
+msgid "%(user)s has identified your organization \"%(name)s\" as an association"
 msgstr ""
 
+#: udata/templates/mail/badge_added_association.html:27
 #: udata/templates/mail/badge_added_certified.html:27
+#: udata/templates/mail/badge_added_company.html:27
+#: udata/templates/mail/badge_added_local_authority.html:27
 #: udata/templates/mail/badge_added_public_service.html:27
 msgid "See the badge"
 msgstr ""
 
+#: udata/templates/mail/badge_added_certified.html:6
+#, python-format
+msgid "%(user)s has certified your organization \"%(name)s\""
+msgstr ""
+
+#: udata/templates/mail/badge_added_company.html:6
+#, python-format
+msgid "%(user)s has identified your organization \"%(name)s\" as a company"
+msgstr ""
+
+#: udata/templates/mail/badge_added_local_authority.html:6
+#, python-format
+msgid "%(user)s has identified your organization \"%(name)s\" as a local authority"
+msgstr ""
+
 #: udata/templates/mail/badge_added_public_service.html:6
 #, python-format
 msgid "%(user)s has identified your organization \"%(name)s\" as public service"

{udata-7.0.5.dev28098.dist-info → udata-7.0.5.dev28140.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: udata
-Version: 7.0.5.dev28098
+Version: 7.0.5.dev28140
 Summary: Open data portal
 Home-page: https://github.com/opendatateam/udata
 Author: Opendata Team
@@ -145,7 +145,7 @@ It is collectively taken care of by members of the
 - Allow harvesting of big catalog (bigger than 16MB) [#2980](https://github.com/opendatateam/udata/pull/2980) [2985](https://github.com/opendatateam/udata/pull/2985)
 - Add downloads' count to organizations CSV [#2973](https://github.com/opendatateam/udata/pull/2973)
 - Add 3 new badges to the organization model : `company`, `association` and `local authority` [#2984](https://github.com/opendatateam/udata/pull/2984)
-- Prevent geozones listed ad `deleted` to be loaded [#2983](https://github.com/opendatateam/udata/pull/2983)
+- Prevent geozones listed ad `deleted` to be loaded [#2983](https://github.com/opendatateam/udata/pull/2983) [#2993](https://github.com/opendatateam/udata/pull/2993)
 - Topic: add spatial field [#2988](https://github.com/opendatateam/udata/pull/2988)
 - Topic: add last_modified field [#2987](https://github.com/opendatateam/udata/pull/2987)
 - Add stacktraces to CSV errors [#2990](https://github.com/opendatateam/udata/pull/2990)

{udata-7.0.5.dev28098.dist-info → udata-7.0.5.dev28140.dist-info}/RECORD

@@ -178,7 +178,7 @@ udata/core/spam/tests/test_spam.py,sha256=IuSRVoVCLBjJuoCXnPZx8XjtRyt5q2LrSBtIp8
 udata/core/spatial/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 udata/core/spatial/api.py,sha256=tlApg3JpqbO6CwEwp1LzZ1hyPQreVEgF3H5yrcAPE74,5848
 udata/core/spatial/api_fields.py,sha256=ymGK3FyE2KNlASOU5GiPgZGeBjjOqnOyCOcRCbuw3D8,2629
-udata/core/spatial/commands.py,sha256=_PJ6ov8Yxz2942lwXraUyu5yaQ4Hn-QlrzrDik5BpcE,6225
+udata/core/spatial/commands.py,sha256=qdJ4mUg3NUTrGx6L5MKPh1usvxmeCn8xMCZNGKyjWYE,6914
 udata/core/spatial/factories.py,sha256=GxUU8nRtSoGPw2m3Q-al0PYps2oSnlqC-bM7Eeu14rk,3288
 udata/core/spatial/forms.py,sha256=tXlYKge5Rc8L8pOjfUo1-9howgVJZDAh7q8xTIlbBww,3218
 udata/core/spatial/geoids.py,sha256=UqCto4dtQYPXOxyG7sx_0npzM6yvId40ngw3eAlmioQ,1159
@@ -643,7 +643,7 @@ udata/tests/workers/test_jobs_commands.py,sha256=0Ru2N-uxgWAgYoADxFjLgyburD5OdBL
 udata/tests/workers/test_tasks_routing.py,sha256=4cBChvphj23rbLIu4dCTYYiM5OfTEUZKlXuNnyBCnWA,2260
 udata/tests/workers/test_workers_api.py,sha256=8MtfAjrPL1TUfEBfVjrYfm_4rft4DfBlcamiVvMCJAo,8863
 udata/tests/workers/test_workers_helpers.py,sha256=EVTHL-KhwbwD8snfN8HdK5o-wMXYkl2oXgtl990fQxE,647
-udata/translations/udata.pot,sha256=a647v6Z3SgFqKC0JF4Ek-AiPJP8dc5mTIwoVS-JbHw4,34126
+udata/translations/udata.pot,sha256=bwuTDKVNnE_SzI8q2tXjP_vKjaibJdPj3k3KG063t6Q,35535
 udata/translations/ar/LC_MESSAGES/udata.mo,sha256=1UE8wTBVizkyYnF0t3LbLckTZWjw_RER3ngiAaWER7Y,12665
 udata/translations/ar/LC_MESSAGES/udata.po,sha256=7J2KVGx7S8a9BEWHt-oYm3UIa5zU6vomh9aMgwTx868,39544
 udata/translations/de/LC_MESSAGES/udata.mo,sha256=FB0H3tMWJ6TUBz92NIlkSk2LqjZtMzA7CxozjePCXQc,16061
@@ -658,9 +658,9 @@ udata/translations/pt/LC_MESSAGES/udata.mo,sha256=dXTr2zzGPgclSMzAJo4qhOEVHYWYP7
 udata/translations/pt/LC_MESSAGES/udata.po,sha256=G-MNwE4Gih-4w-xNAjp7PAvQOeW1uyM-27Z6O08_SCc,42104
 udata/translations/sr/LC_MESSAGES/udata.mo,sha256=5bvKeJp9nqk76tZsgbGC2qnbpJws5lODdMcezr6LKbQ,28553
 udata/translations/sr/LC_MESSAGES/udata.po,sha256=d_uBu93oIsmeewv8QzrB2Z8tmkUXn8juwT5OiySALog,48684
-udata-7.0.5.dev28098.dist-info/LICENSE,sha256=V8j_M8nAz8PvAOZQocyRDX7keai8UJ9skgmnwqETmdY,34520
-udata-7.0.5.dev28098.dist-info/METADATA,sha256=eAH3TpJbYw8a-Ljj_hUTYYMCWcmZNw_zHc3BSwm2hjs,119210
-udata-7.0.5.dev28098.dist-info/WHEEL,sha256=-G_t0oGuE7UD0DrSpVZnq1hHMBV9DD2XkS5v7XpmTnk,110
-udata-7.0.5.dev28098.dist-info/entry_points.txt,sha256=ZqIUHhOth0MMQvMIeuhODbUCDwjR-Hvo7PaKrMwTKuQ,384
-udata-7.0.5.dev28098.dist-info/top_level.txt,sha256=39OCg-VWFWOq4gCKnjKNu-s3OwFlZIu_dVH8Gl6ndHw,12
-udata-7.0.5.dev28098.dist-info/RECORD,,
+udata-7.0.5.dev28140.dist-info/LICENSE,sha256=V8j_M8nAz8PvAOZQocyRDX7keai8UJ9skgmnwqETmdY,34520
+udata-7.0.5.dev28140.dist-info/METADATA,sha256=oa7WvgGwwX6nYfU4tQr2zLSI5lcrR6IocdoeiX12Zjg,119267
+udata-7.0.5.dev28140.dist-info/WHEEL,sha256=-G_t0oGuE7UD0DrSpVZnq1hHMBV9DD2XkS5v7XpmTnk,110
+udata-7.0.5.dev28140.dist-info/entry_points.txt,sha256=ZqIUHhOth0MMQvMIeuhODbUCDwjR-Hvo7PaKrMwTKuQ,384
+udata-7.0.5.dev28140.dist-info/top_level.txt,sha256=39OCg-VWFWOq4gCKnjKNu-s3OwFlZIu_dVH8Gl6ndHw,12
+udata-7.0.5.dev28140.dist-info/RECORD,,