💫 feat: change infrastructure condition field to ManyToMany field (#3970

)
GeotrekCE · Jul 18, 2024 · 7a7e7f5 · 7a7e7f5
1 parent 50f1ef5
commit 7a7e7f5
Show file tree

Hide file tree

Showing 26 changed files with 138 additions and 53 deletions.
diff --git a/docs/changelog.rst b/docs/changelog.rst
@@ -5,6 +5,9 @@ CHANGELOG
 2.108.0+dev     (XXXX-XX-XX)
 ----------------------------
 
+**Improvements**
+
+- Change infrastructure condition field to ManyToMany field (#3970)
 
 2.108.0     (2024-07-12)
 ------------------------
@@ -78,6 +81,7 @@ https://geotrek.readthedocs.io/en/latest/install/upgrade.html#postgresql
 - Bump mapentity to 8.9.0
 
 
+
 2.106.0 (2024-05-15)
 --------------------
 
@@ -129,7 +133,6 @@ https://geotrek.readthedocs.io/en/latest/install/upgrade.html#postgresql
 - Add structures to Aggregator (#3569)
 - Allow to filter flatpages by portal on admin list page
 
-
 2.104.2 (2024-04-04)
 --------------------
 

diff --git a/geotrek/api/tests/test_v2.py b/geotrek/api/tests/test_v2.py
@@ -214,7 +214,7 @@
 ])
 
 INFRASTRUCTURE_DETAIL_JSON_STRUCTURE = sorted([
-    'id', 'accessibility', 'attachments', 'condition', 'description', 'eid', 'geometry',
+    'id', 'accessibility', 'attachments', 'conditions', 'description', 'eid', 'geometry',
     'implantation_year', 'maintenance_difficulty', 'name', 'provider', 'structure',
     'type', 'usage_difficulty', 'uuid'
 ])
@@ -453,9 +453,9 @@ def setUpTestData(cls):
             type=cls.infrastructure_type,
             usage_difficulty=cls.infrastructure_usagedifficulty,
             maintenance_difficulty=cls.infrastructure_maintenancedifficulty,
-            condition=cls.infrastructure_condition,
             published=True
         )
+        cls.infrastructure.conditions.add(cls.infrastructure_condition)
         cls.bladetype = signage_factory.BladeTypeFactory(
         )
         cls.color = signage_factory.BladeColorFactory()

diff --git a/geotrek/api/v2/serializers.py b/geotrek/api/v2/serializers.py
@@ -1558,7 +1558,7 @@ def get_accessibility(self, obj):
 
         class Meta:
             model = infrastructure_models.Infrastructure
-            fields = ('id', 'accessibility', 'attachments', 'condition', 'description', 'eid', 'geometry', 'name',
+            fields = ('id', 'accessibility', 'attachments', 'conditions', 'description', 'eid', 'geometry', 'name',
                       'implantation_year', 'maintenance_difficulty', 'provider', 'structure', 'type', 'usage_difficulty', 'uuid')
 
     class InfrastructureConditionSerializer(DynamicFieldsMixin, serializers.ModelSerializer):

diff --git a/geotrek/api/v2/views/infrastructure.py b/geotrek/api/v2/views/infrastructure.py
@@ -19,8 +19,8 @@ class InfrastructureViewSet(api_viewsets.GeotrekGeometricViewset):
         .annotate(geom3d_transformed=Transform(F('geom_3d'), settings.API_SRID)) \
         .prefetch_related('topo_object__aggregations',
                           Prefetch('attachments',
-                                   queryset=Attachment.objects.select_related('license', 'filetype', 'filetype__structure'))) \
-        .order_by('pk')
+                                   queryset=Attachment.objects.select_related('license', 'filetype', 'filetype__structure')),
+                          'conditions').order_by('pk')
 
 
 class InfrastructureTypeViewSet(api_viewsets.GeotrekViewSet):

