Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feat Synthese: add status, red lists filters #2173

Merged
merged 10 commits into from
Dec 5, 2022

Conversation

amandine-sahl
Copy link
Contributor

@amandine-sahl amandine-sahl commented Nov 28, 2022

cf - #1492

Prise en compte des statuts fournis par l'INPN dans le cadre de la bdc_statut :

  • filtres de la synthèse
  • fiche détail de l'observation
  • export des statuts des taxons sélectionnés dans la synthèse
  • clean : suppression de la mention des anciens statuts

@codecov
Copy link

codecov bot commented Nov 28, 2022

Codecov Report

Base: 67.65% // Head: 67.63% // Decreases project coverage by -0.01% ⚠️

Coverage data is based on head (10c0d82) compared to base (12e3334).
Patch coverage: 98.33% of modified lines in pull request are covered.

Additional details and impacted files
@@             Coverage Diff             @@
##           develop    #2173      +/-   ##
===========================================
- Coverage    67.65%   67.63%   -0.02%     
===========================================
  Files           77       76       -1     
  Lines         6424     6411      -13     
===========================================
- Hits          4346     4336      -10     
+ Misses        2078     2075       -3     
Flag Coverage Δ
pytest 67.63% <98.33%> (-0.02%) ⬇️

Flags with carried forward coverage won't be shown. Click here to find out more.

Impacted Files Coverage Δ
backend/geonature/core/gn_profiles/routes.py 79.36% <ø> (-0.17%) ⬇️
...nature/core/gn_synthese/utils/query_select_sqla.py 75.13% <96.66%> (+4.83%) ⬆️
backend/geonature/core/gn_profiles/models.py 98.96% <100.00%> (ø)
backend/geonature/core/gn_synthese/models.py 89.29% <100.00%> (ø)
backend/geonature/core/gn_synthese/routes.py 78.97% <100.00%> (+0.31%) ⬆️
backend/geonature/utils/config_schema.py 91.83% <100.00%> (+0.10%) ⬆️

Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here.

☔ View full report at Codecov.
📢 Do you have feedback about the report comment? Let us know in this issue.

@amandine-sahl amandine-sahl force-pushed the feat/status-filters-squash branch 5 times, most recently from cdb91d9 to 732d3f3 Compare November 28, 2022 20:30
@amandine-sahl amandine-sahl force-pushed the feat/status-filters-squash branch from 732d3f3 to 24c7c8a Compare November 29, 2022 08:28
Copy link
Contributor

@bouttier bouttier left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

J’ai l’impression qu’on ajoute beaucoup de jointures, je me demande l’impact sur les performances de la synthèse ? Est-ce qu’il est toujours nécessaire de récupérer toutes ces informations ? Elles figurent toutes dans la liste des observations ?

Par ailleurs, on refait les jointures dans SyntheseQuery pour pouvoir filtrer ; est-ce que la BDCS se retrouve jointe 2 fois ? Il me semble qu’il y a du code qui vise à éviter de rejoindre lorsque déjà join mais est-ce qu’il est mis en œuvre ici ? L’utilisation de l’ORM simplifierait ceci mais c’est un autre sujet !

.github/workflows/pytest.yml Outdated Show resolved Hide resolved
backend/geonature/core/gn_synthese/routes.py Outdated Show resolved Hide resolved
backend/geonature/utils/config_schema.py Show resolved Hide resolved
backend/geonature/utils/config_schema.py Show resolved Hide resolved
backend/geonature/utils/config_schema.py Outdated Show resolved Hide resolved
backend/geonature/utils/config_schema.py Show resolved Hide resolved
@jpm-cbna jpm-cbna force-pushed the feat/status-filters-squash branch from 346f121 to e6bde8b Compare November 29, 2022 11:08
@jpm-cbna
Copy link
Contributor

J’ai l’impression qu’on ajoute beaucoup de jointures, je me demande l’impact sur les performances de la synthèse ? Est-ce qu’il est toujours nécessaire de récupérer toutes ces informations ? Elles figurent toutes dans la liste des observations ?

Par ailleurs, on refait les jointures dans SyntheseQuery pour pouvoir filtrer ; est-ce que la BDCS se retrouve jointe 2 fois ?

Alors, j'ai pas mal travaillé les performances et l'on arrive à quelque chose de fonctionnel même sur plusieurs millions de données.
Mais effectivement, cela rajoute des jointures car nous sommes obligé à la fois d'aller vérifier que le taxon de l'observation et bien lié aux textes de protection choisi mais aussi que l'observation est bien lié à la zone géographique d'application du texte...
Et pour éviter la collision avec les tables du ref_geo liés aux filtres géographiques de la Synthese (communes, départements...), nous sommes obligé d'utilisé des alias.

Je ne pense pas que la BDC soit lié plusieurs fois.

@bouttier bouttier added this to the 2.11 milestone Nov 30, 2022
@jpm-cbna jpm-cbna requested a review from bouttier December 2, 2022 16:10
@bouttier bouttier force-pushed the feat/status-filters-squash branch 4 times, most recently from 67d726d to 497a6bc Compare December 5, 2022 17:33
jpm-cbna and others added 4 commits December 5, 2022 18:49
Improve display of form fields used.
Put taxonomic rank fields in a section.
Restore correct order for CorAreaSynthese.
Dynamic tree now avalaible in ngOnInit.
Use "bdc_statut_cor_text_area" name for variable linking tables between
ref_geo and taxonomie.
Use correct field names and css class.
Install Departements before Taxref.

Resolve #1492.
Fix filters used in status export web service.

Resolve #1492.
@bouttier bouttier force-pushed the feat/status-filters-squash branch from 9bdd970 to 5f2c86b Compare December 5, 2022 17:50
@bouttier bouttier force-pushed the feat/status-filters-squash branch from 10c0d82 to 08c1356 Compare December 5, 2022 19:46
@bouttier bouttier merged commit 08c1356 into develop Dec 5, 2022
@bouttier bouttier deleted the feat/status-filters-squash branch December 5, 2022 19:46
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants