fix(synthese) fix pin not working

PnX-SI · Sep 15, 2023 · bc7fc54 · bc7fc54
1 parent e32d43e
commit bc7fc54
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 3 deletions.
diff --git a/backend/geonature/core/gn_synthese/routes.py b/backend/geonature/core/gn_synthese/routes.py
@@ -1109,11 +1109,21 @@ def create_report(permissions):
         TReport.id_synthese == id_synthese,
         TReport.report_type.has(BibReportsTypes.type == type_name),
     )
+
+    user_pin = TReport.query.filter(
+        TReport.id_synthese == id_synthese,
+        TReport.report_type.has(BibReportsTypes.type == "pin"),
+        TReport.id_role == g.current_user.id_role,
+    )
     # only allow one alert by id_synthese
-    if type_name in ["alert", "pin"]:
+    if type_name in ["alert"]:
         alert_exists = report_query.one_or_none()
         if alert_exists is not None:
             raise Conflict("This type already exists for this id")
+    if type_name in ["pin"]:
+        pin_exist = user_pin.one_or_none()
+        if pin_exist is not None:
+            raise Conflict("This type already exists for this id")
     new_entry = TReport(
         id_synthese=id_synthese,
         id_role=g.current_user.id_role,

diff --git a/...tend/src/app/shared/syntheseSharedModule/synthese-info-obs/synthese-info-obs.component.ts b/...tend/src/app/shared/syntheseSharedModule/synthese-info-obs/synthese-info-obs.component.ts
@@ -98,6 +98,7 @@ export class SyntheseInfoObsComponent implements OnInit, OnChanges {
 
   loadAllInfo(idSynthese) {
     this.isLoading = true;
+    this.getReport('pin');
     this._dataService
       .getOneSyntheseObservation(idSynthese)
       .pipe(
@@ -108,7 +109,6 @@ export class SyntheseInfoObsComponent implements OnInit, OnChanges {
       .subscribe((data) => {
         this.selectedObs = data['properties'];
         this.alert = find(data.properties.reports, ['report_type.type', 'alert']);
-        this.pin = find(data.properties.reports, ['report_type.type', 'pin']);
         this.selectCdNomenclature = this.selectedObs?.nomenclature_valid_status.cd_nomenclature;
         this.selectedGeom = data;
         this.selectedObs['municipalities'] = [];
@@ -341,8 +341,9 @@ export class SyntheseInfoObsComponent implements OnInit, OnChanges {
   pinSelectedObs() {
     if (isEmpty(this.pin)) {
       this.addPin();
+    } else {
+      this.deletePin();
     }
-    this.deletePin();
   }
 
   copyToClipBoard() {