diff --git a/geotrek/infrastructure/filters.py b/geotrek/infrastructure/filters.py
@@ -31,7 +31,7 @@ class InfrastructureFilterSet(AltimetryAllGeometriesFilterSet, ValidTopologyFilt
     class Meta(StructureRelatedFilterSet.Meta):
         model = Infrastructure
         fields = StructureRelatedFilterSet.Meta.fields + [
-            'category', 'type', 'condition', 'implantation_year',
+            'category', 'type', 'conditions', 'implantation_year',
             'intervention_year', 'published', 'provider', 'access'
         ]
 

diff --git a/geotrek/infrastructure/forms.py b/geotrek/infrastructure/forms.py
@@ -43,7 +43,7 @@ class InfrastructureForm(BaseInfrastructureForm):
             'description',
             'accessibility',
             'type',
-            'condition',
+            'conditions',
             'access',
             'implantation_year',
             'usage_difficulty',
@@ -54,4 +54,4 @@ class InfrastructureForm(BaseInfrastructureForm):
 
     class Meta(BaseInfrastructureForm.Meta):
         model = Infrastructure
-        fields = BaseInfrastructureForm.Meta.fields + ['accessibility', 'maintenance_difficulty', 'usage_difficulty', 'condition']
+        fields = BaseInfrastructureForm.Meta.fields + ['accessibility', 'maintenance_difficulty', 'usage_difficulty', 'conditions']
diff --git a/geotrek/infrastructure/locale/de/LC_MESSAGES/django.po b/geotrek/infrastructure/locale/de/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-04-03 15:39+0000\n"
+"POT-Creation-Date: 2024-07-18 14:36+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -108,7 +108,7 @@ msgstr ""
 msgid "Accessibility"
 msgstr ""
 
-msgid "Condition"
+msgid "Conditions"
 msgstr ""
 
 msgid "Infrastructures"

diff --git a/geotrek/infrastructure/locale/en/LC_MESSAGES/django.po b/geotrek/infrastructure/locale/en/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-04-03 15:39+0000\n"
+"POT-Creation-Date: 2024-07-18 14:36+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -108,7 +108,7 @@ msgstr ""
 msgid "Accessibility"
 msgstr ""
 
-msgid "Condition"
+msgid "Conditions"
 msgstr ""
 
 msgid "Infrastructures"

diff --git a/geotrek/infrastructure/locale/es/LC_MESSAGES/django.po b/geotrek/infrastructure/locale/es/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-04-03 15:39+0000\n"
+"POT-Creation-Date: 2024-07-18 14:36+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -108,7 +108,7 @@ msgstr ""
 msgid "Accessibility"
 msgstr ""
 
-msgid "Condition"
+msgid "Conditions"
 msgstr ""
 
 msgid "Infrastructures"

diff --git a/geotrek/infrastructure/locale/fr/LC_MESSAGES/django.po b/geotrek/infrastructure/locale/fr/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-04-03 15:39+0000\n"
+"POT-Creation-Date: 2024-07-18 14:36+0000\n"
 "PO-Revision-Date: 2020-04-22 07:48+0000\n"
 "Last-Translator: Emmanuelle Helly <emmanuelle.helly@makina-corpus.com>\n"
 "Language-Team: French <https://weblate.makina-corpus.net/projects/geotrek-"
@@ -109,8 +109,8 @@ msgstr "Niveau de dangerosité de l'aménagement pour les usagers"
 msgid "Accessibility"
 msgstr "Accessibilité"
 
-msgid "Condition"
-msgstr "État"
+msgid "Conditions"
+msgstr "États"
 
 msgid "Infrastructures"
 msgstr "Aménagements"

diff --git a/geotrek/infrastructure/locale/it/LC_MESSAGES/django.po b/geotrek/infrastructure/locale/it/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-04-03 15:39+0000\n"
+"POT-Creation-Date: 2024-07-18 14:36+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -108,7 +108,7 @@ msgstr ""
 msgid "Accessibility"
 msgstr ""
 
-msgid "Condition"
+msgid "Conditions"
 msgstr ""
 
 msgid "Infrastructures"

diff --git a/geotrek/infrastructure/locale/nl/LC_MESSAGES/django.po b/geotrek/infrastructure/locale/nl/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-04-03 15:39+0000\n"
+"POT-Creation-Date: 2024-07-18 14:36+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -108,7 +108,7 @@ msgstr ""
 msgid "Accessibility"
 msgstr ""
 
-msgid "Condition"
+msgid "Conditions"
 msgstr ""
 
 msgid "Infrastructures"

diff --git a/geotrek/infrastructure/management/commands/loadinfrastructure.py b/geotrek/infrastructure/management/commands/loadinfrastructure.py
@@ -217,7 +217,6 @@ def create_infrastructure(self, geometry, name, type, category, use_structure,
             fields_without_eid = {
                 'type': infra_type,
                 'name': name,
-                'condition': condition_type,
                 'structure': structure,
                 'description': description,
                 'implantation_year': year
@@ -227,6 +226,8 @@ def create_infrastructure(self, geometry, name, type, category, use_structure,
                     eid=eid,
                     defaults=fields_without_eid
                 )
+                if condition_type:
+                    infra.conditions.add(condition_type)
                 if verbosity > 0 and not created:
                     self.stdout.write("Update : %s with eid %s" % (name, eid))
             else:

diff --git a/geotrek/infrastructure/migrations/0039_infrastructure_conditions.py b/geotrek/infrastructure/migrations/0039_infrastructure_conditions.py
@@ -0,0 +1,28 @@
+# Generated by Django 3.2.25 on 2024-04-25 12:25
+
+from django.db import migrations, models
+
+
+def copy_condition_to_conditions(apps, schema_editor):
+    Infrastructure = apps.get_model('infrastructure', 'Infrastructure')
+
+    # Copy InfrastructureCondition ForeignKey to ManyToMany field
+    for infrastructure in Infrastructure.objects.all():
+        if infrastructure.condition:
+            infrastructure.conditions.add(infrastructure.condition)
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('infrastructure', '0038_rename_access_tmp_infrastructure_access'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='infrastructure',
+            name='conditions',
+            field=models.ManyToManyField(blank=True, related_name='infrastructures', to='infrastructure.InfrastructureCondition', verbose_name='Condition'),
+        ),
+        migrations.RunPython(copy_condition_to_conditions, reverse_code=migrations.RunPython.noop),
+    ]
diff --git a/geotrek/infrastructure/migrations/0040_remove_infrastructure_condition.py b/geotrek/infrastructure/migrations/0040_remove_infrastructure_condition.py
@@ -0,0 +1,17 @@
+# Generated by Django 3.2.25 on 2024-04-25 13:27
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('infrastructure', '0039_infrastructure_conditions'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='infrastructure',
+            name='condition',
+        ),
+    ]
diff --git a/geotrek/infrastructure/models.py b/geotrek/infrastructure/models.py
@@ -174,9 +174,12 @@ class Infrastructure(BaseInfrastructure, GeotrekMapEntityMixin):
                                          on_delete=models.PROTECT,
                                          related_name='infrastructures_set')
     accessibility = models.TextField(verbose_name=_("Accessibility"), blank=True)
