Touristicevent organizers in many to many #3587 #3864

TheoLechemia · 2023-12-20T14:05:31Z

Description

Transform the field organizer to a many to many field name organizers
The PR keep retrocompatibilty on the API : the attribute organizer now return a concatened string of the organizers labels. We still can filter on organisms with the organism parameter
However the field organizer_id is now named organizers_id and return a list of id organism

Related Issue

#3587

Checklist

cypress · 2023-12-20T14:16:43Z

Passing run #8105 ↗︎

0	24	0	0	0

Details:

Merge `201f9f7` into `ad649e5`...
Project: Geotrek-admin	Commit: `0dffdb1c24 ℹ️`
Status: Passed	Duration: 02:10 💡
Started: Feb 28, 2024 2:24 PM	Ended: Feb 28, 2024 2:26 PM

Review all test suite changes for PR #3864 ↗︎

submarcos · 2023-12-22T13:25:04Z

geotrek/api/v2/serializers.py

-        organizer_id = serializers.PrimaryKeyRelatedField(
-            read_only=True
-        )
+        organizer = serializers.SerializerMethodField(source="organizers")


Si organizer est une liste, nomme le au pluriel

Suggested change

organizer = serializers.SerializerMethodField(source="organizers")

organizers = serializers.SerializerMethodField()

Par contre, quid de la retrocompat ?
l'aggregateur utilise l'api v2, i lfaut qu'on puisse importer les données avec

Merci pour les retours.
J'avais garder le "organizer" au singulier justement pour la rétrocompatibilité. Mais vu que le champs en maintenant en M2M, de toute façon il va falloir revoir pleins de choses.
Je me proposais de revoir aussi la partie parser, pour assurer la retrocompat

Oui, on utilise aussi la propriété "organizer" dans Geotrek-rando-v3, c'est pour ça qu'on ne l'avait pas renommé.
Mais de mémoire, on peut faire un synonyme pour gérer la transition et que "organizers" ou "organizer" fonctionne ?

submarcos · 2023-12-22T13:25:29Z

geotrek/api/v2/serializers.py

-            read_only=True
-        )
+        organizer = serializers.SerializerMethodField(source="organizers")
+        organizer_id = serializers.SerializerMethodField(source="organizers")


