[METADATA][ADDITIONAL_FIELDS] Implémentation du système de champs additionnels pour les cadres d'acquisition #3744

VincentCauchois · 2025-10-01T16:23:53Z

Dans la continuité des travaux de #1363 qui avaient notamment permis la gestion des champs additionnels en BDD et l'implémentation pour le module OCCTAX.

codecov · 2025-10-01T16:33:31Z

Codecov Report

✅ All modified and coverable lines are covered by tests.
✅ Project coverage is 84.59%. Comparing base (a8f3906) to head (a04326e).
⚠️ Report is 11 commits behind head on develop.

Additional details and impacted files

@@             Coverage Diff             @@
##           develop    #3744      +/-   ##
===========================================
+ Coverage    84.48%   84.59%   +0.10%     
===========================================
  Files          133      133              
  Lines        10361    10374      +13     
===========================================
+ Hits          8754     8776      +22     
+ Misses        1607     1598       -9

Flag	Coverage Δ
pytest	`84.59% <100.00%> (+0.10%)`	⬆️

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

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

🚀 New features to boost your workflow:

❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.
📦 JS Bundle Analysis: Save yourself from yourself by tracking and limiting bundle sizes in JS merges.

jacquesfize

Ca me semble bien dans le fonctionnement ! En plus, ça montre que le système de champs additionnels s'intègre facilement côté backend mais aussi frontend !

Toutefois, la création d'une nouvelle colonne est à mon sens inutile car une colonne existante a été créée à ce dessin #3422. Il faudra aussi ajouter des tests côtés backend pour tester les champs additionnels.

Enfin, quelques broutilles sur les choix de nommages.

frontend/src/app/metadataModule/services/af-form.service.ts

backend/geonature/core/gn_meta/models/aframework.py

backend/geonature/utils/config_schema.py

backend/geonature/migrations/versions/1f223c509a80_add_additional_fields_for_af.py

backend/geonature/core/gn_meta/models/aframework.py

camillemonchicourt · 2025-10-03T08:33:54Z

En effet, le champs additional_data qui a été ajouté récemment dans les tables de métadonnées a exactement cette vocation.
L'appellation additional_fields qui a été utilisée dans Occtax est un peu divergente et nous a échappé à l'époque, mais me semble moins pertinente.
Donc si il y avait un truc à faire, cela serait, il me semble, de renommer les champs additional_fields des tables Occtax en additional_data.
Car on y stocke des données additionnelles, pas des champs additionnels, et donc ça apporte de la confusion avec la table gn_commons.t_additional_fields qui elle contient bien la définition des champs additionnels.

VincentCauchois · 2025-10-03T08:46:29Z

En effet, le champs additional_data qui a été ajouté récemment dans les tables de métadonnées a exactement cette vocation. L'appellation additional_fields qui a été utilisée dans Occtax est un peu divergente et nous a échappé à l'époque, mais me semble moins pertinente. Donc si il y avait un truc à faire, cela serait, il me semble, de renommer les champs additional_fields des tables Occtax en additional_data. Car on y stocke des données additionnelles, pas des champs additionnels, et donc ça apporte de la confusion avec la table gn_commons.t_additional_fields qui elle contient bien la définition des champs additionnels.

Ok, je comprends mieux, merci pour l'explication !

frontend/src/app/metadataModule/af/af-card.component.html

Features: - AF additional fields: able define additional fields, for acquisition frameworks, from GN backoffice admin: add an object 'METADATA_CADRE_ACQUISITION' in `gn_permissions.t_objects` that can be used, through GN config - Set by default in GN config this new object and the module 'METADATA' as implemented for additional fields // `config_schema.py` - AF form: able provide additional data, based on configured additional fields, in create-or-update acquisition framework form - AF card: display additional data, based on configured additional fields, in acquisition framework card - Default config example: - Complete `default_config.toml.example` with missing section `[ADDITIONAL_FIELDS]` Informations: - Use existing field `gn_meta.t_acquisition_frameworks.additional_data` Ref #2745

Add additional_data to the acquisition framework "af_1" so as to cover additional_data section in endpoint "gn_meta.get_export_pdf_acquisition_frameworks", through existing test function `test_get_export_pdf_acquisition_frameworks`

Add tests and modify an existing one to add coverage for "gn_commons._get_additional_fields" function: - Filter-by-`id_dataset`-parameter code - Filter-by-`object_code`-parameter code, for when it the parameter a strictly-longer-than-1-list