-    condition = models.ForeignKey(InfrastructureCondition,
-                                  verbose_name=_("Condition"), blank=True, null=True,
-                                  on_delete=models.PROTECT)
+    conditions = models.ManyToManyField(
+        InfrastructureCondition,
+        related_name='infrastructures',
+        verbose_name=_("Conditions"),
+        blank=True)
+
     geometry_types_allowed = ["LINESTRING", "POINT"]
 
     class Meta:
@@ -213,6 +216,15 @@ def tourism_infrastructures(cls, tourism_obj, queryset=None):
     def outdoor_infrastructures(cls, outdoor_obj, queryset=None):
         return intersecting(qs=queryset_or_model(queryset, cls), obj=outdoor_obj)
 
+    @property
+    def conditions_display(self):
+        if hasattr(self, "conditions_list"):
+            # Use conditions prefetched
+            conditions_list = self.conditions_list
+        else:
+            conditions_list = self.conditions.select_related('structure').all()
+        return ", ".join([str(c) for c in conditions_list])
+
     def save(self, *args, **kwargs):
         super().save(*args, **kwargs)
         for trek in self.treks.all():

diff --git a/geotrek/infrastructure/serializers.py b/geotrek/infrastructure/serializers.py
@@ -18,7 +18,7 @@ class Meta:
 class InfrastructureSerializer(DynamicFieldsMixin, serializers.ModelSerializer):
     name = serializers.CharField(source='name_display')
     type = serializers.CharField(source='type_display')