idem pour le nom (source="organizers" n'est pas necessaire pour un serializers.SerializerMethodField)

submarcos · 2023-12-22T13:30:53Z

geotrek/api/v2/serializers.py

+                    return ", ".join(
+                        map(lambda org: org.label, organizers)
+                    )
+            return None


en temps normal j'aurai suggéré d'utiliser .values_list(), mais pour que le prefetch fonctionne il vaut mieux 👍🏼

def get_organizer(self, obj): return ", ".join( map(lambda org: org.label, obj.organizers.all()) )

attention à if obj.organizers:, c'est un manager de M2M pas une liste, c'est tjrs == True

submarcos · 2023-12-22T13:31:11Z

geotrek/api/v2/serializers.py

+            return None
+
+        def get_organizer_id(self, obj):
+            return [org.id for org in obj.organizers.get_queryset()]


Suggested change

return [org.id for org in obj.organizers.get_queryset()]

return [org.id for org in obj.organizers.all()]

submarcos · 2023-12-22T13:32:44Z

geotrek/tourism/locale/en/LC_MESSAGES/django.po

+msgstr ""
+
+#: geotrek/tourism/tests/test_functional.py:131
+#: geotrek/tourism/tests/test_functional.py:277


pour les trads, il faut mettre à jour tous les fichiers de toutes les langues, (sans -l en) et en utilisant l'indication pour ne pas rajoter tous ces commentaires (--no-location)
https://github.com/GeotrekCE/Geotrek-admin/blob/master/Makefile#L41

submarcos · 2023-12-22T13:33:28Z

geotrek/tourism/serializers.py

+                return ", ".join(
+                    map(lambda org: org.label, organizers)
+                )
+        return None


meme remarques que dans les serializers API v2 pour le nom / contenu

…y field

codecov · 2024-02-23T09:28:05Z

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 98.35%. Comparing base (c46c2e5) to head (201f9f7).
Report is 2 commits behind head on master.

Additional details and impacted files

@@           Coverage Diff           @@
##           master    #3864   +/-   ##
=======================================
  Coverage   98.35%   98.35%           
=======================================
  Files         294      294           
  Lines       22285    22309   +24     
=======================================
+ Hits        21918    21942   +24     
  Misses        367      367

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

TheoLechemia · 2024-02-23T14:22:43Z

J'ai corrigé les derniers tests sur les parsers

TheoLechemia · 2024-02-23T15:17:10Z

Tout est bon sur cette PR, sauf les fichiers de langues.
Quand je lance
docker compose run --rm web ./manage.py makemessages -a --no-location --no-obsolete
j'ai un
PermissionError: [Errno 13] Permission denied: './docs/_build/html/CONTRIBUTING.html.py'
je suis preneur si vous avez des idées

geotrek/tourism/locale/en/LC_MESSAGES/django.po

submarcos

I think there is a problem with your traslation files.
https://github.com/GeotrekCE/Geotrek-admin/pull/3864/files#diff-fc6029e51be9d381ebe39b2b526f0a10f7cb10fd0ed1800e0a79048e8dbe58d3 is too big.

I supose you create a local venv folder that is parsed by makemessages

TheoLechemia · 2024-02-28T10:46:48Z

Yes I had a venv. I re run make messages after deleting it

submarcos · 2024-02-28T13:57:29Z

Yes I had a venv. I re run make messages after deleting it

Your changes in geotrek/locales shoud be reverted

submarcos · 2024-02-29T14:05:53Z

replaced by #3965

TheoLechemia force-pushed the impr_touristic_event_organizers branch 3 times, most recently from 1d98523 to cbf2bf3 Compare December 20, 2023 17:07

Chatewgne added the 💫 Improvements label Dec 21, 2023

submarcos reviewed Dec 22, 2023

View reviewed changes

babastienne changed the title ~~💫 Improvements - touristicevent organizers in many to many #3587~~ Touristicevent organizers in many to many #3587 Dec 26, 2023

TheoLechemia force-pushed the impr_touristic_event_organizers branch 3 times, most recently from dec5b6d to d2b3b69 Compare January 24, 2024 16:08

TheoLechemia and others added 6 commits February 23, 2024 10:11

💫 Improvements - touristicevent: transform organizer to a many to man…

fd98214

…y field

fix test

89f8e65

fix test and retro compat

a65feea

try to fix some tests

da56894

fix mobile api response and test

2940f21

tests

f8f5ebe

TheoLechemia force-pushed the impr_touristic_event_organizers branch from c0a7ab3 to 5e2ff46 Compare February 23, 2024 09:12

fix parser with str value on m2m

39a2b9f

TheoLechemia force-pushed the impr_touristic_event_organizers branch from 5e2ff46 to 39a2b9f Compare February 23, 2024 10:01

use PrimaryKeyRelatedField for organizers_id

0df2477

submarcos reviewed Feb 26, 2024

View reviewed changes

geotrek/tourism/locale/en/LC_MESSAGES/django.po Outdated Show resolved Hide resolved

submarcos reviewed Feb 28, 2024

View reviewed changes

generate translate files

201f9f7

TheoLechemia force-pushed the impr_touristic_event_organizers branch from f88bc2b to 201f9f7 Compare February 28, 2024 14:12

submarcos linked an issue Feb 28, 2024 that may be closed by this pull request

Evolution du module ÉVÉNEMENTS - Partie 2 #3587

Open

submarcos removed a link to an issue Feb 28, 2024

Evolution du module ÉVÉNEMENTS - Partie 2 #3587

Open

submarcos closed this Feb 29, 2024

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Touristicevent organizers in many to many #3587 #3864

Touristicevent organizers in many to many #3587 #3864

TheoLechemia commented Dec 20, 2023

cypress bot commented Dec 20, 2023 •

edited

Loading

submarcos Dec 22, 2023

TheoLechemia Jan 24, 2024

camillemonchicourt Jan 24, 2024

submarcos Dec 22, 2023

submarcos Dec 22, 2023 •

edited

Loading

submarcos Dec 22, 2023

submarcos Dec 22, 2023

submarcos Dec 22, 2023

codecov bot commented Feb 23, 2024 •

edited

Loading

TheoLechemia commented Feb 23, 2024

TheoLechemia commented Feb 23, 2024

submarcos left a comment

TheoLechemia commented Feb 28, 2024

submarcos commented Feb 28, 2024

submarcos commented Feb 29, 2024

	organizer = serializers.SerializerMethodField(source="organizers")
	organizers = serializers.SerializerMethodField()

	return [org.id for org in obj.organizers.get_queryset()]
	return [org.id for org in obj.organizers.all()]

Touristicevent organizers in many to many #3587 #3864

Touristicevent organizers in many to many #3587 #3864

Conversation

TheoLechemia commented Dec 20, 2023

Description

Related Issue

Checklist

cypress bot commented Dec 20, 2023 • edited Loading

Passing run #8105 ↗︎

Review all test suite changes for PR #3864 ↗︎

submarcos Dec 22, 2023

Choose a reason for hiding this comment

TheoLechemia Jan 24, 2024

Choose a reason for hiding this comment

camillemonchicourt Jan 24, 2024

Choose a reason for hiding this comment

submarcos Dec 22, 2023

Choose a reason for hiding this comment

submarcos Dec 22, 2023 • edited Loading

Choose a reason for hiding this comment

submarcos Dec 22, 2023

Choose a reason for hiding this comment

submarcos Dec 22, 2023

Choose a reason for hiding this comment

submarcos Dec 22, 2023

Choose a reason for hiding this comment

codecov bot commented Feb 23, 2024 • edited Loading

Codecov Report

TheoLechemia commented Feb 23, 2024

TheoLechemia commented Feb 23, 2024

submarcos left a comment

Choose a reason for hiding this comment

TheoLechemia commented Feb 28, 2024

submarcos commented Feb 28, 2024

submarcos commented Feb 29, 2024

cypress bot commented Dec 20, 2023 •

edited

Loading

submarcos Dec 22, 2023 •

edited

Loading

codecov bot commented Feb 23, 2024 •

edited

Loading