jacquesfize

Encore quelques trucs mais on est bien :)

backend/geonature/core/gn_meta/routes.py

backend/geonature/tests/test_gn_commons.py

backend/geonature/tests/test_gn_meta.py

backend/geonature/core/gn_commons/routes.py

Several executions of `cy.pause()` unwishingly committed in a4e6e72#diff-baf651828980696c20d86295e86660fcf210eca06855bad4844062b3e758443fR310-R321

…pdf export

jacquesfize

Les tests frontends échouent. Pas sur de la nouvelle branche pour les champs additionnels... il y a peut-être une stratégie plus importante sur la ou les branches dédiées aux tests E2E. A discuter.

Sinon, fonctionnellement ça marche bien de mon côté.

jacquesfize · 2025-11-04T13:19:18Z

.github/workflows/cypress.yml

          geonature install-gn-module contrib/gn_module_occhab OCCHAB --build=false --upgrade-db=false
          geonature install-gn-module contrib/gn_module_validation VALIDATION --build=false --upgrade-db=false
-          geonature db upgrade occtax-samples-test@head 
+          geonature db upgrade cypress-samples-test@head


ça pose question... pourquoi ne pas ajouter aussi occhab-samples@head, import-samples@head dans le depends on ? 🤔

VincentCauchois requested review from christophe-ramet and jacquesfize October 1, 2025 16:23

VincentCauchois self-assigned this Oct 1, 2025

VincentCauchois added enhancement généricité database SQL frontend backend javascript Pull requests that update Javascript code python Pull requests that update Python code labels Oct 1, 2025

VincentCauchois changed the title ~~[METADATA][ADDITIONAL_FIELDS] Implémentation du système de champs additionels pour les cadres d'acquisition~~ [METADATA][ADDITIONAL_FIELDS] Implémentation du système de champs additionnels pour les cadres d'acquisition Oct 1, 2025

VincentCauchois force-pushed the feat/add-additional-data-fields-for-metadata branch 2 times, most recently from 598330d to 31278cb Compare October 1, 2025 16:38

jacquesfize requested changes Oct 2, 2025

View reviewed changes

frontend/src/app/metadataModule/services/af-form.service.ts Outdated Show resolved Hide resolved

backend/geonature/core/gn_meta/models/aframework.py Outdated Show resolved Hide resolved

backend/geonature/utils/config_schema.py Outdated Show resolved Hide resolved

jacquesfize added this to the 2.17.0 milestone Oct 2, 2025

jacquesfize mentioned this pull request Oct 2, 2025

Version 2.17.0 de GeoNature #3411

Open

13 tasks

VincentCauchois force-pushed the feat/add-additional-data-fields-for-metadata branch 3 times, most recently from 53aff95 to 5f9ac34 Compare October 2, 2025 13:40

VincentCauchois commented Oct 2, 2025

View reviewed changes

backend/geonature/migrations/versions/1f223c509a80_add_additional_fields_for_af.py Outdated Show resolved Hide resolved

VincentCauchois commented Oct 2, 2025

View reviewed changes

backend/geonature/core/gn_meta/models/aframework.py Outdated Show resolved Hide resolved

VincentCauchois force-pushed the feat/add-additional-data-fields-for-metadata branch from 5f9ac34 to 53add31 Compare October 3, 2025 08:20

VincentCauchois force-pushed the feat/add-additional-data-fields-for-metadata branch from 53add31 to ec22f56 Compare October 3, 2025 08:33

VincentCauchois commented Oct 3, 2025

View reviewed changes

frontend/src/app/metadataModule/af/af-card.component.html Outdated Show resolved Hide resolved

VincentCauchois force-pushed the feat/add-additional-data-fields-for-metadata branch from ec22f56 to d2c6c74 Compare October 3, 2025 12:45

VincentCauchois requested a review from jacquesfize October 7, 2025 14:34

VincentCauchois force-pushed the feat/add-additional-data-fields-for-metadata branch from 48110b7 to f52121a Compare October 7, 2025 14:56

VincentCauchois force-pushed the feat/add-additional-data-fields-for-metadata branch from f52121a to d45eff1 Compare October 7, 2025 15:57

jacquesfize reviewed Oct 8, 2025

View reviewed changes

backend/geonature/core/gn_meta/routes.py Outdated Show resolved Hide resolved

backend/geonature/tests/test_gn_commons.py Show resolved Hide resolved