-    condition = serializers.SlugRelatedField('label', read_only=True)
+    conditions = serializers.CharField(source='conditions_display')
     cities = serializers.CharField(source='cities_display')
     structure = serializers.SlugRelatedField('name', read_only=True)
     usage_difficulty = serializers.SlugRelatedField('label', read_only=True)

diff --git a/geotrek/infrastructure/templates/infrastructure/infrastructure_detail_attributes.html b/geotrek/infrastructure/templates/infrastructure/infrastructure_detail_attributes.html
@@ -17,9 +17,11 @@ <h3>{% trans "Attributes" %}</h3>
             <th>{{ object|verbose:"type" }}</th>
             <td>{{ object.type }}</td>
         </tr>
-        <tr>
-            <th>{{ object|verbose:"condition" }}</th>
-            <td>{{ object.condition }}</td>
+            <tr>
+            <th>{{ object|verbose:"conditions" }}</th>
+            <td>
+                <span> {{ object.conditions_display }} </span>
+            </td>
         </tr>
         <tr>
             <th>{{ object|verbose:"description" }}</th>

diff --git a/geotrek/infrastructure/templates/infrastructure/sql/post_10_views.sql b/geotrek/infrastructure/templates/infrastructure/sql/post_10_views.sql
@@ -21,7 +21,6 @@ CREATE VIEW {{ schema_geotrek }}.v_infrastructures AS WITH v_infra AS
             {% endfor %}
             CONCAT (e.min_elevation, 'm') AS altitude,
             t.implantation_year,
-            t.condition_id,
             t.access_id,
             t.structure_id,
             t.type_id,
@@ -44,7 +43,7 @@ SELECT a.id,
        a.name_{{ lang }} AS "Name {{ lang }}",
        {% endfor %}
        b.label AS "Type",
-       c.label AS "Condition",
+       c.labels AS "Conditions",
        {% for lang in MODELTRANSLATION_LANGUAGES %}
        a.description_{{ lang }} AS "Description {{ lang }}",
        {% endfor %}
@@ -71,7 +70,19 @@ SELECT a.id,
        a.geom
 FROM v_infra a
 LEFT JOIN infrastructure_infrastructuretype b ON a.type_id = b.id
-LEFT JOIN infrastructure_infrastructurecondition c ON a.condition_id = c.id
+
+        LEFT JOIN ( WITH infrastructure_condition AS (
+                    SELECT a_1.infrastructurecondition_id,
+                    b_2.label AS labels,
+                    a_1.infrastructure_id
+                    FROM infrastructure_infrastructurecondition b_2
+                        JOIN infrastructure_infrastructure_conditions a_1 ON a_1.infrastructurecondition_id = b_2.id
+                )
+            SELECT array_to_string(array_agg(infrastructure_condition.labels), ', '::text, '_'::text)::character varying AS labels,
+            infrastructure_condition.infrastructure_id
+            FROM infrastructure_condition
+            GROUP BY infrastructure_condition.infrastructure_id) c ON a.topo_object_id = c.infrastructure_id
+
 LEFT JOIN infrastructure_infrastructureusagedifficultylevel d ON a.usage_difficulty_id = d.id
 LEFT JOIN infrastructure_infrastructuremaintenancedifficultylevel e ON a.maintenance_difficulty_id = e.id
 LEFT JOIN common_accessmean j ON a.access_id = j.id

diff --git a/geotrek/infrastructure/tests/data/infrastructure.dbf b/geotrek/infrastructure/tests/data/infrastructure.dbf
diff --git a/geotrek/infrastructure/tests/data/infrastructure.qix b/geotrek/infrastructure/tests/data/infrastructure.qix