log history: corrections

PnX-SI · Feb 13, 2023 · d928a61 · d928a61
1 parent 1510cca
commit d928a61
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 13 deletions.
diff --git a/backend/geonature/core/gn_synthese/models.py b/backend/geonature/core/gn_synthese/models.py
@@ -129,7 +129,6 @@ def filter_by_scope(self, scope, user=None):
             )
         return self
 
-
     def filter_by_params(self, params: MultiDict = None):
         model = Synthese
         and_list = []
@@ -150,6 +149,7 @@ def sort(self, label: str, direction: str):
 
         return self.order_by(order_by)
 
+
 @serializable
 class CorAreaSynthese(DB.Model):
     __tablename__ = "cor_area_synthese"

diff --git a/backend/geonature/core/gn_synthese/routes.py b/backend/geonature/core/gn_synthese/routes.py
@@ -21,12 +21,11 @@
 from geojson import FeatureCollection, Feature
 import sqlalchemy as sa
 
-from utils_flask_sqla.generic import serializeQuery, GenericTable, GenericQuery
+from utils_flask_sqla.generic import serializeQuery, GenericTable
 from utils_flask_sqla.response import to_csv_resp, to_json_resp, json_resp
 from utils_flask_sqla_geo.generic import GenericTableGeo
 
 from geonature.utils import filemanager
-from geonature.utils.config import config
 from geonature.utils.env import DB
 from geonature.utils.errors import GeonatureApiError
 from geonature.utils.utilsgeometrytools import export_as_geo_file
@@ -43,8 +42,6 @@
     VColorAreaTaxon,
     TReport,
     SyntheseLogEntry,
-    SyntheseQuery,
-
 )
 from geonature.core.gn_synthese.synthese_config import MANDATORY_COLUMNS
 
@@ -1195,8 +1192,6 @@ def delete_report(id_report):
     DB.session.commit()
 
 
-
-
 @routes.route("/log", methods=["get"])
 @permissions.check_cruved_scope("R", True, module_code="SYNTHESE")
 @json_resp
@@ -1227,7 +1222,9 @@ def list_synthese_log_entries(info_role) -> dict:
     q2 = Synthese.query.with_entities(
         Synthese.id_synthese,
         Synthese.last_action,
-        func.coalesce(Synthese.meta_update_date, Synthese.meta_create_date),
+        func.coalesce(Synthese.meta_update_date, Synthese.meta_create_date).label(
+            "meta_last_action_date"
+        ),
     )
 
     q3 = q1.union(q2)

diff --git a/backend/geonature/migrations/versions/9e9218653d6c_add_synthese_log_history.py b/backend/geonature/migrations/versions/9e9218653d6c_add_synthese_log_history.py
@@ -7,8 +7,6 @@
 """
 from alembic import op
 import sqlalchemy as sa
-from sqlalchemy.dialects.postgresql import UUID
-from sqlalchemy.sql.expression import null
 
 
 # revision identifiers, used by Alembic.
@@ -28,7 +26,7 @@ def upgrade():
     )
     op.execute(
         """
-    CREATE OR REPLACE FUNCTION gn_synthese.fct_tri_log_delete_on_synthese() RETURNS TRIGGER AS
+    CREATE FUNCTION gn_synthese.fct_tri_log_delete_on_synthese() RETURNS TRIGGER AS
     $BODY$
     DECLARE
     BEGIN
@@ -47,13 +45,12 @@ def upgrade():
     END;
     $BODY$ LANGUAGE plpgsql COST 100
     ;
-    DROP TRIGGER IF EXISTS tri_log_delete_synthese ON gn_synthese.synthese;
     CREATE TRIGGER tri_log_delete_synthese
         AFTER DELETE
         ON gn_synthese.synthese
         REFERENCING OLD TABLE AS old_table
         FOR EACH STATEMENT
-    EXECUTE FUNCTION gn_synthese.fct_tri_log_delete_on_synthese()
+        EXECUTE FUNCTION gn_synthese.fct_tri_log_delete_on_synthese()
     ;
     """
     )