chore(metadata): replace ds synthese "records_count" with "nb_obs"

Author: VincentCauchois

backend/geonature/core/gn_meta/routes.py

@@ -119,7 +119,7 @@ def get_datasets():
 
     for item_nb_observations in [
         "nb_observations",
-        "synthese_records_count",
+        "nb_observations_synthese",
         "nb_observations_habitats",
     ]:
         if params.get(item_nb_observations, type=int, default=0):

backend/geonature/core/gn_meta/schemas.py

@@ -15,7 +15,7 @@
 from geonature.core.gn_commons.schemas import ModuleSchema
 
 # Note: import of SourceSchema is importent as it trigger import of synthese models
-# which define [TDatasets.sources, TDatasets.synthese_records_count, TDatasets.nb_observations_habitats, TDatasets.nb_observations], and these must be
+# which define [TDatasets.sources, TDatasets.nb_observations_synthese, TDatasets.nb_observations_habitats, TDatasets.nb_observations], and these must be
 # defined before AutoSchema creation to be known by marshmallow!
 from geonature.core.gn_synthese.schemas import SourceSchema
 from geonature.core.gn_permissions.tools import get_scopes_by_action

backend/geonature/core/gn_synthese/blueprints/statistics.py

@@ -112,7 +112,7 @@ def observation_count_per_column(column):
 
     This function was used to count observations per dataset,
     but this usage have been replaced by
-    TDatasets.synthese_records_count.
+    TDatasets.nb_observations_synthese.
     Remove this function as it is very inefficient?
     """
     if column not in inspect(Synthese).column_attrs:

backend/geonature/core/gn_synthese/models.py

@@ -880,7 +880,7 @@ def sort(cls, columns: List[str], *, query):
     .where(Synthese.id_dataset == TDatasets.id_dataset)
     .scalar_subquery()
 )
-TDatasets.synthese_records_count = column_property(
+TDatasets.nb_observations_synthese = column_property(
     request_nb_obs_synthese.label("nb_observations_synthese"),
     deferred=True,
 )

backend/geonature/tests/test_gn_meta.py

@@ -868,10 +868,10 @@ def test_get_dataset(self, users, datasets):
         assert DatasetSchema().validate(response.json)
         assert response.json["id_dataset"] == ds.id_dataset
 
-    def test_get_datasets_synthese_records_count(self, users):
+    def test_get_datasets_nb_observations_synthese(self, users):
         # FIXME : verify content
         set_logged_user(self.client, users["admin_user"])
-        response = self.client.get(url_for("gn_meta.get_datasets", synthese_records_count=1))
+        response = self.client.get(url_for("gn_meta.get_datasets", nb_observations_synthese=1))
 
         assert response.status_code == 200
 

frontend/src/app/metadataModule/metadata-dataset.component.html

@@ -79,12 +79,12 @@
     aria-hidden="true"
     *ngIf="dataset.nb_observations"
     [matTooltip]="
-      (dataset?.synthese_records_count
+      (dataset?.nb_observations_synthese
         ? ('MetaData.ObservationsSyntheseTooltip' | translate) +
           ': ' +
-          dataset?.synthese_records_count
+          dataset?.nb_observations_synthese
         : '') +
-      (dataset?.synthese_records_count && dataset?.nb_observations_habitats ? ' - ' : '') +
+      (dataset?.nb_observations_synthese && dataset?.nb_observations_habitats ? ' - ' : '') +
       (dataset?.nb_observations_habitats
         ? ('MetaData.ObservationsHabitatsTooltip' | translate) +
           ': ' +
@@ -104,13 +104,13 @@
 
   <a
     mat-icon-button
-    [disabled]="dataset?.synthese_records_count == 0"
+    [disabled]="dataset?.nb_observations_synthese == 0"
     [routerLink]="['/synthese']"
     [queryParams]="{ id_dataset: dataset.id_dataset }"
     [attr.data-qa]="'pnx-metadata-jdd-display-data-' + dataset.unique_dataset_id"
   >
     <mat-icon
-      *ngIf="dataset?.synthese_records_count == 0; else elseSynthese"
+      *ngIf="dataset?.nb_observations_synthese == 0; else elseSynthese"
       matTooltip="Ce jeu de données ne comporte aucune donnée dans la Synthèse"
     >
       room

frontend/src/app/metadataModule/metadata.component.ts

@@ -183,7 +183,7 @@ export class MetadataComponent implements OnInit {
       let params = {};
       const queryStrings: ParamsDict = {
         nb_observations: 1,
-        synthese_records_count: 1,
+        nb_observations_synthese: 1,
       };
       if (this.config.OCCHAB) {
         queryStrings['nb_observations_habitats'] = 1;