backend/geonature/tests/test_gn_meta.py Show resolved Hide resolved

backend/geonature/core/gn_commons/routes.py Show resolved Hide resolved

VincentCauchois force-pushed the feat/add-additional-data-fields-for-metadata branch from 531b47f to aa8d430 Compare October 13, 2025 15:48

VincentCauchois marked this pull request as draft October 13, 2025 17:16

VincentCauchois force-pushed the feat/add-additional-data-fields-for-metadata branch 3 times, most recently from d814159 to c2e6e46 Compare October 14, 2025 16:56

VincentCauchois requested a review from jacquesfize October 30, 2025 14:43

VincentCauchois added 2 commits October 30, 2025 15:46

feat(cypress): add frontend tests for af additional fields

2a21dd2

fix(cypress): remove unwished cy.pause()

a3b84e4

Several executions of `cy.pause()` unwishingly committed in a4e6e72#diff-baf651828980696c20d86295e86660fcf210eca06855bad4844062b3e758443fR310-R321

VincentCauchois force-pushed the feat/add-additional-data-fields-for-metadata branch from 56b0974 to 7bea1a8 Compare October 30, 2025 14:47

VincentCauchois added 4 commits October 30, 2025 15:58

feat(cypress): add frontend test for pdf export of af

768f0b5

fixup! feat(metadata_export): add display of additional fields in af …

f3ce202

…pdf export

fixup! feat(metadata): add additional_fields support for af

45a1acd

fixup! feat(metadata_export): add display of additional fields in af …

81757f0

…pdf export

VincentCauchois force-pushed the feat/add-additional-data-fields-for-metadata branch from 7bea1a8 to 81757f0 Compare October 30, 2025 14:58

VincentCauchois added 4 commits October 30, 2025 16:40

fixup! feat(pytest): increase tests codecov for get_additional_fields

c94ed99

fixup! feat(metadata_export): add display of additional fields in af …

9ad3a4b

…pdf export

fixup! feat(tests): add pytest coverage for af additional_data

72220c2

fixup! feat(metadata): add additional_fields support for af

b2be7a7

VincentCauchois force-pushed the feat/add-additional-data-fields-for-metadata branch from a54915d to b2be7a7 Compare October 31, 2025 14:08

fixup! feat(cypress): add frontend test for pdf export of af

fe92c31

VincentCauchois force-pushed the feat/add-additional-data-fields-for-metadata branch from 83eb8e9 to fe92c31 Compare November 3, 2025 10:17

VincentCauchois mentioned this pull request Nov 3, 2025

feat(metadata): add possibility to fill af form from query params #3781

Draft

jacquesfize requested changes Nov 4, 2025

View reviewed changes

fixup! feat(metadata): add additional_fields support for af

a04326e

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

[METADATA][ADDITIONAL_FIELDS] Implémentation du système de champs additionnels pour les cadres d'acquisition #3744

[METADATA][ADDITIONAL_FIELDS] Implémentation du système de champs additionnels pour les cadres d'acquisition #3744

VincentCauchois commented Oct 1, 2025 •

edited

Loading

Uh oh!

codecov bot commented Oct 1, 2025 •

edited

Loading

Uh oh!

jacquesfize left a comment •

edited

Loading

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

camillemonchicourt commented Oct 3, 2025

Uh oh!

VincentCauchois commented Oct 3, 2025

Uh oh!

Uh oh!

jacquesfize left a comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

jacquesfize left a comment

Uh oh!

jacquesfize Nov 4, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

[METADATA][ADDITIONAL_FIELDS] Implémentation du système de champs additionnels pour les cadres d'acquisition #3744

Are you sure you want to change the base?

[METADATA][ADDITIONAL_FIELDS] Implémentation du système de champs additionnels pour les cadres d'acquisition #3744

Conversation

VincentCauchois commented Oct 1, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

codecov bot commented Oct 1, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

jacquesfize left a comment • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

camillemonchicourt commented Oct 3, 2025

Uh oh!

VincentCauchois commented Oct 3, 2025

Uh oh!

Uh oh!

jacquesfize left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

jacquesfize left a comment

Choose a reason for hiding this comment

Uh oh!

jacquesfize Nov 4, 2025

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

VincentCauchois commented Oct 1, 2025 •

edited

Loading

codecov bot commented Oct 1, 2025 •

edited

Loading

jacquesfize left a comment •

edited

Loading