From 328f1ec3fd1bec38d8e23231cba825c6644c03b0 Mon Sep 17 00:00:00 2001 From: "joel.clement" Date: Mon, 13 Mar 2023 11:44:46 +0100 Subject: [PATCH 001/142] refactor api rest --- backend/gn_modulator/blueprint.py | 3 + backend/gn_modulator/module/config/base.py | 1 - backend/gn_modulator/module/config/utils.py | 27 -- backend/gn_modulator/routes/__init__.py | 0 backend/gn_modulator/routes/exports.py | 43 ++ backend/gn_modulator/routes/rest.py | 72 ++++ backend/gn_modulator/routes/utils/__init__.py | 0 .../gn_modulator/routes/utils/decorators.py | 46 +++ backend/gn_modulator/routes/utils/params.py | 52 +++ .../gn_modulator/routes/utils/repository.py | 154 +++++++ backend/gn_modulator/schema/__init__.py | 2 - backend/gn_modulator/schema/api.py | 391 ------------------ backend/gn_modulator/schema/base.py | 25 ++ .../schema/models/column_properties.py | 3 +- .../schema/repositories/filters.py | 100 ----- backend/gn_modulator/tests/test_rest_api.py | 25 ++ backend/gn_modulator/tests/utils/rest.py | 119 ++++++ backend/gn_modulator/utils/filters.py | 104 +++++ doc/changelog.md | 4 + frontend/app/services/config.service.ts | 4 +- frontend/app/services/data.service.ts | 2 +- 21 files changed, 652 insertions(+), 525 deletions(-) create mode 100644 backend/gn_modulator/routes/__init__.py create mode 100644 backend/gn_modulator/routes/exports.py create mode 100644 backend/gn_modulator/routes/rest.py create mode 100644 backend/gn_modulator/routes/utils/__init__.py create mode 100644 backend/gn_modulator/routes/utils/decorators.py create mode 100644 backend/gn_modulator/routes/utils/params.py create mode 100644 backend/gn_modulator/routes/utils/repository.py delete mode 100644 backend/gn_modulator/schema/api.py create mode 100644 backend/gn_modulator/tests/test_rest_api.py create mode 100644 backend/gn_modulator/tests/utils/rest.py create mode 100644 backend/gn_modulator/utils/filters.py diff --git a/backend/gn_modulator/blueprint.py b/backend/gn_modulator/blueprint.py index 4df159ab..ade1e1e6 100644 --- a/backend/gn_modulator/blueprint.py +++ b/backend/gn_modulator/blueprint.py @@ -16,6 +16,9 @@ blueprint = Blueprint(MODULE_CODE.lower(), __name__) +from gn_modulator.routes.rest import * # noqa +from gn_modulator.routes.exports import * # noqa + # Creation des commandes pour modules blueprint.cli.short_help = "Commandes pour l' administration du module MODULES" for cmd in commands: diff --git a/backend/gn_modulator/module/config/base.py b/backend/gn_modulator/module/config/base.py index e4dc6eb4..ae8fcafa 100644 --- a/backend/gn_modulator/module/config/base.py +++ b/backend/gn_modulator/module/config/base.py @@ -78,7 +78,6 @@ def init_module_config(cls, module_code): if module_config.get("registred"): cls.process_module_params(module_code) - cls.process_module_api(module_code) return module_config diff --git a/backend/gn_modulator/module/config/utils.py b/backend/gn_modulator/module/config/utils.py index 60cab22d..f5065106 100644 --- a/backend/gn_modulator/module/config/utils.py +++ b/backend/gn_modulator/module/config/utils.py @@ -242,30 +242,3 @@ def process_module_objects(cls, module_code): # # mise en cache pour pouvoir s'en reservir par ailleurs # set_global_cache(["exports", export_code], export_definition) - - @classmethod - def process_module_api(cls, module_code): - """ - ouvre les routes pour un module - """ - - module_config = cls.module_config(module_code) - - bp = Blueprint(module_code, __name__) - - # pour tous les object d'un module - for object_code, object_definition in module_config["objects"].items(): - # on récupère schema methodes - sm = SchemaMethods(object_definition["schema_code"]) - - # ouverture des routes pour ce schema - # - avec les options:'object_definition' - # en particulier le cruved - sm.register_api(bp, module_code, object_code, copy.deepcopy(object_definition)) - - # les prefiltres définis dans les objects ne servent que dans les ouverture de route ??? - if "prefilters" in object_definition: - del object_definition["prefilters"] - - # enregistrement du blueprint pour ce module - current_app.register_blueprint(bp, url_prefix=f"/{module_code.lower()}") diff --git a/backend/gn_modulator/routes/__init__.py b/backend/gn_modulator/routes/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/backend/gn_modulator/routes/exports.py b/backend/gn_modulator/routes/exports.py new file mode 100644 index 00000000..943490b2 --- /dev/null +++ b/backend/gn_modulator/routes/exports.py @@ -0,0 +1,43 @@ +from gn_modulator import DefinitionMethods, ModuleMethods, SchemaMethods +from gn_modulator.blueprint import blueprint +from .utils.decorators import check_rest_route +from .utils.params import parse_request_args + + +@blueprint.route("/exports///", methods=["GET"]) +@check_rest_route("E") +def api_export(module_code, object_code, export_code): + """ + Route pour les exports + """ + + # récupération de la configuration de l'export + export_definition = DefinitionMethods.get_definition("export", export_code) + + object_definition = ModuleMethods.object_config(module_code, object_code) + schema_code = ModuleMethods.schema_code(module_code, object_code) + # renvoie une erreur si l'export n'est pas trouvé + if export_definition is None: + return "L'export correspondant au code {export_code} n'existe pas", 403 + + # definitions des paramètres + + # - query params + object_definition + params = parse_request_args(object_definition) + + # - export_definition + # - on force fields a être + # - TODO faire l'intersection de params['fields'] et export_definition['fields'] (si params['fields'] est défini) + params["fields"] = export_definition["fields"] + # - TODO autres paramètres ???? + + cruved_type = params.get("cruved_type") or "R" + + # recupération de la liste + sm = SchemaMethods(schema_code) + + query_list = sm.query_list(module_code=module_code, cruved_type=cruved_type, params=params) + + # on assume qu'il n'y que des export csv + # TODO ajouter query param export_type (csv, shape, geosjon, etc) et traiter les différents cas + return sm.process_export_csv(module_code, query_list, params) diff --git a/backend/gn_modulator/routes/rest.py b/backend/gn_modulator/routes/rest.py new file mode 100644 index 00000000..07c6542b --- /dev/null +++ b/backend/gn_modulator/routes/rest.py @@ -0,0 +1,72 @@ +from gn_modulator.blueprint import blueprint +from .utils.decorators import check_rest_route +from .utils.repository import ( + get_list_rest, + get_one_rest, + get_page_number_and_list, + post_rest, + patch_rest, + delete_rest, +) + + +@blueprint.route("/rest///", methods=["GET"]) +@check_rest_route("R") +def api_rest_get_list(module_code, object_code): + """ + Route pour récupérer les listes + """ + + return get_list_rest(module_code, object_code) + + +@blueprint.route("/rest///", methods=["GET"]) +@check_rest_route("R") +def api_rest_get_one(module_code, object_code, value): + """ + Route pour récupérer une ligne + """ + + return get_one_rest(module_code, object_code, value) + + +@blueprint.route("/page_number_and_list///", methods=["GET"]) +@check_rest_route("R") +def api_rest_get_page_number_and_list(module_code, object_code, value): + """ + Route pour récupérer une liste à partir d'un ligne + dont on va chercher le numero de page + et renvoyer la liste de la page + """ + + return get_page_number_and_list(module_code, object_code, value) + + +@blueprint.route("/rest///", methods=["POST"]) +@check_rest_route("C") +def api_rest_post(module_code, object_code): + """ + Route pour créer une nouvelle ligne + """ + + return post_rest(module_code, object_code) + + +@blueprint.route("/rest///", methods=["PATCH"]) +@check_rest_route("U") +def api_rest_patch(module_code, object_code, value): + """ + Route pour modifier une ligne + """ + + return patch_rest(module_code, object_code, value) + + +@blueprint.route("/rest///", methods=["DELETE"]) +@check_rest_route("D") +def api_rest_delete(module_code, object_code, value): + """ + Route pour supprimer une ligne + """ + + return delete_rest(module_code, object_code, value) diff --git a/backend/gn_modulator/routes/utils/__init__.py b/backend/gn_modulator/routes/utils/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/backend/gn_modulator/routes/utils/decorators.py b/backend/gn_modulator/routes/utils/decorators.py new file mode 100644 index 00000000..939091de --- /dev/null +++ b/backend/gn_modulator/routes/utils/decorators.py @@ -0,0 +1,46 @@ +from functools import wraps +from gn_modulator import ModuleMethods +from geonature.core.gn_permissions.decorators import check_cruved_scope +from werkzeug.exceptions import Forbidden + + +def check_rest_route(action): + def _check_rest_route(fn): + """ + decorateur qui va vérifier si la route est bien définie + pour un module un object et un action (CRUVED) donnés + puis effectue check_cruved_scope pour vérifier le droit de l'utilateur à accéder à cette route + """ + + @wraps(fn) + def __check_rest_route(*args, **kwargs): + module_code = kwargs["module_code"] + object_code = kwargs["object_code"] + + module_config = ModuleMethods.module_config(module_code) + + if not module_config: + raise Forbidden(description=f"Module {module_code} does not exists") + + if not module_config.get("registred"): + raise Forbidden(description=f"Module {module_code} is not registred") + + object_config = ModuleMethods.object_config(module_code, object_code) + + if not object_config: + raise Forbidden( + description=f"object {object_code} of module {module_code} is not defined" + ) + + cruved = object_config.get("cruved", "") + + if action not in cruved: + raise Forbidden( + description=f"action {action} is not defined for object {object_code} of module {module_code}" + ) + + return check_cruved_scope(action, module_code=module_code)(fn)(*args, **kwargs) + + return __check_rest_route + + return _check_rest_route diff --git a/backend/gn_modulator/routes/utils/params.py b/backend/gn_modulator/routes/utils/params.py new file mode 100644 index 00000000..739542d7 --- /dev/null +++ b/backend/gn_modulator/routes/utils/params.py @@ -0,0 +1,52 @@ +import json +from flask import request +from gn_modulator.utils.filters import parse_filters + + +def parse_request_args(object_definition={}): + params = { + "as_geojson": load_param(request.args.get("as_geojson", "false")), + "flat_keys": load_param(request.args.get("flat_keys", "false")), + "compress": load_param(request.args.get("compress", "false")), + "fields": load_array_param(request.args.get("fields")), + "field_name": load_param(request.args.get("field_name", "null")), + "filters": parse_filters(request.args.get("filters")), + "prefilters": parse_filters(request.args.get("prefilters")), + "page": load_param(request.args.get("page", "null")), + "page_size": load_param(request.args.get("page_size", "null")), + "sort": load_array_param(request.args.get("sort")), + "value": load_param(request.args.get("value", "null")), + "as_csv": load_param(request.args.get("as_csv", "false")), + "cruved_type": load_param(request.args.get("cruved_type", "null")), + "sql": "sql" in request.args, + "test": load_param(request.args.get("test", "null")), + } + + if "prefilters" in object_definition: + params["prefilters"] = ( + parse_filters(object_definition["prefilters"]) + params["prefilters"] + ) + + return params + + +def load_array_param(param): + """ + pour les cas ou params est une chaine de caractère séparée par des ',' + """ + + if not param: + return [] + + return param.split(",") + + +def load_param(param): + if param == "undefined": + return None + + # pour traiter les true false + try: + return json.loads(param) + except Exception: + return param diff --git a/backend/gn_modulator/routes/utils/repository.py b/backend/gn_modulator/routes/utils/repository.py new file mode 100644 index 00000000..b19798fb --- /dev/null +++ b/backend/gn_modulator/routes/utils/repository.py @@ -0,0 +1,154 @@ +from flask import request, make_response +from gn_modulator import ModuleMethods, SchemaMethods +from .params import parse_request_args +from sqlalchemy import orm + + +def get_list_rest(module_code, object_code, additional_params={}): + object_definition = ModuleMethods.object_config(module_code, object_code) + schema_code = ModuleMethods.schema_code(module_code, object_code) + sm = SchemaMethods(schema_code) + + params = { + **parse_request_args(object_definition), + **additional_params, + } + + cruved_type = params.get("cruved_type") or "R" + query_infos = sm.get_query_infos( + module_code=module_code, + cruved_type=cruved_type, + params=params, + url=request.url, + ) + + query_list = sm.query_list(module_code=module_code, cruved_type=cruved_type, params=params) + + if params.get("sql"): + sql_txt = sm.cls.query_as_txt(query_list) + response = make_response( + sm.cls.pprint_sql(sql_txt), + 200, + ) + response.mimetype = "text/plain" + return response + + res_list = query_list.all() + + out = { + **query_infos, + "data": sm.serialize_list( + res_list, + fields=params.get("fields"), + as_geojson=params.get("as_geojson"), + flat_keys=params.get("flat_keys"), + ), + } + + return out + + +def get_one_rest(module_code, object_code, value): + object_definition = ModuleMethods.object_config(module_code, object_code) + schema_code = ModuleMethods.schema_code(module_code, object_code) + sm = SchemaMethods(schema_code) + + params = parse_request_args(object_definition) + + try: + m = sm.get_row( + value, + field_name=params.get("field_name"), + module_code=module_code, + cruved_type="R", + params=params, + ).one() + + except sm.errors.SchemaUnsufficientCruvedRigth as e: + return f"Erreur Cruved : {str(e)}", 403 + + except orm.exc.NoResultFound as e: + return ( + f"Pas de resultats trouvé pour {schema_code} avec ({params.get('field_name') or sm.pk_field_name()})=({value})", + 404, + ) + + return sm.serialize(m, fields=params.get("fields"), as_geojson=params.get("as_geojson")) + + +def post_rest(module_code, object_code): + object_definition = ModuleMethods.object_config(module_code, object_code) + schema_code = ModuleMethods.schema_code(module_code, object_code) + sm = SchemaMethods(schema_code) + + data = request.get_json() + params = parse_request_args(object_definition) + + try: + m = sm.insert_row(data) + + except sm.errors.SchemaUnsufficientCruvedRigth as e: + return "Erreur Cruved : {}".format(str(e)), 403 + + return sm.serialize(m, fields=params.get("fields"), as_geojson=params.get("as_geojson")) + + +def patch_rest(module_code, object_code, value): + object_definition = ModuleMethods.object_config(module_code, object_code) + schema_code = ModuleMethods.schema_code(module_code, object_code) + sm = SchemaMethods(schema_code) + + data = request.get_json() + params = parse_request_args(object_definition) + + try: + m, _ = sm.update_row( + value, + data, + field_name=params.get("field_name"), + module_code=module_code, + params=params, + ) + + except sm.errors.SchemaUnsufficientCruvedRigth as e: + return "Erreur Cruved : {}".format(str(e)), 403 + + return sm.serialize(m, fields=params.get("fields"), as_geojson=params.get("as_geojson")) + + +def delete_rest(module_code, object_code, value): + object_definition = ModuleMethods.object_config(module_code, object_code) + schema_code = ModuleMethods.schema_code(module_code, object_code) + sm = SchemaMethods(schema_code) + + params = parse_request_args(object_definition) + + m = sm.get_row( + value, + field_name=params.get("field_name"), + module_code=module_code, + cruved_type="D", + params=params, + ).one() + dict_out = sm.serialize(m, fields=params.get("fields"), as_geojson=params.get("as_geojson")) + + try: + sm.delete_row(value, field_name=params.get("field_name")) + + except sm.errors.SchemaUnsufficientCruvedRigth as e: + return "Erreur Cruved : {}".format(str(e)), 403 + + return dict_out + + pass + + +def get_page_number_and_list(module_code, object_code, value): + object_definition = ModuleMethods.object_config(module_code, object_code) + schema_code = ModuleMethods.schema_code(module_code, object_code) + sm = SchemaMethods(schema_code) + + params = parse_request_args(object_definition) + page_number = sm.get_page_number(value, module_code, params.get("cruved_type") or "R", params) + + return get_list_rest(module_code, object_code, additional_params={"page": page_number}) diff --git a/backend/gn_modulator/schema/__init__.py b/backend/gn_modulator/schema/__init__.py index 742f114c..d2055ce7 100644 --- a/backend/gn_modulator/schema/__init__.py +++ b/backend/gn_modulator/schema/__init__.py @@ -4,7 +4,6 @@ class gathering methods from mixins """ -from .api import SchemaApi from .auto import SchemaAuto from .base import SchemaBase from .commands import SchemaCommands @@ -23,7 +22,6 @@ class gathering methods from mixins class SchemaMethods( - SchemaApi, SchemaAuto, SchemaBase, SchemaCommands, diff --git a/backend/gn_modulator/schema/api.py b/backend/gn_modulator/schema/api.py deleted file mode 100644 index d8ccaa62..00000000 --- a/backend/gn_modulator/schema/api.py +++ /dev/null @@ -1,391 +0,0 @@ -""" - SchemaMethods : api -""" - -import json -from flask.views import MethodView -from flask import request, make_response -from geonature.core.gn_permissions import decorators as permissions -from geonature.utils.env import db - -# from geonature.utils.config import config -from gn_modulator import MODULE_CODE -from gn_modulator.definition import DefinitionMethods - - -class SchemaApi: - """ - class for schema api processing - - doc: - - https://flask.palletsprojects.com/en/2.0.x/views/ - - """ - - def method_view_name(self, module_code, object_code, view_type): - object_code_undot = object_code.replace(".", "_") - return f"MV_{module_code}_{object_code_undot}_{view_type}" - - def view_name(self, module_code, object_code, view_type): - """ """ - object_code_undot = object_code.replace(".", "_") - return f"MV_{module_code}_{object_code_undot}_{view_type}" - - @classmethod - def base_url(cls): - """ - base url (may differ with apps (GN, UH, TH, ...)) - - TODO process apps ? - - """ - from geonature.utils.config import config - - return "{}/{}".format(config["API_ENDPOINT"], MODULE_CODE.lower()) - - def url(self, post_url, full_url=False): - """ - /{schema_code}{post_url} - - - full/url renvoie l'url complet - - TODO gérer par type d'url ? - """ - - url = self.attr("meta.url", "/{}{}".format(self.schema_code(), post_url)) - - if full_url: - url = "{}{}".format(self.cls.base_url(), url) - - return url - - def parse_request_args(self, request, object_definition={}): - """ - TODO !!! à refaire avec repo get_list - parse request flask element - - filters - - prefilters - - fields - - field_name - - sort - - page - - page_size - - TODO plusieurs possibilités pour le parametrage - - par exemple au format tabulator ou autre .... - """ - - # params = json.loads(params_txt) - params = { - "as_geojson": self.load_param(request.args.get("as_geojson", "false")), - "flat_keys": self.load_param(request.args.get("flat_keys", "false")), - "compress": self.load_param(request.args.get("compress", "false")), - "fields": self.load_array_param(request.args.get("fields")), - "field_name": self.load_param(request.args.get("field_name", "null")), - "filters": self.parse_filters(request.args.get("filters")), - "prefilters": self.parse_filters(request.args.get("prefilters")), - "page": self.load_param(request.args.get("page", "null")), - "page_size": self.load_param(request.args.get("page_size", "null")), - "sort": self.load_array_param(request.args.get("sort")), - "value": self.load_param(request.args.get("value", "null")), - "as_csv": self.load_param(request.args.get("as_csv", "false")), - "cruved_type": self.load_param(request.args.get("cruved_type", "null")), - "sql": "sql" in request.args, - "test": self.load_param(request.args.get("test", "null")), - } - - if "prefilters" in object_definition: - params["prefilters"] = ( - self.parse_filters(object_definition["prefilters"]) + params["prefilters"] - ) - - return params - - def load_array_param(self, param): - """ - pour les cas ou params est une chaine de caractère séparée par des ',' - """ - - if not param: - return [] - - return param.split(",") - - def load_param(self, param): - if param == "undefined": - return None - - # pour traiter les true false - try: - return json.loads(param) - except Exception: - return param - - def schema_api_dict(self, module_code, object_definition): - """ - object_definition : dict - - prefilters - """ - - def get_rest(self_mv, value=None): - if value: - try: - return get_one_rest(value) - except self.errors.SchemaUnsufficientCruvedRigth: - return f"Vous n'avez pas les droits suffisants pour accéder à cette requête (schema_code: {self.schema_code()}, module_code: {module_code})" - - else: - return get_list_rest() - - def get_one_rest(value): - params = self.parse_request_args(request, object_definition) - - try: - m = self.get_row( - value, - field_name=params.get("field_name"), - module_code=module_code, - cruved_type="R", - params=params, - ).one() - - except self.errors.SchemaUnsufficientCruvedRigth as e: - return "Erreur Cruved : {}".format(str(e)), 403 - - return self.serialize( - m, fields=params.get("fields"), as_geojson=params.get("as_geojson") - ) - - def get_list_rest(additional_params={}): - params = { - **self.parse_request_args(request, object_definition), - **additional_params, - } - - cruved_type = params.get("cruved_type") or "R" - query_infos = self.get_query_infos( - module_code=module_code, - cruved_type=cruved_type, - params=params, - url=request.url, - ) - - query_list = self.query_list( - module_code=module_code, cruved_type=cruved_type, params=params - ) - - if params.get("sql"): - sql_txt = self.cls.query_as_txt(query_list) - response = make_response( - self.cls.pprint_sql(sql_txt), - 200, - ) - response.mimetype = "text/plain" - return response - - res_list = query_list.all() - - out = { - **query_infos, - "data": self.serialize_list( - res_list, - fields=params.get("fields"), - as_geojson=params.get("as_geojson"), - flat_keys=params.get("flat_keys"), - ), - } - - return out - - def post_rest(self_mv): - data = request.get_json() - params = self.parse_request_args(request, object_definition) - - try: - m = self.insert_row(data) - - except self.errors.SchemaUnsufficientCruvedRigth as e: - return "Erreur Cruved : {}".format(str(e)), 403 - - return self.serialize( - m, fields=params.get("fields"), as_geojson=params.get("as_geojson") - ) - - def patch_rest(self_mv, value): - data = request.get_json() - params = self.parse_request_args(request, object_definition) - - try: - m, _ = self.update_row( - value, - data, - field_name=params.get("field_name"), - module_code=module_code, - params=params, - ) - - except self.errors.SchemaUnsufficientCruvedRigth as e: - return "Erreur Cruved : {}".format(str(e)), 403 - - return self.serialize( - m, fields=params.get("fields"), as_geojson=params.get("as_geojson") - ) - - def delete_rest(self_mv, value): - params = self.parse_request_args(request, object_definition) - - m = self.get_row( - value, - field_name=params.get("field_name"), - module_code=module_code, - cruved_type="D", - params=params, - ).one() - dict_out = self.serialize( - m, fields=params.get("fields"), as_geojson=params.get("as_geojson") - ) - - try: - self.delete_row(value, field_name=params.get("field_name")) - - except self.errors.SchemaUnsufficientCruvedRigth as e: - return "Erreur Cruved : {}".format(str(e)), 403 - - return dict_out - - def get_page_number(self_mv, value): - """ """ - - params = self.parse_request_args(request, object_definition) - page_number = self.get_page_number( - value, module_code, params.get("cruved_type") or "R", params - ) - - return get_list_rest(additional_params={"page": page_number}) - # return { - # "page": self.get_page_number( - # value, module_code, params.get("cruved_type") or "R", params - # ) - # } - - def get_export(self_mv, export_code): - """ - methode pour gérer la route d'export - - récupération de la configuration de l'export - """ - - # récupération de la configuration de l'export - export_definition = DefinitionMethods.get_definition("export", export_code) - - # renvoie une erreur si l'export n'est pas trouvé - if export_definition is None: - return "L'export correspondant au code {export_code} n'existe pas", 403 - - # definitions des paramètres - - # - query params + object_definition - params = self.parse_request_args(request, object_definition) - - # - export_definition - # - on force fields a être - # - TODO faire l'intersection de params['fields'] et export_definition['fields'] (si params['fields'] est défini) - params["fields"] = export_definition["fields"] - # - TODO autres paramètres ???? - - cruved_type = params.get("cruved_type") or "R" - - # recupération de la liste - query_list = self.query_list( - module_code=module_code, cruved_type=cruved_type, params=params - ) - - # on assume qu'il n'y que des export csv - # TODO ajouter query param export_type (csv, shape, geosjon, etc) et traiter les différents cas - return self.process_export_csv(module_code, query_list, params) - - return { - "rest": { - "get": permissions.check_cruved_scope("R", module_code=module_code)(get_rest), - "post": permissions.check_cruved_scope("C", module_code=module_code)(post_rest), - "patch": permissions.check_cruved_scope("U", module_code=module_code)(patch_rest), - "delete": permissions.check_cruved_scope("D", module_code=module_code)( - delete_rest - ), - }, - "export": { - "get": permissions.check_cruved_scope("E", module_code=module_code)(get_export) - }, - "page_number": { - "get": permissions.check_cruved_scope("R", module_code=module_code)( - get_page_number - ) - }, - } - - def schema_view_func(self, view_type, module_code, object_definition): - """ - c'est ici que ce gère le CRUVED pour l'accès aux routes - """ - - schema_api_dict = self.schema_api_dict(module_code, object_definition)[view_type] - - MV = type( - self.method_view_name(module_code, object_definition["object_code"], view_type), - (MethodView,), - schema_api_dict, - ) - return MV.as_view(self.view_name(module_code, object_definition["object_code"], view_type)) - - def register_api(self, bp, module_code, object_code, object_definition={}): - """ - Fonction qui enregistre une api pour un schema - - TODO s - -comment gérer la config pour limiter les routes selon le cruved - """ - - cruved = object_definition.get("cruved", "") - - # rest api - view_func_rest = self.schema_view_func("rest", module_code, object_definition) - view_func_page_number = self.schema_view_func( - "page_number", module_code, object_definition - ) - view_func_export = self.schema_view_func("export", module_code, object_definition) - - # read: GET (liste et one_row) - if "R" in cruved: - bp.add_url_rule( - f"/{object_code}/", - defaults={"value": None}, - view_func=view_func_rest, - methods=["GET"], - ) - bp.add_url_rule(f"/{object_code}/", view_func=view_func_rest, methods=["GET"]) - bp.add_url_rule( - f"/{object_code}/page_number/", - view_func=view_func_page_number, - methods=["GET"], - ) - - # create : POST - if "C" in cruved: - bp.add_url_rule(f"/{object_code}/", view_func=view_func_rest, methods=["POST"]) - - # update : PATCH - if "U" in cruved: - bp.add_url_rule(f"/{object_code}/", view_func=view_func_rest, methods=["PATCH"]) - - # delete : DELETE - if "D" in cruved: - bp.add_url_rule( - f"/{object_code}/", view_func=view_func_rest, methods=["DELETE"] - ) - - # export - if "E" in cruved: # and object_definition.get("exports"): - bp.add_url_rule( - f"/{object_code}/exports/", - view_func=view_func_export, - methods=["GET"], - ) diff --git a/backend/gn_modulator/schema/base.py b/backend/gn_modulator/schema/base.py index da7408eb..b67560a4 100644 --- a/backend/gn_modulator/schema/base.py +++ b/backend/gn_modulator/schema/base.py @@ -8,6 +8,7 @@ import copy import json +from gn_modulator import MODULE_CODE from gn_modulator.utils.cache import get_global_cache column_types = [ @@ -338,3 +339,27 @@ def process_csv_data(self, key, data, options={}): return labels[1] if len(labels) > 2 else None return data + + @classmethod + def base_url(cls): + """ + base url (may differ with apps (GN, UH, TH, ...)) + TODO process apps ? + """ + from geonature.utils.config import config + + return "{}/{}".format(config["API_ENDPOINT"], MODULE_CODE.lower()) + + def url(self, post_url, full_url=False): + """ + /{schema_code}{post_url} + - full/url renvoie l'url complet + TODO gérer par type d'url ? + """ + + url = self.attr("meta.url", "/{}{}".format(self.schema_code(), post_url)) + + if full_url: + url = "{}{}".format(self.cls.base_url(), url) + + return url diff --git a/backend/gn_modulator/schema/models/column_properties.py b/backend/gn_modulator/schema/models/column_properties.py index f3e73fa6..9a5470a9 100644 --- a/backend/gn_modulator/schema/models/column_properties.py +++ b/backend/gn_modulator/schema/models/column_properties.py @@ -9,6 +9,7 @@ cast, ) from geonature.utils.env import db +from gn_modulator.utils.filters import parse_filters from .. import errors @@ -98,7 +99,7 @@ def column_property_util_relation_where_conditions(self, key, column_property_de if column_property_def.get("filters") is not None: condition_filters, conditions = rel.process_filter_array( relation.mapper.entity, - self.parse_filters(column_property_def.get("filters")), + parse_filters(column_property_def.get("filters")), query=conditions, condition=True, ) diff --git a/backend/gn_modulator/schema/repositories/filters.py b/backend/gn_modulator/schema/repositories/filters.py index bfdcdb40..9143e89a 100644 --- a/backend/gn_modulator/schema/repositories/filters.py +++ b/backend/gn_modulator/schema/repositories/filters.py @@ -113,106 +113,6 @@ def process_filter_array(self, Model, filter_array, query=None, condition=None): cur_filter = loop_filter return cur_filter, query - def find_index_close(self, index_open, filters): - """ - pour trouver l'index de la parenthèse fermante ] correspondante - """ - cpt_open = 0 - for index in range(index_open + 1, len(filters)): - if filters[index] == "[": - cpt_open += 1 - if filters[index] == "]": - if cpt_open == 0: - return index - else: - cpt_open -= 1 - filters[index_open] = f" {filters[index_open]} " - raise Exception(f"Pas de parenthèse fermante trouvée {','.join(filters[index_open:])}") - - def parse_filters(self, filters): - """ - traite une liste de chaine de caractères représentant des filtres - """ - - if not filters: - return [] - - if isinstance(filters, str): - return self.parse_filters(filters.split(",")) - - filters_out = [] - - nb_filters = len(filters) - index = 0 - while index < nb_filters: - # calcul du filtre {field, type, value} - filter = self.parse_filter(filters[index]) - - # si on tombe sur une parenthèse ouvrante - if filter == "[": - # on cherche l'index de la parenthèse fermante ] correspondante - index_close = self.find_index_close(index, filters) - - # on calcule les filtres entre les deux [...] - filters_out.append(self.parse_filters(filters[index + 1 : index_close])) - - # on passe à l'index qui suit index_close - index = index_close + 1 - # de l'indice du ']' correspondant - - # si on tombe sur une parenthère fermante => pb - elif filter == "]": - filters[index] = f" {filters[index]} " - raise SchemaRepositoryFilterError( - f"Parenthese fermante non appariée trouvée dans {','.join(filters)}" - ) - - # sinon on ajoute le filtre à la liste et on passe à l'index suivant - else: - filters_out.append(filter) - index += 1 - - return filters_out - - def parse_filter(self, str_filter): - """ - renvoie un filtre a partir d'une chaine de caractère - id_truc=5 => { field: id_truc type: = value: 5 } etc... - """ - - if str_filter in "*|![]": - return str_filter - - index_min = None - filter_type_min = None - for filter_type in ["=", "<", ">", ">=", "<=", "like", "ilike", "in", "~"]: - try: - index = str_filter.index(f" {filter_type} ") - except ValueError: - continue - - if ( - (index_min is None) - or (index < index_min) - or (index_min == index and len(filter_type) > len(filter_type_min)) - ): - index_min = index - filter_type_min = filter_type - - if not filter_type_min: - return None - - filter = { - "field": str_filter[:index_min], - "type": filter_type_min, - "value": str_filter[index_min + len(filter_type_min) + 2 :], - } - - if filter_type_min == "in": - filter["value"] = filter["value"].split(";") - - return filter - def get_filter(self, Model, filter, query=None, condition=None): """ get filter diff --git a/backend/gn_modulator/tests/test_rest_api.py b/backend/gn_modulator/tests/test_rest_api.py new file mode 100644 index 00000000..93069881 --- /dev/null +++ b/backend/gn_modulator/tests/test_rest_api.py @@ -0,0 +1,25 @@ +""" + Test pour valider les fonctionalité repository + - get_one + - insert + - update + - delete + - list ?? +""" + +import pytest +from .utils.rest import test_schema_rest +from .data import commons as data_commons + + +@pytest.mark.usefixtures("client_class", "temporary_transaction") +class TestRest: + def test_gn_commons_module(self, client, users): + test_schema_rest( + client, + users["admin_user"], + "MODULATOR", + "commons.module", + data_commons.module(), + data_commons.module_update(), + ) diff --git a/backend/gn_modulator/tests/utils/rest.py b/backend/gn_modulator/tests/utils/rest.py new file mode 100644 index 00000000..f2120ec4 --- /dev/null +++ b/backend/gn_modulator/tests/utils/rest.py @@ -0,0 +1,119 @@ +import pytest + +from flask import url_for +from gn_modulator import SchemaMethods, ModuleMethods +from geonature.tests.utils import set_logged_user_cookie, unset_logged_user_cookie + + +@pytest.mark.skip() +def test_schema_rest(client, user, module_code, object_code, data_post, data_update): + """ + Test chainage sur les api rest + - get (vide) + - post + - get + - patch + - delete + - get(vide) + """ + + # patch cruved for tests + object_config = ModuleMethods.object_config(module_code, object_code) + assert object_config is not None + + object_config["cruved"] = "CRUVED" + + # INIT + set_logged_user_cookie(client, user) + schema_code = ModuleMethods.schema_code(module_code, object_code) + assert schema_code is not None + sm = SchemaMethods(schema_code) + field_name = sm.attr("meta.unique") + data_unique = ",".join(list(map(lambda x: data_post[x], field_name))) + + # GET VIDE + r = client.get( + url_for( + "modulator.api_rest_get_one", + value=data_unique, + module_code=module_code, + object_code=object_code, + field_name=field_name, + ) + ) + assert r.status_code == 404, "La donnée ne devrait pas exister" + + # POST + fields = list(data_post.keys()) + fields.append(sm.pk_field_name()) + + r = client.post( + url_for( + "modulator.api_rest_post", + module_code=module_code, + object_code=object_code, + fields=",".join(fields), + ), + data=data_post, + ) + + assert r.status_code == 200, "Erreur avec POST" + + data_from_post = r.json + assert all(data_post[k] == data_from_post[k] for k in list(data_post.keys())) + + assert sm.pk_field_name() in data_from_post + id = data_from_post[sm.pk_field_name()] + + # GET OK + r = client.get( + url_for( + "modulator.api_rest_get_one", + value=id, + module_code=module_code, + object_code=object_code, + ) + ) + assert r.status_code == 200, "Erreur avec GET" + + # PATCH + r = client.patch( + url_for( + "modulator.api_rest_patch", + value=id, + module_code=module_code, + object_code=object_code, + fields=",".join(list(data_update.keys())), + ), + data=data_update, + ) + + assert r.status_code == 200, "Erreur avec PATCH" + data_from_patch = r.json + assert all(data_update[k] == data_from_patch[k] for k in list(data_update.keys())) + + # DELETE + r = client.delete( + url_for( + "modulator.api_rest_delete", + value=id, + module_code=module_code, + object_code=object_code, + ) + ) + + assert r.status_code == 200, "Erreur avec DELETE" + # GET VIDE + r = client.get( + url_for( + "modulator.api_rest_get_one", + value=data_unique, + module_code=module_code, + object_code=object_code, + field_name=field_name, + ) + ) + assert r.status_code == 404, "La donnée n'a pas été effacée" + + # FINALIZE + unset_logged_user_cookie(client) diff --git a/backend/gn_modulator/utils/filters.py b/backend/gn_modulator/utils/filters.py new file mode 100644 index 00000000..eb60a8a3 --- /dev/null +++ b/backend/gn_modulator/utils/filters.py @@ -0,0 +1,104 @@ +from gn_modulator.schema.errors import SchemaRepositoryFilterError, SchemaRepositoryFilterTypeError + + +def parse_filters(filters): + """ + traite une liste de chaine de caractères représentant des filtres + """ + + if not filters: + return [] + + if isinstance(filters, str): + return parse_filters(filters.split(",")) + + filters_out = [] + + nb_filters = len(filters) + index = 0 + while index < nb_filters: + # calcul du filtre {field, type, value} + filter = parse_filter(filters[index]) + + # si on tombe sur une parenthèse ouvrante + if filter == "[": + # on cherche l'index de la parenthèse fermante ] correspondante + index_close = find_index_close(index, filters) + + # on calcule les filtres entre les deux [...] + filters_out.append(parse_filters(filters[index + 1 : index_close])) + + # on passe à l'index qui suit index_close + index = index_close + 1 + # de l'indice du ']' correspondant + + # si on tombe sur une parenthère fermante => pb + elif filter == "]": + filters[index] = f" {filters[index]} " + raise SchemaRepositoryFilterError( + f"Parenthese fermante non appariée trouvée dans {','.join(filters)}" + ) + + # sinon on ajoute le filtre à la liste et on passe à l'index suivant + else: + filters_out.append(filter) + index += 1 + + return filters_out + + +def parse_filter(str_filter): + """ + renvoie un filtre a partir d'une chaine de caractère + id_truc=5 => { field: id_truc type: = value: 5 } etc... + """ + + if str_filter in "*|![]": + return str_filter + + index_min = None + filter_type_min = None + for filter_type in ["=", "<", ">", ">=", "<=", "like", "ilike", "in", "~"]: + try: + index = str_filter.index(f" {filter_type} ") + except ValueError: + continue + + if ( + (index_min is None) + or (index < index_min) + or (index_min == index and len(filter_type) > len(filter_type_min)) + ): + index_min = index + filter_type_min = filter_type + + if not filter_type_min: + return None + + filter = { + "field": str_filter[:index_min], + "type": filter_type_min, + "value": str_filter[index_min + len(filter_type_min) + 2 :], + } + + if filter_type_min == "in": + filter["value"] = filter["value"].split(";") + + return filter + + +def find_index_close(index_open, filters): + """ + pour trouver l'index de la parenthèse fermante ] correspondante + """ + cpt_open = 0 + for index in range(index_open + 1, len(filters)): + if filters[index] == "[": + cpt_open += 1 + if filters[index] == "]": + if cpt_open == 0: + return index + else: + cpt_open -= 1 + filters[index_open] = f" {filters[index_open]} " + raise Exception(f"Pas de parenthèse fermante trouvée {','.join(filters[index_open:])}") diff --git a/doc/changelog.md b/doc/changelog.md index bf6459cc..6e20e311 100644 --- a/doc/changelog.md +++ b/doc/changelog.md @@ -1,6 +1,10 @@ # Changelog +## 1.0.6 (unreleased) +**✨ Améliorations** + +- Clarification dans la gestion des routes REST ## 1.0.5 (13-03-2023) **✨ Améliorations** diff --git a/frontend/app/services/config.service.ts b/frontend/app/services/config.service.ts index 3a332597..7337d49f 100644 --- a/frontend/app/services/config.service.ts +++ b/frontend/app/services/config.service.ts @@ -141,7 +141,7 @@ export class ModulesConfigService { exportUrl(moduleCode, objectCode, exportCode, options: any = {}) { const url = this._mRequest.url( - `${this.backendUrl()}/${moduleCode.toLowerCase()}/${objectCode}/exports/${exportCode}`, + `${this.backendUrl()}/modulator/exports/${moduleCode.toLowerCase()}/${objectCode}/${exportCode}`, { prefilters: options.prefilters, filters: options.filters, @@ -151,7 +151,7 @@ export class ModulesConfigService { } objectUrl(moduleCode, objectCode, value = '', urlSuffix = '') { - return `${this.backendUrl()}/${moduleCode.toLowerCase()}/${objectCode}/${urlSuffix}${ + return `${this.backendUrl()}/modulator/${urlSuffix || 'rest'}/${moduleCode}/${objectCode}/${ value || '' }`; } diff --git a/frontend/app/services/data.service.ts b/frontend/app/services/data.service.ts index 875f820f..36d4e84e 100644 --- a/frontend/app/services/data.service.ts +++ b/frontend/app/services/data.service.ts @@ -63,7 +63,7 @@ export class ModulesDataService { return this.dataRequest('get', moduleCode, objectCode, { value, params, - urlSuffix: 'page_number/', + urlSuffix: 'page_number_and_list', }); } From 690b05b16f2518bdf1d413e5349597a9b422ce43 Mon Sep 17 00:00:00 2001 From: "joel.clement" Date: Mon, 13 Mar 2023 12:02:30 +0100 Subject: [PATCH 002/142] refactor button & color --- config/layouts/utils/utils.button_edit.layout.yml | 2 +- .../layouts/utils/utils.buttons_filter.layout.yml | 15 +++++++-------- .../layouts/utils/utils.buttons_form.layout.yml | 2 +- frontend/app/components/base/base.scss | 12 ++++++++++++ 4 files changed, 21 insertions(+), 10 deletions(-) diff --git a/config/layouts/utils/utils.button_edit.layout.yml b/config/layouts/utils/utils.button_edit.layout.yml index 6a6bc528..fe65cf55 100644 --- a/config/layouts/utils/utils.button_edit.layout.yml +++ b/config/layouts/utils/utils.button_edit.layout.yml @@ -4,7 +4,7 @@ title: boutton edit description: Bouton 'editer', destiné aux page de detail de monitoring layout: type: button - color: primary + color: success title: Éditer description: __f__o.label_edit(x) action: edit diff --git a/config/layouts/utils/utils.buttons_filter.layout.yml b/config/layouts/utils/utils.buttons_filter.layout.yml index 11c4b5d1..0ed7d704 100644 --- a/config/layouts/utils/utils.buttons_filter.layout.yml +++ b/config/layouts/utils/utils.buttons_filter.layout.yml @@ -9,15 +9,14 @@ layout: items: - flex: "0" type: button - color: primary + color: error + icon: refresh + description: Réinitialiser filtres + action: clear-filters + - flex: "0" + type: button + color: success title: Rechercher icon: done description: Effectuer une recherche avec les filtre définis ci-dessus action: filter - - flex: "0" - type: button - color: primary - title: Réinitialiser - icon: refresh - description: RAZ des filtres - action: clear-filters diff --git a/config/layouts/utils/utils.buttons_form.layout.yml b/config/layouts/utils/utils.buttons_form.layout.yml index d7d79942..15168131 100644 --- a/config/layouts/utils/utils.buttons_form.layout.yml +++ b/config/layouts/utils/utils.buttons_form.layout.yml @@ -8,7 +8,7 @@ layout: items: - flex: "0" type: button - color: primary + color: success title: Valider icon: done description: Enregistrer le contenu du formulaire diff --git a/frontend/app/components/base/base.scss b/frontend/app/components/base/base.scss index f9bf991a..c722c1e4 100644 --- a/frontend/app/components/base/base.scss +++ b/frontend/app/components/base/base.scss @@ -29,6 +29,18 @@ width: 50%; } +// couleur custom des bouttons +.layout-buttons .mat-success { + background-color: green; + color: #fff; +} + +// couleur custom des bouttons +.layout-buttons .mat-error { + background-color: red; + color: #fff; +} + .content-container { min-width: 50%; } From 1233af69643dc669394b0c6b14024a84f9f4311f Mon Sep 17 00:00:00 2001 From: "joel.clement" Date: Mon, 20 Mar 2023 22:23:54 +0100 Subject: [PATCH 003/142] fix #32 overflow-y and scrolls --- .../layouts/utils/utils.object_details.layout.yml | 3 +-- .../utils/utils.object_form_map.layout.yml | 3 +-- config/modules/contrib/m_sipaf/config.yml | 15 +++++++++------ doc/changelog.md | 1 + .../layout/base/layout-section.component.html | 8 ++++++-- .../components/layout/base/layout.component.ts | 14 +++++++++----- .../object/layout-object-filters.component.ts | 1 - 7 files changed, 27 insertions(+), 18 deletions(-) diff --git a/config/layouts/utils/utils.object_details.layout.yml b/config/layouts/utils/utils.object_details.layout.yml index ab613413..6c01c415 100644 --- a/config/layouts/utils/utils.object_details.layout.yml +++ b/config/layouts/utils/utils.object_details.layout.yml @@ -10,7 +10,6 @@ layout: items: - title: __f__o.title_details(x) flex: "0" - - overflow: true - items: __LAYOUT__ + - items: __LAYOUT__ - code: utils.button_edit flex: "0" diff --git a/config/layouts/utils/utils.object_form_map.layout.yml b/config/layouts/utils/utils.object_form_map.layout.yml index 52a21cb3..e4f3449c 100644 --- a/config/layouts/utils/utils.object_form_map.layout.yml +++ b/config/layouts/utils/utils.object_form_map.layout.yml @@ -28,7 +28,6 @@ layout: flex: "0" - title: __f__o.title_create_edit(x) flex : "0" - - overflow: true - items: __LAYOUT__ + - items: __LAYOUT__ - code: utils.buttons_form flex: '0' diff --git a/config/modules/contrib/m_sipaf/config.yml b/config/modules/contrib/m_sipaf/config.yml index cebd7977..3e1f2ac4 100644 --- a/config/modules/contrib/m_sipaf/config.yml +++ b/config/modules/contrib/m_sipaf/config.yml @@ -1,5 +1,6 @@ site_filters_fields: display: tabs + overflow: true items: - label: Infos items: @@ -102,6 +103,7 @@ site_map_popup_fields: site_details_fields: display: tabs + overflow: true items: - label: Propriétés items: @@ -165,7 +167,7 @@ site_details_fields: - key: nomenclatures_ouvrage_type.cd_nomenclature hidden: true - key: ouvrage_type_autre - hidden: __f__!data.nomenclatures_ouvrage_type?.some(n => n.cd_nomenclature == 'AUT') + hidden: __f__!data?.nomenclatures_ouvrage_type?.some(n => n.cd_nomenclature == 'AUT') - direction: row items: - pi_ou_ps @@ -185,7 +187,7 @@ site_details_fields: - diametre - title: Banquette (Ouvrages hydrauliques) display: fieldset - hidden: "__f__!data.ouvrage_hydrau" + hidden: "__f__!data?.ouvrage_hydrau" items: - direction: row items: @@ -202,6 +204,7 @@ site_details_fields: site_form_fields: display: tabs + overflow: true items: - label: Propriétés items: @@ -280,10 +283,10 @@ site_form_fields: return_object: true additional_fields: ["cd_nomenclature"] - key: ouvrage_type_autre - description: __f__data.nomenclatures_ouvrage_type?.some(n => n.cd_nomenclature == 'AUT') + description: __f__data?.nomenclatures_ouvrage_type?.some(n => n.cd_nomenclature == 'AUT') type: string - hidden: __f__!data.nomenclatures_ouvrage_type?.some(n => n.cd_nomenclature == 'AUT') - required: __f__data.nomenclatures_ouvrage_type?.some(n => n.cd_nomenclature == 'AUT') + hidden: __f__!data?.nomenclatures_ouvrage_type?.some(n => n.cd_nomenclature == 'AUT') + required: __f__data?.nomenclatures_ouvrage_type?.some(n => n.cd_nomenclature == 'AUT') - title: Dimensions display: fieldset @@ -299,7 +302,7 @@ site_form_fields: - hauteur_dispo_faune - diametre - title: Banquette - hidden: "__f__!data.ouvrage_hydrau" + hidden: "__f__!data?.ouvrage_hydrau" display: fieldset items: - direction: row diff --git a/doc/changelog.md b/doc/changelog.md index 6e20e311..564645fe 100644 --- a/doc/changelog.md +++ b/doc/changelog.md @@ -5,6 +5,7 @@ **✨ Améliorations** - Clarification dans la gestion des routes REST +- Meilleure gestion des `tabs` et des `scrolls` ## 1.0.5 (13-03-2023) **✨ Améliorations** diff --git a/frontend/app/components/layout/base/layout-section.component.html b/frontend/app/components/layout/base/layout-section.component.html index 5fc7e8ba..f873c273 100644 --- a/frontend/app/components/layout/base/layout-section.component.html +++ b/frontend/app/components/layout/base/layout-section.component.html @@ -7,7 +7,7 @@
- + on remet à 0 + const overflowStyle = {}; + if (this.computedLayout.display != 'tabs') { + overflowStyle['overflow-y'] = 'scroll'; + } if (this.docHeightSave > docHeight || !this.docHeightSave) { this.computedLayout.style = { ...(this.computedLayout.style || {}), height: '200px', - 'overflow-y': 'scroll', + ...overflowStyle, }; this.layout.style = { ...(this.layout.style || {}), height: `200px`, - 'overflow-y': 'scroll', + ...overflowStyle, }; } @@ -447,13 +451,13 @@ export class ModulesLayoutComponent implements OnInit { this.layout.style = { ...(this.layout.style || {}), height: `${height}px`, - 'overflow-y': 'scroll', + ...overflowStyle, }; this.computedLayout.style = { ...(this.computedLayout.style || {}), height: `${height}px`, - 'overflow-y': 'scroll', + ...overflowStyle, }; }, 200); } @@ -508,7 +512,7 @@ export class ModulesLayoutComponent implements OnInit { } const elementHeight = elem && `${elem.clientHeight}px`; - const bodyHeight = `${document.body.clientHeight - elem.offsetTop}px`; + const bodyHeight = `${document.body.clientHeight - elem.offsetTop - 4}px`; // si la taille de l'élément correspond à la taille de la page // -> on ne fait rien diff --git a/frontend/app/components/layout/object/layout-object-filters.component.ts b/frontend/app/components/layout/object/layout-object-filters.component.ts index b6a67316..5b8afb69 100644 --- a/frontend/app/components/layout/object/layout-object-filters.component.ts +++ b/frontend/app/components/layout/object/layout-object-filters.component.ts @@ -38,7 +38,6 @@ export class ModulesLayoutObjectFiltersComponent }, { items: this.layout.items, - overflow: true, }, { flex: '0', From be5fa6c9e9b3d77e268a38d43eb2c0f0f369e20e Mon Sep 17 00:00:00 2001 From: "joel.clement" Date: Tue, 21 Mar 2023 22:23:10 +0100 Subject: [PATCH 004/142] add pr_sipaf models --- backend/gn_modulator/schema/auto.py | 1 - .../gn_modulator/schema/repositories/base.py | 4 + backend/gn_modulator/schema/sql/base.py | 32 ++-- config/modules/contrib/m_sipaf/config.yml | 2 +- .../definitions/m_sipaf.actor.schema.yml | 6 +- .../m_sipaf/definitions/m_sipaf.pf.schema.yml | 141 +----------------- .../m_sipaf/exports/m_sipaf.pf.export.yml | 2 +- 7 files changed, 37 insertions(+), 151 deletions(-) diff --git a/backend/gn_modulator/schema/auto.py b/backend/gn_modulator/schema/auto.py index 83956bae..e512ac37 100644 --- a/backend/gn_modulator/schema/auto.py +++ b/backend/gn_modulator/schema/auto.py @@ -48,7 +48,6 @@ def get_autoschema(self): return schema_definition Model = get_class_from_path(self.attr("meta.model")) - if Model is None: raise SchemaAutoError( "Pas de modèles trouvé pour la table {}".format(schema_dot_table) diff --git a/backend/gn_modulator/schema/repositories/base.py b/backend/gn_modulator/schema/repositories/base.py index 2eca617e..acff8233 100644 --- a/backend/gn_modulator/schema/repositories/base.py +++ b/backend/gn_modulator/schema/repositories/base.py @@ -255,6 +255,10 @@ def query_list(self, module_code=MODULE_CODE, cruved_type="R", params={}, query_ """ Model = self.Model() + + if Model is None: + raise Exception(f"Model not found for {self.schema_code()}") + model_pk_fields = [ getattr(Model, pk_field_name) for pk_field_name in self.pk_field_names() ] diff --git a/backend/gn_modulator/schema/sql/base.py b/backend/gn_modulator/schema/sql/base.py index ebf02674..50c1202e 100644 --- a/backend/gn_modulator/schema/sql/base.py +++ b/backend/gn_modulator/schema/sql/base.py @@ -30,6 +30,25 @@ def auto_sql_schemas_dot_tables(cls): return auto_sql_schemas_dot_tables + @classmethod + def get_tables(cls): + if tables := get_global_cache(["schema_dot_tables"]): + return tables + + sql_txt_tables = f""" + SELECT + concat(t.table_schema, '.', t.table_name) + FROM + information_schema.tables t + WHERE + CONCAT(t.table_schema, '.', t.table_name) IN ('{"', '".join(cls.auto_sql_schemas_dot_tables())}') + + """ + res = cls.c_sql_exec_txt(sql_txt_tables) + tables = [r[0] for r in res] + set_global_cache(["schema_dot_tables"], tables) + return tables + @classmethod def get_table_columns(cls, schema_dot_table): table_schema = schema_dot_table.split(".")[0] @@ -181,20 +200,9 @@ def c_sql_schema_dot_table_exists(cls, sql_schema_dot_table): sql_table_name = sql_schema_dot_table.split(".")[1] return cls.c_sql_table_exists(sql_schema_name, sql_table_name) - @classmethod - def table_names(cls, sql_schema_name): - table_names = get_global_cache(["table_names", sql_schema_name]) - if table_names is None: - inspector = inspect(db.engine) - table_names = inspector.get_table_names(sql_schema_name) + inspector.get_view_names( - sql_schema_name - ) - set_global_cache(["table_names", sql_schema_name], table_names) - return table_names - @classmethod def c_sql_table_exists(cls, sql_schema_name, sql_table_name): - return sql_table_name.lower() in cls.table_names(sql_schema_name) + return f"{sql_schema_name}.{sql_table_name}".lower() in cls.get_tables() @classmethod def c_sql_schema_exists(cls, sql_schema_name): diff --git a/config/modules/contrib/m_sipaf/config.yml b/config/modules/contrib/m_sipaf/config.yml index 3e1f2ac4..23366262 100644 --- a/config/modules/contrib/m_sipaf/config.yml +++ b/config/modules/contrib/m_sipaf/config.yml @@ -193,7 +193,7 @@ site_details_fields: items: - nomenclature_ouvrage_hydrau_position.label_fr - nomenclature_ouvrage_hydrau_banq_caract.label_fr - - nomenclature_ouvrage_hydro_banq_type.label_fr + - nomenclature_ouvrage_hydrau_banq_type.label_fr - ouvrag_hydrau_tirant_air - label: __f__`Médias (${data?.medias?.length || 0})` items: diff --git a/config/modules/contrib/m_sipaf/definitions/m_sipaf.actor.schema.yml b/config/modules/contrib/m_sipaf/definitions/m_sipaf.actor.schema.yml index 70b97997..a364b2fb 100644 --- a/config/modules/contrib/m_sipaf/definitions/m_sipaf.actor.schema.yml +++ b/config/modules/contrib/m_sipaf/definitions/m_sipaf.actor.schema.yml @@ -7,9 +7,11 @@ required: - id_passage_faune - id_nomenclature_type_actor meta: + autoschema: true schema_code: m_sipaf.actor - sql_processing: true - sql_schema_dot_table: pr_sipaf.cor_actor_pf + # sql_processing: true + # sql_schema_dot_table: pr_sipaf.cor_actor_pf + model: m_sipaf.models.Actor genre: M label: Acteur label_field_name: id_nomenclature_type_actor diff --git a/config/modules/contrib/m_sipaf/definitions/m_sipaf.pf.schema.yml b/config/modules/contrib/m_sipaf/definitions/m_sipaf.pf.schema.yml index 3aa26b54..e6fe3d0e 100644 --- a/config/modules/contrib/m_sipaf/definitions/m_sipaf.pf.schema.yml +++ b/config/modules/contrib/m_sipaf/definitions/m_sipaf.pf.schema.yml @@ -4,8 +4,11 @@ title: schema passage faune description: schema pour les passages à faune meta: - sql_processing: true - sql_schema_dot_table: pr_sipaf.t_passages_faune + # sql_processing: true + # sql_schema_dot_table: pr_sipaf.t_passages_faune + # unique_in_db: true + autoschema: true + model: m_sipaf.models.PassageFaune genre: M label: passage à faune labels: passages à faune @@ -13,300 +16,170 @@ meta: geometry_field_name: geom unique: - code_passage_faune - unique_in_db: true check_cruved: true properties: id_passage_faune: - type: integer title: ID - primary_key: true code_passage_faune: - type: string title: Code passage faune - required: true description: "Code permettant d'identifier le passage à faune de manière unique (texte)" uuid_passage_faune: - type: uuid title: UUID - default: uuid description: Identifiant universel unique au format UUID (uuid_pf) id_digitiser: - type: integer - foreign_key: true - schema_code: user.role title: Numérisateur description: Personne qui a saisi la donnée digitiser: - type: relation - relation_type: n-1 - schema_code: user.role title: Numérisateur description: Personne qui a saisi la donnée - local_key: id_digitiser pi_ou_ps: - type: boolean title: Positionnement description: Positionnement du passage vis-à vis de l’infrastructure (inférieur (False) ou supérieur (True)) labels: - Supérieur - Inférieur geom: - type: geometry - geometry_type: geometry - srid: 4326 title: Geometrie (4326) description: Géometrie du passage à faune (SRID=4326) - index: true - required: true geom_local: - type: geometry - geometry_type: geometry - srid: __LOCAL_SRID__ title: Geometrie locale (__LOCAL_SRID__) description: Géométrie locale du passage à faune (SRID=__LOCAL_SRID__) - index: true - trigger: - name: copy_geom - key: geom pk: - type: number title: Point kilométrique description: Point kilométrique min: 0 pr: - type: integer title: Point Repère description: Point repère min: 0 pr_abs: - type: integer title: Point repère abscisse (m) description: Distance en abscisse curviligne depuis le dernier PR min: 0 code_ouvrage_gestionnaire: - type: string title: Code ouvrage gestionnaire description: Code de l’ouvrage (pour le gestionnaire) nom_usuel_passage_faune: - type: string title: Nom Passage Faune description: "Nom usuel utilisé pour dénommer l'ouvrage (nom_usuel_pf)" issu_requalification: - type: boolean title: Requalification description: "L'ouvrage est issu d'une opération de requalification ?" labels: - Oui - Non date_creation_ouvrage: - type: date title: Date de réalisation description: "Date de la réalisation de l'ouvrage" date_requalification_ouvrage: - type: date title: Date de requalification description: "Date de la requalification de l'ouvrage" largeur_ouvrage: - type: number title: Largeur ouvrage (m) description: "Largeur de l'ouvrage en mètre" min: 0 hauteur_ouvrage: - type: number title: Hauteur ouvrage (m) description: "Hauteur de l'ouvrage en mètre" min: 0 longueur_franchissement: - type: number title: Longueur de franchissement (m) description: "Longueur de franchissement de l'ouvrage en mètres (ne prend pas en compte l'épaisseur des matériaux et éventuels obstacles)" min: 0 diametre: - type: number title: Diamètre (m) description: Diamètre de la buse en mètre min: 0 largeur_dispo_faune: - type: number title: Largeur disponible (m) description: "Largeur de l'ouvrage effectivement disponible pour la faune en mètre" min: 0 hauteur_dispo_faune: - type: number title: Hauteur disponible (m) description: "Hauteur de l'ouvrage effectivement disponible pour la faune en mètre" min: 0 id_nomenclature_ouvrage_specificite: - type: integer title: Spécificité du passage faune description: Exclusivité pour le passage faune (specificite) - foreign_key: true - schema_code: ref_nom.nomenclature nomenclature_type: PF_OUVRAGE_SPECIFICITE nomenclatures_ouvrage_type: - type: relation - relation_type: n-n title: "Type d'ouvrage" description: "Type d'ouvrage d'art (lb_type_ouvrage)" - schema_dot_table: pr_sipaf.cor_pf_nomenclature_ouvrage_type - schema_code: ref_nom.nomenclature nomenclature_type: PF_OUVRAGE_TYPE ouvrage_type_autre: type: string title: Autre type d'ouvrage nomenclatures_ouvrage_materiaux: - type: relation - relation_type: n-n - schema_code: ref_nom.nomenclature - schema_dot_table: pr_sipaf.cor_pf_nomenclature_ouvrage_materiaux title: Matériaux description: "Matériaux composants l'ouvrage d'art (lb_materiaux)" nomenclature_type: PF_OUVRAGE_MATERIAUX ouvrage_hydrau: - type: boolean title: Ouvrage hydraulique description: Ouvrage hydraulique ou non labels: - Oui - Non id_nomenclature_ouvrage_hydrau_position: - type: integer title: Ouvrage hydraulique Position description: Ouvrage hydraulique Position (ouvrage_hydrau_position) - foreign_key: true - schema_code: ref_nom.nomenclature nomenclature_type: PF_OUVRAGE_HYDRAULIQUE_POSITION id_nomenclature_ouvrage_hydrau_banq_caract: - type: integer title: Caractérisation banquette description: "Caractérisation de la banquette dans le cas d'un ouvrage hydraulique (ouvrage_hydrau_caract_banquette)" nomenclature_type: PF_OUVRAGE_HYDRAULIQUE_BANQ_CARACT - foreign_key: true schema_code: ref_nom.nomenclature id_nomenclature_ouvrage_hydrau_banq_type: - type: integer title: Type de banquette description: "Type de la banquette dans le cas d'un ouvrage hydraulique (ouvrage_hydrau_type_banquette)" - foreign_key: true - schema_code: ref_nom.nomenclature nomenclature_type: PF_OUVRAGE_HYDRAULIQUE_BANQ_TYPE ouvrag_hydrau_tirant_air: - type: number title: "Tirant d'air banquette (m)" description: " Tirant d'air existant entre la banquette et le plafond de l'ouvrage, en mètre" source: - type: string title: Source description: Source de la donnée nomenclature_ouvrage_specificite: - type: relation - relation_type: n-1 title: Spécificité du passage faune description: Exclusivité pour le passage faune - local_key: id_nomenclature_ouvrage_specificite - schema_code: ref_nom.nomenclature nomenclature_ouvrage_hydrau_position: - type: relation - relation_type: n-1 - schema_code: ref_nom.nomenclature title: Position banquette - local_key: id_nomenclature_ouvrage_hydrau_position nomenclature_ouvrage_hydrau_banq_caract: - type: relation - relation_type: n-1 - schema_code: ref_nom.nomenclature title: OH Caractérisation banquette - local_key: id_nomenclature_ouvrage_hydrau_banq_caract - nomenclature_ouvrage_hydro_banq_type: - type: relation - relation_type: n-1 - schema_code: ref_nom.nomenclature + nomenclature_ouvrage_hydrau_banq_type: title: OH type de banquette - local_key: id_nomenclature_ouvrage_hydrau_banq_type meta_create_date: - type: datetime title: Date de création (en base) meta_update_date: - type: datetime title: Date de modification (en base) areas: - type: relation title: Areas - relation_type: n-n - schema_code: ref_geo.area - schema_dot_table: pr_sipaf.cor_area_pf - trigger: - name: intersect_ref_geo - key: geom_local - 'on': geom linears: - type: relation title: Linéaires - relation_type: n-n - schema_code: ref_geo.linear - schema_dot_table: pr_sipaf.cor_linear_pf - trigger: - name: d_within - distance: 100 - key: geom_local - 'on': geom - partition: - - id_type actors: - type: relation - relation_type: 1-n - foreign_key: id_passage_faune - schema_code: m_sipaf.actor title: Acteurs description: Acteurs du passage à faune medias: - type: relation title: medias - relation_type: 1-n - foreign_key: uuid_attached_row - local_key: uuid_passage_faune - schema_code: commons.media + geom_x: type: number title: Latitude - column_property: st_x - key: geom geom_y: type: number title: Longitude - column_property: st_y - key: geom geom_text: type: string title: Geométrie (text) - column_property: st_astext - key: geom label_infrastructures: type: string title: Infrastructure traversée - column_property: label - relation_key: linears - label_key: linear_name - filters: type.type_code = RTE label_communes: type: string title: Commune(s) - column_property: label - relation_key: areas - label_key: area_name - filters: area_type.type_code in COM label_departements: type: string title: Département(s) - column_property: label - relation_key: areas - label_key: area_name - filters: area_type.type_code in DEP label_regions: type: string title: Région(s) - column_property: label - relation_key: areas - label_key: area_name - filters: area_type.type_code in REG diff --git a/config/modules/contrib/m_sipaf/exports/m_sipaf.pf.export.yml b/config/modules/contrib/m_sipaf/exports/m_sipaf.pf.export.yml index e7f590ab..f665db0e 100644 --- a/config/modules/contrib/m_sipaf/exports/m_sipaf.pf.export.yml +++ b/config/modules/contrib/m_sipaf/exports/m_sipaf.pf.export.yml @@ -30,7 +30,7 @@ fields: - ouvrag_hydrau_tirant_air - nomenclature_ouvrage_hydrau_position.label_fr - nomenclature_ouvrage_hydrau_banq_caract.label_fr - - nomenclature_ouvrage_hydro_banq_type.label_fr + - nomenclature_ouvrage_hydrau_banq_type.label_fr - label_communes - label_departements - label_infrastructures From d2ee2dce640104567e6f9b4bda4d8d931ed3cbc1 Mon Sep 17 00:00:00 2001 From: "joel.clement" Date: Fri, 3 Mar 2023 12:38:08 +0100 Subject: [PATCH 005/142] test api import --- backend/gn_modulator/tests/test_import_api.py | 17 ++++++++++++++++- config/modules/MODULATOR.module.yml | 2 ++ 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/backend/gn_modulator/tests/test_import_api.py b/backend/gn_modulator/tests/test_import_api.py index 6d37fd8e..15d79dac 100644 --- a/backend/gn_modulator/tests/test_import_api.py +++ b/backend/gn_modulator/tests/test_import_api.py @@ -1,7 +1,22 @@ import pytest # noqa +from flask import url_for +from werkzeug.datastructures import Headers + +from geonature.tests.utils import set_logged_user_cookie + from gn_modulator.utils.env import import_test_dir @pytest.mark.usefixtures("client_class", "temporary_transaction", scope="session") class TestImportApi: - pass + def test_import_synthese(self, users): + set_logged_user_cookie(self.client, users["admin_user"]) + with open(import_test_dir / "synthese_1.csv", "rb") as f: + data = {"file": (f, "synthese.csv"), "object_code": "syn.synthese"} + r = self.client.post( + url_for("modulator.api_import", module_code="MODULATOR"), + data=data, + headers=Headers({"Content-Type": "multipart/form-data"}), + ) + print(r.data) + assert r.status_code == 200, r.data diff --git a/config/modules/MODULATOR.module.yml b/config/modules/MODULATOR.module.yml index 2fef08b1..8d59ed4e 100644 --- a/config/modules/MODULATOR.module.yml +++ b/config/modules/MODULATOR.module.yml @@ -27,4 +27,6 @@ objects: tax.taxref: cruved: R tax.taxsearch: + cruved: R + syn.synthese: cruved: R \ No newline at end of file From 81a38c5adb8171ba370d3f200b085e24e84495ad Mon Sep 17 00:00:00 2001 From: "joel.clement" Date: Fri, 3 Mar 2023 14:10:35 +0100 Subject: [PATCH 006/142] import securize preprocess --- .../gn_modulator/schema/imports/preprocess.py | 62 +++++- .../tests/import_test/route/pp_linear.sql | 21 +-- .../import_test/route/pp_linear_group.sql | 9 +- .../imports/m_sipaf.pf_exemples.import.yml | 16 -- .../m_sipaf/imports/scripts/ppi_actor.sql | 3 - .../m_sipaf/imports/scripts/ppi_actor_V1.sql | 3 - .../imports/scripts/ppi_groupe_route_na.sql | 1 - .../m_sipaf/imports/scripts/ppi_organism.sql | 3 - .../imports/scripts/ppi_organism_V1.sql | 3 - .../m_sipaf/imports/scripts/ppi_pf.sql | 178 ------------------ .../m_sipaf/imports/scripts/ppi_pf_V1.sql | 61 +++--- .../imports/scripts/ppi_srce_reservoir.sql | 6 +- .../imports/scripts/ppi_troncon_route_na.sql | 21 +-- doc/import.md | 5 +- 14 files changed, 106 insertions(+), 286 deletions(-) delete mode 100644 config/modules/contrib/m_sipaf/imports/m_sipaf.pf_exemples.import.yml delete mode 100644 config/modules/contrib/m_sipaf/imports/scripts/ppi_pf.sql diff --git a/backend/gn_modulator/schema/imports/preprocess.py b/backend/gn_modulator/schema/imports/preprocess.py index 2d34db98..d566079f 100644 --- a/backend/gn_modulator/schema/imports/preprocess.py +++ b/backend/gn_modulator/schema/imports/preprocess.py @@ -1,3 +1,6 @@ +import re + + class SchemaPreProcessImports: @classmethod def import_raw(cls, import_number, schema_code, from_table, dest_table): @@ -33,19 +36,60 @@ def import_preprocess( msg=f"Le fichier de preprocess {pre_process_file_path} n'existe pas", ) return - with open(pre_process_file_path, "r") as f: - txt_pre_process_raw_import_view = ( - f.read() - .replace(":raw_import_table", from_table) - .replace(":pre_processed_import_view", dest_table) - .replace("%", "%%") - ) + with open(pre_process_file_path, "r") as f: + preprocess_select = f.read().upper().replace(";", "").replace("%", "%%") + + forbidden_words = [] + for forbidden_word in [ + "INSERT ", + "DROP ", + "DELETE ", + "UPDATE ", + "EXECUTE", + "TRUNCATE", + ]: + if forbidden_word in preprocess_select: + forbidden_words.append(forbidden_word.strip()) + + if forbidden_words: + cls.import_add_error( + import_number, + schema_code, + code="ERR_IMPORT_PRE_PROCESS_FORBIDEN_WORD", + msg=f"Le fichier de preprocess {pre_process_file_path} contient le ou les mots interdits {', '.join(forbidden_word)}", + ) + return + + for word in ["WHERE", "ORDER BY", "LIMIT"]: + if word in preprocess_select: + preprocess_select = preprocess_select.replace( + f"{word}", "\nFROM {from_table}\n{word}" + ) + break + + if "FROM" not in preprocess_select: + preprocess_select += f"\nFROM {from_table}" + + txt_pre_process_raw_import_view = f""" +DROP VIEW IF EXISTS {dest_table}; +CREATE VIEW {dest_table} AS +{preprocess_select} +; + """ cls.import_set_infos( import_number, schema_code, "sql.preprocess", txt_pre_process_raw_import_view ) - cls.c_sql_exec_txt(txt_pre_process_raw_import_view) - + try: + cls.c_sql_exec_txt(txt_pre_process_raw_import_view) + except Exception as e: + cls.import_add_error( + import_number, + schema_code, + code="ERR_IMPORT_PRE_PROCESS_CREATE_VIEW", + msg=f"La vue de preprocess n'a pas être crée : {str(e)}", + ) + return cls.count_and_check_table(import_number, schema_code, dest_table, "preprocess") @classmethod diff --git a/backend/gn_modulator/tests/import_test/route/pp_linear.sql b/backend/gn_modulator/tests/import_test/route/pp_linear.sql index 221c6d67..e5b66b9f 100644 --- a/backend/gn_modulator/tests/import_test/route/pp_linear.sql +++ b/backend/gn_modulator/tests/import_test/route/pp_linear.sql @@ -1,13 +1,8 @@ -DROP VIEW IF EXISTS :pre_processed_import_view CASCADE; -CREATE VIEW :pre_processed_import_view AS - SELECT - 'RTE' AS id_type, - id AS linear_code, - numero || '_' || substring(id, 9)::bigint AS linear_name, - wkt as geom, - true as enable, - 'https://geoservices.ign.fr/bdtopo#telechargementshpreg' AS source, - numero as groups -- n-n ++ - FROM :raw_import_table -; - +SELECT + 'RTE' AS id_type, + id AS linear_code, + numero || '_' || substring(id, 9) :: bigint AS linear_name, + wkt as geom, + true as enable, + 'https://geoservices.ign.fr/bdtopo#telechargementshpreg' AS source, + numero as groups -- n-n ++ \ No newline at end of file diff --git a/backend/gn_modulator/tests/import_test/route/pp_linear_group.sql b/backend/gn_modulator/tests/import_test/route/pp_linear_group.sql index afb5e4ca..8ef52ba8 100644 --- a/backend/gn_modulator/tests/import_test/route/pp_linear_group.sql +++ b/backend/gn_modulator/tests/import_test/route/pp_linear_group.sql @@ -1,7 +1,4 @@ -DROP VIEW IF EXISTS :pre_processed_import_view CASCADE; -CREATE VIEW :pre_processed_import_view AS -SELECT DISTINCT - 'RTE' AS id_type, +SELECT + DISTINCT 'RTE' AS id_type, numero AS code, - cl_admin || ' ' || numero AS name - FROM :raw_import_table tis + cl_admin || ' ' || numero AS name \ No newline at end of file diff --git a/config/modules/contrib/m_sipaf/imports/m_sipaf.pf_exemples.import.yml b/config/modules/contrib/m_sipaf/imports/m_sipaf.pf_exemples.import.yml deleted file mode 100644 index ae0ce67d..00000000 --- a/config/modules/contrib/m_sipaf/imports/m_sipaf.pf_exemples.import.yml +++ /dev/null @@ -1,16 +0,0 @@ -type: import -code: m_sipaf.pf_exemples -title: Données d'exemple m_sipaf -description: import données d'exemple de passage à faune pour SIPAF -items: - - schema_code: user.organisme - data: pf.csv - pre_process: scripts/ppi_organism.sql - - schema_code: m_sipaf.pf - data: pf.csv - pre_process: scripts/ppi_pf.sql - keep_raw: true - - schema_code: m_sipaf.actor - data: pf.csv - pre_process: scripts/ppi_actor.sql - keep_raw: true diff --git a/config/modules/contrib/m_sipaf/imports/scripts/ppi_actor.sql b/config/modules/contrib/m_sipaf/imports/scripts/ppi_actor.sql index 2924e66d..8d0826d4 100644 --- a/config/modules/contrib/m_sipaf/imports/scripts/ppi_actor.sql +++ b/config/modules/contrib/m_sipaf/imports/scripts/ppi_actor.sql @@ -1,5 +1,3 @@ -DROP VIEW IF EXISTS :pre_processed_import_view; -CREATE VIEW :pre_processed_import_view AS SELECT uuid_pf AS id_passage_faune, CASE @@ -11,7 +9,6 @@ SELECT END AS id_nomenclature_type_actor, nom_organism AS id_organism, NULL AS id_role - FROM :raw_import_table t WHERE nom_organism IS NOT NULL AND nom_organism != '' ; diff --git a/config/modules/contrib/m_sipaf/imports/scripts/ppi_actor_V1.sql b/config/modules/contrib/m_sipaf/imports/scripts/ppi_actor_V1.sql index e4976651..0a52176f 100644 --- a/config/modules/contrib/m_sipaf/imports/scripts/ppi_actor_V1.sql +++ b/config/modules/contrib/m_sipaf/imports/scripts/ppi_actor_V1.sql @@ -1,11 +1,8 @@ -DROP VIEW IF EXISTS :pre_processed_import_view; -CREATE VIEW :pre_processed_import_view AS SELECT uuid_pf AS id_passage_faune, 'CON' AS id_nomenclature_type_actor, concess AS id_organism, NULL AS id_role - FROM :raw_import_table t WHERE concess IS NOT NULL AND concess != '' ; diff --git a/config/modules/contrib/m_sipaf/imports/scripts/ppi_groupe_route_na.sql b/config/modules/contrib/m_sipaf/imports/scripts/ppi_groupe_route_na.sql index afb5e4ca..1eed5d7c 100644 --- a/config/modules/contrib/m_sipaf/imports/scripts/ppi_groupe_route_na.sql +++ b/config/modules/contrib/m_sipaf/imports/scripts/ppi_groupe_route_na.sql @@ -4,4 +4,3 @@ SELECT DISTINCT 'RTE' AS id_type, numero AS code, cl_admin || ' ' || numero AS name - FROM :raw_import_table tis diff --git a/config/modules/contrib/m_sipaf/imports/scripts/ppi_organism.sql b/config/modules/contrib/m_sipaf/imports/scripts/ppi_organism.sql index c1c36010..112ad275 100644 --- a/config/modules/contrib/m_sipaf/imports/scripts/ppi_organism.sql +++ b/config/modules/contrib/m_sipaf/imports/scripts/ppi_organism.sql @@ -1,8 +1,5 @@ -DROP VIEW IF EXISTS :pre_processed_import_view; -CREATE VIEW :pre_processed_import_view AS SELECT DISTINCT nom_organism AS nom_organisme, 'SIPAF' AS adresse_organisme - FROM :raw_import_table t WHERE nom_organism IS NOT NULL AND nom_organism != '' ORDER BY nom_organism diff --git a/config/modules/contrib/m_sipaf/imports/scripts/ppi_organism_V1.sql b/config/modules/contrib/m_sipaf/imports/scripts/ppi_organism_V1.sql index 77c7aede..a6267ec9 100644 --- a/config/modules/contrib/m_sipaf/imports/scripts/ppi_organism_V1.sql +++ b/config/modules/contrib/m_sipaf/imports/scripts/ppi_organism_V1.sql @@ -1,8 +1,5 @@ -DROP VIEW IF EXISTS :pre_processed_import_view; -CREATE VIEW :pre_processed_import_view AS SELECT DISTINCT concess AS nom_organisme, 'SIPAF' AS adresse_organisme - FROM :raw_import_table t WHERE concess IS NOT NULL AND concess != '' ORDER BY concess diff --git a/config/modules/contrib/m_sipaf/imports/scripts/ppi_pf.sql b/config/modules/contrib/m_sipaf/imports/scripts/ppi_pf.sql deleted file mode 100644 index 491a2530..00000000 --- a/config/modules/contrib/m_sipaf/imports/scripts/ppi_pf.sql +++ /dev/null @@ -1,178 +0,0 @@ - - ---DROP FUNCTION IF EXISTS process_number; -CREATE OR REPLACE FUNCTION process_number(n_in text) RETURNS NUMERIC AS $$ -DECLARE x NUMERIC; -DECLARE inter TEXT; -BEGIN - inter := n_in; - SELECT INTO inter REPLACE(inter, ',', '.'); - x = inter::NUMERIC; - RETURN x; -EXCEPTION - WHEN others THEN - RETURN CASE - WHEN n_in IS NULL OR n_in = '' THEN NULL - ELSE NULL - END; -END; -$$ -STRICT -LANGUAGE plpgsql IMMUTABLE; - ---DROP FUNCTION IF EXISTS process_integer; -CREATE OR REPLACE FUNCTION process_integer(n_in text) RETURNS INTEGER AS $$ -DECLARE x INTEGER; -DECLARE inter TEXT; -BEGIN - inter := n_in; - x = inter::INTEGER; - RETURN x; -EXCEPTION - WHEN others THEN - RETURN CASE - WHEN n_in IS NULL OR n_in = '' THEN NULL - ELSE NULL - END; -END; -$$ -STRICT -LANGUAGE plpgsql IMMUTABLE; - - ---DROP FUNCTION IF EXISTS check_number(TEXT, TEXT, TEXT) ; -CREATE OR REPLACE FUNCTION check_number( - col_num_in TEXT, - col_id_in TEXT, - table_in TEXT -) -RETURNS TABLE(id text, value text) AS -$$ - BEGIN - RETURN QUERY EXECUTE FORMAT(' - SELECT %I::text as id, %I::text as value - FROM %s - WHERE process_number(%I) = double precision ''NaN'' - ', col_id_in, col_num_in, table_in, col_num_in); - END; -$$ -STRICT -LANGUAGE plpgsql IMMUTABLE; - -DROP TABLE IF EXISTS corr_type_ouv CASCADE; -CREATE TABLE corr_type_ouv( -cd_nomenclature TEXT, -mot TEXT, -UNIQUE(cd_nomenclature, mot) -); - - -INSERT INTO corr_type_ouv -VALUES ('BUS', 'buse'), -('ARC', 'Arc'), -('CAD', 'cadre'), -('DAL', 'dalle'), -('VIA', 'Viaduc'), -('VOU', 'Voute'), -('VOU', 'Vo?t?'), -('PON', 'Pont'), -('CAN', 'Canalisation'), -('DIAB', 'Diabolo'), -('DALO', 'Dalot'), -('TRA', 'Tranch'), -('TUN', 'Tunnel'), -('POR', 'portique') -ON CONFLICT DO NOTHING; - -DROP VIEW IF EXISTS :pre_processed_import_view; -CREATE VIEW :pre_processed_import_view AS -WITH - doublons AS ( - SELECT MIN(id_import) AS id_import, uuid_pf - FROM :raw_import_table - WHERE uuid_pf != '' OR uuid_pf IS NOT NULL - GROUP BY uuid_pf - ORDER BY uuid_pf - ), - type_ouv AS ( - SELECT - uuid_pf, - string_agg(DISTINCT cd_nomenclature, ',') AS nomenclatures_ouvrage_type - FROM :raw_import_table tis - JOIN corr_type_ouv cto - ON UNACCENT(tis.lb_typ_ouv) ILIKE '%' || cto.mot || '%' - WHERE lb_typ_ouv != '' - GROUP BY uuid_pf -) -SELECT - -- tis.uuid_pf AS id_passage_faune, - tis.uuid_pf AS code_passage_faune, - CASE - WHEN pi_ou_ps LIKE 'PI%' THEN FALSE - WHEN pi_ou_ps LIKE 'PS%' THEN TRUE - WHEN pi_ou_ps = '' THEN NULL - ELSE NULL - END AS pi_ou_ps, - st_asewkt(st_makepoint(process_number(x), process_number(y), 4326)) AS GEOM, - process_number(pk) AS pk, - process_integer(pr) AS pr, - process_integer(pr_abs) AS pr_abs, - id_op AS code_ouvrage_gestionnaire, - nom_pf AS nom_usuel_passage_faune, - CASE - WHEN process_number(date_creat) != double PRECISION 'NaN' - THEN TO_DATE(process_number(date_creat)::text, 'yyyy') - ELSE NULL - END AS date_creation_ouvrage, - CASE - WHEN process_number(date_requal) != double PRECISION 'NaN' - THEN TO_DATE(process_number(date_requal)::text, 'yyyy') - ELSE NULL - END AS date_requalification_ouvrage, - CASE - WHEN process_number(date_requal) != double PRECISION 'NaN' - THEN date_requal != '' - ELSE NULL - END AS issu_requalification, - process_number(larg_ouvrag) AS largeur_ouvrage, - process_number(haut_ouvrag) AS hauteur_ouvrage, - process_number(long_franch) AS longueur_franchissement, - process_number(diam) AS diametre, - process_number(larg_disp) AS largeur_dispo_faune, - process_number(haut_disp) AS hauteur_dispo_faune, - CASE - WHEN specificit ILIKE '%mixte%' THEN 'MIX' - WHEN - specificit ILIKE '%sp%cifique%' - OR specificit IN ('Amphibiens', 'Batraciens', 'Boviduc', 'Crapauduc', 'Faune') - OR specificit ILIKE '%GF%' - OR specificit ILIKE '%PPF%' - OR specificit ILIKE '%PF%' - OR specificit ILIKE '%BESTIAUX%' - OR specificit ILIKE '%gibier%' - OR specificit ILIKE '%pas%' - OR specificit IN ('PF', 'PGF', 'PPF', 'PB', 'PP', 'S') - THEN 'SPE' - WHEN - specificit ILIKE '%non dedie%' - OR specificit IN ('H', 'M', 'Non') - THEN 'ND' - WHEN specificit IN ('', '?', 'coudée', 'immergée') THEN NULL - ELSE '???' - END AS id_nomenclature_ouvrage_specificite, - tou.nomenclatures_ouvrage_type, - CASE - WHEN UNACCENT(TRIM(lb_materiaux)) ILIKE '%Beton%' THEN 'BET' - WHEN UNACCENT(TRIM(lb_materiaux)) ILIKE '%Metal%' THEN 'MET' - ELSE NULL - END AS nomenclatures_ouvrage_materiaux, - CASE - WHEN oh = 'Oui' THEN TRUE - WHEN oh = 'Non' THEN FALSE - ELSE NULL - END AS ouvrage_hydrau - FROM :raw_import_table tis - JOIN doublons dbl ON dbl.id_import = tis.id_import - LEFT JOIN type_ouv tou ON tou.uuid_pf = tis.uuid_pf - ORDER BY tis.uuid_pf -; \ No newline at end of file diff --git a/config/modules/contrib/m_sipaf/imports/scripts/ppi_pf_V1.sql b/config/modules/contrib/m_sipaf/imports/scripts/ppi_pf_V1.sql index 594b1ce3..3ab0ac68 100644 --- a/config/modules/contrib/m_sipaf/imports/scripts/ppi_pf_V1.sql +++ b/config/modules/contrib/m_sipaf/imports/scripts/ppi_pf_V1.sql @@ -1,31 +1,34 @@ -- import V1 -- (sans les données spécificité, matériaux, et ouvrage_type) -DROP VIEW IF EXISTS :pre_processed_import_view; -CREATE VIEW :pre_processed_import_view AS - select - uuid_pf as code_passage_faune, - CASE - WHEN pi_ou_ps = 'PI' THEN FALSE - WHEN pi_ou_ps = 'PS' THEN TRUE - WHEN pi_ou_ps = '' THEN NULL - ELSE NULL - END AS pi_ou_ps, - pr, - pr_abs, - st_asewkt(st_makepoint(replace(X, ',', '.')::numeric, replace(y, ',', '.')::numeric, 4326)) AS GEOM, - ID_PF_GEST AS code_ouvrage_gestionnaire, - NOM_PF AS nom_usuel_passage_faune, - CASE - WHEN ISSU_REQA = 'oui' THEN TRUE - ELSE NULL - END AS issu_requalification, - replace(larg_ouvra, ',', '.')::numeric AS largeur_ouvrage, - replace(haut_ouvra, ',', '.')::NUMERIC AS hauteur_ouvrage, - replace(long_franc, ',', '.')::NUMERIC AS longueur_franchissement, - replace(diam, ',', '.')::NUMERIC AS diametre, - replace(larg_disp, ',', '.')::NUMERIC AS largeur_dispo_faune, - replace(haut_disp, ',', '.')::NUMERIC AS hauteur_dispo_faune, - source - FROM :raw_import_table tis - ORDER BY tis.uuid_pf -; \ No newline at end of file +select + uuid_pf as code_passage_faune, + CASE + WHEN pi_ou_ps = 'PI' THEN FALSE + WHEN pi_ou_ps = 'PS' THEN TRUE + WHEN pi_ou_ps = '' THEN NULL + ELSE NULL + END AS pi_ou_ps, + pr, + pr_abs, + st_asewkt( + st_makepoint( + replace(X, ',', '.') :: numeric, + replace(y, ',', '.') :: numeric, + 4326 + ) + ) AS GEOM, + ID_PF_GEST AS code_ouvrage_gestionnaire, + NOM_PF AS nom_usuel_passage_faune, + CASE + WHEN ISSU_REQA = 'oui' THEN TRUE + ELSE NULL + END AS issu_requalification, + replace(larg_ouvra, ',', '.') :: numeric AS largeur_ouvrage, + replace(haut_ouvra, ',', '.') :: NUMERIC AS hauteur_ouvrage, + replace(long_franc, ',', '.') :: NUMERIC AS longueur_franchissement, + replace(diam, ',', '.') :: NUMERIC AS diametre, + replace(larg_disp, ',', '.') :: NUMERIC AS largeur_dispo_faune, + replace(haut_disp, ',', '.') :: NUMERIC AS hauteur_dispo_faune, + source +ORDER BY + tis.uuid_pf; \ No newline at end of file diff --git a/config/modules/contrib/m_sipaf/imports/scripts/ppi_srce_reservoir.sql b/config/modules/contrib/m_sipaf/imports/scripts/ppi_srce_reservoir.sql index daf3c810..20f13523 100644 --- a/config/modules/contrib/m_sipaf/imports/scripts/ppi_srce_reservoir.sql +++ b/config/modules/contrib/m_sipaf/imports/scripts/ppi_srce_reservoir.sql @@ -1,5 +1,3 @@ -DROP VIEW IF EXISTS :pre_processed_import_view; -CREATE VIEW :pre_processed_import_view AS SELECT 'RESV_SRCE' AS id_type, id_resv AS area_code, @@ -9,6 +7,4 @@ SELECT END AS area_name, wkt AS geom, TRUE AS enable, - 'https://inpn.mnhn.fr/docs/TVB/N_SRCE_RESERVOIR_S_000.zip' AS source - FROM :raw_import_table -; \ No newline at end of file + 'https://inpn.mnhn.fr/docs/TVB/N_SRCE_RESERVOIR_S_000.zip' AS source \ No newline at end of file diff --git a/config/modules/contrib/m_sipaf/imports/scripts/ppi_troncon_route_na.sql b/config/modules/contrib/m_sipaf/imports/scripts/ppi_troncon_route_na.sql index 221c6d67..e5b66b9f 100644 --- a/config/modules/contrib/m_sipaf/imports/scripts/ppi_troncon_route_na.sql +++ b/config/modules/contrib/m_sipaf/imports/scripts/ppi_troncon_route_na.sql @@ -1,13 +1,8 @@ -DROP VIEW IF EXISTS :pre_processed_import_view CASCADE; -CREATE VIEW :pre_processed_import_view AS - SELECT - 'RTE' AS id_type, - id AS linear_code, - numero || '_' || substring(id, 9)::bigint AS linear_name, - wkt as geom, - true as enable, - 'https://geoservices.ign.fr/bdtopo#telechargementshpreg' AS source, - numero as groups -- n-n ++ - FROM :raw_import_table -; - +SELECT + 'RTE' AS id_type, + id AS linear_code, + numero || '_' || substring(id, 9) :: bigint AS linear_name, + wkt as geom, + true as enable, + 'https://geoservices.ign.fr/bdtopo#telechargementshpreg' AS source, + numero as groups -- n-n ++ \ No newline at end of file diff --git a/doc/import.md b/doc/import.md index 10b51478..b1739ac1 100644 --- a/doc/import.md +++ b/doc/import.md @@ -26,11 +26,9 @@ Cette commande va intégrer (s'il y a correspondance des champs), pour chaque li geonature modules import -s m_sipaf.pf -d -p ``` -où `pre_process` est une vue qui va transformer les colonnes du fichier csv en colonnes assimilables par la table destinataire. (il est très important de garder les noms `:pre_processed_import_view` et `:raw_import_table`) +où `pre_process` est une vue qui va transformer les colonnes du fichier csv en colonnes assimilables par la table destinataire. ``` -DROP VIEW IF EXISTS :pre_processed_import_view; -CREATE VIEW :pre_processed_import_view AS SELECT uuid_pf AS id_passage_faune, CASE @@ -42,7 +40,6 @@ SELECT END AS id_nomenclature_type_actor, nom_organism AS id_organism, NULL AS id_role - FROM :raw_import_table t WHERE nom_organism IS NOT NULL AND nom_organism != '' ; ``` From 5749cf833293cff619827fb15cc56967db6cffd1 Mon Sep 17 00:00:00 2001 From: "joel.clement" Date: Mon, 6 Mar 2023 15:42:17 +0100 Subject: [PATCH 007/142] add model TImport and methods --- backend/gn_modulator/blueprint.py | 12 +- backend/gn_modulator/imports/__init__.py | 5 - backend/gn_modulator/imports/api.py | 64 ----- .../gn_modulator/imports/mixins/__init__.py | 56 +++++ backend/gn_modulator/imports/mixins/data.py | 126 ++++++++++ backend/gn_modulator/imports/mixins/insert.py | 65 ++++++ .../gn_modulator/imports/mixins/mapping.py | 80 +++++++ .../gn_modulator/imports/mixins/process.py | 220 ++++++++++++++++++ backend/gn_modulator/imports/mixins/raw.py | 119 ++++++++++ .../gn_modulator/imports/mixins/relation.py | 127 ++++++++++ backend/gn_modulator/imports/mixins/update.py | 113 +++++++++ backend/gn_modulator/imports/mixins/utils.py | 56 +++++ backend/gn_modulator/imports/models.py | 46 ++++ backend/gn_modulator/imports/routes.py | 53 +++++ backend/gn_modulator/imports/utils/files.py | 10 + backend/gn_modulator/tests/test_import.py | 36 +-- backend/gn_modulator/tests/utils/imports.py | 34 +-- .../layouts/m_sipaf.site_list.layout.yml | 72 +++--- doc/import.md | 2 +- 19 files changed, 1143 insertions(+), 153 deletions(-) delete mode 100644 backend/gn_modulator/imports/api.py create mode 100644 backend/gn_modulator/imports/mixins/__init__.py create mode 100644 backend/gn_modulator/imports/mixins/data.py create mode 100644 backend/gn_modulator/imports/mixins/insert.py create mode 100644 backend/gn_modulator/imports/mixins/mapping.py create mode 100644 backend/gn_modulator/imports/mixins/process.py create mode 100644 backend/gn_modulator/imports/mixins/raw.py create mode 100644 backend/gn_modulator/imports/mixins/relation.py create mode 100644 backend/gn_modulator/imports/mixins/update.py create mode 100644 backend/gn_modulator/imports/mixins/utils.py create mode 100644 backend/gn_modulator/imports/models.py create mode 100644 backend/gn_modulator/imports/routes.py create mode 100644 backend/gn_modulator/imports/utils/files.py diff --git a/backend/gn_modulator/blueprint.py b/backend/gn_modulator/blueprint.py index ade1e1e6..484b674d 100644 --- a/backend/gn_modulator/blueprint.py +++ b/backend/gn_modulator/blueprint.py @@ -2,11 +2,9 @@ from flask import Blueprint, request, g, current_app from .commands import commands from .schema import SchemaMethods -from .definition import DefinitionMethods from sqlalchemy.exc import NoForeignKeysError from gn_modulator.module import ModuleMethods from gn_modulator.layout import LayoutMethods -from gn_modulator.imports import ImportMethods from gn_modulator import init_gn_modulator from gn_modulator.utils.api import process_dict_path from gn_modulator.utils.errors import get_errors, errors_txt @@ -16,8 +14,12 @@ blueprint = Blueprint(MODULE_CODE.lower(), __name__) +<<<<<<< HEAD from gn_modulator.routes.rest import * # noqa from gn_modulator.routes.exports import * # noqa +======= +from gn_modulator.imports.routes import * # noqa +>>>>>>> add model TImport and methods # Creation des commandes pour modules blueprint.cli.short_help = "Commandes pour l' administration du module MODULES" @@ -89,12 +91,6 @@ def api_breadcrumbs(module_code, page_code): return ModuleMethods.breadcrumbs(module_code, page_code, request.args.to_dict()) -@check_cruved_scope("R") # object import ?? -@blueprint.route("import/", methods=["POST"]) -def api_import(module_code): - return ImportMethods.process_api_import(module_code) - - @blueprint.route("/layouts/", methods=["GET"]) @blueprint.route("/layouts/", methods=["GET"], defaults={"config_path": None}) def api_layout(config_path): diff --git a/backend/gn_modulator/imports/__init__.py b/backend/gn_modulator/imports/__init__.py index ee131d2e..e69de29b 100644 --- a/backend/gn_modulator/imports/__init__.py +++ b/backend/gn_modulator/imports/__init__.py @@ -1,5 +0,0 @@ -from .api import ImportApi - - -class ImportMethods(ImportApi): - pass diff --git a/backend/gn_modulator/imports/api.py b/backend/gn_modulator/imports/api.py deleted file mode 100644 index 8b4a0e7b..00000000 --- a/backend/gn_modulator/imports/api.py +++ /dev/null @@ -1,64 +0,0 @@ -import pathlib -from flask import request, jsonify -from gn_modulator.schema import SchemaMethods -from gn_modulator.module import ModuleMethods -from gn_modulator.utils.env import IMPORT_DIR -from geonature.core.gn_commons.file_manager import upload_file, remove_file, rename_file - - -class ImportApi: - @classmethod - def upload_file(cls, module_code, object_code, import_number, file): - IMPORT_DIR.mkdir(parents=True, exist_ok=True) - - file_name = f"{import_number}_{file.name}" - return pathlib.Path(upload_file(file, IMPORT_DIR, file_name)) - - @classmethod - def process_api_import(cls, module_code): - import_number = SchemaMethods.generate_import_number() - - object_code = None - if request.form: - object_code = request.form.get("object_code") - - schema_code = ModuleMethods.schema_code(module_code, object_code) - - if not schema_code: - return { - "errors": [ - { - "msg": f"Il n'y pas de schema pour module_code={module_code} et object_code={object_code}", - "code": "ERR_IMPORT_SCHEMA_CODE", - } - ] - } - - files_path = {} - if request.files: - for file_key in request.files: - file = request.files.get(file_key) - files_path[file_key] = cls.upload_file( - module_code, object_code, import_number, file - ) - data_file_path = files_path.get("data_file") - - if not (data_file_path): - return { - "errors": [ - { - "msg": "Il n'y a pas de fichier de données", - "code": "ERR_IMPORT_NO_DATA_FILE", - } - ] - } - - import_number = SchemaMethods.process_import_schema( - schema_code, data_file_path, import_number=import_number, commit=True - ) - import_infos = SchemaMethods.import_get_infos(import_number, schema_code) - print(SchemaMethods.import_pretty_infos(import_number, schema_code)) # __DEBUG - - import_infos.pop("data_file_path", None) - - return jsonify(import_infos) diff --git a/backend/gn_modulator/imports/mixins/__init__.py b/backend/gn_modulator/imports/mixins/__init__.py new file mode 100644 index 00000000..6c88be91 --- /dev/null +++ b/backend/gn_modulator/imports/mixins/__init__.py @@ -0,0 +1,56 @@ +from .data import ImportMixinData +from .insert import ImportMixinInsert +from .mapping import ImportMixinMapping +from .process import ImportMixinProcess +from .raw import ImportMixinRaw +from .relation import ImportMixinRelation +from .update import ImportMixinUpdate +from .utils import ImportMixinUtils + + +class ImportMixin( + ImportMixinRelation, + ImportMixinData, + ImportMixinInsert, + ImportMixinMapping, + ImportMixinProcess, + ImportMixinRaw, + ImportMixinUpdate, + ImportMixinUtils, +): + def process_import_schema(self, _insert_data=False): + self._insert_data = _insert_data + + self.process_data_table() + if self.errors: + return self + + self.process_mapping_view() + if self.errors: + return self + + self.process_raw_view() + if self.errors: + return self + + self.process_view() + if self.errors: + return self + + self.process_insert() + if self.errors: + return self + + self.process_update() + if self.errors: + return self + + self.process_relations() + if self.errors: + return self + + self.res["nb_unchanged"] = ( + self.res["nb_process"] - self.res["nb_insert"] - self.res["nb_update"] + ) + + return self diff --git a/backend/gn_modulator/imports/mixins/data.py b/backend/gn_modulator/imports/mixins/data.py new file mode 100644 index 00000000..15c0c4bf --- /dev/null +++ b/backend/gn_modulator/imports/mixins/data.py @@ -0,0 +1,126 @@ +from pathlib import Path +from .utils import ImportMixinUtils +from gn_modulator.schema import SchemaMethods +from geonature.utils.env import db + + +class ImportMixinData(ImportMixinUtils): + def process_data_table(self): + if self.tables.get("data"): + return + + self.tables["data"] = self.table_name("data") + + if Path(self.data_file_path).suffix == ".csv": + self.data_type = "csv" + self.import_csv_file(self.tables["data"]) + + # TODO traiter autres types de fichier + + else: + self.add_error( + code="ERR_IMPORT_DATA_FILE_TYPE_NOT_FOUND", + msg=f"Le type du fichier d'import {self.data_file_path} n'est pas traité", + ) + return + + self.count_and_check_table("data", self.tables["data"]) + + def import_csv_file(self, dest_table): + if not Path(self.data_file_path).exists(): + self.add_error( + code="ERR_IMPORT_DATA_FILE_NOT_FOUND", + msg=f"Le fichier d'import {self.data_file_path} n'existe pas", + ) + return + + with open(self.data_file_path, "r") as f: + # on récupère la premiere ligne du csv pour avoir le nom des colonnes + first_line = f.readline() + + self.csv_delimiter = ";" if ";" in first_line else "," if "," in first_line else None + + if self.csv_delimiter is None: + self.add_error( + code="ERR_IMPORT_CSV_FILE_DELIMITER_NOT_FOUND", + msg=f"Pas de séparateur trouvé pour le fichier csv {self.data_file_path}", + ) + return + + import_table_columns = first_line.replace("\n", "").split(self.csv_delimiter) + + # creation de la table temporaire + self.sql["data_table"] = self.sql_create_data_table( + self.tables["data"], import_table_columns + ) + try: + SchemaMethods.c_sql_exec_txt(self.sql["data_table"]) + except Exception as e: + self.add_error( + code="ERR_IMPORT_DATA_CREATE_TABLE", + msg=f"Erreur durant la création de la table des données: {str(e)}", + ) + return + # on copie les données dans la table temporaire + + # pour faire marcher les tests pytest on passe par un insert + # TODO faire marche copy_expert avec pytest + # manière de récupérer cursor ? + if self._insert_data: + self.insert_csv_data(f, dest_table, import_table_columns) + else: + self.copy_csv_data(f, dest_table, import_table_columns) + + def copy_csv_data(self, f, dest_table, table_columns): + columns_fields = ", ".join(table_columns) + self.sql[ + "data_copy_csv" + ] = f"""COPY {dest_table}({columns_fields}) FROM STDIN DELIMITER '{self.csv_delimiter}' QUOTE '"' CSV""" + try: + cursor = db.session.connection().connection.cursor() + cursor.copy_expert(sql=self.sql["data_copy_csv"], file=f) + except Exception as e: + self.add_error( + code="ERR_IMPORT_DATA_COPY", + msg=f"Erreur lors de la copie des données csv : {str(e)}", + ) + return + + def insert_csv_data(self, f, dest_table, table_columns): + sql_columns_fields = ", ".join(table_columns) + + values = "" + for line in f: + data = "', '".join((line.replace('"', "").replace("\n", "").split(self.csv_delimiter))) + values += f"('{data}')," + if not values: + return + + values = values[:-1] + self.sql[ + "data_insert" + ] = f"INSERT INTO {dest_table} ({sql_columns_fields}) VALUES {values}" + try: + SchemaMethods.c_sql_exec_txt(self.sql["data_insert"]) + except Exception as e: + self.add_error( + code="ERR_IMPORT_DATA_INSERT", + msg=f"Erreur lors de l'insertion des données csv : {str(e)}", + ) + return + + def sql_create_data_table(self, dest_table, table_columns): + """ + requete de creation d'une table temporaire pour import csv + tout les champs sont en varchar + """ + + columns_sql = "\n ".join(map(lambda x: f"{x} VARCHAR,", table_columns)) + pk_constraint_name = f"pk_{'_'.join(dest_table.split('.'))}_id_import" + + txt = f"""CREATE TABLE IF NOT EXISTS {dest_table} ( + id_import SERIAL NOT NULL, + {columns_sql} + CONSTRAINT {pk_constraint_name} PRIMARY KEY (id_import) +);""" + return txt diff --git a/backend/gn_modulator/imports/mixins/insert.py b/backend/gn_modulator/imports/mixins/insert.py new file mode 100644 index 00000000..07c05e93 --- /dev/null +++ b/backend/gn_modulator/imports/mixins/insert.py @@ -0,0 +1,65 @@ +from .utils import ImportMixinUtils +from gn_modulator import SchemaMethods + + +class ImportMixinInsert(ImportMixinUtils): + def process_insert(self): + from_table = self.tables["process"] + + sm = SchemaMethods(self.schema_code) + self.sql[ + "nb_insert" + ] = f"SELECT COUNT(*) FROM {from_table} WHERE {sm.pk_field_name()} IS NULL" + + try: + self.res["nb_insert"] = SchemaMethods.c_sql_exec_txt(self.sql["nb_insert"]).scalar() + except Exception as e: + self.add_error( + code="ERR_IMPORT_INSERT_COUNT", + msg=f"Erreur lors du comptage du nombre d'insert: {str(e)}", + ) + return + + if self.res["nb_insert"] == 0: + return + + self.sql["insert"] = self.sql_insert(from_table) + + try: + SchemaMethods.c_sql_exec_txt(self.sql["insert"]) + except Exception as e: + if isinstance(e, AttributeError): + raise e + self.add_error( + code="ERR_IMPORT_INSERT", + msg=f"Erreur durant l'insert de {from_table} vers {self.schema_code} : {str(e)}", + ) + + def sql_insert(self, from_table, dest_table=None, keys=None): + sm = SchemaMethods(self.schema_code) + + table_name = dest_table or sm.sql_schema_dot_table() + + columns_select = filter( + lambda x: ( + x in keys + if keys is not None + else not (sm.is_column(x) and sm.property(x).get("primary_key")) + ), + SchemaMethods.get_table_columns(from_table), + ) + + v_column_select_keys = map(lambda x: x, columns_select) + + txt_columns_select_keys = ",\n ".join(v_column_select_keys) + + txt_where = f" WHERE {sm.pk_field_name()} IS NULL" if keys is None else "" + + return f""" +INSERT INTO {table_name} ( + {txt_columns_select_keys} +) +SELECT + {txt_columns_select_keys} +FROM {from_table}{txt_where}; +""" diff --git a/backend/gn_modulator/imports/mixins/mapping.py b/backend/gn_modulator/imports/mixins/mapping.py new file mode 100644 index 00000000..9abd26a7 --- /dev/null +++ b/backend/gn_modulator/imports/mixins/mapping.py @@ -0,0 +1,80 @@ +from pathlib import Path +from .utils import ImportMixinUtils +from gn_modulator.schema import SchemaMethods + + +class ImportMixinMapping(ImportMixinUtils): + def process_mapping_view(self): + """ + Application de la vue de mappage à la la table d'import + """ + + if self.mapping_file_path is None: + return + + self.tables["mapping"] = self.table_name("mapping") + + if not Path(self.mapping_file_path).exists(): + self.add_error( + code="ERR_IMPORT_MAPPING_FILE_MISSING", + msg=f"Le fichier de preprocess {self.mapping_file_path} n'existe pas", + ) + return + + self.sql["mapping_view"] = self.sql_mapping() + + try: + SchemaMethods.c_sql_exec_txt(self.sql["mapping_view"]) + except Exception as e: + self.add_error( + code="ERR_IMPORT_PRE_PROCESS_CREATE_VIEW", + msg=f"La vue de preprocess n'a pas être crée : {str(e)}", + ) + return + + self.count_and_check_table("mapping", self.tables["mapping"]) + + def sql_mapping(self): + from_table = self.tables["data"] + dest_table = self.tables["mapping"] + + with open(self.mapping_file_path, "r") as f: + mapping_select = f.read().upper().replace(";", "").replace("%", "%%") + + forbidden_words = [] + for forbidden_word in [ + "INSERT ", + "DROP ", + "DELETE ", + "UPDATE ", + "EXECUTE", + "TRUNCATE", + ]: + if forbidden_word in mapping_select: + forbidden_words.append(forbidden_word.strip()) + + if forbidden_words: + self.add_error( + code="ERR_IMPORT_PRE_PROCESS_FORBIDEN_WORD", + msg=f"Le fichier de preprocess {self.mapping_file_path} contient le ou les mots interdits {', '.join(forbidden_word)}", + ) + return + + for word in ["WHERE", "ORDER BY", "LIMIT"]: + if word in mapping_select: + mapping_select = mapping_select.replace( + f"{word}", "\nFROM {from_table}\n{word}" + ) + break + + if "FROM" not in mapping_select: + mapping_select += f"\nFROM {from_table}" + + sql_mapping = f""" +DROP VIEW IF EXISTS {dest_table}; +CREATE VIEW {dest_table} AS +{mapping_select} +; + """ + + return sql_mapping diff --git a/backend/gn_modulator/imports/mixins/process.py b/backend/gn_modulator/imports/mixins/process.py new file mode 100644 index 00000000..e8da6db7 --- /dev/null +++ b/backend/gn_modulator/imports/mixins/process.py @@ -0,0 +1,220 @@ +from .utils import ImportMixinUtils +from gn_modulator import SchemaMethods + + +class ImportMixinProcess(ImportMixinUtils): + def process_view(self, keys=None): + from_table = self.tables["raw"] + dest_table = self.tables["process"] = self.table_name("process") + + self.sql["process_view"] = self.sql_process_view(from_table, dest_table, keys) + + try: + SchemaMethods.c_sql_exec_txt(self.sql["process_view"]) + except Exception as e: + self.add_error( + code="ERR_IMPORT_PROCESS_CREATE_VIEW", + msg=f"La vue de process n'a pas être crée : {str(e)}", + ) + return + + self.count_and_check_table("process", dest_table) + + def sql_process_view(self, from_table, dest_table, keys=None): + """ + requete pour créer une vue qui résoud les clé + """ + + sm = SchemaMethods(self.schema_code) + + v_columns = [] + v_joins = [] + + from_table_columns = SchemaMethods.get_table_columns(from_table) + + columns = list( + filter( + lambda x: ( + x in keys + if keys is not None + else sm.is_column(x) and not sm.property(x).get("primary_key") + ), + from_table_columns, + ) + ) + + solved_keys = {} + + for index, key in enumerate(columns): + txt_column, v_join = self.process_column_import_view(index, key) + if txt_column: + # TODO n-n ici ???? + if sm.has_property(key) and sm.property(key).get("relation_type") == "n-n": + rel = SchemaMethods(sm.property(key)["schema_code"]) + v_columns.append(f"{txt_column.split('.')[0]}.{rel.pk_field_name()}") + else: + v_columns.append(f"{txt_column} AS {key}") + solved_keys[key] = txt_column + v_joins += v_join + + txt_pk_column, v_join = self.resolve_key( + self.schema_code, sm.pk_field_name(), alias_join_base="j_pk", solved_keys=solved_keys + ) + v_columns.append(txt_pk_column) + v_joins += v_join + + txt_columns = ",\n ".join(v_columns) + txt_joins = "\n".join(v_joins) + + return f"""DROP VIEW IF EXISTS {dest_table} CASCADE; +CREATE VIEW {dest_table} AS +SELECT + {txt_columns} +FROM {from_table} t +{txt_joins}; +""" + + def process_raw_import_column(self, key): + """ """ + + sm = SchemaMethods(self.schema_code) + + if not sm.has_property(key): + return f"{key}" + + property = sm.property(key) + + # pour les nomenclature (on rajoute le type) + if nomenclature_type := property.get("nomenclature_type"): + return f"""CASE + WHEN {key} IS NOT NULL AND {key} NOT LIKE '%%|%%' THEN CONCAT('{nomenclature_type}|', {key}) + ELSE {key} + END AS {key}""" + + if property["type"] == "boolean": + return f"""CASE + WHEN {key}::text IN ('t', 'true') THEN TRUE + WHEN {key}::text IN ('f', 'false') THEN FALSE + ELSE NULL + END AS {key}""" + + if property["type"] == "geometry": + geometry_type = "ST_MULTI" if property["geometry_type"] == "multipolygon" else "" + return f"""{geometry_type}( + ST_SETSRID( + ST_FORCE2D( + ST_GEOMFROMEWKT({key}) + ), {sm.property(key).get('srid')} + ) + ) + AS {key}""" + + return f"{key}" + + def resolve_key( + self, schema_code, key, index=None, alias_main="t", alias_join_base="j", solved_keys={} + ): + """ + compliqué + crée le txt pour + le champs de la colonne qui doit contenir la clé + la ou les jointures nécessaire pour résoudre la clé + """ + + sm = SchemaMethods(schema_code) + + alias_join = alias_join_base if index is None else f"{alias_join_base}_{index}" + + txt_column = f"{alias_join}.{sm.pk_field_name()}" + + unique = sm.attr("meta.unique") + v_join = [] + + # resolution des cles si besoins + + # couf pour permttre de faire les liens entre les join quand il y en a plusieurs + link_joins = {} + for index_unique, k_unique in enumerate(unique): + var_key = self.var_key( + schema_code, key, k_unique, index_unique, link_joins, alias_main + ) + if sm.property(k_unique).get("foreign_key"): + if k_unique in solved_keys: + link_joins[k_unique] = solved_keys[k_unique] + else: + rel = SchemaMethods(sm.property(k_unique)["schema_code"]) + txt_column_join, v_join_inter = self.resolve_key( + rel.schema_code(), + var_key, + index=index_unique, + alias_main=alias_join, + alias_join_base=alias_join, + ) + v_join += v_join_inter + + link_joins[k_unique] = f"{alias_join}_{index_unique}.{rel.pk_field_name()}" + + # creation des joins avec les conditions + v_join_on = [] + + for index_unique, k_unique in enumerate(unique): + var_key = self.var_key( + schema_code, key, k_unique, index_unique, link_joins, alias_main + ) + # !!!(SELECT (NULL = NULL) => NULL) + cast = "::TEXT" # if var_type != main_type else '' + txt_join_on = ( + f"{alias_join}.{k_unique}{cast} = {var_key}{cast}" + if not sm.is_nullable(k_unique) or sm.is_required(k_unique) + else f"({alias_join}.{k_unique}{cast} = {var_key}{cast} OR ({alias_join}.{k_unique} IS NULL AND {var_key} IS NULL))" + # else f"({var_key} IS NOT NULL) AND ({alias_join}.{k_unique} = {var_key})" + ) + v_join_on.append(txt_join_on) + + txt_join_on = "\n AND ".join(v_join_on) + txt_join = f"LEFT JOIN {sm.sql_schema_dot_table()} {alias_join} ON\n {txt_join_on}" + + v_join.append(txt_join) + + return txt_column, v_join + + def var_key(self, schema_code, key, k_unique, index_unique, link_joins, alias_main): + """ + TODO à clarifier + """ + sm = SchemaMethods(schema_code) + + if key is None: + return f"{alias_main}.{k_unique}" + + if link_joins.get(k_unique): + return link_joins[k_unique] + + if "." in key: + return key + + if len(sm.attr("meta.unique", [])) <= 1: + return f"{alias_main}.{key}" + + return f"SPLIT_PART({alias_main}.{key}, '|', { index_unique + 1})" + + def process_column_import_view(self, index, key): + """ + process column for processed view + """ + sm = SchemaMethods(self.schema_code) + if not sm.has_property(key): + return key, [] + + property = sm.property(key) + + if property.get("foreign_key"): + return self.resolve_key(property["schema_code"], key, index) + + if property.get("relation_type") == "n-n": + return self.resolve_key(property["schema_code"], key, index) + + # txt_column, v_join = rel.resolve_key(key, index) + # return f"{txt_column.split('.')[0]}.{rel.pk_field_name()}", v_join + + return f"t.{key}", [] diff --git a/backend/gn_modulator/imports/mixins/raw.py b/backend/gn_modulator/imports/mixins/raw.py new file mode 100644 index 00000000..02684913 --- /dev/null +++ b/backend/gn_modulator/imports/mixins/raw.py @@ -0,0 +1,119 @@ +from gn_modulator import SchemaMethods +from .utils import ImportMixinUtils + + +class ImportMixinRaw(ImportMixinUtils): + def process_raw_view(self): + """ + creation de la vue d'import à partir de la table d'import + correction des null et association du bon typage + """ + + from_table = self.tables.get("mapping") or self.tables["data"] + dest_table = self.tables["raw"] = self.table_name("raw") + + self.sql["raw_view"] = self.sql_raw_view(from_table, dest_table) + + try: + SchemaMethods.c_sql_exec_txt(self.sql["raw_view"]) + except Exception as e: + self.add_error( + code="ERR_IMPORT_CREATE_RAW_VIEW", + msg=f"Erreur dans la creation de la vue 'raw': {str(e)}", + ) + + self.count_and_check_table("raw", dest_table) + + def sql_raw_view( + self, + from_table, + dest_table, + keys=None, + key_unnest=None, + limit=None, + ): + """ + - temporary_table : table ou sont stockées les données d'un csv + - raw_import_view : vue qui corrige les '' en NULL + Creation d'une vue d'import brute à partir d'une table accueillant des données d'un fichier csv + on passe les champs valant '' à NULL + """ + + sm = SchemaMethods(self.schema_code) + + from_table_columns = SchemaMethods.get_table_columns(from_table) + + columns = filter( + lambda x: ( + x in keys + if keys is not None + else not (sm.is_column(x) and sm.property(x).get("primary_key")) + ), + from_table_columns, + ) + + # on preprocess ttes les colonnes + v_txt_pre_process_columns = list( + map( + lambda x: self.pre_process_raw_import_columns(x, key_unnest=key_unnest), + from_table_columns, + ) + ) + + v_txt_columns = list(map(lambda x: self.process_raw_import_column(x), columns)) + + txt_primary_column = ( + f"""CONCAT({", '|', ".join(sm.attr('meta.unique'))}) AS {sm.pk_field_name()}""" + ) + v_txt_columns.insert(0, txt_primary_column) + + txt_columns = ",\n ".join(v_txt_columns) + txt_pre_process_columns = ",\n ".join(v_txt_pre_process_columns) + txt_limit = f"LIMIT {limit}" if limit else "" + + return f"""DROP VIEW IF EXISTS {dest_table} CASCADE; +CREATE VIEW {dest_table} AS +WITH pre_process AS ( +SELECT + {txt_pre_process_columns} +FROM {from_table} +{txt_limit} +) +SELECT + {txt_columns} +FROM pre_process; +""" + + def pre_process_raw_import_columns(self, key, key_unnest=None): + """ + TODO gérer les null dans l'import csv (ou dans l'insert) + """ + + sm = SchemaMethods(self.schema_code) + + if key == "id_import": + return key + + if key_unnest == key: + return f"UNNEST(STRING_TO_ARRAY({key}, ',')) AS {key}" + + if not sm.has_property(key): + return f"{key}" + + property = sm.property(key) + if property.get("foreign_key"): + return key + + if property["type"] == "number": + return f"CASE WHEN {key}::TEXT = '' THEN NULL ELSE {key}::FLOAT END AS {key}" + + if property["type"] == "date": + return f"CASE WHEN {key}::TEXT = '' THEN NULL ELSE {key}::DATE END AS {key}" + + if property["type"] == "datetime": + return f"CASE WHEN {key}::TEXT = '' THEN NULL ELSE {key}::TIMESTAMP END AS {key}" + + if property["type"] == "integer" and "schema_code" not in property: + return f"CASE WHEN {key}::TEXT = '' THEN NULL ELSE {key}::INTEGER END AS {key}" + + return f"CASE WHEN {key}::TEXT = '' THEN NULL ELSE {key} END AS {key}" diff --git a/backend/gn_modulator/imports/mixins/relation.py b/backend/gn_modulator/imports/mixins/relation.py new file mode 100644 index 00000000..2d340b34 --- /dev/null +++ b/backend/gn_modulator/imports/mixins/relation.py @@ -0,0 +1,127 @@ +from .utils import ImportMixinUtils +from .raw import ImportMixinRaw +from .insert import ImportMixinInsert +from .process import ImportMixinProcess +from gn_modulator import SchemaMethods + + +class ImportMixinRelation(ImportMixinInsert, ImportMixinProcess, ImportMixinRaw, ImportMixinUtils): + def process_relations(self): + from_table = self.tables.get("mapping") or self.tables["data"] + sm = SchemaMethods(self.schema_code) + + columns = SchemaMethods.get_table_columns(from_table) + + for index, key in enumerate(columns): + if not sm.is_relationship(key): + continue + property = sm.property(key) + + # on commence par les n-n + if property.get("relation_type") in ("n-n"): + self.import_relation_n_n(from_table, key) + + def import_relation_n_n(self, from_table, key): + sm = SchemaMethods(self.schema_code) + + self.sql[key] = {} + + property = sm.property(key) + cor_table = property["schema_dot_table"] + rel = SchemaMethods(property["schema_code"]) + + raw_delete_view = self.table_name("raw_delete", key) + process_delete_view = self.table_name("process_delete", key) + raw_import_view = self.table_name("raw", key) + process_import_view = self.table_name("process", key) + + # 0) clean + + SchemaMethods.c_sql_exec_txt(f"DROP VIEW IF EXISTS {process_delete_view}") + SchemaMethods.c_sql_exec_txt(f"DROP VIEW IF EXISTS {raw_delete_view}") + SchemaMethods.c_sql_exec_txt(f"DROP VIEW IF EXISTS {process_import_view}") + SchemaMethods.c_sql_exec_txt(f"DROP VIEW IF EXISTS {raw_import_view}") + + # 1) create raw_temp_table for n-n + self.sql[key]["raw_view"] = self.sql_raw_view( + from_table, raw_import_view, keys=[key], key_unnest=key + ) + try: + SchemaMethods.c_sql_exec_txt(self.sql[key]["raw_view"]) + except Exception as e: + self.add_error( + code="ERR_IMPORT_RELATION_CREATE_RAW_VIEW", + msg=f"Erreur dans la creation de la vue 'raw' pour {key}: {str(e)}", + ) + return + + self.sql[key]["process_view"] = self.sql_process_view( + raw_import_view, process_import_view, keys=[key] + ) + try: + SchemaMethods.c_sql_exec_txt(self.sql[key]["process_view"]) + except Exception as e: + self.add_error( + code="ERR_IMPORT_RELATION_CREATE_PROCESS_VIEW", + msg=f"Erreur dans la creation de la vue 'process' pour {key}: {str(e)}", + ) + return + + # 3) insert / update / delete ?? + + # - delete : tout depuis import_table + # create_view for delete + self.sql[key]["raw_delete_view"] = self.sql_raw_view( + from_table, raw_delete_view, keys=[key], key_unnest=key + ) + try: + SchemaMethods.c_sql_exec_txt(self.sql[key]["raw_delete_view"]) + except Exception as e: + self.add_error( + code="ERR_IMPORT_RELATION_CREATE_RAW_VIEW", + msg=f"Erreur dans la creation de la vue 'delete_raw' pour {key}: {str(e)}", + ) + return + + self.sql[key]["process_delete_view"] = self.sql_process_view( + raw_delete_view, process_delete_view, keys=[key] + ) + try: + SchemaMethods.c_sql_exec_txt(self.sql[key]["process_delete_view"]) + except Exception as e: + self.add_error( + code="ERR_IMPORT_RELATION_CREATE_PROCESS_DELETE_VIEW", + msg=f"Erreur dans la creation de la vue 'delete_process' pour {key}: {str(e)}", + ) + return + + self.sql[key][ + "delete" + ] = f""" +DELETE FROM {cor_table} t + USING {process_delete_view} j + WHERE t.{sm.pk_field_name()} = j.{sm.pk_field_name()}; +""" + try: + SchemaMethods.c_sql_exec_txt(self.sql[key]["delete"]) + except Exception as e: + self.add_error( + code="ERR_IMPORT_RELATION_DELETE", + msg=f"Erreur dans la suppression pour la relation {key}: {str(e)}", + ) + return + + # - insert + self.sql[key]["insert"] = self.sql_insert( + process_import_view, + keys=[sm.pk_field_name(), rel.pk_field_name()], + dest_table=cor_table, + ) + try: + SchemaMethods.c_sql_exec_txt(self.sql[key]["insert"]) + except Exception as e: + self.add_error( + code="ERR_IMPORT_RELATION_INSERT", + msg=f"Erreur dans l'insertion pour la relation {key}: {str(e)}", + ) + return diff --git a/backend/gn_modulator/imports/mixins/update.py b/backend/gn_modulator/imports/mixins/update.py new file mode 100644 index 00000000..3c52076c --- /dev/null +++ b/backend/gn_modulator/imports/mixins/update.py @@ -0,0 +1,113 @@ +from .utils import ImportMixinUtils +from gn_modulator import SchemaMethods + + +class ImportMixinUpdate(ImportMixinUtils): + def process_update(self): + from_table = self.tables["process"] + + self.sql["nb_update"] = self.sql_nb_update(from_table) + + try: + self.res["nb_update"] = SchemaMethods.c_sql_exec_txt(self.sql["nb_update"]).scalar() + except Exception as e: + self.add_error( + code="ERR_IMPORT_UPDATE_COUNT", + msg=f"Erreur lors du comptage du nombre d'update: {str(e)}", + ) + return + + if self.res["nb_update"] == 0: + return + + self.sql["update"] = self.sql_update(from_table) + + try: + SchemaMethods.c_sql_exec_txt(self.sql["update"]) + except Exception as e: + if isinstance(e, AttributeError): + raise e + self.add_error( + code="ERR_IMPORT_UPDATE", + msg=f"Erreur durant l'update de {from_table} vers {self.schema_code} : {str(e)}", + ) + + def sql_update(self, from_table): + sm = SchemaMethods(self.schema_code) + + columns = SchemaMethods.get_table_columns(from_table) + + v_column_keys = map( + lambda x: x, + filter(lambda x: sm.has_property(x) and sm.is_column(x), columns), + ) + + v_set_keys = list( + map( + lambda x: f"{x}=a.{x}", + filter( + lambda x: sm.has_property(x) + and sm.is_column(x) + and not sm.property(x).get("primary_key"), + columns, + ), + ) + ) + + v_update_condition = list( + map( + lambda x: f"(t.{x}::TEXT IS DISTINCT FROM a.{x}::TEXT)", + filter( + lambda x: sm.has_property(x) + and sm.is_column(x) + and not sm.property(x).get("primary_key"), + columns, + ), + ) + ) + + txt_set_keys = ",\n ".join(v_set_keys) + txt_columns_keys = ",\n ".join(v_column_keys) + txt_update_conditions = "NOT (" + "\n AND ".join(v_update_condition) + ")" + + return f""" +UPDATE {sm.sql_schema_dot_table()} t SET + {txt_set_keys} +FROM ( + SELECT + {txt_columns_keys} + FROM {from_table} +)a +WHERE a.{sm.pk_field_name()} = t.{sm.pk_field_name()} +AND {txt_update_conditions} +; +""" + + def sql_nb_update(self, from_table): + sm = SchemaMethods(self.schema_code) + + columns = SchemaMethods.get_table_columns(from_table) + + v_update_conditions = list( + map( + lambda x: f"(t.{x}::TEXT IS DISTINCT FROM a.{x}::TEXT)", + filter( + lambda x: sm.has_property(x) + and sm.is_column(x) + and not sm.property(x).get("primary_key"), + columns, + ), + ) + ) + + txt_update_conditions = "" + "\n OR ".join(v_update_conditions) + "" + + return f""" + SELECT + COUNT(*) + FROM {sm.sql_schema_dot_table()} t + JOIN {from_table} a + ON a.{sm.pk_field_name()} = t.{sm.pk_field_name()} + WHERE {txt_update_conditions} +; +""" diff --git a/backend/gn_modulator/imports/mixins/utils.py b/backend/gn_modulator/imports/mixins/utils.py new file mode 100644 index 00000000..e2562b91 --- /dev/null +++ b/backend/gn_modulator/imports/mixins/utils.py @@ -0,0 +1,56 @@ +from pathlib import Path + +from gn_modulator.schema import SchemaMethods +from gn_modulator.utils.env import schema_import + + +class ImportMixinUtils: + def pretty_infos(self): + print(self.res) + txt = "" + txt += f"\n-- import csv file {Path(self.data_file_path).name}" + txt += f" {self.res.get('nb_data')} lignes" + txt += f" - {self.schema_code}\n" + if self.res.get("nb_raw") != self.res.get("nb_process"): + txt += f" raw : {self.res.get('nb_raw'):10d}\n" + if self.res.get("nb_insert"): + txt += f" insert : {self.res['nb_insert']:10d}\n" + if self.res.get("nb_update"): + txt += f" update : {self.res['nb_update']:10d}\n" + if self.res.get("nb_unchanged"): + txt += f" unchanged : {self.res['nb_unchanged']:10d}\n" + + return txt + + def count_and_check_table(self, table_type, table_name): + try: + self.res[f"nb_{table_type}"] = SchemaMethods.c_sql_exec_txt( + f"SELECT COUNT(*) FROM {table_name}" + ).scalar() + + except Exception as e: + self.add_error( + code="ERR_IMPORT_COUNT_VIEW", + msg=f"Erreur avec la table/vue '{table_type}' {table_name}: {str(e)}", + ) + return + + if self.res[f"nb_{table_type}"] == 0: + self.add_error( + code="ERR_IMPORT_COUNT_VIEW", + msg=f"Erreur avec la table/vue '{table_type}' {table_name}: il n'y a n'a pas de données", + ) + + def table_name(self, type, key=None): + """ + nom de la table + """ + + if type == "data": + return f"{schema_import}.t_{self.id_import}_{type}" + else: + rel = f"_{key}" if key is not None else "" + return f"{schema_import}.v_{self.id_import}_{type}_{self.schema_code.replace('.', '_')}{rel}" + + def add_error(self, code=None, msg=None): + self.errors.append({"code": code, "msg": msg}) diff --git a/backend/gn_modulator/imports/models.py b/backend/gn_modulator/imports/models.py new file mode 100644 index 00000000..98fa4e4a --- /dev/null +++ b/backend/gn_modulator/imports/models.py @@ -0,0 +1,46 @@ +# modeles d'import +from geonature.utils.env import db +from sqlalchemy.dialects.postgresql import JSONB +from .mixins import ImportMixin + + +class TImport(db.Model, ImportMixin): + __tablename__ = "t_imports" + __table_args__ = {"schema": "gn_modulator"} + + def __init__(self, schema_code=None, data_file_path=None, mapping_file_path=None): + self.schema_code = schema_code + self.data_file_path = data_file_path and str(data_file_path) + self.mapping_file_path = mapping_file_path and str(mapping_file_path) + + self.res = {} + self.errors = [] + self.sql = {} + self.tables = {} + + _insert = False + _keep_raw = False + + id_import = db.Column(db.Integer, primary_key=True) + + schema_code = db.Column(db.Unicode) + + data_file_path = db.Column(db.Unicode) + mapping_file_path = db.Column(db.Unicode) + + csv_delimiter = db.Column(db.Unicode) + data_type = db.Column(db.Unicode) + + res = db.column(JSONB) + tables = db.column(JSONB) + sql = db.column(JSONB) + errors = db.Column(JSONB) + + def as_dict(self): + return { + "id_import": self.id_import, + "data_type": self.data_type, + "csv_delimiter": self.csv_delimiter, + "res": self.res, + "errors": self.errors, + } diff --git a/backend/gn_modulator/imports/routes.py b/backend/gn_modulator/imports/routes.py new file mode 100644 index 00000000..8f059a17 --- /dev/null +++ b/backend/gn_modulator/imports/routes.py @@ -0,0 +1,53 @@ +from flask import request, jsonify + +from geonature.core.gn_permissions.decorators import check_cruved_scope +from geonature.utils.env import db + +from gn_modulator.blueprint import blueprint +from gn_modulator.schema import SchemaMethods +from gn_modulator.module import ModuleMethods + + +from .utils.files import upload_import_file +from .models import TImport + + +@check_cruved_scope("R") # object import ?? +@blueprint.route("import/", methods=["POST"]) +def api_import(module_code): + object_code = None + if request.form: + object_code = request.form.get("object_code") + + schema_code = ModuleMethods.schema_code(module_code, object_code) + + if not schema_code: + return { + "errors": [ + { + "msg": f"Il n'y pas de schema pour module_code={module_code} et object_code={object_code}", + "code": "ERR_IMPORT_SCHEMA_CODE", + } + ] + } + + impt = TImport(schema_code=schema_code) + db.session.add(impt) + + files_path = {} + if request.files: + for file_key in request.files: + file = request.files.get(file_key) + files_path[file_key] = upload_import_file( + module_code, object_code, impt.id_import, file + ) + + impt.data_file_path = str(files_path.get("data_file")) + db.session.flush() + + impt.process_import_schema() + print(impt.pretty_infos()) + + db.session.commit() + + return impt.as_dict() diff --git a/backend/gn_modulator/imports/utils/files.py b/backend/gn_modulator/imports/utils/files.py new file mode 100644 index 00000000..13d7aba9 --- /dev/null +++ b/backend/gn_modulator/imports/utils/files.py @@ -0,0 +1,10 @@ +import pathlib +from geonature.core.gn_commons.file_manager import upload_file +from gn_modulator.utils.env import IMPORT_DIR + + +def upload_import_file(module_code, object_code, import_number, file): + IMPORT_DIR.mkdir(parents=True, exist_ok=True) + + file_name = f"{import_number}_{module_code}_{object_code}_{file.name}" + return pathlib.Path(upload_file(file, IMPORT_DIR, file_name)) diff --git a/backend/gn_modulator/tests/test_import.py b/backend/gn_modulator/tests/test_import.py index 2eefdf00..5fe6187a 100644 --- a/backend/gn_modulator/tests/test_import.py +++ b/backend/gn_modulator/tests/test_import.py @@ -13,10 +13,12 @@ def test_synthese(self): schema_code = "syn.synthese" data_file_path = import_test_dir / "synthese_1.csv" expected_infos = { - "nb_data": 2, - "nb_insert": 2, - "nb_update": 0, - "nb_unchanged": 0, + "res.nb_data": 2, + "res.nb_insert": 2, + "res.nb_update": 0, + "res.nb_unchanged": 0, + "data_type": "csv", + "csv_delimiter": ",", } test_data_file(schema_code, data_file_path, expected_infos=expected_infos) @@ -28,10 +30,10 @@ def test_synthese2(self): schema_code = "syn.synthese" data_file_path = import_test_dir / "synthese_1.csv" expected_infos = { - "nb_data": 2, - "nb_insert": 2, - "nb_update": 0, - "nb_unchanged": 0, + "res.nb_data": 2, + "res.nb_insert": 2, + "res.nb_update": 0, + "res.nb_unchanged": 0, } test_data_file(schema_code, data_file_path, expected_infos=expected_infos) @@ -42,17 +44,17 @@ def test_ref_geo_linear(self): schema_code = "ref_geo.linear_type" data_file_path = import_test_dir / "route/linear_type.csv" - expected_infos = {"nb_data": 1} + expected_infos = {"res.nb_data": 1} test_data_file(schema_code, data_file_path, expected_infos=expected_infos) schema_code = "ref_geo.linear_group" data_file_path = import_test_dir / "route/route.csv" pre_process_file_path = import_test_dir / "route/pp_linear_group.sql" expected_infos = { - "nb_data": 1, - "nb_insert": 1, - "nb_update": 0, - "nb_unchanged": 0, + "res.nb_data": 1, + "res.nb_insert": 1, + "res.nb_update": 0, + "res.nb_unchanged": 0, } test_data_file( schema_code, data_file_path, pre_process_file_path, expected_infos=expected_infos @@ -62,10 +64,10 @@ def test_ref_geo_linear(self): data_file_path = import_test_dir / "route/route.csv" pre_process_file_path = import_test_dir / "route/pp_linear.sql" expected_infos = { - "nb_data": 1, - "nb_insert": 1, - "nb_update": 0, - "nb_unchanged": 0, + "res.nb_data": 1, + "res.nb_insert": 1, + "res.nb_update": 0, + "res.nb_unchanged": 0, } test_data_file( schema_code, data_file_path, pre_process_file_path, expected_infos=expected_infos diff --git a/backend/gn_modulator/tests/utils/imports.py b/backend/gn_modulator/tests/utils/imports.py index 7858ecf8..1e5fd0b5 100644 --- a/backend/gn_modulator/tests/utils/imports.py +++ b/backend/gn_modulator/tests/utils/imports.py @@ -1,36 +1,27 @@ -from gn_modulator.schema import SchemaMethods +from gn_modulator.imports.models import TImport from gn_modulator.utils.commons import getAttr +from geonature.utils.env import db def test_data_file( - schema_code=None, data_file_path=None, pre_process_file_path=None, expected_infos={} + schema_code=None, data_file_path=None, mapping_file_path=None, expected_infos={} ): if not (schema_code and data_file_path): return - import_number = SchemaMethods.process_import_schema( - schema_code, - data_file_path, - pre_process_file_path=pre_process_file_path, - verbose=1, - insert=True, - ) - - import_infos = SchemaMethods.import_get_infos(import_number, schema_code) - - print( - { - "nb_data": import_infos.get("nb_data"), - "nb_insert": import_infos.get("nb_insert"), - "nb_update": import_infos.get("nb_update"), - "errors:": import_infos.get("errors"), - } - ) + with db.session.begin_nested(): + impt = TImport(schema_code, data_file_path, mapping_file_path) + db.session.add(impt) + assert impt.id_import is not None + + impt.process_import_schema() + + import_infos = impt.as_dict() errors = expected_infos.pop("errors", []) if len(errors) == 0: - assert len(import_infos["errors"]) == 0 + assert len(import_infos["errors"]) == 0, import_infos["errors"] else: assert len(errors) == len(import_infos("error")) for error in errors: @@ -38,7 +29,6 @@ def test_data_file( for key in expected_infos: txt_err = f"schema_code: {schema_code}, key: {key}, expected: {expected_infos.get(key)}, import: {getAttr(import_infos, key)}" - print(txt_err) assert getAttr(import_infos, key) == expected_infos.get(key), txt_err return import_infos diff --git a/config/modules/contrib/m_sipaf/layouts/m_sipaf.site_list.layout.yml b/config/modules/contrib/m_sipaf/layouts/m_sipaf.site_list.layout.yml index c6e58bc7..64558e2e 100644 --- a/config/modules/contrib/m_sipaf/layouts/m_sipaf.site_list.layout.yml +++ b/config/modules/contrib/m_sipaf/layouts/m_sipaf.site_list.layout.yml @@ -35,42 +35,42 @@ layout: description: Télécharger les passages à faune (les filtres sont appliqués) href: __f__o.url_export(x, 'm_sipaf.pf') hidden: __f__!o.is_action_allowed(x, 'E') - # - type: button - # flex: "0" - # icon: upload - # color: primary - # description: Importer des passage à faune - # action: - # type: modal - # modal_name: import - # hidden: __f__!o.is_action_allowed(x, 'C') - # - type: modal - # modal_name: import - # items: - # title: Importer des passage à faune - # type: form - # items: - # - items: - # - key: data_file - # type: file - # title: Fichier d'import - # description: Choisir un fichier à importer - # - key: object_code - # type: string - # default: __f__context.object_code - # - direction: row - # items: - # - type: button - # color: primary - # title: Valider - # description: Valider - # action: import - # disabled: __f__!(formGroup.valid ) - # - type: button - # color: primary - # title: Annuler - # description: Annuler - # action: close + - type: button + flex: "0" + icon: upload + color: primary + description: Importer des passage à faune + action: + type: modal + modal_name: import + hidden: __f__!o.is_action_allowed(x, 'C') + - type: modal + modal_name: import + items: + title: Importer des passage à faune + type: form + items: + - items: + - key: data_file + type: file + title: Fichier d'import + description: Choisir un fichier à importer + - key: object_code + type: string + default: __f__context.object_code + - direction: row + items: + - type: button + color: primary + title: Valider + description: Valider + action: import + disabled: __f__!(formGroup.valid ) + - type: button + color: primary + title: Annuler + description: Annuler + action: close flex: "0" - type: object diff --git a/doc/import.md b/doc/import.md index b1739ac1..30131bb5 100644 --- a/doc/import.md +++ b/doc/import.md @@ -40,7 +40,7 @@ SELECT END AS id_nomenclature_type_actor, nom_organism AS id_organism, NULL AS id_role - WHERE nom_organism IS NOT NULL AND nom_organism != '' +m WHERE nom_organism IS NOT NULL AND nom_organism != '' ; ``` From 6064ca7866218d28d790f9a026dc4cd3834266bf Mon Sep 17 00:00:00 2001 From: "joel.clement" Date: Wed, 8 Mar 2023 16:09:37 +0100 Subject: [PATCH 008/142] import errors on lines REQUIRED and UNRESOLVED --- .../gn_modulator/imports/mixins/__init__.py | 21 ++++ backend/gn_modulator/imports/mixins/check.py | 88 +++++++++++++++++ backend/gn_modulator/imports/mixins/data.py | 2 +- backend/gn_modulator/imports/mixins/insert.py | 16 +-- .../gn_modulator/imports/mixins/mapping.py | 15 ++- .../gn_modulator/imports/mixins/process.py | 1 + backend/gn_modulator/imports/mixins/raw.py | 6 ++ .../gn_modulator/imports/mixins/relation.py | 1 + backend/gn_modulator/imports/mixins/utils.py | 12 ++- backend/gn_modulator/imports/models.py | 6 +- backend/gn_modulator/imports/routes.py | 15 ++- .../tests/import_test/route/pf.csv | 2 +- .../tests/import_test/route/pp_linear.sql | 1 + .../import_test/route/pp_linear_group.sql | 7 +- .../tests/pf_test_erreurs copy.csv | 4 + .../tests/import_test/tests/pf_test_ok.csv | 4 + backend/gn_modulator/tests/test_import_api.py | 26 ++++- .../layouts/m_sipaf.site_list.layout.yml | 10 ++ frontend/app/components/base/base.scss | 6 ++ .../layout/base/layout.component.html | 7 +- .../layout/form/form-element.component.ts | 1 + frontend/app/services/action.service.ts | 97 +++++++++++++++++-- frontend/app/services/form.service.ts | 12 ++- 23 files changed, 319 insertions(+), 41 deletions(-) create mode 100644 backend/gn_modulator/imports/mixins/check.py create mode 100644 backend/gn_modulator/tests/import_test/tests/pf_test_erreurs copy.csv create mode 100644 backend/gn_modulator/tests/import_test/tests/pf_test_ok.csv diff --git a/backend/gn_modulator/imports/mixins/__init__.py b/backend/gn_modulator/imports/mixins/__init__.py index 6c88be91..4d55b4e4 100644 --- a/backend/gn_modulator/imports/mixins/__init__.py +++ b/backend/gn_modulator/imports/mixins/__init__.py @@ -1,3 +1,6 @@ +from geonature.utils.env import db + +from .check import ImportMixinCheck from .data import ImportMixinData from .insert import ImportMixinInsert from .mapping import ImportMixinMapping @@ -10,6 +13,7 @@ class ImportMixin( ImportMixinRelation, + ImportMixinCheck, ImportMixinData, ImportMixinInsert, ImportMixinMapping, @@ -21,33 +25,50 @@ class ImportMixin( def process_import_schema(self, _insert_data=False): self._insert_data = _insert_data + self.init_import() + if self.errors: + return self + db.session.flush() + self.process_data_table() if self.errors: return self + db.session.flush() self.process_mapping_view() if self.errors: return self + db.session.flush() self.process_raw_view() if self.errors: return self + db.session.flush() self.process_view() if self.errors: return self + db.session.flush() + + self.process_check() + if self.errors: + return self + db.session.flush() self.process_insert() if self.errors: return self + db.session.flush() self.process_update() if self.errors: return self + db.session.flush() self.process_relations() if self.errors: return self + db.session.flush() self.res["nb_unchanged"] = ( self.res["nb_process"] - self.res["nb_insert"] - self.res["nb_update"] diff --git a/backend/gn_modulator/imports/mixins/check.py b/backend/gn_modulator/imports/mixins/check.py new file mode 100644 index 00000000..6375c06d --- /dev/null +++ b/backend/gn_modulator/imports/mixins/check.py @@ -0,0 +1,88 @@ +from gn_modulator import SchemaMethods +from pypnnomenclature.repository import get_nomenclature_list + +from .utils import ImportMixinUtils + + +class ImportMixinCheck(ImportMixinUtils): + def process_check(self): + self.check_required() + self.check_resolve_keys() + + def check_required(self): + # pour toutes les colonnes de raw + # si une colonne est requise + # et que la valeur dans raw est nulle + # erreur + raw_table = self.tables["raw"] + sm = SchemaMethods(self.schema_code) + + for key in SchemaMethods.get_table_columns(raw_table): + if not sm.is_required(key): + continue + + txt_check_required = f""" +SELECT + COUNT(*), ARRAY_AGG(id_import) + FROM {raw_table} + WHERE {key} is NULL +""" + + res = SchemaMethods.c_sql_exec_txt(txt_check_required).fetchone() + nb_lines = res[0] + lines = res[1] + str_lines = lines and ", ".join(map(lambda x: str(x), lines)) or "" + if nb_lines == 0: + continue + self.add_error( + code="ERR_IMPORT_REQUIRED", + key=key, + lines=lines, + msg=f"La colonne {key} est obligatoire. {nb_lines} ligne(s) concernée(s) : [{str_lines}]", + ) + + return + + def check_resolve_keys(self): + raw_table = self.tables["raw"] + process_table = self.tables["process"] + sm = SchemaMethods(self.schema_code) + + for key in SchemaMethods.get_table_columns(raw_table): + if not (sm.has_property(key) and sm.property(key).get("foreign_key")): + continue + + txt_check_resolve_keys = f""" +SELECT COUNT(*), ARRAY_AGG(r.id_import) +FROM {raw_table} r +JOIN {process_table} p + ON r.id_import = p.id_import +WHERE + p.{key} is NULL and r.{key} is NOT NULL + """ + + res = SchemaMethods.c_sql_exec_txt(txt_check_resolve_keys).fetchone() + nb_lines = res[0] + lines = res[1] + str_lines = lines and ", ".join(map(lambda x: str(x), lines)) or "" + if nb_lines == 0: + continue + + values = None + if code_type := sm.property(key).get("nomenclature_type"): + values = list( + map( + lambda x: { + "cd_nomenclature": x["cd_nomenclature"], + "label_fr": x["label_fr"], + }, + get_nomenclature_list(code_type=code_type)["values"], + ) + ) + self.add_error( + code="ERR_IMPORT_UNRESOLVED", + key=key, + lines=lines, + msg=f"La colonne {key} est non nulle et n'a pas de correspondance. {nb_lines} ligne(s) concernée(s) : [{str_lines}]", + values=values, + ) diff --git a/backend/gn_modulator/imports/mixins/data.py b/backend/gn_modulator/imports/mixins/data.py index 15c0c4bf..9f3b46c9 100644 --- a/backend/gn_modulator/imports/mixins/data.py +++ b/backend/gn_modulator/imports/mixins/data.py @@ -75,7 +75,7 @@ def copy_csv_data(self, f, dest_table, table_columns): columns_fields = ", ".join(table_columns) self.sql[ "data_copy_csv" - ] = f"""COPY {dest_table}({columns_fields}) FROM STDIN DELIMITER '{self.csv_delimiter}' QUOTE '"' CSV""" + ] = f"""COPY {dest_table}({columns_fields}) FROM STDIN DELIMITER '{self.csv_delimiter}' QUOTE '"' CSV """ try: cursor = db.session.connection().connection.cursor() cursor.copy_expert(sql=self.sql["data_copy_csv"], file=f) diff --git a/backend/gn_modulator/imports/mixins/insert.py b/backend/gn_modulator/imports/mixins/insert.py index 07c05e93..dc50ef6a 100644 --- a/backend/gn_modulator/imports/mixins/insert.py +++ b/backend/gn_modulator/imports/mixins/insert.py @@ -40,13 +40,15 @@ def sql_insert(self, from_table, dest_table=None, keys=None): table_name = dest_table or sm.sql_schema_dot_table() - columns_select = filter( - lambda x: ( - x in keys - if keys is not None - else not (sm.is_column(x) and sm.property(x).get("primary_key")) - ), - SchemaMethods.get_table_columns(from_table), + columns_select = list( + filter( + lambda x: ( + x in keys + if keys is not None + else sm.is_column(x) and not (sm.property(x).get("primary_key")) + ), + SchemaMethods.get_table_columns(from_table), + ) ) v_column_select_keys = map(lambda x: x, columns_select) diff --git a/backend/gn_modulator/imports/mixins/mapping.py b/backend/gn_modulator/imports/mixins/mapping.py index 9abd26a7..48083392 100644 --- a/backend/gn_modulator/imports/mixins/mapping.py +++ b/backend/gn_modulator/imports/mixins/mapping.py @@ -22,12 +22,14 @@ def process_mapping_view(self): return self.sql["mapping_view"] = self.sql_mapping() + if self.errors: + return try: SchemaMethods.c_sql_exec_txt(self.sql["mapping_view"]) except Exception as e: self.add_error( - code="ERR_IMPORT_PRE_PROCESS_CREATE_VIEW", + code="ERR_IMPORT_MAPPING_CREATE_VIEW", msg=f"La vue de preprocess n'a pas être crée : {str(e)}", ) return @@ -55,7 +57,7 @@ def sql_mapping(self): if forbidden_words: self.add_error( - code="ERR_IMPORT_PRE_PROCESS_FORBIDEN_WORD", + code="ERR_IMPORT_MAPPING_FORBIDEN_WORD", msg=f"Le fichier de preprocess {self.mapping_file_path} contient le ou les mots interdits {', '.join(forbidden_word)}", ) return @@ -63,13 +65,20 @@ def sql_mapping(self): for word in ["WHERE", "ORDER BY", "LIMIT"]: if word in mapping_select: mapping_select = mapping_select.replace( - f"{word}", "\nFROM {from_table}\n{word}" + f"{word}", f"\nFROM {from_table}\n{word}" ) break if "FROM" not in mapping_select: mapping_select += f"\nFROM {from_table}" + if "ID_IMPORT" not in mapping_select: + self.add_error( + code="ERR_IMPORT_MAPPING_MISSING_IMPORT", + msg=f"La selection de mapping doit contenir le champs id_import dans {self.mapping_file_path}", + ) + return + sql_mapping = f""" DROP VIEW IF EXISTS {dest_table}; CREATE VIEW {dest_table} AS diff --git a/backend/gn_modulator/imports/mixins/process.py b/backend/gn_modulator/imports/mixins/process.py index e8da6db7..a0af32a0 100644 --- a/backend/gn_modulator/imports/mixins/process.py +++ b/backend/gn_modulator/imports/mixins/process.py @@ -69,6 +69,7 @@ def sql_process_view(self, from_table, dest_table, keys=None): return f"""DROP VIEW IF EXISTS {dest_table} CASCADE; CREATE VIEW {dest_table} AS SELECT + id_import, {txt_columns} FROM {from_table} t {txt_joins}; diff --git a/backend/gn_modulator/imports/mixins/raw.py b/backend/gn_modulator/imports/mixins/raw.py index 02684913..4b4a5f1c 100644 --- a/backend/gn_modulator/imports/mixins/raw.py +++ b/backend/gn_modulator/imports/mixins/raw.py @@ -71,6 +71,12 @@ def sql_raw_view( txt_pre_process_columns = ",\n ".join(v_txt_pre_process_columns) txt_limit = f"LIMIT {limit}" if limit else "" + if "id_import" not in txt_pre_process_columns: + txt_pre_process_columns = f"id_import, {txt_pre_process_columns}" + + if "id_import" not in txt_columns: + txt_columns = f"id_import, {txt_columns}" + return f"""DROP VIEW IF EXISTS {dest_table} CASCADE; CREATE VIEW {dest_table} AS WITH pre_process AS ( diff --git a/backend/gn_modulator/imports/mixins/relation.py b/backend/gn_modulator/imports/mixins/relation.py index 2d340b34..0eeee907 100644 --- a/backend/gn_modulator/imports/mixins/relation.py +++ b/backend/gn_modulator/imports/mixins/relation.py @@ -64,6 +64,7 @@ def import_relation_n_n(self, from_table, key): self.add_error( code="ERR_IMPORT_RELATION_CREATE_PROCESS_VIEW", msg=f"Erreur dans la creation de la vue 'process' pour {key}: {str(e)}", + key=key, ) return diff --git a/backend/gn_modulator/imports/mixins/utils.py b/backend/gn_modulator/imports/mixins/utils.py index e2562b91..8350dba1 100644 --- a/backend/gn_modulator/imports/mixins/utils.py +++ b/backend/gn_modulator/imports/mixins/utils.py @@ -5,6 +5,9 @@ class ImportMixinUtils: + def init_import(self): + SchemaMethods.c_sql_exec_txt(f"CREATE SCHEMA IF NOT EXISTS {schema_import}") + def pretty_infos(self): print(self.res) txt = "" @@ -23,6 +26,9 @@ def pretty_infos(self): return txt def count_and_check_table(self, table_type, table_name): + if self.errors: + return + try: self.res[f"nb_{table_type}"] = SchemaMethods.c_sql_exec_txt( f"SELECT COUNT(*) FROM {table_name}" @@ -52,5 +58,7 @@ def table_name(self, type, key=None): rel = f"_{key}" if key is not None else "" return f"{schema_import}.v_{self.id_import}_{type}_{self.schema_code.replace('.', '_')}{rel}" - def add_error(self, code=None, msg=None): - self.errors.append({"code": code, "msg": msg}) + def add_error(self, code=None, msg=None, key=None, lines=None, values=None): + self.errors.append( + {"code": code, "msg": msg, "key": key, "lines": lines, "values": values} + ) diff --git a/backend/gn_modulator/imports/models.py b/backend/gn_modulator/imports/models.py index 98fa4e4a..9387989d 100644 --- a/backend/gn_modulator/imports/models.py +++ b/backend/gn_modulator/imports/models.py @@ -31,9 +31,9 @@ def __init__(self, schema_code=None, data_file_path=None, mapping_file_path=None csv_delimiter = db.Column(db.Unicode) data_type = db.Column(db.Unicode) - res = db.column(JSONB) - tables = db.column(JSONB) - sql = db.column(JSONB) + res = db.Column(JSONB) + tables = db.Column(JSONB) + sql = db.Column(JSONB) errors = db.Column(JSONB) def as_dict(self): diff --git a/backend/gn_modulator/imports/routes.py b/backend/gn_modulator/imports/routes.py index 8f059a17..abb41052 100644 --- a/backend/gn_modulator/imports/routes.py +++ b/backend/gn_modulator/imports/routes.py @@ -33,6 +33,7 @@ def api_import(module_code): impt = TImport(schema_code=schema_code) db.session.add(impt) + db.session.flush() files_path = {} if request.files: @@ -42,12 +43,16 @@ def api_import(module_code): module_code, object_code, impt.id_import, file ) - impt.data_file_path = str(files_path.get("data_file")) - db.session.flush() + impt.data_file_path = files_path.get("data_file") and str(files_path.get("data_file")) impt.process_import_schema() - print(impt.pretty_infos()) - db.session.commit() + if impt.errors: + out = {"errors": impt.errors} + db.session.commit() + return out - return impt.as_dict() + out = impt.as_dict() + + db.session.commit() + return out diff --git a/backend/gn_modulator/tests/import_test/route/pf.csv b/backend/gn_modulator/tests/import_test/route/pf.csv index 4438291e..c3281591 100644 --- a/backend/gn_modulator/tests/import_test/route/pf.csv +++ b/backend/gn_modulator/tests/import_test/route/pf.csv @@ -1,3 +1,3 @@ code_passage_faune, geom TEST04, POINT (43.676265 4.028108) -TEST05, POINT (43.676265 4.028108) \ No newline at end of file +TEST05, POINT (43.676262 4.028108) \ No newline at end of file diff --git a/backend/gn_modulator/tests/import_test/route/pp_linear.sql b/backend/gn_modulator/tests/import_test/route/pp_linear.sql index e5b66b9f..d4eaedf6 100644 --- a/backend/gn_modulator/tests/import_test/route/pp_linear.sql +++ b/backend/gn_modulator/tests/import_test/route/pp_linear.sql @@ -1,4 +1,5 @@ SELECT + id_import, 'RTE' AS id_type, id AS linear_code, numero || '_' || substring(id, 9) :: bigint AS linear_name, diff --git a/backend/gn_modulator/tests/import_test/route/pp_linear_group.sql b/backend/gn_modulator/tests/import_test/route/pp_linear_group.sql index 8ef52ba8..fe117403 100644 --- a/backend/gn_modulator/tests/import_test/route/pp_linear_group.sql +++ b/backend/gn_modulator/tests/import_test/route/pp_linear_group.sql @@ -1,4 +1,7 @@ SELECT - DISTINCT 'RTE' AS id_type, + DISTINCT ON (id_import) + id_import, + 'RTE' AS id_type, numero AS code, - cl_admin || ' ' || numero AS name \ No newline at end of file + cl_admin || ' ' || numero AS name + ORDER BY id_import \ No newline at end of file diff --git a/backend/gn_modulator/tests/import_test/tests/pf_test_erreurs copy.csv b/backend/gn_modulator/tests/import_test/tests/pf_test_erreurs copy.csv new file mode 100644 index 00000000..ff809071 --- /dev/null +++ b/backend/gn_modulator/tests/import_test/tests/pf_test_erreurs copy.csv @@ -0,0 +1,4 @@ +code_passage_faune, geom, id_nomenclature_ouvrage_hydrau_position +TEST07, POINT (43.676265 4.028108), RD +, POINT (43.676262 4.028108), +TEST08,, \ No newline at end of file diff --git a/backend/gn_modulator/tests/import_test/tests/pf_test_ok.csv b/backend/gn_modulator/tests/import_test/tests/pf_test_ok.csv new file mode 100644 index 00000000..816973e6 --- /dev/null +++ b/backend/gn_modulator/tests/import_test/tests/pf_test_ok.csv @@ -0,0 +1,4 @@ +code_passage_faune, geom, id_nomenclature_ouvrage_hydrau_position +_TEST01, POINT (43.676265 4.028108),RD +_TEST02, POINT (43.676262 4.028108), +_TEST023, POINT (43.676262 4.028108),RG \ No newline at end of file diff --git a/backend/gn_modulator/tests/test_import_api.py b/backend/gn_modulator/tests/test_import_api.py index 15d79dac..f382b920 100644 --- a/backend/gn_modulator/tests/test_import_api.py +++ b/backend/gn_modulator/tests/test_import_api.py @@ -12,11 +12,33 @@ class TestImportApi: def test_import_synthese(self, users): set_logged_user_cookie(self.client, users["admin_user"]) with open(import_test_dir / "synthese_1.csv", "rb") as f: - data = {"file": (f, "synthese.csv"), "object_code": "syn.synthese"} + data = {"data_file": (f, "synthese.csv"), "object_code": "syn.synthese"} r = self.client.post( url_for("modulator.api_import", module_code="MODULATOR"), data=data, headers=Headers({"Content-Type": "multipart/form-data"}), ) - print(r.data) + assert r.status_code == 200, r.data + + assert len(r.json["errors"]) == 0, r.json["errors"] + + assert r.json["res"]["nb_data"] == 2 + assert r.json["res"]["nb_insert"] == 2 + + def test_import_synthese2(self, users): + set_logged_user_cookie(self.client, users["admin_user"]) + with open(import_test_dir / "synthese_1.csv", "rb") as f: + data = {"data_file": (f, "synthese.csv"), "object_code": "syn.synthese"} + r = self.client.post( + url_for("modulator.api_import", module_code="MODULATOR"), + data=data, + headers=Headers({"Content-Type": "multipart/form-data"}), + ) + + assert r.status_code == 200, r.data + + assert len(r.json["errors"]) == 0, r.json["errors"] + + assert r.json["res"]["nb_data"] == 2 + assert r.json["res"]["nb_insert"] == 2 diff --git a/config/modules/contrib/m_sipaf/layouts/m_sipaf.site_list.layout.yml b/config/modules/contrib/m_sipaf/layouts/m_sipaf.site_list.layout.yml index 64558e2e..4912b796 100644 --- a/config/modules/contrib/m_sipaf/layouts/m_sipaf.site_list.layout.yml +++ b/config/modules/contrib/m_sipaf/layouts/m_sipaf.site_list.layout.yml @@ -51,13 +51,23 @@ layout: type: form items: - items: + - type: message + html: __f__data.importMsg?.html + class: __f__data.importMsg?.class + hidden: __f__!data.importMsg + + - key: importMsg + hidden: true - key: data_file type: file title: Fichier d'import + required: true description: Choisir un fichier à importer - key: object_code type: string + hidden: true default: __f__context.object_code + - direction: row items: - type: button diff --git a/frontend/app/components/base/base.scss b/frontend/app/components/base/base.scss index c722c1e4..a7b12019 100644 --- a/frontend/app/components/base/base.scss +++ b/frontend/app/components/base/base.scss @@ -178,6 +178,12 @@ div.layout-items > div { background-color: lightgreen; } +.layout-message.success { + color: darkgreen; + background-color: lightgreen; +} + + .layout-message.error { color: darkred; background-color: lightcoral; diff --git a/frontend/app/components/layout/base/layout.component.html b/frontend/app/components/layout/base/layout.component.html index 2cb8561d..10d846d4 100644 --- a/frontend/app/components/layout/base/layout.component.html +++ b/frontend/app/components/layout/base/layout.component.html @@ -142,9 +142,10 @@
this._mLayout.reComputeLayout(), 100); + // this._commonService.regularToaster('success', txtImport); } }, (error: HttpErrorResponse) => { @@ -166,4 +175,72 @@ export class ModulesActionService { } ); } + + importHTMLMsgSuccess(impt) { + let txtImport = `
Import réussi
`; + let res = impt.res; + + if (res.nb_data) { + txtImport += `data: ${res.nb_data}
`; + } + + if (res.nb_raw != res.nb_data) { + txtImport += `raw: ${res.nb_raw}
`; + } + + if (res.nb_insert) { + txtImport += `insert: ${res.nb_insert}
`; + } + + if (res.nb_update) { + txtImport += `update: ${res.nb_update}
`; + } + + if (res.nb_unchanged) { + txtImport += `unchanged: ${res.nb_unchanged}
`; + } + return txtImport; + } + + importHTMLMsgError(impt) { + let txtImport = `

${impt.errors.length} erreurs

`; + + let txtErrorRequired; + for (let error of impt.errors.filter((e) => e.code == 'ERR_IMPORT_REQUIRED')) { + if (!txtErrorRequired) { + txtErrorRequired = `
Champs requis manquants
`; + } + txtErrorRequired += `${error.key} ${error.lines.length} ligne(s): [${error.lines}]
`; + } + if (txtErrorRequired) { + txtImport += '
'; + txtImport += txtErrorRequired; + } + + let txtErrorUnresolved; + for (let error of impt.errors.filter((e) => e.code == 'ERR_IMPORT_UNRESOLVED')) { + if (!txtErrorUnresolved) { + txtErrorUnresolved = `
Champs non résolus
`; + } + txtErrorUnresolved += `${error.key} ${error.lines.length} ligne(s): [${error.lines}]
`; + if (error.values) { + txtErrorUnresolved += `Valeurs parmi : ${error.values + .map((v) => v.cd_nomenclature) + .join(', ')}
`; + } + } + if (txtErrorUnresolved) { + txtImport += '
'; + txtImport += txtErrorUnresolved; + } + + for (let error of impt.errors.filter( + (e) => !['ERR_IMPORT_REQUIRED', 'ERR_IMPORT_UNRESOLVED'].includes(e.code) + )) { + txtImport += '
'; + txtImport += `${error.code}: ${error.msg}`; + } + + return txtImport; + } } diff --git a/frontend/app/services/form.service.ts b/frontend/app/services/form.service.ts index 386d7f51..ca786086 100644 --- a/frontend/app/services/form.service.ts +++ b/frontend/app/services/form.service.ts @@ -280,10 +280,14 @@ export class ModulesFormService { /** pour mettre à jour les données sans casser les références */ updateData(data, formValue) { - if (utils.fastDeepEqual(data, formValue)) { + if (this.isEqual(formValue, data)) { return data; } + if (utils.isFile(formValue)) { + return formValue; + } + if (utils.isObject(formValue)) { if (data == null) { return formValue; @@ -318,7 +322,11 @@ export class ModulesFormService { } isEqual(formValue, data) { - return utils.isObject(formValue) + return utils.isFile(formValue) + ? utils.isFile(data) + ? ['name', 'lastModified', 'size', 'type'].every((k) => data[k] == formValue[k]) + : false + : utils.isObject(formValue) ? !utils.isObject(data) ? false : Object.entries(formValue) From eed69e2a70e9d109db35f737d7c776dc71587457 Mon Sep 17 00:00:00 2001 From: "joel.clement" Date: Wed, 8 Mar 2023 16:21:46 +0100 Subject: [PATCH 009/142] migration import --- .gitignore | 2 +- .../3920371728d8_gn_modulator_import_init.py | 48 +++++++++++++++++++ 2 files changed, 49 insertions(+), 1 deletion(-) create mode 100644 backend/gn_modulator/migrations/versions/3920371728d8_gn_modulator_import_init.py diff --git a/.gitignore b/.gitignore index df5d7890..c4101487 100644 --- a/.gitignore +++ b/.gitignore @@ -11,7 +11,7 @@ frontend/app/module.config.ts #!migrations/data/*.sql backend/gn_modulator/migrations/versions/* -!backend/gn_modulator/migrations/versions/*_gn_modulator.py +!backend/gn_modulator/migrations/versions/*gn_modulator*.py !.gitkeep diff --git a/backend/gn_modulator/migrations/versions/3920371728d8_gn_modulator_import_init.py b/backend/gn_modulator/migrations/versions/3920371728d8_gn_modulator_import_init.py new file mode 100644 index 00000000..9a920659 --- /dev/null +++ b/backend/gn_modulator/migrations/versions/3920371728d8_gn_modulator_import_init.py @@ -0,0 +1,48 @@ +"""gn_modulator import init + +Revision ID: 3920371728d8 +Revises: d3f266c7b1b6 +Create Date: 2023-03-03 14:31:35.339631 + +""" +from alembic import op +import sqlalchemy as sa + + +# revision identifiers, used by Alembic. +revision = "3920371728d8" +down_revision = "d3f266c7b1b6" +branch_labels = None +depends_on = None + + +def upgrade(): + op.execute( + """ +CREATE TABLE gn_modulator.t_imports( + id_import SERIAL NOT NULL, + schema_code VARCHAR, + data_file_path VARCHAR, + mapping_file_path VARCHAR, + csv_delimiter VARCHAR, + data_type VARCHAR, + res JSONB, + tables JSONB, + errors JSONB, + sql JSONB +); + +ALTER TABLE gn_modulator.t_imports + ADD CONSTRAINT pk_gn_modulator_t_imports_id_import PRIMARY KEY (id_import); + """ + ) + pass + + +def downgrade(): + op.execute( + """ + DROP TABLE gn_modulator.t_imports; + """ + ) + pass From d1b7fb401679f3119beb93ac5b9fd2839a329873 Mon Sep 17 00:00:00 2001 From: "joel.clement" Date: Thu, 9 Mar 2023 09:18:18 +0100 Subject: [PATCH 010/142] mapping :table_data --- backend/gn_modulator/imports/mixins/mapping.py | 16 ++++++---------- .../tests/import_test/route/pp_linear.sql | 3 ++- .../tests/import_test/route/pp_linear_group.sql | 3 ++- .../m_sipaf/imports/scripts/ppi_actor.sql | 1 + .../m_sipaf/imports/scripts/ppi_actor_V1.sql | 1 + .../imports/scripts/ppi_groupe_route_na.sql | 4 +++- .../m_sipaf/imports/scripts/ppi_organism.sql | 5 +++-- .../m_sipaf/imports/scripts/ppi_organism_V1.sql | 5 +++-- .../m_sipaf/imports/scripts/ppi_pf_V1.sql | 1 + .../imports/scripts/ppi_troncon_route_na.sql | 4 +++- 10 files changed, 25 insertions(+), 18 deletions(-) diff --git a/backend/gn_modulator/imports/mixins/mapping.py b/backend/gn_modulator/imports/mixins/mapping.py index 48083392..39c56ffe 100644 --- a/backend/gn_modulator/imports/mixins/mapping.py +++ b/backend/gn_modulator/imports/mixins/mapping.py @@ -60,24 +60,20 @@ def sql_mapping(self): code="ERR_IMPORT_MAPPING_FORBIDEN_WORD", msg=f"Le fichier de preprocess {self.mapping_file_path} contient le ou les mots interdits {', '.join(forbidden_word)}", ) - return - for word in ["WHERE", "ORDER BY", "LIMIT"]: - if word in mapping_select: - mapping_select = mapping_select.replace( - f"{word}", f"\nFROM {from_table}\n{word}" - ) - break + if ":TABLE_DATA" not in mapping_select: + self.add_error( + code="ERR_IMPORT_MAPPING_MISSING_TABLE", + msg="La selection de mapping doit contenir 'FROM :table_data", + ) - if "FROM" not in mapping_select: - mapping_select += f"\nFROM {from_table}" + mapping_select = mapping_select.replace(":TABLE_DATA", from_table) if "ID_IMPORT" not in mapping_select: self.add_error( code="ERR_IMPORT_MAPPING_MISSING_IMPORT", msg=f"La selection de mapping doit contenir le champs id_import dans {self.mapping_file_path}", ) - return sql_mapping = f""" DROP VIEW IF EXISTS {dest_table}; diff --git a/backend/gn_modulator/tests/import_test/route/pp_linear.sql b/backend/gn_modulator/tests/import_test/route/pp_linear.sql index d4eaedf6..0daaf31c 100644 --- a/backend/gn_modulator/tests/import_test/route/pp_linear.sql +++ b/backend/gn_modulator/tests/import_test/route/pp_linear.sql @@ -6,4 +6,5 @@ SELECT wkt as geom, true as enable, 'https://geoservices.ign.fr/bdtopo#telechargementshpreg' AS source, - numero as groups -- n-n ++ \ No newline at end of file + numero as groups -- n-n ++ + FROM :table_data \ No newline at end of file diff --git a/backend/gn_modulator/tests/import_test/route/pp_linear_group.sql b/backend/gn_modulator/tests/import_test/route/pp_linear_group.sql index fe117403..2ca16629 100644 --- a/backend/gn_modulator/tests/import_test/route/pp_linear_group.sql +++ b/backend/gn_modulator/tests/import_test/route/pp_linear_group.sql @@ -4,4 +4,5 @@ SELECT 'RTE' AS id_type, numero AS code, cl_admin || ' ' || numero AS name - ORDER BY id_import \ No newline at end of file + FROM :table_data + ORDER BY id_import diff --git a/config/modules/contrib/m_sipaf/imports/scripts/ppi_actor.sql b/config/modules/contrib/m_sipaf/imports/scripts/ppi_actor.sql index 8d0826d4..ca0a2dc4 100644 --- a/config/modules/contrib/m_sipaf/imports/scripts/ppi_actor.sql +++ b/config/modules/contrib/m_sipaf/imports/scripts/ppi_actor.sql @@ -9,6 +9,7 @@ SELECT END AS id_nomenclature_type_actor, nom_organism AS id_organism, NULL AS id_role + FROM :table_data WHERE nom_organism IS NOT NULL AND nom_organism != '' ; diff --git a/config/modules/contrib/m_sipaf/imports/scripts/ppi_actor_V1.sql b/config/modules/contrib/m_sipaf/imports/scripts/ppi_actor_V1.sql index 0a52176f..713fed0c 100644 --- a/config/modules/contrib/m_sipaf/imports/scripts/ppi_actor_V1.sql +++ b/config/modules/contrib/m_sipaf/imports/scripts/ppi_actor_V1.sql @@ -3,6 +3,7 @@ SELECT 'CON' AS id_nomenclature_type_actor, concess AS id_organism, NULL AS id_role + FROM :table_data WHERE concess IS NOT NULL AND concess != '' ; diff --git a/config/modules/contrib/m_sipaf/imports/scripts/ppi_groupe_route_na.sql b/config/modules/contrib/m_sipaf/imports/scripts/ppi_groupe_route_na.sql index 1eed5d7c..2a25e3fc 100644 --- a/config/modules/contrib/m_sipaf/imports/scripts/ppi_groupe_route_na.sql +++ b/config/modules/contrib/m_sipaf/imports/scripts/ppi_groupe_route_na.sql @@ -1,6 +1,8 @@ DROP VIEW IF EXISTS :pre_processed_import_view CASCADE; CREATE VIEW :pre_processed_import_view AS -SELECT DISTINCT +SELECT DISTINCT ON(id_import) 'RTE' AS id_type, numero AS code, cl_admin || ' ' || numero AS name + FROM :table_data + ORDER BY id_import \ No newline at end of file diff --git a/config/modules/contrib/m_sipaf/imports/scripts/ppi_organism.sql b/config/modules/contrib/m_sipaf/imports/scripts/ppi_organism.sql index 112ad275..57d5ce2f 100644 --- a/config/modules/contrib/m_sipaf/imports/scripts/ppi_organism.sql +++ b/config/modules/contrib/m_sipaf/imports/scripts/ppi_organism.sql @@ -1,5 +1,6 @@ -SELECT DISTINCT +SELECT DISTINCT ON (id_import) nom_organism AS nom_organisme, 'SIPAF' AS adresse_organisme WHERE nom_organism IS NOT NULL AND nom_organism != '' - ORDER BY nom_organism + FROM :table_data + ORDER BY id_import, nom_organism diff --git a/config/modules/contrib/m_sipaf/imports/scripts/ppi_organism_V1.sql b/config/modules/contrib/m_sipaf/imports/scripts/ppi_organism_V1.sql index a6267ec9..e0423a4b 100644 --- a/config/modules/contrib/m_sipaf/imports/scripts/ppi_organism_V1.sql +++ b/config/modules/contrib/m_sipaf/imports/scripts/ppi_organism_V1.sql @@ -1,5 +1,6 @@ -SELECT DISTINCT +SELECT DISTINCT ON (id_import) concess AS nom_organisme, 'SIPAF' AS adresse_organisme WHERE concess IS NOT NULL AND concess != '' - ORDER BY concess + FROM :table_data + ORDER BY id_import, concess diff --git a/config/modules/contrib/m_sipaf/imports/scripts/ppi_pf_V1.sql b/config/modules/contrib/m_sipaf/imports/scripts/ppi_pf_V1.sql index 3ab0ac68..2d373ed4 100644 --- a/config/modules/contrib/m_sipaf/imports/scripts/ppi_pf_V1.sql +++ b/config/modules/contrib/m_sipaf/imports/scripts/ppi_pf_V1.sql @@ -1,6 +1,7 @@ -- import V1 -- (sans les données spécificité, matériaux, et ouvrage_type) select + id_import, uuid_pf as code_passage_faune, CASE WHEN pi_ou_ps = 'PI' THEN FALSE diff --git a/config/modules/contrib/m_sipaf/imports/scripts/ppi_troncon_route_na.sql b/config/modules/contrib/m_sipaf/imports/scripts/ppi_troncon_route_na.sql index e5b66b9f..0daaf31c 100644 --- a/config/modules/contrib/m_sipaf/imports/scripts/ppi_troncon_route_na.sql +++ b/config/modules/contrib/m_sipaf/imports/scripts/ppi_troncon_route_na.sql @@ -1,8 +1,10 @@ SELECT + id_import, 'RTE' AS id_type, id AS linear_code, numero || '_' || substring(id, 9) :: bigint AS linear_name, wkt as geom, true as enable, 'https://geoservices.ign.fr/bdtopo#telechargementshpreg' AS source, - numero as groups -- n-n ++ \ No newline at end of file + numero as groups -- n-n ++ + FROM :table_data \ No newline at end of file From 4753b693a27f909267fd6ab69aeb08b2a2e8126a Mon Sep 17 00:00:00 2001 From: "joel.clement" Date: Thu, 9 Mar 2023 13:18:48 +0100 Subject: [PATCH 011/142] process import code --- .../gn_modulator/imports/mixins/__init__.py | 50 ++++++++++++++++++- backend/gn_modulator/imports/models.py | 5 +- backend/gn_modulator/schema/imports/bulk.py | 4 +- backend/gn_modulator/tests/utils/imports.py | 2 +- 4 files changed, 54 insertions(+), 7 deletions(-) diff --git a/backend/gn_modulator/imports/mixins/__init__.py b/backend/gn_modulator/imports/mixins/__init__.py index 4d55b4e4..c6fb9d44 100644 --- a/backend/gn_modulator/imports/mixins/__init__.py +++ b/backend/gn_modulator/imports/mixins/__init__.py @@ -1,4 +1,6 @@ +from pathlib import Path from geonature.utils.env import db +from gn_modulator.definition import DefinitionMethods from .check import ImportMixinCheck from .data import ImportMixinData @@ -22,8 +24,7 @@ class ImportMixin( ImportMixinUpdate, ImportMixinUtils, ): - def process_import_schema(self, _insert_data=False): - self._insert_data = _insert_data + def process_import_schema(self): self.init_import() if self.errors: @@ -75,3 +76,48 @@ def process_import_schema(self, _insert_data=False): ) return self + + @classmethod + def process_import_code(cls, import_code, data_dir_path): + + print(f"\nProcess scenaria d'import {import_code}") + + # get import definition + import_definitions = DefinitionMethods.get_definition("import", import_code) + import_definitions_file_path = DefinitionMethods.get_file_path("import", import_code) + + # for all definition items + imports = [] + last_impt = None + for import_definition in import_definitions["items"]: + # récupération du fichier de données + data_file_path = Path(data_dir_path) / import_definition["data"] if d.get("data") else Path(data_dir_path) + + # récupération du fichier pre-process, s'il est défini + pre_process_file_path = ( + Path(import_definitions_file_path).parent / import_definition["pre_process"] + if import_definition.get("pre_process") + else None + ) + + impt = cls(schema_code=import_definition["schema_code"], data_dir_path=data_file_path, pre_process_file_path=pre_process_file_path) + + # pour éviter d'avoir à recharger + if import_definition['keep_raw'] and last_impt: + impt.tables['data'] = last_impt.tables['data'] + + db.session.add(impt) + # flush ?? + + impt.process_import_schema() + import_infos = impt.import_infos() + if errors := import_infos["errors"]: + print(f"Il y a des erreurs dans l'import {import_definition['schema_code']}") + for error in errors: + print(f"- {error['code']} : {error['msg']}") + return imports + print(impt.pretty_infos()) + last_impt = impt + + print(f"\nImport {import_code} terminé\n") + return imports diff --git a/backend/gn_modulator/imports/models.py b/backend/gn_modulator/imports/models.py index 9387989d..50060f42 100644 --- a/backend/gn_modulator/imports/models.py +++ b/backend/gn_modulator/imports/models.py @@ -8,18 +8,17 @@ class TImport(db.Model, ImportMixin): __tablename__ = "t_imports" __table_args__ = {"schema": "gn_modulator"} - def __init__(self, schema_code=None, data_file_path=None, mapping_file_path=None): + def __init__(self, schema_code=None, data_file_path=None, mapping_file_path=None, _insert=False): self.schema_code = schema_code self.data_file_path = data_file_path and str(data_file_path) self.mapping_file_path = mapping_file_path and str(mapping_file_path) - + self._insert = _insert self.res = {} self.errors = [] self.sql = {} self.tables = {} _insert = False - _keep_raw = False id_import = db.Column(db.Integer, primary_key=True) diff --git a/backend/gn_modulator/schema/imports/bulk.py b/backend/gn_modulator/schema/imports/bulk.py index dc510360..e669e414 100644 --- a/backend/gn_modulator/schema/imports/bulk.py +++ b/backend/gn_modulator/schema/imports/bulk.py @@ -1,8 +1,10 @@ from pathlib import Path + +from geonature.utils.env import db + from gn_modulator.definition import DefinitionMethods from gn_modulator.utils.env import schema_import from gn_modulator.utils.cache import set_global_cache, get_global_cache -from geonature.utils.env import db class SchemaBulkImports: diff --git a/backend/gn_modulator/tests/utils/imports.py b/backend/gn_modulator/tests/utils/imports.py index 1e5fd0b5..587b3e67 100644 --- a/backend/gn_modulator/tests/utils/imports.py +++ b/backend/gn_modulator/tests/utils/imports.py @@ -10,7 +10,7 @@ def test_data_file( return with db.session.begin_nested(): - impt = TImport(schema_code, data_file_path, mapping_file_path) + impt = TImport(schema_code=schema_code, data_file_path=data_file_path, mapping_file_path=mapping_file_path, _insert=True) db.session.add(impt) assert impt.id_import is not None From 1ed81fa5dc52124ae446c8b23fee409125430a01 Mon Sep 17 00:00:00 2001 From: "joel.clement" Date: Thu, 9 Mar 2023 15:14:41 +0100 Subject: [PATCH 012/142] TImport import code + test --- backend/gn_modulator/commands.py | 35 +++++---------- .../gn_modulator/imports/mixins/__init__.py | 44 +++++++++++-------- .../gn_modulator/imports/mixins/mapping.py | 9 ++-- backend/gn_modulator/imports/mixins/raw.py | 1 - backend/gn_modulator/imports/mixins/utils.py | 8 ++-- backend/gn_modulator/imports/models.py | 8 ++-- .../TRONCON_DE_ROUTE_NATIONALE_AUTOROUTE.csv | 10 +++++ .../import_test/import_code/linear_type.csv | 2 + .../tests/import_test/import_code/pf_V1.csv | 12 +++++ .../gn_modulator/tests/test_import_code.py | 24 ++++++++++ backend/gn_modulator/tests/utils/imports.py | 27 +++++++++++- .../m_sipaf/imports/m_sipaf.pf_V1.import.yml | 6 +-- .../m_sipaf/imports/ref_geo.route.import.yml | 4 +- .../m_sipaf/imports/scripts/ppi_actor.sql | 1 + .../m_sipaf/imports/scripts/ppi_actor_V1.sql | 1 + .../imports/scripts/ppi_groupe_route_na.sql | 7 ++- .../m_sipaf/imports/scripts/ppi_organism.sql | 1 + .../imports/scripts/ppi_organism_V1.sql | 8 ++-- .../m_sipaf/imports/scripts/ppi_pf_V1.sql | 5 ++- .../imports/scripts/ppi_srce_reservoir.sql | 4 +- 20 files changed, 147 insertions(+), 70 deletions(-) create mode 100644 backend/gn_modulator/tests/import_test/import_code/TRONCON_DE_ROUTE_NATIONALE_AUTOROUTE.csv create mode 100644 backend/gn_modulator/tests/import_test/import_code/linear_type.csv create mode 100644 backend/gn_modulator/tests/import_test/import_code/pf_V1.csv create mode 100644 backend/gn_modulator/tests/test_import_code.py diff --git a/backend/gn_modulator/commands.py b/backend/gn_modulator/commands.py index f8c32d30..d1576752 100644 --- a/backend/gn_modulator/commands.py +++ b/backend/gn_modulator/commands.py @@ -7,9 +7,8 @@ import click from flask.cli import with_appcontext -from gn_modulator.schema import SchemaMethods -from gn_modulator.module import ModuleMethods -from gn_modulator.definition import DefinitionMethods +from gn_modulator import SchemaMethods, ModuleMethods, DefinitionMethods +from gn_modulator.imports.models import TImport from gn_modulator.utils.errors import errors_txt from gn_modulator import init_gn_modulator from geonature.utils.env import db @@ -127,9 +126,9 @@ def cmd_doc_schema(schema_code, force=False): @click.option("-s", "schema_code") @click.option("-d", "data_path", type=click.Path(exists=True)) @click.option( - "-p", - "--pre-process", - "pre_process_file_path", + "-m", + "--mapping", + "mapping_file_path", type=click.Path(exists=True), help="chemin vers le script sql de pre-process", ) @@ -139,18 +138,12 @@ def cmd_doc_schema(schema_code, force=False): "import_code", help="code de l'import de ficher", ) -@click.option("-k", "--keep-raw", is_flag=True, help="garde le csv en base") @click.option( "-v", "--verbose", type=int, default=1, help="1 : affiche les sortie, 2: les commandes sql " ) @with_appcontext def cmd_import_bulk_data( - schema_code=None, - import_code=None, - data_path=None, - pre_process_file_path=None, - verbose=1, - keep_raw=False, + schema_code=None, import_code=None, data_path=None, mapping_file_path=None, verbose=None ): """ importe des données pour un schema @@ -159,20 +152,14 @@ def cmd_import_bulk_data( init_gn_modulator() if schema_code and data_path: - Timport() - import_number = SchemaMethods.process_import_schema( - schema_code, - data_path, - pre_process_file_path=pre_process_file_path, - verbose=verbose, - keep_raw=keep_raw, - commit=True, + impt = TImport( + schema_code=schema_code, data_file_path=data_path, mapping_file_path=mapping_file_path ) + impt.process_import_schema() + print(impt.pretty_infos()) if import_code: - import_number = SchemaMethods.process_import_code( - import_code, data_path, verbose=verbose, commit=True - ) + TImport.process_import_code(import_code, data_path) return True diff --git a/backend/gn_modulator/imports/mixins/__init__.py b/backend/gn_modulator/imports/mixins/__init__.py index c6fb9d44..5d3a5a46 100644 --- a/backend/gn_modulator/imports/mixins/__init__.py +++ b/backend/gn_modulator/imports/mixins/__init__.py @@ -25,7 +25,6 @@ class ImportMixin( ImportMixinUtils, ): def process_import_schema(self): - self.init_import() if self.errors: return self @@ -78,9 +77,8 @@ def process_import_schema(self): return self @classmethod - def process_import_code(cls, import_code, data_dir_path): - - print(f"\nProcess scenaria d'import {import_code}") + def process_import_code(cls, import_code, data_dir_path, commit=True): + print(f"\nProcess scenario d'import {import_code}") # get import definition import_definitions = DefinitionMethods.get_definition("import", import_code) @@ -88,36 +86,46 @@ def process_import_code(cls, import_code, data_dir_path): # for all definition items imports = [] - last_impt = None for import_definition in import_definitions["items"]: # récupération du fichier de données - data_file_path = Path(data_dir_path) / import_definition["data"] if d.get("data") else Path(data_dir_path) + data_file_path = ( + Path(data_dir_path) / import_definition["data"] + if import_definition.get("data") + else Path(data_dir_path) + ) # récupération du fichier pre-process, s'il est défini - pre_process_file_path = ( - Path(import_definitions_file_path).parent / import_definition["pre_process"] - if import_definition.get("pre_process") + mapping_file_path = ( + Path(import_definitions_file_path).parent / import_definition["mapping"] + if import_definition.get("mapping") else None ) - impt = cls(schema_code=import_definition["schema_code"], data_dir_path=data_file_path, pre_process_file_path=pre_process_file_path) + impt = cls( + schema_code=import_definition["schema_code"], + data_file_path=data_file_path, + mapping_file_path=mapping_file_path, + ) - # pour éviter d'avoir à recharger - if import_definition['keep_raw'] and last_impt: - impt.tables['data'] = last_impt.tables['data'] + # pour éviter d'avoir à recharger les données + if import_definition.get("keep_raw") and len(imports): + last_import = imports[-1] + impt.tables["data"] = imports[-1].tables["data"] db.session.add(impt) # flush ?? impt.process_import_schema() - import_infos = impt.import_infos() - if errors := import_infos["errors"]: + imports.append(impt) + + if impt.errors: print(f"Il y a des erreurs dans l'import {import_definition['schema_code']}") - for error in errors: + for error in impt.errors: print(f"- {error['code']} : {error['msg']}") return imports print(impt.pretty_infos()) - last_impt = impt - print(f"\nImport {import_code} terminé\n") + if commit: + db.session.commit() + print(f"Import {import_code} terminé") return imports diff --git a/backend/gn_modulator/imports/mixins/mapping.py b/backend/gn_modulator/imports/mixins/mapping.py index 39c56ffe..97b36ff1 100644 --- a/backend/gn_modulator/imports/mixins/mapping.py +++ b/backend/gn_modulator/imports/mixins/mapping.py @@ -8,7 +8,6 @@ def process_mapping_view(self): """ Application de la vue de mappage à la la table d'import """ - if self.mapping_file_path is None: return @@ -49,8 +48,8 @@ def sql_mapping(self): "DROP ", "DELETE ", "UPDATE ", - "EXECUTE", - "TRUNCATE", + "EXECUTE ", + "TRUNCATE ", ]: if forbidden_word in mapping_select: forbidden_words.append(forbidden_word.strip()) @@ -58,13 +57,13 @@ def sql_mapping(self): if forbidden_words: self.add_error( code="ERR_IMPORT_MAPPING_FORBIDEN_WORD", - msg=f"Le fichier de preprocess {self.mapping_file_path} contient le ou les mots interdits {', '.join(forbidden_word)}", + msg=f"Le fichier de preprocess {self.mapping_file_path} contient le ou les mots interdits {', '.join(forbidden_words)}:\n {mapping_select}", ) if ":TABLE_DATA" not in mapping_select: self.add_error( code="ERR_IMPORT_MAPPING_MISSING_TABLE", - msg="La selection de mapping doit contenir 'FROM :table_data", + msg=f"La selection de mapping doit contenir 'FROM :table_data {mapping_select}", ) mapping_select = mapping_select.replace(":TABLE_DATA", from_table) diff --git a/backend/gn_modulator/imports/mixins/raw.py b/backend/gn_modulator/imports/mixins/raw.py index 4b4a5f1c..a8877182 100644 --- a/backend/gn_modulator/imports/mixins/raw.py +++ b/backend/gn_modulator/imports/mixins/raw.py @@ -11,7 +11,6 @@ def process_raw_view(self): from_table = self.tables.get("mapping") or self.tables["data"] dest_table = self.tables["raw"] = self.table_name("raw") - self.sql["raw_view"] = self.sql_raw_view(from_table, dest_table) try: diff --git a/backend/gn_modulator/imports/mixins/utils.py b/backend/gn_modulator/imports/mixins/utils.py index 8350dba1..64857511 100644 --- a/backend/gn_modulator/imports/mixins/utils.py +++ b/backend/gn_modulator/imports/mixins/utils.py @@ -9,13 +9,15 @@ def init_import(self): SchemaMethods.c_sql_exec_txt(f"CREATE SCHEMA IF NOT EXISTS {schema_import}") def pretty_infos(self): - print(self.res) txt = "" - txt += f"\n-- import csv file {Path(self.data_file_path).name}" - txt += f" {self.res.get('nb_data')} lignes" + if self.res.get("nb_data") is not None: + txt += f"\n-- import csv file {Path(self.data_file_path).name}" + txt += f" {self.res.get('nb_data')} lignes\n\n" txt += f" - {self.schema_code}\n" if self.res.get("nb_raw") != self.res.get("nb_process"): txt += f" raw : {self.res.get('nb_raw'):10d}\n" + if self.res.get("nb_process"): + txt += f" process : {self.res.get('nb_process'):10d}\n" if self.res.get("nb_insert"): txt += f" insert : {self.res['nb_insert']:10d}\n" if self.res.get("nb_update"): diff --git a/backend/gn_modulator/imports/models.py b/backend/gn_modulator/imports/models.py index 50060f42..cf7c2c33 100644 --- a/backend/gn_modulator/imports/models.py +++ b/backend/gn_modulator/imports/models.py @@ -8,17 +8,19 @@ class TImport(db.Model, ImportMixin): __tablename__ = "t_imports" __table_args__ = {"schema": "gn_modulator"} - def __init__(self, schema_code=None, data_file_path=None, mapping_file_path=None, _insert=False): + def __init__( + self, schema_code=None, data_file_path=None, mapping_file_path=None, _insert_data=False + ): self.schema_code = schema_code self.data_file_path = data_file_path and str(data_file_path) self.mapping_file_path = mapping_file_path and str(mapping_file_path) - self._insert = _insert + self._insert = _insert_data self.res = {} self.errors = [] self.sql = {} self.tables = {} - _insert = False + _insert_data = False id_import = db.Column(db.Integer, primary_key=True) diff --git a/backend/gn_modulator/tests/import_test/import_code/TRONCON_DE_ROUTE_NATIONALE_AUTOROUTE.csv b/backend/gn_modulator/tests/import_test/import_code/TRONCON_DE_ROUTE_NATIONALE_AUTOROUTE.csv new file mode 100644 index 00000000..a2506a96 --- /dev/null +++ b/backend/gn_modulator/tests/import_test/import_code/TRONCON_DE_ROUTE_NATIONALE_AUTOROUTE.csv @@ -0,0 +1,10 @@ +WKT;ID;NATURE;NOM_1_G;NOM_1_D;NOM_2_G;NOM_2_D;IMPORTANCE;FICTIF;POS_SOL;ETAT;DATE_CREAT;DATE_MAJ;DATE_APP;DATE_CONF;SOURCE;ID_SOURCE;PREC_PLANI;PREC_ALTI;NB_VOIES;LARGEUR;IT_VERT;PRIVE;SENS;CYCLABLE;BUS;URBAIN;VIT_MOY_VL;ACCES_VL;ACCES_PED;FERMETURE;NAT_RESTR;RESTR_H;RESTR_P;RESTR_PPE;RESTR_LAR;RESTR_LON;RESTR_MAT;BORNEDEB_G;BORNEDEB_D;BORNEFIN_G;BORNEFIN_D;INSEECOM_G;INSEECOM_D;TYP_ADRES;ALIAS_G;ALIAS_D;C_POSTAL_G;C_POSTAL_D;DATE_SERV;ID_VOIE_G;ID_VOIE_D;ID_RN;ID_ITI;NUMERO;NUM_EUROP;CL_ADMIN;GESTION;TOPONYME;ITI_CYCL;VOIE_VERTE;NATURE_ITI;NOM_ITI +"LINESTRING (653061.6 6867012.6,653058.8 6867014.4,653051.2 6867019.4,653043.3 6867026.7,653031.4 6867040.3)";TRONROUT0000006660176847;Bretelle;;;;;"1";Non;"1";En service;2006-05-22 13:18:11;2020-12-18 10:36:12;;;;;2.5;1.5;"1";3.0;Oui;Non;Sens direct;;;Non;"45";Libre;;;;;;;;;Non;;;;;"75118";"75118";;;;"75018";"75018";;;;ROUTNOMM0000000000208330/ROUTNOMM0000000002780793;;A30001;;Autoroute;DIR Île-de-France;Autoroute du Nord;;;; +"LINESTRING (651026.3 6857814.4,651007.6 6857824.3)";TRONROUT0000006660208122;Type autoroutier;;;;;"1";Non;"1";En service;2006-05-22 13:18:11;2019-07-05 21:05:08;;;;;2.5;1.5;"3";9.0;Oui;Non;Sens direct;;;Oui;"100";Libre;;;;;;;;;Non;;;;;"75114";"75114";;;;"75014";"75014";;;;ROUTNOMM0000000000208363/ROUTNOMM0000000004450783;;A30006A;;Autoroute;DIR Île-de-France;Autoroute du Soleil;;;; +"LINESTRING (645449.7 6870697.8,645391.5 6870680.3,645260.0 6870641.7,645243.2 6870636.5,645128.7 6870600.5,645098.4 6870589.7)";TRONROUT0000006660510795;Type autoroutier;;;;;"1";Non;"0";En service;2006-05-22 13:39:36;2019-07-05 21:05:08;;;;;2.5;1.5;"2";7.0;Oui;Non;Sens inverse;;;Oui;"100";Libre;;;;;;;;;Non;;;;;"92025";"92025";;;;"92700";"92700";;;;ROUTNOMM0000000004450785;;A30086;;Autoroute;DIR Île-de-France;;;;; +"LINESTRING (649396.2 6868616.0,649387.5 6868623.8,649377.8 6868634.4,649366.7 6868648.4,649360.4 6868656.4,649347.1 6868673.2)";TRONROUT0000006660514231;Bretelle;;;;;"2";Non;"0";En service;2006-05-22 13:39:36;2021-01-26 16:59:51;;;;;2.5;1.5;"2";5.0;Oui;Non;Sens direct;;;Oui;"45";Libre;;;;;;;;;Non;;;;;"92004";"92004";;;;"92600";"92600";;;;ROUTNOMM0000000000552015;;N30315;;Nationale;DIR Île-de-France;;;;; +"LINESTRING (641257.4 6867324.0,641247.1 6867331.5,641229.6 6867344.7,641208.4 6867361.3,641195.9 6867371.1,641171.3 6867391.5,641122.0 6867437.3,641094.1 6867464.6,641086.3 6867468.5)";TRONROUT0000006660517964;Type autoroutier;;;;;"1";Non;"1";En service;2006-05-22 13:39:36;2018-05-23 18:49:45;;;;;20.0;2.5;"2";7.0;Oui;Non;Sens inverse;;;Non;"105";A péage;;;;;;;;;Non;;;;;"92050";"92050";;;;"92000";"92000";;;;ROUTNOMM0000000000552037;;A30014;;Autoroute;DIR Île-de-France;;;;; +"LINESTRING (639087.7 6865829.7,639094.5 6865837.4,639102.5 6865843.9,639112.6 6865851.0,639126.4 6865860.3,639142.0 6865869.2,639159.8 6865878.0,639180.4 6865886.7,639202.2 6865894.5,639222.5 6865900.6,639239.4 6865904.9,639254.6 6865908.8,639274.3 6865913.2,639318.8 6865923.0,639344.0 6865928.6)";TRONROUT0000006660522791;Type autoroutier;;;;;"1";Non;"0";En service;2006-05-22 13:39:36;2019-07-05 21:05:08;;;;;20.0;2.5;"4";14.0;Oui;Non;Sens direct;;;Non;"125";Libre;;;;;;;;;Non;;;;;"92063";"92063";;;;"92500";"92500";;;;ROUTNOMM0000000004450785;;A30086;;Autoroute;DIR Île-de-France;;;;; +"LINESTRING (647066.9 6864590.6,646982.3 6864630.8,646959.2 6864642.8,646952.7 6864648.9)";TRONROUT0000006660523771;Bretelle;;;;;"1";Non;"0";En service;2006-05-22 13:39:36;2019-07-05 21:05:08;;;;;20.0;2.5;"2";6.0;Oui;Non;Sens direct;;;Oui;"45";Libre;;;;;;;;;Non;;;;;"92051";"92051";;;;"92200";"92200";;;;ROUTNOMM0000000005210177;;N30013;;Nationale;DIR Île-de-France;;;;; +"LINESTRING (646622.9 6864812.2,646557.4 6864844.9)";TRONROUT0000006660523813;Route à 2 chaussées;AV CHARLES DE GAULLE;AV CHARLES DE GAULLE;;;"1";Non;"0";En service;2006-05-22 13:39:36;2019-07-05 21:05:08;;;;;20.0;2.5;"5";14.0;Oui;Non;Sens direct;;;Oui;"50";Libre;;;;;;;;;Non;;;;;"92051";"92051";Classique;;;"92200";"92200";;"920511436";"920511436";ROUTNOMM0000000005210177;;N30013;;Nationale;DIR Île-de-France;;;;; +"LINESTRING (643325.9 6861228.1,643299.0 6861223.8,643285.4 6861221.0,643267.7 6861216.6,643247.9 6861210.5,643225.1 6861201.9,643205.5 6861193.2,643187.0 6861183.7,643165.0 6861170.1)";TRONROUT0000006660528942;Type autoroutier;;;;;"1";Non;"1";En service;2006-05-22 13:39:36;2019-07-05 21:05:08;;;;;20.0;2.5;"2";7.0;Oui;Non;Sens direct;;;Oui;"100";Libre;;;;;;;;;Non;;;;;"92012";"92012";;;;"92100";"92100";;;;ROUTNOMM0000000000208343/ROUTNOMM0000000216939416;;A30013;;Autoroute;DIR Île-de-France;Autoroute de Normandie;;;; diff --git a/backend/gn_modulator/tests/import_test/import_code/linear_type.csv b/backend/gn_modulator/tests/import_test/import_code/linear_type.csv new file mode 100644 index 00000000..752a2650 --- /dev/null +++ b/backend/gn_modulator/tests/import_test/import_code/linear_type.csv @@ -0,0 +1,2 @@ +type_code;type_name;type_desc +RTE;Tronçons de route;Tronçons de route (Autoroute, Nationales, Départementales ??) diff --git a/backend/gn_modulator/tests/import_test/import_code/pf_V1.csv b/backend/gn_modulator/tests/import_test/import_code/pf_V1.csv new file mode 100644 index 00000000..1d3d8317 --- /dev/null +++ b/backend/gn_modulator/tests/import_test/import_code/pf_V1.csv @@ -0,0 +1,12 @@ +id_pf;uuid_pf;pi_ou_ps;geom_wtk;pk;pr;pr_abs;Y;X;id_pf_gest;nom_pf;cd_com;anRefCom;issu_reqa;date_creat;date_requa;date_supp;larg_ouvra;haut_ouvra;long_franc;diam;haut_disp;larg_disp;specifit;lb_typ_ouv;lb_materia;oh;oh_positio;oh_caract;oh_banqu;oh_tirant;id_cer;id_corr;nom_corr;id_resv;nom_resv;id_obst;nom_obst;comment;infra;concess;source +0;TESTAU0;PI;;0,000000;0;0;43,676265;4,028107;;iPloums buse 1;34244;03/01/-1;;03/01/-1;03/01/-1;03/01/-1;2,270000;2,350000;48,000000;0,000000;2,350000;2,270000;Ouvrage hydraulique non dedie;OH non dedie;;0;;;;0,000000;;;;;;;;34;A9;TESTASF;table ouvrages cerema +1;TESTAU1;PI;;0,000000;0;0;43,676254;4,028049;;Ploums buse 2;34244;03/01/-1;;03/01/-1;03/01/-1;03/01/-1;2,270000;2,350000;48,000000;0,000000;2,350000;2,270000;Ouvrage hydraulique non dedie;OH non dedie;;0;;;;0,000000;;;;;;;;34;A9;TESTASF;table ouvrages cerema +2;TESTAU2;PI;;0,000000;0;0;43,674725;4,022257;;Berange;34244;03/01/-1;;03/01/-1;03/01/-1;03/01/-1;31,200000;3,650000;53,000000;0,000000;3,650000;7,000000;Viaduc;OH non dedie;;0;;;;0,000000;;;;;;;;34;A9;TESTASF;table ouvrages cerema +3;TESTAU3;PI;;0,000000;0;0;43,671934;4,015574;;OH877;34022;03/01/-1;;03/01/-1;03/01/-1;03/01/-1;3,000000;1,500000;100,000000;0,000000;1,500000;3,000000;PIGF;PI specifique faune;;0;;;;0,000000;;;;;;;;34;A9-A709;TESTASF;table ouvrages cerema +4;TESTAU4;PI;;0,000000;0;0;43,668212;4,008340;;OH884;34022;03/01/-1;;03/01/-1;03/01/-1;03/01/-1;1,000000;0,800000;75,000000;0,000000;0,800000;1,000000;Ouvrage hydraulique non dedie;OH non dedie;;0;;;;0,000000;;;;;;;;34;A9-A709;TESTASF;table ouvrages cerema +5;TESTAU5;PI;;0,000000;0;0;43,662404;4,002029;;OH892;34022;03/01/-1;;03/01/-1;03/01/-1;03/01/-1;0,000000;0,000000;88,000000;1,000000;1,000000;0,700000;Ouvrage hydraulique non dedie;OH non dedie;;0;;;;0,000000;;;;;;;;34;A9-A709;TESTASF;table ouvrages cerema +6;TESTAU6;PI;;0,000000;0;0;43,651819;3,988755;;Cadoule_rg;34022;03/01/-1;;03/01/-1;03/01/-1;03/01/-1;20,000000;4,000000;95,000000;0,000000;3,500000;6,600000;Ouvrage hydraulique non dedie;OH non dedie;;0;;;;0,000000;;;;;;;;34;A9-A709;TESTASF;table ouvrages cerema +7;TESTAU7;PI;;0,000000;0;0;43,651819;3,988755;;Cadoule_rd;34022;03/01/-1;;03/01/-1;03/01/-1;03/01/-1;20,000000;4,000000;95,000000;0,000000;3,500000;6,600000;Ouvrage hydraulique non dedie;OH non dedie;;0;;;;0,000000;;;;;;;;34;A9-A709;TESTASF;table ouvrages cerema +8;TESTAU8;PI;;0,000000;0;0;43,624308;3,960569;;Salaison;34240;03/01/-1;;03/01/-1;03/01/-1;03/01/-1;32,000000;3,000000;73,000000;0,000000;2,700000;19,200000;Viaduc;OH non dedie;;0;;;;0,000000;;;;;;;;34;A9-A709;TESTASF;table ouvrages cerema +9;TESTAU9;PI;;0,000000;0;0;43,615854;3,950371;;Jasse;34154;03/01/-1;;03/01/-1;03/01/-1;03/01/-1;7,580000;5,280000;72,000000;0,000000;4,000000;5,000000;Ouvrage hydraulique non dedie;OH non dedie;;0;;;;0,000000;;;;;;;;34;DDA9;TESTASF;table ouvrages cerema +10;TESTAU10;PI;;0,000000;0;0;43,560064;3,827260;;PI1079;34270;03/01/-1;;03/01/-1;03/01/-1;03/01/-1;7,500000;4,500000;71,000000;0,000000;4,500000;7,500000;PI non dedie;PI non dedie;;0;;;;0,000000;;;;;;;;34;A9-A709;TESTASF;table ouvrages cerema diff --git a/backend/gn_modulator/tests/test_import_code.py b/backend/gn_modulator/tests/test_import_code.py new file mode 100644 index 00000000..c9aa03eb --- /dev/null +++ b/backend/gn_modulator/tests/test_import_code.py @@ -0,0 +1,24 @@ +import pytest # noqa +from gn_modulator.utils.env import import_test_dir +from .utils.imports import test_import_code + + +@pytest.mark.usefixtures("temporary_transaction", scope="session") +class TestImportCode: + def test_import_code_pfV1(self): + expected = [ + {"res.nb_process": 1, "res.nb_insert": 1}, + {"res.nb_process": 11, "res.nb_insert": 11}, + {"res.nb_process": 11, "res.nb_insert": 11}, + ] + + test_import_code("m_sipaf.pf_V1", import_test_dir / "import_code/", expected) + + def test_import_code_route(self): + expected = [ + {"res.nb_process": 1}, + {"res.nb_process": 7, "res.nb_insert": 7}, + {"res.nb_process": 9, "res.nb_insert": 9}, + ] + + test_import_code("ref_geo.route", import_test_dir / "import_code/", expected) diff --git a/backend/gn_modulator/tests/utils/imports.py b/backend/gn_modulator/tests/utils/imports.py index 587b3e67..d3ff9cac 100644 --- a/backend/gn_modulator/tests/utils/imports.py +++ b/backend/gn_modulator/tests/utils/imports.py @@ -10,7 +10,14 @@ def test_data_file( return with db.session.begin_nested(): - impt = TImport(schema_code=schema_code, data_file_path=data_file_path, mapping_file_path=mapping_file_path, _insert=True) + # ici _insert_data est à true pour intégrer les avec un insert + # et non un copy qui ne marche pas en test + impt = TImport( + schema_code=schema_code, + data_file_path=data_file_path, + mapping_file_path=mapping_file_path, + _insert_data=True, + ) db.session.add(impt) assert impt.id_import is not None @@ -32,3 +39,21 @@ def test_data_file( assert getAttr(import_infos, key) == expected_infos.get(key), txt_err return import_infos + + +def test_import_code(import_code=None, data_dir_path=None, expected_infos=[]): + if not (import_code and data_dir_path): + return + + imports = TImport.process_import_code(import_code, data_dir_path, commit=False) + assert len(imports) > 0 + + for impt in imports: + assert len(impt.errors) == 0 + + for index, expected_info in enumerate(expected_infos): + impt = imports[index] + import_infos = impt.as_dict() + for key in expected_info: + txt_err = f"schema_code: {impt.schema_code}, key: {key}, expected: {expected_info.get(key)}, import: {getAttr(import_infos, key)}" + assert getAttr(import_infos, key) == expected_info.get(key), txt_err diff --git a/config/modules/contrib/m_sipaf/imports/m_sipaf.pf_V1.import.yml b/config/modules/contrib/m_sipaf/imports/m_sipaf.pf_V1.import.yml index 65c7401a..02d37324 100644 --- a/config/modules/contrib/m_sipaf/imports/m_sipaf.pf_V1.import.yml +++ b/config/modules/contrib/m_sipaf/imports/m_sipaf.pf_V1.import.yml @@ -5,12 +5,12 @@ description: import données d'exemple de passage à faune pour SIPAF items: - schema_code: user.organisme data: pf_V1.csv - pre_process: scripts/ppi_organism_V1.sql + mapping: scripts/ppi_organism_V1.sql - schema_code: m_sipaf.pf data: pf_V1.csv - pre_process: scripts/ppi_pf_V1.sql + mapping: scripts/ppi_pf_V1.sql keep_raw: true - schema_code: m_sipaf.actor data: pf_V1.csv - pre_process: scripts/ppi_actor_V1.sql + mapping: scripts/ppi_actor_V1.sql keep_raw: true diff --git a/config/modules/contrib/m_sipaf/imports/ref_geo.route.import.yml b/config/modules/contrib/m_sipaf/imports/ref_geo.route.import.yml index 6d4648c6..9f98942a 100644 --- a/config/modules/contrib/m_sipaf/imports/ref_geo.route.import.yml +++ b/config/modules/contrib/m_sipaf/imports/ref_geo.route.import.yml @@ -7,9 +7,9 @@ items: data: linear_type.csv - schema_code: ref_geo.linear_group data: TRONCON_DE_ROUTE_NATIONALE_AUTOROUTE.csv - pre_process: scripts/ppi_groupe_route_na.sql + mapping: scripts/ppi_groupe_route_na.sql - schema_code: ref_geo.linear ref_geo.linear: ref_geo.linear data: TRONCON_DE_ROUTE_NATIONALE_AUTOROUTE.csv - pre_process: scripts/ppi_troncon_route_na.sql + mapping: scripts/ppi_troncon_route_na.sql keep_raw: true diff --git a/config/modules/contrib/m_sipaf/imports/scripts/ppi_actor.sql b/config/modules/contrib/m_sipaf/imports/scripts/ppi_actor.sql index ca0a2dc4..4d41535f 100644 --- a/config/modules/contrib/m_sipaf/imports/scripts/ppi_actor.sql +++ b/config/modules/contrib/m_sipaf/imports/scripts/ppi_actor.sql @@ -1,4 +1,5 @@ SELECT + id_import, uuid_pf AS id_passage_faune, CASE WHEN type_role_org = 'Concessionaire' THEN 'CON' diff --git a/config/modules/contrib/m_sipaf/imports/scripts/ppi_actor_V1.sql b/config/modules/contrib/m_sipaf/imports/scripts/ppi_actor_V1.sql index 713fed0c..a1c370cd 100644 --- a/config/modules/contrib/m_sipaf/imports/scripts/ppi_actor_V1.sql +++ b/config/modules/contrib/m_sipaf/imports/scripts/ppi_actor_V1.sql @@ -1,4 +1,5 @@ SELECT + id_import, uuid_pf AS id_passage_faune, 'CON' AS id_nomenclature_type_actor, concess AS id_organism, diff --git a/config/modules/contrib/m_sipaf/imports/scripts/ppi_groupe_route_na.sql b/config/modules/contrib/m_sipaf/imports/scripts/ppi_groupe_route_na.sql index 2a25e3fc..e6ea8a5a 100644 --- a/config/modules/contrib/m_sipaf/imports/scripts/ppi_groupe_route_na.sql +++ b/config/modules/contrib/m_sipaf/imports/scripts/ppi_groupe_route_na.sql @@ -1,8 +1,7 @@ -DROP VIEW IF EXISTS :pre_processed_import_view CASCADE; -CREATE VIEW :pre_processed_import_view AS -SELECT DISTINCT ON(id_import) +SELECT + MIN(id_import) AS id_import, 'RTE' AS id_type, numero AS code, cl_admin || ' ' || numero AS name FROM :table_data - ORDER BY id_import \ No newline at end of file + GROUP BY cl_admin, numero \ No newline at end of file diff --git a/config/modules/contrib/m_sipaf/imports/scripts/ppi_organism.sql b/config/modules/contrib/m_sipaf/imports/scripts/ppi_organism.sql index 57d5ce2f..2ae10c52 100644 --- a/config/modules/contrib/m_sipaf/imports/scripts/ppi_organism.sql +++ b/config/modules/contrib/m_sipaf/imports/scripts/ppi_organism.sql @@ -1,4 +1,5 @@ SELECT DISTINCT ON (id_import) + id_import, nom_organism AS nom_organisme, 'SIPAF' AS adresse_organisme WHERE nom_organism IS NOT NULL AND nom_organism != '' diff --git a/config/modules/contrib/m_sipaf/imports/scripts/ppi_organism_V1.sql b/config/modules/contrib/m_sipaf/imports/scripts/ppi_organism_V1.sql index e0423a4b..66032ce4 100644 --- a/config/modules/contrib/m_sipaf/imports/scripts/ppi_organism_V1.sql +++ b/config/modules/contrib/m_sipaf/imports/scripts/ppi_organism_V1.sql @@ -1,6 +1,8 @@ -SELECT DISTINCT ON (id_import) +SELECT + MIN(id_import) AS id_import, concess AS nom_organisme, 'SIPAF' AS adresse_organisme - WHERE concess IS NOT NULL AND concess != '' FROM :table_data - ORDER BY id_import, concess + WHERE concess IS NOT NULL AND concess != '' + GROUP BY concess + ORDER BY concess diff --git a/config/modules/contrib/m_sipaf/imports/scripts/ppi_pf_V1.sql b/config/modules/contrib/m_sipaf/imports/scripts/ppi_pf_V1.sql index 2d373ed4..cf0ae6a4 100644 --- a/config/modules/contrib/m_sipaf/imports/scripts/ppi_pf_V1.sql +++ b/config/modules/contrib/m_sipaf/imports/scripts/ppi_pf_V1.sql @@ -31,5 +31,6 @@ select replace(larg_disp, ',', '.') :: NUMERIC AS largeur_dispo_faune, replace(haut_disp, ',', '.') :: NUMERIC AS hauteur_dispo_faune, source -ORDER BY - tis.uuid_pf; \ No newline at end of file + FROM :table_data + ORDER BY + uuid_pf; \ No newline at end of file diff --git a/config/modules/contrib/m_sipaf/imports/scripts/ppi_srce_reservoir.sql b/config/modules/contrib/m_sipaf/imports/scripts/ppi_srce_reservoir.sql index 20f13523..b2066702 100644 --- a/config/modules/contrib/m_sipaf/imports/scripts/ppi_srce_reservoir.sql +++ b/config/modules/contrib/m_sipaf/imports/scripts/ppi_srce_reservoir.sql @@ -1,4 +1,5 @@ SELECT + id_import 'RESV_SRCE' AS id_type, id_resv AS area_code, CASE @@ -7,4 +8,5 @@ SELECT END AS area_name, wkt AS geom, TRUE AS enable, - 'https://inpn.mnhn.fr/docs/TVB/N_SRCE_RESERVOIR_S_000.zip' AS source \ No newline at end of file + 'https://inpn.mnhn.fr/docs/TVB/N_SRCE_RESERVOIR_S_000.zip' AS source + FROM :table_data \ No newline at end of file From 7dd6c2fee22a536da7d2136c2f50fbc5172b2d38 Mon Sep 17 00:00:00 2001 From: "joel.clement" Date: Thu, 9 Mar 2023 15:23:09 +0100 Subject: [PATCH 013/142] remove schema bulk import --- .../gn_modulator/schema/imports/__init__.py | 16 -- backend/gn_modulator/schema/imports/api.py | 0 backend/gn_modulator/schema/imports/bulk.py | 187 ---------------- backend/gn_modulator/schema/imports/data.py | 123 ----------- backend/gn_modulator/schema/imports/insert.py | 56 ----- .../gn_modulator/schema/imports/preprocess.py | 188 ---------------- .../gn_modulator/schema/imports/process.py | 202 ------------------ .../gn_modulator/schema/imports/relation.py | 82 ------- backend/gn_modulator/schema/imports/update.py | 103 --------- backend/gn_modulator/schema/imports/utils.py | 138 ------------ 10 files changed, 1095 deletions(-) delete mode 100644 backend/gn_modulator/schema/imports/api.py delete mode 100644 backend/gn_modulator/schema/imports/bulk.py delete mode 100644 backend/gn_modulator/schema/imports/data.py delete mode 100644 backend/gn_modulator/schema/imports/insert.py delete mode 100644 backend/gn_modulator/schema/imports/preprocess.py delete mode 100644 backend/gn_modulator/schema/imports/process.py delete mode 100644 backend/gn_modulator/schema/imports/relation.py delete mode 100644 backend/gn_modulator/schema/imports/update.py delete mode 100644 backend/gn_modulator/schema/imports/utils.py diff --git a/backend/gn_modulator/schema/imports/__init__.py b/backend/gn_modulator/schema/imports/__init__.py index da313661..2a4c99f6 100644 --- a/backend/gn_modulator/schema/imports/__init__.py +++ b/backend/gn_modulator/schema/imports/__init__.py @@ -1,24 +1,8 @@ from .base import SchemaBaseImports -from .bulk import SchemaBulkImports -from .data import SchemaDataImports -from .insert import SchemaInsertImports -from .update import SchemaUpdateImports -from .relation import SchemaRelationImports -from .preprocess import SchemaPreProcessImports -from .process import SchemaProcessImports -from .utils import SchemaUtilsImports class SchemaImports( SchemaBaseImports, - SchemaBulkImports, - SchemaDataImports, - SchemaInsertImports, - SchemaUpdateImports, - SchemaPreProcessImports, - SchemaProcessImports, - SchemaRelationImports, - SchemaUtilsImports, ): """ methodes d'import de données diff --git a/backend/gn_modulator/schema/imports/api.py b/backend/gn_modulator/schema/imports/api.py deleted file mode 100644 index e69de29b..00000000 diff --git a/backend/gn_modulator/schema/imports/bulk.py b/backend/gn_modulator/schema/imports/bulk.py deleted file mode 100644 index e669e414..00000000 --- a/backend/gn_modulator/schema/imports/bulk.py +++ /dev/null @@ -1,187 +0,0 @@ -from pathlib import Path - -from geonature.utils.env import db - -from gn_modulator.definition import DefinitionMethods -from gn_modulator.utils.env import schema_import -from gn_modulator.utils.cache import set_global_cache, get_global_cache - - -class SchemaBulkImports: - @classmethod - def process_import_code( - cls, import_code, data_path, import_number=None, verbose=0, insert=False, commit=False - ): - """ - import_code est la référence du scenario d'import - """ - - if not import_number: - import_number = cls.generate_import_number() - - print(f"\nProcess import {import_code} {import_code}") - - # get import definition - import_definition = DefinitionMethods.get_definition("import", import_code) - import_definition_file_path = DefinitionMethods.get_file_path("import", import_code) - - # for all definition items - for d in import_definition["items"]: - # récupération du fichier de données - data_file_path = Path(data_path) / d["data"] if d.get("data") else Path(data_path) - - # récupération du fichier pre-process, s'il est défini - pre_process_file_path = ( - Path(import_definition_file_path).parent / d["pre_process"] - if d.get("pre_process") - else None - ) - - # process import schema - cls.process_import_schema( - d["schema_code"], - data_file_path, - import_number=import_number, - pre_process_file_path=pre_process_file_path, - keep_raw=d.get("keep_raw"), - verbose=verbose, - insert=insert, - commit=commit, - ) - - import_infos = cls.import_get_infos(import_number, d["schema_code"]) - - if import_infos["errors"]: - print(f"Il y a des erreurs dans l'import {d['schema_code']}") - for error in errors: - print(f"- {error['code']} : {error['msg']}") - return import_number - - print(f"\nImport {import_code} terminé\n") - return import_number - - @classmethod - def process_import_schema( - cls, - schema_code, - data_file_path, - import_number=None, - pre_process_file_path=None, - verbose=0, - insert=False, - keep_raw=False, - commit=False, - ): - """ - import de données - - todo tout types de données - """ - - # 0) init - # suppression des table d'import précedentes ? - # si keep_raw on garde la table qui contient les données csv - - if not import_number: - import_number = cls.generate_import_number() - - cls.import_init(import_number, schema_code, data_file_path, pre_process_file_path) - cls.import_clean_tables(import_number, schema_code, keep_raw) - - # 1) csv -> table temporaire - # - cls.import_process_data( - import_number, - schema_code, - data_file_path, - cls.import_get_infos(import_number, schema_code, "tables.import"), - insert=insert, - keep_raw=keep_raw, - ) - if verbose and not keep_raw: - print(f"\n-- import csv file {data_file_path.name}") - print(f" {cls.import_get_infos(import_number, schema_code, 'nb_data')} lignes") - - if cls.import_get_infos(import_number, schema_code, "errors"): - return import_number - # 2.1) pre-process - # - cls.import_preprocess( - import_number, - schema_code, - cls.import_get_infos(import_number, schema_code, "tables.import"), - cls.import_get_infos(import_number, schema_code, "tables.preprocess"), - pre_process_file_path, - ) - if cls.import_get_infos(import_number, schema_code, "errors"): - return import_number - - # 2.2) table import (ou preprocess) -> vue brute - cls.import_raw( - import_number, - schema_code, - cls.import_get_infos(import_number, schema_code, "tables.preprocess"), - cls.import_get_infos(import_number, schema_code, "tables.raw"), - ) - if cls.import_get_infos(import_number, schema_code, "errors"): - return import_number - - # 3) vue brute -> vue prête pour l'import avec les clés étrangéres et primaires résolues - cls.import_process( - import_number, - schema_code, - cls.import_get_infos(import_number, schema_code, "tables.raw"), - cls.import_get_infos(import_number, schema_code, "tables.process"), - ) - if cls.import_get_infos(import_number, schema_code, "errors"): - return import_number - - # 4) INSERT / UPDATE - # 4-1) INSERT - cls.import_insert( - import_number, - schema_code, - cls.import_get_infos(import_number, schema_code, "tables.process"), - ) - if cls.import_get_infos(import_number, schema_code, "errors"): - return import_number - - # 4-2) UPDATE - cls.import_update( - import_number, - schema_code, - cls.import_get_infos(import_number, schema_code, "tables.process"), - ) - if cls.import_get_infos(import_number, schema_code, "errors"): - return import_number - ## HERE !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! - - # 4-2) UNCHANGED - - nb_unchanged = ( - cls.import_get_infos(import_number, schema_code, "nb_process") - - cls.import_get_infos(import_number, schema_code, "nb_insert") - - cls.import_get_infos(import_number, schema_code, "nb_update") - ) - cls.import_set_infos(import_number, schema_code, "nb_unchanged", nb_unchanged) - txt_pretty_info = cls.import_pretty_infos(import_number, schema_code) - - verbose and print(f"\n{txt_pretty_info}") - - # 5) process relations ??? - # ?? au moins n-n - cls.import_relations( - import_number, - schema_code, - cls.import_get_infos(import_number, schema_code, "tables.preprocess", data_file_path), - data_file_path, - verbose, - ) - - if cls.import_get_infos(import_number, schema_code, "errors"): - return import_number - - if commit: - db.session.commit() - - return import_number diff --git a/backend/gn_modulator/schema/imports/data.py b/backend/gn_modulator/schema/imports/data.py deleted file mode 100644 index 7d19588c..00000000 --- a/backend/gn_modulator/schema/imports/data.py +++ /dev/null @@ -1,123 +0,0 @@ -from geonature.utils.env import db - - -class SchemaDataImports: - @classmethod - def import_process_data( - cls, import_number, schema_code, data_file_path, dest_table, insert=False, keep_raw=False - ): - """ - cree une vue a partir d'un fichier csv pour pouvoir traiter les données ensuite - - le fichier csv - separateur : ';' - créé - - une table temporaire pour avoir les données du csv en varchar - - une vue pour passer les champs en '' à NULL - """ - - # cas où la table d'import à été générée lors d'un import d'un import précédent - - if not keep_raw: - cls.import_csv_file( - import_number, schema_code, data_file_path, dest_table, insert=insert - ) - - cls.count_and_check_table(import_number, schema_code, dest_table, "data") - - return - - @classmethod - def import_csv_file(cls, import_number, schema_code, data_file_path, dest_table, insert=False): - if not data_file_path.exists(): - cls.import_add_error( - import_number, - schema_code, - code="ERR_IMPORT_DATA_FILE_NOT_FOUND", - msg=f"Le fichier d'import {data_file_path} n'existe pas", - ) - return - - with open(data_file_path, "r") as f: - # on récupère la premiere ligne du csv pour avoir le nom des colonnes - first_line = f.readline() - - delimiter = ";" if ";" in first_line else "," if "," in first_line else None - - import_table_columns = first_line.replace("\n", "").split(delimiter) - - cls.import_set_infos(import_number, schema_code, "delimiter", delimiter) - cls.import_set_infos( - import_number, schema_code, "import_table_columns", import_table_columns - ) - - if delimiter is None: - cls.import_add_error( - import_number, - schema_code, - code="ERR_IMPORT_CSV_FILE_DELIMITER_NOT_FOUND", - msg=f"Pas de séparateur trouvé pour le fichier csv {data_file_path}", - ) - return - # creation de la table temporaire - import_txt_create_import_table = cls.import_txt_create_import_table( - import_number, schema_code, dest_table, import_table_columns - ) - cls.import_set_infos( - import_number, - schema_code, - "sql.import", - import_txt_create_import_table, - ) - cls.c_sql_exec_txt(import_txt_create_import_table) - - # on copie les données dans la table temporaire - - # pour faire marcher les tests pytest on passe par un insert - # TODO faire marche copy_expert avec pytest - # manière de récupérer cursor ? - if insert: - cls.import_csv_insert( - import_number, schema_code, f, dest_table, import_table_columns, delimiter - ) - else: - columns_fields = ", ".join(import_table_columns) - txt_copy_from_csv = f"""COPY {dest_table}({columns_fields}) FROM STDIN DELIMITER '{delimiter}' QUOTE '"' CSV""" - cls.import_set_infos(import_number, schema_code, "sql.csv_copy", txt_copy_from_csv) - cursor = db.session.connection().connection.cursor() - cursor.copy_expert(sql=txt_copy_from_csv, file=f) - - @classmethod - def import_csv_insert( - cls, import_number, schema_code, f, dest_table, table_columns, delimiter - ): - sql_columns_fields = ", ".join(table_columns) - - values = "" - for line in f: - data = "', '".join((line.replace('"', "").replace("\n", "").split(delimiter))) - values += f"('{data}')," - if not values: - return - - values = values[:-1] - txt_insert_csv = f"INSERT INTO {dest_table} ({sql_columns_fields}) VALUES {values}" - cls.import_set_infos(import_number, schema_code, "sql.csv_insert", txt_insert_csv) - cls.c_sql_exec_txt(txt_insert_csv) - - @classmethod - def import_txt_create_import_table(cls, import_number, schema_code, dest_table, table_columns): - """ - requete de creation d'une table temporaire pour import csv - tout les champs sont en varchar - """ - - columns_sql = "\n ".join(map(lambda x: f"{x} VARCHAR,", table_columns)) - pk_constraint_name = f"pk_{'_'.join(dest_table.split('.'))}_id_import" - - txt = f"""CREATE TABLE IF NOT EXISTS {dest_table} ( - id_import SERIAL NOT NULL, - {columns_sql} - CONSTRAINT {pk_constraint_name} PRIMARY KEY (id_import) -);""" - return txt diff --git a/backend/gn_modulator/schema/imports/insert.py b/backend/gn_modulator/schema/imports/insert.py deleted file mode 100644 index 49ce1870..00000000 --- a/backend/gn_modulator/schema/imports/insert.py +++ /dev/null @@ -1,56 +0,0 @@ -class SchemaInsertImports: - @classmethod - def import_insert(cls, import_number, schema_code, from_table): - sm = cls(schema_code) - nb_insert = cls.c_sql_exec_txt( - f"SELECT COUNT(*) FROM {from_table} WHERE {sm.pk_field_name()} IS NULL" - ).scalar() - - cls.import_set_infos(import_number, schema_code, "nb_insert", nb_insert) - - if not nb_insert: - return - - try: - import_txt_insert = cls.import_txt_insert(schema_code, from_table) - cls.import_set_infos(import_number, schema_code, "sql.insert", nb_insert) - cls.c_sql_exec_txt(import_txt_insert) - except Exception as e: - if isinstance(e, AttributeError): - raise e - cls.import_add_error( - import_number, - schema_code, - code="ERR_IMPORT_INSERT", - msg=f"Erreur durant l'insert de {from_table} vers {schema_code} : {str(e)}", - ) - - @classmethod - def import_txt_insert(cls, schema_code, from_table, dest_table=None, keys=None): - sm = cls(schema_code) - - table_name = dest_table or sm.sql_schema_dot_table() - - columns_select = filter( - lambda x: ( - x in keys - if keys is not None - else not (sm.is_column(x) and sm.property(x).get("primary_key")) - ), - cls.get_table_columns(from_table), - ) - - v_column_select_keys = map(lambda x: x, columns_select) - - txt_columns_select_keys = ",\n ".join(v_column_select_keys) - - txt_where = f" WHERE {sm.pk_field_name()} IS NULL" if keys is None else "" - - return f""" -INSERT INTO {table_name} ( - {txt_columns_select_keys} -) -SELECT - {txt_columns_select_keys} -FROM {from_table}{txt_where}; -""" diff --git a/backend/gn_modulator/schema/imports/preprocess.py b/backend/gn_modulator/schema/imports/preprocess.py deleted file mode 100644 index d566079f..00000000 --- a/backend/gn_modulator/schema/imports/preprocess.py +++ /dev/null @@ -1,188 +0,0 @@ -import re - - -class SchemaPreProcessImports: - @classmethod - def import_raw(cls, import_number, schema_code, from_table, dest_table): - """ - creation de la vue d'import à partir de la table d'import - correction des null et association du bon typage - """ - import_txt_create_raw_view = cls.import_txt_create_raw_view( - import_number, schema_code, from_table, dest_table - ) - - cls.import_set_infos(import_number, schema_code, "sql.raw", import_txt_create_raw_view) - cls.c_sql_exec_txt(import_txt_create_raw_view) - - cls.count_and_check_table(import_number, schema_code, dest_table, "raw") - - @classmethod - def import_preprocess( - cls, import_number, schema_code, from_table, dest_table, pre_process_file_path - ): - """ - Application de la vue de mappage à la la table d'import - """ - - if pre_process_file_path is None: - return - - if not pre_process_file_path.exists(): - cls.import_add_error( - import_number, - schema_code, - code="ERR_IMPORT_PRE_PROCESS_FILE_MISSING", - msg=f"Le fichier de preprocess {pre_process_file_path} n'existe pas", - ) - return - - with open(pre_process_file_path, "r") as f: - preprocess_select = f.read().upper().replace(";", "").replace("%", "%%") - - forbidden_words = [] - for forbidden_word in [ - "INSERT ", - "DROP ", - "DELETE ", - "UPDATE ", - "EXECUTE", - "TRUNCATE", - ]: - if forbidden_word in preprocess_select: - forbidden_words.append(forbidden_word.strip()) - - if forbidden_words: - cls.import_add_error( - import_number, - schema_code, - code="ERR_IMPORT_PRE_PROCESS_FORBIDEN_WORD", - msg=f"Le fichier de preprocess {pre_process_file_path} contient le ou les mots interdits {', '.join(forbidden_word)}", - ) - return - - for word in ["WHERE", "ORDER BY", "LIMIT"]: - if word in preprocess_select: - preprocess_select = preprocess_select.replace( - f"{word}", "\nFROM {from_table}\n{word}" - ) - break - - if "FROM" not in preprocess_select: - preprocess_select += f"\nFROM {from_table}" - - txt_pre_process_raw_import_view = f""" -DROP VIEW IF EXISTS {dest_table}; -CREATE VIEW {dest_table} AS -{preprocess_select} -; - """ - cls.import_set_infos( - import_number, schema_code, "sql.preprocess", txt_pre_process_raw_import_view - ) - try: - cls.c_sql_exec_txt(txt_pre_process_raw_import_view) - except Exception as e: - cls.import_add_error( - import_number, - schema_code, - code="ERR_IMPORT_PRE_PROCESS_CREATE_VIEW", - msg=f"La vue de preprocess n'a pas être crée : {str(e)}", - ) - return - cls.count_and_check_table(import_number, schema_code, dest_table, "preprocess") - - @classmethod - def import_txt_create_raw_view( - cls, - import_number, - schema_code, - from_table, - dest_table, - keys=None, - key_unnest=None, - limit=None, - ): - """ - - temporary_table : table ou sont stockées les données d'un csv - - raw_import_view : vue qui corrige les '' en NULL - Creation d'une vue d'import brute à partir d'une table accueillant des données d'un fichier csv - on passe les champs valant '' à NULL - """ - - sm = cls(schema_code) - - from_table_columns = cls.get_table_columns(from_table) - - columns = filter( - lambda x: ( - x in keys - if keys is not None - else not (sm.is_column(x) and sm.property(x).get("primary_key")) - ), - from_table_columns, - ) - - # on preprocess ttes les colonnes - v_txt_pre_process_columns = list( - map( - lambda x: cls(schema_code).pre_process_raw_import_columns( - x, key_unnest=key_unnest - ), - from_table_columns, - ) - ) - - v_txt_columns = list(map(lambda x: cls(schema_code).process_raw_import_column(x), columns)) - - txt_primary_column = ( - f"""CONCAT({", '|', ".join(sm.attr('meta.unique'))}) AS {sm.pk_field_name()}""" - ) - v_txt_columns.insert(0, txt_primary_column) - - txt_columns = ",\n ".join(v_txt_columns) - txt_pre_process_columns = ",\n ".join(v_txt_pre_process_columns) - txt_limit = f"LIMIT {limit}" if limit else "" - - return f"""DROP VIEW IF EXISTS {dest_table} CASCADE; -CREATE VIEW {dest_table} AS -WITH pre_process AS ( -SELECT - {txt_pre_process_columns} -FROM {from_table} -{txt_limit} -) -SELECT - {txt_columns} -FROM pre_process; -""" - - def pre_process_raw_import_columns(self, key, key_unnest=None): - """ """ - - if key == "id_import": - return key - - if key_unnest == key: - return f"UNNEST(STRING_TO_ARRAY({key}, ',')) AS {key}" - - if not self.has_property(key): - return f"{key}" - - property = self.property(key) - if property.get("foreign_key"): - return key - - if property["type"] == "number": - return f"CASE WHEN {key}::TEXT = '' THEN NULL ELSE {key}::FLOAT END AS {key}" - - if property["type"] == "date": - return f"CASE WHEN {key}::TEXT = '' THEN NULL ELSE {key}::DATE END AS {key}" - - if property["type"] == "datetime": - return f"CASE WHEN {key}::TEXT = '' THEN NULL ELSE {key}::TIMESTAMP END AS {key}" - - if property["type"] == "integer" and "schema_code" not in property: - return f"CASE WHEN {key}::TEXT = '' THEN NULL ELSE {key}::INTEGER END AS {key}" - - return f"CASE WHEN {key}::TEXT = '' THEN NULL ELSE {key} END AS {key}" diff --git a/backend/gn_modulator/schema/imports/process.py b/backend/gn_modulator/schema/imports/process.py deleted file mode 100644 index 83fa3b4b..00000000 --- a/backend/gn_modulator/schema/imports/process.py +++ /dev/null @@ -1,202 +0,0 @@ -class SchemaProcessImports: - @classmethod - def import_process(cls, import_number, schema_code, from_table, dest_table, keys=None): - import_txt_processed_view = cls.import_txt_processed_view( - import_number, schema_code, from_table, dest_table, keys - ) - - cls.import_set_infos(import_number, schema_code, "sql.process", import_txt_processed_view) - - cls.c_sql_exec_txt(import_txt_processed_view) - - cls.count_and_check_table(import_number, schema_code, dest_table, "process") - - @classmethod - def import_txt_processed_view( - cls, import_number, schema_code, from_table, dest_table, keys=None - ): - """ - requete pour créer une vue qui résoud les clé - """ - - sm = cls(schema_code) - - v_columns = [] - v_joins = [] - - from_table_columns = cls.get_table_columns(from_table) - - columns = list( - filter( - lambda x: ( - x in keys - if keys is not None - else sm.is_column(x) and not sm.property(x).get("primary_key") - ), - from_table_columns, - ) - ) - - solved_keys = {} - - for index, key in enumerate(columns): - txt_column, v_join = sm.process_column_import_view(index, key) - if txt_column: - # TODO n-n ici ???? - if sm.has_property(key) and sm.property(key).get("relation_type") == "n-n": - rel = cls(sm.property(key)["schema_code"]) - v_columns.append(f"{txt_column.split('.')[0]}.{rel.pk_field_name()}") - else: - v_columns.append(f"{txt_column} AS {key}") - solved_keys[key] = txt_column - v_joins += v_join - - txt_pk_column, v_join = sm.resolve_key( - sm.pk_field_name(), alias_join_base="j_pk", solved_keys=solved_keys - ) - v_columns.append(txt_pk_column) - v_joins += v_join - - txt_columns = ",\n ".join(v_columns) - txt_joins = "\n".join(v_joins) - - return f"""DROP VIEW IF EXISTS {dest_table} CASCADE; -CREATE VIEW {dest_table} AS -SELECT - {txt_columns} -FROM {from_table} t -{txt_joins}; -""" - - def process_raw_import_column(self, key): - """ """ - if not self.has_property(key): - return f"{key}" - - property = self.property(key) - - # pour les nomenclature (on rajoute le type) - if nomenclature_type := property.get("nomenclature_type"): - return f"""CASE - WHEN {key} IS NOT NULL AND {key} NOT LIKE '%%|%%' THEN CONCAT('{nomenclature_type}|', {key}) - ELSE {key} - END AS {key}""" - - if property["type"] == "boolean": - return f"""CASE - WHEN {key}::text IN ('t', 'true') THEN TRUE - WHEN {key}::text IN ('f', 'false') THEN FALSE - ELSE NULL - END AS {key}""" - - if property["type"] == "geometry": - geometry_type = "ST_MULTI" if property["geometry_type"] == "multipolygon" else "" - return f"""{geometry_type}( - ST_SETSRID( - ST_FORCE2D( - ST_GEOMFROMEWKT({key}) - ), {self.property(key).get('srid')} - ) - ) - AS {key}""" - - return f"{key}" - - def resolve_key(self, key, index=None, alias_main="t", alias_join_base="j", solved_keys={}): - """ - compliqué - crée le txt pour - le champs de la colonne qui doit contenir la clé - la ou les jointures nécessaire pour résoudre la clé - """ - - alias_join = alias_join_base if index is None else f"{alias_join_base}_{index}" - - txt_column = f"{alias_join}.{self.pk_field_name()}" - - unique = self.attr("meta.unique") - v_join = [] - - # resolution des cles si besoins - - # couf pour permttre de faire les liens entre les join quand il y en a plusieurs - link_joins = {} - for index_unique, k_unique in enumerate(unique): - var_key = self.var_key(key, k_unique, index_unique, link_joins, alias_main) - if self.property(k_unique).get("foreign_key"): - if k_unique in solved_keys: - link_joins[k_unique] = solved_keys[k_unique] - else: - rel = self.cls(self.property(k_unique)["schema_code"]) - txt_column_join, v_join_inter = rel.resolve_key( - var_key, - index=index_unique, - alias_main=alias_join, - alias_join_base=alias_join, - ) - v_join += v_join_inter - - link_joins[k_unique] = f"{alias_join}_{index_unique}.{rel.pk_field_name()}" - - # creation des joins avec les conditions - v_join_on = [] - - for index_unique, k_unique in enumerate(unique): - var_key = self.var_key(key, k_unique, index_unique, link_joins, alias_main) - # !!!(SELECT (NULL = NULL) => NULL) - cast = "::TEXT" # if var_type != main_type else '' - txt_join_on = ( - f"{alias_join}.{k_unique}{cast} = {var_key}{cast}" - if not self.is_nullable(k_unique) or self.is_required(k_unique) - else f"({alias_join}.{k_unique}{cast} = {var_key}{cast} OR ({alias_join}.{k_unique} IS NULL AND {var_key} IS NULL))" - # else f"({var_key} IS NOT NULL) AND ({alias_join}.{k_unique} = {var_key})" - ) - v_join_on.append(txt_join_on) - - txt_join_on = "\n AND ".join(v_join_on) - txt_join = f"LEFT JOIN {self.sql_schema_dot_table()} {alias_join} ON\n {txt_join_on}" - - v_join.append(txt_join) - - return txt_column, v_join - - def var_key(self, key, k_unique, index_unique, link_joins, alias_main): - """ - TODO à clarifier - """ - - if key is None: - return f"{alias_main}.{k_unique}" - - if link_joins.get(k_unique): - return link_joins[k_unique] - - if "." in key: - return key - - if len(self.attr("meta.unique", [])) <= 1: - return f"{alias_main}.{key}" - - return f"SPLIT_PART({alias_main}.{key}, '|', { index_unique + 1})" - - def process_column_import_view(self, index, key): - """ - process column for processed view - """ - if not self.has_property(key): - return key, [] - - property = self.property(key) - - if property.get("foreign_key"): - rel = self.cls(property["schema_code"]) - return rel.resolve_key(key, index) - - if property.get("relation_type") == "n-n": - rel = self.cls(property["schema_code"]) - return rel.resolve_key(key, index) - - # txt_column, v_join = rel.resolve_key(key, index) - # return f"{txt_column.split('.')[0]}.{rel.pk_field_name()}", v_join - - return f"t.{key}", [] diff --git a/backend/gn_modulator/schema/imports/relation.py b/backend/gn_modulator/schema/imports/relation.py deleted file mode 100644 index aa79f20b..00000000 --- a/backend/gn_modulator/schema/imports/relation.py +++ /dev/null @@ -1,82 +0,0 @@ -class SchemaRelationImports: - @classmethod - def import_relations( - cls, import_number, schema_code, from_table, data_file_path, verbose=None - ): - sm = cls(schema_code) - - columns = cls.get_table_columns(from_table) - - for index, key in enumerate(columns): - if not sm.is_relationship(key): - continue - property = sm.property(key) - - # on commence par les n-n - if property.get("relation_type") in ("n-n"): - print(f" process relation n-n {key}") - cls.import_relation_n_n(import_number, schema_code, from_table, key, verbose) - - @classmethod - def import_relation_n_n(cls, import_number, schema_code, from_table, key, verbose=None): - sm = cls(schema_code) - - property = sm.property(key) - cor_table = property["schema_dot_table"] - rel = cls(property["schema_code"]) - - raw_delete_view = cls.import_table_name(import_number, schema_code, "raw_delete", key) - process_delete_view = cls.import_table_name( - import_number, schema_code, "process_delete", key - ) - raw_import_view = cls.import_table_name(import_number, schema_code, "raw", key) - process_import_view = cls.import_table_name(import_number, schema_code, "process", key) - - # 0) clean - - cls.c_sql_exec_txt(f"DROP VIEW IF EXISTS {process_delete_view}") - cls.c_sql_exec_txt(f"DROP VIEW IF EXISTS {raw_delete_view}") - cls.c_sql_exec_txt(f"DROP VIEW IF EXISTS {process_import_view}") - cls.c_sql_exec_txt(f"DROP VIEW IF EXISTS {raw_import_view}") - - # 1) create raw_temp_table for n-n - txt_raw_unnest_table = cls.import_txt_create_raw_view( - import_number, schema_code, from_table, raw_import_view, keys=[key], key_unnest=key - ) - cls.c_sql_exec_txt(txt_raw_unnest_table) - txt_process_table = cls.import_txt_processed_view( - import_number, schema_code, raw_import_view, process_import_view, keys=[key] - ) - - cls.c_sql_exec_txt(txt_process_table) - - # 3) insert / update / delete ?? - - # - delete : tout depuis import_table - # create_view for delete - txt_raw_delete_table = cls.import_txt_create_raw_view( - import_number, schema_code, from_table, raw_delete_view, keys=[] - ) - cls.c_sql_exec_txt(txt_raw_delete_table) - - txt_processed_delete_table = cls.import_txt_processed_view( - import_number, schema_code, raw_delete_view, process_delete_view, keys=[] - ) - cls.c_sql_exec_txt(txt_processed_delete_table) - - txt_delete = f""" -DELETE FROM {cor_table} t - USING {process_delete_view} j - WHERE t.{sm.pk_field_name()} = j.{sm.pk_field_name()}; - """ - - cls.c_sql_exec_txt(txt_delete) - - # - insert - txt_insert = cls.import_txt_insert( - schema_code, - process_import_view, - keys=[sm.pk_field_name(), rel.pk_field_name()], - dest_table=cor_table, - ) - cls.c_sql_exec_txt(txt_insert) diff --git a/backend/gn_modulator/schema/imports/update.py b/backend/gn_modulator/schema/imports/update.py deleted file mode 100644 index d210851f..00000000 --- a/backend/gn_modulator/schema/imports/update.py +++ /dev/null @@ -1,103 +0,0 @@ -class SchemaUpdateImports: - @classmethod - def import_update(cls, import_number, schema_code, from_table): - nb_update = cls.c_sql_exec_txt(cls.import_txt_nb_update(schema_code, from_table)).scalar() - - cls.import_set_infos(import_number, schema_code, "nb_update", nb_update) - - if nb_update == 0: - return - - try: - import_txt_update = cls.import_txt_update(schema_code, from_table) - cls.import_set_infos(import_number, schema_code, "sql.update", nb_update) - cls.c_sql_exec_txt(import_txt_update) - except Exception as e: - cls.import_add_error( - import_number, - schema_code, - code="ERR_IMPORT_UPDATE", - msg=f"Erreur durant l'insert de {from_table} vers {schema_code} : {str(e)}", - ) - - @classmethod - def import_txt_update(cls, schema_code, processed_import_view): - sm = cls(schema_code) - - columns = cls.get_table_columns(processed_import_view) - - v_column_keys = map( - lambda x: x, - filter(lambda x: sm.has_property(x) and sm.is_column(x), columns), - ) - - v_set_keys = list( - map( - lambda x: f"{x}=a.{x}", - filter( - lambda x: sm.has_property(x) - and sm.is_column(x) - and not sm.property(x).get("primary_key"), - columns, - ), - ) - ) - - v_update_condition = list( - map( - lambda x: f"(t.{x}::TEXT IS DISTINCT FROM a.{x}::TEXT)", - filter( - lambda x: sm.has_property(x) - and sm.is_column(x) - and not sm.property(x).get("primary_key"), - columns, - ), - ) - ) - - txt_set_keys = ",\n ".join(v_set_keys) - txt_columns_keys = ",\n ".join(v_column_keys) - txt_update_conditions = "NOT (" + "\n AND ".join(v_update_condition) + ")" - - return f""" -UPDATE {sm.sql_schema_dot_table()} t SET - {txt_set_keys} -FROM ( - SELECT - {txt_columns_keys} - FROM {processed_import_view} -)a -WHERE a.{sm.pk_field_name()} = t.{sm.pk_field_name()} -AND {txt_update_conditions} -; -""" - - @classmethod - def import_txt_nb_update(cls, schema_code, processed_import_view): - sm = cls(schema_code) - - columns = cls.get_table_columns(processed_import_view) - - v_update_conditions = list( - map( - lambda x: f"(t.{x}::TEXT IS DISTINCT FROM a.{x}::TEXT)", - filter( - lambda x: sm.has_property(x) - and sm.is_column(x) - and not sm.property(x).get("primary_key"), - columns, - ), - ) - ) - - txt_update_conditions = "" + "\n OR ".join(v_update_conditions) + "" - - return f""" - SELECT - COUNT(*) - FROM {sm.sql_schema_dot_table()} t - JOIN {processed_import_view} a - ON a.{sm.pk_field_name()} = t.{sm.pk_field_name()} - WHERE {txt_update_conditions} -; -""" diff --git a/backend/gn_modulator/schema/imports/utils.py b/backend/gn_modulator/schema/imports/utils.py deleted file mode 100644 index 0471e0af..00000000 --- a/backend/gn_modulator/schema/imports/utils.py +++ /dev/null @@ -1,138 +0,0 @@ -from pathlib import Path -import math, random -from geonature.utils.env import db -from utils_flask_sqla.generic import GenericTable -from gn_modulator.utils.env import schema_import -from gn_modulator.utils.cache import set_global_cache, get_global_cache - - -class SchemaUtilsImports: - """ - methodes pour aider aux imports - """ - - @classmethod - def count_and_check_table(cls, import_number, schema_code, dest_table, table_type): - try: - nb_lines = cls.c_sql_exec_txt(f"SELECT COUNT(*) FROM {dest_table}").scalar() - cls.import_set_infos(import_number, schema_code, f"nb_{table_type}", nb_lines) - except Exception as e: - cls.import_add_error( - import_number, - schema_code, - code="ERR_IMPORT_COUNT_VIEW", - msg=f"Erreur avec la table/vue '{table_type}' {dest_table}: {str(e)}", - ) - return - - if nb_lines == 0: - cls.import_add_error( - import_number, - schema_code, - code="ERR_IMPORT_COUNT_VIEW", - msg=f"Erreur avec la table/vue '{table_type}' {dest_table}: il n'y a n'a pas de données", - ) - - @classmethod - def generate_import_number(cls): - """ - genere un nombre aleatoire pour différer tous les imports - TODO utiliser un serial ? - """ - return math.floor(random.random() * 1e6) - - @classmethod - def import_pretty_infos(cls, import_number, schema_code): - """ - met en forme les resultats de l'import - """ - - import_infos = cls.import_get_infos(import_number, schema_code) - txt = "" - txt += f" - {schema_code}\n" - txt += f" raw : {import_infos['nb_raw']:10d}\n" - if import_infos.get("nb_raw") != import_infos["nb_process"]: - txt += f" processed : {import_infos['nb_process']:10d}\n" - if import_infos.get("nb_insert"): - txt += f" insert : {import_infos['nb_insert']:10d}\n" - if import_infos.get("nb_update"): - txt += f" update : {import_infos['nb_update']:10d}\n" - if import_infos.get("nb_unchanged"): - txt += f" unchanged : {import_infos['nb_unchanged']:10d}\n" - - return txt - - @classmethod - def import_clean_tables(cls, import_number, schema_code, keep_raw): - """ - Drop import tables - """ - tables = cls.import_get_infos(import_number, schema_code, "tables", required=True) - - if not keep_raw: - cls.c_sql_exec_txt(f"DROP TABLE IF EXISTS {tables['import']} CASCADE") - else: - cls.c_sql_exec_txt(f"DROP VIEW IF EXISTS {tables['process']} CASCADE") - cls.c_sql_exec_txt(f"DROP VIEW IF EXISTS {tables['preprocess']} CASCADE") - cls.c_sql_exec_txt(f"DROP VIEW IF EXISTS {tables['raw']} CASCADE") - - @classmethod - def import_table_name(cls, import_number, schema_code, type, key=None): - """ - table dans laquelle on importe le fichier csv - """ - - if type == "import": - return f"{schema_import}.t_{import_number}_{type}" - else: - rel = f"_{key}" if key is not None else "" - return f"{schema_import}.v_{import_number}_{type}_{schema_code.replace('.', '_')}{rel}" - - @classmethod - def import_init(cls, import_number, schema_code, data_file_path, pre_process_file_path): - """ - create schema if not exists - drop previous tables ?? - """ - cls.import_set_infos(import_number, schema_code, "data_file_path", data_file_path) - cls.import_set_infos( - import_number, schema_code, "pre_process_file_path", pre_process_file_path - ) - cls.import_set_infos(import_number, schema_code, "errors", []) - - for table_type in ["import", "raw", "preprocess", "process"]: - table_type2 = ( - "import" - if (table_type == "preprocess" and not pre_process_file_path) - else table_type - ) - cls.import_set_infos( - import_number, - schema_code, - f"tables.{table_type}", - cls.import_table_name(import_number, schema_code, table_type2), - ) - - cls.c_sql_exec_txt(f"CREATE SCHEMA IF NOT EXISTS {schema_import}") - - @classmethod - def import_get_infos(cls, import_number, schema_code, key=None, required=False): - cache_keys = ["import_info", import_number, schema_code] - if key is not None: - cache_keys += key.split(".") - res = get_global_cache(cache_keys) - if required and res is None: - raise cls.SchemaImportRequiredInfoNotFoundError( - f"Required import_info not found for {{import_number: {import_number}, schema_code: {schema_code}, key: {key}}}" - ) - return res - - @classmethod - def import_set_infos(cls, import_number, schema_code, key, value): - cache_keys = ["import_info", import_number, schema_code] + key.split(".") - set_global_cache(cache_keys, value) - - @classmethod - def import_add_error(cls, import_number, schema_code, code=None, msg=None): - errors = cls.import_get_infos(import_number, schema_code, "errors") - errors.append({"code": code, "msg": msg}) From 465ad303e421526b86ed59fd0cf0e0479665673e Mon Sep 17 00:00:00 2001 From: "joel.clement" Date: Thu, 9 Mar 2023 15:49:33 +0100 Subject: [PATCH 014/142] import add id_digitiser && test --- backend/gn_modulator/imports/mixins/process.py | 11 ++++++++++- backend/gn_modulator/imports/models.py | 9 ++++++++- .../versions/3920371728d8_gn_modulator_import_init.py | 7 +++++++ backend/gn_modulator/tests/test_import_api.py | 2 ++ 4 files changed, 27 insertions(+), 2 deletions(-) diff --git a/backend/gn_modulator/imports/mixins/process.py b/backend/gn_modulator/imports/mixins/process.py index a0af32a0..2ca0583a 100644 --- a/backend/gn_modulator/imports/mixins/process.py +++ b/backend/gn_modulator/imports/mixins/process.py @@ -1,5 +1,5 @@ -from .utils import ImportMixinUtils from gn_modulator import SchemaMethods +from .utils import ImportMixinUtils class ImportMixinProcess(ImportMixinUtils): @@ -66,10 +66,19 @@ def sql_process_view(self, from_table, dest_table, keys=None): txt_columns = ",\n ".join(v_columns) txt_joins = "\n".join(v_joins) + # TODO rendre id_digitiser parametrable ? + txt_id_digitiser = "" + if self.id_digitiser: + for key in ["id_digitiser", "id_digitizer"]: + if SchemaMethods(self.schema_code).has_property(key): + txt_id_digitiser = f"{self.id_digitiser} AS {key}," + break + return f"""DROP VIEW IF EXISTS {dest_table} CASCADE; CREATE VIEW {dest_table} AS SELECT id_import, + {txt_id_digitiser} {txt_columns} FROM {from_table} t {txt_joins}; diff --git a/backend/gn_modulator/imports/models.py b/backend/gn_modulator/imports/models.py index cf7c2c33..b34ae7f9 100644 --- a/backend/gn_modulator/imports/models.py +++ b/backend/gn_modulator/imports/models.py @@ -1,6 +1,7 @@ # modeles d'import -from geonature.utils.env import db +from flask import g from sqlalchemy.dialects.postgresql import JSONB +from geonature.utils.env import db from .mixins import ImportMixin @@ -11,10 +12,14 @@ class TImport(db.Model, ImportMixin): def __init__( self, schema_code=None, data_file_path=None, mapping_file_path=None, _insert_data=False ): + self.id_digitiser = g.current_user.id_role if hasattr(g, "current_user") else None + self.schema_code = schema_code self.data_file_path = data_file_path and str(data_file_path) self.mapping_file_path = mapping_file_path and str(mapping_file_path) + self._insert = _insert_data + self.res = {} self.errors = [] self.sql = {} @@ -24,6 +29,7 @@ def __init__( id_import = db.Column(db.Integer, primary_key=True) + id_digitiser = db.Column(db.Integer, db.ForeignKey("utilisateurs.t_roles.id_role")) schema_code = db.Column(db.Unicode) data_file_path = db.Column(db.Unicode) @@ -40,6 +46,7 @@ def __init__( def as_dict(self): return { "id_import": self.id_import, + "id_digitiser": self.id_digitiser, "data_type": self.data_type, "csv_delimiter": self.csv_delimiter, "res": self.res, diff --git a/backend/gn_modulator/migrations/versions/3920371728d8_gn_modulator_import_init.py b/backend/gn_modulator/migrations/versions/3920371728d8_gn_modulator_import_init.py index 9a920659..0b6de7df 100644 --- a/backend/gn_modulator/migrations/versions/3920371728d8_gn_modulator_import_init.py +++ b/backend/gn_modulator/migrations/versions/3920371728d8_gn_modulator_import_init.py @@ -21,6 +21,7 @@ def upgrade(): """ CREATE TABLE gn_modulator.t_imports( id_import SERIAL NOT NULL, + id_digitiser INTEGER, schema_code VARCHAR, data_file_path VARCHAR, mapping_file_path VARCHAR, @@ -34,6 +35,12 @@ def upgrade(): ALTER TABLE gn_modulator.t_imports ADD CONSTRAINT pk_gn_modulator_t_imports_id_import PRIMARY KEY (id_import); + +ALTER TABLE pr_sipaf.t_passages_faune + ADD CONSTRAINT fk_modulator_t_impt_t_role_id_digitiser FOREIGN KEY (id_digitiser) + REFERENCES utilisateurs.t_roles(id_role) + ON UPDATE CASCADE ON DELETE SET NULL; + """ ) pass diff --git a/backend/gn_modulator/tests/test_import_api.py b/backend/gn_modulator/tests/test_import_api.py index f382b920..d46f8c54 100644 --- a/backend/gn_modulator/tests/test_import_api.py +++ b/backend/gn_modulator/tests/test_import_api.py @@ -26,6 +26,8 @@ def test_import_synthese(self, users): assert r.json["res"]["nb_data"] == 2 assert r.json["res"]["nb_insert"] == 2 + assert r.json["id_digitiser"] == users["admin_user"].id_role + def test_import_synthese2(self, users): set_logged_user_cookie(self.client, users["admin_user"]) with open(import_test_dir / "synthese_1.csv", "rb") as f: From 6fc8041c8cb5deca4456e7e3ee887ba6b2bdc933 Mon Sep 17 00:00:00 2001 From: "joel.clement" Date: Thu, 9 Mar 2023 15:56:27 +0100 Subject: [PATCH 015/142] --no-edit --- backend/gn_modulator/imports/mixins/check.py | 4 ++-- backend/gn_modulator/imports/mixins/insert.py | 2 +- backend/gn_modulator/imports/mixins/process.py | 2 +- backend/gn_modulator/imports/mixins/raw.py | 2 +- backend/gn_modulator/imports/mixins/relation.py | 2 +- backend/gn_modulator/imports/mixins/update.py | 4 ++-- backend/gn_modulator/imports/mixins/utils.py | 5 +++++ backend/gn_modulator/imports/models.py | 1 + backend/gn_modulator/schema/sql/base.py | 2 +- 9 files changed, 15 insertions(+), 9 deletions(-) diff --git a/backend/gn_modulator/imports/mixins/check.py b/backend/gn_modulator/imports/mixins/check.py index 6375c06d..b70cf3f2 100644 --- a/backend/gn_modulator/imports/mixins/check.py +++ b/backend/gn_modulator/imports/mixins/check.py @@ -17,7 +17,7 @@ def check_required(self): raw_table = self.tables["raw"] sm = SchemaMethods(self.schema_code) - for key in SchemaMethods.get_table_columns(raw_table): + for key in self.get_table_columns(raw_table): if not sm.is_required(key): continue @@ -48,7 +48,7 @@ def check_resolve_keys(self): process_table = self.tables["process"] sm = SchemaMethods(self.schema_code) - for key in SchemaMethods.get_table_columns(raw_table): + for key in self.get_table_columns(raw_table): if not (sm.has_property(key) and sm.property(key).get("foreign_key")): continue diff --git a/backend/gn_modulator/imports/mixins/insert.py b/backend/gn_modulator/imports/mixins/insert.py index dc50ef6a..48f677b4 100644 --- a/backend/gn_modulator/imports/mixins/insert.py +++ b/backend/gn_modulator/imports/mixins/insert.py @@ -47,7 +47,7 @@ def sql_insert(self, from_table, dest_table=None, keys=None): if keys is not None else sm.is_column(x) and not (sm.property(x).get("primary_key")) ), - SchemaMethods.get_table_columns(from_table), + self.get_table_columns(from_table), ) ) diff --git a/backend/gn_modulator/imports/mixins/process.py b/backend/gn_modulator/imports/mixins/process.py index 2ca0583a..6c597372 100644 --- a/backend/gn_modulator/imports/mixins/process.py +++ b/backend/gn_modulator/imports/mixins/process.py @@ -30,7 +30,7 @@ def sql_process_view(self, from_table, dest_table, keys=None): v_columns = [] v_joins = [] - from_table_columns = SchemaMethods.get_table_columns(from_table) + from_table_columns = self.get_table_columns(from_table) columns = list( filter( diff --git a/backend/gn_modulator/imports/mixins/raw.py b/backend/gn_modulator/imports/mixins/raw.py index a8877182..bfd7bf52 100644 --- a/backend/gn_modulator/imports/mixins/raw.py +++ b/backend/gn_modulator/imports/mixins/raw.py @@ -40,7 +40,7 @@ def sql_raw_view( sm = SchemaMethods(self.schema_code) - from_table_columns = SchemaMethods.get_table_columns(from_table) + from_table_columns = self.get_table_columns(from_table) columns = filter( lambda x: ( diff --git a/backend/gn_modulator/imports/mixins/relation.py b/backend/gn_modulator/imports/mixins/relation.py index 0eeee907..73c36a97 100644 --- a/backend/gn_modulator/imports/mixins/relation.py +++ b/backend/gn_modulator/imports/mixins/relation.py @@ -10,7 +10,7 @@ def process_relations(self): from_table = self.tables.get("mapping") or self.tables["data"] sm = SchemaMethods(self.schema_code) - columns = SchemaMethods.get_table_columns(from_table) + columns = self.get_table_columns(from_table) for index, key in enumerate(columns): if not sm.is_relationship(key): diff --git a/backend/gn_modulator/imports/mixins/update.py b/backend/gn_modulator/imports/mixins/update.py index 3c52076c..e691ab82 100644 --- a/backend/gn_modulator/imports/mixins/update.py +++ b/backend/gn_modulator/imports/mixins/update.py @@ -35,7 +35,7 @@ def process_update(self): def sql_update(self, from_table): sm = SchemaMethods(self.schema_code) - columns = SchemaMethods.get_table_columns(from_table) + columns = self.get_table_columns(from_table) v_column_keys = map( lambda x: x, @@ -86,7 +86,7 @@ def sql_update(self, from_table): def sql_nb_update(self, from_table): sm = SchemaMethods(self.schema_code) - columns = SchemaMethods.get_table_columns(from_table) + columns = self.get_table_columns(from_table) v_update_conditions = list( map( diff --git a/backend/gn_modulator/imports/mixins/utils.py b/backend/gn_modulator/imports/mixins/utils.py index 64857511..0eeaa466 100644 --- a/backend/gn_modulator/imports/mixins/utils.py +++ b/backend/gn_modulator/imports/mixins/utils.py @@ -64,3 +64,8 @@ def add_error(self, code=None, msg=None, key=None, lines=None, values=None): self.errors.append( {"code": code, "msg": msg, "key": key, "lines": lines, "values": values} ) + + def get_table_columns(self, table_name): + if not self._columns.get(table_name): + self._columns[table_name] = SchemaMethods.get_table_columns(table_name) + return self._columns[table_name] diff --git a/backend/gn_modulator/imports/models.py b/backend/gn_modulator/imports/models.py index b34ae7f9..c2d87408 100644 --- a/backend/gn_modulator/imports/models.py +++ b/backend/gn_modulator/imports/models.py @@ -26,6 +26,7 @@ def __init__( self.tables = {} _insert_data = False + _columns = {} id_import = db.Column(db.Integer, primary_key=True) diff --git a/backend/gn_modulator/schema/sql/base.py b/backend/gn_modulator/schema/sql/base.py index 50c1202e..f7d273b3 100644 --- a/backend/gn_modulator/schema/sql/base.py +++ b/backend/gn_modulator/schema/sql/base.py @@ -58,7 +58,7 @@ def get_table_columns(cls, schema_dot_table): column_name FROM information_schema.columns c - WHERE + WHERE c.table_schema = '{table_schema}' AND c.table_name = '{table_name}' """ From 94ba5892a851ceefc8d9536e2909c0b6fb52a555 Mon Sep 17 00:00:00 2001 From: "joel.clement" Date: Fri, 10 Mar 2023 12:25:22 +0100 Subject: [PATCH 016/142] fix id_digitiser_fk_constraint --- .../versions/3920371728d8_gn_modulator_import_init.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/backend/gn_modulator/migrations/versions/3920371728d8_gn_modulator_import_init.py b/backend/gn_modulator/migrations/versions/3920371728d8_gn_modulator_import_init.py index 0b6de7df..f0b01446 100644 --- a/backend/gn_modulator/migrations/versions/3920371728d8_gn_modulator_import_init.py +++ b/backend/gn_modulator/migrations/versions/3920371728d8_gn_modulator_import_init.py @@ -36,7 +36,7 @@ def upgrade(): ALTER TABLE gn_modulator.t_imports ADD CONSTRAINT pk_gn_modulator_t_imports_id_import PRIMARY KEY (id_import); -ALTER TABLE pr_sipaf.t_passages_faune +ALTER TABLE gn_modulator.t_imports ADD CONSTRAINT fk_modulator_t_impt_t_role_id_digitiser FOREIGN KEY (id_digitiser) REFERENCES utilisateurs.t_roles(id_role) ON UPDATE CASCADE ON DELETE SET NULL; From 4b56b5192ebef7a10c67d90af0c813c9600c4629 Mon Sep 17 00:00:00 2001 From: "joel.clement" Date: Fri, 10 Mar 2023 17:31:23 +0100 Subject: [PATCH 017/142] doc technique init --- doc/technique/import.md | 45 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) create mode 100644 doc/technique/import.md diff --git a/doc/technique/import.md b/doc/technique/import.md new file mode 100644 index 00000000..6f569db8 --- /dev/null +++ b/doc/technique/import.md @@ -0,0 +1,45 @@ +# Import + +# TODO + donner exemple pour chaque étapes + +## Les étapes + +### 1) Données () + +Chargement du fichier de données dans une table `gn_modulator_import.t_` + +### 2) Mapping (optionnel) + +Creation du vue de mapping pour réorganiser les colonnes de la table de données à partir d'une instruction select `SELECT` + +### 3) Vue brute (`raw`) + +En partant de vue de mapping si elle existe, ou de la table de donnée, on cherche à donner le bon type aux colonnes. + +### 4) Vue process + +En partant de la vue brute, on cherche à résoudre les clé étrangère +La vue process est prête à être intégrée telle quelle dans la table destinataire elle possède les bonnes id + + +### 5) Vérification des données + +On collecte des erreur si +- dans la table `raw`, une colonnes requise possède une valeur NULL. +- dans la table `process` il y a ube clé étrangère NULL aors qu'elle est non nulles dans la table `raw`. + +### 5) Insertion des données + +On insère dans la table destinataire les lignes de la table process pour lequelles la colonne corespondant à la clé primaire est nulle. + +### 6) Mise à jour des données (optionnel) + +On met à jour les ligne sde la table destinataire qui correspondent aux lignes de la table process +- pour lequelles la colonne corespondant à la clé primaire est nulle. +- et où une au moins des colonnes est différente de celle de la ligne destinataire + +### 7) Traitement des relations n-n + +- Effacement de toutes les lignes concernées +- Insert des lignes selon les données \ No newline at end of file From 63ffa6363e9d7028c4971175c2ff6b68acb43e5b Mon Sep 17 00:00:00 2001 From: "joel.clement" Date: Mon, 13 Mar 2023 12:08:48 +0100 Subject: [PATCH 018/142] NULLIF --- backend/gn_modulator/blueprint.py | 4 ---- backend/gn_modulator/imports/mixins/raw.py | 10 +++++----- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/backend/gn_modulator/blueprint.py b/backend/gn_modulator/blueprint.py index 484b674d..599bd1a9 100644 --- a/backend/gn_modulator/blueprint.py +++ b/backend/gn_modulator/blueprint.py @@ -14,12 +14,8 @@ blueprint = Blueprint(MODULE_CODE.lower(), __name__) -<<<<<<< HEAD from gn_modulator.routes.rest import * # noqa from gn_modulator.routes.exports import * # noqa -======= -from gn_modulator.imports.routes import * # noqa ->>>>>>> add model TImport and methods # Creation des commandes pour modules blueprint.cli.short_help = "Commandes pour l' administration du module MODULES" diff --git a/backend/gn_modulator/imports/mixins/raw.py b/backend/gn_modulator/imports/mixins/raw.py index bfd7bf52..0e6c3049 100644 --- a/backend/gn_modulator/imports/mixins/raw.py +++ b/backend/gn_modulator/imports/mixins/raw.py @@ -110,15 +110,15 @@ def pre_process_raw_import_columns(self, key, key_unnest=None): return key if property["type"] == "number": - return f"CASE WHEN {key}::TEXT = '' THEN NULL ELSE {key}::FLOAT END AS {key}" + return f"NULLIF({key}, '')::FLOAT END AS {key}" if property["type"] == "date": - return f"CASE WHEN {key}::TEXT = '' THEN NULL ELSE {key}::DATE END AS {key}" + return f"NULLIF({key}, '')::DATE END AS {key}" if property["type"] == "datetime": - return f"CASE WHEN {key}::TEXT = '' THEN NULL ELSE {key}::TIMESTAMP END AS {key}" + return f"NULLIF({key}, '')::TIMESTAMP END AS {key}" if property["type"] == "integer" and "schema_code" not in property: - return f"CASE WHEN {key}::TEXT = '' THEN NULL ELSE {key}::INTEGER END AS {key}" + return f"NULLIF({key}, '')::INTEGER END AS {key}" - return f"CASE WHEN {key}::TEXT = '' THEN NULL ELSE {key} END AS {key}" + return f"NULLIF({key}, '') END AS {key}" From 0fed0379170d28ab3a023294f5631021178477e1 Mon Sep 17 00:00:00 2001 From: "joel.clement" Date: Mon, 13 Mar 2023 16:43:10 +0100 Subject: [PATCH 019/142] test wrong value for type and test --- backend/gn_modulator/blueprint.py | 1 + .../gn_modulator/imports/mixins/__init__.py | 13 +++-- backend/gn_modulator/imports/mixins/check.py | 53 +++++++++++++++++-- backend/gn_modulator/imports/mixins/data.py | 9 +++- .../gn_modulator/imports/mixins/process.py | 37 ------------- backend/gn_modulator/imports/mixins/raw.py | 44 ++++++++++++--- backend/gn_modulator/imports/models.py | 2 +- .../3920371728d8_gn_modulator_import_init.py | 24 ++++++++- .../{imports/routes.py => routes/imports.py} | 8 ++- backend/gn_modulator/schema/auto.py | 1 - backend/gn_modulator/schema/sql/base.py | 5 ++ ...hese_ERR_IMPORT_INVALID_VALUE_FOR_TYPE.csv | 3 ++ backend/gn_modulator/tests/test_import.py | 16 ++++-- backend/gn_modulator/tests/utils/imports.py | 27 +++++----- .../utils/synthese/syn.synthese.schema.yml | 6 +-- doc/technique/import.md | 6 ++- 16 files changed, 175 insertions(+), 80 deletions(-) rename backend/gn_modulator/{imports/routes.py => routes/imports.py} (90%) create mode 100644 backend/gn_modulator/tests/import_test/synthese_ERR_IMPORT_INVALID_VALUE_FOR_TYPE.csv diff --git a/backend/gn_modulator/blueprint.py b/backend/gn_modulator/blueprint.py index 599bd1a9..2a55514d 100644 --- a/backend/gn_modulator/blueprint.py +++ b/backend/gn_modulator/blueprint.py @@ -16,6 +16,7 @@ from gn_modulator.routes.rest import * # noqa from gn_modulator.routes.exports import * # noqa +from gn_modulator.routes.imports import * # noqa # Creation des commandes pour modules blueprint.cli.short_help = "Commandes pour l' administration du module MODULES" diff --git a/backend/gn_modulator/imports/mixins/__init__.py b/backend/gn_modulator/imports/mixins/__init__.py index 5d3a5a46..70cb105a 100644 --- a/backend/gn_modulator/imports/mixins/__init__.py +++ b/backend/gn_modulator/imports/mixins/__init__.py @@ -40,6 +40,11 @@ def process_import_schema(self): return self db.session.flush() + self.process_check_types() + if self.errors: + return self + db.session.flush() + self.process_raw_view() if self.errors: return self @@ -50,7 +55,9 @@ def process_import_schema(self): return self db.session.flush() - self.process_check() + self.process_check_required() + self.process_check_resolve_keys() + if self.errors: return self db.session.flush() @@ -77,7 +84,7 @@ def process_import_schema(self): return self @classmethod - def process_import_code(cls, import_code, data_dir_path, commit=True): + def process_import_code(cls, import_code, data_dir_path, insert_data=True, commit=True): print(f"\nProcess scenario d'import {import_code}") # get import definition @@ -105,11 +112,11 @@ def process_import_code(cls, import_code, data_dir_path, commit=True): schema_code=import_definition["schema_code"], data_file_path=data_file_path, mapping_file_path=mapping_file_path, + _insert_data=False, ) # pour éviter d'avoir à recharger les données if import_definition.get("keep_raw") and len(imports): - last_import = imports[-1] impt.tables["data"] = imports[-1].tables["data"] db.session.add(impt) diff --git a/backend/gn_modulator/imports/mixins/check.py b/backend/gn_modulator/imports/mixins/check.py index b70cf3f2..156b0b60 100644 --- a/backend/gn_modulator/imports/mixins/check.py +++ b/backend/gn_modulator/imports/mixins/check.py @@ -5,11 +5,54 @@ class ImportMixinCheck(ImportMixinUtils): - def process_check(self): - self.check_required() - self.check_resolve_keys() + def process_check_types(self): + # avant raw + # verifie si les champs des colonnes correspondent bien aux types + # avec la fonction + # gn_modulator.check_type(TYPE_IN, val) - def check_required(self): + table_test = self.tables.get("mapping") or self.tables["data"] + sm = SchemaMethods(self.schema_code) + for key in filter( + lambda x: sm.is_column(x) and not sm.property(x).get("foreign_key"), + self.get_table_columns(table_test), + ): + sql_type = sm.sql_type(key)["type"] + if sql_type == "DATETIME": + sql_type = "TIMESTAMP" + sql_check_type_for_column = f""" + SELECT + COUNT(*), + ARRAY_AGG(id_import), + ARRAY_AGG({key}) + FROM {table_test} + WHERE NOT ( + {key} is NULL + OR + gn_modulator.check_value_for_type('{sql_type}', {key}) + ) + GROUP BY id_import + ORDER BY id_import + """ + res = SchemaMethods.c_sql_exec_txt(sql_check_type_for_column).fetchone() + if res is None: + continue + nb_lines = res[0] + lines = res[1] + values = res[2] + str_lines = lines and ", ".join(map(lambda x: str(x), lines)) or "" + if nb_lines == 0: + continue + self.add_error( + code="ERR_IMPORT_INVALID_VALUE_FOR_TYPE", + key=key, + lines=lines, + values=values, + msg=f"Il y a des valeurs invalides pour la colonne {key} de type {sql_type}. {nb_lines} ligne(s) concernée(s) : [{str_lines}]", + ) + + def process_check_required(self): + # apres raw # pour toutes les colonnes de raw # si une colonne est requise # et que la valeur dans raw est nulle @@ -43,7 +86,7 @@ def check_required(self): return - def check_resolve_keys(self): + def process_check_resolve_keys(self): raw_table = self.tables["raw"] process_table = self.tables["process"] sm = SchemaMethods(self.schema_code) diff --git a/backend/gn_modulator/imports/mixins/data.py b/backend/gn_modulator/imports/mixins/data.py index 9f3b46c9..6e94e2e8 100644 --- a/backend/gn_modulator/imports/mixins/data.py +++ b/backend/gn_modulator/imports/mixins/data.py @@ -48,7 +48,6 @@ def import_csv_file(self, dest_table): return import_table_columns = first_line.replace("\n", "").split(self.csv_delimiter) - # creation de la table temporaire self.sql["data_table"] = self.sql_create_data_table( self.tables["data"], import_table_columns @@ -71,6 +70,14 @@ def import_csv_file(self, dest_table): else: self.copy_csv_data(f, dest_table, import_table_columns) + set_columns_txt = ", ".join("NULLIF({key}, '') AS {key}") + + self.sql[ + "post_data" + ] = f""" + UPDATE {dest_table} SET {set_columns_txt}; + """ + def copy_csv_data(self, f, dest_table, table_columns): columns_fields = ", ".join(table_columns) self.sql[ diff --git a/backend/gn_modulator/imports/mixins/process.py b/backend/gn_modulator/imports/mixins/process.py index 6c597372..ca7dbacb 100644 --- a/backend/gn_modulator/imports/mixins/process.py +++ b/backend/gn_modulator/imports/mixins/process.py @@ -84,43 +84,6 @@ def sql_process_view(self, from_table, dest_table, keys=None): {txt_joins}; """ - def process_raw_import_column(self, key): - """ """ - - sm = SchemaMethods(self.schema_code) - - if not sm.has_property(key): - return f"{key}" - - property = sm.property(key) - - # pour les nomenclature (on rajoute le type) - if nomenclature_type := property.get("nomenclature_type"): - return f"""CASE - WHEN {key} IS NOT NULL AND {key} NOT LIKE '%%|%%' THEN CONCAT('{nomenclature_type}|', {key}) - ELSE {key} - END AS {key}""" - - if property["type"] == "boolean": - return f"""CASE - WHEN {key}::text IN ('t', 'true') THEN TRUE - WHEN {key}::text IN ('f', 'false') THEN FALSE - ELSE NULL - END AS {key}""" - - if property["type"] == "geometry": - geometry_type = "ST_MULTI" if property["geometry_type"] == "multipolygon" else "" - return f"""{geometry_type}( - ST_SETSRID( - ST_FORCE2D( - ST_GEOMFROMEWKT({key}) - ), {sm.property(key).get('srid')} - ) - ) - AS {key}""" - - return f"{key}" - def resolve_key( self, schema_code, key, index=None, alias_main="t", alias_join_base="j", solved_keys={} ): diff --git a/backend/gn_modulator/imports/mixins/raw.py b/backend/gn_modulator/imports/mixins/raw.py index 0e6c3049..6bad6d87 100644 --- a/backend/gn_modulator/imports/mixins/raw.py +++ b/backend/gn_modulator/imports/mixins/raw.py @@ -12,7 +12,6 @@ def process_raw_view(self): from_table = self.tables.get("mapping") or self.tables["data"] dest_table = self.tables["raw"] = self.table_name("raw") self.sql["raw_view"] = self.sql_raw_view(from_table, dest_table) - try: SchemaMethods.c_sql_exec_txt(self.sql["raw_view"]) except Exception as e: @@ -109,16 +108,49 @@ def pre_process_raw_import_columns(self, key, key_unnest=None): if property.get("foreign_key"): return key + if property["type"] == "geometry": + geometry_type = "ST_MULTI" if property["geometry_type"] == "multipolygon" else "" + return f"""{geometry_type}( + ST_SETSRID( + ST_FORCE2D( + ST_GEOMFROMEWKT({key}) + ), {sm.property(key).get('srid')} + ) + ) + AS {key}""" + if property["type"] == "number": - return f"NULLIF({key}, '')::FLOAT END AS {key}" + return f"({key})::FLOAT" + + if property["type"] == "boolean": + f"({key})::BOOLEAN" if property["type"] == "date": - return f"NULLIF({key}, '')::DATE END AS {key}" + return f"({key})::DATE" if property["type"] == "datetime": - return f"NULLIF({key}, '')::TIMESTAMP END AS {key}" + return f"({key})::TIMESTAMP" if property["type"] == "integer" and "schema_code" not in property: - return f"NULLIF({key}, '')::INTEGER END AS {key}" + return f"({key})::INTEGER" + + return f"{key}" + + def process_raw_import_column(self, key): + """ """ + + sm = SchemaMethods(self.schema_code) + + if not sm.has_property(key): + return f"{key}" + + property = sm.property(key) + + # pour les nomenclature (on rajoute le type) + if nomenclature_type := property.get("nomenclature_type"): + return f"""CASE + WHEN {key} IS NOT NULL AND {key} NOT LIKE '%%|%%' THEN CONCAT('{nomenclature_type}|', {key}) + ELSE {key} + END AS {key}""" - return f"NULLIF({key}, '') END AS {key}" + return f"{key}" diff --git a/backend/gn_modulator/imports/models.py b/backend/gn_modulator/imports/models.py index c2d87408..c9bd7eca 100644 --- a/backend/gn_modulator/imports/models.py +++ b/backend/gn_modulator/imports/models.py @@ -18,7 +18,7 @@ def __init__( self.data_file_path = data_file_path and str(data_file_path) self.mapping_file_path = mapping_file_path and str(mapping_file_path) - self._insert = _insert_data + self._insert_data = _insert_data self.res = {} self.errors = [] diff --git a/backend/gn_modulator/migrations/versions/3920371728d8_gn_modulator_import_init.py b/backend/gn_modulator/migrations/versions/3920371728d8_gn_modulator_import_init.py index f0b01446..a1c27b60 100644 --- a/backend/gn_modulator/migrations/versions/3920371728d8_gn_modulator_import_init.py +++ b/backend/gn_modulator/migrations/versions/3920371728d8_gn_modulator_import_init.py @@ -19,6 +19,7 @@ def upgrade(): op.execute( """ + CREATE TABLE gn_modulator.t_imports( id_import SERIAL NOT NULL, id_digitiser INTEGER, @@ -30,7 +31,9 @@ def upgrade(): res JSONB, tables JSONB, errors JSONB, - sql JSONB + sql JSONB, + meta_create_date timestamp without time zone DEFAULT now(), + meta_update_date timestamp without time zone DEFAULT now() ); ALTER TABLE gn_modulator.t_imports @@ -41,6 +44,25 @@ def upgrade(): REFERENCES utilisateurs.t_roles(id_role) ON UPDATE CASCADE ON DELETE SET NULL; +CREATE TRIGGER tri_meta_dates_change_gnm_t_import + BEFORE INSERT OR UPDATE + ON gn_modulator.t_imports + FOR EACH ROW + EXECUTE PROCEDURE public.fct_trg_meta_dates_change(); + +CREATE OR REPLACE FUNCTION gn_modulator.check_value_for_type(type_in VARCHAR, value_in ANYELEMENT) +RETURNS BOOLEAN AS +$$ +BEGIN + EXECUTE FORMAT('SELECT (''%s'')::%s', value_in, type_in); + RETURN TRUE; +EXCEPTION WHEN OTHERS THEN + RETURN FALSE; +END; +$$ +LANGUAGE 'plpgsql' COST 100 +; + """ ) pass diff --git a/backend/gn_modulator/imports/routes.py b/backend/gn_modulator/routes/imports.py similarity index 90% rename from backend/gn_modulator/imports/routes.py rename to backend/gn_modulator/routes/imports.py index abb41052..124d2d7d 100644 --- a/backend/gn_modulator/imports/routes.py +++ b/backend/gn_modulator/routes/imports.py @@ -1,15 +1,13 @@ -from flask import request, jsonify +from flask import request from geonature.core.gn_permissions.decorators import check_cruved_scope from geonature.utils.env import db from gn_modulator.blueprint import blueprint -from gn_modulator.schema import SchemaMethods from gn_modulator.module import ModuleMethods - -from .utils.files import upload_import_file -from .models import TImport +from gn_modulator.imports.utils.files import upload_import_file +from gn_modulator.imports.models import TImport @check_cruved_scope("R") # object import ?? diff --git a/backend/gn_modulator/schema/auto.py b/backend/gn_modulator/schema/auto.py index e512ac37..81a640d2 100644 --- a/backend/gn_modulator/schema/auto.py +++ b/backend/gn_modulator/schema/auto.py @@ -153,7 +153,6 @@ def process_relation_auto(self, relation_key, relation): def process_column_auto(self, column, sql_schema_name, sql_table_name): type = str(column.type) - if "VARCHAR(" in type: type = "VARCHAR" diff --git a/backend/gn_modulator/schema/sql/base.py b/backend/gn_modulator/schema/sql/base.py index f7d273b3..3274d163 100644 --- a/backend/gn_modulator/schema/sql/base.py +++ b/backend/gn_modulator/schema/sql/base.py @@ -15,6 +15,11 @@ class SchemaSqlBase: + def sql_type(self, key): + if not self.is_column(key): + return None + return self.cls.c_get_type(self.property(key)["type"], "definition", "sql") + @classmethod def auto_sql_schemas_dot_tables(cls): auto_sql_schemas_dot_tables = [] diff --git a/backend/gn_modulator/tests/import_test/synthese_ERR_IMPORT_INVALID_VALUE_FOR_TYPE.csv b/backend/gn_modulator/tests/import_test/synthese_ERR_IMPORT_INVALID_VALUE_FOR_TYPE.csv new file mode 100644 index 00000000..162c32c0 --- /dev/null +++ b/backend/gn_modulator/tests/import_test/synthese_ERR_IMPORT_INVALID_VALUE_FOR_TYPE.csv @@ -0,0 +1,3 @@ +cd_nom,id_source,entity_source_pk_value,nom_cite,date_min,date_max,cor_observers +67111,Occtax,21,Ablette,"xxx","2017-01-08 23:00:00.000","admin" +67111,Occtax,22,Ablette,"2017-01-08 20:00:00.000","2017-01-08 23:00:00.000","admin" \ No newline at end of file diff --git a/backend/gn_modulator/tests/test_import.py b/backend/gn_modulator/tests/test_import.py index 5fe6187a..c040bc46 100644 --- a/backend/gn_modulator/tests/test_import.py +++ b/backend/gn_modulator/tests/test_import.py @@ -49,7 +49,7 @@ def test_ref_geo_linear(self): schema_code = "ref_geo.linear_group" data_file_path = import_test_dir / "route/route.csv" - pre_process_file_path = import_test_dir / "route/pp_linear_group.sql" + mapping_file_path = import_test_dir / "route/pp_linear_group.sql" expected_infos = { "res.nb_data": 1, "res.nb_insert": 1, @@ -57,12 +57,12 @@ def test_ref_geo_linear(self): "res.nb_unchanged": 0, } test_data_file( - schema_code, data_file_path, pre_process_file_path, expected_infos=expected_infos + schema_code, data_file_path, mapping_file_path, expected_infos=expected_infos ) schema_code = "ref_geo.linear" data_file_path = import_test_dir / "route/route.csv" - pre_process_file_path = import_test_dir / "route/pp_linear.sql" + mapping_file_path = import_test_dir / "route/pp_linear.sql" expected_infos = { "res.nb_data": 1, "res.nb_insert": 1, @@ -70,5 +70,13 @@ def test_ref_geo_linear(self): "res.nb_unchanged": 0, } test_data_file( - schema_code, data_file_path, pre_process_file_path, expected_infos=expected_infos + schema_code, data_file_path, mapping_file_path, expected_infos=expected_infos + ) + + def test_error_ERR_IMPORT_INVALID_VALUE_FOR_TYPE(self): + schema_code = "syn.synthese" + data_file_path = import_test_dir / "synthese_ERR_IMPORT_INVALID_VALUE_FOR_TYPE.csv" + expected_infos = {"errors": [{"code": "ERR_IMPORT_INVALID_VALUE_FOR_TYPE"}]} + test_data_file( + schema_code, data_file_path, mapping_file_path=None, expected_infos=expected_infos ) diff --git a/backend/gn_modulator/tests/utils/imports.py b/backend/gn_modulator/tests/utils/imports.py index d3ff9cac..e5669501 100644 --- a/backend/gn_modulator/tests/utils/imports.py +++ b/backend/gn_modulator/tests/utils/imports.py @@ -1,14 +1,13 @@ +import pytest from gn_modulator.imports.models import TImport from gn_modulator.utils.commons import getAttr from geonature.utils.env import db +@pytest.mark.skip() def test_data_file( schema_code=None, data_file_path=None, mapping_file_path=None, expected_infos={} ): - if not (schema_code and data_file_path): - return - with db.session.begin_nested(): # ici _insert_data est à true pour intégrer les avec un insert # et non un copy qui ne marche pas en test @@ -25,14 +24,18 @@ def test_data_file( import_infos = impt.as_dict() - errors = expected_infos.pop("errors", []) + expected_errors = expected_infos.pop("errors", []) - if len(errors) == 0: + if len(expected_errors) == 0: + # on teste si le nombre d'erreur est bien nul assert len(import_infos["errors"]) == 0, import_infos["errors"] else: - assert len(errors) == len(import_infos("error")) - for error in errors: - assert len([e for e in import_infos["errors"] if error["code"] == e["code"]]) > 0 + # on teste si on rencontre bien les erreurs attendues parmi les erreurs rencontrées + assert len(expected_errors) == len(import_infos["errors"]) + for expected_error in expected_errors: + assert ( + len([e for e in import_infos["errors"] if expected_error["code"] == e["code"]]) > 0 + ), f"L'erreur de code {expected_error['code']} n'a pas été trouvée" for key in expected_infos: txt_err = f"schema_code: {schema_code}, key: {key}, expected: {expected_infos.get(key)}, import: {getAttr(import_infos, key)}" @@ -41,11 +44,11 @@ def test_data_file( return import_infos +@pytest.mark.skip() def test_import_code(import_code=None, data_dir_path=None, expected_infos=[]): - if not (import_code and data_dir_path): - return - - imports = TImport.process_import_code(import_code, data_dir_path, commit=False) + imports = TImport.process_import_code( + import_code, data_dir_path, insert_data=True, commit=False + ) assert len(imports) > 0 for impt in imports: diff --git a/config/definitions/utils/synthese/syn.synthese.schema.yml b/config/definitions/utils/synthese/syn.synthese.schema.yml index b25b51d7..1d113921 100644 --- a/config/definitions/utils/synthese/syn.synthese.schema.yml +++ b/config/definitions/utils/synthese/syn.synthese.schema.yml @@ -15,6 +15,6 @@ meta: unique: - id_source - entity_source_pk_value - properties: - entity_source_pk_value: - type: string \ No newline at end of file +properties: + entity_source_pk_value: + type: string \ No newline at end of file diff --git a/doc/technique/import.md b/doc/technique/import.md index 6f569db8..3a002230 100644 --- a/doc/technique/import.md +++ b/doc/technique/import.md @@ -5,9 +5,13 @@ ## Les étapes -### 1) Données () +### 1) Données Chargement du fichier de données dans une table `gn_modulator_import.t_` + - Toutes les colonnes sont de type `VARCHAR` + - On passe tous les champs de valeur `''` à `NULL` + - La première ligne donne le nom des colonnes + - seulement pour les fichiers csv, à voir si l'on prévoit d'autres formats ### 2) Mapping (optionnel) From 460d28231158acae6668e156681c81e8c2f137f9 Mon Sep 17 00:00:00 2001 From: "joel.clement" Date: Tue, 14 Mar 2023 14:32:56 +0100 Subject: [PATCH 020/142] doc and test exemple --- .github/workflows/pytest.yml | 6 ++ backend/gn_modulator/imports/mixins/data.py | 14 +-- .../gn_modulator/imports/mixins/mapping.py | 11 ++- backend/gn_modulator/imports/mixins/raw.py | 25 ++--- backend/gn_modulator/schema/auto.py | 3 + backend/gn_modulator/schema/sql/base.py | 25 +++-- .../tests/import_test/ref_geo.area.csv | 3 + backend/gn_modulator/tests/test_import.py | 16 ++++ backend/gn_modulator/tests/utils/imports.py | 2 +- doc/technique/import.md | 53 ++++++++-- .../import_exemple_avance_synthese.md | 3 + .../import_exemple_simple_ref_geo_area.md | 96 +++++++++++++++++++ frontend/app/services/map/base.ts | 1 + 13 files changed, 224 insertions(+), 34 deletions(-) create mode 100644 backend/gn_modulator/tests/import_test/ref_geo.area.csv create mode 100644 doc/technique/import_exemple_avance_synthese.md create mode 100644 doc/technique/import_exemple_simple_ref_geo_area.md diff --git a/.github/workflows/pytest.yml b/.github/workflows/pytest.yml index 1a5ad2c8..e75fbe53 100644 --- a/.github/workflows/pytest.yml +++ b/.github/workflows/pytest.yml @@ -156,6 +156,12 @@ jobs: env: GEONATURE_CONFIG_FILE: ./dependencies/GeoNature/config/test_config.toml + - name: install m_sipaf + run: geonature modulator install -f m_sipaf + env: + GEONATURE_CONFIG_FILE: ./dependencies/GeoNature/config/test_config.toml + + - name: Pytest gn_modulator run: pytest -v --cov --cov-report xml env: diff --git a/backend/gn_modulator/imports/mixins/data.py b/backend/gn_modulator/imports/mixins/data.py index 6e94e2e8..f0d8a9cb 100644 --- a/backend/gn_modulator/imports/mixins/data.py +++ b/backend/gn_modulator/imports/mixins/data.py @@ -2,6 +2,7 @@ from .utils import ImportMixinUtils from gn_modulator.schema import SchemaMethods from geonature.utils.env import db +import csv class ImportMixinData(ImportMixinUtils): @@ -96,17 +97,18 @@ def copy_csv_data(self, f, dest_table, table_columns): def insert_csv_data(self, f, dest_table, table_columns): sql_columns_fields = ", ".join(table_columns) - values = "" - for line in f: - data = "', '".join((line.replace('"', "").replace("\n", "").split(self.csv_delimiter))) - values += f"('{data}')," + values = [] + csvreader = csv.reader(f, delimiter=self.csv_delimiter, quotechar='"') + for row in csvreader: + data = ",".join(map(lambda x: f"'{x}'", row)) + values.append(f"({data})") if not values: return - values = values[:-1] + values_txt = ",\n".join(values) self.sql[ "data_insert" - ] = f"INSERT INTO {dest_table} ({sql_columns_fields}) VALUES {values}" + ] = f"INSERT INTO {dest_table} ({sql_columns_fields}) VALUES {values_txt}" try: SchemaMethods.c_sql_exec_txt(self.sql["data_insert"]) except Exception as e: diff --git a/backend/gn_modulator/imports/mixins/mapping.py b/backend/gn_modulator/imports/mixins/mapping.py index 97b36ff1..753f352f 100644 --- a/backend/gn_modulator/imports/mixins/mapping.py +++ b/backend/gn_modulator/imports/mixins/mapping.py @@ -50,6 +50,9 @@ def sql_mapping(self): "UPDATE ", "EXECUTE ", "TRUNCATE ", + "ALTER ", + "CREATE ", + "GRANT ", ]: if forbidden_word in mapping_select: forbidden_words.append(forbidden_word.strip()) @@ -66,12 +69,18 @@ def sql_mapping(self): msg=f"La selection de mapping doit contenir 'FROM :table_data {mapping_select}", ) + if "SELECT" not in mapping_select: + self.add_error( + code="ERR_IMPORT_MAPPING_MISSING_SELECT", + msg=f"La selection de mapping doit contenir 'SELECT {mapping_select}", + ) + mapping_select = mapping_select.replace(":TABLE_DATA", from_table) if "ID_IMPORT" not in mapping_select: self.add_error( code="ERR_IMPORT_MAPPING_MISSING_IMPORT", - msg=f"La selection de mapping doit contenir le champs id_import dans {self.mapping_file_path}", + msg=f"La selection de mapping doit contenir le champs 'id_import' dans {self.mapping_file_path}", ) sql_mapping = f""" diff --git a/backend/gn_modulator/imports/mixins/raw.py b/backend/gn_modulator/imports/mixins/raw.py index 6bad6d87..a579d17c 100644 --- a/backend/gn_modulator/imports/mixins/raw.py +++ b/backend/gn_modulator/imports/mixins/raw.py @@ -14,6 +14,7 @@ def process_raw_view(self): self.sql["raw_view"] = self.sql_raw_view(from_table, dest_table) try: SchemaMethods.c_sql_exec_txt(self.sql["raw_view"]) + except Exception as e: self.add_error( code="ERR_IMPORT_CREATE_RAW_VIEW", @@ -60,14 +61,15 @@ def sql_raw_view( v_txt_columns = list(map(lambda x: self.process_raw_import_column(x), columns)) - txt_primary_column = ( - f"""CONCAT({", '|', ".join(sm.attr('meta.unique'))}) AS {sm.pk_field_name()}""" - ) + txt_primary_column = f"""CONCAT({", '|', ".join( + map( + lambda x: f"pp.{x}", + sm.attr('meta.unique')))}) AS {sm.pk_field_name()}""" v_txt_columns.insert(0, txt_primary_column) txt_columns = ",\n ".join(v_txt_columns) txt_pre_process_columns = ",\n ".join(v_txt_pre_process_columns) - txt_limit = f"LIMIT {limit}" if limit else "" + txt_limit = f"\nLIMIT {limit}" if limit else "" if "id_import" not in txt_pre_process_columns: txt_pre_process_columns = f"id_import, {txt_pre_process_columns}" @@ -80,12 +82,11 @@ def sql_raw_view( WITH pre_process AS ( SELECT {txt_pre_process_columns} -FROM {from_table} -{txt_limit} +FROM {from_table}{txt_limit} ) SELECT {txt_columns} -FROM pre_process; +FROM pre_process pp; """ def pre_process_raw_import_columns(self, key, key_unnest=None): @@ -113,7 +114,7 @@ def pre_process_raw_import_columns(self, key, key_unnest=None): return f"""{geometry_type}( ST_SETSRID( ST_FORCE2D( - ST_GEOMFROMEWKT({key}) + {key}::GEOMETRY ), {sm.property(key).get('srid')} ) ) @@ -142,15 +143,15 @@ def process_raw_import_column(self, key): sm = SchemaMethods(self.schema_code) if not sm.has_property(key): - return f"{key}" + return f"pp.{key}" property = sm.property(key) # pour les nomenclature (on rajoute le type) if nomenclature_type := property.get("nomenclature_type"): return f"""CASE - WHEN {key} IS NOT NULL AND {key} NOT LIKE '%%|%%' THEN CONCAT('{nomenclature_type}|', {key}) - ELSE {key} + WHEN pp.{key} IS NOT NULL AND pp.{key} NOT LIKE '%%|%%' THEN CONCAT('{nomenclature_type}|', {key}) + ELSE pp.{key} END AS {key}""" - return f"{key}" + return f"pp.{key}" diff --git a/backend/gn_modulator/schema/auto.py b/backend/gn_modulator/schema/auto.py index 81a640d2..b98d2d18 100644 --- a/backend/gn_modulator/schema/auto.py +++ b/backend/gn_modulator/schema/auto.py @@ -220,6 +220,9 @@ def process_column_auto(self, column, sql_schema_name, sql_table_name): and (column.key != "meta_create_date") ) + if column_info.get("geometry_type"): + property["geometry_type"] = column_info["geometry_type"].lower() + if condition_required: property["required"] = True diff --git a/backend/gn_modulator/schema/sql/base.py b/backend/gn_modulator/schema/sql/base.py index 3274d163..041b944b 100644 --- a/backend/gn_modulator/schema/sql/base.py +++ b/backend/gn_modulator/schema/sql/base.py @@ -83,13 +83,19 @@ def get_columns_info(cls): # on récupère les info des colonnes depuis information_schema.columns sql_txt_get_columns_info = f""" SELECT - c.table_schema, - c.table_name, - column_name, - column_default, - is_nullable + c.table_schema, + c.table_name, + column_name, + column_default, + is_nullable, + DATA_TYPE AS TYPE, + gc.TYPE AS geometry_type FROM - information_schema.columns c + information_schema.columns c +LEFT JOIN GEOMETRY_COLUMNS GC ON + c.TABLE_SCHEMA = GC.F_TABLE_SCHEMA + AND c.TABLE_NAME= GC.F_TABLE_NAME + AND c.COLUMN_NAME = gc.F_GEOMETRY_COLUMN WHERE CONCAT(c.table_schema, '.', c.table_name) IN ('{"', '".join(cls.auto_sql_schemas_dot_tables())}') """ @@ -104,7 +110,12 @@ def get_columns_info(cls): columns_info[schema_name] = columns_info.get(schema_name) or {} columns_info[schema_name][table_name] = columns_info[schema_name].get(table_name) or {} - column_info = {"default": r[3], "nullable": r[4] == "YES"} + column_info = { + "default": r[3], + "nullable": r[4] == "YES", + "type": r[5], + "geometry_type": r[6], + } columns_info[schema_name][table_name][column_name] = column_info # set_global_cache(["columns", schema_name, table_name, column_name], column_info) set_global_cache(["columns"], columns_info) diff --git a/backend/gn_modulator/tests/import_test/ref_geo.area.csv b/backend/gn_modulator/tests/import_test/ref_geo.area.csv new file mode 100644 index 00000000..3e3897aa --- /dev/null +++ b/backend/gn_modulator/tests/import_test/ref_geo.area.csv @@ -0,0 +1,3 @@ +id_type,area_name, area_code,geom +ZC,Parc National du Triangle,PNTRI,"POLYGON((6.48 48.87, 5.22 47.84, 6.87 47.96, 6.48 48.87))" +ZC,Parc National du Carré,PNCAR,"POLYGON((3.29 45.05, 5.49 44.91, 5.42 43.80, 3.12 44.11, 3.29 45.05))" diff --git a/backend/gn_modulator/tests/test_import.py b/backend/gn_modulator/tests/test_import.py index c040bc46..34281c41 100644 --- a/backend/gn_modulator/tests/test_import.py +++ b/backend/gn_modulator/tests/test_import.py @@ -73,6 +73,22 @@ def test_ref_geo_linear(self): schema_code, data_file_path, mapping_file_path, expected_infos=expected_infos ) + def test_ref_geo_area(self): + schema_code = "ref_geo.area" + data_file_path = import_test_dir / "ref_geo.area.csv" + expected_infos = { + "res.nb_data": 2, + "res.nb_insert": 2, + "res.nb_update": 0, + "res.nb_unchanged": 0, + } + impt = test_data_file(schema_code, data_file_path, expected_infos=expected_infos) + + # print(impt.sql["process_view"]) + # assert 1 == 0 + + # Test remontées d'erreurs + def test_error_ERR_IMPORT_INVALID_VALUE_FOR_TYPE(self): schema_code = "syn.synthese" data_file_path = import_test_dir / "synthese_ERR_IMPORT_INVALID_VALUE_FOR_TYPE.csv" diff --git a/backend/gn_modulator/tests/utils/imports.py b/backend/gn_modulator/tests/utils/imports.py index e5669501..e9e15960 100644 --- a/backend/gn_modulator/tests/utils/imports.py +++ b/backend/gn_modulator/tests/utils/imports.py @@ -41,7 +41,7 @@ def test_data_file( txt_err = f"schema_code: {schema_code}, key: {key}, expected: {expected_infos.get(key)}, import: {getAttr(import_infos, key)}" assert getAttr(import_infos, key) == expected_infos.get(key), txt_err - return import_infos + return impt @pytest.mark.skip() diff --git a/doc/technique/import.md b/doc/technique/import.md index 3a002230..607937d8 100644 --- a/doc/technique/import.md +++ b/doc/technique/import.md @@ -1,8 +1,33 @@ # Import -# TODO - donner exemple pour chaque étapes +## Introduction et principes + +Dans le cadre de ce module, nous avons implémenter des fonctionalité d'import à destination (théoriquement) de n'importe quelle table de la base. + +Les étapes de la procédure d'import sont illustrés par des exemple, où l'on détaille le code sql produit pour chaque étape. + +- [Exemle simple (ref_geo.l_areas)](./import_exemple_simple_ref_geo_area.md) +- [Exemle avancé (gn_synthese.synthese)](./import_exemple_avance) + +### L'unicité + +Une condition essentielle au bon déroulement de l'import est de pouvoir définir, pour toutes les tables concernées par l'import, un ou plusieurs champs qui cont permettre d'assurer la continuité d'une ligne. Cela peut être +- un code +- un uuid, lorsque celui ci est fourni dans les données et non généré par l'application +- une combinaison de type et de code (pour le ref_geo ou la nomenclature) + +Cela permet + +- de résoudre la clé primaire lorsque les champs d'unicité sont présent dans les données + +- de résoudre les clés étrangère, qui sont renseigner sous forme de code (ou de combinaison de valeurs s'il y a plusieurs champs d'unicité pour la tablé associée à la clé étrangère) + +Pour une ligne du fichier à importer on peux être dans deux cas + +- la clé primaire ne peux pas être résolue, il n'y a pas de ligne correspondante dans la table. Il s'agit d'une nouvelle données et on va faire un `INSERT` pour ces lignes + +- la clé primaire peut être résolue, il existe déjà une ligne correspondant à cette données. On a la possibilité de faire un `UPDATE` pour ces lignes ## Les étapes ### 1) Données @@ -13,30 +38,44 @@ Chargement du fichier de données dans une table `gn_modulator_import.t_ { map.coordinatesTxt = `${event.latlng.lng}, ${event.latlng.lat}`; navigator.clipboard.writeText(`${event.latlng.lng}, ${event.latlng.lat}`); + console.log(`${event.latlng.lng} ${event.latlng.lat}`); }); // init panes From 82931ccccf34c15b640065dc5f2a46f918293bdd Mon Sep 17 00:00:00 2001 From: "joel.clement" Date: Tue, 14 Mar 2023 14:53:35 +0100 Subject: [PATCH 021/142] check unique & test --- .../gn_modulator/imports/mixins/__init__.py | 7 +++--- backend/gn_modulator/imports/mixins/check.py | 22 ++++++++++++++++--- ...ref_geo.area_ERR_IMPORT_MISSING_UNIQUE.csv | 3 +++ backend/gn_modulator/tests/test_import.py | 8 +++++++ backend/gn_modulator/tests/utils/imports.py | 2 ++ doc/technique/import.md | 10 ++++++++- 6 files changed, 45 insertions(+), 7 deletions(-) create mode 100644 backend/gn_modulator/tests/import_test/ref_geo.area_ERR_IMPORT_MISSING_UNIQUE.csv diff --git a/backend/gn_modulator/imports/mixins/__init__.py b/backend/gn_modulator/imports/mixins/__init__.py index 70cb105a..97510a92 100644 --- a/backend/gn_modulator/imports/mixins/__init__.py +++ b/backend/gn_modulator/imports/mixins/__init__.py @@ -40,7 +40,8 @@ def process_import_schema(self): return self db.session.flush() - self.process_check_types() + self.check_uniques() + self.check_types() if self.errors: return self db.session.flush() @@ -55,8 +56,8 @@ def process_import_schema(self): return self db.session.flush() - self.process_check_required() - self.process_check_resolve_keys() + self.check_required() + self.check_resolve_keys() if self.errors: return self diff --git a/backend/gn_modulator/imports/mixins/check.py b/backend/gn_modulator/imports/mixins/check.py index 156b0b60..181e5405 100644 --- a/backend/gn_modulator/imports/mixins/check.py +++ b/backend/gn_modulator/imports/mixins/check.py @@ -5,7 +5,23 @@ class ImportMixinCheck(ImportMixinUtils): - def process_check_types(self): + def check_uniques(self): + # avant raw + # on verifie la présence des colonne d'unicité + + table_test = self.tables.get("mapping") or self.tables["data"] + columns = self.get_table_columns(table_test) + sm = SchemaMethods(self.schema_code) + unique = sm.attr("meta.unique") + + missing_unique = [key for key in unique if key not in columns] + if missing_unique: + self.add_error( + code="ERR_IMPORT_MISSING_UNIQUE", + msg=f"Il manque des champs d'unicité : {', '.join(missing_unique) }", + ) + + def check_types(self): # avant raw # verifie si les champs des colonnes correspondent bien aux types # avec la fonction @@ -51,7 +67,7 @@ def process_check_types(self): msg=f"Il y a des valeurs invalides pour la colonne {key} de type {sql_type}. {nb_lines} ligne(s) concernée(s) : [{str_lines}]", ) - def process_check_required(self): + def check_required(self): # apres raw # pour toutes les colonnes de raw # si une colonne est requise @@ -86,7 +102,7 @@ def process_check_required(self): return - def process_check_resolve_keys(self): + def check_resolve_keys(self): raw_table = self.tables["raw"] process_table = self.tables["process"] sm = SchemaMethods(self.schema_code) diff --git a/backend/gn_modulator/tests/import_test/ref_geo.area_ERR_IMPORT_MISSING_UNIQUE.csv b/backend/gn_modulator/tests/import_test/ref_geo.area_ERR_IMPORT_MISSING_UNIQUE.csv new file mode 100644 index 00000000..6b8a86c7 --- /dev/null +++ b/backend/gn_modulator/tests/import_test/ref_geo.area_ERR_IMPORT_MISSING_UNIQUE.csv @@ -0,0 +1,3 @@ +id_type,area_name, aera_code,geom +ZC,Parc National du Triangle,PNTRI,"POLYGON((6.48 48.87, 5.22 47.84, 6.87 47.96, 6.48 48.87))" +ZC,Parc National du Carré,PNCAR,"POLYGON((3.29 45.05, 5.49 44.91, 5.42 43.80, 3.12 44.11, 3.29 45.05))" diff --git a/backend/gn_modulator/tests/test_import.py b/backend/gn_modulator/tests/test_import.py index 34281c41..981ba813 100644 --- a/backend/gn_modulator/tests/test_import.py +++ b/backend/gn_modulator/tests/test_import.py @@ -96,3 +96,11 @@ def test_error_ERR_IMPORT_INVALID_VALUE_FOR_TYPE(self): test_data_file( schema_code, data_file_path, mapping_file_path=None, expected_infos=expected_infos ) + + def test_error_ERR_IMPORT_MISSING_UNIQUE(self): + schema_code = "ref_geo.area" + data_file_path = import_test_dir / "ref_geo.area_ERR_IMPORT_MISSING_UNIQUE.csv" + expected_infos = {"errors": [{"code": "ERR_IMPORT_MISSING_UNIQUE"}]} + test_data_file( + schema_code, data_file_path, mapping_file_path=None, expected_infos=expected_infos + ) diff --git a/backend/gn_modulator/tests/utils/imports.py b/backend/gn_modulator/tests/utils/imports.py index e9e15960..b06b0d81 100644 --- a/backend/gn_modulator/tests/utils/imports.py +++ b/backend/gn_modulator/tests/utils/imports.py @@ -31,6 +31,8 @@ def test_data_file( assert len(import_infos["errors"]) == 0, import_infos["errors"] else: # on teste si on rencontre bien les erreurs attendues parmi les erreurs rencontrées + print(expected_errors) + print(import_infos["errors"]) assert len(expected_errors) == len(import_infos["errors"]) for expected_error in expected_errors: assert ( diff --git a/doc/technique/import.md b/doc/technique/import.md index 607937d8..ad02683f 100644 --- a/doc/technique/import.md +++ b/doc/technique/import.md @@ -44,10 +44,18 @@ On rajoute un champs `id_import` (clé primaire, `SERIAL`) afin de pouvoir numé Creation du vue de mapping pour réorganiser les colonnes de la table de données à partir d'une instruction select `SELECT` -### 3) Vérification du typage des données +### 3) Vérification + +#### Verification du typage des données On verifie pour chaque colonnes (sauf clé étrangères) que les données des colonnes vont bien pouvoir être convertie dans le type de la colonne destinataire. +#### Verification de la présence des champs pour l'unicité + +Les champs d'unicité permette de résoudre la clé primaire et de voir si la ligne est présente en base. +On vérifie que ces clé sont bien présente dans les données à ce stade (pour la vue de mapping si elle existe ou table de données sinon). + + ### 4) Vue brute (`raw`) La table de départ est la de mapping si elle existe, ou de la table de donnée From e1ebeb4c3c7933dceb1a4e9eca0bf4644805797c Mon Sep 17 00:00:00 2001 From: "joel.clement" Date: Tue, 14 Mar 2023 15:21:33 +0100 Subject: [PATCH 022/142] fix sql_type --- backend/gn_modulator/imports/mixins/check.py | 5 ++--- backend/gn_modulator/imports/mixins/utils.py | 12 +++++++++++ .../3920371728d8_gn_modulator_import_init.py | 20 +++++++++---------- 3 files changed, 24 insertions(+), 13 deletions(-) diff --git a/backend/gn_modulator/imports/mixins/check.py b/backend/gn_modulator/imports/mixins/check.py index 181e5405..6671564c 100644 --- a/backend/gn_modulator/imports/mixins/check.py +++ b/backend/gn_modulator/imports/mixins/check.py @@ -33,9 +33,8 @@ def check_types(self): lambda x: sm.is_column(x) and not sm.property(x).get("foreign_key"), self.get_table_columns(table_test), ): - sql_type = sm.sql_type(key)["type"] - if sql_type == "DATETIME": - sql_type = "TIMESTAMP" + sql_type = self.sql_type_dict[sm.property(key)["type"]] + sql_check_type_for_column = f""" SELECT COUNT(*), diff --git a/backend/gn_modulator/imports/mixins/utils.py b/backend/gn_modulator/imports/mixins/utils.py index 0eeaa466..73317b85 100644 --- a/backend/gn_modulator/imports/mixins/utils.py +++ b/backend/gn_modulator/imports/mixins/utils.py @@ -5,6 +5,18 @@ class ImportMixinUtils: + sql_type_dict = { + "integer": "INTEGER", + "boolean": "BOOLEAN", + "number": "FLOAT", + "string": "VARCHAR", + "date": "DATE", + "datetime": "TIMESTAMP", + "uuid": "UUID", + "geometry": "GEOMETRY", + "json": "JSONB", + } + def init_import(self): SchemaMethods.c_sql_exec_txt(f"CREATE SCHEMA IF NOT EXISTS {schema_import}") diff --git a/backend/gn_modulator/migrations/versions/3920371728d8_gn_modulator_import_init.py b/backend/gn_modulator/migrations/versions/3920371728d8_gn_modulator_import_init.py index a1c27b60..7976d09f 100644 --- a/backend/gn_modulator/migrations/versions/3920371728d8_gn_modulator_import_init.py +++ b/backend/gn_modulator/migrations/versions/3920371728d8_gn_modulator_import_init.py @@ -51,16 +51,16 @@ def upgrade(): EXECUTE PROCEDURE public.fct_trg_meta_dates_change(); CREATE OR REPLACE FUNCTION gn_modulator.check_value_for_type(type_in VARCHAR, value_in ANYELEMENT) -RETURNS BOOLEAN AS -$$ -BEGIN - EXECUTE FORMAT('SELECT (''%s'')::%s', value_in, type_in); - RETURN TRUE; -EXCEPTION WHEN OTHERS THEN - RETURN FALSE; -END; -$$ -LANGUAGE 'plpgsql' COST 100 + RETURNS BOOLEAN AS + $$ + BEGIN + EXECUTE FORMAT('SELECT (''%s'')::%s', value_in, type_in); + RETURN TRUE; + EXCEPTION WHEN OTHERS THEN + RETURN FALSE; + END; + $$ + LANGUAGE 'plpgsql' COST 100 ; """ From e85201ca4d5bc45070f98c786e2ff20d94ba5b63 Mon Sep 17 00:00:00 2001 From: "joel.clement" Date: Tue, 14 Mar 2023 17:00:57 +0100 Subject: [PATCH 023/142] composant layout-import --- backend/gn_modulator/definition/dynamic.py | 1 + .../gn_modulator/imports/mixins/__init__.py | 2 +- backend/gn_modulator/imports/mixins/data.py | 2 +- .../gn_modulator/imports/mixins/mapping.py | 1 + backend/gn_modulator/imports/models.py | 9 +- .../3920371728d8_gn_modulator_import_init.py | 1 + backend/gn_modulator/tests/utils/imports.py | 5 +- config/layouts/tests/test_import.layout.yml | 10 ++ config/layouts/utils/utils.import.layout.yml | 51 +++++++ .../layout/base/layout-import.component.html | 6 + .../layout/base/layout-import.component.scss | 0 .../layout/base/layout-import.component.ts | 41 +++++ .../layout/base/layout.component.html | 11 ++ .../layout/form/generic-form.component.ts | 3 - frontend/app/components/layout/index.ts | 3 +- .../test/test-layout.component.html | 1 + frontend/app/services/action.service.ts | 113 -------------- frontend/app/services/import.service.ts | 142 ++++++++++++++++++ frontend/app/services/index.ts | 2 + frontend/app/services/object.service.ts | 9 +- 20 files changed, 286 insertions(+), 127 deletions(-) create mode 100644 config/layouts/tests/test_import.layout.yml create mode 100644 config/layouts/utils/utils.import.layout.yml create mode 100644 frontend/app/components/layout/base/layout-import.component.html create mode 100644 frontend/app/components/layout/base/layout-import.component.scss create mode 100644 frontend/app/components/layout/base/layout-import.component.ts create mode 100644 frontend/app/services/import.service.ts diff --git a/backend/gn_modulator/definition/dynamic.py b/backend/gn_modulator/definition/dynamic.py index 0bc3ce12..f7bc50e1 100644 --- a/backend/gn_modulator/definition/dynamic.py +++ b/backend/gn_modulator/definition/dynamic.py @@ -71,6 +71,7 @@ def str_x_for_test(cls): label: () => {}, labels: () => {}, du_label: () => {}, + des_labels: () => {}, data_label: () => {}, tab_label: () => {}, title_details: () => {}, diff --git a/backend/gn_modulator/imports/mixins/__init__.py b/backend/gn_modulator/imports/mixins/__init__.py index 97510a92..68dbfcfd 100644 --- a/backend/gn_modulator/imports/mixins/__init__.py +++ b/backend/gn_modulator/imports/mixins/__init__.py @@ -113,7 +113,7 @@ def process_import_code(cls, import_code, data_dir_path, insert_data=True, commi schema_code=import_definition["schema_code"], data_file_path=data_file_path, mapping_file_path=mapping_file_path, - _insert_data=False, + options={"insert_data": False}, ) # pour éviter d'avoir à recharger les données diff --git a/backend/gn_modulator/imports/mixins/data.py b/backend/gn_modulator/imports/mixins/data.py index f0d8a9cb..f999bb77 100644 --- a/backend/gn_modulator/imports/mixins/data.py +++ b/backend/gn_modulator/imports/mixins/data.py @@ -66,7 +66,7 @@ def import_csv_file(self, dest_table): # pour faire marcher les tests pytest on passe par un insert # TODO faire marche copy_expert avec pytest # manière de récupérer cursor ? - if self._insert_data: + if self.options.get("insert_data"): self.insert_csv_data(f, dest_table, import_table_columns) else: self.copy_csv_data(f, dest_table, import_table_columns) diff --git a/backend/gn_modulator/imports/mixins/mapping.py b/backend/gn_modulator/imports/mixins/mapping.py index 753f352f..81bd36af 100644 --- a/backend/gn_modulator/imports/mixins/mapping.py +++ b/backend/gn_modulator/imports/mixins/mapping.py @@ -53,6 +53,7 @@ def sql_mapping(self): "ALTER ", "CREATE ", "GRANT ", + "COPY ", ]: if forbidden_word in mapping_select: forbidden_words.append(forbidden_word.strip()) diff --git a/backend/gn_modulator/imports/models.py b/backend/gn_modulator/imports/models.py index c9bd7eca..6c59f0a6 100644 --- a/backend/gn_modulator/imports/models.py +++ b/backend/gn_modulator/imports/models.py @@ -9,23 +9,20 @@ class TImport(db.Model, ImportMixin): __tablename__ = "t_imports" __table_args__ = {"schema": "gn_modulator"} - def __init__( - self, schema_code=None, data_file_path=None, mapping_file_path=None, _insert_data=False - ): + def __init__(self, schema_code=None, data_file_path=None, mapping_file_path=None, options={}): self.id_digitiser = g.current_user.id_role if hasattr(g, "current_user") else None self.schema_code = schema_code self.data_file_path = data_file_path and str(data_file_path) self.mapping_file_path = mapping_file_path and str(mapping_file_path) - self._insert_data = _insert_data + self.options = options self.res = {} self.errors = [] self.sql = {} self.tables = {} - _insert_data = False _columns = {} id_import = db.Column(db.Integer, primary_key=True) @@ -44,6 +41,8 @@ def __init__( sql = db.Column(JSONB) errors = db.Column(JSONB) + options = db.Column(JSONB) + def as_dict(self): return { "id_import": self.id_import, diff --git a/backend/gn_modulator/migrations/versions/3920371728d8_gn_modulator_import_init.py b/backend/gn_modulator/migrations/versions/3920371728d8_gn_modulator_import_init.py index 7976d09f..55bd35f9 100644 --- a/backend/gn_modulator/migrations/versions/3920371728d8_gn_modulator_import_init.py +++ b/backend/gn_modulator/migrations/versions/3920371728d8_gn_modulator_import_init.py @@ -32,6 +32,7 @@ def upgrade(): tables JSONB, errors JSONB, sql JSONB, + options JSONB, meta_create_date timestamp without time zone DEFAULT now(), meta_update_date timestamp without time zone DEFAULT now() ); diff --git a/backend/gn_modulator/tests/utils/imports.py b/backend/gn_modulator/tests/utils/imports.py index b06b0d81..746b3b5a 100644 --- a/backend/gn_modulator/tests/utils/imports.py +++ b/backend/gn_modulator/tests/utils/imports.py @@ -9,13 +9,14 @@ def test_data_file( schema_code=None, data_file_path=None, mapping_file_path=None, expected_infos={} ): with db.session.begin_nested(): - # ici _insert_data est à true pour intégrer les avec un insert + # ici options={"insert_data": True} est à true pour intégrer les avec un insert + # et non un copy qui ne marche pas en test impt = TImport( schema_code=schema_code, data_file_path=data_file_path, mapping_file_path=mapping_file_path, - _insert_data=True, + options={"insert_data": True}, ) db.session.add(impt) assert impt.id_import is not None diff --git a/config/layouts/tests/test_import.layout.yml b/config/layouts/tests/test_import.layout.yml new file mode 100644 index 00000000..3ccf2f89 --- /dev/null +++ b/config/layouts/tests/test_import.layout.yml @@ -0,0 +1,10 @@ +type: layout +code: test_import +title: test import +description: test pour le composant d'import + +layout: + type: import + object_code: site + module_code: m_sipaf +data: \ No newline at end of file diff --git a/config/layouts/utils/utils.import.layout.yml b/config/layouts/utils/utils.import.layout.yml new file mode 100644 index 00000000..9cf85e62 --- /dev/null +++ b/config/layouts/utils/utils.import.layout.yml @@ -0,0 +1,51 @@ +type: layout +code: utils.import +title: layout du composant d'import +description: layout du composant d'import +layout: + title: __f__`Importer ${o.des_labels(x, 'C')}` + # hidden: __f__!(o.is_action_allowed(x)) + type: form + items: + - items: + - type: message + html: __f__data.importMsg?.html + class: __f__data.importMsg?.class + hidden: __f__!data.importMsg + - hidden: true + items: + - key: importMsg + - key: object_code + type: string + hidden: true + default: __f__context.object_code + - title: import + display: fieldset + items: + - key: data_file + type: file + title: Fichier d'import + required: __f__!data.tables?.data + description: Choisir un fichier à importer + - title: Options additionnelles + display: fieldset + type: dict + items: + - key: options.enable_update + title: "Autoriser les mises à jour" + type: boolean + default: __f__false + + - direction: row + items: + - type: button + color: primary + title: Valider + description: Valider + action: import + disabled: __f__!(formGroup.valid ) + - type: button + color: primary + title: Annuler + description: Annuler + action: close diff --git a/frontend/app/components/layout/base/layout-import.component.html b/frontend/app/components/layout/base/layout-import.component.html new file mode 100644 index 00000000..a663b841 --- /dev/null +++ b/frontend/app/components/layout/base/layout-import.component.html @@ -0,0 +1,6 @@ + diff --git a/frontend/app/components/layout/base/layout-import.component.scss b/frontend/app/components/layout/base/layout-import.component.scss new file mode 100644 index 00000000..e69de29b diff --git a/frontend/app/components/layout/base/layout-import.component.ts b/frontend/app/components/layout/base/layout-import.component.ts new file mode 100644 index 00000000..4ccf8130 --- /dev/null +++ b/frontend/app/components/layout/base/layout-import.component.ts @@ -0,0 +1,41 @@ +import { Component, OnInit, Injector, ViewEncapsulation } from '@angular/core'; +import { ModulesLayoutComponent } from './layout.component'; +import { ModulesImportService } from '../../../services/import.service'; + +import utils from '../../../utils'; +@Component({ + selector: 'modules-layout-import', + templateUrl: 'layout-import.component.html', + styleUrls: ['layout-import.component.scss', '../../base/base.scss'], + encapsulation: ViewEncapsulation.None, +}) +export class ModulesLayoutImportComponent extends ModulesLayoutComponent implements OnInit { + importData: {}; + importLayout: any; // layout pour l'import + importContext: any; + _mImport: ModulesImportService; + + constructor(_injector: Injector) { + super(_injector); + this._name = 'layout-import'; + this.bPostComputeLayout = true; + this._mImport = this._injector.get(ModulesImportService); + } + + postComputeLayout() { + this.importContext = { + module_code: this.context.module_code, + object_code: this.context.object_code, + }; + this.importLayout = { + code: 'utils.import', + }; + } + + processAction(event: any): void { + const { action, context, value = null, data = null, layout = null } = event; + if (action == 'import') { + return this._mImport.processImport(context, data); + } + } +} diff --git a/frontend/app/components/layout/base/layout.component.html b/frontend/app/components/layout/base/layout.component.html index 10d846d4..bbd97cc7 100644 --- a/frontend/app/components/layout/base/layout.component.html +++ b/frontend/app/components/layout/base/layout.component.html @@ -79,6 +79,17 @@ > + + + + + +
diff --git a/frontend/app/services/action.service.ts b/frontend/app/services/action.service.ts index b80a35ee..2f80aa58 100644 --- a/frontend/app/services/action.service.ts +++ b/frontend/app/services/action.service.ts @@ -130,117 +130,4 @@ export class ModulesActionService { } ); } - - processImport(context, data) { - data.importMsg = { - html: 'Traitement en cours', - class: null, - }; - this._mLayout.reComputeLayout(); - this._mData - .import(context.module_code, data) - .pipe() - .subscribe( - (importEvent) => { - if (importEvent.type === HttpEventType.UploadProgress) { - const uploadPerCentDone = Math.round((100 * importEvent.loaded) / importEvent.total); - } - if (importEvent instanceof HttpResponse) { - this._mLayout.stopActionProcessing(''); - const response = importEvent.body as any; - if (response.errors?.length) { - for (let error of response.errors) { - console.error(`${error.code} : ${error.msg}`); - } - data.importMsg = { - class: 'error', - html: this.importHTMLMsgError(response), - }; - return; - } - - let txtImport = this.importHTMLMsgSuccess(response); - - data.importMsg = { - class: 'success', - html: txtImport, - }; - - setTimeout(() => this._mLayout.reComputeLayout(), 100); - // this._commonService.regularToaster('success', txtImport); - } - }, - (error: HttpErrorResponse) => { - this._commonService.regularToaster('error', `Import : ${error.error.msg}`); - } - ); - } - - importHTMLMsgSuccess(impt) { - let txtImport = `
Import réussi
`; - let res = impt.res; - - if (res.nb_data) { - txtImport += `data: ${res.nb_data}
`; - } - - if (res.nb_raw != res.nb_data) { - txtImport += `raw: ${res.nb_raw}
`; - } - - if (res.nb_insert) { - txtImport += `insert: ${res.nb_insert}
`; - } - - if (res.nb_update) { - txtImport += `update: ${res.nb_update}
`; - } - - if (res.nb_unchanged) { - txtImport += `unchanged: ${res.nb_unchanged}
`; - } - return txtImport; - } - - importHTMLMsgError(impt) { - let txtImport = `

${impt.errors.length} erreurs

`; - - let txtErrorRequired; - for (let error of impt.errors.filter((e) => e.code == 'ERR_IMPORT_REQUIRED')) { - if (!txtErrorRequired) { - txtErrorRequired = `
Champs requis manquants
`; - } - txtErrorRequired += `${error.key} ${error.lines.length} ligne(s): [${error.lines}]
`; - } - if (txtErrorRequired) { - txtImport += '
'; - txtImport += txtErrorRequired; - } - - let txtErrorUnresolved; - for (let error of impt.errors.filter((e) => e.code == 'ERR_IMPORT_UNRESOLVED')) { - if (!txtErrorUnresolved) { - txtErrorUnresolved = `
Champs non résolus
`; - } - txtErrorUnresolved += `${error.key} ${error.lines.length} ligne(s): [${error.lines}]
`; - if (error.values) { - txtErrorUnresolved += `Valeurs parmi : ${error.values - .map((v) => v.cd_nomenclature) - .join(', ')}
`; - } - } - if (txtErrorUnresolved) { - txtImport += '
'; - txtImport += txtErrorUnresolved; - } - - for (let error of impt.errors.filter( - (e) => !['ERR_IMPORT_REQUIRED', 'ERR_IMPORT_UNRESOLVED'].includes(e.code) - )) { - txtImport += '
'; - txtImport += `${error.code}: ${error.msg}`; - } - - return txtImport; - } } diff --git a/frontend/app/services/import.service.ts b/frontend/app/services/import.service.ts new file mode 100644 index 00000000..a0aa8aed --- /dev/null +++ b/frontend/app/services/import.service.ts @@ -0,0 +1,142 @@ +import { Injectable, Injector } from '@angular/core'; +import { ModulesDataService } from './data.service'; +import { ModulesLayoutService } from './layout.service'; +import { ModulesObjectService } from './object.service'; +import { ModulesConfigService } from './config.service'; +import { ModulesRouteService } from './route.service'; +import { CommonService } from '@geonature_common/service/common.service'; +import { HttpEventType, HttpResponse, HttpErrorResponse } from '@angular/common/http'; +import { catchError, map, filter, switchMap } from 'rxjs/operators'; +import { of } from 'rxjs'; + +@Injectable() +export class ModulesImportService { + _mData: ModulesDataService; + _mLayout: ModulesLayoutService; + _mObject: ModulesObjectService; + _commonService: CommonService; + _mConfig: ModulesConfigService; + _mRoute: ModulesRouteService; + + constructor(private _injector: Injector) { + this._mData = this._injector.get(ModulesDataService); + this._mLayout = this._injector.get(ModulesLayoutService); + this._mObject = this._injector.get(ModulesObjectService); + this._commonService = this._injector.get(CommonService); + this._mConfig = this._injector.get(ModulesConfigService); + this._mRoute = this._injector.get(ModulesRouteService); + } + + processImport(context, data) { + data.importMsg = { + html: 'Traitement en cours', + class: null, + }; + this._mLayout.reComputeLayout(); + this._mData + .import(context.module_code, data) + .pipe() + .subscribe( + (importEvent) => { + if (importEvent.type === HttpEventType.UploadProgress) { + const uploadPerCentDone = Math.round((100 * importEvent.loaded) / importEvent.total); + } + if (importEvent instanceof HttpResponse) { + this._mLayout.stopActionProcessing(''); + const response = importEvent.body as any; + if (response.errors?.length) { + for (let error of response.errors) { + console.error(`${error.code} : ${error.msg}`); + } + data.importMsg = { + class: 'error', + html: this.importHTMLMsgError(response), + }; + return; + } + + let txtImport = this.importHTMLMsgSuccess(response); + + data.importMsg = { + class: 'success', + html: txtImport, + }; + + setTimeout(() => this._mLayout.reComputeLayout(), 100); + // this._commonService.regularToaster('success', txtImport); + } + }, + (error: HttpErrorResponse) => { + this._commonService.regularToaster('error', `Import : ${error.error.msg}`); + } + ); + } + + importHTMLMsgSuccess(impt) { + let txtImport = `
Import réussi
`; + let res = impt.res; + + if (res.nb_data) { + txtImport += `data: ${res.nb_data}
`; + } + + if (res.nb_raw != res.nb_data) { + txtImport += `raw: ${res.nb_raw}
`; + } + + if (res.nb_insert) { + txtImport += `insert: ${res.nb_insert}
`; + } + + if (res.nb_update) { + txtImport += `update: ${res.nb_update}
`; + } + + if (res.nb_unchanged) { + txtImport += `unchanged: ${res.nb_unchanged}
`; + } + return txtImport; + } + + importHTMLMsgError(impt) { + let txtImport = `

${impt.errors.length} erreurs

`; + + let txtErrorRequired; + for (let error of impt.errors.filter((e) => e.code == 'ERR_IMPORT_REQUIRED')) { + if (!txtErrorRequired) { + txtErrorRequired = `
Champs requis manquants
`; + } + txtErrorRequired += `${error.key} ${error.lines.length} ligne(s): [${error.lines}]
`; + } + if (txtErrorRequired) { + txtImport += '
'; + txtImport += txtErrorRequired; + } + + let txtErrorUnresolved; + for (let error of impt.errors.filter((e) => e.code == 'ERR_IMPORT_UNRESOLVED')) { + if (!txtErrorUnresolved) { + txtErrorUnresolved = `
Champs non résolus
`; + } + txtErrorUnresolved += `${error.key} ${error.lines.length} ligne(s): [${error.lines}]
`; + if (error.values) { + txtErrorUnresolved += `Valeurs parmi : ${error.values + .map((v) => v.cd_nomenclature) + .join(', ')}
`; + } + } + if (txtErrorUnresolved) { + txtImport += '
'; + txtImport += txtErrorUnresolved; + } + + for (let error of impt.errors.filter( + (e) => !['ERR_IMPORT_REQUIRED', 'ERR_IMPORT_UNRESOLVED'].includes(e.code) + )) { + txtImport += '
'; + txtImport += `${error.code}: ${error.msg}`; + } + + return txtImport; + } +} diff --git a/frontend/app/services/index.ts b/frontend/app/services/index.ts index 7df8d296..3d3ef926 100644 --- a/frontend/app/services/index.ts +++ b/frontend/app/services/index.ts @@ -5,6 +5,7 @@ import { ModulesRouteService } from './route.service'; import { ModulesDataService } from './data.service'; import { ModulesLayoutService } from './layout.service'; import { ModulesFormService } from './form.service'; +import { ModulesImportService } from './import.service'; import { ModulesRequestService } from './request.service'; import { ModulesMapService } from './map.service'; import { ModulesTableService } from './table.service'; @@ -18,6 +19,7 @@ export default [ ModulesContextService, ModulesDataService, ModulesLayoutService, + ModulesImportService, ModulesFormService, ModulesRequestService, ListFormService, diff --git a/frontend/app/services/object.service.ts b/frontend/app/services/object.service.ts index bc861626..fee2f3fb 100644 --- a/frontend/app/services/object.service.ts +++ b/frontend/app/services/object.service.ts @@ -42,8 +42,9 @@ export class ModulesObjectService { } const objectModuleConfig = this._mConfig.moduleConfig(moduleCode).objects[objectCode]; + if (!objectModuleConfig) { - // console.error(`L'object ${objectCode} du module ${moduleCode} n'est pas présent`); + console.error(`L'object ${objectCode} du module ${moduleCode} n'est pas présent`); return; } @@ -76,6 +77,7 @@ export class ModulesObjectService { } this._cacheObjectConfig[cacheKey] = utils.copy(objectConfig); + return objectConfig; } @@ -165,6 +167,10 @@ export class ModulesObjectService { return this.objectConfigContext(context)?.display.du_label; } + desLabels({ context }) { + return this.objectConfigContext(context)?.display.des_labels; + } + display({ context }) { return this.objectConfigContext(context).display; } @@ -375,6 +381,7 @@ export class ModulesObjectService { schema_code: this.schemaCode.bind(this), label: this.label.bind(this), du_label: this.duLabel.bind(this), + des_labels: this.desLabels.bind(this), data_label: this.dataLabel.bind(this), labels: this.labels.bind(this), tab_label: this.tabLabel.bind(this), From 366a2dfd95f37a0da2acfbaa48e70c6ac81df932 Mon Sep 17 00:00:00 2001 From: "joel.clement" Date: Wed, 15 Mar 2023 13:29:42 +0100 Subject: [PATCH 024/142] import module_code object_code --- .../gn_modulator/imports/mixins/__init__.py | 17 +++-- backend/gn_modulator/imports/mixins/check.py | 8 +-- backend/gn_modulator/imports/mixins/count.py | 70 +++++++++++++++++++ backend/gn_modulator/imports/mixins/insert.py | 6 +- .../gn_modulator/imports/mixins/process.py | 8 +-- backend/gn_modulator/imports/mixins/raw.py | 6 +- .../gn_modulator/imports/mixins/relation.py | 4 +- backend/gn_modulator/imports/mixins/update.py | 33 +-------- backend/gn_modulator/imports/mixins/utils.py | 4 +- backend/gn_modulator/imports/models.py | 19 ++++- .../3920371728d8_gn_modulator_import_init.py | 12 ++-- backend/gn_modulator/routes/imports.py | 29 +++++--- backend/gn_modulator/tests/test_import.py | 58 ++++++++++----- backend/gn_modulator/tests/test_import_api.py | 12 ++-- backend/gn_modulator/tests/utils/imports.py | 7 +- config/layouts/utils/utils.import.layout.yml | 9 ++- config/modules/MODULATOR.module.yml | 4 ++ .../m_sipaf/imports/m_sipaf.pf_V1.import.yml | 9 ++- .../m_sipaf/imports/ref_geo.route.import.yml | 9 ++- .../contrib/m_sipaf/m_sipaf.module.yml | 4 ++ config/references/import.reference.yml | 7 +- doc/technique/import.md | 33 +++++---- .../import_exemple_simple_ref_geo_area.md | 9 ++- .../components/test/test-layout.component.ts | 15 +--- frontend/app/services/data.service.ts | 10 --- frontend/app/services/form.service.ts | 3 +- frontend/app/services/import.service.ts | 18 ++++- frontend/app/services/request.service.ts | 3 +- 28 files changed, 275 insertions(+), 151 deletions(-) create mode 100644 backend/gn_modulator/imports/mixins/count.py diff --git a/backend/gn_modulator/imports/mixins/__init__.py b/backend/gn_modulator/imports/mixins/__init__.py index 68dbfcfd..96b88cc0 100644 --- a/backend/gn_modulator/imports/mixins/__init__.py +++ b/backend/gn_modulator/imports/mixins/__init__.py @@ -3,6 +3,7 @@ from gn_modulator.definition import DefinitionMethods from .check import ImportMixinCheck +from .count import ImportMixinCount from .data import ImportMixinData from .insert import ImportMixinInsert from .mapping import ImportMixinMapping @@ -16,6 +17,7 @@ class ImportMixin( ImportMixinRelation, ImportMixinCheck, + ImportMixinCount, ImportMixinData, ImportMixinInsert, ImportMixinMapping, @@ -63,6 +65,14 @@ def process_import_schema(self): return self db.session.flush() + self.process_count() + if self.errors: + return self + db.session.flush() + + if self.options.get("check_only"): + return self + self.process_insert() if self.errors: return self @@ -78,10 +88,6 @@ def process_import_schema(self): return self db.session.flush() - self.res["nb_unchanged"] = ( - self.res["nb_process"] - self.res["nb_insert"] - self.res["nb_update"] - ) - return self @classmethod @@ -110,7 +116,8 @@ def process_import_code(cls, import_code, data_dir_path, insert_data=True, commi ) impt = cls( - schema_code=import_definition["schema_code"], + module_code=import_definition["module_code"], + object_code=import_definition["object_code"], data_file_path=data_file_path, mapping_file_path=mapping_file_path, options={"insert_data": False}, diff --git a/backend/gn_modulator/imports/mixins/check.py b/backend/gn_modulator/imports/mixins/check.py index 6671564c..3d631f92 100644 --- a/backend/gn_modulator/imports/mixins/check.py +++ b/backend/gn_modulator/imports/mixins/check.py @@ -11,7 +11,7 @@ def check_uniques(self): table_test = self.tables.get("mapping") or self.tables["data"] columns = self.get_table_columns(table_test) - sm = SchemaMethods(self.schema_code) + sm = SchemaMethods(self.schema_code()) unique = sm.attr("meta.unique") missing_unique = [key for key in unique if key not in columns] @@ -28,7 +28,7 @@ def check_types(self): # gn_modulator.check_type(TYPE_IN, val) table_test = self.tables.get("mapping") or self.tables["data"] - sm = SchemaMethods(self.schema_code) + sm = SchemaMethods(self.schema_code()) for key in filter( lambda x: sm.is_column(x) and not sm.property(x).get("foreign_key"), self.get_table_columns(table_test), @@ -73,7 +73,7 @@ def check_required(self): # et que la valeur dans raw est nulle # erreur raw_table = self.tables["raw"] - sm = SchemaMethods(self.schema_code) + sm = SchemaMethods(self.schema_code()) for key in self.get_table_columns(raw_table): if not sm.is_required(key): @@ -104,7 +104,7 @@ def check_required(self): def check_resolve_keys(self): raw_table = self.tables["raw"] process_table = self.tables["process"] - sm = SchemaMethods(self.schema_code) + sm = SchemaMethods(self.schema_code()) for key in self.get_table_columns(raw_table): if not (sm.has_property(key) and sm.property(key).get("foreign_key")): diff --git a/backend/gn_modulator/imports/mixins/count.py b/backend/gn_modulator/imports/mixins/count.py new file mode 100644 index 00000000..a9720a1d --- /dev/null +++ b/backend/gn_modulator/imports/mixins/count.py @@ -0,0 +1,70 @@ +from gn_modulator import SchemaMethods +from .utils import ImportMixinUtils + + +class ImportMixinCount(ImportMixinUtils): + def process_count(self): + self.count_insert() + self.count_update() + self.res["nb_unchanged"] = ( + self.res["nb_process"] - self.res["nb_insert"] - self.res["nb_update"] + ) + + def sql_nb_update(self, from_table): + sm = SchemaMethods(self.schema_code()) + + columns = self.get_table_columns(from_table) + + v_update_conditions = list( + map( + lambda x: f"(t.{x}::TEXT IS DISTINCT FROM a.{x}::TEXT)", + filter( + lambda x: sm.has_property(x) + and sm.is_column(x) + and not sm.property(x).get("primary_key"), + columns, + ), + ) + ) + + txt_update_conditions = "" + "\n OR ".join(v_update_conditions) + "" + + return f""" + SELECT + COUNT(*) + FROM {sm.sql_schema_dot_table()} t + JOIN {from_table} a + ON a.{sm.pk_field_name()} = t.{sm.pk_field_name()} + WHERE {txt_update_conditions} +; +""" + + def count_update(self): + from_table = self.tables["process"] + + self.sql["nb_update"] = self.sql_nb_update(from_table) + + try: + self.res["nb_update"] = SchemaMethods.c_sql_exec_txt(self.sql["nb_update"]).scalar() + except Exception as e: + self.add_error( + code="ERR_IMPORT_UPDATE_COUNT", + msg=f"Erreur lors du comptage du nombre d'update: {str(e)}", + ) + return + + def count_insert(self): + from_table = self.tables["process"] + sm = SchemaMethods(self.schema_code()) + self.sql[ + "nb_insert" + ] = f"SELECT COUNT(*) FROM {from_table} WHERE {sm.pk_field_name()} IS NULL" + + try: + self.res["nb_insert"] = SchemaMethods.c_sql_exec_txt(self.sql["nb_insert"]).scalar() + except Exception as e: + self.add_error( + code="ERR_IMPORT_INSERT_COUNT", + msg=f"Erreur lors du comptage du nombre d'insert: {str(e)}", + ) + return diff --git a/backend/gn_modulator/imports/mixins/insert.py b/backend/gn_modulator/imports/mixins/insert.py index 48f677b4..03c48d34 100644 --- a/backend/gn_modulator/imports/mixins/insert.py +++ b/backend/gn_modulator/imports/mixins/insert.py @@ -6,7 +6,7 @@ class ImportMixinInsert(ImportMixinUtils): def process_insert(self): from_table = self.tables["process"] - sm = SchemaMethods(self.schema_code) + sm = SchemaMethods(self.schema_code()) self.sql[ "nb_insert" ] = f"SELECT COUNT(*) FROM {from_table} WHERE {sm.pk_field_name()} IS NULL" @@ -32,11 +32,11 @@ def process_insert(self): raise e self.add_error( code="ERR_IMPORT_INSERT", - msg=f"Erreur durant l'insert de {from_table} vers {self.schema_code} : {str(e)}", + msg=f"Erreur durant l'insert de {from_table} vers {self.schema_code()} : {str(e)}", ) def sql_insert(self, from_table, dest_table=None, keys=None): - sm = SchemaMethods(self.schema_code) + sm = SchemaMethods(self.schema_code()) table_name = dest_table or sm.sql_schema_dot_table() diff --git a/backend/gn_modulator/imports/mixins/process.py b/backend/gn_modulator/imports/mixins/process.py index ca7dbacb..6069b222 100644 --- a/backend/gn_modulator/imports/mixins/process.py +++ b/backend/gn_modulator/imports/mixins/process.py @@ -25,7 +25,7 @@ def sql_process_view(self, from_table, dest_table, keys=None): requete pour créer une vue qui résoud les clé """ - sm = SchemaMethods(self.schema_code) + sm = SchemaMethods(self.schema_code()) v_columns = [] v_joins = [] @@ -58,7 +58,7 @@ def sql_process_view(self, from_table, dest_table, keys=None): v_joins += v_join txt_pk_column, v_join = self.resolve_key( - self.schema_code, sm.pk_field_name(), alias_join_base="j_pk", solved_keys=solved_keys + self.schema_code(), sm.pk_field_name(), alias_join_base="j_pk", solved_keys=solved_keys ) v_columns.append(txt_pk_column) v_joins += v_join @@ -70,7 +70,7 @@ def sql_process_view(self, from_table, dest_table, keys=None): txt_id_digitiser = "" if self.id_digitiser: for key in ["id_digitiser", "id_digitizer"]: - if SchemaMethods(self.schema_code).has_property(key): + if SchemaMethods(self.schema_code()).has_property(key): txt_id_digitiser = f"{self.id_digitiser} AS {key}," break @@ -175,7 +175,7 @@ def process_column_import_view(self, index, key): """ process column for processed view """ - sm = SchemaMethods(self.schema_code) + sm = SchemaMethods(self.schema_code()) if not sm.has_property(key): return key, [] diff --git a/backend/gn_modulator/imports/mixins/raw.py b/backend/gn_modulator/imports/mixins/raw.py index a579d17c..9374a65b 100644 --- a/backend/gn_modulator/imports/mixins/raw.py +++ b/backend/gn_modulator/imports/mixins/raw.py @@ -38,7 +38,7 @@ def sql_raw_view( on passe les champs valant '' à NULL """ - sm = SchemaMethods(self.schema_code) + sm = SchemaMethods(self.schema_code()) from_table_columns = self.get_table_columns(from_table) @@ -94,7 +94,7 @@ def pre_process_raw_import_columns(self, key, key_unnest=None): TODO gérer les null dans l'import csv (ou dans l'insert) """ - sm = SchemaMethods(self.schema_code) + sm = SchemaMethods(self.schema_code()) if key == "id_import": return key @@ -140,7 +140,7 @@ def pre_process_raw_import_columns(self, key, key_unnest=None): def process_raw_import_column(self, key): """ """ - sm = SchemaMethods(self.schema_code) + sm = SchemaMethods(self.schema_code()) if not sm.has_property(key): return f"pp.{key}" diff --git a/backend/gn_modulator/imports/mixins/relation.py b/backend/gn_modulator/imports/mixins/relation.py index 73c36a97..14390c4b 100644 --- a/backend/gn_modulator/imports/mixins/relation.py +++ b/backend/gn_modulator/imports/mixins/relation.py @@ -8,7 +8,7 @@ class ImportMixinRelation(ImportMixinInsert, ImportMixinProcess, ImportMixinRaw, ImportMixinUtils): def process_relations(self): from_table = self.tables.get("mapping") or self.tables["data"] - sm = SchemaMethods(self.schema_code) + sm = SchemaMethods(self.schema_code()) columns = self.get_table_columns(from_table) @@ -22,7 +22,7 @@ def process_relations(self): self.import_relation_n_n(from_table, key) def import_relation_n_n(self, from_table, key): - sm = SchemaMethods(self.schema_code) + sm = SchemaMethods(self.schema_code()) self.sql[key] = {} diff --git a/backend/gn_modulator/imports/mixins/update.py b/backend/gn_modulator/imports/mixins/update.py index e691ab82..a5c425ee 100644 --- a/backend/gn_modulator/imports/mixins/update.py +++ b/backend/gn_modulator/imports/mixins/update.py @@ -29,11 +29,11 @@ def process_update(self): raise e self.add_error( code="ERR_IMPORT_UPDATE", - msg=f"Erreur durant l'update de {from_table} vers {self.schema_code} : {str(e)}", + msg=f"Erreur durant l'update de {from_table} vers {self.schema_code()} : {str(e)}", ) def sql_update(self, from_table): - sm = SchemaMethods(self.schema_code) + sm = SchemaMethods(self.schema_code()) columns = self.get_table_columns(from_table) @@ -81,33 +81,4 @@ def sql_update(self, from_table): WHERE a.{sm.pk_field_name()} = t.{sm.pk_field_name()} AND {txt_update_conditions} ; -""" - - def sql_nb_update(self, from_table): - sm = SchemaMethods(self.schema_code) - - columns = self.get_table_columns(from_table) - - v_update_conditions = list( - map( - lambda x: f"(t.{x}::TEXT IS DISTINCT FROM a.{x}::TEXT)", - filter( - lambda x: sm.has_property(x) - and sm.is_column(x) - and not sm.property(x).get("primary_key"), - columns, - ), - ) - ) - - txt_update_conditions = "" + "\n OR ".join(v_update_conditions) + "" - - return f""" - SELECT - COUNT(*) - FROM {sm.sql_schema_dot_table()} t - JOIN {from_table} a - ON a.{sm.pk_field_name()} = t.{sm.pk_field_name()} - WHERE {txt_update_conditions} -; """ diff --git a/backend/gn_modulator/imports/mixins/utils.py b/backend/gn_modulator/imports/mixins/utils.py index 73317b85..bc199445 100644 --- a/backend/gn_modulator/imports/mixins/utils.py +++ b/backend/gn_modulator/imports/mixins/utils.py @@ -25,7 +25,7 @@ def pretty_infos(self): if self.res.get("nb_data") is not None: txt += f"\n-- import csv file {Path(self.data_file_path).name}" txt += f" {self.res.get('nb_data')} lignes\n\n" - txt += f" - {self.schema_code}\n" + txt += f" - {self.schema_code()}\n" if self.res.get("nb_raw") != self.res.get("nb_process"): txt += f" raw : {self.res.get('nb_raw'):10d}\n" if self.res.get("nb_process"): @@ -70,7 +70,7 @@ def table_name(self, type, key=None): return f"{schema_import}.t_{self.id_import}_{type}" else: rel = f"_{key}" if key is not None else "" - return f"{schema_import}.v_{self.id_import}_{type}_{self.schema_code.replace('.', '_')}{rel}" + return f"{schema_import}.v_{self.id_import}_{type}_{self.schema_code().replace('.', '_')}{rel}" def add_error(self, code=None, msg=None, key=None, lines=None, values=None): self.errors.append( diff --git a/backend/gn_modulator/imports/models.py b/backend/gn_modulator/imports/models.py index 6c59f0a6..5981d693 100644 --- a/backend/gn_modulator/imports/models.py +++ b/backend/gn_modulator/imports/models.py @@ -3,16 +3,20 @@ from sqlalchemy.dialects.postgresql import JSONB from geonature.utils.env import db from .mixins import ImportMixin +from gn_modulator import ModuleMethods class TImport(db.Model, ImportMixin): __tablename__ = "t_imports" __table_args__ = {"schema": "gn_modulator"} - def __init__(self, schema_code=None, data_file_path=None, mapping_file_path=None, options={}): + def __init__( + self, module_code, object_code, data_file_path=None, mapping_file_path=None, options={} + ): self.id_digitiser = g.current_user.id_role if hasattr(g, "current_user") else None - self.schema_code = schema_code + self.module_code = module_code + self.object_code = object_code self.data_file_path = data_file_path and str(data_file_path) self.mapping_file_path = mapping_file_path and str(mapping_file_path) @@ -28,7 +32,13 @@ def __init__(self, schema_code=None, data_file_path=None, mapping_file_path=None id_import = db.Column(db.Integer, primary_key=True) id_digitiser = db.Column(db.Integer, db.ForeignKey("utilisateurs.t_roles.id_role")) - schema_code = db.Column(db.Unicode) + module_code = db.Column(db.Unicode) + object_code = db.Column(db.Unicode) + + def schema_code(self): + return ModuleMethods.schema_code(self.module_code, self.object_code) + + status = db.Column(db.Unicode) data_file_path = db.Column(db.Unicode) mapping_file_path = db.Column(db.Unicode) @@ -51,4 +61,7 @@ def as_dict(self): "csv_delimiter": self.csv_delimiter, "res": self.res, "errors": self.errors, + "options": self.options, + "tables": self.tables, + "status": self.status, } diff --git a/backend/gn_modulator/migrations/versions/3920371728d8_gn_modulator_import_init.py b/backend/gn_modulator/migrations/versions/3920371728d8_gn_modulator_import_init.py index 55bd35f9..aa387481 100644 --- a/backend/gn_modulator/migrations/versions/3920371728d8_gn_modulator_import_init.py +++ b/backend/gn_modulator/migrations/versions/3920371728d8_gn_modulator_import_init.py @@ -22,12 +22,14 @@ def upgrade(): CREATE TABLE gn_modulator.t_imports( id_import SERIAL NOT NULL, - id_digitiser INTEGER, - schema_code VARCHAR, - data_file_path VARCHAR, - mapping_file_path VARCHAR, - csv_delimiter VARCHAR, + id_digitiser INTEGER, -- qui a fait l'import + module_code VARCHAR NOT NULL, -- + object_code VARCHAR NOT NULL, -- + data_file_path VARCHAR, -- stocker dans un blob ?? + mapping_file_path VARCHAR, -- varchar ou table mapping + csv_delimiter VARCHAR, -- data_type VARCHAR, + status VARCHAR, res JSONB, tables JSONB, errors JSONB, diff --git a/backend/gn_modulator/routes/imports.py b/backend/gn_modulator/routes/imports.py index 124d2d7d..e1fdcd37 100644 --- a/backend/gn_modulator/routes/imports.py +++ b/backend/gn_modulator/routes/imports.py @@ -1,5 +1,7 @@ -from flask import request +import json +from flask import request, jsonify +from sqlalchemy import orm from geonature.core.gn_permissions.decorators import check_cruved_scope from geonature.utils.env import db @@ -10,12 +12,13 @@ from gn_modulator.imports.models import TImport -@check_cruved_scope("R") # object import ?? -@blueprint.route("import/", methods=["POST"]) -def api_import(module_code): - object_code = None - if request.form: - object_code = request.form.get("object_code") +@check_cruved_scope("C") # object import ?? +@blueprint.route("import///", methods=["POST"]) +@blueprint.route( + "import///", methods=["POST"], defaults={"id_import": None} +) +def api_import(module_code, object_code, id_import): + options = json.loads(request.form.get("options")) if request.form.get("options") else {} schema_code = ModuleMethods.schema_code(module_code, object_code) @@ -29,9 +32,15 @@ def api_import(module_code): ] } - impt = TImport(schema_code=schema_code) - db.session.add(impt) - db.session.flush() + if id_import: + try: + impt = TImport.query().filter_by(id_import=id_import).one() + except orm.exc.NoResultFound: + return f"Pas d'import trouvé pour id_import={id_import}", 404 + else: + impt = TImport(module_code, object_code, options=options) + db.session.add(impt) + db.session.flush() files_path = {} if request.files: diff --git a/backend/gn_modulator/tests/test_import.py b/backend/gn_modulator/tests/test_import.py index 981ba813..adbd297f 100644 --- a/backend/gn_modulator/tests/test_import.py +++ b/backend/gn_modulator/tests/test_import.py @@ -10,7 +10,8 @@ def test_synthese(self): premier test ajout d'une ligne dans la synthese """ - schema_code = "syn.synthese" + module_code = "MODULATOR" + object_code = "syn.synthese" data_file_path = import_test_dir / "synthese_1.csv" expected_infos = { "res.nb_data": 2, @@ -20,14 +21,15 @@ def test_synthese(self): "data_type": "csv", "csv_delimiter": ",", } - test_data_file(schema_code, data_file_path, expected_infos=expected_infos) + test_data_file(module_code, object_code, data_file_path, expected_infos=expected_infos) def test_synthese2(self): """ pour être sur que le premier import n'est pas persistant """ - schema_code = "syn.synthese" + module_code = "MODULATOR" + object_code = "syn.synthese" data_file_path = import_test_dir / "synthese_1.csv" expected_infos = { "res.nb_data": 2, @@ -35,19 +37,21 @@ def test_synthese2(self): "res.nb_update": 0, "res.nb_unchanged": 0, } - test_data_file(schema_code, data_file_path, expected_infos=expected_infos) + test_data_file(module_code, object_code, data_file_path, expected_infos=expected_infos) def test_ref_geo_linear(self): """ test import_route """ - schema_code = "ref_geo.linear_type" + module_code = "MODULATOR" + object_code = "ref_geo.linear_type" data_file_path = import_test_dir / "route/linear_type.csv" expected_infos = {"res.nb_data": 1} - test_data_file(schema_code, data_file_path, expected_infos=expected_infos) + test_data_file(module_code, object_code, data_file_path, expected_infos=expected_infos) - schema_code = "ref_geo.linear_group" + module_code = "MODULATOR" + object_code = "ref_geo.linear_group" data_file_path = import_test_dir / "route/route.csv" mapping_file_path = import_test_dir / "route/pp_linear_group.sql" expected_infos = { @@ -57,10 +61,15 @@ def test_ref_geo_linear(self): "res.nb_unchanged": 0, } test_data_file( - schema_code, data_file_path, mapping_file_path, expected_infos=expected_infos + module_code, + object_code, + data_file_path, + mapping_file_path, + expected_infos=expected_infos, ) - schema_code = "ref_geo.linear" + module_code = "MODULATOR" + object_code = "ref_geo.linear" data_file_path = import_test_dir / "route/route.csv" mapping_file_path = import_test_dir / "route/pp_linear.sql" expected_infos = { @@ -70,11 +79,16 @@ def test_ref_geo_linear(self): "res.nb_unchanged": 0, } test_data_file( - schema_code, data_file_path, mapping_file_path, expected_infos=expected_infos + module_code, + object_code, + data_file_path, + mapping_file_path, + expected_infos=expected_infos, ) def test_ref_geo_area(self): - schema_code = "ref_geo.area" + module_code = "MODULATOR" + object_code = "ref_geo.area" data_file_path = import_test_dir / "ref_geo.area.csv" expected_infos = { "res.nb_data": 2, @@ -82,7 +96,9 @@ def test_ref_geo_area(self): "res.nb_update": 0, "res.nb_unchanged": 0, } - impt = test_data_file(schema_code, data_file_path, expected_infos=expected_infos) + impt = test_data_file( + module_code, object_code, data_file_path, expected_infos=expected_infos + ) # print(impt.sql["process_view"]) # assert 1 == 0 @@ -90,17 +106,27 @@ def test_ref_geo_area(self): # Test remontées d'erreurs def test_error_ERR_IMPORT_INVALID_VALUE_FOR_TYPE(self): - schema_code = "syn.synthese" + module_code = "MODULATOR" + object_code = "syn.synthese" data_file_path = import_test_dir / "synthese_ERR_IMPORT_INVALID_VALUE_FOR_TYPE.csv" expected_infos = {"errors": [{"code": "ERR_IMPORT_INVALID_VALUE_FOR_TYPE"}]} test_data_file( - schema_code, data_file_path, mapping_file_path=None, expected_infos=expected_infos + module_code, + object_code, + data_file_path, + mapping_file_path=None, + expected_infos=expected_infos, ) def test_error_ERR_IMPORT_MISSING_UNIQUE(self): - schema_code = "ref_geo.area" + module_code = "MODULATOR" + object_code = "ref_geo.area" data_file_path = import_test_dir / "ref_geo.area_ERR_IMPORT_MISSING_UNIQUE.csv" expected_infos = {"errors": [{"code": "ERR_IMPORT_MISSING_UNIQUE"}]} test_data_file( - schema_code, data_file_path, mapping_file_path=None, expected_infos=expected_infos + module_code, + object_code, + data_file_path, + mapping_file_path=None, + expected_infos=expected_infos, ) diff --git a/backend/gn_modulator/tests/test_import_api.py b/backend/gn_modulator/tests/test_import_api.py index d46f8c54..edcd7629 100644 --- a/backend/gn_modulator/tests/test_import_api.py +++ b/backend/gn_modulator/tests/test_import_api.py @@ -12,9 +12,11 @@ class TestImportApi: def test_import_synthese(self, users): set_logged_user_cookie(self.client, users["admin_user"]) with open(import_test_dir / "synthese_1.csv", "rb") as f: - data = {"data_file": (f, "synthese.csv"), "object_code": "syn.synthese"} + data = {"data_file": (f, "synthese.csv")} r = self.client.post( - url_for("modulator.api_import", module_code="MODULATOR"), + url_for( + "modulator.api_import", module_code="MODULATOR", object_code="syn.synthese" + ), data=data, headers=Headers({"Content-Type": "multipart/form-data"}), ) @@ -31,9 +33,11 @@ def test_import_synthese(self, users): def test_import_synthese2(self, users): set_logged_user_cookie(self.client, users["admin_user"]) with open(import_test_dir / "synthese_1.csv", "rb") as f: - data = {"data_file": (f, "synthese.csv"), "object_code": "syn.synthese"} + data = {"data_file": (f, "synthese.csv")} r = self.client.post( - url_for("modulator.api_import", module_code="MODULATOR"), + url_for( + "modulator.api_import", module_code="MODULATOR", object_code="syn.synthese" + ), data=data, headers=Headers({"Content-Type": "multipart/form-data"}), ) diff --git a/backend/gn_modulator/tests/utils/imports.py b/backend/gn_modulator/tests/utils/imports.py index 746b3b5a..45b3a2ad 100644 --- a/backend/gn_modulator/tests/utils/imports.py +++ b/backend/gn_modulator/tests/utils/imports.py @@ -6,14 +6,15 @@ @pytest.mark.skip() def test_data_file( - schema_code=None, data_file_path=None, mapping_file_path=None, expected_infos={} + module_code, object_code, data_file_path=None, mapping_file_path=None, expected_infos={} ): with db.session.begin_nested(): # ici options={"insert_data": True} est à true pour intégrer les avec un insert # et non un copy qui ne marche pas en test impt = TImport( - schema_code=schema_code, + module_code, + object_code, data_file_path=data_file_path, mapping_file_path=mapping_file_path, options={"insert_data": True}, @@ -41,7 +42,7 @@ def test_data_file( ), f"L'erreur de code {expected_error['code']} n'a pas été trouvée" for key in expected_infos: - txt_err = f"schema_code: {schema_code}, key: {key}, expected: {expected_infos.get(key)}, import: {getAttr(import_infos, key)}" + txt_err = f"module_code: {module_code}, object_code: {object_code}, key: {key}, expected: {expected_infos.get(key)}, import: {getAttr(import_infos, key)}" assert getAttr(import_infos, key) == expected_infos.get(key), txt_err return impt diff --git a/config/layouts/utils/utils.import.layout.yml b/config/layouts/utils/utils.import.layout.yml index 9cf85e62..f9b23b30 100644 --- a/config/layouts/utils/utils.import.layout.yml +++ b/config/layouts/utils/utils.import.layout.yml @@ -4,7 +4,6 @@ title: layout du composant d'import description: layout du composant d'import layout: title: __f__`Importer ${o.des_labels(x, 'C')}` - # hidden: __f__!(o.is_action_allowed(x)) type: form items: - items: @@ -35,6 +34,14 @@ layout: title: "Autoriser les mises à jour" type: boolean default: __f__false + - key: options.check_only + title: Verifier + description: | + L'import se fait en deux temps. + Une premiere étape de validation des données. + Et une deuxième étape d'insertion et de mise à jour des données. + type: boolean + default: __f__true - direction: row items: diff --git a/config/modules/MODULATOR.module.yml b/config/modules/MODULATOR.module.yml index 8d59ed4e..34856b06 100644 --- a/config/modules/MODULATOR.module.yml +++ b/config/modules/MODULATOR.module.yml @@ -12,6 +12,10 @@ objects: cruved: R ref_geo.linear_group: cruved: R + ref_geo.linear_type: + cruved: R + ref_geo.linear: + cruved: R user.role: cruved: R user.organisme: diff --git a/config/modules/contrib/m_sipaf/imports/m_sipaf.pf_V1.import.yml b/config/modules/contrib/m_sipaf/imports/m_sipaf.pf_V1.import.yml index 02d37324..3be4b6a0 100644 --- a/config/modules/contrib/m_sipaf/imports/m_sipaf.pf_V1.import.yml +++ b/config/modules/contrib/m_sipaf/imports/m_sipaf.pf_V1.import.yml @@ -3,14 +3,17 @@ code: m_sipaf.pf_V1 title: Données d'exemple m_sipaf description: import données d'exemple de passage à faune pour SIPAF items: - - schema_code: user.organisme + - object_code: user.organisme + module_code: MODULATOR data: pf_V1.csv mapping: scripts/ppi_organism_V1.sql - - schema_code: m_sipaf.pf + - object_code: site + module_code: m_sipaf data: pf_V1.csv mapping: scripts/ppi_pf_V1.sql keep_raw: true - - schema_code: m_sipaf.actor + - object_code: actor + module_code: m_sipaf data: pf_V1.csv mapping: scripts/ppi_actor_V1.sql keep_raw: true diff --git a/config/modules/contrib/m_sipaf/imports/ref_geo.route.import.yml b/config/modules/contrib/m_sipaf/imports/ref_geo.route.import.yml index 9f98942a..a84ed43b 100644 --- a/config/modules/contrib/m_sipaf/imports/ref_geo.route.import.yml +++ b/config/modules/contrib/m_sipaf/imports/ref_geo.route.import.yml @@ -3,12 +3,15 @@ code: ref_geo.route title: import ref_geo.route description: scenario d'import de données pour le ref_geo lineaire (route, autoroute) items: - - schema_code: ref_geo.linear_type + - module_code: MODULATOR + object_code: ref_geo.linear_type data: linear_type.csv - - schema_code: ref_geo.linear_group + - module_code: MODULATOR + object_code: ref_geo.linear_group data: TRONCON_DE_ROUTE_NATIONALE_AUTOROUTE.csv mapping: scripts/ppi_groupe_route_na.sql - - schema_code: ref_geo.linear + - module_code: MODULATOR + object_code: ref_geo.linear ref_geo.linear: ref_geo.linear data: TRONCON_DE_ROUTE_NATIONALE_AUTOROUTE.csv mapping: scripts/ppi_troncon_route_na.sql diff --git a/config/modules/contrib/m_sipaf/m_sipaf.module.yml b/config/modules/contrib/m_sipaf/m_sipaf.module.yml index ae394bb7..5a78d743 100644 --- a/config/modules/contrib/m_sipaf/m_sipaf.module.yml +++ b/config/modules/contrib/m_sipaf/m_sipaf.module.yml @@ -19,6 +19,10 @@ objects: site: schema_code: m_sipaf.pf cruved: CRUDE + actor: + schema_code: m_sipaf.actor + cruved: R + tree: pf: diff --git a/config/references/import.reference.yml b/config/references/import.reference.yml index bda7c882..95d2dec3 100644 --- a/config/references/import.reference.yml +++ b/config/references/import.reference.yml @@ -23,11 +23,14 @@ properties: type: array items: required: - - schema_code + - module_code + - object_code - data type: object properties: - schema_code: + module_code: + type: string + object_code: type: string data: type: string diff --git a/doc/technique/import.md b/doc/technique/import.md index ad02683f..febbf9b7 100644 --- a/doc/technique/import.md +++ b/doc/technique/import.md @@ -30,7 +30,8 @@ Pour une ligne du fichier à importer on peux être dans deux cas - la clé primaire peut être résolue, il existe déjà une ligne correspondant à cette données. On a la possibilité de faire un `UPDATE` pour ces lignes ## Les étapes -### 1) Données +### 1) Chargement, pré-traitement et verification des données +#### 1.1) Chargement des données Chargement du fichier de données dans une table `gn_modulator_import.t_` - Toutes les colonnes sont de type `VARCHAR` @@ -39,24 +40,24 @@ Chargement du fichier de données dans une table `gn_modulator_import.t_ { - formGroup.patchValue({ - oups: !formGroup.value.oups, - layout_definition: '', - layout_from_list: { code: data.layout_from_list.code }, - }); - }`, - }, { flex: '0', type: 'boolean', @@ -116,7 +103,7 @@ export class TestLayoutComponent implements OnInit { title_field_name: 'description', return_object: true, oup: '__f__data.oups', - // reload_on_search: true, + reload_on_search: true, default_item: this.layoutCode && { code: this.layoutCode }, }, { diff --git a/frontend/app/services/data.service.ts b/frontend/app/services/data.service.ts index 36d4e84e..80cb94dd 100644 --- a/frontend/app/services/data.service.ts +++ b/frontend/app/services/data.service.ts @@ -89,16 +89,6 @@ export class ModulesDataService { }); } - import(moduleCode, data, params = {}) { - return this._mRequest.postRequestWithFormData( - `${this._mConfig.backendModuleUrl()}/import/${moduleCode}`, - { - data, - params, - } - ); - } - getBreadcrumbs(context: any) { return this._mRequest.request( 'get', diff --git a/frontend/app/services/form.service.ts b/frontend/app/services/form.service.ts index ca786086..b15ea434 100644 --- a/frontend/app/services/form.service.ts +++ b/frontend/app/services/form.service.ts @@ -329,7 +329,8 @@ export class ModulesFormService { : utils.isObject(formValue) ? !utils.isObject(data) ? false - : Object.entries(formValue) + : // Object.keys(formValue).length == Object.keys(data).length && + Object.entries(formValue) .filter(([k, v]) => k != 'pendingRequest') .every(([k, v]) => this.isEqual(v, data[k])) : Array.isArray(formValue) diff --git a/frontend/app/services/import.service.ts b/frontend/app/services/import.service.ts index a0aa8aed..3eedd371 100644 --- a/frontend/app/services/import.service.ts +++ b/frontend/app/services/import.service.ts @@ -4,6 +4,7 @@ import { ModulesLayoutService } from './layout.service'; import { ModulesObjectService } from './object.service'; import { ModulesConfigService } from './config.service'; import { ModulesRouteService } from './route.service'; +import { ModulesRequestService } from './request.service'; import { CommonService } from '@geonature_common/service/common.service'; import { HttpEventType, HttpResponse, HttpErrorResponse } from '@angular/common/http'; import { catchError, map, filter, switchMap } from 'rxjs/operators'; @@ -17,6 +18,7 @@ export class ModulesImportService { _commonService: CommonService; _mConfig: ModulesConfigService; _mRoute: ModulesRouteService; + _mRequest: ModulesRequestService; constructor(private _injector: Injector) { this._mData = this._injector.get(ModulesDataService); @@ -25,6 +27,19 @@ export class ModulesImportService { this._commonService = this._injector.get(CommonService); this._mConfig = this._injector.get(ModulesConfigService); this._mRoute = this._injector.get(ModulesRouteService); + this._mRequest = this._injector.get(ModulesRequestService); + } + + importRequest(moduleCode, object_code, data, params = {}) { + return this._mRequest.postRequestWithFormData( + `${this._mConfig.backendModuleUrl()}/import/${moduleCode}/${object_code}/${ + data.id_import || '' + }`, + { + data, + params, + } + ); } processImport(context, data) { @@ -33,8 +48,7 @@ export class ModulesImportService { class: null, }; this._mLayout.reComputeLayout(); - this._mData - .import(context.module_code, data) + this.importRequest(context.module_code, context.object_code, data) .pipe() .subscribe( (importEvent) => { diff --git a/frontend/app/services/request.service.ts b/frontend/app/services/request.service.ts index e494c559..059caba5 100644 --- a/frontend/app/services/request.service.ts +++ b/frontend/app/services/request.service.ts @@ -29,7 +29,8 @@ export class ModulesRequestService { for (const [key, value] of Object.entries(data).filter( ([key, value]) => !utils.isFile(value) )) { - formData.append(key, value as any); + const processedValue = utils.isObject(value) ? JSON.stringify(value) : value; + formData.append(key, processedValue as any); } for (const [key, value] of Object.entries(data).filter(([key, value]) => utils.isFile(value))) { formData.append(key, value as any); From 2d96ea39295fbd3e6e756b718e8f227d55d04a49 Mon Sep 17 00:00:00 2001 From: "joel.clement" Date: Thu, 16 Mar 2023 10:14:19 +0100 Subject: [PATCH 025/142] import status --- backend/gn_modulator/commands.py | 11 ++- .../gn_modulator/imports/mixins/__init__.py | 99 ++++++++----------- backend/gn_modulator/imports/mixins/check.py | 16 ++- backend/gn_modulator/imports/mixins/count.py | 4 +- backend/gn_modulator/imports/mixins/insert.py | 6 +- .../gn_modulator/imports/mixins/process.py | 9 +- backend/gn_modulator/imports/mixins/raw.py | 6 +- .../gn_modulator/imports/mixins/relation.py | 4 +- backend/gn_modulator/imports/mixins/update.py | 4 +- backend/gn_modulator/imports/mixins/utils.py | 16 ++- backend/gn_modulator/imports/models.py | 19 +++- .../3920371728d8_gn_modulator_import_init.py | 5 +- backend/gn_modulator/routes/imports.py | 37 ++----- backend/gn_modulator/tests/utils/imports.py | 4 +- config/layouts/utils/utils.import.layout.yml | 16 ++- frontend/app/components/base/base.scss | 6 ++ .../layout/base/layout-import.component.ts | 50 +++++++++- frontend/app/services/import.service.ts | 66 +------------ 18 files changed, 189 insertions(+), 189 deletions(-) diff --git a/backend/gn_modulator/commands.py b/backend/gn_modulator/commands.py index d1576752..333b941a 100644 --- a/backend/gn_modulator/commands.py +++ b/backend/gn_modulator/commands.py @@ -143,7 +143,12 @@ def cmd_doc_schema(schema_code, force=False): ) @with_appcontext def cmd_import_bulk_data( - schema_code=None, import_code=None, data_path=None, mapping_file_path=None, verbose=None + module_code=None, + object_code=None, + import_code=None, + data_path=None, + mapping_file_path=None, + verbose=None, ): """ importe des données pour un schema @@ -151,9 +156,9 @@ def cmd_import_bulk_data( init_gn_modulator() - if schema_code and data_path: + if module_code and object_code and data_path: impt = TImport( - schema_code=schema_code, data_file_path=data_path, mapping_file_path=mapping_file_path + module_code, object_code, data_file_path=data_path, mapping_file_path=mapping_file_path ) impt.process_import_schema() print(impt.pretty_infos()) diff --git a/backend/gn_modulator/imports/mixins/__init__.py b/backend/gn_modulator/imports/mixins/__init__.py index 96b88cc0..a40b936c 100644 --- a/backend/gn_modulator/imports/mixins/__init__.py +++ b/backend/gn_modulator/imports/mixins/__init__.py @@ -27,68 +27,53 @@ class ImportMixin( ImportMixinUtils, ): def process_import_schema(self): - self.init_import() - if self.errors: - return self - db.session.flush() - - self.process_data_table() - if self.errors: - return self - db.session.flush() - - self.process_mapping_view() - if self.errors: - return self - db.session.flush() - - self.check_uniques() - self.check_types() - if self.errors: - return self - db.session.flush() - - self.process_raw_view() - if self.errors: - return self - db.session.flush() - - self.process_view() - if self.errors: - return self - db.session.flush() - - self.check_required() - self.check_resolve_keys() - - if self.errors: - return self - db.session.flush() - - self.process_count() - if self.errors: - return self - db.session.flush() + if self.status in ["DONE", "PROCESSING"]: + return - if self.options.get("check_only"): - return self + if self.status is None: + self.process_load_data_and_check() - self.process_insert() - if self.errors: - return self - db.session.flush() - - self.process_update() - if self.errors: - return self - db.session.flush() + if self.status == "ERROR": + return - self.process_relations() - if self.errors: + if self.options.get("check_only") and not self.status == "READY": + self.status = "READY" return self - db.session.flush() - return self + print(self.as_dict()) + + self.process_insert_and_update() + + def process_load_data_and_check(self): + for action in [ + "init_import", + "process_data_table", + "process_mapping_view", + "process_pre_check", + "process_raw_view", + "process_view", + "process_post_check", + "process_count", + ]: + getattr(self, action)() + if self.status == "ERROR": + return self + db.session.flush() + + def process_insert_and_update(self): + self.status = "PROCESSING" + + for action in [ + "process_insert", + "process_update", + "process_relations", + ]: + getattr(self, action)() + if self.status == "ERROR": + return self + db.session.flush() + + self.status = "DONE" @classmethod def process_import_code(cls, import_code, data_dir_path, insert_data=True, commit=True): diff --git a/backend/gn_modulator/imports/mixins/check.py b/backend/gn_modulator/imports/mixins/check.py index 3d631f92..7900c2ae 100644 --- a/backend/gn_modulator/imports/mixins/check.py +++ b/backend/gn_modulator/imports/mixins/check.py @@ -5,13 +5,21 @@ class ImportMixinCheck(ImportMixinUtils): + def process_pre_check(self): + self.check_types() + self.check_uniques() + + def process_post_check(self): + self.check_required() + self.check_resolve_keys() + def check_uniques(self): # avant raw # on verifie la présence des colonne d'unicité table_test = self.tables.get("mapping") or self.tables["data"] columns = self.get_table_columns(table_test) - sm = SchemaMethods(self.schema_code()) + sm = SchemaMethods(self.schema_code) unique = sm.attr("meta.unique") missing_unique = [key for key in unique if key not in columns] @@ -28,7 +36,7 @@ def check_types(self): # gn_modulator.check_type(TYPE_IN, val) table_test = self.tables.get("mapping") or self.tables["data"] - sm = SchemaMethods(self.schema_code()) + sm = SchemaMethods(self.schema_code) for key in filter( lambda x: sm.is_column(x) and not sm.property(x).get("foreign_key"), self.get_table_columns(table_test), @@ -73,7 +81,7 @@ def check_required(self): # et que la valeur dans raw est nulle # erreur raw_table = self.tables["raw"] - sm = SchemaMethods(self.schema_code()) + sm = SchemaMethods(self.schema_code) for key in self.get_table_columns(raw_table): if not sm.is_required(key): @@ -104,7 +112,7 @@ def check_required(self): def check_resolve_keys(self): raw_table = self.tables["raw"] process_table = self.tables["process"] - sm = SchemaMethods(self.schema_code()) + sm = SchemaMethods(self.schema_code) for key in self.get_table_columns(raw_table): if not (sm.has_property(key) and sm.property(key).get("foreign_key")): diff --git a/backend/gn_modulator/imports/mixins/count.py b/backend/gn_modulator/imports/mixins/count.py index a9720a1d..b389198a 100644 --- a/backend/gn_modulator/imports/mixins/count.py +++ b/backend/gn_modulator/imports/mixins/count.py @@ -11,7 +11,7 @@ def process_count(self): ) def sql_nb_update(self, from_table): - sm = SchemaMethods(self.schema_code()) + sm = SchemaMethods(self.schema_code) columns = self.get_table_columns(from_table) @@ -55,7 +55,7 @@ def count_update(self): def count_insert(self): from_table = self.tables["process"] - sm = SchemaMethods(self.schema_code()) + sm = SchemaMethods(self.schema_code) self.sql[ "nb_insert" ] = f"SELECT COUNT(*) FROM {from_table} WHERE {sm.pk_field_name()} IS NULL" diff --git a/backend/gn_modulator/imports/mixins/insert.py b/backend/gn_modulator/imports/mixins/insert.py index 03c48d34..48f677b4 100644 --- a/backend/gn_modulator/imports/mixins/insert.py +++ b/backend/gn_modulator/imports/mixins/insert.py @@ -6,7 +6,7 @@ class ImportMixinInsert(ImportMixinUtils): def process_insert(self): from_table = self.tables["process"] - sm = SchemaMethods(self.schema_code()) + sm = SchemaMethods(self.schema_code) self.sql[ "nb_insert" ] = f"SELECT COUNT(*) FROM {from_table} WHERE {sm.pk_field_name()} IS NULL" @@ -32,11 +32,11 @@ def process_insert(self): raise e self.add_error( code="ERR_IMPORT_INSERT", - msg=f"Erreur durant l'insert de {from_table} vers {self.schema_code()} : {str(e)}", + msg=f"Erreur durant l'insert de {from_table} vers {self.schema_code} : {str(e)}", ) def sql_insert(self, from_table, dest_table=None, keys=None): - sm = SchemaMethods(self.schema_code()) + sm = SchemaMethods(self.schema_code) table_name = dest_table or sm.sql_schema_dot_table() diff --git a/backend/gn_modulator/imports/mixins/process.py b/backend/gn_modulator/imports/mixins/process.py index 6069b222..8e3f7bf6 100644 --- a/backend/gn_modulator/imports/mixins/process.py +++ b/backend/gn_modulator/imports/mixins/process.py @@ -25,7 +25,7 @@ def sql_process_view(self, from_table, dest_table, keys=None): requete pour créer une vue qui résoud les clé """ - sm = SchemaMethods(self.schema_code()) + sm = SchemaMethods(self.schema_code) v_columns = [] v_joins = [] @@ -58,7 +58,7 @@ def sql_process_view(self, from_table, dest_table, keys=None): v_joins += v_join txt_pk_column, v_join = self.resolve_key( - self.schema_code(), sm.pk_field_name(), alias_join_base="j_pk", solved_keys=solved_keys + self.schema_code, sm.pk_field_name(), alias_join_base="j_pk", solved_keys=solved_keys ) v_columns.append(txt_pk_column) v_joins += v_join @@ -70,7 +70,7 @@ def sql_process_view(self, from_table, dest_table, keys=None): txt_id_digitiser = "" if self.id_digitiser: for key in ["id_digitiser", "id_digitizer"]: - if SchemaMethods(self.schema_code()).has_property(key): + if SchemaMethods(self.schema_code).has_property(key): txt_id_digitiser = f"{self.id_digitiser} AS {key}," break @@ -93,7 +93,6 @@ def resolve_key( le champs de la colonne qui doit contenir la clé la ou les jointures nécessaire pour résoudre la clé """ - sm = SchemaMethods(schema_code) alias_join = alias_join_base if index is None else f"{alias_join_base}_{index}" @@ -175,7 +174,7 @@ def process_column_import_view(self, index, key): """ process column for processed view """ - sm = SchemaMethods(self.schema_code()) + sm = SchemaMethods(self.schema_code) if not sm.has_property(key): return key, [] diff --git a/backend/gn_modulator/imports/mixins/raw.py b/backend/gn_modulator/imports/mixins/raw.py index 9374a65b..a579d17c 100644 --- a/backend/gn_modulator/imports/mixins/raw.py +++ b/backend/gn_modulator/imports/mixins/raw.py @@ -38,7 +38,7 @@ def sql_raw_view( on passe les champs valant '' à NULL """ - sm = SchemaMethods(self.schema_code()) + sm = SchemaMethods(self.schema_code) from_table_columns = self.get_table_columns(from_table) @@ -94,7 +94,7 @@ def pre_process_raw_import_columns(self, key, key_unnest=None): TODO gérer les null dans l'import csv (ou dans l'insert) """ - sm = SchemaMethods(self.schema_code()) + sm = SchemaMethods(self.schema_code) if key == "id_import": return key @@ -140,7 +140,7 @@ def pre_process_raw_import_columns(self, key, key_unnest=None): def process_raw_import_column(self, key): """ """ - sm = SchemaMethods(self.schema_code()) + sm = SchemaMethods(self.schema_code) if not sm.has_property(key): return f"pp.{key}" diff --git a/backend/gn_modulator/imports/mixins/relation.py b/backend/gn_modulator/imports/mixins/relation.py index 14390c4b..73c36a97 100644 --- a/backend/gn_modulator/imports/mixins/relation.py +++ b/backend/gn_modulator/imports/mixins/relation.py @@ -8,7 +8,7 @@ class ImportMixinRelation(ImportMixinInsert, ImportMixinProcess, ImportMixinRaw, ImportMixinUtils): def process_relations(self): from_table = self.tables.get("mapping") or self.tables["data"] - sm = SchemaMethods(self.schema_code()) + sm = SchemaMethods(self.schema_code) columns = self.get_table_columns(from_table) @@ -22,7 +22,7 @@ def process_relations(self): self.import_relation_n_n(from_table, key) def import_relation_n_n(self, from_table, key): - sm = SchemaMethods(self.schema_code()) + sm = SchemaMethods(self.schema_code) self.sql[key] = {} diff --git a/backend/gn_modulator/imports/mixins/update.py b/backend/gn_modulator/imports/mixins/update.py index a5c425ee..68dd0ac7 100644 --- a/backend/gn_modulator/imports/mixins/update.py +++ b/backend/gn_modulator/imports/mixins/update.py @@ -29,11 +29,11 @@ def process_update(self): raise e self.add_error( code="ERR_IMPORT_UPDATE", - msg=f"Erreur durant l'update de {from_table} vers {self.schema_code()} : {str(e)}", + msg=f"Erreur durant l'update de {from_table} vers {self.schema_code} : {str(e)}", ) def sql_update(self, from_table): - sm = SchemaMethods(self.schema_code()) + sm = SchemaMethods(self.schema_code) columns = self.get_table_columns(from_table) diff --git a/backend/gn_modulator/imports/mixins/utils.py b/backend/gn_modulator/imports/mixins/utils.py index bc199445..1a4458b8 100644 --- a/backend/gn_modulator/imports/mixins/utils.py +++ b/backend/gn_modulator/imports/mixins/utils.py @@ -2,6 +2,7 @@ from gn_modulator.schema import SchemaMethods from gn_modulator.utils.env import schema_import +from gn_modulator import ModuleMethods class ImportMixinUtils: @@ -18,6 +19,16 @@ class ImportMixinUtils: } def init_import(self): + self.schema_code = self.schema_code or ModuleMethods.schema_code( + self.module_code, self.object_code + ) + if not self.schema_code: + self.add_error( + { + "code": "ERR_IMPORT_SCHEMA_CODE_NOT_FOND", + "msg": f"Il n'y a pas de schema pour module_code={self.module_code}, object_code={self.object_code}", + } + ) SchemaMethods.c_sql_exec_txt(f"CREATE SCHEMA IF NOT EXISTS {schema_import}") def pretty_infos(self): @@ -25,7 +36,7 @@ def pretty_infos(self): if self.res.get("nb_data") is not None: txt += f"\n-- import csv file {Path(self.data_file_path).name}" txt += f" {self.res.get('nb_data')} lignes\n\n" - txt += f" - {self.schema_code()}\n" + txt += f" - {self.schema_code}\n" if self.res.get("nb_raw") != self.res.get("nb_process"): txt += f" raw : {self.res.get('nb_raw'):10d}\n" if self.res.get("nb_process"): @@ -70,12 +81,13 @@ def table_name(self, type, key=None): return f"{schema_import}.t_{self.id_import}_{type}" else: rel = f"_{key}" if key is not None else "" - return f"{schema_import}.v_{self.id_import}_{type}_{self.schema_code().replace('.', '_')}{rel}" + return f"{schema_import}.v_{self.id_import}_{type}_{self.schema_code.replace('.', '_')}{rel}" def add_error(self, code=None, msg=None, key=None, lines=None, values=None): self.errors.append( {"code": code, "msg": msg, "key": key, "lines": lines, "values": values} ) + self.status = "ERROR" def get_table_columns(self, table_name): if not self._columns.get(table_name): diff --git a/backend/gn_modulator/imports/models.py b/backend/gn_modulator/imports/models.py index 5981d693..67f130af 100644 --- a/backend/gn_modulator/imports/models.py +++ b/backend/gn_modulator/imports/models.py @@ -11,10 +11,17 @@ class TImport(db.Model, ImportMixin): __table_args__ = {"schema": "gn_modulator"} def __init__( - self, module_code, object_code, data_file_path=None, mapping_file_path=None, options={} + self, + module_code=None, + object_code=None, + schema_code=None, + data_file_path=None, + mapping_file_path=None, + options={}, ): self.id_digitiser = g.current_user.id_role if hasattr(g, "current_user") else None + self.schema_code = schema_code self.module_code = module_code self.object_code = object_code self.data_file_path = data_file_path and str(data_file_path) @@ -25,7 +32,8 @@ def __init__( self.res = {} self.errors = [] self.sql = {} - self.tables = {} + self.tables = {"prout": "oug"} + print("init import ", self.id_import) _columns = {} @@ -34,9 +42,7 @@ def __init__( id_digitiser = db.Column(db.Integer, db.ForeignKey("utilisateurs.t_roles.id_role")) module_code = db.Column(db.Unicode) object_code = db.Column(db.Unicode) - - def schema_code(self): - return ModuleMethods.schema_code(self.module_code, self.object_code) + schema_code = db.Column(db.Unicode) status = db.Column(db.Unicode) @@ -56,6 +62,9 @@ def schema_code(self): def as_dict(self): return { "id_import": self.id_import, + "schema_code": self.schema_code, + "module_code": self.module_code, + "object_code": self.object_code, "id_digitiser": self.id_digitiser, "data_type": self.data_type, "csv_delimiter": self.csv_delimiter, diff --git a/backend/gn_modulator/migrations/versions/3920371728d8_gn_modulator_import_init.py b/backend/gn_modulator/migrations/versions/3920371728d8_gn_modulator_import_init.py index aa387481..105eeb8a 100644 --- a/backend/gn_modulator/migrations/versions/3920371728d8_gn_modulator_import_init.py +++ b/backend/gn_modulator/migrations/versions/3920371728d8_gn_modulator_import_init.py @@ -23,8 +23,9 @@ def upgrade(): CREATE TABLE gn_modulator.t_imports( id_import SERIAL NOT NULL, id_digitiser INTEGER, -- qui a fait l'import - module_code VARCHAR NOT NULL, -- - object_code VARCHAR NOT NULL, -- + module_code VARCHAR, -- + object_code VARCHAR, -- + schema_code VARCHAR, -- data_file_path VARCHAR, -- stocker dans un blob ?? mapping_file_path VARCHAR, -- varchar ou table mapping csv_delimiter VARCHAR, -- diff --git a/backend/gn_modulator/routes/imports.py b/backend/gn_modulator/routes/imports.py index e1fdcd37..557317c2 100644 --- a/backend/gn_modulator/routes/imports.py +++ b/backend/gn_modulator/routes/imports.py @@ -20,21 +20,9 @@ def api_import(module_code, object_code, id_import): options = json.loads(request.form.get("options")) if request.form.get("options") else {} - schema_code = ModuleMethods.schema_code(module_code, object_code) - - if not schema_code: - return { - "errors": [ - { - "msg": f"Il n'y pas de schema pour module_code={module_code} et object_code={object_code}", - "code": "ERR_IMPORT_SCHEMA_CODE", - } - ] - } - if id_import: try: - impt = TImport.query().filter_by(id_import=id_import).one() + impt = TImport.query.filter_by(id_import=id_import).one() except orm.exc.NoResultFound: return f"Pas d'import trouvé pour id_import={id_import}", 404 else: @@ -42,24 +30,19 @@ def api_import(module_code, object_code, id_import): db.session.add(impt) db.session.flush() - files_path = {} - if request.files: - for file_key in request.files: - file = request.files.get(file_key) - files_path[file_key] = upload_import_file( - module_code, object_code, impt.id_import, file - ) + if not impt.status: + files_path = {} + if request.files: + for file_key in request.files: + file = request.files.get(file_key) + files_path[file_key] = upload_import_file( + module_code, object_code, impt.id_import, file + ) - impt.data_file_path = files_path.get("data_file") and str(files_path.get("data_file")) + impt.data_file_path = files_path.get("data_file") and str(files_path.get("data_file")) impt.process_import_schema() - if impt.errors: - out = {"errors": impt.errors} - db.session.commit() - return out - out = impt.as_dict() - db.session.commit() return out diff --git a/backend/gn_modulator/tests/utils/imports.py b/backend/gn_modulator/tests/utils/imports.py index 45b3a2ad..df45b6cb 100644 --- a/backend/gn_modulator/tests/utils/imports.py +++ b/backend/gn_modulator/tests/utils/imports.py @@ -13,8 +13,8 @@ def test_data_file( # et non un copy qui ne marche pas en test impt = TImport( - module_code, - object_code, + module_code=module_code, + object_code=object_code, data_file_path=data_file_path, mapping_file_path=mapping_file_path, options={"insert_data": True}, diff --git a/config/layouts/utils/utils.import.layout.yml b/config/layouts/utils/utils.import.layout.yml index f9b23b30..a251dd29 100644 --- a/config/layouts/utils/utils.import.layout.yml +++ b/config/layouts/utils/utils.import.layout.yml @@ -11,13 +11,16 @@ layout: html: __f__data.importMsg?.html class: __f__data.importMsg?.class hidden: __f__!data.importMsg + - type: message + json: __f__data - hidden: true items: - key: importMsg - - key: object_code type: string - hidden: true - default: __f__context.object_code + - title: '__f__`Statut: ${data.status}`' + - key: status + type: string + - title: import display: fieldset items: @@ -46,8 +49,11 @@ layout: - direction: row items: - type: button - color: primary - title: Valider + color: success + title: | + __f__data.status == 'READY' + ? 'Importer les données' + : 'Charger et valider les données' description: Valider action: import disabled: __f__!(formGroup.valid ) diff --git a/frontend/app/components/base/base.scss b/frontend/app/components/base/base.scss index a7b12019..50ed8af0 100644 --- a/frontend/app/components/base/base.scss +++ b/frontend/app/components/base/base.scss @@ -41,6 +41,12 @@ color: #fff; } +.layout-buttons .mat-button-disabled { + color: rgba(0,0,0,.26); + background-color: rgba(0,0,0,.12); +} + + .content-container { min-width: 50%; } diff --git a/frontend/app/components/layout/base/layout-import.component.ts b/frontend/app/components/layout/base/layout-import.component.ts index 4ccf8130..1ad01bc6 100644 --- a/frontend/app/components/layout/base/layout-import.component.ts +++ b/frontend/app/components/layout/base/layout-import.component.ts @@ -1,6 +1,7 @@ import { Component, OnInit, Injector, ViewEncapsulation } from '@angular/core'; import { ModulesLayoutComponent } from './layout.component'; import { ModulesImportService } from '../../../services/import.service'; +import { HttpEventType, HttpResponse, HttpErrorResponse } from '@angular/common/http'; import utils from '../../../utils'; @Component({ @@ -15,6 +16,8 @@ export class ModulesLayoutImportComponent extends ModulesLayoutComponent impleme importContext: any; _mImport: ModulesImportService; + uploadPercentDone; + constructor(_injector: Injector) { super(_injector); this._name = 'layout-import'; @@ -32,10 +35,55 @@ export class ModulesLayoutImportComponent extends ModulesLayoutComponent impleme }; } + processImport(context, data) { + data.importMsg = { + html: 'Traitement en cours', + class: null, + }; + this._mLayout.reComputeLayout(); + this._mImport + .importRequest(context.module_code, context.object_code, data) + .pipe() + .subscribe((importEvent) => { + if (importEvent.type === HttpEventType.UploadProgress) { + this.uploadPercentDone = Math.round((100 * importEvent.loaded) / importEvent.total); + } + if (importEvent instanceof HttpResponse) { + this._mLayout.stopActionProcessing(''); + const response = importEvent.body as any; + this.importData = response; + // if (response.errors?.length) { + // for (let error of response.errors) { + // console.error(`${error.code} : ${error.msg}`); + // } + // data.importMsg = { + // class: 'error', + // html: this._mImport.importHTMLMsgError(response), + // }; + // for (const key of response) { + // console.log(key) + // data[key] = response[key] + // } + // return; + // } + + // let txtImport = this._mImport.importHTMLMsgSuccess(response); + + // data.importMsg = { + // class: 'success', + // html: txtImport, + // }; + + // setTimeout(() => this._mLayout.reComputeLayout(), 100); + // this._commonService.regularToaster('success', txtImport); + } + }); + } + processAction(event: any): void { const { action, context, value = null, data = null, layout = null } = event; if (action == 'import') { - return this._mImport.processImport(context, data); + return this.processImport(context, data); } } } diff --git a/frontend/app/services/import.service.ts b/frontend/app/services/import.service.ts index 3eedd371..bdbe98f8 100644 --- a/frontend/app/services/import.service.ts +++ b/frontend/app/services/import.service.ts @@ -1,33 +1,15 @@ import { Injectable, Injector } from '@angular/core'; -import { ModulesDataService } from './data.service'; -import { ModulesLayoutService } from './layout.service'; -import { ModulesObjectService } from './object.service'; import { ModulesConfigService } from './config.service'; -import { ModulesRouteService } from './route.service'; import { ModulesRequestService } from './request.service'; -import { CommonService } from '@geonature_common/service/common.service'; -import { HttpEventType, HttpResponse, HttpErrorResponse } from '@angular/common/http'; -import { catchError, map, filter, switchMap } from 'rxjs/operators'; -import { of } from 'rxjs'; @Injectable() export class ModulesImportService { - _mData: ModulesDataService; - _mLayout: ModulesLayoutService; - _mObject: ModulesObjectService; - _commonService: CommonService; _mConfig: ModulesConfigService; - _mRoute: ModulesRouteService; _mRequest: ModulesRequestService; constructor(private _injector: Injector) { - this._mData = this._injector.get(ModulesDataService); - this._mLayout = this._injector.get(ModulesLayoutService); - this._mObject = this._injector.get(ModulesObjectService); - this._commonService = this._injector.get(CommonService); - this._mConfig = this._injector.get(ModulesConfigService); - this._mRoute = this._injector.get(ModulesRouteService); this._mRequest = this._injector.get(ModulesRequestService); + this._mConfig = this._injector.get(ModulesConfigService); } importRequest(moduleCode, object_code, data, params = {}) { @@ -36,56 +18,12 @@ export class ModulesImportService { data.id_import || '' }`, { - data, + data: data.id_import ? {} : data, params, } ); } - processImport(context, data) { - data.importMsg = { - html: 'Traitement en cours', - class: null, - }; - this._mLayout.reComputeLayout(); - this.importRequest(context.module_code, context.object_code, data) - .pipe() - .subscribe( - (importEvent) => { - if (importEvent.type === HttpEventType.UploadProgress) { - const uploadPerCentDone = Math.round((100 * importEvent.loaded) / importEvent.total); - } - if (importEvent instanceof HttpResponse) { - this._mLayout.stopActionProcessing(''); - const response = importEvent.body as any; - if (response.errors?.length) { - for (let error of response.errors) { - console.error(`${error.code} : ${error.msg}`); - } - data.importMsg = { - class: 'error', - html: this.importHTMLMsgError(response), - }; - return; - } - - let txtImport = this.importHTMLMsgSuccess(response); - - data.importMsg = { - class: 'success', - html: txtImport, - }; - - setTimeout(() => this._mLayout.reComputeLayout(), 100); - // this._commonService.regularToaster('success', txtImport); - } - }, - (error: HttpErrorResponse) => { - this._commonService.regularToaster('error', `Import : ${error.error.msg}`); - } - ); - } - importHTMLMsgSuccess(impt) { let txtImport = `
Import réussi
`; let res = impt.res; From 5f695be2678f5035fa10edf6f92b7a015b4687cc Mon Sep 17 00:00:00 2001 From: "joel.clement" Date: Thu, 16 Mar 2023 10:57:08 +0100 Subject: [PATCH 026/142] fix jsonb update with mutable --- backend/gn_modulator/imports/mixins/data.py | 1 + backend/gn_modulator/imports/mixins/mapping.py | 1 + backend/gn_modulator/imports/mixins/process.py | 1 + backend/gn_modulator/imports/mixins/raw.py | 1 + backend/gn_modulator/imports/mixins/utils.py | 1 + backend/gn_modulator/imports/models.py | 14 +++++++------- 6 files changed, 12 insertions(+), 7 deletions(-) diff --git a/backend/gn_modulator/imports/mixins/data.py b/backend/gn_modulator/imports/mixins/data.py index f999bb77..1a3147ce 100644 --- a/backend/gn_modulator/imports/mixins/data.py +++ b/backend/gn_modulator/imports/mixins/data.py @@ -11,6 +11,7 @@ def process_data_table(self): return self.tables["data"] = self.table_name("data") + self.tables = self.tables if Path(self.data_file_path).suffix == ".csv": self.data_type = "csv" diff --git a/backend/gn_modulator/imports/mixins/mapping.py b/backend/gn_modulator/imports/mixins/mapping.py index 81bd36af..e47d90b8 100644 --- a/backend/gn_modulator/imports/mixins/mapping.py +++ b/backend/gn_modulator/imports/mixins/mapping.py @@ -12,6 +12,7 @@ def process_mapping_view(self): return self.tables["mapping"] = self.table_name("mapping") + self.tables = self.tables if not Path(self.mapping_file_path).exists(): self.add_error( diff --git a/backend/gn_modulator/imports/mixins/process.py b/backend/gn_modulator/imports/mixins/process.py index 8e3f7bf6..c2af9571 100644 --- a/backend/gn_modulator/imports/mixins/process.py +++ b/backend/gn_modulator/imports/mixins/process.py @@ -6,6 +6,7 @@ class ImportMixinProcess(ImportMixinUtils): def process_view(self, keys=None): from_table = self.tables["raw"] dest_table = self.tables["process"] = self.table_name("process") + self.tables = self.tables self.sql["process_view"] = self.sql_process_view(from_table, dest_table, keys) diff --git a/backend/gn_modulator/imports/mixins/raw.py b/backend/gn_modulator/imports/mixins/raw.py index a579d17c..c233566b 100644 --- a/backend/gn_modulator/imports/mixins/raw.py +++ b/backend/gn_modulator/imports/mixins/raw.py @@ -11,6 +11,7 @@ def process_raw_view(self): from_table = self.tables.get("mapping") or self.tables["data"] dest_table = self.tables["raw"] = self.table_name("raw") + self.tables = self.tables self.sql["raw_view"] = self.sql_raw_view(from_table, dest_table) try: SchemaMethods.c_sql_exec_txt(self.sql["raw_view"]) diff --git a/backend/gn_modulator/imports/mixins/utils.py b/backend/gn_modulator/imports/mixins/utils.py index 1a4458b8..14ac816f 100644 --- a/backend/gn_modulator/imports/mixins/utils.py +++ b/backend/gn_modulator/imports/mixins/utils.py @@ -1,3 +1,4 @@ +import json from pathlib import Path from gn_modulator.schema import SchemaMethods diff --git a/backend/gn_modulator/imports/models.py b/backend/gn_modulator/imports/models.py index 67f130af..d0b1a310 100644 --- a/backend/gn_modulator/imports/models.py +++ b/backend/gn_modulator/imports/models.py @@ -3,7 +3,7 @@ from sqlalchemy.dialects.postgresql import JSONB from geonature.utils.env import db from .mixins import ImportMixin -from gn_modulator import ModuleMethods +from sqlalchemy.ext.mutable import MutableDict, MutableList class TImport(db.Model, ImportMixin): @@ -32,7 +32,7 @@ def __init__( self.res = {} self.errors = [] self.sql = {} - self.tables = {"prout": "oug"} + self.tables = {} print("init import ", self.id_import) _columns = {} @@ -52,12 +52,12 @@ def __init__( csv_delimiter = db.Column(db.Unicode) data_type = db.Column(db.Unicode) - res = db.Column(JSONB) - tables = db.Column(JSONB) - sql = db.Column(JSONB) - errors = db.Column(JSONB) + res = db.Column(MutableDict.as_mutable(JSONB)) + tables = db.Column(MutableDict.as_mutable(JSONB)) + sql = db.Column(MutableDict.as_mutable(JSONB)) + errors = db.Column(MutableList.as_mutable(JSONB)) - options = db.Column(JSONB) + options = db.Column(MutableDict.as_mutable(JSONB)) def as_dict(self): return { From 88552821fb5d9d3d8ec29de3ea7133f8b32fd313 Mon Sep 17 00:00:00 2001 From: "joel.clement" Date: Thu, 16 Mar 2023 11:05:55 +0100 Subject: [PATCH 027/142] fix command import --- backend/gn_modulator/commands.py | 3 ++- backend/gn_modulator/imports/mixins/__init__.py | 2 -- backend/gn_modulator/imports/models.py | 1 - 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/backend/gn_modulator/commands.py b/backend/gn_modulator/commands.py index 333b941a..b6d4d60d 100644 --- a/backend/gn_modulator/commands.py +++ b/backend/gn_modulator/commands.py @@ -123,7 +123,8 @@ def cmd_doc_schema(schema_code, force=False): @click.command("import") -@click.option("-s", "schema_code") +@click.option("-o", "object_code") +@click.option("-m", "module_code") @click.option("-d", "data_path", type=click.Path(exists=True)) @click.option( "-m", diff --git a/backend/gn_modulator/imports/mixins/__init__.py b/backend/gn_modulator/imports/mixins/__init__.py index a40b936c..de9e3eab 100644 --- a/backend/gn_modulator/imports/mixins/__init__.py +++ b/backend/gn_modulator/imports/mixins/__init__.py @@ -40,8 +40,6 @@ def process_import_schema(self): self.status = "READY" return self - print(self.as_dict()) - self.process_insert_and_update() def process_load_data_and_check(self): diff --git a/backend/gn_modulator/imports/models.py b/backend/gn_modulator/imports/models.py index d0b1a310..8f85a193 100644 --- a/backend/gn_modulator/imports/models.py +++ b/backend/gn_modulator/imports/models.py @@ -33,7 +33,6 @@ def __init__( self.errors = [] self.sql = {} self.tables = {} - print("init import ", self.id_import) _columns = {} From 322f685be19c00ebb4007a3ad56eb502f3826ba9 Mon Sep 17 00:00:00 2001 From: "joel.clement" Date: Thu, 16 Mar 2023 11:18:49 +0100 Subject: [PATCH 028/142] cmd import print available import_code --- backend/gn_modulator/commands.py | 10 +++++++++- backend/gn_modulator/imports/mixins/__init__.py | 8 ++++++-- 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/backend/gn_modulator/commands.py b/backend/gn_modulator/commands.py index b6d4d60d..d98aebe8 100644 --- a/backend/gn_modulator/commands.py +++ b/backend/gn_modulator/commands.py @@ -165,7 +165,15 @@ def cmd_import_bulk_data( print(impt.pretty_infos()) if import_code: - TImport.process_import_code(import_code, data_path) + res = TImport.process_import_code(import_code, data_path) + if res is None: + print(f"L'import de code {import_code} n'existe pas\n") + import_codes = sorted(DefinitionMethods.definition_codes_for_type("import")) + print(f"Veuillez choisir parmi codes suivants\n") + for import_code in import_codes: + print( + f"- {import_code:>15} : {DefinitionMethods.get_definition('import', import_code)['title']}" + ) return True diff --git a/backend/gn_modulator/imports/mixins/__init__.py b/backend/gn_modulator/imports/mixins/__init__.py index de9e3eab..fce9b3d8 100644 --- a/backend/gn_modulator/imports/mixins/__init__.py +++ b/backend/gn_modulator/imports/mixins/__init__.py @@ -75,10 +75,14 @@ def process_insert_and_update(self): @classmethod def process_import_code(cls, import_code, data_dir_path, insert_data=True, commit=True): - print(f"\nProcess scenario d'import {import_code}") - # get import definition import_definitions = DefinitionMethods.get_definition("import", import_code) + + if not import_definitions: + return None + + print(f"\nProcess scenario d'import {import_code}") + import_definitions_file_path = DefinitionMethods.get_file_path("import", import_code) # for all definition items From f30910af8aff02583fa72b15ab037afa2446eaa3 Mon Sep 17 00:00:00 2001 From: "joel.clement" Date: Thu, 16 Mar 2023 12:02:05 +0100 Subject: [PATCH 029/142] fix gn_modulator.check_value_for_type --- .../gn_modulator/imports/mixins/__init__.py | 7 +++--- backend/gn_modulator/imports/mixins/check.py | 2 +- .../gn_modulator/imports/mixins/mapping.py | 1 + .../3920371728d8_gn_modulator_import_init.py | 24 +++++++++++++++---- 4 files changed, 25 insertions(+), 9 deletions(-) diff --git a/backend/gn_modulator/imports/mixins/__init__.py b/backend/gn_modulator/imports/mixins/__init__.py index fce9b3d8..94cb2a28 100644 --- a/backend/gn_modulator/imports/mixins/__init__.py +++ b/backend/gn_modulator/imports/mixins/__init__.py @@ -120,14 +120,15 @@ def process_import_code(cls, import_code, data_dir_path, insert_data=True, commi impt.process_import_schema() imports.append(impt) + if commit: + db.session.commit() + if impt.errors: - print(f"Il y a des erreurs dans l'import {import_definition['schema_code']}") + print(f"Il y a des erreurs dans l'import {import_definition['object_code']}") for error in impt.errors: print(f"- {error['code']} : {error['msg']}") return imports print(impt.pretty_infos()) - if commit: - db.session.commit() print(f"Import {import_code} terminé") return imports diff --git a/backend/gn_modulator/imports/mixins/check.py b/backend/gn_modulator/imports/mixins/check.py index 7900c2ae..ab773544 100644 --- a/backend/gn_modulator/imports/mixins/check.py +++ b/backend/gn_modulator/imports/mixins/check.py @@ -52,7 +52,7 @@ def check_types(self): WHERE NOT ( {key} is NULL OR - gn_modulator.check_value_for_type('{sql_type}', {key}) + gn_modulator.check_value_for_type('{sql_type}', {key}::VARCHAR) ) GROUP BY id_import ORDER BY id_import diff --git a/backend/gn_modulator/imports/mixins/mapping.py b/backend/gn_modulator/imports/mixins/mapping.py index e47d90b8..ca427d0e 100644 --- a/backend/gn_modulator/imports/mixins/mapping.py +++ b/backend/gn_modulator/imports/mixins/mapping.py @@ -55,6 +55,7 @@ def sql_mapping(self): "CREATE ", "GRANT ", "COPY ", + "PERFORM ", ]: if forbidden_word in mapping_select: forbidden_words.append(forbidden_word.strip()) diff --git a/backend/gn_modulator/migrations/versions/3920371728d8_gn_modulator_import_init.py b/backend/gn_modulator/migrations/versions/3920371728d8_gn_modulator_import_init.py index 105eeb8a..897c78e2 100644 --- a/backend/gn_modulator/migrations/versions/3920371728d8_gn_modulator_import_init.py +++ b/backend/gn_modulator/migrations/versions/3920371728d8_gn_modulator_import_init.py @@ -54,18 +54,28 @@ def upgrade(): FOR EACH ROW EXECUTE PROCEDURE public.fct_trg_meta_dates_change(); -CREATE OR REPLACE FUNCTION gn_modulator.check_value_for_type(type_in VARCHAR, value_in ANYELEMENT) + +DROP FUNCTION IF EXISTS gn_modulator.check_value_for_type(VARCHAR, varchar); +DROP FUNCTION IF EXISTS gn_modulator.check_value_for_type(VARCHAR, anyelement); +CREATE OR REPLACE FUNCTION gn_modulator.check_value_for_type(type_in VARCHAR, value_in varchar) RETURNS BOOLEAN AS $$ BEGIN - EXECUTE FORMAT('SELECT (''%s'')::%s', value_in, type_in); - RETURN TRUE; - EXCEPTION WHEN OTHERS THEN + IF type_in = 'VARCHAR' THEN PERFORM value_in::VARCHAR; RETURN TRUE; END IF; + IF type_in = 'INTEGER' THEN PERFORM value_in::INTEGER; RETURN TRUE; END IF; + IF type_in = 'BOOLEAN' THEN PERFORM value_in::BOOLEAN; RETURN TRUE; END IF; + IF type_in = 'FLOAT' THEN PERFORM value_in::FLOAT; RETURN TRUE; END IF; + IF type_in = 'DATE' THEN PERFORM value_in::DATE; RETURN TRUE; END IF; + IF type_in = 'TIMESTAMP' THEN PERFORM value_in::TIMESTAMP; RETURN TRUE; END IF; + IF type_in = 'UUID' THEN PERFORM value_in::UUID; RETURN TRUE; END IF; + IF type_in = 'GEOMETRY' THEN PERFORM value_in::GEOMETRY; RETURN TRUE; END IF; + IF type_in = 'JSONB' THEN PERFORM value_in::JSONB; RETURN TRUE; END IF; RETURN FALSE; + EXCEPTION WHEN OTHERS THEN + RETURN FALSE; END; $$ LANGUAGE 'plpgsql' COST 100 -; """ ) @@ -76,6 +86,10 @@ def downgrade(): op.execute( """ DROP TABLE gn_modulator.t_imports; + + DROP FUNCTION IF EXISTS gn_modulator.check_value_for_type(VARCHAR, varchar); + DROP FUNCTION IF EXISTS gn_modulator.check_value_for_type(VARCHAR, anyelement); + """ ) pass From ea77cc74156f2b9cfdaa2f989eff4ad5f528680b Mon Sep 17 00:00:00 2001 From: "joel.clement" Date: Thu, 16 Mar 2023 12:31:22 +0100 Subject: [PATCH 030/142] fix form default with data_keys --- frontend/app/services/form.service.ts | 2 +- frontend/app/utils/commons.ts | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/frontend/app/services/form.service.ts b/frontend/app/services/form.service.ts index b15ea434..b9adbe63 100644 --- a/frontend/app/services/form.service.ts +++ b/frontend/app/services/form.service.ts @@ -242,7 +242,7 @@ export class ModulesFormService { if (computedLayout.default && [null, undefined].includes(control.value)) { control.setValue(computedLayout.default); if (data) { - data[computedLayout.key] = computedLayout.default; + utils.setAttr(data, [...context.data_keys, computedLayout.key], computedLayout.default); } } diff --git a/frontend/app/utils/commons.ts b/frontend/app/utils/commons.ts index ab5634c5..21dd18bb 100644 --- a/frontend/app/utils/commons.ts +++ b/frontend/app/utils/commons.ts @@ -142,7 +142,9 @@ const filterAttr = (obj, paths, value) => { const setAttr = (obj, paths, value) => { var inter = obj; - const v_path = Object.entries(paths.split('.')) as any; + const v_path = Array.isArray(paths) + ? Object.entries(paths) + : (Object.entries(paths.split('.')) as any); for (const [index, path] of v_path) { if (index < v_path.length - 1) { inter[path] = inter[path] || {}; From dc43ca1ef96cc3960fbadeb556119830a0639b00 Mon Sep 17 00:00:00 2001 From: "joel.clement" Date: Thu, 16 Mar 2023 17:07:56 +0100 Subject: [PATCH 031/142] import frontend --- config/layouts/utils/utils.import.layout.yml | 35 ++++---- .../utils/utils.import.layout.yml_save | 57 +++++++++++++ frontend/app/components/layout/base/index.ts | 25 ++++++ .../layout/base/layout-import.component.html | 6 -- .../layout/base/layout-import.component.scss | 0 .../layout/form/form-element.component.html | 17 +++- frontend/app/components/layout/form/index.ts | 5 ++ .../app/components/layout/import/index.ts | 3 + .../import/layout-import.component.html | 69 ++++++++++++++++ .../import/layout-import.component.scss | 10 +++ .../layout-import.component.ts | 79 +++++++++++-------- frontend/app/components/layout/index.ts | 46 ++--------- .../app/components/layout/object/index.ts | 11 +++ frontend/app/services/import.service.ts | 37 +++++++++ 14 files changed, 300 insertions(+), 100 deletions(-) create mode 100644 config/layouts/utils/utils.import.layout.yml_save create mode 100644 frontend/app/components/layout/base/index.ts delete mode 100644 frontend/app/components/layout/base/layout-import.component.html delete mode 100644 frontend/app/components/layout/base/layout-import.component.scss create mode 100644 frontend/app/components/layout/form/index.ts create mode 100644 frontend/app/components/layout/import/index.ts create mode 100644 frontend/app/components/layout/import/layout-import.component.html create mode 100644 frontend/app/components/layout/import/layout-import.component.scss rename frontend/app/components/layout/{base => import}/layout-import.component.ts (58%) create mode 100644 frontend/app/components/layout/object/index.ts diff --git a/config/layouts/utils/utils.import.layout.yml b/config/layouts/utils/utils.import.layout.yml index a251dd29..8543508d 100644 --- a/config/layouts/utils/utils.import.layout.yml +++ b/config/layouts/utils/utils.import.layout.yml @@ -3,24 +3,11 @@ code: utils.import title: layout du composant d'import description: layout du composant d'import layout: - title: __f__`Importer ${o.des_labels(x, 'C')}` + flex: '0' type: form items: - - items: - - type: message - html: __f__data.importMsg?.html - class: __f__data.importMsg?.class - hidden: __f__!data.importMsg - - type: message - json: __f__data - - hidden: true - items: - - key: importMsg - type: string - - title: '__f__`Statut: ${data.status}`' - - key: status - type: string - + - flex: '0' + items: - title: import display: fieldset items: @@ -29,6 +16,7 @@ layout: title: Fichier d'import required: __f__!data.tables?.data description: Choisir un fichier à importer + disabled: __f__data.id_import - title: Options additionnelles display: fieldset type: dict @@ -47,16 +35,23 @@ layout: default: __f__true - direction: row + flex: '0' items: - type: button color: success - title: | - __f__data.status == 'READY' - ? 'Importer les données' - : 'Charger et valider les données' + title: Valider description: Valider action: import disabled: __f__!(formGroup.valid ) + hidden: __f__data.status == 'DONE' + - type: button + color: info + icon: refresh + title: nouvel import + description: Faire un nouvel import + action: reset + hidden: __f__!data.status + - type: button color: primary title: Annuler diff --git a/config/layouts/utils/utils.import.layout.yml_save b/config/layouts/utils/utils.import.layout.yml_save new file mode 100644 index 00000000..f213600d --- /dev/null +++ b/config/layouts/utils/utils.import.layout.yml_save @@ -0,0 +1,57 @@ +type: layout +code: utils.import +title: layout du composant d'import +description: layout du composant d'import +layout: + title: __f__`Importer ${o.des_labels(x, 'C')}` + type: form + items: + - items: + - type: message + html: __f__data.importMsg?.html + class: __f__data.importMsg?.class + hidden: __f__!data.importMsg + - hidden: true + items: + - key: importMsg + type: string + + - title: import + display: fieldset + items: + - key: data_file + type: file + title: Fichier d'import + required: __f__!data.tables?.data + description: Choisir un fichier à importer + disabled: __f__data.id_import + - title: Options additionnelles + display: fieldset + type: dict + items: + - key: options.enable_update + title: "Autoriser les mises à jour" + type: boolean + default: __f__false + - key: options.check_only + title: Verifier + description: | + L'import se fait en deux temps. + Une premiere étape de validation des données. + Et une deuxième étape d'insertion et de mise à jour des données. + type: boolean + default: __f__true + + - direction: row + items: + - type: button + color: success + title: Valider + description: Valider + action: import + disabled: __f__!(formGroup.valid ) + - type: button + color: primary + title: Annuler + description: Annuler + action: close diff --git a/frontend/app/components/layout/base/index.ts b/frontend/app/components/layout/base/index.ts new file mode 100644 index 00000000..3975cc54 --- /dev/null +++ b/frontend/app/components/layout/base/index.ts @@ -0,0 +1,25 @@ +import { ModulesLayoutComponent } from './layout.component'; +import { ModulesLayoutDebugComponent } from './layout-debug.component'; +import { ModulesLayoutModalComponent } from './layout-modal.component'; +import { ModulesLayoutSectionComponent } from './layout-section.component'; +import { ModulesLayoutCardComponent } from './layout-card.component'; +import { ModulesLayoutElementComponent } from './layout-element.component'; +import { ModulesLayoutMapComponent } from './layout-map.component'; +import { ModulesLayoutArrayComponent } from './layout-array.component'; +import { ModulesLayoutBreadcrumbsComponent } from './layout-breadcrumbs.component'; +import { ModulesLayoutItemsComponent } from './layout-items.component'; +import { ModulesLayoutMediasComponent } from './layout-medias.component'; + +export default [ + ModulesLayoutMediasComponent, + ModulesLayoutMapComponent, + ModulesLayoutDebugComponent, + ModulesLayoutBreadcrumbsComponent, + ModulesLayoutComponent, + ModulesLayoutModalComponent, + ModulesLayoutSectionComponent, + ModulesLayoutCardComponent, + ModulesLayoutElementComponent, + ModulesLayoutArrayComponent, + ModulesLayoutItemsComponent, +]; diff --git a/frontend/app/components/layout/base/layout-import.component.html b/frontend/app/components/layout/base/layout-import.component.html deleted file mode 100644 index a663b841..00000000 --- a/frontend/app/components/layout/base/layout-import.component.html +++ /dev/null @@ -1,6 +0,0 @@ - diff --git a/frontend/app/components/layout/base/layout-import.component.scss b/frontend/app/components/layout/base/layout-import.component.scss deleted file mode 100644 index e69de29b..00000000 diff --git a/frontend/app/components/layout/form/form-element.component.html b/frontend/app/components/layout/form/form-element.component.html index afc87916..64a332c4 100644 --- a/frontend/app/components/layout/form/form-element.component.html +++ b/frontend/app/components/layout/form/form-element.component.html @@ -1,7 +1,7 @@ - @@ -18,9 +18,10 @@ [attr.id]="_id + '_inputfile'" type="file" hidden + [disabled]="computedLayout.disabled" (change)="fileChange($event.target.files)" /> - {{ formControl.value?.name}} + {{ formControl.value?.name }} + {{ computedLayout.title || elementKey }} + + help + + diff --git a/frontend/app/components/layout/form/index.ts b/frontend/app/components/layout/form/index.ts new file mode 100644 index 00000000..7afba9c9 --- /dev/null +++ b/frontend/app/components/layout/form/index.ts @@ -0,0 +1,5 @@ +import { ModulesGenericFormComponent } from './generic-form.component'; +import { ModulesFormElementComponent } from './form-element.component'; +import { ModulesListFormComponent } from './list-form.component'; + +export default [ModulesListFormComponent, ModulesGenericFormComponent, ModulesFormElementComponent]; diff --git a/frontend/app/components/layout/import/index.ts b/frontend/app/components/layout/import/index.ts new file mode 100644 index 00000000..be142bdf --- /dev/null +++ b/frontend/app/components/layout/import/index.ts @@ -0,0 +1,3 @@ +import { ModulesLayoutImportComponent } from './layout-import.component'; + +export default [ModulesLayoutImportComponent]; diff --git a/frontend/app/components/layout/import/layout-import.component.html b/frontend/app/components/layout/import/layout-import.component.html new file mode 100644 index 00000000..465b02b5 --- /dev/null +++ b/frontend/app/components/layout/import/layout-import.component.html @@ -0,0 +1,69 @@ +

Importer des données

+ + + + + + + + + +
+ +

Veuillez choisir un fichier et appuyer sur Valider

+ + + +
Chargement du fichier et verification des données terminé
+

- Nombre de lignes {{ importData.res.nb_raw }}

+

- Nombre d'insertion {{ importData.res.nb_insert }}

+

+ - Nombre de mise à jour {{ importData.res.nb_update }} + {{ + importData.options.enable_update + ? '' + : '(MAJ Non + autorisée)' + }} +

+

Veuillez appuyer sur valider pour insérer les données`,

+ + + +
Import terminé
+

- Nombre de lignes {{ importData.res.nb_raw }}

+

- Nombre d'insertion {{ importData.res.nb_insert }}

+

+ - Nombre de mise à jour {{ importData.res.nb_update }} + {{ + importData.options.enable_update + ? '' + : '(MAJ Non + autorisée)' + }} +

+
+ + + diff --git a/frontend/app/components/layout/import/layout-import.component.scss b/frontend/app/components/layout/import/layout-import.component.scss new file mode 100644 index 00000000..67e68326 --- /dev/null +++ b/frontend/app/components/layout/import/layout-import.component.scss @@ -0,0 +1,10 @@ +.import-msg { + height: 200px; + overflow-y: scroll; +} +:host ::ng-deep .mat-step-header[aria-selected="true"] { + background-color: #c8adf0; + border-radius: 20px; + margin: 10px; + +} \ No newline at end of file diff --git a/frontend/app/components/layout/base/layout-import.component.ts b/frontend/app/components/layout/import/layout-import.component.ts similarity index 58% rename from frontend/app/components/layout/base/layout-import.component.ts rename to frontend/app/components/layout/import/layout-import.component.ts index 1ad01bc6..37461e05 100644 --- a/frontend/app/components/layout/base/layout-import.component.ts +++ b/frontend/app/components/layout/import/layout-import.component.ts @@ -1,23 +1,31 @@ -import { Component, OnInit, Injector, ViewEncapsulation } from '@angular/core'; -import { ModulesLayoutComponent } from './layout.component'; +import { Component, OnInit, Injector, ViewEncapsulation, ViewChild } from '@angular/core'; +import { ModulesLayoutComponent } from '../base/layout.component'; import { ModulesImportService } from '../../../services/import.service'; import { HttpEventType, HttpResponse, HttpErrorResponse } from '@angular/common/http'; +import { MatStepper } from '@angular/material/stepper'; import utils from '../../../utils'; @Component({ selector: 'modules-layout-import', templateUrl: 'layout-import.component.html', styleUrls: ['layout-import.component.scss', '../../base/base.scss'], - encapsulation: ViewEncapsulation.None, }) export class ModulesLayoutImportComponent extends ModulesLayoutComponent implements OnInit { - importData: {}; + importData: any = {}; importLayout: any; // layout pour l'import importContext: any; _mImport: ModulesImportService; + step = 0; + uploadPercentDone; + editableStep = false; + + importMsg: any = {}; + + @ViewChild('stepper') stepper: MatStepper; + constructor(_injector: Injector) { super(_injector); this._name = 'layout-import'; @@ -26,6 +34,10 @@ export class ModulesLayoutImportComponent extends ModulesLayoutComponent impleme } postComputeLayout() { + this.initImport(); + } + + initImport() { this.importContext = { module_code: this.context.module_code, object_code: this.context.object_code, @@ -33,14 +45,34 @@ export class ModulesLayoutImportComponent extends ModulesLayoutComponent impleme this.importLayout = { code: 'utils.import', }; + this.importMsg = this._mImport.processMessage(this.importData); + this.importData = {}; + this.setStep(); + } + + setStep() { + // this.editableStep = true; + this.step = this.importData.status == 'READY' ? 1 : this.importData.status == 'DONE' ? 2 : 0; + + if (this.stepper) { + this.editableStep = true; + setTimeout(() => { + const diff = this.step - this.stepper.selectedIndex; + for (let i = 0; i < Math.abs(diff); i++) { + if (diff > 0) { + this.stepper.next(); + } + if (diff < 0) { + this.stepper.previous(); + } + } + this.editableStep = false; + }); + } + this._mImport.processMessage(this.importData); } processImport(context, data) { - data.importMsg = { - html: 'Traitement en cours', - class: null, - }; - this._mLayout.reComputeLayout(); this._mImport .importRequest(context.module_code, context.object_code, data) .pipe() @@ -52,30 +84,7 @@ export class ModulesLayoutImportComponent extends ModulesLayoutComponent impleme this._mLayout.stopActionProcessing(''); const response = importEvent.body as any; this.importData = response; - // if (response.errors?.length) { - // for (let error of response.errors) { - // console.error(`${error.code} : ${error.msg}`); - // } - // data.importMsg = { - // class: 'error', - // html: this._mImport.importHTMLMsgError(response), - // }; - // for (const key of response) { - // console.log(key) - // data[key] = response[key] - // } - // return; - // } - - // let txtImport = this._mImport.importHTMLMsgSuccess(response); - - // data.importMsg = { - // class: 'success', - // html: txtImport, - // }; - - // setTimeout(() => this._mLayout.reComputeLayout(), 100); - // this._commonService.regularToaster('success', txtImport); + this.setStep(); } }); } @@ -85,5 +94,9 @@ export class ModulesLayoutImportComponent extends ModulesLayoutComponent impleme if (action == 'import') { return this.processImport(context, data); } + if (action == 'reset') { + this.initImport(); + this._mLayout.stopActionProcessing(''); + } } } diff --git a/frontend/app/components/layout/index.ts b/frontend/app/components/layout/index.ts index 9a736c20..a0667e85 100644 --- a/frontend/app/components/layout/index.ts +++ b/frontend/app/components/layout/index.ts @@ -1,41 +1,11 @@ -import { ModulesLayoutComponent } from './base/layout.component'; -import { ModulesLayoutDebugComponent } from './base/layout-debug.component'; -import { ModulesLayoutModalComponent } from './base/layout-modal.component'; -import { ModulesLayoutSectionComponent } from './base/layout-section.component'; -import { ModulesLayoutCardComponent } from './base/layout-card.component'; -import { ModulesLayoutElementComponent } from './base/layout-element.component'; -import { ModulesLayoutMapComponent } from './base/layout-map.component'; -import { ModulesLayoutArrayComponent } from './base/layout-array.component'; -import { ModulesLayoutBreadcrumbsComponent } from './base/layout-breadcrumbs.component'; -import { ModulesLayoutItemsComponent } from './base/layout-items.component'; -import { ModulesLayoutMediasComponent } from './base/layout-medias.component'; -import { ModulesLayoutObjectComponent } from './object/layout-object.component'; -import { ModulesLayoutObjectTableComponent } from './object/layout-object-table.component'; -import { ModulesLayoutObjectGeoJSONComponent } from './object/layout-object-geojson.component'; -import { ModulesLayoutObjectFiltersComponent } from './object/layout-object-filters.component'; -import { ModulesLayoutImportComponent } from './base/layout-import.component'; -import { ModulesGenericFormComponent } from './form/generic-form.component'; -import { ModulesFormElementComponent } from './form/form-element.component'; -import { ModulesListFormComponent } from './form/list-form.component'; +import ModuleLayoutsBase from './base'; +import ModuleLayoutsObject from './object'; +import ModuleLayoutsImport from './import'; +import ModuleLayoutsForm from './form'; export default [ - ModulesLayoutDebugComponent, - ModulesLayoutBreadcrumbsComponent, - ModulesLayoutComponent, - ModulesLayoutModalComponent, - ModulesLayoutSectionComponent, - ModulesLayoutCardComponent, - ModulesLayoutElementComponent, - ModulesLayoutArrayComponent, - ModulesLayoutItemsComponent, - ModulesLayoutImportComponent, - ModulesLayoutMediasComponent, - ModulesLayoutMapComponent, - ModulesLayoutObjectComponent, - ModulesLayoutObjectGeoJSONComponent, - ModulesLayoutObjectTableComponent, - ModulesLayoutObjectFiltersComponent, - ModulesListFormComponent, - ModulesGenericFormComponent, - ModulesFormElementComponent, + ...ModuleLayoutsBase, + ...ModuleLayoutsObject, + ...ModuleLayoutsImport, + ...ModuleLayoutsForm, ]; diff --git a/frontend/app/components/layout/object/index.ts b/frontend/app/components/layout/object/index.ts new file mode 100644 index 00000000..fd43d039 --- /dev/null +++ b/frontend/app/components/layout/object/index.ts @@ -0,0 +1,11 @@ +import { ModulesLayoutObjectComponent } from './layout-object.component'; +import { ModulesLayoutObjectTableComponent } from './layout-object-table.component'; +import { ModulesLayoutObjectGeoJSONComponent } from './layout-object-geojson.component'; +import { ModulesLayoutObjectFiltersComponent } from './layout-object-filters.component'; + +export default [ + ModulesLayoutObjectComponent, + ModulesLayoutObjectGeoJSONComponent, + ModulesLayoutObjectTableComponent, + ModulesLayoutObjectFiltersComponent, +]; diff --git a/frontend/app/services/import.service.ts b/frontend/app/services/import.service.ts index bdbe98f8..cd937e20 100644 --- a/frontend/app/services/import.service.ts +++ b/frontend/app/services/import.service.ts @@ -24,6 +24,43 @@ export class ModulesImportService { ); } + processMessage(data) { + if (!data.id_import) { + return { + html: ` +
Etape 1/3
+
Chargement et validation des données
+ Veuillez choisir un fichier et appuyer sur Valider`, + class: 'info', + }; + } + + if (data.status == 'READY') { + return { + html: ` +
Etape 1/3
+
Insertion des données
+

- Nombre de lignes ${data.res.nb_raw}

+

- Nombre d'insertion ${data.res.nb_insert}

+

- Nombre de mise à jour ${data.res.nb_update} ${ + data.options.enable_update ? '' : '(MAJ Non autorisée)' + }

+ Veuillez appuyer sur valider pour insérer les données`, + class: 'info', + }; + } + + if (data.status == 'DONE') { + return { + html: ` +
Etape 3/3
+
Import Terminé
+ `, + class: 'info', + }; + } + } + importHTMLMsgSuccess(impt) { let txtImport = `
Import réussi
`; let res = impt.res; From 321cc2e8809802b6f1ecbbd4746b54c0f45ea56b Mon Sep 17 00:00:00 2001 From: "joel.clement" Date: Fri, 17 Mar 2023 15:57:04 +0100 Subject: [PATCH 032/142] up frontend import --- backend/gn_modulator/imports/mixins/check.py | 6 +- .../tests/import_test/tests/pf_test_ok.csv | 2 +- config/layouts/utils/utils.import.layout.yml | 79 ++++++--- .../layouts/m_sipaf.site_list.layout.yml | 37 +---- frontend/app/components/base/base.scss | 2 +- .../layout/base/layout-map.component.ts | 3 - .../layout/base/layout-modal.component.html | 11 +- .../layout/base/layout-modal.component.scss | 7 +- .../layout/base/layout-modal.component.ts | 3 - .../layout/form/form-element.component.html | 1 - .../layout/form/generic-form.component.ts | 5 +- .../import/layout-import.component.html | 15 +- .../import/layout-import.component.scss | 4 + .../layout/import/layout-import.component.ts | 16 +- .../object/layout-object-table.component.ts | 2 - .../layout/object/layout-object.component.ts | 10 ++ frontend/app/services/import.service.ts | 156 +++++++++++------- frontend/app/services/object.service.ts | 8 + 18 files changed, 217 insertions(+), 150 deletions(-) diff --git a/backend/gn_modulator/imports/mixins/check.py b/backend/gn_modulator/imports/mixins/check.py index ab773544..35da710e 100644 --- a/backend/gn_modulator/imports/mixins/check.py +++ b/backend/gn_modulator/imports/mixins/check.py @@ -97,14 +97,14 @@ def check_required(self): res = SchemaMethods.c_sql_exec_txt(txt_check_required).fetchone() nb_lines = res[0] lines = res[1] - str_lines = lines and ", ".join(map(lambda x: str(x), lines)) or "" + # str_lines = lines and ", ".join(map(lambda x: str(x), lines)) or "" if nb_lines == 0: continue self.add_error( code="ERR_IMPORT_REQUIRED", key=key, lines=lines, - msg=f"La colonne {key} est obligatoire. {nb_lines} ligne(s) concernée(s) : [{str_lines}]", + msg="Champs obligatoire à null", ) return @@ -149,6 +149,6 @@ def check_resolve_keys(self): code="ERR_IMPORT_UNRESOLVED", key=key, lines=lines, - msg=f"La colonne {key} est non nulle et n'a pas de correspondance. {nb_lines} ligne(s) concernée(s) : [{str_lines}]", + msg=f"Clé étrangère non résolue", values=values, ) diff --git a/backend/gn_modulator/tests/import_test/tests/pf_test_ok.csv b/backend/gn_modulator/tests/import_test/tests/pf_test_ok.csv index 816973e6..8ce42dfb 100644 --- a/backend/gn_modulator/tests/import_test/tests/pf_test_ok.csv +++ b/backend/gn_modulator/tests/import_test/tests/pf_test_ok.csv @@ -1,4 +1,4 @@ code_passage_faune, geom, id_nomenclature_ouvrage_hydrau_position _TEST01, POINT (43.676265 4.028108),RD _TEST02, POINT (43.676262 4.028108), -_TEST023, POINT (43.676262 4.028108),RG \ No newline at end of file +_TEST02345, POINT (43.676262 4.028108),RG \ No newline at end of file diff --git a/config/layouts/utils/utils.import.layout.yml b/config/layouts/utils/utils.import.layout.yml index 8543508d..9b6a1706 100644 --- a/config/layouts/utils/utils.import.layout.yml +++ b/config/layouts/utils/utils.import.layout.yml @@ -3,39 +3,68 @@ code: utils.import title: layout du composant d'import description: layout du composant d'import layout: - flex: '0' type: form + form_group_id: form_import items: - - flex: '0' + - display: tabs items: - - title: import - display: fieldset + - label: Import items: - - key: data_file - type: file + - hidden: true + items: + - key: id_import + - key: importMsg + - key: errorMsgType + - key: errorMsgLine + - key: errors + - key: status + - type: message + html: __f__data.importMsg.html + class: __f__data.importMsg.class + - display: fieldset title: Fichier d'import - required: __f__!data.tables?.data - description: Choisir un fichier à importer - disabled: __f__data.id_import - - title: Options additionnelles - display: fieldset - type: dict + items: + - key: data_file + type: file + title: '__f__data.data_file ? data.data_file.name : "Choisir un fichier"' + required: __f__!data.tables?.data + description: Choisir un fichier à importer + disabled: __f__data.id_import + - display: fieldset + title: Options + items: + - key: options.enable_update + title: "Autoriser les mises à jour" + type: boolean + default: __f__false + - key: options.check_only + title: Verifier + description: | + L'import se fait en deux temps. + Une premiere étape de validation des données. + Et une deuxième étape d'insertion et de mise à jour des données. + type: boolean + default: __f__true + - label: __f__`Erreurs (${data.errors?.length})` + hidden: __f__!data.errors?.length items: - - key: options.enable_update - title: "Autoriser les mises à jour" + - key: error_display_line + title: Afficher les erreurs en ligne type: boolean - default: __f__false - - key: options.check_only - title: Verifier - description: | - L'import se fait en deux temps. - Une premiere étape de validation des données. - Et une deuxième étape d'insertion et de mise à jour des données. - type: boolean - default: __f__true + - style: + max-height: 400px + overflow-y: scroll + items: + - type: message + html: __f__data.errorMsgType + class: error + hidden: __f__!!data.error_display_line + - type: message + html: __f__data.errorMsgLine + class: error + hidden: __f__!data.error_display_line - direction: row - flex: '0' items: - type: button color: success @@ -50,7 +79,7 @@ layout: title: nouvel import description: Faire un nouvel import action: reset - hidden: __f__!data.status + hidden: __f__!data.id_import - type: button color: primary diff --git a/config/modules/contrib/m_sipaf/layouts/m_sipaf.site_list.layout.yml b/config/modules/contrib/m_sipaf/layouts/m_sipaf.site_list.layout.yml index 4912b796..423aeb14 100644 --- a/config/modules/contrib/m_sipaf/layouts/m_sipaf.site_list.layout.yml +++ b/config/modules/contrib/m_sipaf/layouts/m_sipaf.site_list.layout.yml @@ -46,41 +46,10 @@ layout: hidden: __f__!o.is_action_allowed(x, 'C') - type: modal modal_name: import + # style: + # width: 1200px items: - title: Importer des passage à faune - type: form - items: - - items: - - type: message - html: __f__data.importMsg?.html - class: __f__data.importMsg?.class - hidden: __f__!data.importMsg - - - key: importMsg - hidden: true - - key: data_file - type: file - title: Fichier d'import - required: true - description: Choisir un fichier à importer - - key: object_code - type: string - hidden: true - default: __f__context.object_code - - - direction: row - items: - - type: button - color: primary - title: Valider - description: Valider - action: import - disabled: __f__!(formGroup.valid ) - - type: button - color: primary - title: Annuler - description: Annuler - action: close + type: import flex: "0" - type: object diff --git a/frontend/app/components/base/base.scss b/frontend/app/components/base/base.scss index 50ed8af0..25c0153c 100644 --- a/frontend/app/components/base/base.scss +++ b/frontend/app/components/base/base.scss @@ -170,7 +170,7 @@ div.layout-items > div { background-color: lightgrey; color: grey; border-radius: 15px; - border: solid 1px; + // border: solid 1px; display: inline-block; } diff --git a/frontend/app/components/layout/base/layout-map.component.ts b/frontend/app/components/layout/base/layout-map.component.ts index afd262ba..f40594ac 100644 --- a/frontend/app/components/layout/base/layout-map.component.ts +++ b/frontend/app/components/layout/base/layout-map.component.ts @@ -28,9 +28,6 @@ export class ModulesLayoutMapComponent extends ModulesLayoutComponent implements this.bPostComputeLayout = true; } - /** initialisaiton de la carte */ - postInit(): void {} - /** * action quand un modal (gps, gpx etc... est validé) */ diff --git a/frontend/app/components/layout/base/layout-modal.component.html b/frontend/app/components/layout/base/layout-modal.component.html index 21b9d837..44ed3b39 100644 --- a/frontend/app/components/layout/base/layout-modal.component.html +++ b/frontend/app/components/layout/base/layout-modal.component.html @@ -1,8 +1,13 @@
-
- - +
+ +
diff --git a/frontend/app/components/layout/base/layout-modal.component.scss b/frontend/app/components/layout/base/layout-modal.component.scss index 422e3046..9cf504f1 100644 --- a/frontend/app/components/layout/base/layout-modal.component.scss +++ b/frontend/app/components/layout/base/layout-modal.component.scss @@ -12,8 +12,11 @@ } .modal-container > div { - width: 500px; + width: fit-content; padding: 10px; opacity: 1; +} -} \ No newline at end of file +.modal-container > div > div{ + background-color: red; +} diff --git a/frontend/app/components/layout/base/layout-modal.component.ts b/frontend/app/components/layout/base/layout-modal.component.ts index 4faf7c70..4aa4943f 100644 --- a/frontend/app/components/layout/base/layout-modal.component.ts +++ b/frontend/app/components/layout/base/layout-modal.component.ts @@ -29,9 +29,6 @@ export class ModulesLayoutModalComponent extends ModulesLayoutComponent implemen this.bPostComputeLayout = true; } - // postInit(): void { - // } - // processLayout(): void { // this.initModal(); // } diff --git a/frontend/app/components/layout/form/form-element.component.html b/frontend/app/components/layout/form/form-element.component.html index 64a332c4..4148f86c 100644 --- a/frontend/app/components/layout/form/form-element.component.html +++ b/frontend/app/components/layout/form/form-element.component.html @@ -21,7 +21,6 @@ [disabled]="computedLayout.disabled" (change)="fileChange($event.target.files)" /> - {{ formControl.value?.name }} +

Importer des données

- + Importer des données -
+ - + +
+
+
diff --git a/frontend/app/components/layout/import/layout-import.component.scss b/frontend/app/components/layout/import/layout-import.component.scss index 67e68326..6397fd78 100644 --- a/frontend/app/components/layout/import/layout-import.component.scss +++ b/frontend/app/components/layout/import/layout-import.component.scss @@ -1,3 +1,7 @@ +.import { + width: 1000px +} + .import-msg { height: 200px; overflow-y: scroll; diff --git a/frontend/app/components/layout/import/layout-import.component.ts b/frontend/app/components/layout/import/layout-import.component.ts index 37461e05..91d5753a 100644 --- a/frontend/app/components/layout/import/layout-import.component.ts +++ b/frontend/app/components/layout/import/layout-import.component.ts @@ -33,7 +33,7 @@ export class ModulesLayoutImportComponent extends ModulesLayoutComponent impleme this._mImport = this._injector.get(ModulesImportService); } - postComputeLayout() { + postProcessLayout() { this.initImport(); } @@ -45,7 +45,7 @@ export class ModulesLayoutImportComponent extends ModulesLayoutComponent impleme this.importLayout = { code: 'utils.import', }; - this.importMsg = this._mImport.processMessage(this.importData); + // this._mLayout.getFormControl('form_import')?.reset() this.importData = {}; this.setStep(); } @@ -69,7 +69,9 @@ export class ModulesLayoutImportComponent extends ModulesLayoutComponent impleme this.editableStep = false; }); } - this._mImport.processMessage(this.importData); + this.importData.importMsg = this._mImport.processMessage(this.importData); + this.importData.errorMsgType = this._mImport.processErrorsType(this.importData); + this.importData.errorMsgLine = this._mImport.processErrorsLine(this.importData); } processImport(context, data) { @@ -83,8 +85,13 @@ export class ModulesLayoutImportComponent extends ModulesLayoutComponent impleme if (importEvent instanceof HttpResponse) { this._mLayout.stopActionProcessing(''); const response = importEvent.body as any; - this.importData = response; + this.importData = { ...this.importData, ...response }; this.setStep(); + if (response.status == 'DONE') { + if (response.res.nb_unchanged != response.res.nb_process) { + this._mObject.reProcessObject(this.context.module_code, this.context.object_code); + } + } } }); } @@ -95,6 +102,7 @@ export class ModulesLayoutImportComponent extends ModulesLayoutComponent impleme return this.processImport(context, data); } if (action == 'reset') { + this._mLayout.getFormControl('form_import')?.reset(); this.initImport(); this._mLayout.stopActionProcessing(''); } diff --git a/frontend/app/components/layout/object/layout-object-table.component.ts b/frontend/app/components/layout/object/layout-object-table.component.ts index f46d5d60..b37ca65f 100644 --- a/frontend/app/components/layout/object/layout-object-table.component.ts +++ b/frontend/app/components/layout/object/layout-object-table.component.ts @@ -42,8 +42,6 @@ export class ModulesLayoutObjectTableComponent this.tableId = `table_${this._id}`; } - postInit() {} - onRedrawElem(): void { this.onHeightChange(true); this.setCount(); diff --git a/frontend/app/components/layout/object/layout-object.component.ts b/frontend/app/components/layout/object/layout-object.component.ts index 97b9354c..c9148a84 100644 --- a/frontend/app/components/layout/object/layout-object.component.ts +++ b/frontend/app/components/layout/object/layout-object.component.ts @@ -44,6 +44,16 @@ export class ModulesLayoutObjectComponent extends ModulesLayoutComponent impleme this.bPostComputeLayout = true; } + postInit() { + this._subs['reProcess'] = this._mObject.$reProcessObject.subscribe( + ({ moduleCode, objectCode }) => { + if (this.moduleCode() == moduleCode && this.objectCode() == objectCode) { + this.processObject(); + } + } + ); + } + postComputeLayout(dataChanged: any, layoutChanged: any, contextChanged: any): void { if (!utils.fastDeepEqual(this.context.value, this.contextSave?.value)) { this.processValue(this.context.value); diff --git a/frontend/app/services/import.service.ts b/frontend/app/services/import.service.ts index cd937e20..f3ae27e0 100644 --- a/frontend/app/services/import.service.ts +++ b/frontend/app/services/import.service.ts @@ -1,7 +1,7 @@ import { Injectable, Injector } from '@angular/core'; import { ModulesConfigService } from './config.service'; import { ModulesRequestService } from './request.service'; - +import utils from '../utils'; @Injectable() export class ModulesImportService { _mConfig: ModulesConfigService; @@ -28,8 +28,6 @@ export class ModulesImportService { if (!data.id_import) { return { html: ` -
Etape 1/3
-
Chargement et validation des données
Veuillez choisir un fichier et appuyer sur Valider`, class: 'info', }; @@ -38,8 +36,6 @@ export class ModulesImportService { if (data.status == 'READY') { return { html: ` -
Etape 1/3
-
Insertion des données

- Nombre de lignes ${data.res.nb_raw}

- Nombre d'insertion ${data.res.nb_insert}

- Nombre de mise à jour ${data.res.nb_update} ${ @@ -53,79 +49,117 @@ export class ModulesImportService { if (data.status == 'DONE') { return { html: ` -

Etape 3/3
-
Import Terminé
+ Import Terminé `, - class: 'info', + class: 'success', }; } - } - importHTMLMsgSuccess(impt) { - let txtImport = `
Import réussi
`; - let res = impt.res; - - if (res.nb_data) { - txtImport += `data: ${res.nb_data}
`; + if (data.status == 'ERROR') { + return { + html: ` +

${data.errors.length} Erreurs

+

Voir les détails dans l'onglet Erreurs + `, + class: 'error', + }; } + } - if (res.nb_raw != res.nb_data) { - txtImport += `raw: ${res.nb_raw}
`; + processErrorsLine(data) { + if (!data.errors?.length) { + return ''; } - if (res.nb_insert) { - txtImport += `insert: ${res.nb_insert}
`; + const lines = {}; + for (const error of data.errors) { + for (const line of error.lines) { + lines[line] = lines[line] || {}; + lines[line][error.code] = lines[line][error.code] || { msg: error.msg, keys: [] }; + lines[line][error.code].keys.push(error.key); + } } - - if (res.nb_update) { - txtImport += `update: ${res.nb_update}
`; + let errorHTML = `

${Object.keys(lines).length} ligne${ + Object.keys(lines).length > 1 ? 's' : '' + } en erreur

`; + + for (const line of Object.keys(lines) + .map((l) => parseInt(l)) + .sort()) { + errorHTML += `- ${line}
`; + for (const errorCode of Object.keys(lines[line]).sort()) { + errorHTML += `    ${lines[line][errorCode].msg}:
`; + errorHTML += `      ${lines[line][errorCode].keys.join( + ', ' + )}
`; + } } + return errorHTML; + } - if (res.nb_unchanged) { - txtImport += `unchanged: ${res.nb_unchanged}
`; + processErrorsType(data) { + if (!data.errors?.length) { + return ''; } - return txtImport; - } - importHTMLMsgError(impt) { - let txtImport = `

${impt.errors.length} erreurs

`; + let errorHTML = `

${data.errors.length} erreurs

`; - let txtErrorRequired; - for (let error of impt.errors.filter((e) => e.code == 'ERR_IMPORT_REQUIRED')) { - if (!txtErrorRequired) { - txtErrorRequired = `
Champs requis manquants
`; - } - txtErrorRequired += `${error.key} ${error.lines.length} ligne(s): [${error.lines}]
`; - } - if (txtErrorRequired) { - txtImport += '
'; - txtImport += txtErrorRequired; + const errors = {}; + for (const error of data.errors) { + errors[error.code] = errors[error.code] || { msg: error.msg }; } - let txtErrorUnresolved; - for (let error of impt.errors.filter((e) => e.code == 'ERR_IMPORT_UNRESOLVED')) { - if (!txtErrorUnresolved) { - txtErrorUnresolved = `
Champs non résolus
`; - } - txtErrorUnresolved += `${error.key} ${error.lines.length} ligne(s): [${error.lines}]
`; - if (error.values) { - txtErrorUnresolved += `Valeurs parmi : ${error.values - .map((v) => v.cd_nomenclature) - .join(', ')}
`; + for (const errorType of Object.keys(errors)) { + const errorsOfType = data.errors.filter((e) => e.code == errorType); + errorHTML += `
${errorsOfType[0].msg}
`; + errors[errorType].keys = {}; + for (let error of errorsOfType) { + if (error.key) { + errors[errorType].keys[error.key] = { lines: error.lines }; + errorHTML += `- ${error.key} : ligne${ + error.lines.length > 1 ? 's' : '' + } ${error.lines.join(', ')}
`; + } } } - if (txtErrorUnresolved) { - txtImport += '
'; - txtImport += txtErrorUnresolved; - } - - for (let error of impt.errors.filter( - (e) => !['ERR_IMPORT_REQUIRED', 'ERR_IMPORT_UNRESOLVED'].includes(e.code) - )) { - txtImport += '
'; - txtImport += `${error.code}: ${error.msg}`; - } - - return txtImport; + return errorHTML; } + + // for (let error of impt.errors.filter((e) => e.code == 'ERR_IMPORT_REQUIRED')) { + // if (!txtErrorRequired) { + // txtErrorRequired = `
`; + // } + // txtErrorRequired += `${error.key} ${error.lines.length} ligne(s): [${error.lines}]
`; + // } + // if (txtErrorRequired) { + // txtImport += '
'; + // txtImport += txtErrorRequired; + // } + + // let txtErrorUnresolved; + // for (let error of impt.errors.filter((e) => e.code == 'ERR_IMPORT_UNRESOLVED')) { + // if (!txtErrorUnresolved) { + // txtErrorUnresolved = `
Champs non résolus
`; + // } + // txtErrorUnresolved += `${error.key} ${error.lines.length} ligne(s): [${error.lines}]
`; + // if (error.values) { + // txtErrorUnresolved += `Valeurs parmi : ${error.values + // .map((v) => v.cd_nomenclature) + // .join(', ')}
`; + // } + // } + // if (txtErrorUnresolved) { + // txtImport += '
'; + // txtImport += txtErrorUnresolved; + // } + + // for (let error of impt.errors.filter( + // (e) => !['ERR_IMPORT_REQUIRED', 'ERR_IMPORT_UNRESOLVED'].includes(e.code) + // )) { + // txtImport += '
'; + // txtImport += `${error.code}: ${error.msg}`; + // } + + // return txtImport; + // } } diff --git a/frontend/app/services/object.service.ts b/frontend/app/services/object.service.ts index fee2f3fb..212a3a23 100644 --- a/frontend/app/services/object.service.ts +++ b/frontend/app/services/object.service.ts @@ -2,6 +2,8 @@ import { Injectable, Injector } from '@angular/core'; import { ModulesDataService } from './data.service'; import { ModulesConfigService } from './config.service'; import { ModulesSchemaService } from './schema.service'; +import { Subject } from '@librairies/rxjs'; + import utils from '../utils'; @Injectable() export class ModulesObjectService { @@ -10,12 +12,18 @@ export class ModulesObjectService { _mSchema: ModulesSchemaService; _cacheObjectConfig = {}; + $reProcessObject = new Subject(); + constructor(private _injector: Injector) { this._mData = this._injector.get(ModulesDataService); this._mConfig = this._injector.get(ModulesConfigService); this._mSchema = this._injector.get(ModulesSchemaService); } + reProcessObject(moduleCode, objectCode) { + this.$reProcessObject.next({ moduleCode, objectCode }); + } + /** renvoie la configuration d'un object en fonction de * - moduleCode * - objectCode From 1942e256bf27fc7bbd09125c34f551404118662a Mon Sep 17 00:00:00 2001 From: "joel.clement" Date: Fri, 17 Mar 2023 16:04:58 +0100 Subject: [PATCH 033/142] fix geom test --- backend/gn_modulator/tests/import_test/tests/pf_test_ok.csv | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/backend/gn_modulator/tests/import_test/tests/pf_test_ok.csv b/backend/gn_modulator/tests/import_test/tests/pf_test_ok.csv index 8ce42dfb..2c2094ee 100644 --- a/backend/gn_modulator/tests/import_test/tests/pf_test_ok.csv +++ b/backend/gn_modulator/tests/import_test/tests/pf_test_ok.csv @@ -1,4 +1,4 @@ code_passage_faune, geom, id_nomenclature_ouvrage_hydrau_position -_TEST01, POINT (43.676265 4.028108),RD -_TEST02, POINT (43.676262 4.028108), -_TEST02345, POINT (43.676262 4.028108),RG \ No newline at end of file +_TEST01, POINT (4.01 43.61 ),RD +_TEST02, POINT (4.02 43.62 ), +_TEST02345, POINT (4.03 43.63 ),RG \ No newline at end of file From 9447dce4428d3260a840ed3920c0398f88582d62 Mon Sep 17 00:00:00 2001 From: "joel.clement" Date: Fri, 17 Mar 2023 17:02:27 +0100 Subject: [PATCH 034/142] permission import --- .../gn_modulator/imports/mixins/process.py | 7 +-- backend/gn_modulator/imports/mixins/update.py | 10 +++-- backend/gn_modulator/imports/mixins/utils.py | 5 +++ backend/gn_modulator/module/base.py | 7 +++ backend/gn_modulator/routes/exports.py | 4 +- backend/gn_modulator/routes/imports.py | 4 +- backend/gn_modulator/routes/rest.py | 14 +++--- .../gn_modulator/routes/utils/decorators.py | 15 ++++--- backend/gn_modulator/tests/test_import.py | 6 ++- backend/gn_modulator/tests/test_import_api.py | 5 +++ backend/gn_modulator/tests/utils/rest.py | 5 +-- .../layouts/m_sipaf.site_list.layout.yml | 2 +- .../contrib/m_sipaf/m_sipaf.module.yml | 2 +- .../import_exemple_simple_ref_geo_area.md | 44 ++++++++++++++++++- frontend/app/services/object.service.ts | 14 +++--- 15 files changed, 102 insertions(+), 42 deletions(-) diff --git a/backend/gn_modulator/imports/mixins/process.py b/backend/gn_modulator/imports/mixins/process.py index c2af9571..65c5e4a0 100644 --- a/backend/gn_modulator/imports/mixins/process.py +++ b/backend/gn_modulator/imports/mixins/process.py @@ -69,11 +69,8 @@ def sql_process_view(self, from_table, dest_table, keys=None): # TODO rendre id_digitiser parametrable ? txt_id_digitiser = "" - if self.id_digitiser: - for key in ["id_digitiser", "id_digitizer"]: - if SchemaMethods(self.schema_code).has_property(key): - txt_id_digitiser = f"{self.id_digitiser} AS {key}," - break + if self.id_digitiser and self.id_digitiser_key(): + txt_id_digitiser = f"{self.id_digitiser} AS {self.id_digitiser_key()}," return f"""DROP VIEW IF EXISTS {dest_table} CASCADE; CREATE VIEW {dest_table} AS diff --git a/backend/gn_modulator/imports/mixins/update.py b/backend/gn_modulator/imports/mixins/update.py index 68dd0ac7..378cefc4 100644 --- a/backend/gn_modulator/imports/mixins/update.py +++ b/backend/gn_modulator/imports/mixins/update.py @@ -17,11 +17,11 @@ def process_update(self): ) return + self.sql["update"] = self.sql_update(from_table) + if self.res["nb_update"] == 0: return - self.sql["update"] = self.sql_update(from_table) - try: SchemaMethods.c_sql_exec_txt(self.sql["update"]) except Exception as e: @@ -48,7 +48,8 @@ def sql_update(self, from_table): filter( lambda x: sm.has_property(x) and sm.is_column(x) - and not sm.property(x).get("primary_key"), + and not sm.property(x).get("primary_key") + and x != self.id_digitiser_key(), columns, ), ) @@ -60,7 +61,8 @@ def sql_update(self, from_table): filter( lambda x: sm.has_property(x) and sm.is_column(x) - and not sm.property(x).get("primary_key"), + and not sm.property(x).get("primary_key") + and x != self.id_digitiser_key(), columns, ), ) diff --git a/backend/gn_modulator/imports/mixins/utils.py b/backend/gn_modulator/imports/mixins/utils.py index 14ac816f..1043e543 100644 --- a/backend/gn_modulator/imports/mixins/utils.py +++ b/backend/gn_modulator/imports/mixins/utils.py @@ -94,3 +94,8 @@ def get_table_columns(self, table_name): if not self._columns.get(table_name): self._columns[table_name] = SchemaMethods.get_table_columns(table_name) return self._columns[table_name] + + def id_digitiser_key(self): + for key in ["id_digitiser", "id_digitizer"]: + if SchemaMethods(self.schema_code).has_property(key): + return key diff --git a/backend/gn_modulator/module/base.py b/backend/gn_modulator/module/base.py index f5b2c499..cebdfca5 100644 --- a/backend/gn_modulator/module/base.py +++ b/backend/gn_modulator/module/base.py @@ -9,6 +9,13 @@ class ModuleBase: + @classmethod + def add_actions(cls, module_code, object_code, actions): + object_config = cls.object_config(module_code, object_code) + for action in actions: + if action not in object_config["cruved"]: + object_config["cruved"] = (object_config["cruved"] or "") + action + @classmethod def is_python_module(cls, module_code): """ diff --git a/backend/gn_modulator/routes/exports.py b/backend/gn_modulator/routes/exports.py index 943490b2..27b7ea59 100644 --- a/backend/gn_modulator/routes/exports.py +++ b/backend/gn_modulator/routes/exports.py @@ -1,11 +1,11 @@ from gn_modulator import DefinitionMethods, ModuleMethods, SchemaMethods from gn_modulator.blueprint import blueprint -from .utils.decorators import check_rest_route +from .utils.decorators import check_module_object_route from .utils.params import parse_request_args @blueprint.route("/exports///", methods=["GET"]) -@check_rest_route("E") +@check_module_object_route("E") def api_export(module_code, object_code, export_code): """ Route pour les exports diff --git a/backend/gn_modulator/routes/imports.py b/backend/gn_modulator/routes/imports.py index 557317c2..e30d769c 100644 --- a/backend/gn_modulator/routes/imports.py +++ b/backend/gn_modulator/routes/imports.py @@ -2,7 +2,7 @@ from flask import request, jsonify from sqlalchemy import orm -from geonature.core.gn_permissions.decorators import check_cruved_scope +from gn_modulator.routes.utils.decorators import check_module_object_route from geonature.utils.env import db from gn_modulator.blueprint import blueprint @@ -12,7 +12,7 @@ from gn_modulator.imports.models import TImport -@check_cruved_scope("C") # object import ?? +@check_module_object_route("I") # object import ?? @blueprint.route("import///", methods=["POST"]) @blueprint.route( "import///", methods=["POST"], defaults={"id_import": None} diff --git a/backend/gn_modulator/routes/rest.py b/backend/gn_modulator/routes/rest.py index 07c6542b..47c781a2 100644 --- a/backend/gn_modulator/routes/rest.py +++ b/backend/gn_modulator/routes/rest.py @@ -1,5 +1,5 @@ from gn_modulator.blueprint import blueprint -from .utils.decorators import check_rest_route +from .utils.decorators import check_module_object_route from .utils.repository import ( get_list_rest, get_one_rest, @@ -11,7 +11,7 @@ @blueprint.route("/rest///", methods=["GET"]) -@check_rest_route("R") +@check_module_object_route("R") def api_rest_get_list(module_code, object_code): """ Route pour récupérer les listes @@ -21,7 +21,7 @@ def api_rest_get_list(module_code, object_code): @blueprint.route("/rest///", methods=["GET"]) -@check_rest_route("R") +@check_module_object_route("R") def api_rest_get_one(module_code, object_code, value): """ Route pour récupérer une ligne @@ -31,7 +31,7 @@ def api_rest_get_one(module_code, object_code, value): @blueprint.route("/page_number_and_list///", methods=["GET"]) -@check_rest_route("R") +@check_module_object_route("R") def api_rest_get_page_number_and_list(module_code, object_code, value): """ Route pour récupérer une liste à partir d'un ligne @@ -43,7 +43,7 @@ def api_rest_get_page_number_and_list(module_code, object_code, value): @blueprint.route("/rest///", methods=["POST"]) -@check_rest_route("C") +@check_module_object_route("C") def api_rest_post(module_code, object_code): """ Route pour créer une nouvelle ligne @@ -53,7 +53,7 @@ def api_rest_post(module_code, object_code): @blueprint.route("/rest///", methods=["PATCH"]) -@check_rest_route("U") +@check_module_object_route("U") def api_rest_patch(module_code, object_code, value): """ Route pour modifier une ligne @@ -63,7 +63,7 @@ def api_rest_patch(module_code, object_code, value): @blueprint.route("/rest///", methods=["DELETE"]) -@check_rest_route("D") +@check_module_object_route("D") def api_rest_delete(module_code, object_code, value): """ Route pour supprimer une ligne diff --git a/backend/gn_modulator/routes/utils/decorators.py b/backend/gn_modulator/routes/utils/decorators.py index 939091de..cbf090c6 100644 --- a/backend/gn_modulator/routes/utils/decorators.py +++ b/backend/gn_modulator/routes/utils/decorators.py @@ -4,8 +4,8 @@ from werkzeug.exceptions import Forbidden -def check_rest_route(action): - def _check_rest_route(fn): +def check_module_object_route(action): + def _check_module_object_route(fn): """ decorateur qui va vérifier si la route est bien définie pour un module un object et un action (CRUVED) donnés @@ -13,7 +13,7 @@ def _check_rest_route(fn): """ @wraps(fn) - def __check_rest_route(*args, **kwargs): + def __check_module_object_route(*args, **kwargs): module_code = kwargs["module_code"] object_code = kwargs["object_code"] @@ -39,8 +39,11 @@ def __check_rest_route(*args, **kwargs): description=f"action {action} is not defined for object {object_code} of module {module_code}" ) - return check_cruved_scope(action, module_code=module_code)(fn)(*args, **kwargs) + # pour les actions d'import on regarde les droit de creation C + action_cruved = "C" if action == "I" else action - return __check_rest_route + return check_cruved_scope(action_cruved, module_code=module_code)(fn)(*args, **kwargs) - return _check_rest_route + return __check_module_object_route + + return _check_module_object_route diff --git a/backend/gn_modulator/tests/test_import.py b/backend/gn_modulator/tests/test_import.py index adbd297f..40909299 100644 --- a/backend/gn_modulator/tests/test_import.py +++ b/backend/gn_modulator/tests/test_import.py @@ -100,8 +100,10 @@ def test_ref_geo_area(self): module_code, object_code, data_file_path, expected_infos=expected_infos ) - # print(impt.sql["process_view"]) - # assert 1 == 0 + print(impt.sql["insert"]) + print(impt.sql["update"]) + print(impt.sql["nb_insert"]) + print(impt.sql["nb_update"]) # Test remontées d'erreurs diff --git a/backend/gn_modulator/tests/test_import_api.py b/backend/gn_modulator/tests/test_import_api.py index edcd7629..7657d515 100644 --- a/backend/gn_modulator/tests/test_import_api.py +++ b/backend/gn_modulator/tests/test_import_api.py @@ -4,12 +4,15 @@ from geonature.tests.utils import set_logged_user_cookie +from gn_modulator import ModuleMethods from gn_modulator.utils.env import import_test_dir @pytest.mark.usefixtures("client_class", "temporary_transaction", scope="session") class TestImportApi: def test_import_synthese(self, users): + ModuleMethods.add_actions("MODULATOR", "syn.synthese", "I") + set_logged_user_cookie(self.client, users["admin_user"]) with open(import_test_dir / "synthese_1.csv", "rb") as f: data = {"data_file": (f, "synthese.csv")} @@ -31,6 +34,8 @@ def test_import_synthese(self, users): assert r.json["id_digitiser"] == users["admin_user"].id_role def test_import_synthese2(self, users): + ModuleMethods.add_actions("MODULATOR", "syn.synthese", "I") + set_logged_user_cookie(self.client, users["admin_user"]) with open(import_test_dir / "synthese_1.csv", "rb") as f: data = {"data_file": (f, "synthese.csv")} diff --git a/backend/gn_modulator/tests/utils/rest.py b/backend/gn_modulator/tests/utils/rest.py index f2120ec4..1ddd9d54 100644 --- a/backend/gn_modulator/tests/utils/rest.py +++ b/backend/gn_modulator/tests/utils/rest.py @@ -18,10 +18,7 @@ def test_schema_rest(client, user, module_code, object_code, data_post, data_upd """ # patch cruved for tests - object_config = ModuleMethods.object_config(module_code, object_code) - assert object_config is not None - - object_config["cruved"] = "CRUVED" + ModuleMethods.add_actions(module_code, object_code, "CUD") # INIT set_logged_user_cookie(client, user) diff --git a/config/modules/contrib/m_sipaf/layouts/m_sipaf.site_list.layout.yml b/config/modules/contrib/m_sipaf/layouts/m_sipaf.site_list.layout.yml index 423aeb14..bee4985f 100644 --- a/config/modules/contrib/m_sipaf/layouts/m_sipaf.site_list.layout.yml +++ b/config/modules/contrib/m_sipaf/layouts/m_sipaf.site_list.layout.yml @@ -43,7 +43,7 @@ layout: action: type: modal modal_name: import - hidden: __f__!o.is_action_allowed(x, 'C') + hidden: __f__!o.is_action_allowed(x, 'I') - type: modal modal_name: import # style: diff --git a/config/modules/contrib/m_sipaf/m_sipaf.module.yml b/config/modules/contrib/m_sipaf/m_sipaf.module.yml index 5a78d743..5450b41f 100644 --- a/config/modules/contrib/m_sipaf/m_sipaf.module.yml +++ b/config/modules/contrib/m_sipaf/m_sipaf.module.yml @@ -18,7 +18,7 @@ features: objects: site: schema_code: m_sipaf.pf - cruved: CRUDE + cruved: CRUIDE actor: schema_code: m_sipaf.actor cruved: R diff --git a/doc/technique/import_exemple_simple_ref_geo_area.md b/doc/technique/import_exemple_simple_ref_geo_area.md index 2e12385f..6add79db 100644 --- a/doc/technique/import_exemple_simple_ref_geo_area.md +++ b/doc/technique/import_exemple_simple_ref_geo_area.md @@ -77,7 +77,7 @@ Cette vue permet de résoudre les clé étrangère et la clé primaire. - on fait une jointure sur la table `ref_geo.l_areas` avec des condition sur `id_type` et `area_code` ``` -CREATE VIEW gn_modulator_import.v_260_process_ref_geo_area AS +CREATE VIEW gn_modulator_import.v_xxx_process_ref_geo_area AS SELECT id_import, j_0.id_type AS id_type, @@ -85,11 +85,51 @@ SELECT t.area_code AS area_code, t.geom AS geom, j_pk.id_area -FROM gn_modulator_import.v_260_raw_ref_geo_area t +FROM gn_modulator_import.v_xxx_raw_ref_geo_area t LEFT JOIN ref_geo.bib_areas_types j_0 ON j_0.type_code::TEXT = t.id_type::TEXT LEFT JOIN ref_geo.l_areas j_pk ON j_pk.id_type::TEXT = j_0.id_type::TEXT AND (j_pk.area_code::TEXT = SPLIT_PART(t.id_area, '|', 2)::TEXT OR (j_pk.area_code IS NULL AND SPLIT_PART(t.id_area, '|', 2) IS NULL)); +``` + +#### 2.1) Insert +``` +INSERT INTO ref_geo.l_areas ( + id_type, + area_name, + area_code, + geom +) +SELECT + id_type, + area_name, + area_code, + geom +FROM gn_modulator_import.v_xxx_process_ref_geo_area WHERE id_area IS NULL; +``` + +#### 2.2) Update + +``` +UPDATE ref_geo.l_areas t SET + id_type=a.id_type, + area_name=a.area_name, + area_code=a.area_code, + geom=a.geom +FROM ( + SELECT + id_type, + area_name, + area_code, + geom, + id_area + FROM gn_modulator_import.v_xxx_process_ref_geo_area +)a +WHERE a.id_area = t.id_area +AND NOT ((t.id_type::TEXT IS DISTINCT FROM a.id_type::TEXT) + AND (t.area_name::TEXT IS DISTINCT FROM a.area_name::TEXT) + AND (t.area_code::TEXT IS DISTINCT FROM a.area_code::TEXT) + AND (t.geom::TEXT IS DISTINCT FROM a.geom::TEXT)) ``` \ No newline at end of file diff --git a/frontend/app/services/object.service.ts b/frontend/app/services/object.service.ts index 212a3a23..d370413c 100644 --- a/frontend/app/services/object.service.ts +++ b/frontend/app/services/object.service.ts @@ -350,12 +350,13 @@ export class ModulesObjectService { if (!testUserCruved) { const msgDroitsInsuffisants = { - C: `Droits inssuffisants pour créer ${objectConfig.display.un_nouveau_label}`, - R: `Droits inssuffisants pour voir ${objectConfig.display.le_label}`, - U: `Droits inssuffisants pour éditer ${objectConfig.display.le_label}`, - V: `Droits inssuffisants pour valider ${objectConfig.display.le_label}`, - E: `Droits inssuffisants pour exporter ${objectConfig.display.des_label}`, - D: `Droits inssuffisants pour supprimer ${objectConfig.display.le_label}`, + C: `Droits insuffisants pour créer ${objectConfig.display.un_nouveau_label}`, + R: `Droits insuffisants pour voir ${objectConfig.display.le_label}`, + U: `Droits insuffisants pour éditer ${objectConfig.display.le_label}`, + V: `Droits insuffisants pour valider ${objectConfig.display.le_label}`, + E: `Droits insuffisants pour exporter ${objectConfig.display.des_label}`, + D: `Droits insuffisants pour supprimer ${objectConfig.display.le_label}`, + I: `Droits insuffisants pour importer ${objectConfig.display.des_label}`, }; return { actionAllowed: false, @@ -372,6 +373,7 @@ export class ModulesObjectService { V: `Valider ${objectConfig.display.le_label}`, E: `Exporter ${objectConfig.display.des_label}`, D: `Supprimer ${objectConfig.display.le_label}`, + I: `Importer ${objectConfig.display.des_label}`, }; return { From c127da6a02d8c61c8136e4cf10fb7bdc3c76ce56 Mon Sep 17 00:00:00 2001 From: "joel.clement" Date: Mon, 20 Mar 2023 11:37:58 +0100 Subject: [PATCH 035/142] table action disabled clair --- .../layout-object-filters.component.scss | 77 ------------------- .../layout-object-geojson.component.scss | 77 ------------------- .../object/layout-object-table.component.scss | 4 +- 3 files changed, 2 insertions(+), 156 deletions(-) diff --git a/frontend/app/components/layout/object/layout-object-filters.component.scss b/frontend/app/components/layout/object/layout-object-filters.component.scss index 771eebf8..e69de29b 100644 --- a/frontend/app/components/layout/object/layout-object-filters.component.scss +++ b/frontend/app/components/layout/object/layout-object-filters.component.scss @@ -1,77 +0,0 @@ -// @import '~tabulator-tables/dist/css/tabulator_site.min.css'; - -:host ::ng-deep .table-icon { - padding: 3px; - border-radius: 5px; - // margin-left: 5px; - } - - :host ::ng-deep .table-icon { - padding: 3px; - border-radius: 5px; - // margin-left: 5px; - } - - - :host ::ng-deep .table-icon.disabled { - color: grey; - padding: 3px; - border-radius: 5px; - // margin-left: 5px; - } - - - :host ::ng-deep .table-icon:hover{ - background-color: lightgrey; - } - - - :host ::ng-deep .table-icon.disabled:hover{ - background-color: none; - } - - :host ::ng-deep .tabulator { - font-size: 12px; - border: none; - - } - - :host ::ng-deep .tabulator .tabulator-header { - font-weight: normal; - border-bottom: 1px solid; - border-bottom-color: rgba(0, 0, 0, 0.12); - color: rgba(0, 0, 0, 0.54); - } - - :host ::ng-deep .tabulator .tabulator-header .tabulator-col { - height: 48px; - background-color: #ffffff; - border: none; - padding: 0 7px; - } - - :host ::ng-deep .tabulator-row { - border-bottom: 1px solid; - border-bottom-color: rgba(0, 0, 0, 0.12); - min-height: 48px; - vertical-align: middle; - } - - :host ::ng-deep .tabulator-row .tabulator-cell { - padding: 16px 7px; - border-right: none; - vertical-align: middle; - } - - // :host ::ng-deep .tabulator-row .tabulator-cell:first-of-type, - // .tabulator .tabulator-header .tabulator-col:first-of-type { - // padding-left: 2 4px; - // } - - :host ::ng-deep .tabulator-row.tabulator-row-even { - background-color: rgb(240, 240, 250); - } - - :host ::ng-deep .tabulator-row.tabulator-row-even.tabulator-selected { - background-color: rgb(154, 188, 234) - } \ No newline at end of file diff --git a/frontend/app/components/layout/object/layout-object-geojson.component.scss b/frontend/app/components/layout/object/layout-object-geojson.component.scss index 771eebf8..e69de29b 100644 --- a/frontend/app/components/layout/object/layout-object-geojson.component.scss +++ b/frontend/app/components/layout/object/layout-object-geojson.component.scss @@ -1,77 +0,0 @@ -// @import '~tabulator-tables/dist/css/tabulator_site.min.css'; - -:host ::ng-deep .table-icon { - padding: 3px; - border-radius: 5px; - // margin-left: 5px; - } - - :host ::ng-deep .table-icon { - padding: 3px; - border-radius: 5px; - // margin-left: 5px; - } - - - :host ::ng-deep .table-icon.disabled { - color: grey; - padding: 3px; - border-radius: 5px; - // margin-left: 5px; - } - - - :host ::ng-deep .table-icon:hover{ - background-color: lightgrey; - } - - - :host ::ng-deep .table-icon.disabled:hover{ - background-color: none; - } - - :host ::ng-deep .tabulator { - font-size: 12px; - border: none; - - } - - :host ::ng-deep .tabulator .tabulator-header { - font-weight: normal; - border-bottom: 1px solid; - border-bottom-color: rgba(0, 0, 0, 0.12); - color: rgba(0, 0, 0, 0.54); - } - - :host ::ng-deep .tabulator .tabulator-header .tabulator-col { - height: 48px; - background-color: #ffffff; - border: none; - padding: 0 7px; - } - - :host ::ng-deep .tabulator-row { - border-bottom: 1px solid; - border-bottom-color: rgba(0, 0, 0, 0.12); - min-height: 48px; - vertical-align: middle; - } - - :host ::ng-deep .tabulator-row .tabulator-cell { - padding: 16px 7px; - border-right: none; - vertical-align: middle; - } - - // :host ::ng-deep .tabulator-row .tabulator-cell:first-of-type, - // .tabulator .tabulator-header .tabulator-col:first-of-type { - // padding-left: 2 4px; - // } - - :host ::ng-deep .tabulator-row.tabulator-row-even { - background-color: rgb(240, 240, 250); - } - - :host ::ng-deep .tabulator-row.tabulator-row-even.tabulator-selected { - background-color: rgb(154, 188, 234) - } \ No newline at end of file diff --git a/frontend/app/components/layout/object/layout-object-table.component.scss b/frontend/app/components/layout/object/layout-object-table.component.scss index ff0e01c7..598f270c 100644 --- a/frontend/app/components/layout/object/layout-object-table.component.scss +++ b/frontend/app/components/layout/object/layout-object-table.component.scss @@ -17,7 +17,7 @@ // :host ::ng-deep .table-icon.disabled { - color: grey; + color: rgb(200, 200, 200); padding: 3px; border-radius: 5px; // margin-left: 5px; @@ -25,7 +25,7 @@ // :host ::ng-deep - .table-icon:hover{ +.table-icon:hover{ background-color: lightgrey; } From 4c87cbee63782d0a4e45b88ac44518057abca7c0 Mon Sep 17 00:00:00 2001 From: "joel.clement" Date: Wed, 29 Mar 2023 10:27:08 +0200 Subject: [PATCH 036/142] cacher les options --- config/layouts/utils/utils.import.layout.yml | 6 +- .../90f6e5531f7c_diagnostic_m_sipaf.py | 55 +++ .../contrib/m_sipaf/backend/m_sipaf/models.py | 287 ++++++++++++++++ config/modules/contrib/m_sipaf/config.yml | 15 + .../definitions/m_sipaf.actor.schema.yml | 30 -- .../definitions/m_sipaf.diag.schema.yml | 24 ++ .../definitions/m_sipaf.pf.schema.yml_save | 314 ++++++++++++++++++ .../contrib/m_sipaf/m_sipaf.module.yml | 11 + .../layout/base/layout.component.ts | 9 +- 9 files changed, 718 insertions(+), 33 deletions(-) create mode 100644 config/modules/contrib/m_sipaf/backend/m_sipaf/migrations/versions/90f6e5531f7c_diagnostic_m_sipaf.py create mode 100644 config/modules/contrib/m_sipaf/backend/m_sipaf/models.py create mode 100644 config/modules/contrib/m_sipaf/definitions/m_sipaf.diag.schema.yml create mode 100644 config/modules/contrib/m_sipaf/definitions/m_sipaf.pf.schema.yml_save diff --git a/config/layouts/utils/utils.import.layout.yml b/config/layouts/utils/utils.import.layout.yml index 9b6a1706..3124343e 100644 --- a/config/layouts/utils/utils.import.layout.yml +++ b/config/layouts/utils/utils.import.layout.yml @@ -30,15 +30,19 @@ layout: required: __f__!data.tables?.data description: Choisir un fichier à importer disabled: __f__data.id_import + - key: display_options + title: Afficher les options avancées. + type: boolean - display: fieldset title: Options + hidden: __f__!data.display_options items: - key: options.enable_update title: "Autoriser les mises à jour" type: boolean default: __f__false - key: options.check_only - title: Verifier + title: Verifier avant insertion description: | L'import se fait en deux temps. Une premiere étape de validation des données. diff --git a/config/modules/contrib/m_sipaf/backend/m_sipaf/migrations/versions/90f6e5531f7c_diagnostic_m_sipaf.py b/config/modules/contrib/m_sipaf/backend/m_sipaf/migrations/versions/90f6e5531f7c_diagnostic_m_sipaf.py new file mode 100644 index 00000000..e97509c6 --- /dev/null +++ b/config/modules/contrib/m_sipaf/backend/m_sipaf/migrations/versions/90f6e5531f7c_diagnostic_m_sipaf.py @@ -0,0 +1,55 @@ +"""empty message + +Revision ID: 90f6e5531f7c +Revises: ec6ebeb214b1 +Create Date: 2023-03-21 22:36:24.415201 + +""" +from alembic import op +import sqlalchemy as sa + + +# revision identifiers, used by Alembic. +revision = '90f6e5531f7c' +down_revision = 'ec6ebeb214b1' +branch_labels = None +depends_on = None + + +def upgrade(): + op.execute(""" + CREATE TABLE pr_sipaf.t_diagnostics ( + id_diagnostic SERIAL NOT NULL, + id_passage_faune INTEGER NOT NULL, + id_role INTEGER, + id_organisme INTEGER, + date_diagnostic DATE + ); + + ALTER TABLE pr_sipaf.t_diagnostics + ADD CONSTRAINT pk_sipaf_t_diagnostic_id_diagnostic PRIMARY KEY (id_diagnostic); + + ALTER TABLE pr_sipaf.t_diagnostics + ADD CONSTRAINT fk_sipaf_t_diag_t_pf_id_passage_faune FOREIGN KEY (id_passage_faune) + REFERENCES pr_sipaf.t_passages_faune(id_passage_faune) + ON UPDATE CASCADE ON DELETE CASCADE; + + ALTER TABLE pr_sipaf.t_diagnostics + ADD CONSTRAINT fk_sipaf_t_diag_t_rol_id_role FOREIGN KEY (id_role) + REFERENCES utilisateurs.t_roles(id_role) + ON UPDATE CASCADE ON DELETE SET NULL; + + ALTER TABLE pr_sipaf.t_diagnostics + ADD CONSTRAINT fk_sipaf_t_diag_b_org_id_organisme FOREIGN KEY (id_organisme) + REFERENCES utilisateurs.bib_organismes(id_organisme) + ON UPDATE CASCADE ON DELETE SET NULL; + + """) + pass + + +def downgrade(): + op.execute(""" + DROP TABLE pr_sipaf.t_diagnostics CASCADE; + """) + pass diff --git a/config/modules/contrib/m_sipaf/backend/m_sipaf/models.py b/config/modules/contrib/m_sipaf/backend/m_sipaf/models.py new file mode 100644 index 00000000..b750781d --- /dev/null +++ b/config/modules/contrib/m_sipaf/backend/m_sipaf/models.py @@ -0,0 +1,287 @@ +import uuid +from datetime import datetime + +from sqlalchemy.dialects.postgresql import UUID, JSONB +from sqlalchemy.orm import column_property +from sqlalchemy import ( + func, + literal, + select, + exists, + and_, + literal_column, + cast, +) +from geoalchemy2 import Geometry + +from geonature.utils.env import db + +from geonature.core.gn_commons.models import TMedias +from pypnusershub.db.models import User, Organisme +from pypnnomenclature.models import TNomenclatures +from ref_geo.models import LAreas, LLinears, BibAreasTypes, BibLinearsTypes + +# class TActors(db.Model): +# __tablename__ = "t_actors" +# __table_args__ = {"schema": "pr_sipaf"} + + +class CorPfNomenclatureOuvrageType(db.Model): + __tablename__ = "cor_pf_nomenclature_ouvrage_type" + __table_args__ = {"schema": "pr_sipaf"} + + id_passage_faune = db.Column( + db.Integer, db.ForeignKey("pr_sipaf.t_passages_faune.id_passage_faune"), primary_key=True + ) + id_nomenclature = db.Column( + db.Integer, + db.ForeignKey("ref_nomenclatures.t_nomenclatures.id_nomenclature"), + primary_key=True, + ) + + +class CorPfNomenclatureOuvrageMateriaux(db.Model): + __tablename__ = "cor_pf_nomenclature_ouvrage_materiaux" + __table_args__ = {"schema": "pr_sipaf"} + + id_passage_faune = db.Column( + db.Integer, db.ForeignKey("pr_sipaf.t_passages_faune.id_passage_faune"), primary_key=True + ) + id_nomenclature = db.Column( + db.Integer, + db.ForeignKey("ref_nomenclatures.t_nomenclatures.id_nomenclature"), + primary_key=True, + ) + + +class CorPfArea(db.Model): + __tablename__ = "cor_area_pf" + __table_args__ = {"schema": "pr_sipaf"} + + id_passage_faune = db.Column( + db.Integer, db.ForeignKey("pr_sipaf.t_passages_faune.id_passage_faune"), primary_key=True + ) + id_area = db.Column(db.Integer, db.ForeignKey("ref_geo.l_areas.id_area"), primary_key=True) + + +class CorPfLinear(db.Model): + __tablename__ = "cor_linear_pf" + __table_args__ = {"schema": "pr_sipaf"} + + id_passage_faune = db.Column( + db.Integer, db.ForeignKey("pr_sipaf.t_passages_faune.id_passage_faune"), primary_key=True + ) + id_linear = db.Column( + db.Integer, db.ForeignKey("ref_geo.l_linears.id_linear"), primary_key=True + ) + + +class PassageFaune(db.Model): + __tablename__ = "t_passages_faune" + __table_args__ = {"schema": "pr_sipaf"} + + id_passage_faune = db.Column(db.Integer, primary_key=True) + + code_passage_faune = db.Column(db.Unicode, nullable=False) + uuid_passage_faune = db.Column(UUID(as_uuid=True), default=uuid.uuid4) + + id_digitiser = db.Column(db.Integer, db.ForeignKey("utilisateurs.t_roles.id_role")) + digitiser = db.relationship(User) + + pi_ou_ps = db.Column(db.Boolean) + + geom = db.Column(Geometry("GEOMETRY", 4326), nullable=False) + geom_local = db.Column(Geometry("GEOMETRY")) + + pk = db.Column(db.Float) + pr = db.Column(db.Float) + pr_abs = db.Column(db.Integer) + + code_ouvrage_gestionnaire = db.Column(db.Unicode) + + nom_usuel_passage_faune = db.Column(db.Unicode) + + issu_requalification = db.Column(db.Boolean) + + date_creation_ouvrage = db.Column(db.Date) + date_requalification_ouvrage = db.Column(db.Date) + + largeur_ouvrage = db.Column(db.Float) + hauteur_ouvrage = db.Column(db.Float) + longueur_franchissement = db.Column(db.Float) + diametre = db.Column(db.Float) + largeur_dispo_faune = db.Column(db.Float) + hauteur_dispo_faune = db.Column(db.Float) + + id_nomenclature_ouvrage_specificite = db.Column( + db.Integer, db.ForeignKey("ref_nomenclatures.t_nomenclatures.id_nomenclature") + ) + nomenclature_ouvrage_specificite = db.relationship( + TNomenclatures, foreign_keys=[id_nomenclature_ouvrage_specificite] + ) + + nomenclatures_ouvrage_type = db.relationship( + TNomenclatures, secondary=CorPfNomenclatureOuvrageType.__table__ + ) + ouvrage_type_autre = db.Column(db.Unicode) + + nomenclatures_ouvrage_materiaux = db.relationship( + TNomenclatures, secondary=CorPfNomenclatureOuvrageMateriaux.__table__ + ) + + ouvrage_hydrau = db.Column(db.Boolean) + + id_nomenclature_ouvrage_hydrau_position = db.Column( + db.Integer, db.ForeignKey("ref_nomenclatures.t_nomenclatures.id_nomenclature") + ) + nomenclature_ouvrage_hydrau_position = db.relationship( + TNomenclatures, foreign_keys=[id_nomenclature_ouvrage_hydrau_position] + ) + + id_nomenclature_ouvrage_hydrau_banq_caract = db.Column( + db.Integer, db.ForeignKey("ref_nomenclatures.t_nomenclatures.id_nomenclature") + ) + nomenclature_ouvrage_hydrau_banq_caract = db.relationship( + TNomenclatures, foreign_keys=[id_nomenclature_ouvrage_hydrau_banq_caract] + ) + + id_nomenclature_ouvrage_hydrau_banq_type = db.Column( + db.Integer, db.ForeignKey("ref_nomenclatures.t_nomenclatures.id_nomenclature") + ) + nomenclature_ouvrage_hydrau_banq_type = db.relationship( + TNomenclatures, foreign_keys=[id_nomenclature_ouvrage_hydrau_banq_type] + ) + + ouvrag_hydrau_tirant_air = db.Column(db.Float) + + source = db.Column(db.Unicode) + + meta_create_date = db.Column( + db.DateTime, + ) + meta_update_date = db.Column(db.DateTime) + + areas = db.relationship(LAreas, secondary=CorPfArea.__table__) + linears = db.relationship(LLinears, secondary=CorPfLinear.__table__) + + medias = db.relationship( + TMedias, + primaryjoin=TMedias.uuid_attached_row == uuid_passage_faune, + foreign_keys=[TMedias.uuid_attached_row], + cascade="all", + lazy="select", + ) + + # actors + actors = db.relationship("Actor", cascade="all,delete,delete-orphan") + + # columns properties + geom_x = column_property(func.st_x(func.st_centroid(geom))) + geom_y = column_property(func.st_y(func.st_centroid(geom))) + geom_text = column_property(func.st_astext(geom)) + + label_infrastructures = column_property( + select([func.string_agg(LLinears.linear_name, literal_column("', '"))]).where( + and_( + CorPfLinear.id_passage_faune == id_passage_faune, + CorPfLinear.id_linear == LLinears.id_linear, + BibLinearsTypes.id_type == LLinears.id_type, + BibLinearsTypes.type_code == "RTE", + ) + ) + ) + + label_communes = column_property( + select([func.string_agg(LAreas.area_name, literal_column("', '"))]).where( + and_( + CorPfArea.id_passage_faune == id_passage_faune, + CorPfArea.id_area == LAreas.id_area, + BibAreasTypes.id_type == LAreas.id_type, + BibAreasTypes.type_code == "COM", + ) + ) + ) + + label_departements = column_property( + select([func.string_agg(LAreas.area_name, literal_column("', '"))]).where( + and_( + CorPfArea.id_passage_faune == id_passage_faune, + CorPfArea.id_area == LAreas.id_area, + BibAreasTypes.id_type == LAreas.id_type, + BibAreasTypes.type_code == "DEP", + ) + ) + ) + + label_regions = column_property( + select([func.string_agg(LAreas.area_name, literal_column("', '"))]).where( + and_( + CorPfArea.id_passage_faune == id_passage_faune, + CorPfArea.id_area == LAreas.id_area, + BibAreasTypes.id_type == LAreas.id_type, + BibAreasTypes.type_code == "REG", + ) + ) + ) + + +class Actor(db.Model): + __tablename__ = "cor_actor_pf" + __table_args__ = {"schema": "pr_sipaf"} + + id_actor = db.Column(db.Integer, primary_key=True) + + id_passage_faune = db.Column( + db.Integer, + db.ForeignKey( + "pr_sipaf.t_passages_faune.id_passage_faune", + ondelete="CASCADE", + onupdate="CASCADE", + ), + nullable=False, + ) + passage_faune = db.relationship(PassageFaune) + + id_role = db.Column(db.Integer, db.ForeignKey("utilisateurs.t_roles.id_role")) + role = db.relationship(User) + + id_organism = db.Column(db.Integer, db.ForeignKey("utilisateurs.bib_organismes.id_organisme")) + organisme = db.relationship(Organisme) + + id_nomenclature_type_actor = db.Column( + db.Integer, + db.ForeignKey( + "ref_nomenclatures.t_nomenclatures.id_nomenclature", + ondelete="CASCADE", + onupdate="CASCADE", + ), + nullable=False, + ) + nomenclature_type_actor = db.relationship(TNomenclatures) + + +class Diagnostic(db.Model): + __tablename__ = "t_diagnostics" + __table_args__ = {"schema": "pr_sipaf"} + + id_diagnostic = db.Column(db.Integer, primary_key=True) + + id_passage_faune = db.Column( + db.Integer, + db.ForeignKey( + "pr_sipaf.t_passages_faune.id_passage_faune", + ondelete="CASCADE", + onupdate="CASCADE", + ), + nullable=False, + ) + + passage_faune = db.relationship(PassageFaune, backref="diagnostics") + + date_diagnostic = db.Column(db.Date) + + id_role = db.Column(db.Integer, db.ForeignKey("utilisateurs.t_roles.id_role")) + role = db.relationship(User) + + id_organism = db.Column(db.Integer, db.ForeignKey("utilisateurs.bib_organismes.id_organisme")) + organisme = db.relationship(Organisme) diff --git a/config/modules/contrib/m_sipaf/config.yml b/config/modules/contrib/m_sipaf/config.yml index 23366262..30b16c05 100644 --- a/config/modules/contrib/m_sipaf/config.yml +++ b/config/modules/contrib/m_sipaf/config.yml @@ -202,6 +202,21 @@ site_details_fields: - type: medias key: medias + - label: __f__o.tab_label(x) + object_code: diagnostic + items: + - code: utils.button_create + flex: "0" + - type: object + display: table + items: + - date_diagnostic + - organisme.nom_organisme + - role.nom_complet + prefilters: __f__`id_passage_faune = ${o.object(x, 'site').value}` + sort: date_diagnostic- + + site_form_fields: display: tabs overflow: true diff --git a/config/modules/contrib/m_sipaf/definitions/m_sipaf.actor.schema.yml b/config/modules/contrib/m_sipaf/definitions/m_sipaf.actor.schema.yml index a364b2fb..070417d6 100644 --- a/config/modules/contrib/m_sipaf/definitions/m_sipaf.actor.schema.yml +++ b/config/modules/contrib/m_sipaf/definitions/m_sipaf.actor.schema.yml @@ -3,9 +3,6 @@ type: schema code: m_sipaf.actor title: schema acteur site description: Définition du schema pour les acteurs liés aux sites -required: - - id_passage_faune - - id_nomenclature_type_actor meta: autoschema: true schema_code: m_sipaf.actor @@ -22,46 +19,19 @@ meta: - id_passage_faune properties: id_actor: - type: integer - primary_key: true title: ID actor id_passage_faune: - type: integer - foreign_key: true - schema_code: m_sipaf.pf title: Passage_faune - required: true id_organism: - type: integer - foreign_key: true schema_code: user.organisme - title: Organisme id_role: - type: integer - foreign_key: true - schema_code: user.role title: Utilisateur id_nomenclature_type_actor: - type: integer - foreign_key: true - schema_code: ref_nom.nomenclature title: "Type d'acteur" nomenclature_type: PF_TYPE_ACTOR nomenclature_type_actor: - type: relation - relation_type: n-1 - local_key: id_nomenclature_type_actor - schema_code: ref_nom.nomenclature title: "Type d'acteur" role: - type: relation - relation_type: n-1 - local_key: id_role - schema_code: user.role title: Rôle organisme: - type: relation - relation_type: n-1 - local_key: id_organism - schema_code: user.organisme title: Organisme diff --git a/config/modules/contrib/m_sipaf/definitions/m_sipaf.diag.schema.yml b/config/modules/contrib/m_sipaf/definitions/m_sipaf.diag.schema.yml new file mode 100644 index 00000000..29de12cc --- /dev/null +++ b/config/modules/contrib/m_sipaf/definitions/m_sipaf.diag.schema.yml @@ -0,0 +1,24 @@ +type: schema +code: m_sipaf.diag +title: schema diagnostic passage faune +description: schema pour les diagnostics des passages à faune + +meta: + autoschema: true + model: m_sipaf.models.Diagnostic + genre: M + label: diagnostic + label_field_name: date_diagnostic + unique: + - id_passage_faune + - date_diagnostic + - id_organism + unique_in_db: true +properties: + date_diagnostic: + title: Date + role: + title: Agent + organisme: + title: Organisme + diff --git a/config/modules/contrib/m_sipaf/definitions/m_sipaf.pf.schema.yml_save b/config/modules/contrib/m_sipaf/definitions/m_sipaf.pf.schema.yml_save new file mode 100644 index 00000000..b3828fb3 --- /dev/null +++ b/config/modules/contrib/m_sipaf/definitions/m_sipaf.pf.schema.yml_save @@ -0,0 +1,314 @@ +type: schema +code: m_sipaf.pf +title: schema passage faune +description: schema pour les passages à faune + +meta: + # sql_processing: true + # sql_schema_dot_table: pr_sipaf.t_passages_faune + # unique_in_db: true + autoschema: true + model: m_sipaf.models.PassageFaune + genre: M + label: passage à faune + labels: passages à faune + label_field_name: code_passage_faune + geometry_field_name: geom + unique: + - code_passage_faune + check_cruved: true + +properties: + id_passage_faune: + type: integer + title: ID + primary_key: true + code_passage_faune: + type: string + title: Code passage faune + required: true + description: "Code permettant d'identifier le passage à faune de manière unique (texte)" + uuid_passage_faune: + type: uuid + title: UUID + default: uuid + description: Identifiant universel unique au format UUID (uuid_pf) + id_digitiser: + type: integer + foreign_key: true + schema_code: user.role + title: Numérisateur + description: Personne qui a saisi la donnée + digitiser: + type: relation + relation_type: n-1 + schema_code: user.role + title: Numérisateur + description: Personne qui a saisi la donnée + local_key: id_digitiser + pi_ou_ps: + type: boolean + title: Positionnement + description: Positionnement du passage vis-à vis de l’infrastructure (inférieur (False) ou supérieur (True)) + labels: + - Supérieur + - Inférieur + geom: + type: geometry + geometry_type: geometry + srid: 4326 + title: Geometrie (4326) + description: Géometrie du passage à faune (SRID=4326) + index: true + required: true + geom_local: + type: geometry + geometry_type: geometry + srid: __LOCAL_SRID__ + title: Geometrie locale (__LOCAL_SRID__) + description: Géométrie locale du passage à faune (SRID=__LOCAL_SRID__) + index: true + trigger: + name: copy_geom + key: geom + pk: + type: number + title: Point kilométrique + description: Point kilométrique + min: 0 + pr: + type: integer + title: Point Repère + description: Point repère + min: 0 + pr_abs: + type: integer + title: Point repère abscisse (m) + description: Distance en abscisse curviligne depuis le dernier PR + min: 0 + code_ouvrage_gestionnaire: + type: string + title: Code ouvrage gestionnaire + description: Code de l’ouvrage (pour le gestionnaire) + nom_usuel_passage_faune: + type: string + title: Nom Passage Faune + description: "Nom usuel utilisé pour dénommer l'ouvrage (nom_usuel_pf)" + issu_requalification: + type: boolean + title: Requalification + description: "L'ouvrage est issu d'une opération de requalification ?" + labels: + - Oui + - Non + date_creation_ouvrage: + type: date + title: Date de réalisation + description: "Date de la réalisation de l'ouvrage" + date_requalification_ouvrage: + type: date + title: Date de requalification + description: "Date de la requalification de l'ouvrage" + largeur_ouvrage: + type: number + title: Largeur ouvrage (m) + description: "Largeur de l'ouvrage en mètre" + min: 0 + hauteur_ouvrage: + type: number + title: Hauteur ouvrage (m) + description: "Hauteur de l'ouvrage en mètre" + min: 0 + longueur_franchissement: + type: number + title: Longueur de franchissement (m) + description: "Longueur de franchissement de l'ouvrage en mètres (ne prend pas en compte l'épaisseur des matériaux et éventuels obstacles)" + min: 0 + diametre: + type: number + title: Diamètre (m) + description: Diamètre de la buse en mètre + min: 0 + largeur_dispo_faune: + type: number + title: Largeur disponible (m) + description: "Largeur de l'ouvrage effectivement disponible pour la faune en mètre" + min: 0 + hauteur_dispo_faune: + type: number + title: Hauteur disponible (m) + description: "Hauteur de l'ouvrage effectivement disponible pour la faune en mètre" + min: 0 + id_nomenclature_ouvrage_specificite: + type: integer + title: Spécificité du passage faune + description: Exclusivité pour le passage faune (specificite) + foreign_key: true + schema_code: ref_nom.nomenclature + nomenclature_type: PF_OUVRAGE_SPECIFICITE + nomenclatures_ouvrage_type: + type: relation + relation_type: n-n + title: "Type d'ouvrage" + description: "Type d'ouvrage d'art (lb_type_ouvrage)" + schema_dot_table: pr_sipaf.cor_pf_nomenclature_ouvrage_type + schema_code: ref_nom.nomenclature + nomenclature_type: PF_OUVRAGE_TYPE + ouvrage_type_autre: + type: string + title: Autre type d'ouvrage + nomenclatures_ouvrage_materiaux: + type: relation + relation_type: n-n + schema_code: ref_nom.nomenclature + schema_dot_table: pr_sipaf.cor_pf_nomenclature_ouvrage_materiaux + title: Matériaux + description: "Matériaux composants l'ouvrage d'art (lb_materiaux)" + nomenclature_type: PF_OUVRAGE_MATERIAUX + ouvrage_hydrau: + type: boolean + title: Ouvrage hydraulique + description: Ouvrage hydraulique ou non + labels: + - Oui + - Non + id_nomenclature_ouvrage_hydrau_position: + type: integer + title: Ouvrage hydraulique Position + description: Ouvrage hydraulique Position (ouvrage_hydrau_position) + foreign_key: true + schema_code: ref_nom.nomenclature + nomenclature_type: PF_OUVRAGE_HYDRAULIQUE_POSITION + id_nomenclature_ouvrage_hydrau_banq_caract: + type: integer + title: Caractérisation banquette + description: "Caractérisation de la banquette dans le cas d'un ouvrage hydraulique (ouvrage_hydrau_caract_banquette)" + nomenclature_type: PF_OUVRAGE_HYDRAULIQUE_BANQ_CARACT + foreign_key: true + schema_code: ref_nom.nomenclature + id_nomenclature_ouvrage_hydrau_banq_type: + type: integer + title: Type de banquette + description: "Type de la banquette dans le cas d'un ouvrage hydraulique (ouvrage_hydrau_type_banquette)" + foreign_key: true + schema_code: ref_nom.nomenclature + nomenclature_type: PF_OUVRAGE_HYDRAULIQUE_BANQ_TYPE + ouvrag_hydrau_tirant_air: + type: number + title: "Tirant d'air banquette (m)" + description: " Tirant d'air existant entre la banquette et le plafond de l'ouvrage, en mètre" + source: + type: string + title: Source + description: Source de la donnée + nomenclature_ouvrage_specificite: + type: relation + relation_type: n-1 + title: Spécificité du passage faune + description: Exclusivité pour le passage faune + local_key: id_nomenclature_ouvrage_specificite + schema_code: ref_nom.nomenclature + nomenclature_ouvrage_hydrau_position: + type: relation + relation_type: n-1 + schema_code: ref_nom.nomenclature + title: Position banquette + local_key: id_nomenclature_ouvrage_hydrau_position + nomenclature_ouvrage_hydrau_banq_caract: + type: relation + relation_type: n-1 + schema_code: ref_nom.nomenclature + title: OH Caractérisation banquette + local_key: id_nomenclature_ouvrage_hydrau_banq_caract + nomenclature_ouvrage_hydrau_banq_type: + type: relation + relation_type: n-1 + schema_code: ref_nom.nomenclature + title: OH type de banquette + local_key: id_nomenclature_ouvrage_hydrau_banq_type + meta_create_date: + type: datetime + title: Date de création (en base) + meta_update_date: + type: datetime + title: Date de modification (en base) + areas: + type: relation + title: Areas + relation_type: n-n + schema_code: ref_geo.area + schema_dot_table: pr_sipaf.cor_area_pf + trigger: + name: intersect_ref_geo + key: geom_local + 'on': geom + linears: + type: relation + title: Linéaires + relation_type: n-n + schema_code: ref_geo.linear + schema_dot_table: pr_sipaf.cor_linear_pf + trigger: + name: d_within + distance: 100 + key: geom_local + 'on': geom + partition: + - id_type + actors: + type: relation + relation_type: 1-n + foreign_key: id_passage_faune + schema_code: m_sipaf.actor + title: Acteurs + description: Acteurs du passage à faune + medias: + type: relation + title: medias + relation_type: 1-n + foreign_key: uuid_attached_row + local_key: uuid_passage_faune + schema_code: commons.media + geom_x: + type: number + title: Latitude + column_property: st_x + key: geom + geom_y: + type: number + title: Longitude + column_property: st_y + key: geom + geom_text: + type: string + title: Geométrie (text) + column_property: st_astext + key: geom + label_infrastructures: + type: string + title: Infrastructure traversée + column_property: label + relation_key: linears + label_key: linear_name + filters: type.type_code = RTE + label_communes: + type: string + title: Commune(s) + column_property: label + relation_key: areas + label_key: area_name + filters: area_type.type_code in COM + label_departements: + type: string + title: Département(s) + column_property: label + relation_key: areas + label_key: area_name + filters: area_type.type_code in DEP + label_regions: + type: string + title: Région(s) + column_property: label + relation_key: areas + label_key: area_name + filters: area_type.type_code in REG diff --git a/config/modules/contrib/m_sipaf/m_sipaf.module.yml b/config/modules/contrib/m_sipaf/m_sipaf.module.yml index 5450b41f..4c4cbadf 100644 --- a/config/modules/contrib/m_sipaf/m_sipaf.module.yml +++ b/config/modules/contrib/m_sipaf/m_sipaf.module.yml @@ -22,10 +22,15 @@ objects: actor: schema_code: m_sipaf.actor cruved: R + diagnostic: + schema_code: m_sipaf.diag + cruved: CRUD + tree: pf: + diagnostic: pages_definition: site: @@ -36,3 +41,9 @@ pages_definition: code: m_sipaf.site_edit edit: details: + diagnostic: + details: + edit: + create: + layout: + code: m_sipaf.diagnostic_edit \ No newline at end of file diff --git a/frontend/app/components/layout/base/layout.component.ts b/frontend/app/components/layout/base/layout.component.ts index cf2aacf6..d0a5a0db 100644 --- a/frontend/app/components/layout/base/layout.component.ts +++ b/frontend/app/components/layout/base/layout.component.ts @@ -253,8 +253,13 @@ export class ModulesLayoutComponent implements OnInit { this.context.current_user = computedContext.current_user; const objectConfig = this.objectConfig() || {}; - for (const key of ['filters', 'prefilters', 'value', 'nb_filtered', 'nb_total']) { - this.context[key] = layout[key] || this.parentContext[key] || objectConfig[key]; + if ( + this.parentContext.object_code && + this.context.object_code == this.parentContext.object_code + ) { + for (const key of ['filters', 'prefilters', 'value', 'nb_filtered', 'nb_total']) { + this.context[key] = layout[key] || this.parentContext[key] || objectConfig[key]; + } } // ici pour filter value, etc.... From 9b2b8ae719c07739a6cecefc2f8479550970d3a9 Mon Sep 17 00:00:00 2001 From: "joel.clement" Date: Wed, 29 Mar 2023 11:01:26 +0200 Subject: [PATCH 037/142] import geom xy --- backend/gn_modulator/imports/mixins/count.py | 3 ++ backend/gn_modulator/imports/mixins/raw.py | 31 ++++++++++++++----- backend/gn_modulator/imports/mixins/update.py | 11 ------- .../tests/import_test/synthese_xy.csv | 3 ++ backend/gn_modulator/tests/test_import.py | 14 +++++++++ .../90f6e5531f7c_diagnostic_m_sipaf.py | 16 ++++++---- 6 files changed, 54 insertions(+), 24 deletions(-) create mode 100644 backend/gn_modulator/tests/import_test/synthese_xy.csv diff --git a/backend/gn_modulator/imports/mixins/count.py b/backend/gn_modulator/imports/mixins/count.py index b389198a..90a63453 100644 --- a/backend/gn_modulator/imports/mixins/count.py +++ b/backend/gn_modulator/imports/mixins/count.py @@ -29,6 +29,8 @@ def sql_nb_update(self, from_table): txt_update_conditions = "" + "\n OR ".join(v_update_conditions) + "" + print(txt_update_conditions) + return f""" SELECT COUNT(*) @@ -47,6 +49,7 @@ def count_update(self): try: self.res["nb_update"] = SchemaMethods.c_sql_exec_txt(self.sql["nb_update"]).scalar() except Exception as e: + print(self.sql["nb_update"]) self.add_error( code="ERR_IMPORT_UPDATE_COUNT", msg=f"Erreur lors du comptage du nombre d'update: {str(e)}", diff --git a/backend/gn_modulator/imports/mixins/raw.py b/backend/gn_modulator/imports/mixins/raw.py index c233566b..49fc1481 100644 --- a/backend/gn_modulator/imports/mixins/raw.py +++ b/backend/gn_modulator/imports/mixins/raw.py @@ -43,13 +43,15 @@ def sql_raw_view( from_table_columns = self.get_table_columns(from_table) - columns = filter( - lambda x: ( - x in keys - if keys is not None - else not (sm.is_column(x) and sm.property(x).get("primary_key")) - ), - from_table_columns, + columns = list( + filter( + lambda x: ( + x in keys + if keys is not None + else not (sm.is_column(x) and sm.property(x).get("primary_key")) + ), + from_table_columns, + ) ) # on preprocess ttes les colonnes @@ -60,6 +62,21 @@ def sql_raw_view( ) ) + # traitement de la geometrie en x y + # si des champs x et y sont présents + # s'il n'y a pas de champs geom + if ( + sm.geometry_field_name() + and sm.geometry_field_name() not in columns + and "x" in from_table_columns + and "y" in from_table_columns + ): + txt_geom_xy = f"""ST_SETSRID( + ST_MAKEPOINT(x::FLOAT, y::FLOAT), + {sm.property(sm.geometry_field_name()).get('srid')} + ) as {sm.geometry_field_name()}""" + v_txt_pre_process_columns.append(txt_geom_xy) + v_txt_columns = list(map(lambda x: self.process_raw_import_column(x), columns)) txt_primary_column = f"""CONCAT({", '|', ".join( diff --git a/backend/gn_modulator/imports/mixins/update.py b/backend/gn_modulator/imports/mixins/update.py index 378cefc4..13d67862 100644 --- a/backend/gn_modulator/imports/mixins/update.py +++ b/backend/gn_modulator/imports/mixins/update.py @@ -6,17 +6,6 @@ class ImportMixinUpdate(ImportMixinUtils): def process_update(self): from_table = self.tables["process"] - self.sql["nb_update"] = self.sql_nb_update(from_table) - - try: - self.res["nb_update"] = SchemaMethods.c_sql_exec_txt(self.sql["nb_update"]).scalar() - except Exception as e: - self.add_error( - code="ERR_IMPORT_UPDATE_COUNT", - msg=f"Erreur lors du comptage du nombre d'update: {str(e)}", - ) - return - self.sql["update"] = self.sql_update(from_table) if self.res["nb_update"] == 0: diff --git a/backend/gn_modulator/tests/import_test/synthese_xy.csv b/backend/gn_modulator/tests/import_test/synthese_xy.csv new file mode 100644 index 00000000..3f3055b7 --- /dev/null +++ b/backend/gn_modulator/tests/import_test/synthese_xy.csv @@ -0,0 +1,3 @@ +cd_nom,id_source,entity_source_pk_value,nom_cite,date_min,date_max,cor_observers,x,y +67111,Occtax,23,Ablette,"2017-01-08 20:00:00.000","2017-01-08 23:00:00.000","admin",0,45 +67111,Occtax,24,Ablette,"2017-01-08 20:00:00.000","2017-01-08 23:00:00.000","admin",1,45 \ No newline at end of file diff --git a/backend/gn_modulator/tests/test_import.py b/backend/gn_modulator/tests/test_import.py index 40909299..4978acae 100644 --- a/backend/gn_modulator/tests/test_import.py +++ b/backend/gn_modulator/tests/test_import.py @@ -105,6 +105,20 @@ def test_ref_geo_area(self): print(impt.sql["nb_insert"]) print(impt.sql["nb_update"]) + def test_synthese_x_y(self): + module_code = "MODULATOR" + object_code = "syn.synthese" + data_file_path = import_test_dir / "synthese_xy.csv" + expected_infos = { + "res.nb_data": 2, + "res.nb_insert": 2, + "res.nb_update": 0, + "res.nb_unchanged": 0, + "data_type": "csv", + "csv_delimiter": ",", + } + test_data_file(module_code, object_code, data_file_path, expected_infos=expected_infos) + # Test remontées d'erreurs def test_error_ERR_IMPORT_INVALID_VALUE_FOR_TYPE(self): diff --git a/config/modules/contrib/m_sipaf/backend/m_sipaf/migrations/versions/90f6e5531f7c_diagnostic_m_sipaf.py b/config/modules/contrib/m_sipaf/backend/m_sipaf/migrations/versions/90f6e5531f7c_diagnostic_m_sipaf.py index e97509c6..cb63f417 100644 --- a/config/modules/contrib/m_sipaf/backend/m_sipaf/migrations/versions/90f6e5531f7c_diagnostic_m_sipaf.py +++ b/config/modules/contrib/m_sipaf/backend/m_sipaf/migrations/versions/90f6e5531f7c_diagnostic_m_sipaf.py @@ -10,14 +10,15 @@ # revision identifiers, used by Alembic. -revision = '90f6e5531f7c' -down_revision = 'ec6ebeb214b1' +revision = "90f6e5531f7c" +down_revision = "ec6ebeb214b1" branch_labels = None depends_on = None def upgrade(): - op.execute(""" + op.execute( + """ CREATE TABLE pr_sipaf.t_diagnostics ( id_diagnostic SERIAL NOT NULL, id_passage_faune INTEGER NOT NULL, @@ -44,12 +45,15 @@ def upgrade(): REFERENCES utilisateurs.bib_organismes(id_organisme) ON UPDATE CASCADE ON DELETE SET NULL; - """) + """ + ) pass def downgrade(): - op.execute(""" + op.execute( + """ DROP TABLE pr_sipaf.t_diagnostics CASCADE; - """) + """ + ) pass From 49c5e6d9cb90d0900a7fe6d4a18747ab8019a348 Mon Sep 17 00:00:00 2001 From: "joel.clement" Date: Thu, 30 Mar 2023 11:32:44 +0200 Subject: [PATCH 038/142] count rel update --- .../gn_modulator/imports/mixins/__init__.py | 3 +- backend/gn_modulator/imports/mixins/count.py | 86 +++++++++++--- backend/gn_modulator/imports/mixins/raw.py | 8 +- .../gn_modulator/imports/mixins/relation.py | 106 ++++++++++-------- .../tests/import_test/synthese_obs.csv | 3 + .../tests/import_test/synthese_obs_update.csv | 3 + backend/gn_modulator/tests/test_import.py | 25 +++++ backend/gn_modulator/tests/utils/imports.py | 2 + 8 files changed, 170 insertions(+), 66 deletions(-) create mode 100644 backend/gn_modulator/tests/import_test/synthese_obs.csv create mode 100644 backend/gn_modulator/tests/import_test/synthese_obs_update.csv diff --git a/backend/gn_modulator/imports/mixins/__init__.py b/backend/gn_modulator/imports/mixins/__init__.py index 94cb2a28..88957563 100644 --- a/backend/gn_modulator/imports/mixins/__init__.py +++ b/backend/gn_modulator/imports/mixins/__init__.py @@ -50,6 +50,7 @@ def process_load_data_and_check(self): "process_pre_check", "process_raw_view", "process_view", + "process_relations_view", "process_post_check", "process_count", ]: @@ -64,7 +65,7 @@ def process_insert_and_update(self): for action in [ "process_insert", "process_update", - "process_relations", + "process_relations_data", ]: getattr(self, action)() if self.status == "ERROR": diff --git a/backend/gn_modulator/imports/mixins/count.py b/backend/gn_modulator/imports/mixins/count.py index 90a63453..2845fa20 100644 --- a/backend/gn_modulator/imports/mixins/count.py +++ b/backend/gn_modulator/imports/mixins/count.py @@ -10,42 +10,96 @@ def process_count(self): self.res["nb_process"] - self.res["nb_insert"] - self.res["nb_update"] ) - def sql_nb_update(self, from_table): + def update_condition_columns(self): sm = SchemaMethods(self.schema_code) - - columns = self.get_table_columns(from_table) - - v_update_conditions = list( + columns = self.get_table_columns(self.tables["raw"]) + return list( map( lambda x: f"(t.{x}::TEXT IS DISTINCT FROM a.{x}::TEXT)", filter( - lambda x: sm.has_property(x) - and sm.is_column(x) - and not sm.property(x).get("primary_key"), + lambda x: sm.is_column(x) and not sm.property(x).get("primary_key"), columns, ), ) ) - txt_update_conditions = "" + "\n OR ".join(v_update_conditions) + "" + def with_rel(self, key): + sm = SchemaMethods(self.schema_code) + pk = sm.pk_field_name() + rel = SchemaMethods(sm.property(key)["schema_code"]) + rel_pk = rel.pk_field_name() + cor_table = sm.property(key)["schema_dot_table"] + + return f"""process_{key} AS ( + SELECT + {pk}, + ARRAY_AGG({rel_pk}) AS a + FROM {self.tables['relations'][key]['process_view']} + GROUP BY {pk} + ), cor_{key} AS ( + SELECT + {pk}, + ARRAY_AGG({rel_pk}) AS a + FROM {cor_table} + GROUP BY {pk} + )""" + + def join_rel(self, key): + sm = SchemaMethods(self.schema_code) + pk = sm.pk_field_name() - print(txt_update_conditions) + return f""" LEFT JOIN process_{key} + ON process_{key}.{pk} = t.{pk} + LEFT JOIN cor_{key} + ON cor_{key}.{pk} = t.{pk}""" + + def update_condition_rel(self, key): + return f"""process_{key}.a IS DISTINCT FROM cor_{key}.a""" + + def update_condition_relations(self): + sm = SchemaMethods(self.schema_code) + columns = self.get_table_columns(self.tables["raw"]) + relations = list( + filter( + lambda x: sm.has_property(x) and sm.property(x).get("relation_type") == "n-n", + columns, + ) + ) + withs_rel = list(map(lambda x: self.with_rel(x), relations)) + joins_rel = list(map(lambda x: self.join_rel(x), relations)) + update_conditions_rel = list(map(lambda x: self.update_condition_rel(x), relations)) - return f""" + return withs_rel, joins_rel, update_conditions_rel + + def sql_nb_update(self): + sm = SchemaMethods(self.schema_code) + + update_conditions_columns = self.update_condition_columns() + withs_rel, joins_rel, update_condition_relations = self.update_condition_relations() + + txt_update_conditions = ( + "" + "\n OR ".join(update_conditions_columns + update_condition_relations) + "" + ) + + withs_rel_txt = "" + joins_rel_txt = "" + if len(withs_rel): + withs_rel_txt = " WITH " + "\n,".join(withs_rel) + joins_rel_txt = "\n".join(joins_rel) + + return f"""{withs_rel_txt} SELECT COUNT(*) FROM {sm.sql_schema_dot_table()} t - JOIN {from_table} a + JOIN {self.tables['process']} a ON a.{sm.pk_field_name()} = t.{sm.pk_field_name()} +{joins_rel_txt} WHERE {txt_update_conditions} ; """ def count_update(self): - from_table = self.tables["process"] - - self.sql["nb_update"] = self.sql_nb_update(from_table) - + self.sql["nb_update"] = self.sql_nb_update() try: self.res["nb_update"] = SchemaMethods.c_sql_exec_txt(self.sql["nb_update"]).scalar() except Exception as e: diff --git a/backend/gn_modulator/imports/mixins/raw.py b/backend/gn_modulator/imports/mixins/raw.py index 49fc1481..9d3589af 100644 --- a/backend/gn_modulator/imports/mixins/raw.py +++ b/backend/gn_modulator/imports/mixins/raw.py @@ -48,7 +48,13 @@ def sql_raw_view( lambda x: ( x in keys if keys is not None - else not (sm.is_column(x) and sm.property(x).get("primary_key")) + else ( + sm.has_property(x) + and ( + (not sm.property(x).get("primary_key")) + or sm.property(x).get("relation_type") == "n-n" + ) + ) ), from_table_columns, ) diff --git a/backend/gn_modulator/imports/mixins/relation.py b/backend/gn_modulator/imports/mixins/relation.py index 73c36a97..4279a315 100644 --- a/backend/gn_modulator/imports/mixins/relation.py +++ b/backend/gn_modulator/imports/mixins/relation.py @@ -6,48 +6,51 @@ class ImportMixinRelation(ImportMixinInsert, ImportMixinProcess, ImportMixinRaw, ImportMixinUtils): - def process_relations(self): - from_table = self.tables.get("mapping") or self.tables["data"] + def get_n_n_relations(self, from_table): sm = SchemaMethods(self.schema_code) + return list( + filter( + lambda x: sm.is_relationship(x) and sm.property(x).get("relation_type") == "n-n", + self.get_table_columns(from_table), + ) + ) - columns = self.get_table_columns(from_table) - - for index, key in enumerate(columns): - if not sm.is_relationship(key): - continue - property = sm.property(key) + def process_relations_view(self): + from_table = self.tables.get("mapping") or self.tables["data"] - # on commence par les n-n - if property.get("relation_type") in ("n-n"): - self.import_relation_n_n(from_table, key) + for key in self.get_n_n_relations(from_table): + self.process_relation_views(key, from_table) - def import_relation_n_n(self, from_table, key): - sm = SchemaMethods(self.schema_code) + def process_relations_data(self): + from_table = self.tables.get("mapping") or self.tables["data"] - self.sql[key] = {} + for key in self.get_n_n_relations(from_table): + self.process_relation_data(key) - property = sm.property(key) - cor_table = property["schema_dot_table"] - rel = SchemaMethods(property["schema_code"]) + def process_relation_views(self, key, from_table): + self.sql["relations"] = self.sql.get("relations") or {} + self.tables["relations"] = self.tables.get("relations") or {} + sql = self.sql["relations"][key] = {} + tables = self.tables["relations"][key] = {} - raw_delete_view = self.table_name("raw_delete", key) - process_delete_view = self.table_name("process_delete", key) - raw_import_view = self.table_name("raw", key) - process_import_view = self.table_name("process", key) + tables["raw_delete_view"] = self.table_name("raw_delete", key) + tables["process_delete_view"] = self.table_name("process_delete", key) + tables["raw_view"] = self.table_name("raw", key) + tables["process_view"] = self.table_name("process", key) # 0) clean + SchemaMethods.c_sql_exec_txt(f"DROP VIEW IF EXISTS {tables['process_delete_view']}") + SchemaMethods.c_sql_exec_txt(f"DROP VIEW IF EXISTS {tables['raw_delete_view']}") + SchemaMethods.c_sql_exec_txt(f"DROP VIEW IF EXISTS {tables['process_view']}") + SchemaMethods.c_sql_exec_txt(f"DROP VIEW IF EXISTS {tables['raw_view']}") - SchemaMethods.c_sql_exec_txt(f"DROP VIEW IF EXISTS {process_delete_view}") - SchemaMethods.c_sql_exec_txt(f"DROP VIEW IF EXISTS {raw_delete_view}") - SchemaMethods.c_sql_exec_txt(f"DROP VIEW IF EXISTS {process_import_view}") - SchemaMethods.c_sql_exec_txt(f"DROP VIEW IF EXISTS {raw_import_view}") + sql["raw_view"] = self.sql_raw_view( + from_table, tables["raw_view"], keys=[key], key_unnest=key + ) # 1) create raw_temp_table for n-n - self.sql[key]["raw_view"] = self.sql_raw_view( - from_table, raw_import_view, keys=[key], key_unnest=key - ) try: - SchemaMethods.c_sql_exec_txt(self.sql[key]["raw_view"]) + SchemaMethods.c_sql_exec_txt(sql["raw_view"]) except Exception as e: self.add_error( code="ERR_IMPORT_RELATION_CREATE_RAW_VIEW", @@ -55,11 +58,12 @@ def import_relation_n_n(self, from_table, key): ) return - self.sql[key]["process_view"] = self.sql_process_view( - raw_import_view, process_import_view, keys=[key] + sql["process_view"] = self.sql_process_view( + tables["raw_view"], tables["process_view"], keys=[key] ) + try: - SchemaMethods.c_sql_exec_txt(self.sql[key]["process_view"]) + SchemaMethods.c_sql_exec_txt(sql["process_view"]) except Exception as e: self.add_error( code="ERR_IMPORT_RELATION_CREATE_PROCESS_VIEW", @@ -68,15 +72,11 @@ def import_relation_n_n(self, from_table, key): ) return - # 3) insert / update / delete ?? - - # - delete : tout depuis import_table - # create_view for delete - self.sql[key]["raw_delete_view"] = self.sql_raw_view( - from_table, raw_delete_view, keys=[key], key_unnest=key + sql["raw_delete_view"] = self.sql_raw_view( + from_table, tables["raw_delete_view"], keys=[key], key_unnest=key ) try: - SchemaMethods.c_sql_exec_txt(self.sql[key]["raw_delete_view"]) + SchemaMethods.c_sql_exec_txt(sql["raw_delete_view"]) except Exception as e: self.add_error( code="ERR_IMPORT_RELATION_CREATE_RAW_VIEW", @@ -84,11 +84,11 @@ def import_relation_n_n(self, from_table, key): ) return - self.sql[key]["process_delete_view"] = self.sql_process_view( - raw_delete_view, process_delete_view, keys=[key] + sql["process_delete_view"] = self.sql_process_view( + tables["raw_delete_view"], tables["process_delete_view"], keys=[key] ) try: - SchemaMethods.c_sql_exec_txt(self.sql[key]["process_delete_view"]) + SchemaMethods.c_sql_exec_txt(sql["process_delete_view"]) except Exception as e: self.add_error( code="ERR_IMPORT_RELATION_CREATE_PROCESS_DELETE_VIEW", @@ -96,15 +96,25 @@ def import_relation_n_n(self, from_table, key): ) return - self.sql[key][ + def process_relation_data(self, key): + sm = SchemaMethods(self.schema_code) + + tables = self.tables["relations"][key] + sql = self.tables["relations"][key] + + property = sm.property(key) + cor_table = property["schema_dot_table"] + rel = SchemaMethods(property["schema_code"]) + + sql[ "delete" ] = f""" DELETE FROM {cor_table} t - USING {process_delete_view} j + USING {tables['process_delete_view']} j WHERE t.{sm.pk_field_name()} = j.{sm.pk_field_name()}; """ try: - SchemaMethods.c_sql_exec_txt(self.sql[key]["delete"]) + SchemaMethods.c_sql_exec_txt(sql["delete"]) except Exception as e: self.add_error( code="ERR_IMPORT_RELATION_DELETE", @@ -113,13 +123,13 @@ def import_relation_n_n(self, from_table, key): return # - insert - self.sql[key]["insert"] = self.sql_insert( - process_import_view, + sql["insert"] = self.sql_insert( + tables["process_view"], keys=[sm.pk_field_name(), rel.pk_field_name()], dest_table=cor_table, ) try: - SchemaMethods.c_sql_exec_txt(self.sql[key]["insert"]) + SchemaMethods.c_sql_exec_txt(sql["insert"]) except Exception as e: self.add_error( code="ERR_IMPORT_RELATION_INSERT", diff --git a/backend/gn_modulator/tests/import_test/synthese_obs.csv b/backend/gn_modulator/tests/import_test/synthese_obs.csv new file mode 100644 index 00000000..faebc02f --- /dev/null +++ b/backend/gn_modulator/tests/import_test/synthese_obs.csv @@ -0,0 +1,3 @@ +cd_nom,id_source,entity_source_pk_value,nom_cite,date_min,date_max,cor_observers +67111,Occtax,21,Ablette,"2017-01-08 20:00:00.000","2017-01-08 23:00:00.000","admin,agent" +67111,Occtax,22,Ablette,"2017-01-08 20:00:00.000","2017-01-08 23:00:00.000","admin,agent" \ No newline at end of file diff --git a/backend/gn_modulator/tests/import_test/synthese_obs_update.csv b/backend/gn_modulator/tests/import_test/synthese_obs_update.csv new file mode 100644 index 00000000..f6d106f9 --- /dev/null +++ b/backend/gn_modulator/tests/import_test/synthese_obs_update.csv @@ -0,0 +1,3 @@ +cd_nom,id_source,entity_source_pk_value,nom_cite,date_min,date_max,cor_observers +67111,Occtax,21,Ablette,"2017-01-08 20:00:00.000","2017-01-08 23:00:00.000","admin,agent" +67111,Occtax,22,Ablette,"2017-01-08 20:00:00.000","2017-01-08 23:00:00.000","admin" \ No newline at end of file diff --git a/backend/gn_modulator/tests/test_import.py b/backend/gn_modulator/tests/test_import.py index 4978acae..00a6e22f 100644 --- a/backend/gn_modulator/tests/test_import.py +++ b/backend/gn_modulator/tests/test_import.py @@ -119,6 +119,31 @@ def test_synthese_x_y(self): } test_data_file(module_code, object_code, data_file_path, expected_infos=expected_infos) + def test_synthese_update_obs(self): + module_code = "MODULATOR" + object_code = "syn.synthese" + data_file_path = import_test_dir / "synthese_obs.csv" + expected_infos = { + "res.nb_data": 2, + "res.nb_insert": 2, + "res.nb_update": 0, + "res.nb_unchanged": 0, + "data_type": "csv", + "csv_delimiter": ",", + } + test_data_file(module_code, object_code, data_file_path, expected_infos=expected_infos) + + data_file_path = import_test_dir / "synthese_obs_update.csv" + expected_infos = { + "res.nb_data": 2, + "res.nb_insert": 0, + "res.nb_update": 1, + "res.nb_unchanged": 1, + "data_type": "csv", + "csv_delimiter": ",", + } + test_data_file(module_code, object_code, data_file_path, expected_infos=expected_infos) + # Test remontées d'erreurs def test_error_ERR_IMPORT_INVALID_VALUE_FOR_TYPE(self): diff --git a/backend/gn_modulator/tests/utils/imports.py b/backend/gn_modulator/tests/utils/imports.py index df45b6cb..081e90a2 100644 --- a/backend/gn_modulator/tests/utils/imports.py +++ b/backend/gn_modulator/tests/utils/imports.py @@ -28,6 +28,8 @@ def test_data_file( expected_errors = expected_infos.pop("errors", []) + print(import_infos["res"]) + if len(expected_errors) == 0: # on teste si le nombre d'erreur est bien nul assert len(import_infos["errors"]) == 0, import_infos["errors"] From 574ebd11c3ac453b6c0b84e35645408ffb363679 Mon Sep 17 00:00:00 2001 From: "joel.clement" Date: Thu, 30 Mar 2023 13:20:22 +0200 Subject: [PATCH 039/142] error alway visible --- config/layouts/utils/utils.import.layout.yml | 7 +- frontend/app/components/base/base.scss | 20 +++++- .../layout/base/layout-section.component.html | 1 + .../layout/base/layout-section.component.ts | 2 +- .../layout/form/form-element.component.html | 35 ++++----- frontend/app/services/import.service.ts | 71 ++++++------------- 6 files changed, 64 insertions(+), 72 deletions(-) diff --git a/config/layouts/utils/utils.import.layout.yml b/config/layouts/utils/utils.import.layout.yml index 3124343e..9d7b50e8 100644 --- a/config/layouts/utils/utils.import.layout.yml +++ b/config/layouts/utils/utils.import.layout.yml @@ -30,6 +30,7 @@ layout: required: __f__!data.tables?.data description: Choisir un fichier à importer disabled: __f__data.id_import + color: info - key: display_options title: Afficher les options avancées. type: boolean @@ -49,8 +50,8 @@ layout: Et une deuxième étape d'insertion et de mise à jour des données. type: boolean default: __f__true - - label: __f__`Erreurs (${data.errors?.length})` - hidden: __f__!data.errors?.length + - label: __f__`Erreurs (${data.errors?.length || 0})` + disabled: __f__!data.errors?.length items: - key: error_display_line title: Afficher les erreurs en ligne @@ -78,9 +79,9 @@ layout: disabled: __f__!(formGroup.valid ) hidden: __f__data.status == 'DONE' - type: button - color: info icon: refresh title: nouvel import + color: reset description: Faire un nouvel import action: reset hidden: __f__!data.id_import diff --git a/frontend/app/components/base/base.scss b/frontend/app/components/base/base.scss index 25c0153c..757341ba 100644 --- a/frontend/app/components/base/base.scss +++ b/frontend/app/components/base/base.scss @@ -30,18 +30,32 @@ } // couleur custom des bouttons -.layout-buttons .mat-success { +.mat-button-base.mat-success { background-color: green; color: #fff; } // couleur custom des bouttons -.layout-buttons .mat-error { +.mat-button-base.mat-info { + background-color: #4b8ed5; + color: #fff; +} + + +// couleur custom des bouttons +.mat-button-base.mat-error { background-color: red; color: #fff; } -.layout-buttons .mat-button-disabled { +// couleur custom des bouttons +.mat-button-base.mat-reset { + background-color: #d5cc4b; + color: #fff; +} + + +.mat-button-base.mat-button-disabled { color: rgba(0,0,0,.26); background-color: rgba(0,0,0,.12); } diff --git a/frontend/app/components/layout/base/layout-section.component.html b/frontend/app/components/layout/base/layout-section.component.html index f873c273..75405ae5 100644 --- a/frontend/app/components/layout/base/layout-section.component.html +++ b/frontend/app/components/layout/base/layout-section.component.html @@ -40,6 +40,7 @@ diff --git a/frontend/app/components/layout/base/layout-section.component.ts b/frontend/app/components/layout/base/layout-section.component.ts index d81a602c..69a0dc53 100644 --- a/frontend/app/components/layout/base/layout-section.component.ts +++ b/frontend/app/components/layout/base/layout-section.component.ts @@ -28,7 +28,7 @@ export class ModulesLayoutSectionComponent extends ModulesLayoutComponent implem return item; } const computedItem = {}; - for (const key of ['label', 'hidden']) { + for (const key of ['label', 'hidden', 'disabled']) { computedItem[key] = this._mLayout.evalLayoutElement({ element: item[key], layout: item, diff --git a/frontend/app/components/layout/form/form-element.component.html b/frontend/app/components/layout/form/form-element.component.html index 4148f86c..21883a34 100644 --- a/frontend/app/components/layout/form/form-element.component.html +++ b/frontend/app/components/layout/form/form-element.component.html @@ -1,7 +1,12 @@ - @@ -124,21 +129,19 @@ - - {{ computedLayout.title || elementKey }} - - - help - - + + {{ computedLayout.title || elementKey }} + + + help + + diff --git a/frontend/app/services/import.service.ts b/frontend/app/services/import.service.ts index f3ae27e0..7d87daf7 100644 --- a/frontend/app/services/import.service.ts +++ b/frontend/app/services/import.service.ts @@ -28,29 +28,40 @@ export class ModulesImportService { if (!data.id_import) { return { html: ` - Veuillez choisir un fichier et appuyer sur Valider`, + Veuillez choisir un fichier et appuyer sur Valider`, class: 'info', }; } if (data.status == 'READY') { + let html = ` +

Données prêtes pour l'import

+

- Nombre de lignes ${data.res.nb_raw}

+

- Nombre d'insertion ${data.res.nb_insert}

`; + if (data.options.enable_update && data.res.nb_update) { + html += `

- Nombre de mise à jour ${data.res.nb_update}

`; + } + if (!data.options.enable_update && data.res.nb_update) { + html += `

- Nombre de mise à jour ${data.res.nb_update} (MAJ Non autorisée)

`; + } + html += `

Veuillez appuyer sur valider pour insérer les données

`; return { - html: ` -

- Nombre de lignes ${data.res.nb_raw}

-

- Nombre d'insertion ${data.res.nb_insert}

-

- Nombre de mise à jour ${data.res.nb_update} ${ - data.options.enable_update ? '' : '(MAJ Non autorisée)' - }

- Veuillez appuyer sur valider pour insérer les données`, + html, class: 'info', }; } if (data.status == 'DONE') { + let html = ` +

Import Terminé

+

- Nombre de lignes ${data.res.nb_raw}

+

- Nombre d'insertion ${data.res.nb_insert}

+ `; + if (data.options.enable_update) { + html += `

- Nombre de mise à jour ${data.res.nb_update}

`; + } return { - html: ` - Import Terminé - `, + html, class: 'success', }; } @@ -124,42 +135,4 @@ export class ModulesImportService { } return errorHTML; } - - // for (let error of impt.errors.filter((e) => e.code == 'ERR_IMPORT_REQUIRED')) { - // if (!txtErrorRequired) { - // txtErrorRequired = `
`; - // } - // txtErrorRequired += `${error.key} ${error.lines.length} ligne(s): [${error.lines}]
`; - // } - // if (txtErrorRequired) { - // txtImport += '
'; - // txtImport += txtErrorRequired; - // } - - // let txtErrorUnresolved; - // for (let error of impt.errors.filter((e) => e.code == 'ERR_IMPORT_UNRESOLVED')) { - // if (!txtErrorUnresolved) { - // txtErrorUnresolved = `
Champs non résolus
`; - // } - // txtErrorUnresolved += `${error.key} ${error.lines.length} ligne(s): [${error.lines}]
`; - // if (error.values) { - // txtErrorUnresolved += `Valeurs parmi : ${error.values - // .map((v) => v.cd_nomenclature) - // .join(', ')}
`; - // } - // } - // if (txtErrorUnresolved) { - // txtImport += '
'; - // txtImport += txtErrorUnresolved; - // } - - // for (let error of impt.errors.filter( - // (e) => !['ERR_IMPORT_REQUIRED', 'ERR_IMPORT_UNRESOLVED'].includes(e.code) - // )) { - // txtImport += '
'; - // txtImport += `${error.code}: ${error.msg}`; - // } - - // return txtImport; - // } } From dbd54be794bedb612211c3725c5124c1a6a4ee80 Mon Sep 17 00:00:00 2001 From: "joel.clement" Date: Thu, 30 Mar 2023 16:41:31 +0200 Subject: [PATCH 040/142] import srid + doc import sipaf --- backend/gn_modulator/__init__.py | 7 +- backend/gn_modulator/commands.py | 8 +- backend/gn_modulator/imports/mixins/check.py | 2 +- .../gn_modulator/imports/mixins/process.py | 4 +- backend/gn_modulator/imports/mixins/raw.py | 49 ++++-- backend/gn_modulator/schema/auto.py | 1 + backend/gn_modulator/schema/base.py | 3 + backend/gn_modulator/schema/doc.py | 107 +++++++++++- backend/gn_modulator/schema/imports/base.py | 4 +- .../schema/repositories/filters.py | 5 +- backend/gn_modulator/schema/sql/constraint.py | 4 +- .../tests/import_test/synthese_srid.csv | 2 + backend/gn_modulator/tests/test_import.py | 29 ++++ backend/gn_modulator/tests/utils/imports.py | 4 +- .../gn_modulator/tests/utils/repository.py | 2 +- backend/gn_modulator/tests/utils/rest.py | 2 +- config/layouts/utils/utils.import.layout.yml | 4 + config/modules/contrib/m_sipaf/doc/import.md | 159 ++++++++++++++++++ 18 files changed, 366 insertions(+), 30 deletions(-) create mode 100644 backend/gn_modulator/tests/import_test/synthese_srid.csv create mode 100644 config/modules/contrib/m_sipaf/doc/import.md diff --git a/backend/gn_modulator/__init__.py b/backend/gn_modulator/__init__.py index b9a07604..8cc12e33 100644 --- a/backend/gn_modulator/__init__.py +++ b/backend/gn_modulator/__init__.py @@ -13,21 +13,22 @@ def init_gn_modulator(): Fonction d'initialisation de gn_module """ + verbose = False # - definitions start_time = time.time() DefinitionMethods.init_definitions() - print(f"definitions : {round((time.time() - start_time)*1e3)} ms") + verbose and print(f"definitions : {round((time.time() - start_time)*1e3)} ms") if get_errors(): return # - schemas start_time = time.time() SchemaMethods.init_schemas() - print(f"schemas : {round((time.time() - start_time)*1e3)} ms") + verbose and print(f"schemas : {round((time.time() - start_time)*1e3)} ms") if get_errors(): return # - modules start_time = time.time() ModuleMethods.init_modules() - print(f"modules : {round((time.time() - start_time)*1e3)} ms") + verbose and print(f"modules : {round((time.time() - start_time)*1e3)} ms") diff --git a/backend/gn_modulator/commands.py b/backend/gn_modulator/commands.py index d98aebe8..0a45b83c 100644 --- a/backend/gn_modulator/commands.py +++ b/backend/gn_modulator/commands.py @@ -110,14 +110,16 @@ def cmd_process_sql(module_code=None, schema_code=None, force=False): @click.command("doc") @click.argument("schema_code") -@click.option("-f", "--force", is_flag=True) +@click.argument("doc_type") +@click.option("-e", "exclude") @with_appcontext -def cmd_doc_schema(schema_code, force=False): +def cmd_doc_schema(schema_code, doc_type, exclude=""): """ affiche la doc d'un schema identifié par schema_code """ init_gn_modulator() - txt = SchemaMethods(schema_code).doc_markdown() + exclude_keys = exclude.split(",") + txt = SchemaMethods(schema_code).doc_markdown(doc_type, exclude_keys) print(txt) return True diff --git a/backend/gn_modulator/imports/mixins/check.py b/backend/gn_modulator/imports/mixins/check.py index 35da710e..1271af04 100644 --- a/backend/gn_modulator/imports/mixins/check.py +++ b/backend/gn_modulator/imports/mixins/check.py @@ -20,7 +20,7 @@ def check_uniques(self): table_test = self.tables.get("mapping") or self.tables["data"] columns = self.get_table_columns(table_test) sm = SchemaMethods(self.schema_code) - unique = sm.attr("meta.unique") + unique = sm.unique() missing_unique = [key for key in unique if key not in columns] if missing_unique: diff --git a/backend/gn_modulator/imports/mixins/process.py b/backend/gn_modulator/imports/mixins/process.py index 65c5e4a0..69663ecb 100644 --- a/backend/gn_modulator/imports/mixins/process.py +++ b/backend/gn_modulator/imports/mixins/process.py @@ -97,7 +97,7 @@ def resolve_key( txt_column = f"{alias_join}.{sm.pk_field_name()}" - unique = sm.attr("meta.unique") + unique = sm.unique() v_join = [] # resolution des cles si besoins @@ -163,7 +163,7 @@ def var_key(self, schema_code, key, k_unique, index_unique, link_joins, alias_ma if "." in key: return key - if len(sm.attr("meta.unique", [])) <= 1: + if len(sm.unique()) <= 1: return f"{alias_main}.{key}" return f"SPLIT_PART({alias_main}.{key}, '|', { index_unique + 1})" diff --git a/backend/gn_modulator/imports/mixins/raw.py b/backend/gn_modulator/imports/mixins/raw.py index 9d3589af..e278ae7e 100644 --- a/backend/gn_modulator/imports/mixins/raw.py +++ b/backend/gn_modulator/imports/mixins/raw.py @@ -17,6 +17,7 @@ def process_raw_view(self): SchemaMethods.c_sql_exec_txt(self.sql["raw_view"]) except Exception as e: + print(self.sql["raw_view"]) self.add_error( code="ERR_IMPORT_CREATE_RAW_VIEW", msg=f"Erreur dans la creation de la vue 'raw': {str(e)}", @@ -77,11 +78,8 @@ def sql_raw_view( and "x" in from_table_columns and "y" in from_table_columns ): - txt_geom_xy = f"""ST_SETSRID( - ST_MAKEPOINT(x::FLOAT, y::FLOAT), - {sm.property(sm.geometry_field_name()).get('srid')} - ) as {sm.geometry_field_name()}""" - v_txt_pre_process_columns.append(txt_geom_xy) + + v_txt_pre_process_columns.append(self.txt_geom_xy()) v_txt_columns = list(map(lambda x: self.process_raw_import_column(x), columns)) @@ -113,6 +111,25 @@ def sql_raw_view( FROM pre_process pp; """ + def txt_geom_xy(self): + + sm = SchemaMethods(self.schema_code) + srid_column = sm.geometry_field_name().get("srid") + + if self.options.get("srid") and srid_column != self.options.get("srid"): + return f"""ST_TRANSFORM( + ST_SETSRID( + ST_MAKEPOINT(x::FLOAT, y::FLOAT), + {self.options.get('srid')} + ), + {srid_column} +) as {sm.geometry_field_name()}""" + + return f"""ST_SETSRID( + ST_MAKEPOINT(x::FLOAT, y::FLOAT), + {sm.property(srid_column)} + ) as {sm.geometry_field_name()}""" + def pre_process_raw_import_columns(self, key, key_unnest=None): """ TODO gérer les null dans l'import csv (ou dans l'insert) @@ -134,15 +151,25 @@ def pre_process_raw_import_columns(self, key, key_unnest=None): return key if property["type"] == "geometry": - geometry_type = "ST_MULTI" if property["geometry_type"] == "multipolygon" else "" - return f"""{geometry_type}( + geometry_type = "ST_MULTI(" if property["geometry_type"] == "multipolygon" else "" + last_par = ")" if geometry_type else "" + if self.options.get("srid") and self.options.get("srid") != sm.property(key).get( + "srid" + ): + return f"""ST_TRANSFORM({geometry_type} ST_SETSRID( ST_FORCE2D( {key}::GEOMETRY - ), {sm.property(key).get('srid')} - ) - ) - AS {key}""" + ), {self.options.get('srid')} + ), + {sm.property(key).get('srid')} + ){last_par} AS {key}""" + + return f"""{geometry_type}ST_SETSRID( + ST_FORCE2D( + {key}::GEOMETRY + ), {sm.property(key).get('srid')} + ){last_par} AS {key}""" if property["type"] == "number": return f"({key})::FLOAT" diff --git a/backend/gn_modulator/schema/auto.py b/backend/gn_modulator/schema/auto.py index b98d2d18..23b69863 100644 --- a/backend/gn_modulator/schema/auto.py +++ b/backend/gn_modulator/schema/auto.py @@ -104,6 +104,7 @@ def autoproperties(self, Model): continue properties[k] = { "type": "string", + "is_column_property": True # "column_property": "label", # "title": k, } diff --git a/backend/gn_modulator/schema/base.py b/backend/gn_modulator/schema/base.py index b67560a4..0a69b3b3 100644 --- a/backend/gn_modulator/schema/base.py +++ b/backend/gn_modulator/schema/base.py @@ -363,3 +363,6 @@ def url(self, post_url, full_url=False): url = "{}{}".format(self.cls.base_url(), url) return url + + def unique(self): + return self.attr('meta.unique') or [] \ No newline at end of file diff --git a/backend/gn_modulator/schema/doc.py b/backend/gn_modulator/schema/doc.py index 846689cc..c5c26080 100644 --- a/backend/gn_modulator/schema/doc.py +++ b/backend/gn_modulator/schema/doc.py @@ -5,11 +5,14 @@ class SchemaDoc: pass - def doc_markdown(self): + def doc_markdown(self, doc_type, exclude=[]): """ retourne la doc d'un schema en markdown """ + if doc_type == "import": + return self.doc_import(exclude) + txt = "" txt += f"### Table `{self.sql_schema_dot_table()}`\n" @@ -22,3 +25,105 @@ def doc_markdown(self): txt += f" - *définition*: {property_def['description']}\n" return txt + + def doc_import_key(self, key): + + txt = "" + + property_def = self.property(key) + txt += f"- `{key}`\n" + type = property_def['type'] + if property_def.get('schema_code'): + type = 'clé simple' + + if type == 'relation': + type = 'liste de clé séparée par une virgule `,`' + + txt += f" - *type*: `{type}`\n" + + if type == 'geometry': + txt += f" - *geometry_type*: `{self.property(key)['geometry_type']}`\n" + txt += " - format:\n" + txt += " - WKT\n" + txt += f" - XY (remplacer {key} par les colonnes x et y)" + + if property_def.get('schema_code'): + + rel = self.cls(property_def['schema_code']) + txt += f" - *référence*: `{rel.labels()}`\n" + + champs = ( + ['cd_nomenclature'] if property_def['schema_code'] == 'ref_nom.nomenclature' + else rel.unique() + ) + champs_txt = ', '.join(map(lambda x: f'`{x}`', champs)) + txt += f" - *champ(s)*: {champs_txt}\n" + + if property_def.get("description"): + txt += f" - *définition*: {property_def['description']}\n" + + if property_def.get("nomenclature_type"): + txt += self.doc_nomenclature_values(key) + + return txt + + def doc_nomenclature_values(self, key): + txt = "" + property_def = self.property(key) + nomenclature_type = property_def["nomenclature_type"] + txt += " - *valeurs*:\n" + sm_nom = self.cls("ref_nom.nomenclature") + res = sm_nom.query_list( + params={ + "fields": ["label_fr", "cd_nomenclature"], + "filters": [f"nomenclature_type.mnemonique = {nomenclature_type}"], + } + ).all() + values = sm_nom.serialize_list(res, ["label_fr", "cd_nomenclature"]) + + for v in values: + txt += f" - **{v['cd_nomenclature']}** *{v['label_fr']}*\n" + + return txt + + def doc_import(self, exclude=[]): + txt = "" + + import_keys = list( + filter( + lambda x: ( + not ( + self.property(x)["type"] == "relation" + and self.property(x)["relation_type"] != "n-n" + ) + and (not self.property(x).get("primary_key")) + and (not self.property(x).get("is_column_property")) + and (not x in exclude) + ), + self.properties(), + ) + ) + + import_keys.sort(key=lambda x: (self.property(x).get('schema_code') or '', x)) + + required_import_keys = list( + filter( + lambda x: self.is_required(x) and not self.property(x).get("default"), import_keys + ) + ) + + non_required_import_keys = list( + filter(lambda x: x not in required_import_keys, import_keys) + ) + + txt += "\n\n#### Champs obligatoires\n\n" + + for key in required_import_keys: + txt += self.doc_import_key(key) + + txt += "\n\n#### Champs facultatifs\n\n" + + for key in non_required_import_keys: + txt += self.doc_import_key(key) + + return txt diff --git a/backend/gn_modulator/schema/imports/base.py b/backend/gn_modulator/schema/imports/base.py index 658fe46f..7e4339ba 100644 --- a/backend/gn_modulator/schema/imports/base.py +++ b/backend/gn_modulator/schema/imports/base.py @@ -67,7 +67,7 @@ def get_foreign_key(self, key_process, rel_test_values, process_one=False): if not isinstance(rel_test_values, list): rel_test_values = [rel_test_values] - rel_test_keys = sm_rel.attr("meta.unique") + rel_test_keys = sm_rel.unique() # on récupère le type de nomenclature au besoin if sm_rel.schema_code() == "ref_nom.nomenclature" and len(rel_test_values) == 1: @@ -152,7 +152,7 @@ def process_data_item(cls, data_item, file_path): v_inserts = [] v_errors = [] - test_keys = sm.attr("meta.unique") + test_keys = sm.unique() items = cls.get_data_item(data_item, file_path) diff --git a/backend/gn_modulator/schema/repositories/filters.py b/backend/gn_modulator/schema/repositories/filters.py index 9143e89a..149ea6e8 100644 --- a/backend/gn_modulator/schema/repositories/filters.py +++ b/backend/gn_modulator/schema/repositories/filters.py @@ -6,7 +6,7 @@ from geonature.utils.env import db from ..errors import SchemaRepositoryFilterError, SchemaRepositoryFilterTypeError from sqlalchemy.sql.functions import ReturnTypeFromArgs - +from gn_modulator.utils.filters import parse_filters class unaccent(ReturnTypeFromArgs): pass @@ -86,6 +86,9 @@ def process_filter_array(self, Model, filter_array, query=None, condition=None): else: cur_ops.append(elem) + elif isinstance(elem, str): + loop_filter, query = self.process_filter_array(Model, parse_filters(elem), query, condition) + else: raise SchemaRepositoryFilterError( "L'élément de liste de filtre {} est mal défini.".format(elem) diff --git a/backend/gn_modulator/schema/sql/constraint.py b/backend/gn_modulator/schema/sql/constraint.py index f6411d63..8e2ad327 100644 --- a/backend/gn_modulator/schema/sql/constraint.py +++ b/backend/gn_modulator/schema/sql/constraint.py @@ -13,10 +13,10 @@ class SchemaSqlConstraint: def slq_txt_unique_key_constraint(self): """ """ - if not (self.attr("meta.unique") and self.attr("meta.unique_in_db")): + if not (self.unique() and self.attr("meta.unique_in_db")): return "" - unique = self.attr("meta.unique") + unique = self.unique() txt = "\nALTER TABLE {} ADD CONSTRAINT unique_{}_{} UNIQUE({});".format( self.sql_schema_dot_table(), diff --git a/backend/gn_modulator/tests/import_test/synthese_srid.csv b/backend/gn_modulator/tests/import_test/synthese_srid.csv new file mode 100644 index 00000000..f7f13bce --- /dev/null +++ b/backend/gn_modulator/tests/import_test/synthese_srid.csv @@ -0,0 +1,2 @@ +cd_nom,id_source,entity_source_pk_value,nom_cite,date_min,date_max,cor_observers,the_geom_4326 +67111,Occtax,test_213,Ablette,"2017-01-08 20:00:00.000","2017-01-08 23:00:00.000","admin,agent",POINT (463658.7429450452 6437909.150772502) \ No newline at end of file diff --git a/backend/gn_modulator/tests/test_import.py b/backend/gn_modulator/tests/test_import.py index 00a6e22f..cc4ee4f6 100644 --- a/backend/gn_modulator/tests/test_import.py +++ b/backend/gn_modulator/tests/test_import.py @@ -1,6 +1,7 @@ import pytest # noqa from gn_modulator.utils.env import import_test_dir from .utils.imports import test_data_file +from gn_modulator import SchemaMethods @pytest.mark.usefixtures("temporary_transaction", scope="session") @@ -144,6 +145,34 @@ def test_synthese_update_obs(self): } test_data_file(module_code, object_code, data_file_path, expected_infos=expected_infos) + def test_synthese_srid(self): + module_code = "MODULATOR" + object_code = "syn.synthese" + options = {"srid": 2154} + data_file_path = import_test_dir / "synthese_srid.csv" + expected_infos = { + "res.nb_data": 1, + "res.nb_insert": 1, + "res.nb_update": 0, + "res.nb_unchanged": 0, + "data_type": "csv", + "csv_delimiter": ",", + } + impt = test_data_file( + module_code, + object_code, + data_file_path, + expected_infos=expected_infos, + options=options, + ) + sm = SchemaMethods(object_code) + res = sm.get_row_as_dict( + "test_213", "entity_source_pk_value", fields=["id_synthese", "the_geom_4326"] + ) + print(impt.sql["raw_view"]) + print(res) + assert res["the_geom_4326"] is not None + # Test remontées d'erreurs def test_error_ERR_IMPORT_INVALID_VALUE_FOR_TYPE(self): diff --git a/backend/gn_modulator/tests/utils/imports.py b/backend/gn_modulator/tests/utils/imports.py index 081e90a2..a3f9c805 100644 --- a/backend/gn_modulator/tests/utils/imports.py +++ b/backend/gn_modulator/tests/utils/imports.py @@ -6,7 +6,7 @@ @pytest.mark.skip() def test_data_file( - module_code, object_code, data_file_path=None, mapping_file_path=None, expected_infos={} + module_code, object_code, data_file_path=None, mapping_file_path=None, expected_infos={}, options={} ): with db.session.begin_nested(): # ici options={"insert_data": True} est à true pour intégrer les avec un insert @@ -17,7 +17,7 @@ def test_data_file( object_code=object_code, data_file_path=data_file_path, mapping_file_path=mapping_file_path, - options={"insert_data": True}, + options={"insert_data": True, **options}, ) db.session.add(impt) assert impt.id_import is not None diff --git a/backend/gn_modulator/tests/utils/repository.py b/backend/gn_modulator/tests/utils/repository.py index 0c31bf35..6ca9c094 100644 --- a/backend/gn_modulator/tests/utils/repository.py +++ b/backend/gn_modulator/tests/utils/repository.py @@ -14,7 +14,7 @@ def test_schema_repository(schema_code=None, data=None, data_update=None): pk_field_name = sm.pk_field_name() label_field_name = sm.label_field_name() - unique = sm.attr("meta.unique") + unique = sm.unique() data_search_row = [data[unique_key] for unique_key in unique] diff --git a/backend/gn_modulator/tests/utils/rest.py b/backend/gn_modulator/tests/utils/rest.py index 1ddd9d54..f2fa06a0 100644 --- a/backend/gn_modulator/tests/utils/rest.py +++ b/backend/gn_modulator/tests/utils/rest.py @@ -25,7 +25,7 @@ def test_schema_rest(client, user, module_code, object_code, data_post, data_upd schema_code = ModuleMethods.schema_code(module_code, object_code) assert schema_code is not None sm = SchemaMethods(schema_code) - field_name = sm.attr("meta.unique") + field_name = sm.unique() data_unique = ",".join(list(map(lambda x: data_post[x], field_name))) # GET VIDE diff --git a/config/layouts/utils/utils.import.layout.yml b/config/layouts/utils/utils.import.layout.yml index 9d7b50e8..b7b94286 100644 --- a/config/layouts/utils/utils.import.layout.yml +++ b/config/layouts/utils/utils.import.layout.yml @@ -50,6 +50,10 @@ layout: Et une deuxième étape d'insertion et de mise à jour des données. type: boolean default: __f__true + - key: options.srid + title: SRID + description: SRID des données fournies + type: string - label: __f__`Erreurs (${data.errors?.length || 0})` disabled: __f__!data.errors?.length items: diff --git a/config/modules/contrib/m_sipaf/doc/import.md b/config/modules/contrib/m_sipaf/doc/import.md new file mode 100644 index 00000000..f1ac5510 --- /dev/null +++ b/config/modules/contrib/m_sipaf/doc/import.md @@ -0,0 +1,159 @@ + + +#### Champs obligatoires + +- `code_passage_faune` + - *type*: `string` + - *définition*: Code permettant d'identifier le passage à faune de manière unique (texte) +- `geom` + - *type*: `geometry` + - *geometry_type*: `geometry` + - format: + - WKT + - XY (remplacer geom par les colonnes x et y) - *définition*: Géometrie du passage à faune (SRID=4326) + + +#### Champs facultatifs + +- `code_ouvrage_gestionnaire` + - *type*: `string` + - *définition*: Code de l’ouvrage (pour le gestionnaire) +- `date_creation_ouvrage` + - *type*: `date` + - *définition*: Date de la réalisation de l'ouvrage +- `date_requalification_ouvrage` + - *type*: `date` + - *définition*: Date de la requalification de l'ouvrage +- `diametre` + - *type*: `number` + - *définition*: Diamètre de la buse en mètre +- `geom_local` + - *type*: `geometry` + - *geometry_type*: `geometry` + - format: + - WKT + - XY (remplacer geom_local par les colonnes x et y) - *définition*: Géométrie locale du passage à faune (SRID=2154) +- `hauteur_dispo_faune` + - *type*: `number` + - *définition*: Hauteur de l'ouvrage effectivement disponible pour la faune en mètre +- `hauteur_ouvrage` + - *type*: `number` + - *définition*: Hauteur de l'ouvrage en mètre +- `issu_requalification` + - *type*: `boolean` + - *définition*: L'ouvrage est issu d'une opération de requalification ? +- `largeur_dispo_faune` + - *type*: `number` + - *définition*: Largeur de l'ouvrage effectivement disponible pour la faune en mètre +- `largeur_ouvrage` + - *type*: `number` + - *définition*: Largeur de l'ouvrage en mètre +- `longueur_franchissement` + - *type*: `number` + - *définition*: Longueur de franchissement de l'ouvrage en mètres (ne prend pas en compte l'épaisseur des matériaux et éventuels obstacles) +- `nom_usuel_passage_faune` + - *type*: `string` + - *définition*: Nom usuel utilisé pour dénommer l'ouvrage (nom_usuel_pf) +- `ouvrag_hydrau_tirant_air` + - *type*: `number` + - *définition*: Tirant d'air existant entre la banquette et le plafond de l'ouvrage, en mètre +- `ouvrage_hydrau` + - *type*: `boolean` + - *définition*: Ouvrage hydraulique ou non +- `ouvrage_type_autre` + - *type*: `string` +- `pi_ou_ps` + - *type*: `boolean` + - *définition*: Positionnement du passage vis-à vis de l’infrastructure (inférieur (False) ou supérieur (True)) +- `pk` + - *type*: `number` + - *définition*: Point kilométrique +- `pr` + - *type*: `number` + - *définition*: Point repère +- `pr_abs` + - *type*: `integer` + - *définition*: Distance en abscisse curviligne depuis le dernier PR +- `source` + - *type*: `string` + - *définition*: Source de la donnée +- `uuid_passage_faune` + - *type*: `uuid` + - *définition*: Identifiant universel unique au format UUID (uuid_pf) +- `linears` + - *type*: `clé simple` + - *référence*: `linéaires` + - *champ(s)*: `id_type`, `linear_code` +- `id_nomenclature_ouvrage_hydrau_banq_caract` + - *type*: `clé simple` + - *référence*: `nomenclatures` + - *champ(s)*: `cd_nomenclature` + - *définition*: Caractérisation de la banquette dans le cas d'un ouvrage hydraulique (ouvrage_hydrau_caract_banquette) + - *valeurs*: + - **SIM** *Simple* + - **DOU** *Double* +- `id_nomenclature_ouvrage_hydrau_banq_type` + - *type*: `clé simple` + - *référence*: `nomenclatures` + - *champ(s)*: `cd_nomenclature` + - *définition*: Type de la banquette dans le cas d'un ouvrage hydraulique (ouvrage_hydrau_type_banquette) + - *valeurs*: + - **NAT** *Banquette naturelle* + - **BET** *Banquette béton* + - **ECB** *Encorbellement* + - **POF** *Ponton flottant* + - **AUT** *Autre* +- `id_nomenclature_ouvrage_hydrau_position` + - *type*: `clé simple` + - *référence*: `nomenclatures` + - *champ(s)*: `cd_nomenclature` + - *définition*: Ouvrage hydraulique Position (ouvrage_hydrau_position) + - *valeurs*: + - **RD** *Rive droite* + - **RG** *Rive Gauche* + - **RGD** *Rive gauche et rive droite* +- `id_nomenclature_ouvrage_specificite` + - *type*: `clé simple` + - *référence*: `nomenclatures` + - *champ(s)*: `cd_nomenclature` + - *définition*: Exclusivité pour le passage faune (specificite) + - *valeurs*: + - **SPE** *Spécifique* + - **MIX** *Mixte* + - **ND** *Non dédié* +- `nomenclatures_ouvrage_materiaux` + - *type*: `clé simple` + - *référence*: `nomenclatures` + - *champ(s)*: `cd_nomenclature` + - *définition*: Matériaux composants l'ouvrage d'art (lb_materiaux) + - *valeurs*: + - **BET** *Béton* + - **MET** *Métal* + - **PLT** *Plastique* + - **BOI** *Bois* + - **MAC** *Maçonnerie* + - **AUT** *Autre* + - **IND** *Indéterminé* +- `nomenclatures_ouvrage_type` + - *type*: `clé simple` + - *référence*: `nomenclatures` + - *champ(s)*: `cd_nomenclature` + - *définition*: Type d'ouvrage d'art (lb_type_ouvrage) + - *valeurs*: + - **BUS** *Buse* + - **CAD** *Cadre* + - **VOU+R** *Voûte avec radier* + - **AUT** *Autre (préciser)* + - **POR** *Portique* + - **VOU** *Voûte sans radier* + - **DAL+P** *Dalle et palpaplanche* + - **DAL** *Dalle* + - **ARC** *Arc* + - **VIA** *Viaduc* + - **PON** *Pont* + - **CAN** *Canalisation* + - **DALO** *Dalot* + - **DIAB** *Diabolo* + - **TRA** *Tranchée* + - **TUN** *Tunnel* + From db334adfd708bcfe7243591a5a1e37612d622a9a Mon Sep 17 00:00:00 2001 From: "joel.clement" Date: Thu, 30 Mar 2023 17:03:04 +0200 Subject: [PATCH 041/142] test and fix xy --- backend/gn_modulator/imports/mixins/raw.py | 12 +++---- backend/gn_modulator/schema/base.py | 2 +- backend/gn_modulator/schema/doc.py | 25 +++++++-------- .../schema/repositories/filters.py | 5 ++- .../gn_modulator/tests/import_test/pf_xy.csv | 2 ++ backend/gn_modulator/tests/test_import.py | 31 +++++++++++++++++-- backend/gn_modulator/tests/utils/imports.py | 9 ++++-- 7 files changed, 58 insertions(+), 28 deletions(-) create mode 100644 backend/gn_modulator/tests/import_test/pf_xy.csv diff --git a/backend/gn_modulator/imports/mixins/raw.py b/backend/gn_modulator/imports/mixins/raw.py index e278ae7e..859b8028 100644 --- a/backend/gn_modulator/imports/mixins/raw.py +++ b/backend/gn_modulator/imports/mixins/raw.py @@ -43,7 +43,6 @@ def sql_raw_view( sm = SchemaMethods(self.schema_code) from_table_columns = self.get_table_columns(from_table) - columns = list( filter( lambda x: ( @@ -69,6 +68,8 @@ def sql_raw_view( ) ) + v_txt_columns = list(map(lambda x: self.process_raw_import_column(x), columns)) + # traitement de la geometrie en x y # si des champs x et y sont présents # s'il n'y a pas de champs geom @@ -78,10 +79,8 @@ def sql_raw_view( and "x" in from_table_columns and "y" in from_table_columns ): - v_txt_pre_process_columns.append(self.txt_geom_xy()) - - v_txt_columns = list(map(lambda x: self.process_raw_import_column(x), columns)) + v_txt_columns.append(sm.geometry_field_name()) txt_primary_column = f"""CONCAT({", '|', ".join( map( @@ -112,9 +111,8 @@ def sql_raw_view( """ def txt_geom_xy(self): - sm = SchemaMethods(self.schema_code) - srid_column = sm.geometry_field_name().get("srid") + srid_column = sm.property(sm.geometry_field_name()).get("srid") if self.options.get("srid") and srid_column != self.options.get("srid"): return f"""ST_TRANSFORM( @@ -127,7 +125,7 @@ def txt_geom_xy(self): return f"""ST_SETSRID( ST_MAKEPOINT(x::FLOAT, y::FLOAT), - {sm.property(srid_column)} + {srid_column} ) as {sm.geometry_field_name()}""" def pre_process_raw_import_columns(self, key, key_unnest=None): diff --git a/backend/gn_modulator/schema/base.py b/backend/gn_modulator/schema/base.py index 0a69b3b3..f928c01a 100644 --- a/backend/gn_modulator/schema/base.py +++ b/backend/gn_modulator/schema/base.py @@ -365,4 +365,4 @@ def url(self, post_url, full_url=False): return url def unique(self): - return self.attr('meta.unique') or [] \ No newline at end of file + return self.attr("meta.unique") or [] diff --git a/backend/gn_modulator/schema/doc.py b/backend/gn_modulator/schema/doc.py index c5c26080..8f87f20a 100644 --- a/backend/gn_modulator/schema/doc.py +++ b/backend/gn_modulator/schema/doc.py @@ -27,36 +27,35 @@ def doc_markdown(self, doc_type, exclude=[]): return txt def doc_import_key(self, key): - txt = "" property_def = self.property(key) txt += f"- `{key}`\n" - type = property_def['type'] - if property_def.get('schema_code'): - type = 'clé simple' + type = property_def["type"] + if property_def.get("schema_code"): + type = "clé simple" - if type == 'relation': - type = 'liste de clé séparée par une virgule `,`' + if type == "relation": + type = "liste de clé séparée par une virgule `,`" txt += f" - *type*: `{type}`\n" - if type == 'geometry': + if type == "geometry": txt += f" - *geometry_type*: `{self.property(key)['geometry_type']}`\n" txt += " - format:\n" txt += " - WKT\n" txt += f" - XY (remplacer {key} par les colonnes x et y)" - if property_def.get('schema_code'): - - rel = self.cls(property_def['schema_code']) + if property_def.get("schema_code"): + rel = self.cls(property_def["schema_code"]) txt += f" - *référence*: `{rel.labels()}`\n" champs = ( - ['cd_nomenclature'] if property_def['schema_code'] == 'ref_nom.nomenclature' + ["cd_nomenclature"] + if property_def["schema_code"] == "ref_nom.nomenclature" else rel.unique() ) - champs_txt = ', '.join(map(lambda x: f'`{x}`', champs)) + champs_txt = ", ".join(map(lambda x: f"`{x}`", champs)) txt += f" - *champ(s)*: {champs_txt}\n" if property_def.get("description"): @@ -104,7 +103,7 @@ def doc_import(self, exclude=[]): ) ) - import_keys.sort(key=lambda x: (self.property(x).get('schema_code') or '', x)) + import_keys.sort(key=lambda x: (self.property(x).get("schema_code") or "", x)) required_import_keys = list( filter( diff --git a/backend/gn_modulator/schema/repositories/filters.py b/backend/gn_modulator/schema/repositories/filters.py index 149ea6e8..c5a9027e 100644 --- a/backend/gn_modulator/schema/repositories/filters.py +++ b/backend/gn_modulator/schema/repositories/filters.py @@ -8,6 +8,7 @@ from sqlalchemy.sql.functions import ReturnTypeFromArgs from gn_modulator.utils.filters import parse_filters + class unaccent(ReturnTypeFromArgs): pass @@ -87,7 +88,9 @@ def process_filter_array(self, Model, filter_array, query=None, condition=None): cur_ops.append(elem) elif isinstance(elem, str): - loop_filter, query = self.process_filter_array(Model, parse_filters(elem), query, condition) + loop_filter, query = self.process_filter_array( + Model, parse_filters(elem), query, condition + ) else: raise SchemaRepositoryFilterError( diff --git a/backend/gn_modulator/tests/import_test/pf_xy.csv b/backend/gn_modulator/tests/import_test/pf_xy.csv new file mode 100644 index 00000000..86b05f62 --- /dev/null +++ b/backend/gn_modulator/tests/import_test/pf_xy.csv @@ -0,0 +1,2 @@ +code_passage_faune,x,Y +TEST_XY,0,45 \ No newline at end of file diff --git a/backend/gn_modulator/tests/test_import.py b/backend/gn_modulator/tests/test_import.py index cc4ee4f6..d4ca56c6 100644 --- a/backend/gn_modulator/tests/test_import.py +++ b/backend/gn_modulator/tests/test_import.py @@ -158,7 +158,7 @@ def test_synthese_srid(self): "data_type": "csv", "csv_delimiter": ",", } - impt = test_data_file( + test_data_file( module_code, object_code, data_file_path, @@ -169,10 +169,35 @@ def test_synthese_srid(self): res = sm.get_row_as_dict( "test_213", "entity_source_pk_value", fields=["id_synthese", "the_geom_4326"] ) - print(impt.sql["raw_view"]) - print(res) assert res["the_geom_4326"] is not None + def test_sipaf_xy(self): + module_code = "m_sipaf" + object_code = "site" + data_file_path = import_test_dir / "pf_xy.csv" + options = {} + expected_infos = { + "res.nb_data": 1, + "res.nb_insert": 1, + "res.nb_update": 0, + "res.nb_unchanged": 0, + "data_type": "csv", + "csv_delimiter": ",", + } + test_data_file( + module_code, + object_code, + data_file_path, + expected_infos=expected_infos, + options=options, + ) + + sm = SchemaMethods("m_sipaf.pf") + res = sm.get_row_as_dict( + "TEST_XY", "code_passage_faune", fields=["id_passage_faune", "geom"] + ) + assert res["geom"] is not None + # Test remontées d'erreurs def test_error_ERR_IMPORT_INVALID_VALUE_FOR_TYPE(self): diff --git a/backend/gn_modulator/tests/utils/imports.py b/backend/gn_modulator/tests/utils/imports.py index a3f9c805..cf6dc1de 100644 --- a/backend/gn_modulator/tests/utils/imports.py +++ b/backend/gn_modulator/tests/utils/imports.py @@ -6,7 +6,12 @@ @pytest.mark.skip() def test_data_file( - module_code, object_code, data_file_path=None, mapping_file_path=None, expected_infos={}, options={} + module_code, + object_code, + data_file_path=None, + mapping_file_path=None, + expected_infos={}, + options={}, ): with db.session.begin_nested(): # ici options={"insert_data": True} est à true pour intégrer les avec un insert @@ -28,8 +33,6 @@ def test_data_file( expected_errors = expected_infos.pop("errors", []) - print(import_infos["res"]) - if len(expected_errors) == 0: # on teste si le nombre d'erreur est bien nul assert len(import_infos["errors"]) == 0, import_infos["errors"] From 4da46c4734500d2960c510e3d34c3fee206bb0c6 Mon Sep 17 00:00:00 2001 From: "joel.clement" Date: Fri, 31 Mar 2023 16:18:20 +0200 Subject: [PATCH 042/142] doc import + refactor relation nn + test update nn nomenclature pf_complet --- backend/gn_modulator/commands.py | 7 +- backend/gn_modulator/definition/base.py | 2 + backend/gn_modulator/definition/utils.py | 31 +-- backend/gn_modulator/imports/mixins/count.py | 3 +- .../gn_modulator/imports/mixins/process.py | 45 ++-- backend/gn_modulator/imports/mixins/raw.py | 228 ++++++++++-------- .../gn_modulator/imports/mixins/relation.py | 102 ++++---- backend/gn_modulator/schema/base.py | 3 + backend/gn_modulator/schema/doc.py | 54 ++++- .../tests/import_test/pf_complet.csv | 2 + .../tests/import_test/pf_complet.yml | 29 +++ .../tests/import_test/pf_simple.csv | 2 + .../tests/import_test/pf_simple.yml | 3 + .../tests/import_test/pf_update_1.csv | 2 + .../tests/import_test/pf_update_2.csv | 2 + backend/gn_modulator/tests/test_import.py | 59 +++++ backend/gn_modulator/tests/utils/imports.py | 1 - backend/gn_modulator/utils/yaml.py | 29 +++ config/modules/contrib/m_sipaf/doc/import.md | 164 +------------ .../m_sipaf/doc/import_description_champs.md | 152 ++++++++++++ 20 files changed, 557 insertions(+), 363 deletions(-) create mode 100644 backend/gn_modulator/tests/import_test/pf_complet.csv create mode 100644 backend/gn_modulator/tests/import_test/pf_complet.yml create mode 100644 backend/gn_modulator/tests/import_test/pf_simple.csv create mode 100644 backend/gn_modulator/tests/import_test/pf_simple.yml create mode 100644 backend/gn_modulator/tests/import_test/pf_update_1.csv create mode 100644 backend/gn_modulator/tests/import_test/pf_update_2.csv create mode 100644 backend/gn_modulator/utils/yaml.py create mode 100644 config/modules/contrib/m_sipaf/doc/import_description_champs.md diff --git a/backend/gn_modulator/commands.py b/backend/gn_modulator/commands.py index 0a45b83c..04e17e3a 100644 --- a/backend/gn_modulator/commands.py +++ b/backend/gn_modulator/commands.py @@ -112,14 +112,15 @@ def cmd_process_sql(module_code=None, schema_code=None, force=False): @click.argument("schema_code") @click.argument("doc_type") @click.option("-e", "exclude") +@click.option("-f", "file_path", type=click.Path(exists=True)) @with_appcontext -def cmd_doc_schema(schema_code, doc_type, exclude=""): +def cmd_doc_schema(schema_code, doc_type, file_path=None, exclude=""): """ affiche la doc d'un schema identifié par schema_code """ init_gn_modulator() - exclude_keys = exclude.split(",") - txt = SchemaMethods(schema_code).doc_markdown(doc_type, exclude_keys) + exclude_keys = exclude and exclude.split(",") or [] + txt = SchemaMethods(schema_code).doc_markdown(doc_type, exclude_keys, file_path) print(txt) return True diff --git a/backend/gn_modulator/definition/base.py b/backend/gn_modulator/definition/base.py index b93bd36c..0087637c 100644 --- a/backend/gn_modulator/definition/base.py +++ b/backend/gn_modulator/definition/base.py @@ -307,6 +307,8 @@ def load_definition_file(cls, file_path): # chargement du fichier yml try: definition = cls.load_definition_from_file(file_path) + if not definition: + return cls.save_in_cache_definition(definition, file_path) return definition diff --git a/backend/gn_modulator/definition/utils.py b/backend/gn_modulator/definition/utils.py index 15e07207..22ee12b8 100644 --- a/backend/gn_modulator/definition/utils.py +++ b/backend/gn_modulator/definition/utils.py @@ -4,35 +4,10 @@ from pathlib import Path from gn_modulator.utils.env import local_srid from gn_modulator.utils.commons import replace_in_dict +from gn_modulator.utils.yaml import YmlLoader from gn_modulator import MODULE_CODE -class YmlLoader(yaml.CLoader): - """ - pour ajouter des inclusion de fichier - https://stackoverflow.com/questions/528281/how-can-i-include-a-yaml-file-inside-another - """ - - def __init__(self, stream): - self._root = os.path.split(stream.name)[0] - super(YmlLoader, self).__init__(stream) - - def include(self, node): - filename = os.path.join(self._root, self.construct_scalar(node)) - - with open(filename, "r") as f: - if filename.endswith(".yml"): - return yaml.load(f, YmlLoader) - if filename.endswith(".json"): - return json.loads(f) - raise Exception( - f"Wrong include {filename} in {self._root} (doest not end with .yml or .json)" - ) - - -YmlLoader.add_constructor("!include", YmlLoader.include) - - class DefinitionUtils: """ methodes pour @@ -67,6 +42,10 @@ def load_definition_from_file(cls, file_path): """ with open(file_path) as f: + x = f.tell() + if f.readline() == "#!nodef": + return + f.seek(x) data = yaml.load(f, YmlLoader) if file_path.suffix == ".yml" else json.load(f) # traitement du local_srid diff --git a/backend/gn_modulator/imports/mixins/count.py b/backend/gn_modulator/imports/mixins/count.py index 2845fa20..636793f5 100644 --- a/backend/gn_modulator/imports/mixins/count.py +++ b/backend/gn_modulator/imports/mixins/count.py @@ -34,7 +34,7 @@ def with_rel(self, key): SELECT {pk}, ARRAY_AGG({rel_pk}) AS a - FROM {self.tables['relations'][key]['process_view']} + FROM {self.tables['relations'][key]['process']} GROUP BY {pk} ), cor_{key} AS ( SELECT @@ -103,7 +103,6 @@ def count_update(self): try: self.res["nb_update"] = SchemaMethods.c_sql_exec_txt(self.sql["nb_update"]).scalar() except Exception as e: - print(self.sql["nb_update"]) self.add_error( code="ERR_IMPORT_UPDATE_COUNT", msg=f"Erreur lors du comptage du nombre d'update: {str(e)}", diff --git a/backend/gn_modulator/imports/mixins/process.py b/backend/gn_modulator/imports/mixins/process.py index 69663ecb..17193428 100644 --- a/backend/gn_modulator/imports/mixins/process.py +++ b/backend/gn_modulator/imports/mixins/process.py @@ -3,12 +3,11 @@ class ImportMixinProcess(ImportMixinUtils): - def process_view(self, keys=None): + def process_view(self): from_table = self.tables["raw"] dest_table = self.tables["process"] = self.table_name("process") self.tables = self.tables - - self.sql["process_view"] = self.sql_process_view(from_table, dest_table, keys) + self.sql["process_view"] = self.sql_process_view(from_table, dest_table) try: SchemaMethods.c_sql_exec_txt(self.sql["process_view"]) @@ -21,7 +20,7 @@ def process_view(self, keys=None): self.count_and_check_table("process", dest_table) - def sql_process_view(self, from_table, dest_table, keys=None): + def sql_process_view(self, from_table, dest_table, key_nn=None): """ requete pour créer une vue qui résoud les clé """ @@ -33,14 +32,14 @@ def sql_process_view(self, from_table, dest_table, keys=None): from_table_columns = self.get_table_columns(from_table) - columns = list( - filter( - lambda x: ( - x in keys - if keys is not None - else sm.is_column(x) and not sm.property(x).get("primary_key") - ), - from_table_columns, + columns = ( + [key_nn] + if key_nn + else list( + filter( + lambda x: (sm.is_column(x) and not sm.property(x).get("primary_key")), + from_table_columns, + ) ) ) @@ -70,13 +69,29 @@ def sql_process_view(self, from_table, dest_table, keys=None): # TODO rendre id_digitiser parametrable ? txt_id_digitiser = "" if self.id_digitiser and self.id_digitiser_key(): - txt_id_digitiser = f"{self.id_digitiser} AS {self.id_digitiser_key()}," + txt_id_digitiser = f"\n{self.id_digitiser} AS {self.id_digitiser_key()}," + + if key_nn: + return f"""DROP VIEW IF EXISTS {dest_table} CASCADE; +CREATE VIEW {dest_table} AS +WITH unnest_{key} AS ( + SELECT + id_import, + {sm.pk_field_name()}, + UNNEST(STRING_TO_ARRAY({key}, ',' )) AS {key} + FROM {from_table} +) +SELECT + id_import,{txt_id_digitiser} + {txt_columns} +FROM unnest_{key} AS t +{txt_joins}; +""" return f"""DROP VIEW IF EXISTS {dest_table} CASCADE; CREATE VIEW {dest_table} AS SELECT - id_import, - {txt_id_digitiser} + id_import,{txt_id_digitiser} {txt_columns} FROM {from_table} t {txt_joins}; diff --git a/backend/gn_modulator/imports/mixins/raw.py b/backend/gn_modulator/imports/mixins/raw.py index 859b8028..70cd1f11 100644 --- a/backend/gn_modulator/imports/mixins/raw.py +++ b/backend/gn_modulator/imports/mixins/raw.py @@ -17,7 +17,6 @@ def process_raw_view(self): SchemaMethods.c_sql_exec_txt(self.sql["raw_view"]) except Exception as e: - print(self.sql["raw_view"]) self.add_error( code="ERR_IMPORT_CREATE_RAW_VIEW", msg=f"Erreur dans la creation de la vue 'raw': {str(e)}", @@ -48,25 +47,13 @@ def sql_raw_view( lambda x: ( x in keys if keys is not None - else ( - sm.has_property(x) - and ( - (not sm.property(x).get("primary_key")) - or sm.property(x).get("relation_type") == "n-n" - ) - ) + else (sm.has_property(x) or x in ["id_import", "x", "y"]) ), from_table_columns, ) ) - # on preprocess ttes les colonnes - v_txt_pre_process_columns = list( - map( - lambda x: self.pre_process_raw_import_columns(x, key_unnest=key_unnest), - from_table_columns, - ) - ) + columns.append(sm.pk_field_name()) v_txt_columns = list(map(lambda x: self.process_raw_import_column(x), columns)) @@ -79,128 +66,161 @@ def sql_raw_view( and "x" in from_table_columns and "y" in from_table_columns ): - v_txt_pre_process_columns.append(self.txt_geom_xy()) - v_txt_columns.append(sm.geometry_field_name()) + v_txt_columns.append(self.txt_geom_xy()) - txt_primary_column = f"""CONCAT({", '|', ".join( - map( - lambda x: f"pp.{x}", - sm.attr('meta.unique')))}) AS {sm.pk_field_name()}""" - v_txt_columns.insert(0, txt_primary_column) + # txt_primary_column = f"""CONCAT({", '|', ".join( + # map( + # lambda x: f"pp.{x}", + # sm.attr('meta.unique')))}) AS {sm.pk_field_name()}""" + # v_txt_columns.insert(0, txt_primary_column) txt_columns = ",\n ".join(v_txt_columns) - txt_pre_process_columns = ",\n ".join(v_txt_pre_process_columns) txt_limit = f"\nLIMIT {limit}" if limit else "" - if "id_import" not in txt_pre_process_columns: - txt_pre_process_columns = f"id_import, {txt_pre_process_columns}" + v_with_n_n_nomenclature = list( + map( + lambda x: self.process_raw_import_with_n_n_nomenclature(x, from_table), + filter(lambda x: sm.is_relation_n_n(x), columns), + ) + ) - if "id_import" not in txt_columns: - txt_columns = f"id_import, {txt_columns}" + v_join_n_n_nomenclature = list( + map( + lambda x: self.process_raw_import_join_n_n_nomenclature(x), + filter(lambda x: sm.is_relation_n_n(x), columns), + ) + ) + + txt_with_n_n_nomenclature = ( + "WITH " + ", ".join(v_with_n_n_nomenclature) if v_with_n_n_nomenclature else "" + ) + txt_join_n_n_nomenclature = ( + "\n".join(v_join_n_n_nomenclature) + "\n" if v_join_n_n_nomenclature else "" + ) return f"""DROP VIEW IF EXISTS {dest_table} CASCADE; CREATE VIEW {dest_table} AS -WITH pre_process AS ( -SELECT - {txt_pre_process_columns} -FROM {from_table}{txt_limit} -) +{txt_with_n_n_nomenclature} SELECT {txt_columns} -FROM pre_process pp; +FROM {from_table} t +{txt_join_n_n_nomenclature}{txt_limit}; """ def txt_geom_xy(self): sm = SchemaMethods(self.schema_code) - srid_column = sm.property(sm.geometry_field_name()).get("srid") - - if self.options.get("srid") and srid_column != self.options.get("srid"): - return f"""ST_TRANSFORM( - ST_SETSRID( - ST_MAKEPOINT(x::FLOAT, y::FLOAT), - {self.options.get('srid')} - ), - {srid_column} -) as {sm.geometry_field_name()}""" - - return f"""ST_SETSRID( - ST_MAKEPOINT(x::FLOAT, y::FLOAT), - {srid_column} - ) as {sm.geometry_field_name()}""" - - def pre_process_raw_import_columns(self, key, key_unnest=None): + geom_key = sm.geometry_field_name() + srid_column = sm.property(geom_key).get("srid") + srid_input = self.options.get("srid") or srid_column + txt_geom = f"""ST_SETSRID(ST_MAKEPOINT(x::FLOAT, y::FLOAT),{srid_input})""" + + if srid_input != srid_column: + txt_geom = f"""ST_TRANSFORM({txt_geom}, {srid_column})""" + + txt_geom += f" AS {geom_key}" + return txt_geom + + def process_raw_import_with_n_n_nomenclature(self, key, from_table): + return f"""rel_nnu_{key} AS ( + SELECT + t.id_import, + UNNEST(STRING_TO_ARRAY(t.{key}, ',')) AS {key} + FROM {from_table} t +), rel_nn_{key} AS (SELECT + t.id_import, + STRING_AGG({self.process_raw_import_column_foreign_key_nomenclature(key)}, ',') AS {key} + FROM rel_nnu_{key} t + GROUP BY id_import +)""" + + def process_raw_import_join_n_n_nomenclature(self, key): + return f"""LEFT JOIN rel_nn_{key} ON rel_nn_{key}.id_import = t.id_import""" + + def process_raw_import_relation_n_n(self, key): + sm = SchemaMethods(self.schema_code) + property = sm.property(key) + if property.get("nomenclature_type"): + return f"rel_nn_{key}.{key}" + return f"t.{key}" + + def process_raw_import_column_foreign_key_nomenclature(self, key): + sm = SchemaMethods(self.schema_code) + property = sm.property(key) + nomenclature_type = property.get("nomenclature_type") + return f"""CASE + WHEN t.{key} IS NOT NULL AND t.{key} NOT LIKE '%%|%%' THEN CONCAT('{nomenclature_type}|', t.{key}) + ELSE t.{key} + END""" + + def process_raw_import_column_foreing_key(self, key): + sm = SchemaMethods(self.schema_code) + property = sm.property(key) + if property.get("nomenclature_type"): + return f"{self.process_raw_import_column_foreign_key_nomenclature(key)} AS {key}" + return f"t.{key}" + + def process_raw_import_column_geom(self, key): + sm = SchemaMethods(self.schema_code) + property = sm.property(key) + srid_column = sm.property(key)["srid"] + srid_input = self.options.get("srid") or srid_column + + txt_geom = f"""ST_SETSRID(ST_FORCE2D({key}::GEOMETRY), {srid_input})""" + if property["geometry_type"] == "multipolygon": + txt_geom = f"ST_MULTI({txt_geom})" + + if srid_input != srid_column: + txt_geom = f"ST_TRANSFORM({txt_geom}, {srid_column})" + + txt_geom += f" AS {key}" + + return txt_geom + + def process_raw_import_column(self, key): """ TODO gérer les null dans l'import csv (ou dans l'insert) """ - sm = SchemaMethods(self.schema_code) - if key == "id_import": - return key + if key in ["id_import", "x", "y"] and not sm.has_property(key): + return f"t.{key}" - if key_unnest == key: - return f"UNNEST(STRING_TO_ARRAY({key}, ',')) AS {key}" + property = sm.property(key) - if not sm.has_property(key): - return f"{key}" + if property.get("primary_key"): + return f"""CONCAT({", '|', ".join( + map( + lambda x: f"t.{x}", + sm.attr('meta.unique')))}) AS {sm.pk_field_name()}""" - property = sm.property(key) - if property.get("foreign_key"): - return key + if property["type"] == "integer" and property.get("foreign_key"): + return self.process_raw_import_column_foreing_key(key) + + if property["type"] == "relation" and property["relation_type"] == "n-n": + return self.process_raw_import_relation_n_n(key) if property["type"] == "geometry": - geometry_type = "ST_MULTI(" if property["geometry_type"] == "multipolygon" else "" - last_par = ")" if geometry_type else "" - if self.options.get("srid") and self.options.get("srid") != sm.property(key).get( - "srid" - ): - return f"""ST_TRANSFORM({geometry_type} - ST_SETSRID( - ST_FORCE2D( - {key}::GEOMETRY - ), {self.options.get('srid')} - ), - {sm.property(key).get('srid')} - ){last_par} AS {key}""" - - return f"""{geometry_type}ST_SETSRID( - ST_FORCE2D( - {key}::GEOMETRY - ), {sm.property(key).get('srid')} - ){last_par} AS {key}""" + return self.process_raw_import_column_geom(key) if property["type"] == "number": - return f"({key})::FLOAT" + return f"{key}::FLOAT" if property["type"] == "boolean": - f"({key})::BOOLEAN" + return f"{key}::BOOLEAN" + + if property["type"] == "uuid": + return f"{key}::UUID" if property["type"] == "date": - return f"({key})::DATE" + return f"{key}::DATE" if property["type"] == "datetime": - return f"({key})::TIMESTAMP" - - if property["type"] == "integer" and "schema_code" not in property: - return f"({key})::INTEGER" - - return f"{key}" - - def process_raw_import_column(self, key): - """ """ - - sm = SchemaMethods(self.schema_code) + return f"{key}::TIMESTAMP" - if not sm.has_property(key): - return f"pp.{key}" + if property["type"] == "integer": + return f"{key}::INTEGER" - property = sm.property(key) - - # pour les nomenclature (on rajoute le type) - if nomenclature_type := property.get("nomenclature_type"): - return f"""CASE - WHEN pp.{key} IS NOT NULL AND pp.{key} NOT LIKE '%%|%%' THEN CONCAT('{nomenclature_type}|', {key}) - ELSE pp.{key} - END AS {key}""" + if property["type"] == "integer": + return f"{key}::INTEGER" - return f"pp.{key}" + return f"{key}" diff --git a/backend/gn_modulator/imports/mixins/relation.py b/backend/gn_modulator/imports/mixins/relation.py index 4279a315..26829558 100644 --- a/backend/gn_modulator/imports/mixins/relation.py +++ b/backend/gn_modulator/imports/mixins/relation.py @@ -30,40 +30,40 @@ def process_relations_data(self): def process_relation_views(self, key, from_table): self.sql["relations"] = self.sql.get("relations") or {} self.tables["relations"] = self.tables.get("relations") or {} - sql = self.sql["relations"][key] = {} - tables = self.tables["relations"][key] = {} + sql_rel = self.sql["relations"][key] = {} + tables_rel = self.tables["relations"][key] = {} - tables["raw_delete_view"] = self.table_name("raw_delete", key) - tables["process_delete_view"] = self.table_name("process_delete", key) - tables["raw_view"] = self.table_name("raw", key) - tables["process_view"] = self.table_name("process", key) + # tables["raw_delete_view"] = self.table_name("raw_delete", key) + tables_rel["delete"] = self.table_name("delete", key) + # tables["raw_view"] = self.table_name("raw", key) + tables_rel["process"] = self.table_name("process", key) # 0) clean - SchemaMethods.c_sql_exec_txt(f"DROP VIEW IF EXISTS {tables['process_delete_view']}") - SchemaMethods.c_sql_exec_txt(f"DROP VIEW IF EXISTS {tables['raw_delete_view']}") - SchemaMethods.c_sql_exec_txt(f"DROP VIEW IF EXISTS {tables['process_view']}") - SchemaMethods.c_sql_exec_txt(f"DROP VIEW IF EXISTS {tables['raw_view']}") - - sql["raw_view"] = self.sql_raw_view( - from_table, tables["raw_view"], keys=[key], key_unnest=key - ) - - # 1) create raw_temp_table for n-n - try: - SchemaMethods.c_sql_exec_txt(sql["raw_view"]) - except Exception as e: - self.add_error( - code="ERR_IMPORT_RELATION_CREATE_RAW_VIEW", - msg=f"Erreur dans la creation de la vue 'raw' pour {key}: {str(e)}", - ) - return - - sql["process_view"] = self.sql_process_view( - tables["raw_view"], tables["process_view"], keys=[key] + SchemaMethods.c_sql_exec_txt(f"DROP VIEW IF EXISTS {tables_rel['delete']}") + # SchemaMethods.c_sql_exec_txt(f"DROP VIEW IF EXISTS {tables['raw_delete_view']}") + SchemaMethods.c_sql_exec_txt(f"DROP VIEW IF EXISTS {tables_rel['process']}") + # SchemaMethods.c_sql_exec_txt(f"DROP VIEW IF EXISTS {tables['raw_view']}") + + # sql["raw_view"] = self.sql_raw_view( + # from_table, tables["raw_view"], keys=[key], key_unnest=key + # ) + + # # 1) create raw_temp_table for n-n + # try: + # SchemaMethods.c_sql_exec_txt(sql["raw_view"]) + # except Exception as e: + # self.add_error( + # code="ERR_IMPORT_RELATION_CREATE_RAW_VIEW", + # msg=f"Erreur dans la creation de la vue 'raw' pour {key}: {str(e)}", + # ) + # return + + sql_rel["process_view"] = self.sql_process_view( + self.tables["raw"], tables_rel["process"], key_nn=key ) try: - SchemaMethods.c_sql_exec_txt(sql["process_view"]) + SchemaMethods.c_sql_exec_txt(sql_rel["process_view"]) except Exception as e: self.add_error( code="ERR_IMPORT_RELATION_CREATE_PROCESS_VIEW", @@ -72,23 +72,23 @@ def process_relation_views(self, key, from_table): ) return - sql["raw_delete_view"] = self.sql_raw_view( - from_table, tables["raw_delete_view"], keys=[key], key_unnest=key - ) - try: - SchemaMethods.c_sql_exec_txt(sql["raw_delete_view"]) - except Exception as e: - self.add_error( - code="ERR_IMPORT_RELATION_CREATE_RAW_VIEW", - msg=f"Erreur dans la creation de la vue 'delete_raw' pour {key}: {str(e)}", - ) - return - - sql["process_delete_view"] = self.sql_process_view( - tables["raw_delete_view"], tables["process_delete_view"], keys=[key] + # sql["raw_delete_view"] = self.sql_raw_view( + # from_table, tables["raw_delete_view"], keys=[key], key_unnest=key + # ) + # try: + # SchemaMethods.c_sql_exec_txt(sql["raw_delete_view"]) + # except Exception as e: + # self.add_error( + # code="ERR_IMPORT_RELATION_CREATE_RAW_VIEW", + # msg=f"Erreur dans la creation de la vue 'delete_raw' pour {key}: {str(e)}", + # ) + # return + + sql_rel["delete_view"] = self.sql_process_view( + self.tables["raw"], tables_rel["delete"], key_nn=key ) try: - SchemaMethods.c_sql_exec_txt(sql["process_delete_view"]) + SchemaMethods.c_sql_exec_txt(sql_rel["delete_view"]) except Exception as e: self.add_error( code="ERR_IMPORT_RELATION_CREATE_PROCESS_DELETE_VIEW", @@ -99,22 +99,22 @@ def process_relation_views(self, key, from_table): def process_relation_data(self, key): sm = SchemaMethods(self.schema_code) - tables = self.tables["relations"][key] - sql = self.tables["relations"][key] + tables_rel = self.tables["relations"][key] + sql_rel = self.tables["relations"][key] property = sm.property(key) cor_table = property["schema_dot_table"] rel = SchemaMethods(property["schema_code"]) - sql[ + sql_rel[ "delete" ] = f""" DELETE FROM {cor_table} t - USING {tables['process_delete_view']} j + USING {tables_rel['delete']} j WHERE t.{sm.pk_field_name()} = j.{sm.pk_field_name()}; """ try: - SchemaMethods.c_sql_exec_txt(sql["delete"]) + SchemaMethods.c_sql_exec_txt(sql_rel["delete"]) except Exception as e: self.add_error( code="ERR_IMPORT_RELATION_DELETE", @@ -123,13 +123,13 @@ def process_relation_data(self, key): return # - insert - sql["insert"] = self.sql_insert( - tables["process_view"], + sql_rel["insert"] = self.sql_insert( + tables_rel["process"], keys=[sm.pk_field_name(), rel.pk_field_name()], dest_table=cor_table, ) try: - SchemaMethods.c_sql_exec_txt(sql["insert"]) + SchemaMethods.c_sql_exec_txt(sql_rel["insert"]) except Exception as e: self.add_error( code="ERR_IMPORT_RELATION_INSERT", diff --git a/backend/gn_modulator/schema/base.py b/backend/gn_modulator/schema/base.py index f928c01a..d291e320 100644 --- a/backend/gn_modulator/schema/base.py +++ b/backend/gn_modulator/schema/base.py @@ -366,3 +366,6 @@ def url(self, post_url, full_url=False): def unique(self): return self.attr("meta.unique") or [] + + def is_relation_n_n(self, key): + return self.has_property(key) and self.property(key).get("relation_type") == "n-n" diff --git a/backend/gn_modulator/schema/doc.py b/backend/gn_modulator/schema/doc.py index 8f87f20a..27ab974c 100644 --- a/backend/gn_modulator/schema/doc.py +++ b/backend/gn_modulator/schema/doc.py @@ -1,3 +1,7 @@ +import yaml +from gn_modulator.utils.yaml import YmlLoader + + class SchemaDoc: """ methodes pour faire de la doc @@ -5,7 +9,7 @@ class SchemaDoc: pass - def doc_markdown(self, doc_type, exclude=[]): + def doc_markdown(self, doc_type, exclude=[], file_path=None): """ retourne la doc d'un schema en markdown """ @@ -13,6 +17,24 @@ def doc_markdown(self, doc_type, exclude=[]): if doc_type == "import": return self.doc_import(exclude) + if doc_type == "import_fields": + return self.doc_import_fields(exclude) + + if doc_type == "table": + return self.doc_table(exclude) + + if doc_type == "csv": + return self.doc_csv(file_path) + + def doc_csv(self, file_path): + with open(file_path) as f: + data = yaml.load(f, YmlLoader) + txt = ";".join(data[0].keys()) + "\n" + for d in data: + txt += ";".join(map(lambda x: str(x), d.values())) + return txt + + def doc_table(self, exclude=[]): txt = "" txt += f"### Table `{self.sql_schema_dot_table()}`\n" @@ -32,10 +54,11 @@ def doc_import_key(self, key): property_def = self.property(key) txt += f"- `{key}`\n" type = property_def["type"] + if property_def.get("schema_code"): type = "clé simple" - if type == "relation": + if property_def.get("relation_type") == "n-n": type = "liste de clé séparée par une virgule `,`" txt += f" - *type*: `{type}`\n" @@ -43,8 +66,14 @@ def doc_import_key(self, key): if type == "geometry": txt += f" - *geometry_type*: `{self.property(key)['geometry_type']}`\n" txt += " - format:\n" - txt += " - WKT\n" - txt += f" - XY (remplacer {key} par les colonnes x et y)" + txt += " - WKT (par ex. `POINT(0.1 45.2)` (adapter au SRID)')\n" + txt += f" - XY (remplacer {key} par les colonnes x et y)\n" + + if type == "date": + txt += " - format: `YYYY-MM-DD` (par ex. `2023-03-31`)\n" + + if type == "boolean": + txt += " - format: `true`,`t`,`false`,`f`\n" if property_def.get("schema_code"): rel = self.cls(property_def["schema_code"]) @@ -85,9 +114,7 @@ def doc_nomenclature_values(self, key): return txt - def doc_import(self, exclude=[]): - txt = "" - + def import_keys(self, exclude=[]): import_keys = list( filter( lambda x: ( @@ -97,7 +124,7 @@ def doc_import(self, exclude=[]): ) and (not self.property(x).get("primary_key")) and (not self.property(x).get("is_column_property")) - and (not x in exclude) + and (x not in exclude) ), self.properties(), ) @@ -115,6 +142,17 @@ def doc_import(self, exclude=[]): filter(lambda x: x not in required_import_keys, import_keys) ) + return required_import_keys, non_required_import_keys + + def doc_import_fields(self, exclude=[]): + required_import_keys, non_required_import_keys = self.import_keys(exclude) + + return ",".join(required_import_keys + non_required_import_keys) + + def doc_import(self, exclude=[]): + txt = "" + required_import_keys, non_required_import_keys = self.import_keys(exclude) + txt += "\n\n#### Champs obligatoires\n\n" for key in required_import_keys: diff --git a/backend/gn_modulator/tests/import_test/pf_complet.csv b/backend/gn_modulator/tests/import_test/pf_complet.csv new file mode 100644 index 00000000..17e818c0 --- /dev/null +++ b/backend/gn_modulator/tests/import_test/pf_complet.csv @@ -0,0 +1,2 @@ +code_passage_faune;geom;code_ouvrage_gestionnaire;date_creation_ouvrage;date_requalification_ouvrage;diametre;hauteur_dispo_faune;hauteur_ouvrage;issu_requalification;largeur_dispo_faune;largeur_ouvrage;longueur_franchissement;nom_usuel_passage_faune;ouvrag_hydrau_tirant_air;ouvrage_hydrau;ouvrage_type_autre;pi_ou_ps;pk;pr;pr_abs;source;uuid_passage_faune;id_nomenclature_ouvrage_hydrau_banq_caract;id_nomenclature_ouvrage_hydrau_banq_type;id_nomenclature_ouvrage_hydrau_position;id_nomenclature_ouvrage_specificite;nomenclatures_ouvrage_materiaux;nomenclatures_ouvrage_type +TEST_EX_COMPLET;POINT(0 45);AU4KXB;2020-03-01;2023-03-01;2.3;3.5;4.6;True;1.5;2.5;10.5;Passage faune de test;5;True;Autre type spécifique;True;18.5;18;500;Test pour exemple;123e4567-e89b-12d3-a456-426614174000;SIM;NAT;RD;SPE;BET,MET;BUS,CAD,AUT diff --git a/backend/gn_modulator/tests/import_test/pf_complet.yml b/backend/gn_modulator/tests/import_test/pf_complet.yml new file mode 100644 index 00000000..8f6d7aeb --- /dev/null +++ b/backend/gn_modulator/tests/import_test/pf_complet.yml @@ -0,0 +1,29 @@ +#!nodef +- code_passage_faune: TEST_EX_COMPLET + geom: POINT(0 45) + code_ouvrage_gestionnaire: AU4KXB + date_creation_ouvrage: "2020-03-01" + date_requalification_ouvrage: "2023-03-01" + diametre: 2.3 + hauteur_dispo_faune: 3.5 + hauteur_ouvrage: 4.6 + issu_requalification: true + largeur_dispo_faune: 1.5 + largeur_ouvrage: 2.5 + longueur_franchissement: 10.5 + nom_usuel_passage_faune: Passage faune de test + ouvrag_hydrau_tirant_air: 5 + ouvrage_hydrau: true + ouvrage_type_autre: Autre type spécifique + pi_ou_ps: true + pk: 18.5 + pr: 18 + pr_abs: 500 + source: Test pour exemple + uuid_passage_faune: 123e4567-e89b-12d3-a456-426614174000 + id_nomenclature_ouvrage_hydrau_banq_caract: SIM + id_nomenclature_ouvrage_hydrau_banq_type: NAT + id_nomenclature_ouvrage_hydrau_position: RD + id_nomenclature_ouvrage_specificite: SPE + nomenclatures_ouvrage_materiaux: BET|MET + nomenclatures_ouvrage_type: BUS|CAD|AUT diff --git a/backend/gn_modulator/tests/import_test/pf_simple.csv b/backend/gn_modulator/tests/import_test/pf_simple.csv new file mode 100644 index 00000000..e04833f6 --- /dev/null +++ b/backend/gn_modulator/tests/import_test/pf_simple.csv @@ -0,0 +1,2 @@ +code_passage_faune;geom +TEST_EX_SIMPLE;POINT(0 45) diff --git a/backend/gn_modulator/tests/import_test/pf_simple.yml b/backend/gn_modulator/tests/import_test/pf_simple.yml new file mode 100644 index 00000000..7e92abf8 --- /dev/null +++ b/backend/gn_modulator/tests/import_test/pf_simple.yml @@ -0,0 +1,3 @@ +#!nodef +- code_passage_faune: TEST_EX_SIMPLE + geom: POINT(0 45) diff --git a/backend/gn_modulator/tests/import_test/pf_update_1.csv b/backend/gn_modulator/tests/import_test/pf_update_1.csv new file mode 100644 index 00000000..28be0f6c --- /dev/null +++ b/backend/gn_modulator/tests/import_test/pf_update_1.csv @@ -0,0 +1,2 @@ +code_passage_faune;geom;nomenclatures_ouvrage_materiaux +TEST_EX_SIMPLE;POINT(0 45);BET diff --git a/backend/gn_modulator/tests/import_test/pf_update_2.csv b/backend/gn_modulator/tests/import_test/pf_update_2.csv new file mode 100644 index 00000000..fe5d658a --- /dev/null +++ b/backend/gn_modulator/tests/import_test/pf_update_2.csv @@ -0,0 +1,2 @@ +code_passage_faune;geom;nomenclatures_ouvrage_materiaux +TEST_EX_SIMPLE;POINT(0 45);BET,MET diff --git a/backend/gn_modulator/tests/test_import.py b/backend/gn_modulator/tests/test_import.py index d4ca56c6..d24c726d 100644 --- a/backend/gn_modulator/tests/test_import.py +++ b/backend/gn_modulator/tests/test_import.py @@ -198,6 +198,65 @@ def test_sipaf_xy(self): ) assert res["geom"] is not None + def test_sipaf_exemple_simple(self): + module_code = "m_sipaf" + object_code = "site" + data_file_path = import_test_dir / "pf_simple.csv" + expected_infos = { + "res.nb_data": 1, + "res.nb_insert": 1, + } + test_data_file( + module_code, + object_code, + data_file_path, + expected_infos=expected_infos, + ) + + def test_sipaf_exemple_complet(self): + module_code = "m_sipaf" + object_code = "site" + data_file_path = import_test_dir / "pf_complet.csv" + expected_infos = { + "res.nb_data": 1, + "res.nb_insert": 1, + } + test_data_file( + module_code, + object_code, + data_file_path, + expected_infos=expected_infos, + ) + + def test_sipaf_update(self): + module_code = "m_sipaf" + object_code = "site" + data_file_path = import_test_dir / "pf_update_1.csv" + expected_infos = { + "res.nb_data": 1, + "res.nb_insert": 1, + "res.nb_update": 0, + } + test_data_file( + module_code, + object_code, + data_file_path, + expected_infos=expected_infos, + ) + + data_file_path = import_test_dir / "pf_update_2.csv" + expected_infos = { + "res.nb_data": 1, + "res.nb_insert": 0, + "res.nb_update": 1, + } + test_data_file( + module_code, + object_code, + data_file_path, + expected_infos=expected_infos, + ) + # Test remontées d'erreurs def test_error_ERR_IMPORT_INVALID_VALUE_FOR_TYPE(self): diff --git a/backend/gn_modulator/tests/utils/imports.py b/backend/gn_modulator/tests/utils/imports.py index cf6dc1de..cc8a86b5 100644 --- a/backend/gn_modulator/tests/utils/imports.py +++ b/backend/gn_modulator/tests/utils/imports.py @@ -32,7 +32,6 @@ def test_data_file( import_infos = impt.as_dict() expected_errors = expected_infos.pop("errors", []) - if len(expected_errors) == 0: # on teste si le nombre d'erreur est bien nul assert len(import_infos["errors"]) == 0, import_infos["errors"] diff --git a/backend/gn_modulator/utils/yaml.py b/backend/gn_modulator/utils/yaml.py new file mode 100644 index 00000000..0ffbb50a --- /dev/null +++ b/backend/gn_modulator/utils/yaml.py @@ -0,0 +1,29 @@ +import yaml +import os +import json + + +class YmlLoader(yaml.CLoader): + """ + pour ajouter des inclusion de fichier + https://stackoverflow.com/questions/528281/how-can-i-include-a-yaml-file-inside-another + """ + + def __init__(self, stream): + self._root = os.path.split(stream.name)[0] + super(YmlLoader, self).__init__(stream) + + def include(self, node): + filename = os.path.join(self._root, self.construct_scalar(node)) + + with open(filename, "r") as f: + if filename.endswith(".yml"): + return yaml.load(f, YmlLoader) + if filename.endswith(".json"): + return json.loads(f) + raise Exception( + f"Wrong include {filename} in {self._root} (doest not end with .yml or .json)" + ) + + +YmlLoader.add_constructor("!include", YmlLoader.include) diff --git a/config/modules/contrib/m_sipaf/doc/import.md b/config/modules/contrib/m_sipaf/doc/import.md index f1ac5510..8c2f77a0 100644 --- a/config/modules/contrib/m_sipaf/doc/import.md +++ b/config/modules/contrib/m_sipaf/doc/import.md @@ -1,159 +1,17 @@ +# Impot de passage faune +## Procédure -#### Champs obligatoires +### Chargement du fichier +### Vérification +### Insertion des données -- `code_passage_faune` - - *type*: `string` - - *définition*: Code permettant d'identifier le passage à faune de manière unique (texte) -- `geom` - - *type*: `geometry` - - *geometry_type*: `geometry` - - format: - - WKT - - XY (remplacer geom par les colonnes x et y) - *définition*: Géometrie du passage à faune (SRID=4326) +### Options additionelles +## Définition des champs +[Définition des champs](./import_description_champs.md) -#### Champs facultatifs - -- `code_ouvrage_gestionnaire` - - *type*: `string` - - *définition*: Code de l’ouvrage (pour le gestionnaire) -- `date_creation_ouvrage` - - *type*: `date` - - *définition*: Date de la réalisation de l'ouvrage -- `date_requalification_ouvrage` - - *type*: `date` - - *définition*: Date de la requalification de l'ouvrage -- `diametre` - - *type*: `number` - - *définition*: Diamètre de la buse en mètre -- `geom_local` - - *type*: `geometry` - - *geometry_type*: `geometry` - - format: - - WKT - - XY (remplacer geom_local par les colonnes x et y) - *définition*: Géométrie locale du passage à faune (SRID=2154) -- `hauteur_dispo_faune` - - *type*: `number` - - *définition*: Hauteur de l'ouvrage effectivement disponible pour la faune en mètre -- `hauteur_ouvrage` - - *type*: `number` - - *définition*: Hauteur de l'ouvrage en mètre -- `issu_requalification` - - *type*: `boolean` - - *définition*: L'ouvrage est issu d'une opération de requalification ? -- `largeur_dispo_faune` - - *type*: `number` - - *définition*: Largeur de l'ouvrage effectivement disponible pour la faune en mètre -- `largeur_ouvrage` - - *type*: `number` - - *définition*: Largeur de l'ouvrage en mètre -- `longueur_franchissement` - - *type*: `number` - - *définition*: Longueur de franchissement de l'ouvrage en mètres (ne prend pas en compte l'épaisseur des matériaux et éventuels obstacles) -- `nom_usuel_passage_faune` - - *type*: `string` - - *définition*: Nom usuel utilisé pour dénommer l'ouvrage (nom_usuel_pf) -- `ouvrag_hydrau_tirant_air` - - *type*: `number` - - *définition*: Tirant d'air existant entre la banquette et le plafond de l'ouvrage, en mètre -- `ouvrage_hydrau` - - *type*: `boolean` - - *définition*: Ouvrage hydraulique ou non -- `ouvrage_type_autre` - - *type*: `string` -- `pi_ou_ps` - - *type*: `boolean` - - *définition*: Positionnement du passage vis-à vis de l’infrastructure (inférieur (False) ou supérieur (True)) -- `pk` - - *type*: `number` - - *définition*: Point kilométrique -- `pr` - - *type*: `number` - - *définition*: Point repère -- `pr_abs` - - *type*: `integer` - - *définition*: Distance en abscisse curviligne depuis le dernier PR -- `source` - - *type*: `string` - - *définition*: Source de la donnée -- `uuid_passage_faune` - - *type*: `uuid` - - *définition*: Identifiant universel unique au format UUID (uuid_pf) -- `linears` - - *type*: `clé simple` - - *référence*: `linéaires` - - *champ(s)*: `id_type`, `linear_code` -- `id_nomenclature_ouvrage_hydrau_banq_caract` - - *type*: `clé simple` - - *référence*: `nomenclatures` - - *champ(s)*: `cd_nomenclature` - - *définition*: Caractérisation de la banquette dans le cas d'un ouvrage hydraulique (ouvrage_hydrau_caract_banquette) - - *valeurs*: - - **SIM** *Simple* - - **DOU** *Double* -- `id_nomenclature_ouvrage_hydrau_banq_type` - - *type*: `clé simple` - - *référence*: `nomenclatures` - - *champ(s)*: `cd_nomenclature` - - *définition*: Type de la banquette dans le cas d'un ouvrage hydraulique (ouvrage_hydrau_type_banquette) - - *valeurs*: - - **NAT** *Banquette naturelle* - - **BET** *Banquette béton* - - **ECB** *Encorbellement* - - **POF** *Ponton flottant* - - **AUT** *Autre* -- `id_nomenclature_ouvrage_hydrau_position` - - *type*: `clé simple` - - *référence*: `nomenclatures` - - *champ(s)*: `cd_nomenclature` - - *définition*: Ouvrage hydraulique Position (ouvrage_hydrau_position) - - *valeurs*: - - **RD** *Rive droite* - - **RG** *Rive Gauche* - - **RGD** *Rive gauche et rive droite* -- `id_nomenclature_ouvrage_specificite` - - *type*: `clé simple` - - *référence*: `nomenclatures` - - *champ(s)*: `cd_nomenclature` - - *définition*: Exclusivité pour le passage faune (specificite) - - *valeurs*: - - **SPE** *Spécifique* - - **MIX** *Mixte* - - **ND** *Non dédié* -- `nomenclatures_ouvrage_materiaux` - - *type*: `clé simple` - - *référence*: `nomenclatures` - - *champ(s)*: `cd_nomenclature` - - *définition*: Matériaux composants l'ouvrage d'art (lb_materiaux) - - *valeurs*: - - **BET** *Béton* - - **MET** *Métal* - - **PLT** *Plastique* - - **BOI** *Bois* - - **MAC** *Maçonnerie* - - **AUT** *Autre* - - **IND** *Indéterminé* -- `nomenclatures_ouvrage_type` - - *type*: `clé simple` - - *référence*: `nomenclatures` - - *champ(s)*: `cd_nomenclature` - - *définition*: Type d'ouvrage d'art (lb_type_ouvrage) - - *valeurs*: - - **BUS** *Buse* - - **CAD** *Cadre* - - **VOU+R** *Voûte avec radier* - - **AUT** *Autre (préciser)* - - **POR** *Portique* - - **VOU** *Voûte sans radier* - - **DAL+P** *Dalle et palpaplanche* - - **DAL** *Dalle* - - **ARC** *Arc* - - **VIA** *Viaduc* - - **PON** *Pont* - - **CAN** *Canalisation* - - **DALO** *Dalot* - - **DIAB** *Diabolo* - - **TRA** *Tranchée* - - **TUN** *Tunnel* +## Exemples de fichiers +- [Exemple simple](/backend/gn_modulator/tests/import_test/pf_simple.csv) +- [Exemple complet](/backend/gn_modulator/tests/import_test/pf_complet.csv) \ No newline at end of file diff --git a/config/modules/contrib/m_sipaf/doc/import_description_champs.md b/config/modules/contrib/m_sipaf/doc/import_description_champs.md new file mode 100644 index 00000000..7e982e29 --- /dev/null +++ b/config/modules/contrib/m_sipaf/doc/import_description_champs.md @@ -0,0 +1,152 @@ + + +#### Champs obligatoires + +- `code_passage_faune` + - *type*: `string` + - *définition*: Code permettant d'identifier le passage à faune de manière unique (texte) +- `geom` + - *type*: `geometry` + - *geometry_type*: `geometry` + - format: + - WKT (par ex. `POINT(0.1 45.2)` (adapter au SRID)') + - XY (remplacer geom par les colonnes x et y) + - *définition*: Géometrie du passage à faune (SRID=4326) + + +#### Champs facultatifs + +- `code_ouvrage_gestionnaire` + - *type*: `string` + - *définition*: Code de l’ouvrage (pour le gestionnaire) +- `date_creation_ouvrage` + - *type*: `date` + - format: `YYYY-MM-DD` (par ex. `2023-03-31`) + - *définition*: Date de la réalisation de l'ouvrage +- `date_requalification_ouvrage` + - *type*: `date` + - format: `YYYY-MM-DD` (par ex. `2023-03-31`) + - *définition*: Date de la requalification de l'ouvrage +- `diametre` + - *type*: `number` + - *définition*: Diamètre de la buse en mètre +- `hauteur_dispo_faune` + - *type*: `number` + - *définition*: Hauteur de l'ouvrage effectivement disponible pour la faune en mètre +- `hauteur_ouvrage` + - *type*: `number` + - *définition*: Hauteur de l'ouvrage en mètre +- `issu_requalification` + - *type*: `boolean` + - *définition*: L'ouvrage est issu d'une opération de requalification ? +- `largeur_dispo_faune` + - *type*: `number` + - *définition*: Largeur de l'ouvrage effectivement disponible pour la faune en mètre +- `largeur_ouvrage` + - *type*: `number` + - *définition*: Largeur de l'ouvrage en mètre +- `longueur_franchissement` + - *type*: `number` + - *définition*: Longueur de franchissement de l'ouvrage en mètres (ne prend pas en compte l'épaisseur des matériaux et éventuels obstacles) +- `nom_usuel_passage_faune` + - *type*: `string` + - *définition*: Nom usuel utilisé pour dénommer l'ouvrage (nom_usuel_pf) +- `ouvrag_hydrau_tirant_air` + - *type*: `number` + - *définition*: Tirant d'air existant entre la banquette et le plafond de l'ouvrage, en mètre +- `ouvrage_hydrau` + - *type*: `boolean` + - *définition*: Ouvrage hydraulique ou non +- `ouvrage_type_autre` + - *type*: `string` +- `pi_ou_ps` + - *type*: `boolean` + - *définition*: Positionnement du passage vis-à vis de l’infrastructure (inférieur (False) ou supérieur (True)) +- `pk` + - *type*: `number` + - *définition*: Point kilométrique +- `pr` + - *type*: `number` + - *définition*: Point repère +- `pr_abs` + - *type*: `integer` + - *définition*: Distance en abscisse curviligne depuis le dernier PR +- `source` + - *type*: `string` + - *définition*: Source de la donnée +- `uuid_passage_faune` + - *type*: `uuid` + - *définition*: Identifiant universel unique au format UUID (uuid_pf) +- `id_nomenclature_ouvrage_hydrau_banq_caract` + - *type*: `clé simple` + - *référence*: `nomenclatures` + - *champ(s)*: `cd_nomenclature` + - *définition*: Caractérisation de la banquette dans le cas d'un ouvrage hydraulique (ouvrage_hydrau_caract_banquette) + - *valeurs*: + - **SIM** *Simple* + - **DOU** *Double* +- `id_nomenclature_ouvrage_hydrau_banq_type` + - *type*: `clé simple` + - *référence*: `nomenclatures` + - *champ(s)*: `cd_nomenclature` + - *définition*: Type de la banquette dans le cas d'un ouvrage hydraulique (ouvrage_hydrau_type_banquette) + - *valeurs*: + - **NAT** *Banquette naturelle* + - **BET** *Banquette béton* + - **ECB** *Encorbellement* + - **POF** *Ponton flottant* + - **AUT** *Autre* +- `id_nomenclature_ouvrage_hydrau_position` + - *type*: `clé simple` + - *référence*: `nomenclatures` + - *champ(s)*: `cd_nomenclature` + - *définition*: Ouvrage hydraulique Position (ouvrage_hydrau_position) + - *valeurs*: + - **RD** *Rive droite* + - **RG** *Rive Gauche* + - **RGD** *Rive gauche et rive droite* +- `id_nomenclature_ouvrage_specificite` + - *type*: `clé simple` + - *référence*: `nomenclatures` + - *champ(s)*: `cd_nomenclature` + - *définition*: Exclusivité pour le passage faune (specificite) + - *valeurs*: + - **SPE** *Spécifique* + - **MIX** *Mixte* + - **ND** *Non dédié* +- `nomenclatures_ouvrage_materiaux` + - *type*: `liste de clé séparée par une virgule `,`` + - *référence*: `nomenclatures` + - *champ(s)*: `cd_nomenclature` + - *définition*: Matériaux composants l'ouvrage d'art (lb_materiaux) + - *valeurs*: + - **BET** *Béton* + - **MET** *Métal* + - **PLT** *Plastique* + - **BOI** *Bois* + - **MAC** *Maçonnerie* + - **AUT** *Autre* + - **IND** *Indéterminé* +- `nomenclatures_ouvrage_type` + - *type*: `liste de clé séparée par une virgule `,`` + - *référence*: `nomenclatures` + - *champ(s)*: `cd_nomenclature` + - *définition*: Type d'ouvrage d'art (lb_type_ouvrage) + - *valeurs*: + - **BUS** *Buse* + - **CAD** *Cadre* + - **VOU+R** *Voûte avec radier* + - **AUT** *Autre (préciser)* + - **POR** *Portique* + - **VOU** *Voûte sans radier* + - **DAL+P** *Dalle et palpaplanche* + - **DAL** *Dalle* + - **ARC** *Arc* + - **VIA** *Viaduc* + - **PON** *Pont* + - **CAN** *Canalisation* + - **DALO** *Dalot* + - **DIAB** *Diabolo* + - **TRA** *Tranchée* + - **TUN** *Tunnel* + From 962520c6bc18602c0c4cc67151783a359dffa717 Mon Sep 17 00:00:00 2001 From: "joel.clement" Date: Fri, 31 Mar 2023 16:58:37 +0200 Subject: [PATCH 043/142] check input srid options --- backend/gn_modulator/imports/mixins/raw.py | 12 +++++++++--- backend/gn_modulator/imports/mixins/utils.py | 12 ++++++++++++ 2 files changed, 21 insertions(+), 3 deletions(-) diff --git a/backend/gn_modulator/imports/mixins/raw.py b/backend/gn_modulator/imports/mixins/raw.py index 70cd1f11..2ae464fb 100644 --- a/backend/gn_modulator/imports/mixins/raw.py +++ b/backend/gn_modulator/imports/mixins/raw.py @@ -77,17 +77,23 @@ def sql_raw_view( txt_columns = ",\n ".join(v_txt_columns) txt_limit = f"\nLIMIT {limit}" if limit else "" + columns_nn_nomenclature = list( + filter( + lambda x: sm.is_relation_n_n(x) and sm.property(x).get("nomenclature_type"), + columns, + ) + ) + v_with_n_n_nomenclature = list( map( lambda x: self.process_raw_import_with_n_n_nomenclature(x, from_table), - filter(lambda x: sm.is_relation_n_n(x), columns), + columns_nn_nomenclature, ) ) v_join_n_n_nomenclature = list( map( - lambda x: self.process_raw_import_join_n_n_nomenclature(x), - filter(lambda x: sm.is_relation_n_n(x), columns), + lambda x: self.process_raw_import_join_n_n_nomenclature(x), columns_nn_nomenclature ) ) diff --git a/backend/gn_modulator/imports/mixins/utils.py b/backend/gn_modulator/imports/mixins/utils.py index 1043e543..8ad704ba 100644 --- a/backend/gn_modulator/imports/mixins/utils.py +++ b/backend/gn_modulator/imports/mixins/utils.py @@ -32,6 +32,18 @@ def init_import(self): ) SchemaMethods.c_sql_exec_txt(f"CREATE SCHEMA IF NOT EXISTS {schema_import}") + # check srid (avoid sql injection) + if self.options.get('srid'): + try: + int(self.options.get('srid')) + except ValueError: + self.add_error( + { + "code": "ERR_IMPORT_OPTIONS", + "msg": f"Le srid n'est pas valide {self.options.get('srid')}", + } + ) + def pretty_infos(self): txt = "" if self.res.get("nb_data") is not None: From c7ebaff1424a6120ecbc6a01a3f5cf4e95eab9b6 Mon Sep 17 00:00:00 2001 From: "joel.clement" Date: Fri, 31 Mar 2023 17:36:33 +0200 Subject: [PATCH 044/142] doc import utilisateur --- .../m_sipaf/doc/img/boutton_import.png | Bin 0 -> 106095 bytes .../m_sipaf/doc/img/boutton_import_raw.png | Bin 0 -> 90209 bytes .../contrib/m_sipaf/doc/img/erreur_import.png | Bin 0 -> 64451 bytes .../contrib/m_sipaf/doc/img/fin_import.png | Bin 0 -> 100621 bytes .../contrib/m_sipaf/doc/img/menu_import.png | Bin 0 -> 94119 bytes .../m_sipaf/doc/img/validation_import.png | Bin 0 -> 96068 bytes config/modules/contrib/m_sipaf/doc/import.md | 63 ++++++++++++++++-- 7 files changed, 56 insertions(+), 7 deletions(-) create mode 100644 config/modules/contrib/m_sipaf/doc/img/boutton_import.png create mode 100644 config/modules/contrib/m_sipaf/doc/img/boutton_import_raw.png create mode 100644 config/modules/contrib/m_sipaf/doc/img/erreur_import.png create mode 100644 config/modules/contrib/m_sipaf/doc/img/fin_import.png create mode 100644 config/modules/contrib/m_sipaf/doc/img/menu_import.png create mode 100644 config/modules/contrib/m_sipaf/doc/img/validation_import.png diff --git a/config/modules/contrib/m_sipaf/doc/img/boutton_import.png b/config/modules/contrib/m_sipaf/doc/img/boutton_import.png new file mode 100644 index 0000000000000000000000000000000000000000..4137c0ff5c08b136694d352a3967eea5a33f32a7 GIT binary patch literal 106095 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 z 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

5H(xn+%Z^nP_9U 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.replace(/_/g, ' '); } processErrorsLine(data) { From 7438bf35ee84e90c0f0ffb0a3fe529db72aad1fa Mon Sep 17 00:00:00 2001 From: "joel.clement" Date: Thu, 6 Apr 2023 12:41:08 +0200 Subject: [PATCH 055/142] log import && doc --- backend/gn_modulator/imports/mixins/data.py | 7 +- backend/gn_modulator/imports/mixins/insert.py | 3 +- .../gn_modulator/imports/mixins/process.py | 2 +- .../gn_modulator/imports/mixins/relation.py | 5 +- backend/gn_modulator/imports/mixins/update.py | 3 +- backend/gn_modulator/imports/mixins/utils.py | 155 ++++++++++++++- .../import_test/ref_geo.area.csv.log.sql | 111 +++++++++++ .../tests/import_test/synthese_obs.log.sql | 178 ++++++++++++++++++ backend/gn_modulator/tests/test_import.py | 12 +- doc/technique/import.md | 23 ++- 10 files changed, 476 insertions(+), 23 deletions(-) create mode 100644 backend/gn_modulator/tests/import_test/ref_geo.area.csv.log.sql create mode 100644 backend/gn_modulator/tests/import_test/synthese_obs.log.sql diff --git a/backend/gn_modulator/imports/mixins/data.py b/backend/gn_modulator/imports/mixins/data.py index f165d403..7b09ed7f 100644 --- a/backend/gn_modulator/imports/mixins/data.py +++ b/backend/gn_modulator/imports/mixins/data.py @@ -151,12 +151,15 @@ def insert_csv_data(self, f, dest_table, table_columns): return # VALUES au format texte - values_txt = ",\n".join(values) + values_txt = ",\n ".join(values) # requete d'insertion self.sql[ "data_insert" - ] = f"INSERT INTO {dest_table} ({sql_columns_fields}) VALUES {values_txt}" + ] = f"""INSERT INTO {dest_table} ({sql_columns_fields}) + VALUES + {values_txt} +;""" try: SchemaMethods.c_sql_exec_txt(self.sql["data_insert"]) except Exception as e: diff --git a/backend/gn_modulator/imports/mixins/insert.py b/backend/gn_modulator/imports/mixins/insert.py index ef8bdce7..1f9cd545 100644 --- a/backend/gn_modulator/imports/mixins/insert.py +++ b/backend/gn_modulator/imports/mixins/insert.py @@ -77,8 +77,7 @@ def sql_insert(self, from_table, dest_table=None, keys=None): txt_where = f" WHERE {sm.pk_field_name()} IS NULL" if keys is None else "" # requete d'insertion des données - return f""" -INSERT INTO {table_name} ( + return f"""INSERT INTO {table_name} ( {txt_columns_select_keys} ) SELECT diff --git a/backend/gn_modulator/imports/mixins/process.py b/backend/gn_modulator/imports/mixins/process.py index 9335f5b4..3be47edd 100644 --- a/backend/gn_modulator/imports/mixins/process.py +++ b/backend/gn_modulator/imports/mixins/process.py @@ -309,7 +309,7 @@ def var_key(self, schema_code, key, k_unique, index_unique, link_joins, alias_ma # contenant plusieurs valeurs séparées par des '|' # 'val1|val2' # -> on va récupérer la valeur correspondant à l'index_unique - if len(sm.unique()) >= 1: + if len(sm.unique()) > 1: return f"SPLIT_PART({alias_main}.{key}, '|', { index_unique + 1})" # s'il n'y a qu'une seule clé d'unicité, diff --git a/backend/gn_modulator/imports/mixins/relation.py b/backend/gn_modulator/imports/mixins/relation.py index 3a861888..62da411b 100644 --- a/backend/gn_modulator/imports/mixins/relation.py +++ b/backend/gn_modulator/imports/mixins/relation.py @@ -82,7 +82,7 @@ def process_relation_data(self, key): # tables et code sql associé à n-n key tables_rel = self.tables["relations"][key] - sql_rel = self.tables["relations"][key] + sql_rel = self.sql["relations"][key] property = sm.property(key) @@ -96,8 +96,7 @@ def process_relation_data(self, key): # on supprime toutes les données associé aux lignes d'import sql_rel[ "delete" - ] = f""" -DELETE FROM {cor_table} t + ] = f"""DELETE FROM {cor_table} t USING {tables_rel['process']} j WHERE t.{sm.pk_field_name()} = j.{sm.pk_field_name()}; """ diff --git a/backend/gn_modulator/imports/mixins/update.py b/backend/gn_modulator/imports/mixins/update.py index 1b2bd07a..9149a975 100644 --- a/backend/gn_modulator/imports/mixins/update.py +++ b/backend/gn_modulator/imports/mixins/update.py @@ -82,8 +82,7 @@ def sql_update(self, from_table): # condition pour voir si une ligne est modifiée txt_update_conditions = "NOT (\n " + "\n AND ".join(v_update_condition) + "\n)" - return f""" -UPDATE {sm.sql_schema_dot_table()} t SET + return f"""UPDATE {sm.sql_schema_dot_table()} t SET {txt_set_keys} FROM ( SELECT diff --git a/backend/gn_modulator/imports/mixins/utils.py b/backend/gn_modulator/imports/mixins/utils.py index ff447bc0..a86e81b1 100644 --- a/backend/gn_modulator/imports/mixins/utils.py +++ b/backend/gn_modulator/imports/mixins/utils.py @@ -1,12 +1,20 @@ -import json +import re from pathlib import Path from gn_modulator.schema import SchemaMethods from gn_modulator.utils.env import schema_import +from gn_modulator.utils.commons import getAttr from gn_modulator import ModuleMethods class ImportMixinUtils: + """ + Classe de mixin destinée à TImport + + Fonction utiles utilisées dans les autres fichiers de ce dossier + """ + + # correspondance type schema, type sql sql_type_dict = { "integer": "INTEGER", "boolean": "BOOLEAN", @@ -20,6 +28,13 @@ class ImportMixinUtils: } def init_import(self): + """ + Initialisation de l'import + """ + + # récupération de schema_code à partir de + # - schema_code + # - (module_code_object_code) self.schema_code = self.schema_code or ModuleMethods.schema_code( self.module_code, self.object_code ) @@ -30,9 +45,13 @@ def init_import(self): "msg": f"Il n'y a pas de schema pour module_code={self.module_code}, object_code={self.object_code}", } ) + + # Creation du schema d'import s'il n'existe pas SchemaMethods.c_sql_exec_txt(f"CREATE SCHEMA IF NOT EXISTS {schema_import}") - # check srid (avoid sql injection) + # Verification du srid fourni dans les options + # - on verifie que c'est bien un entier + # - pour éviter les injections sql if self.options.get("srid"): try: int(self.options.get("srid")) @@ -45,6 +64,10 @@ def init_import(self): ) def pretty_infos(self): + """ + Affiche des informations de l'import + Pour les imports en ligne de commande + """ txt = "" if self.res.get("nb_data") is not None: txt += f"\n-- import csv file {Path(self.data_file_path).name}" @@ -64,6 +87,12 @@ def pretty_infos(self): return txt def count_and_check_table(self, table_type, table_name): + """ + Commande qui va + - compter le nombre de lignes dans une table ou vue (créer pour l'import) + - permet de vérifier l'intégrité de la table/vue + """ + if self.errors: return @@ -87,7 +116,7 @@ def count_and_check_table(self, table_type, table_name): def table_name(self, type, key=None): """ - nom de la table + nommange de la table """ if type == "data": @@ -97,17 +126,137 @@ def table_name(self, type, key=None): return f"{schema_import}.v_{self.id_import}_{type}_{self.schema_code.replace('.', '_')}{rel}" def add_error(self, code=None, msg=None, key=None, lines=None, values=None): + """ + ajout d'une erreur lorsque qu'elle est rencontrée + """ self.errors.append( {"code": code, "msg": msg, "key": key, "lines": lines, "values": values} ) self.status = "ERROR" def get_table_columns(self, table_name): + """ + récupération des colonnes d'une table + - avec mise en cache pour éviter de multiplier les requetes + """ if not self._columns.get(table_name): self._columns[table_name] = SchemaMethods.get_table_columns(table_name) return self._columns[table_name] def id_digitiser_key(self): + """ + gestion du numérisateur + - on regarde si la table destinataire possède un champs nommé + - id_digitiser + - ou id_digitizer + """ for key in ["id_digitiser", "id_digitizer"]: if SchemaMethods(self.schema_code).has_property(key): return key + + def log_sql(self, file_path, replace_id=None): + """ + écrit le sql réalisé pour un import dans un fichier + """ + + with open(file_path, "w") as f: + f.write(self.all_sql(replace_id)) + + def txt_sql(self, txt_comment, key): + txt = f"-- {txt_comment}\n\n" + try: + sql = getAttr(self.sql, key) + except KeyError: + return "" + txt += sql + txt += "\n\n" + return txt + + def txt_tables(self): + txt = "\n-- Tables et vues utlisées pour l'import\n" + + txt += f"-- - data: {self.tables['data']}\n" + txt += "-- table contenant les données du fichier à importer\n" + txt += "--\n" + + if self.tables.get("mapping"): + txt += f"-- - mapping: {self.tables['mapping']}\n" + txt += "-- vue permettant de faire la corresondance entre\n" + txt += "-- le fichier source et la table destinataire\n" + txt += "--\n" + + txt += f"-- - raw: {self.tables['raw']}\n" + txt += "-- choix des colonnes, typage\n" + txt += "--\n" + + txt += f"-- - process: {self.tables['process']}\n" + txt += "-- résolution des clés\n" + txt += "--\n" + + for key in self.tables["relations"]: + txt += f"-- - process relation n-n {key}: {self.tables['relations'][key]['process']}\n" + + txt += "\n\n" + return txt + + def all_sql(self, replace_id=None): + """ + agrège les requêtes sql utilisée pour l'import + """ + + txt = "-- Log Import {id import}\n" + txt += f"-- - schema_code: {self.schema_code}\n" + + # explication des tables + txt += self.txt_tables() + + # gestion du fichier à importer + txt += self.txt_sql("Creation de la table des données", "data_table") + txt += self.txt_sql("Copie des données", "data_copy_csv") + txt += self.txt_sql("Insertion des données", "data_insert") + + # mapping + txt += self.txt_sql("Mapping", "mapping_view") + + # raw + txt += self.txt_sql("Typage (raw)", "raw_view") + + # process + txt += self.txt_sql("Résolution des clés (process)", "process_view") + + # insert + txt += self.txt_sql("Insertion des données", "insert") + + # update + txt += self.txt_sql("Mise à jour des données", "update") + + # relations + for key in self.sql["relations"]: + txt += f"-- - Traitement relation n-n {key}\n" + txt += self.txt_sql(" - process", f"relations.{key}.process_view") + txt += self.txt_sql(" - suppression", f"relations.{key}.delete") + txt += self.txt_sql(" - suppression", f"relations.{key}.insert") + + if replace_id: + txt = self.replace_id_in_txt(txt, replace_id) + + return txt + + def replace_id_in_txt(self, txt, replace_id): + """ + remplace une id_import par replace_id (par ex 'xxx') + """ + + for k in filter(lambda x: x != "relations", self.tables): + table_name = self.tables[k] + txt = self.replace_table_name_in_txt(txt, replace_id, table_name) + + for k in self.tables["relations"]: + table_name = self.tables["relations"][k]["process"] + txt = self.replace_table_name_in_txt(txt, replace_id, table_name) + + return txt + + def replace_table_name_in_txt(self, txt, replace_id, table_name): + table_name_r = table_name.replace(str(self.id_import), replace_id) + return re.sub(table_name, table_name_r, txt) diff --git a/backend/gn_modulator/tests/import_test/ref_geo.area.csv.log.sql b/backend/gn_modulator/tests/import_test/ref_geo.area.csv.log.sql new file mode 100644 index 00000000..b06f9ec0 --- /dev/null +++ b/backend/gn_modulator/tests/import_test/ref_geo.area.csv.log.sql @@ -0,0 +1,111 @@ +-- Log Import {id import} +-- - schema_code: ref_geo.area + +-- Tables et vues utlisées pour l'import +-- - data: gn_modulator_import.t_xxx_data +-- table contenant les données du fichier à importer +-- +-- - raw: gn_modulator_import.v_xxx_raw_ref_geo_area +-- choix des colonnes, typage +-- +-- - process: gn_modulator_import.v_xxx_process_ref_geo_area +-- résolution des clés +-- + + +-- Creation de la table des données + +CREATE TABLE IF NOT EXISTS gn_modulator_import.t_xxx_data ( + id_import SERIAL NOT NULL, + id_type VARCHAR, + area_name VARCHAR, + area_code VARCHAR, + geom VARCHAR, + CONSTRAINT pk_gn_modulator_import.t_xxx_data_id_import PRIMARY KEY (id_import) +); + +-- Insertion des données + +INSERT INTO gn_modulator_import.t_xxx_data (id_type, area_name, area_code, geom) + VALUES + ('ZC','Parc National du Triangle','PNTRI','POLYGON((6.48 48.87, 5.22 47.84, 6.87 47.96, 6.48 48.87))'), + ('ZC','Parc National du Carré','PNCAR','POLYGON((3.29 45.05, 5.49 44.91, 5.42 43.80, 3.12 44.11, 3.29 45.05))') +; + +-- Typage (raw) + +DROP VIEW IF EXISTS gn_modulator_import.v_xxx_raw_ref_geo_area CASCADE; +CREATE VIEW gn_modulator_import.v_xxx_raw_ref_geo_area AS +SELECT + t.id_import, + t.id_type, + area_name, + area_code, + ST_MULTI(ST_SETSRID(ST_FORCE2D(geom::GEOMETRY), 2154)) AS geom, + CONCAT(t.id_type, '|', t.area_code) AS id_area +FROM gn_modulator_import.t_xxx_data t; + + +-- Résolution des clés (process) + +DROP VIEW IF EXISTS gn_modulator_import.v_xxx_process_ref_geo_area CASCADE; +CREATE VIEW gn_modulator_import.v_xxx_process_ref_geo_area AS +SELECT + id_import, + j_0.id_type AS id_type, + t.area_name, + t.area_code, + t.geom, + j_pk.id_area +FROM gn_modulator_import.v_xxx_raw_ref_geo_area t +LEFT JOIN ref_geo.bib_areas_types j_0 + ON j_0.type_code::TEXT = t.id_type::TEXT +LEFT JOIN ref_geo.l_areas j_pk + ON j_pk.id_type::TEXT = j_0.id_type::TEXT + AND (j_pk.area_code::TEXT = SPLIT_PART(t.id_area, '|', 2)::TEXT + OR (j_pk.area_code IS NULL AND SPLIT_PART(t.id_area, '|', 2) IS NULL)); + + +-- Insertion des données + +INSERT INTO ref_geo.l_areas ( + id_type, + area_name, + area_code, + geom +) +SELECT + id_type, + area_name, + area_code, + geom +FROM gn_modulator_import.v_xxx_process_ref_geo_area WHERE id_area IS NULL; + + +-- Mise à jour des données + +UPDATE ref_geo.l_areas t SET + id_type=p.id_type, + area_name=p.area_name, + area_code=p.area_code, + geom=p.geom +FROM ( + SELECT + id_type, + area_name, + area_code, + geom, + id_area + FROM gn_modulator_import.v_xxx_process_ref_geo_area +)p +WHERE p.id_area = t.id_area + AND NOT ( + (t.id_type::TEXT IS DISTINCT FROM p.id_type::TEXT) + AND (t.area_name::TEXT IS DISTINCT FROM p.area_name::TEXT) + AND (t.area_code::TEXT IS DISTINCT FROM p.area_code::TEXT) + AND (t.geom::TEXT IS DISTINCT FROM p.geom::TEXT) + AND (t.id_area::TEXT IS DISTINCT FROM p.id_area::TEXT) +) +; + + diff --git a/backend/gn_modulator/tests/import_test/synthese_obs.log.sql b/backend/gn_modulator/tests/import_test/synthese_obs.log.sql new file mode 100644 index 00000000..796507d6 --- /dev/null +++ b/backend/gn_modulator/tests/import_test/synthese_obs.log.sql @@ -0,0 +1,178 @@ +-- Log Import {id import} +-- - schema_code: syn.synthese + +-- Tables et vues utlisées pour l'import +-- - data: gn_modulator_import.t_xxx_data +-- table contenant les données du fichier à importer +-- +-- - raw: gn_modulator_import.v_xxx_raw_syn_synthese +-- choix des colonnes, typage +-- +-- - process: gn_modulator_import.v_xxx_process_syn_synthese +-- résolution des clés +-- +-- - process relation n-n cor_observers: gn_modulator_import.v_xxx_process_syn_synthese_cor_observers + + +-- Creation de la table des données + +CREATE TABLE IF NOT EXISTS gn_modulator_import.t_xxx_data ( + id_import SERIAL NOT NULL, + cd_nom VARCHAR, + id_source VARCHAR, + entity_source_pk_value VARCHAR, + nom_cite VARCHAR, + date_min VARCHAR, + date_max VARCHAR, + cor_observers VARCHAR, + CONSTRAINT pk_gn_modulator_import.t_xxx_data_id_import PRIMARY KEY (id_import) +); + +-- Insertion des données + +INSERT INTO gn_modulator_import.t_xxx_data (cd_nom, id_source, entity_source_pk_value, nom_cite, date_min, date_max, cor_observers) + VALUES + ('67111','Occtax','21','Ablette','2017-01-08 20:00:00.000','2017-01-08 23:00:00.000','admin,agent'), + ('67111','Occtax','22','Ablette','2017-01-08 20:00:00.000','2017-01-08 23:00:00.000','admin,agent') +; + +-- Typage (raw) + +DROP VIEW IF EXISTS gn_modulator_import.v_xxx_raw_syn_synthese CASCADE; +CREATE VIEW gn_modulator_import.v_xxx_raw_syn_synthese AS +SELECT + t.id_import, + t.cd_nom, + t.id_source, + entity_source_pk_value, + nom_cite, + date_min::TIMESTAMP, + date_max::TIMESTAMP, + t.cor_observers, + CONCAT(t.id_source, '|', t.entity_source_pk_value) AS id_synthese +FROM gn_modulator_import.t_xxx_data t; + + +-- Résolution des clés (process) + +DROP VIEW IF EXISTS gn_modulator_import.v_xxx_process_syn_synthese CASCADE; +CREATE VIEW gn_modulator_import.v_xxx_process_syn_synthese AS +SELECT + id_import, + j_0.cd_nom AS cd_nom, + j_1.id_source AS id_source, + t.entity_source_pk_value, + t.nom_cite, + t.date_min, + t.date_max, + j_pk.id_synthese +FROM gn_modulator_import.v_xxx_raw_syn_synthese t +LEFT JOIN taxonomie.taxref j_0 + ON j_0.cd_nom::TEXT = t.cd_nom::TEXT +LEFT JOIN gn_synthese.t_sources j_1 + ON j_1.name_source::TEXT = t.id_source::TEXT +LEFT JOIN gn_synthese.synthese j_pk + ON j_pk.id_source::TEXT = j_1.id_source::TEXT + AND (j_pk.entity_source_pk_value::TEXT = SPLIT_PART(t.id_synthese, '|', 2)::TEXT + OR (j_pk.entity_source_pk_value IS NULL AND SPLIT_PART(t.id_synthese, '|', 2) IS NULL)); + + +-- Insertion des données + +INSERT INTO gn_synthese.synthese ( + cd_nom, + id_source, + entity_source_pk_value, + nom_cite, + date_min, + date_max +) +SELECT + cd_nom, + id_source, + entity_source_pk_value, + nom_cite, + date_min, + date_max +FROM gn_modulator_import.v_xxx_process_syn_synthese WHERE id_synthese IS NULL; + + +-- Mise à jour des données + +UPDATE gn_synthese.synthese t SET + cd_nom=p.cd_nom, + id_source=p.id_source, + entity_source_pk_value=p.entity_source_pk_value, + nom_cite=p.nom_cite, + date_min=p.date_min, + date_max=p.date_max +FROM ( + SELECT + cd_nom, + id_source, + entity_source_pk_value, + nom_cite, + date_min, + date_max, + id_synthese + FROM gn_modulator_import.v_xxx_process_syn_synthese +)p +WHERE p.id_synthese = t.id_synthese + AND NOT ( + (t.cd_nom::TEXT IS DISTINCT FROM p.cd_nom::TEXT) + AND (t.id_source::TEXT IS DISTINCT FROM p.id_source::TEXT) + AND (t.entity_source_pk_value::TEXT IS DISTINCT FROM p.entity_source_pk_value::TEXT) + AND (t.nom_cite::TEXT IS DISTINCT FROM p.nom_cite::TEXT) + AND (t.date_min::TEXT IS DISTINCT FROM p.date_min::TEXT) + AND (t.date_max::TEXT IS DISTINCT FROM p.date_max::TEXT) + AND (t.id_synthese::TEXT IS DISTINCT FROM p.id_synthese::TEXT) +) +; + + +-- - Traitement relation n-n cor_observers +-- - process + +DROP VIEW IF EXISTS gn_modulator_import.v_xxx_process_syn_synthese_cor_observers CASCADE; +CREATE VIEW gn_modulator_import.v_xxx_process_syn_synthese_cor_observers AS +WITH unnest_cor_observers AS ( + SELECT + id_import, + id_synthese, + TRIM(UNNEST(STRING_TO_ARRAY(cor_observers, ','))) AS cor_observers + FROM gn_modulator_import.v_xxx_raw_syn_synthese +) +SELECT + id_import, + j_0.id_role, + j_pk.id_synthese +FROM unnest_cor_observers AS t +LEFT JOIN utilisateurs.t_roles j_0 + ON j_0.identifiant::TEXT = t.cor_observers::TEXT +LEFT JOIN gn_synthese.t_sources j_pk_0 + ON j_pk_0.name_source::TEXT = SPLIT_PART(t.id_synthese, '|', 1)::TEXT +LEFT JOIN gn_synthese.synthese j_pk + ON j_pk.id_source::TEXT = j_pk_0.id_source::TEXT + AND (j_pk.entity_source_pk_value::TEXT = SPLIT_PART(t.id_synthese, '|', 2)::TEXT + OR (j_pk.entity_source_pk_value IS NULL AND SPLIT_PART(t.id_synthese, '|', 2) IS NULL)); + + +-- - suppression + +DELETE FROM gn_synthese.cor_observer_synthese t + USING gn_modulator_import.v_xxx_process_syn_synthese_cor_observers j + WHERE t.id_synthese = j.id_synthese; + + +-- - suppression + +INSERT INTO gn_synthese.cor_observer_synthese ( + id_role, + id_synthese +) +SELECT + id_role, + id_synthese +FROM gn_modulator_import.v_xxx_process_syn_synthese_cor_observers; + + diff --git a/backend/gn_modulator/tests/test_import.py b/backend/gn_modulator/tests/test_import.py index e89eed2b..f1b5ff7e 100644 --- a/backend/gn_modulator/tests/test_import.py +++ b/backend/gn_modulator/tests/test_import.py @@ -6,7 +6,7 @@ @pytest.mark.usefixtures("temporary_transaction", scope="session") class TestImport: - def test_synthese(self): + def test_synthese1(self): """ premier test ajout d'une ligne dans la synthese """ @@ -101,10 +101,7 @@ def test_ref_geo_area(self): module_code, object_code, data_file_path, expected_infos=expected_infos ) - print(impt.sql["insert"]) - print(impt.sql["update"]) - print(impt.sql["nb_insert"]) - print(impt.sql["nb_update"]) + impt.log_sql(import_test_dir / "ref_geo.area.csv.log.sql", "xxx") def test_synthese_x_y(self): module_code = "MODULATOR" @@ -132,7 +129,10 @@ def test_synthese_update_obs(self): "data_type": "csv", "csv_delimiter": ",", } - test_data_file(module_code, object_code, data_file_path, expected_infos=expected_infos) + impt = test_data_file( + module_code, object_code, data_file_path, expected_infos=expected_infos + ) + impt.log_sql(import_test_dir / "synthese_obs.log.sql", "xxx") data_file_path = import_test_dir / "synthese_obs_update.csv" expected_infos = { diff --git a/doc/technique/import.md b/doc/technique/import.md index febbf9b7..b5c7e9dd 100644 --- a/doc/technique/import.md +++ b/doc/technique/import.md @@ -1,14 +1,14 @@ # Import -## Introduction et principes +## Introduction et principes Dans le cadre de ce module, nous avons implémenter des fonctionalité d'import à destination (théoriquement) de n'importe quelle table de la base. Les étapes de la procédure d'import sont illustrés par des exemple, où l'on détaille le code sql produit pour chaque étape. -- [Exemle simple (ref_geo.l_areas)](./import_exemple_simple_ref_geo_area.md) -- [Exemle avancé (gn_synthese.synthese)](./import_exemple_avance) +- [Exemle simple (ref_geo.l_areas)](/gn_modulator/backend/gn_modulator/tests/import_test/ref_geo.area.csv.log.sql) +- [Exemle avancé (gn_synthese.synthese)](/gn_modulator/backend/gn_modulator/tests/import_test/synthese_obs.csv.log.sql) ### L'unicité @@ -98,4 +98,19 @@ On met à jour les ligne sde la table destinataire qui correspondent aux lignes ### 2.3) Traitement des relations n-n - Effacement de toutes les lignes concernées -- Insert des lignes selon les données \ No newline at end of file +- Insert des lignes selon les données + +### 3) Log des commandes d'importd + +Le modèle d'import contient deux objects pour stocker les commandes sql + +- `tables`: pour retrouver les différente tables et vues créées pour l'import. +- `sql`: pour les requêtes utilisée pour l'import + +### 3.1) tables + +- `data`: table contenant les données + +### 3.2) requêtes sql + +- `data_table`: creation de la table contenant les données \ No newline at end of file From b8d82e76a588b661dd2a3a01b71888b8e24dbe44 Mon Sep 17 00:00:00 2001 From: "joel.clement" Date: Fri, 7 Apr 2023 10:17:03 +0200 Subject: [PATCH 056/142] secure_fields --- backend/gn_modulator/module/__init__.py | 2 + backend/gn_modulator/module/config/base.py | 2 + backend/gn_modulator/module/config/utils.py | 176 +++++++ .../gn_modulator/routes/utils/decorators.py | 66 ++- backend/gn_modulator/routes/utils/params.py | 2 +- .../gn_modulator/routes/utils/repository.py | 6 + backend/gn_modulator/schema/api.py | 450 ++++++++++++++++++ backend/gn_modulator/schema/base.py | 16 + backend/gn_modulator/schema/config/base.py | 5 +- backend/gn_modulator/schema/config/layout.py | 38 ++ .../gn_modulator/schema/repositories/base.py | 18 +- backend/gn_modulator/schema/serializers.py | 10 +- backend/gn_modulator/tests/data/commons.py | 13 + .../tests/import_test/synthese_1.log.sql | 133 ++++++ backend/gn_modulator/tests/test_rest_api.py | 122 ++++- ....site_template.module-tempate_defaults.yml | 8 +- config/modules/contrib/m_sipaf/config.yml | 8 + .../m_sipaf.diagnostic_details.layout.yml | 7 + .../m_sipaf.diagnostic_edit.layout.yml | 7 + .../contrib/m_sipaf/m_sipaf.module.yml | 2 - doc/changelog.md | 2 + 21 files changed, 1072 insertions(+), 21 deletions(-) create mode 100644 backend/gn_modulator/schema/api.py create mode 100644 backend/gn_modulator/tests/import_test/synthese_1.log.sql create mode 100644 config/modules/contrib/m_sipaf/layouts/m_sipaf.diagnostic_details.layout.yml create mode 100644 config/modules/contrib/m_sipaf/layouts/m_sipaf.diagnostic_edit.layout.yml diff --git a/backend/gn_modulator/module/__init__.py b/backend/gn_modulator/module/__init__.py index 8f54388f..a36b2b93 100644 --- a/backend/gn_modulator/module/__init__.py +++ b/backend/gn_modulator/module/__init__.py @@ -5,6 +5,8 @@ from . import errors from gn_modulator.utils.errors import add_error +from gn_modulator.utils.cache import get_global_cache, set_global_cache + class ModuleMethods(ModuleBase, ModuleBreadCrumbs, ModuleCommands, ModulesConfig): """ diff --git a/backend/gn_modulator/module/config/base.py b/backend/gn_modulator/module/config/base.py index ae8fcafa..8dd807fd 100644 --- a/backend/gn_modulator/module/config/base.py +++ b/backend/gn_modulator/module/config/base.py @@ -76,6 +76,8 @@ def init_module_config(cls, module_code): cls.process_tree(module_code) + cls.process_fields(module_code) + if module_config.get("registred"): cls.process_module_params(module_code) diff --git a/backend/gn_modulator/module/config/utils.py b/backend/gn_modulator/module/config/utils.py index 808aa839..e0d597be 100644 --- a/backend/gn_modulator/module/config/utils.py +++ b/backend/gn_modulator/module/config/utils.py @@ -249,3 +249,179 @@ def process_module_objects(cls, module_code): # # mise en cache pour pouvoir s'en reservir par ailleurs # set_global_cache(["exports", export_code], export_definition) + + @classmethod + def process_module_api(cls, module_code): + """ + ouvre les routes pour un module + """ + + module_config = cls.module_config(module_code) + + bp = Blueprint(module_code, __name__) + + # pour tous les object d'un module + for object_code, object_definition in module_config["objects"].items(): + # on récupère schema methodes + sm = SchemaMethods(object_definition["schema_code"]) + + # ouverture des routes pour ce schema + # - avec les options:'object_definition' + # en particulier le cruved + sm.register_api(bp, module_code, object_code, copy.deepcopy(object_definition)) + + # les prefiltres définis dans les objects ne servent que dans les ouverture de route ??? + if "prefilters" in object_definition: + del object_definition["prefilters"] + + # enregistrement du blueprint pour ce module + current_app.register_blueprint(bp, url_prefix=f"/{module_code.lower()}") + + @classmethod + def process_fields(cls, module_code): + """ + On regarde dans toutes les pages pour déterminer les champs + """ + + keys = get_global_cache(["keys"], {}) + + module_config = cls.module_config(module_code) + pages = module_config.get("pages", {}) + config_params = module_config.get("config_params", {}) + config_defaults = module_config.get("config_defaults", {}) + config_params = {**config_defaults, **config_params} + context = {"module_code": module_code} + for page_code, page_definition in pages.items(): + keys = cls.get_layout_keys(page_definition["layout"], config_params, context, keys) + + set_global_cache(["keys"], keys) + + @classmethod + def get_layout_keys(cls, layout, params, context, keys): + if isinstance(layout, list): + for item in layout: + cls.get_layout_keys(item, params, context, keys) + return keys + + if isinstance(layout, dict) and layout.get("type") in ["dict", "array"]: + data_keys = context.get("data_keys", []) + data_keys.append(layout["key"]) + context = {**context, "data_keys": data_keys} + return cls.get_layout_keys(layout["items"], params, context, keys) + + if ( + isinstance(layout, dict) + and layout.get("type") == "list_form" + and layout.get("object_code") + ): + key_add = [] + if layout.get("label_field_name"): + key_add.append(layout["label_field_name"]) + if layout.get("title_field_name"): + key_add.append(layout["title_field_name"]) + if layout.get("additional_fields"): + key_add += layout["additional_fields"] + if key_add: + cls.get_layout_keys( + key_add, + params, + { + **context, + "module_code": layout.get("module_code") or context["module_code"], + "object_code": layout["object_code"], + }, + keys, + ) + if layout.get("return_object") and layout.get("additional_fields"): + additional_keys = list( + map(lambda x: f"{layout['key']}.{x}", layout["additional_fields"]) + ) + cls.get_layout_keys(additional_keys, params, context, keys) + + if isinstance(layout, str) or layout.get("key"): + key = layout if isinstance(layout, str) else layout["key"] + if context.get("data_keys"): + key = f"{''.join(context['data_keys'])}.{key}" + module_keys = keys[context["module_code"]] = keys.get(context["module_code"], {}) + object_keys = module_keys[context["object_code"]] = module_keys.get( + context["object_code"], {"read": [], "write": []} + ) + + object_config = cls.object_config(context["module_code"], context["object_code"]) + schema_code = object_config["schema_code"] + + sm = SchemaMethods(schema_code) + if not sm.has_property(key): + return keys + if key not in object_keys["read"]: + object_keys["read"].append(key) + if context.get("form"): + object_keys["write"].append(key) + return keys + + if layout.get("object_code"): + context = {**context, "object_code": layout["object_code"]} + + if layout.get("type") == "form": + context = {**context, "form": True} + + if layout.get("module_code"): + context = {**context, "module_code": layout["module_code"]} + + if layout.get("code"): + template_params = {**params, **layout.get("template_params", {})} + layout_from_code = SchemaMethods.get_layout_from_code( + layout.get("code"), template_params + ) + return cls.get_layout_keys(layout_from_code, params, context, keys) + + if layout.get("items"): + return cls.get_layout_keys(layout.get("items"), params, context, keys) + + return keys + + @classmethod + def get_autorized_fields(cls, module_code, object_code, write=False): + sm = SchemaMethods(cls.schema_code(module_code, object_code)) + + authorized_fields = ( + get_global_cache( + [ + "keys", + module_code, + object_code, + "write" if write else "read", + ] + ) + or [] + ) + + if not authorized_fields: + set_global_cache( + [ + "keys", + module_code, + object_code, + "write" if write else "read", + ], + authorized_fields, + ) + + # pour la lecture, on ajoute par défaut les champs + # - pk_field_name + # - label_field_name + # - title_field_name + # - champs d'unicité + # - ownership + if not write: + for elem in [ + sm.pk_field_name(), + sm.label_field_name(), + sm.title_field_name(), + *sm.unique(), + "ownership", + ]: + if elem is not None and elem not in authorized_fields: + authorized_fields.append(elem) + + return authorized_fields diff --git a/backend/gn_modulator/routes/utils/decorators.py b/backend/gn_modulator/routes/utils/decorators.py index cbf090c6..1b6f3a86 100644 --- a/backend/gn_modulator/routes/utils/decorators.py +++ b/backend/gn_modulator/routes/utils/decorators.py @@ -1,8 +1,64 @@ from functools import wraps -from gn_modulator import ModuleMethods -from geonature.core.gn_permissions.decorators import check_cruved_scope from werkzeug.exceptions import Forbidden +from geonature.core.gn_permissions.decorators import check_cruved_scope + +from gn_modulator import ModuleMethods, SchemaMethods +from gn_modulator.utils.cache import get_global_cache +from gn_modulator.routes.utils.repository import parse_request_args + + +def check_fields(module_code, object_code): + """ + fonction pour vérifier que les champs (fields) utilisé pour une route sont + bien autorisés + - pour ne pas avoir un accès aux info de toutes la base + - pour ne pas modifier des champs que l'on ne souhaite pas modifier + """ + + object_definition = ModuleMethods.object_config(module_code, object_code) + + schema_code = ModuleMethods.schema_code(module_code, object_code) + + params = parse_request_args(object_definition) + fields = params["fields"] + + sm = SchemaMethods(schema_code) + + # les champs autorisés sont récupérés depuis le cache + # ils ont été déterminés à l'unitialisation des modules (methode ModuleMethods.process_fields) + authorized_fields = ModuleMethods.get_autorized_fields(module_code, object_code) + + # liste des champs invalides + # - cad ne correspondent pas à un champs du schema + unvalid_fields = sorted( + list(filter(lambda f: not sm.has_property(f) and f != "ownership", fields)) + ) + + # liste des champs non autorisés + # - cad ne font pas parti des champs autorisés + unauthorized_fields = sorted(list(filter(lambda f: f not in authorized_fields, fields))) + + # retour en cas de champs invalide + if unvalid_fields: + return { + "code": "ERR_REST_API_UNVALID_FIELD", + "unvalid_fields": unvalid_fields, + "authorized_fields": authorized_fields, + "msg": f"Les champs suivants ne sont pas des clé valides:
{', '.join(unvalid_fields)}", + } + + # retour en cas de champs non autorisé + if unauthorized_fields: + msg = f"Les champs suivants ne sont pas authorisé pour cette requete {','.join(unauthorized_fields) }" + + return { + "code": "ERR_REST_API_UNAUTHORIZED_FIELD", + "unauthorized_fields": unauthorized_fields, + "authorized_fields": authorized_fields, + "msg": msg, + } + def check_module_object_route(action): def _check_module_object_route(fn): @@ -42,6 +98,12 @@ def __check_module_object_route(*args, **kwargs): # pour les actions d'import on regarde les droit de creation C action_cruved = "C" if action == "I" else action + # verification des champs + field_errors = check_fields(module_code, object_code) + if field_errors: + print("yakou") + return field_errors, 403 + return check_cruved_scope(action_cruved, module_code=module_code)(fn)(*args, **kwargs) return __check_module_object_route diff --git a/backend/gn_modulator/routes/utils/params.py b/backend/gn_modulator/routes/utils/params.py index 739542d7..d2865fc6 100644 --- a/backend/gn_modulator/routes/utils/params.py +++ b/backend/gn_modulator/routes/utils/params.py @@ -38,7 +38,7 @@ def load_array_param(param): if not param: return [] - return param.split(",") + return list(map(lambda x: x.strip(), param.split(","))) def load_param(param): diff --git a/backend/gn_modulator/routes/utils/repository.py b/backend/gn_modulator/routes/utils/repository.py index b19798fb..ef351f5c 100644 --- a/backend/gn_modulator/routes/utils/repository.py +++ b/backend/gn_modulator/routes/utils/repository.py @@ -82,6 +82,7 @@ def post_rest(module_code, object_code): sm = SchemaMethods(schema_code) data = request.get_json() + # on verifie les champs params = parse_request_args(object_definition) try: @@ -101,6 +102,10 @@ def patch_rest(module_code, object_code, value): data = request.get_json() params = parse_request_args(object_definition) + authorized_write_fields = ModuleMethods.get_autorized_fields( + module_code, object_code, write=True + ) + try: m, _ = sm.update_row( value, @@ -108,6 +113,7 @@ def patch_rest(module_code, object_code, value): field_name=params.get("field_name"), module_code=module_code, params=params, + authorized_write_fields=authorized_write_fields, ) except sm.errors.SchemaUnsufficientCruvedRigth as e: diff --git a/backend/gn_modulator/schema/api.py b/backend/gn_modulator/schema/api.py new file mode 100644 index 00000000..ba25e2ef --- /dev/null +++ b/backend/gn_modulator/schema/api.py @@ -0,0 +1,450 @@ +""" + SchemaMethods : api +""" + +import json +from flask.views import MethodView +from flask import request, make_response +from geonature.core.gn_permissions import decorators as permissions +from gn_modulator.utils.cache import get_global_cache, set_global_cache + +# from geonature.utils.config import config +from gn_modulator import MODULE_CODE +from gn_modulator.definition import DefinitionMethods +import sqlparse + + +class SchemaApi: + """ + class for schema api processing + + doc: + - https://flask.palletsprojects.com/en/2.0.x/views/ + + """ + + def method_view_name(self, module_code, object_code, view_type): + object_code_undot = object_code.replace(".", "_") + return f"MV_{module_code}_{object_code_undot}_{view_type}" + + def view_name(self, module_code, object_code, view_type): + """ """ + object_code_undot = object_code.replace(".", "_") + return f"MV_{module_code}_{object_code_undot}_{view_type}" + + @classmethod + def base_url(cls): + """ + base url (may differ with apps (GN, UH, TH, ...)) + + TODO process apps ? + + """ + from geonature.utils.config import config + + return "{}/{}".format(config["API_ENDPOINT"], MODULE_CODE.lower()) + + def url(self, post_url, full_url=False): + """ + /{schema_code}{post_url} + + - full/url renvoie l'url complet + + TODO gérer par type d'url ? + """ + + url = self.attr("meta.url", "/{}{}".format(self.schema_code(), post_url)) + + if full_url: + url = "{}{}".format(self.cls.base_url(), url) + + return url + + def parse_request_args(self, request, object_definition={}): + """ + TODO !!! à refaire avec repo get_list + parse request flask element + - filters + - prefilters + - fields + - field_name + - sort + - page + - page_size + + TODO plusieurs possibilités pour le parametrage + - par exemple au format tabulator ou autre .... + """ + + # params = json.loads(params_txt) + params = { + "as_geojson": self.load_param(request.args.get("as_geojson", "false")), + "flat_keys": self.load_param(request.args.get("flat_keys", "false")), + "compress": self.load_param(request.args.get("compress", "false")), + "fields": self.load_array_param(request.args.get("fields")), + "field_name": self.load_param(request.args.get("field_name", "null")), + "filters": self.parse_filters(request.args.get("filters")), + "prefilters": self.parse_filters(request.args.get("prefilters")), + "page": self.load_param(request.args.get("page", "null")), + "page_size": self.load_param(request.args.get("page_size", "null")), + "sort": self.load_array_param(request.args.get("sort")), + "value": self.load_param(request.args.get("value", "null")), + "as_csv": self.load_param(request.args.get("as_csv", "false")), + "cruved_type": self.load_param(request.args.get("cruved_type", "null")), + "sql": self.load_param(request.args.get("sql", "null")), + "test": self.load_param(request.args.get("test", "null")), + } + + if "prefilters" in object_definition: + params["prefilters"] = ( + self.parse_filters(object_definition["prefilters"]) + params["prefilters"] + ) + + return params + + def load_array_param(self, param): + """ + pour les cas ou params est une chaine de caractère séparée par des ',' + """ + + if not param: + return [] + + return param.split(",") + + def load_param(self, param): + if param == "undefined": + return None + + # pour traiter les true false + try: + return json.loads(param) + except Exception: + return param + + def schema_api_dict(self, module_code, object_definition): + """ + object_definition : dict + - prefilters + """ + + def check_fields(fields, write=False): + authorized_fields = sorted( + get_global_cache( + [ + "keys", + module_code, + object_definition["object_code"], + "write" if write else "read", + ] + ) + or [] + ) + + for elem in [ + self.pk_field_name(), + self.label_field_name(), + self.title_field_name(), + "ownership", + ]: + if elem is not None and elem not in authorized_fields: + authorized_fields.append(elem) + + unvalid_fields = sorted( + list(filter(lambda f: not self.has_property(f) and f != "ownership", fields)) + ) + unauthorized_fields = sorted( + list(filter(lambda f: f not in authorized_fields, fields)) + ) + + if unvalid_fields: + return f"Les champs suivants ne sont pas des clé valides:
{', '.join(unvalid_fields)}" + + if unauthorized_fields: + return f""" + Les champs suivants ne sont pas authorisé pour cette requete: +

+ - {'
- '.join(unauthorized_fields) } +

+ Champs autorisés +

+ - {'
- '.join(authorized_fields) } + """ + + def get_rest(self_mv, value=None): + if value: + try: + return get_one_rest(value) + except self.errors.SchemaUnsufficientCruvedRigth: + return f"Vous n'avez pas les droits suffisants pour accéder à cette requête (schema_code: {self.schema_code()}, module_code: {module_code})" + + else: + return get_list_rest() + + def get_one_rest(value): + params = self.parse_request_args(request, object_definition) + field_errors = check_fields(params["fields"]) + if field_errors: + return field_errors, 403 + try: + m = self.get_row( + value, + field_name=params.get("field_name"), + module_code=module_code, + cruved_type="R", + params=params, + ).one() + + except self.errors.SchemaUnsufficientCruvedRigth as e: + return "Erreur Cruved : {}".format(str(e)), 403 + + return self.serialize( + m, fields=params.get("fields"), as_geojson=params.get("as_geojson") + ) + + def get_list_rest(additional_params={}): + params = { + **self.parse_request_args(request, object_definition), + **additional_params, + } + + field_errors = check_fields(params["fields"]) + if field_errors: + return field_errors, 403 + + cruved_type = params.get("cruved_type") or "R" + query_infos = self.get_query_infos( + module_code=module_code, + cruved_type=cruved_type, + params=params, + url=request.url, + ) + + query_list = self.query_list( + module_code=module_code, cruved_type=cruved_type, params=params + ) + + if params.get("sql"): + response = make_response( + sqlparse.format(str(query_list), reindent=True, keywordcase="upper"), + 200, + ) + response.mimetype = "text/plain" + return response + + res_list = query_list.all() + + out = { + **query_infos, + "data": self.serialize_list( + res_list, + fields=params.get("fields"), + as_geojson=params.get("as_geojson"), + flat_keys=params.get("flat_keys"), + ), + } + + return out + + def post_rest(self_mv): + params = self.parse_request_args(request, object_definition) + field_errors = check_fields(params["fields"]) + if field_errors: + return field_errors, 403 + + data = request.get_json() + + try: + m = self.insert_row(data) + + except self.errors.SchemaUnsufficientCruvedRigth as e: + return "Erreur Cruved : {}".format(str(e)), 403 + + return self.serialize( + m, fields=params.get("fields"), as_geojson=params.get("as_geojson") + ) + + def patch_rest(self_mv, value): + params = self.parse_request_args(request, object_definition) + field_errors = check_fields(params["fields"]) + if field_errors: + return field_errors, 403 + + data = request.get_json() + + # check data fields + + try: + m, _ = self.update_row( + value, + data, + field_name=params.get("field_name"), + module_code=module_code, + params=params, + ) + + except self.errors.SchemaUnsufficientCruvedRigth as e: + return "Erreur Cruved : {}".format(str(e)), 403 + + return self.serialize( + m, fields=params.get("fields"), as_geojson=params.get("as_geojson") + ) + + def delete_rest(self_mv, value): + params = self.parse_request_args(request, object_definition) + + m = self.get_row( + value, + field_name=params.get("field_name"), + module_code=module_code, + cruved_type="D", + params=params, + ).one() + dict_out = self.serialize( + m, fields=params.get("fields"), as_geojson=params.get("as_geojson") + ) + + try: + self.delete_row(value, field_name=params.get("field_name")) + + except self.errors.SchemaUnsufficientCruvedRigth as e: + return "Erreur Cruved : {}".format(str(e)), 403 + + return dict_out + + def get_page_number(self_mv, value): + """ """ + + params = self.parse_request_args(request, object_definition) + page_number = self.get_page_number( + value, module_code, params.get("cruved_type") or "R", params + ) + + return get_list_rest(additional_params={"page": page_number}) + # return { + # "page": self.get_page_number( + # value, module_code, params.get("cruved_type") or "R", params + # ) + # } + + def get_export(self_mv, export_code): + """ + methode pour gérer la route d'export + - récupération de la configuration de l'export + """ + + # récupération de la configuration de l'export + export_definition = DefinitionMethods.get_definition("export", export_code) + + # renvoie une erreur si l'export n'est pas trouvé + if export_definition is None: + return "L'export correspondant au code {export_code} n'existe pas", 403 + + # definitions des paramètres + + # - query params + object_definition + params = self.parse_request_args(request, object_definition) + + # - export_definition + # - on force fields a être + # - TODO faire l'intersection de params['fields'] et export_definition['fields'] (si params['fields'] est défini) + params["fields"] = export_definition["fields"] + # - TODO autres paramètres ???? + + cruved_type = params.get("cruved_type") or "R" + + # recupération de la liste + query_list = self.query_list( + module_code=module_code, cruved_type=cruved_type, params=params + ) + + # on assume qu'il n'y que des export csv + # TODO ajouter query param export_type (csv, shape, geosjon, etc) et traiter les différents cas + return self.process_export_csv(query_list, params) + + return { + "rest": { + "get": permissions.check_cruved_scope("R", module_code=module_code)(get_rest), + "post": permissions.check_cruved_scope("C", module_code=module_code)(post_rest), + "patch": permissions.check_cruved_scope("U", module_code=module_code)(patch_rest), + "delete": permissions.check_cruved_scope("D", module_code=module_code)( + delete_rest + ), + }, + "export": { + "get": permissions.check_cruved_scope("E", module_code=module_code)(get_export) + }, + "page_number": { + "get": permissions.check_cruved_scope("R", module_code=module_code)( + get_page_number + ) + }, + } + + def schema_view_func(self, view_type, module_code, object_definition): + """ + c'est ici que ce gère le CRUVED pour l'accès aux routes + """ + + schema_api_dict = self.schema_api_dict(module_code, object_definition)[view_type] + + MV = type( + self.method_view_name(module_code, object_definition["object_code"], view_type), + (MethodView,), + schema_api_dict, + ) + return MV.as_view(self.view_name(module_code, object_definition["object_code"], view_type)) + + def register_api(self, bp, module_code, object_code, object_definition={}): + """ + Fonction qui enregistre une api pour un schema + + TODO s + -comment gérer la config pour limiter les routes selon le cruved + """ + + cruved = object_definition.get("cruved", "") + + # rest api + view_func_rest = self.schema_view_func("rest", module_code, object_definition) + view_func_page_number = self.schema_view_func( + "page_number", module_code, object_definition + ) + view_func_export = self.schema_view_func("export", module_code, object_definition) + + # read: GET (liste et one_row) + if "R" in cruved: + bp.add_url_rule( + f"/{object_code}/", + defaults={"value": None}, + view_func=view_func_rest, + methods=["GET"], + ) + bp.add_url_rule(f"/{object_code}/", view_func=view_func_rest, methods=["GET"]) + bp.add_url_rule( + f"/{object_code}/page_number/", + view_func=view_func_page_number, + methods=["GET"], + ) + + # create : POST + if "C" in cruved: + bp.add_url_rule(f"/{object_code}/", view_func=view_func_rest, methods=["POST"]) + + # update : PATCH + if "U" in cruved: + bp.add_url_rule(f"/{object_code}/", view_func=view_func_rest, methods=["PATCH"]) + + # delete : DELETE + if "D" in cruved: + bp.add_url_rule( + f"/{object_code}/", view_func=view_func_rest, methods=["DELETE"] + ) + + # export + if "E" in cruved: # and object_definition.get("exports"): + bp.add_url_rule( + f"/{object_code}/exports/", + view_func=view_func_export, + methods=["GET"], + ) diff --git a/backend/gn_modulator/schema/base.py b/backend/gn_modulator/schema/base.py index 64dde6ee..b4521fe3 100644 --- a/backend/gn_modulator/schema/base.py +++ b/backend/gn_modulator/schema/base.py @@ -309,6 +309,22 @@ def process_csv_keys(self, keys): for key in keys ] + def flat_keys(self, data, key=None): + keys = [] + for k in data: + keys.append(k) + + # if isinstance(data[k], list): + # keys.append(map("k."self.flat_keys(data[k], k))) + + # if isinstance(data[k], dict): + # k_all = + # if k not in keys: + # if + # keys.append(".".join([*keysParent, k]) + + return keys + def process_csv_data(self, key, data, options={}, process_label=True): """ pour rendre les sorties des relations jolies pour l'export ?? diff --git a/backend/gn_modulator/schema/config/base.py b/backend/gn_modulator/schema/config/base.py index 44ab82ad..f1eeb12b 100644 --- a/backend/gn_modulator/schema/config/base.py +++ b/backend/gn_modulator/schema/config/base.py @@ -97,7 +97,7 @@ def config_utils(self): }, "pk_field_name": self.pk_field_name(), "label_field_name": self.label_field_name(), - "title_field_name": self.attr("meta.title_field_name"), + "title_field_name": self.title_field_name(), "value_field_name": self.value_field_name(), "geometry_field_name": self.geometry_field_name(), "model_name": self.model_name(), @@ -127,6 +127,9 @@ def value_field_name(self): def label_field_name(self): return self.attr("meta.label_field_name") + def title_field_name(self): + return self.attr("meta.title_field_name") + def geometry_field_name(self): return self.attr("meta.geometry_field_name") diff --git a/backend/gn_modulator/schema/config/layout.py b/backend/gn_modulator/schema/config/layout.py index f3b389c4..62dad0c3 100644 --- a/backend/gn_modulator/schema/config/layout.py +++ b/backend/gn_modulator/schema/config/layout.py @@ -2,6 +2,11 @@ methodes pour les layout ajsf du frontend """ +from gn_modulator.definition import DefinitionMethods +import copy +from gn_modulator.utils.commons import replace_in_dict +from gn_modulator.utils.errors import add_error + class SchemaConfigLayout: def form_layout(self): @@ -68,3 +73,36 @@ def process_layout(self, layout): return self.process_layout({"key": layout}) return layout + + @classmethod + def get_layout_from_code(cls, layout_code, params): + layout_from_code = copy.deepcopy(DefinitionMethods.get_definition("layout", layout_code)) + if layout_from_code is None: + add_error( + msg=f"Le layout de code {layout_code} n'existe pas", + definition_type="layout", + definition_code=layout_code, + code="ERR_TEMPLATE_NOT_FOUND", + ) + layout_from_code = layout_from_code["layout"] + for param_key, param_item in params.items(): + layout_from_code = replace_in_dict( + layout_from_code, f"__{param_key.upper()}__", param_item + ) + + unresolved_template_params = DefinitionMethods.get_unresolved_template_params( + layout_from_code + ) + if unresolved_template_params: + remindings__str = ", ".join(map(lambda x: f"__{x}__", unresolved_template_params)) + add_error( + msg=f"Le ou les champs suivants n'ont pas été résolus : {remindings__str}", + definition_type="layout", + definition_code=layout_code, + code="ERR_TEMPLATE_UNRESOLVED_FIELDS", + template_file_path=str(DefinitionMethods.get_file_path("layout", layout_code)), + ) + + return {} + + return layout_from_code diff --git a/backend/gn_modulator/schema/repositories/base.py b/backend/gn_modulator/schema/repositories/base.py index acff8233..3defba4c 100644 --- a/backend/gn_modulator/schema/repositories/base.py +++ b/backend/gn_modulator/schema/repositories/base.py @@ -79,7 +79,7 @@ def get_row( return query - def insert_row(self, data): + def insert_row(self, data, authorized_write_fields=None): """ insert new row with data """ @@ -89,7 +89,7 @@ def insert_row(self, data): self.validate_data(data) m = self.Model()() - self.unserialize(m, data) + self.unserialize(m, data, authorized_write_fields) db.session.add(m) db.session.commit() @@ -106,6 +106,8 @@ def is_new_data(self, model, data): if isinstance(data, dict) and not isinstance(model, dict): for key, data_value in data.items(): + if not hasattr(model, key): + return True m = self.serialize(model, fields=[key])[key] if self.is_new_data(m, data_value): return True @@ -144,7 +146,15 @@ def is_new_data(self, model, data): return False - def update_row(self, value, data, field_name=None, module_code=MODULE_CODE, params={}): + def update_row( + self, + value, + data, + field_name=None, + module_code=MODULE_CODE, + params={}, + authorized_write_fields=None, + ): """ update row (Model. == value) with data @@ -167,7 +177,7 @@ def update_row(self, value, data, field_name=None, module_code=MODULE_CODE, para db.session.flush() - self.unserialize(m, data) + self.unserialize(m, data, authorized_write_fields) db.session.commit() diff --git a/backend/gn_modulator/schema/serializers.py b/backend/gn_modulator/schema/serializers.py index 7e67a2a6..8fd50702 100644 --- a/backend/gn_modulator/schema/serializers.py +++ b/backend/gn_modulator/schema/serializers.py @@ -6,7 +6,7 @@ from geoalchemy2.shape import to_shape, from_shape from geojson import Feature -from marshmallow import pre_load, fields, ValidationError +from marshmallow import pre_load, fields, ValidationError, EXCLUDE from shapely.geometry import shape from utils_flask_sqla_geo.utilsgeometry import remove_third_dimension from geonature.utils.env import ma @@ -421,12 +421,16 @@ def as_geojson(self, data, geometry_field_name=None): geometry = data.pop(geometry_field_name) return {"type": "Feature", "geometry": geometry, "properties": data} - def unserialize(self, m, data): + def unserialize(self, m, data, autorized_write_fields=None): """ unserialize using marshmallow """ + kwargs = {} + if autorized_write_fields: + kwargs = {"only": autorized_write_fields, "unknown": EXCLUDE} MS = self.MarshmallowSchema() - ms = MS() + + ms = MS(**kwargs) ms.load(data, instance=m) @classmethod diff --git a/backend/gn_modulator/tests/data/commons.py b/backend/gn_modulator/tests/data/commons.py index 9f851afd..0d4058c0 100644 --- a/backend/gn_modulator/tests/data/commons.py +++ b/backend/gn_modulator/tests/data/commons.py @@ -18,3 +18,16 @@ def module_update(): return { "module_label": "TEST_PYTEST_UPDATE", } + + +def pf(): + return { + "code_passage_faune": "TEST_PF", + "geom": {"type": "Point", "coordinates": [0, 45]}, + } + + +def pf_update(): + return { + "geom": {"type": "Point", "coordinates": [0, 46]}, + } diff --git a/backend/gn_modulator/tests/import_test/synthese_1.log.sql b/backend/gn_modulator/tests/import_test/synthese_1.log.sql new file mode 100644 index 00000000..a3d59fd4 --- /dev/null +++ b/backend/gn_modulator/tests/import_test/synthese_1.log.sql @@ -0,0 +1,133 @@ +-- Log Import {id import} +-- - schema_code: syn.synthese + +-- Tables et vues utlisées pour l'import +-- - data: gn_modulator_import.t_1887_data +-- table contenant les données du fichier à importer +-- +-- - raw: gn_modulator_import.v_1887_raw_syn_synthese +-- choix des colonnes, typage +-- +-- - process: gn_modulator_import.v_1887_process_syn_synthese +-- résolution des clés +-- + + + +-- Creation de la table des données + +CREATE TABLE IF NOT EXISTS gn_modulator_import.t_1887_data ( + id_import SERIAL NOT NULL, + cd_nom VARCHAR, + id_source VARCHAR, + entity_source_pk_value VARCHAR, + nom_cite VARCHAR, + date_min VARCHAR, + date_max VARCHAR, + cor_observers VARCHAR, + CONSTRAINT pk_gn_modulator_import_t_1887_data_id_import PRIMARY KEY (id_import) +); + +-- Insertion des données + +INSERT INTO gn_modulator_import.t_1887_data (cd_nom, id_source, entity_source_pk_value, nom_cite, date_min, date_max, cor_observers) + VALUES + ('67111','Occtax','21','Ablette','2017-01-08 20:00:00.000','2017-01-08 23:00:00.000','admin'), + ('67111','Occtax','22','Ablette','2017-01-08 20:00:00.000','2017-01-08 23:00:00.000','admin') +; + +-- Typage (raw) + +DROP VIEW IF EXISTS gn_modulator_import.v_1887_raw_syn_synthese CASCADE; +CREATE VIEW gn_modulator_import.v_1887_raw_syn_synthese AS +SELECT + t.id_import, + t.cd_nom, + t.id_source, + entity_source_pk_value, + nom_cite, + date_min::TIMESTAMP, + date_max::TIMESTAMP, + t.cor_observers, + CONCAT(t.id_source, '|', t.entity_source_pk_value) AS id_synthese +FROM gn_modulator_import.t_1887_data t; + + +-- Résolution des clés (process) + +DROP VIEW IF EXISTS gn_modulator_import.v_1887_process_syn_synthese CASCADE; +CREATE VIEW gn_modulator_import.v_1887_process_syn_synthese AS +SELECT + id_import, + j_0.cd_nom AS cd_nom, + j_1.id_source AS id_source, + t.entity_source_pk_value, + t.nom_cite, + t.date_min, + t.date_max, + j_pk.id_synthese +FROM gn_modulator_import.v_1887_raw_syn_synthese t +LEFT JOIN taxonomie.taxref j_0 + ON j_0.cd_nom::TEXT = SPLIT_PART(t.cd_nom, '|', 1)::TEXT +LEFT JOIN gn_synthese.t_sources j_1 + ON j_1.name_source::TEXT = SPLIT_PART(t.id_source, '|', 1)::TEXT +LEFT JOIN gn_synthese.synthese j_pk + ON j_pk.id_source::TEXT = j_1.id_source::TEXT + AND (j_pk.entity_source_pk_value::TEXT = SPLIT_PART(t.id_synthese, '|', 2)::TEXT + OR (j_pk.entity_source_pk_value IS NULL AND SPLIT_PART(t.id_synthese, '|', 2) IS NULL)); + + +-- Insertion des données + + +INSERT INTO gn_synthese.synthese ( + cd_nom, + id_source, + entity_source_pk_value, + nom_cite, + date_min, + date_max +) +SELECT + cd_nom, + id_source, + entity_source_pk_value, + nom_cite, + date_min, + date_max +FROM gn_modulator_import.v_1887_process_syn_synthese WHERE id_synthese IS NULL; + + +-- Mise à jour des données + + +UPDATE gn_synthese.synthese t SET + cd_nom=p.cd_nom, + id_source=p.id_source, + entity_source_pk_value=p.entity_source_pk_value, + nom_cite=p.nom_cite, + date_min=p.date_min, + date_max=p.date_max +FROM ( + SELECT + cd_nom, + id_source, + entity_source_pk_value, + nom_cite, + date_min, + date_max, + id_synthese + FROM gn_modulator_import.v_1887_process_syn_synthese +)p +WHERE p.id_synthese = t.id_synthese + AND NOT ( + (t.cd_nom::TEXT IS DISTINCT FROM p.cd_nom::TEXT) + AND (t.id_source::TEXT IS DISTINCT FROM p.id_source::TEXT) + AND (t.entity_source_pk_value::TEXT IS DISTINCT FROM p.entity_source_pk_value::TEXT) + AND (t.nom_cite::TEXT IS DISTINCT FROM p.nom_cite::TEXT) + AND (t.date_min::TEXT IS DISTINCT FROM p.date_min::TEXT) + AND (t.date_max::TEXT IS DISTINCT FROM p.date_max::TEXT) + AND (t.id_synthese::TEXT IS DISTINCT FROM p.id_synthese::TEXT) +) +; +-- - Traitement relation n-n cor_observers \ No newline at end of file diff --git a/backend/gn_modulator/tests/test_rest_api.py b/backend/gn_modulator/tests/test_rest_api.py index 93069881..d0e1d23b 100644 --- a/backend/gn_modulator/tests/test_rest_api.py +++ b/backend/gn_modulator/tests/test_rest_api.py @@ -4,22 +4,132 @@ - insert - update - delete - - list ?? + TODO + + - fields + - list && cruved?? """ import pytest + +from flask import url_for + +from geonature.tests.utils import set_logged_user_cookie, unset_logged_user_cookie + +from gn_modulator import ModuleMethods from .utils.rest import test_schema_rest from .data import commons as data_commons @pytest.mark.usefixtures("client_class", "temporary_transaction") class TestRest: - def test_gn_commons_module(self, client, users): + # def test_gn_commons_module(self, client, users): + # test_schema_rest( + # client, + # users["admin_user"], + # "MODULATOR", + # "commons.module", + # data_commons.module(), + # data_commons.module_update(), + # ) + + def test_m_sipaf_pf(self, client, users): test_schema_rest( client, users["admin_user"], - "MODULATOR", - "commons.module", - data_commons.module(), - data_commons.module_update(), + "m_sipaf", + "site", + data_commons.pf(), + data_commons.pf_update(), + ) + + def test_valid_fields(self, client, users): + """ + test fields valide avec espaces au milieu + """ + set_logged_user_cookie(client, users["admin_user"]) + r = client.get( + url_for( + "modulator.api_rest_get_one", + value="MODULATOR", + module_code="MODULATOR", + object_code="commons.module", + field_name="module_code", + fields="id_module,module_code, module_label", + ) + ) + assert r.status_code == 200 + unset_logged_user_cookie(client) + + def test_unvalid_fields(self, client, users): + """ + test unvalid_fields + """ + set_logged_user_cookie(client, users["admin_user"]) + r = client.get( + url_for( + "modulator.api_rest_get_one", + value="MODULATOR", + module_code="MODULATOR", + object_code="commons.module", + field_name="module_code", + fields="id_module,module_code,module_labelo", + ) ) + assert r.status_code == 403 + data = r.json + assert data["code"] == "ERR_REST_API_UNVALID_FIELD" + assert "module_labelo" in data["unvalid_fields"] + unset_logged_user_cookie(client) + + def test_unauthorized_fields_read(self, client, users): + """ + test unvalid_fields + """ + set_logged_user_cookie(client, users["admin_user"]) + r = client.get( + url_for( + "modulator.api_rest_get_one", + value="MODULATOR", + module_code="MODULATOR", + object_code="commons.module", + field_name="module_code", + fields="id_module,module_code,datasets", + ) + ) + assert r.status_code == 403 + data = r.json + assert data["code"] == "ERR_REST_API_UNAUTHORIZED_FIELD" + assert "datasets" in data["unauthorized_fields"] + unset_logged_user_cookie(client) + + def test_unauthorized_fields_write(self, client, users): + """ + test unvalid_fields + """ + ModuleMethods.add_actions("MODULATOR", "commons.module", "U") + autorized_fields = ModuleMethods.get_autorized_fields( + "MODULATOR", "commons.module", write=True + ) + autorized_fields.append("module_label") + + set_logged_user_cookie(client, users["admin_user"]) + r = client.patch( + url_for( + "modulator.api_rest_get_one", + value="MODULATOR", + module_code="MODULATOR", + object_code="commons.module", + field_name="module_code", + fields="id_module,module_code, module_label", + ), + data={"module_code": "MALADATA", "module_label": "Plouplou"}, + ) + data = r.json + assert r.status_code == 200 + + # module_code n'a pas été modifié + assert data["module_code"] == "MODULATOR" + + # module_label est bien modifié + assert data["module_label"] == "Plouplou" diff --git a/config/modules/contrib/m_monitoring/m_monitoring.site_template.module-tempate_defaults.yml b/config/modules/contrib/m_monitoring/m_monitoring.site_template.module-tempate_defaults.yml index 5808d8f4..7aaa3bdb 100644 --- a/config/modules/contrib/m_monitoring/m_monitoring.site_template.module-tempate_defaults.yml +++ b/config/modules/contrib/m_monitoring/m_monitoring.site_template.module-tempate_defaults.yml @@ -99,6 +99,7 @@ site_form_fields: module_code: m_monitoring - id_nomenclature_type_site - key: modules + object_code: modules type: list_form multiple: true return_object: true @@ -168,6 +169,7 @@ visit_form_fields: default: __f__utils.today() - date_max - key: id_module + object_code: module type: list_form title: Protocole schema_code: commons.module @@ -175,7 +177,8 @@ visit_form_fields: - key: id_dataset type: list_form title: "__f__data.id_module ? 'Jeu de données' : 'Jeu de données (Veuillez entrer un protocole)'" - schema_code: meta.jdd + object_code: meta.jdd + module_code: __REF_MODULE_CODE__ page_size: 10 reload_on_search: true filters: __f__data.id_module && `modules.id_module = ${data.id_module}` @@ -183,7 +186,8 @@ visit_form_fields: - key: observers type: list_form title: Observateurs - schema_code: user.role + object_code: user.role + module_code: __REF_MODULE_CODE__ multiple: true return_object: true filters: groupes.listes.code_liste = obsocctax diff --git a/config/modules/contrib/m_sipaf/config.yml b/config/modules/contrib/m_sipaf/config.yml index 30b16c05..d50baddd 100644 --- a/config/modules/contrib/m_sipaf/config.yml +++ b/config/modules/contrib/m_sipaf/config.yml @@ -19,6 +19,8 @@ site_filters_fields: - label: Localisation items: - key: region + object_code: ref_geo.area + module_code: __REF_MODULE_CODE__ title: Région type: list_form return_object: "true" @@ -28,6 +30,8 @@ site_filters_fields: sort: area_name - key: departement + object_code: ref_geo.area + module_code: __REF_MODULE_CODE__ title: Département type: list_form reload_on_search: true @@ -43,6 +47,8 @@ site_filters_fields: : null - key: commune + object_code: ref_geo.area + module_code: __REF_MODULE_CODE__ reload_on_search: true title: Commune type: list_form @@ -297,6 +303,8 @@ site_form_fields: multiple: true return_object: true additional_fields: ["cd_nomenclature"] + module_code: __REF_MODULE_CODE__ + object_code: ref_nom.nomenclature - key: ouvrage_type_autre description: __f__data?.nomenclatures_ouvrage_type?.some(n => n.cd_nomenclature == 'AUT') type: string diff --git a/config/modules/contrib/m_sipaf/layouts/m_sipaf.diagnostic_details.layout.yml b/config/modules/contrib/m_sipaf/layouts/m_sipaf.diagnostic_details.layout.yml new file mode 100644 index 00000000..c3744633 --- /dev/null +++ b/config/modules/contrib/m_sipaf/layouts/m_sipaf.diagnostic_details.layout.yml @@ -0,0 +1,7 @@ +type: layout +code: m_sipaf.diagnostic_details +title: page details diagnostic +description: page details diagnostic + +layout: + tilte: diagnostic details \ No newline at end of file diff --git a/config/modules/contrib/m_sipaf/layouts/m_sipaf.diagnostic_edit.layout.yml b/config/modules/contrib/m_sipaf/layouts/m_sipaf.diagnostic_edit.layout.yml new file mode 100644 index 00000000..85b1602b --- /dev/null +++ b/config/modules/contrib/m_sipaf/layouts/m_sipaf.diagnostic_edit.layout.yml @@ -0,0 +1,7 @@ +type: layout +code: m_sipaf.diagnostic_edit +title: page edit diagnostic +description: page edit diagnostic + +layout: + tilte: diagnostic edit \ No newline at end of file diff --git a/config/modules/contrib/m_sipaf/m_sipaf.module.yml b/config/modules/contrib/m_sipaf/m_sipaf.module.yml index 4c4cbadf..122d16a5 100644 --- a/config/modules/contrib/m_sipaf/m_sipaf.module.yml +++ b/config/modules/contrib/m_sipaf/m_sipaf.module.yml @@ -26,8 +26,6 @@ objects: schema_code: m_sipaf.diag cruved: CRUD - - tree: pf: diagnostic: diff --git a/doc/changelog.md b/doc/changelog.md index 564645fe..307de879 100644 --- a/doc/changelog.md +++ b/doc/changelog.md @@ -6,6 +6,8 @@ - Clarification dans la gestion des routes REST - Meilleure gestion des `tabs` et des `scrolls` +- Première version de la fonctionalité d'import (commande + interface frontend) +- sécurisation des api (controle des `fields` en lecture et écriture) ## 1.0.5 (13-03-2023) **✨ Améliorations** From 10d17b09b8952f79ab9e086935ac2e61888c8b37 Mon Sep 17 00:00:00 2001 From: "joel.clement" Date: Fri, 7 Apr 2023 12:48:56 +0200 Subject: [PATCH 057/142] process base fields --- backend/gn_modulator/module/config/utils.py | 107 ++++++++++++-------- 1 file changed, 64 insertions(+), 43 deletions(-) diff --git a/backend/gn_modulator/module/config/utils.py b/backend/gn_modulator/module/config/utils.py index e0d597be..bf3a66e0 100644 --- a/backend/gn_modulator/module/config/utils.py +++ b/backend/gn_modulator/module/config/utils.py @@ -283,9 +283,65 @@ def process_fields(cls, module_code): On regarde dans toutes les pages pour déterminer les champs """ - keys = get_global_cache(["keys"], {}) + cls.process_base_fields(module_code) + cls.process_layout_fields(module_code) + @classmethod + def process_base_fields(cls, module_code): module_config = cls.module_config(module_code) + for object_code in module_config["objects"]: + object_config = cls.object_config(module_code, object_code) + if "R" in object_config["cruved"]: + cls.add_basic_fields(module_code, object_code) + + @classmethod + def add_basic_fields(cls, module_code, object_code): + sm = SchemaMethods(cls.schema_code(module_code, object_code)) + + authorized_read_fields = [] + authorized_write_fields = [] + + set_global_cache( + [ + "keys", + module_code, + object_code, + "read", + ], + authorized_read_fields, + ) + + set_global_cache( + [ + "keys", + module_code, + object_code, + "write", + ], + authorized_write_fields, + ) + + # pour la lecture, on ajoute par défaut les champs + # - pk_field_name + # - label_field_name + # - title_field_name + # - champs d'unicité + # - ownership + for elem in [ + sm.pk_field_name(), + sm.label_field_name(), + sm.title_field_name(), + *sm.unique(), + "ownership", + ]: + if elem is not None and elem not in authorized_read_fields: + authorized_read_fields.append(elem) + + @classmethod + def process_layout_fields(cls, module_code): + keys = get_global_cache(["keys"], {}) + module_config = cls.module_config(module_code) + pages = module_config.get("pages", {}) config_params = module_config.get("config_params", {}) config_defaults = module_config.get("config_defaults", {}) @@ -382,46 +438,11 @@ def get_layout_keys(cls, layout, params, context, keys): @classmethod def get_autorized_fields(cls, module_code, object_code, write=False): - sm = SchemaMethods(cls.schema_code(module_code, object_code)) - - authorized_fields = ( - get_global_cache( - [ - "keys", - module_code, - object_code, - "write" if write else "read", - ] - ) - or [] + return get_global_cache( + [ + "keys", + module_code, + object_code, + "write" if write else "read", + ] ) - - if not authorized_fields: - set_global_cache( - [ - "keys", - module_code, - object_code, - "write" if write else "read", - ], - authorized_fields, - ) - - # pour la lecture, on ajoute par défaut les champs - # - pk_field_name - # - label_field_name - # - title_field_name - # - champs d'unicité - # - ownership - if not write: - for elem in [ - sm.pk_field_name(), - sm.label_field_name(), - sm.title_field_name(), - *sm.unique(), - "ownership", - ]: - if elem is not None and elem not in authorized_fields: - authorized_fields.append(elem) - - return authorized_fields From 303743e589c8e648721b90ecda658451ee9a8589 Mon Sep 17 00:00:00 2001 From: "joel.clement" Date: Fri, 7 Apr 2023 12:50:39 +0200 Subject: [PATCH 058/142] gn2.12 --- backend/gn_modulator/imports/utils/files.py | 14 +++++++---- backend/gn_modulator/module/base.py | 4 ++-- .../gn_modulator/routes/utils/decorators.py | 1 - backend/gn_modulator/tests/test_import_api.py | 7 ++++-- backend/gn_modulator/utils/env.py | 14 +++++++++-- config/modules/contrib/m_sipaf/config.yml | 23 +++++++++--------- doc/changelog.md | 8 ++++++- frontend/app/components/base/base.scss | 6 ++--- .../layout/base/layout.component.ts | 24 ++++++++++--------- .../layout/form/form-element.component.html | 18 +++++++------- .../layout/form/list-form.component.html | 6 +++-- .../layout/form/list-form.component.scss | 8 ++++++- .../layout/form/list-form.component.ts | 2 +- frontend/app/components/page.component.ts | 8 ++++--- frontend/app/services/config.service.ts | 16 ++++++++----- frontend/app/services/form.service.ts | 8 ++++--- frontend/app/services/route.service.ts | 2 +- 17 files changed, 104 insertions(+), 65 deletions(-) diff --git a/backend/gn_modulator/imports/utils/files.py b/backend/gn_modulator/imports/utils/files.py index 13d7aba9..dd3bdf4e 100644 --- a/backend/gn_modulator/imports/utils/files.py +++ b/backend/gn_modulator/imports/utils/files.py @@ -1,10 +1,14 @@ import pathlib -from geonature.core.gn_commons.file_manager import upload_file -from gn_modulator.utils.env import IMPORT_DIR + +# from geonature.core.gn_commons.file_manager import upload_file +from gn_modulator.utils.env import import_dir def upload_import_file(module_code, object_code, import_number, file): - IMPORT_DIR.mkdir(parents=True, exist_ok=True) + import_dir().mkdir(parents=True, exist_ok=True) + + file_name = f"{import_number}_{module_code}_{object_code}_{file.filename}" + file_path = pathlib.Path(import_dir() / file_name) + file.save(str(file_path)) - file_name = f"{import_number}_{module_code}_{object_code}_{file.name}" - return pathlib.Path(upload_file(file, IMPORT_DIR, file_name)) + return file_path diff --git a/backend/gn_modulator/module/base.py b/backend/gn_modulator/module/base.py index cebdfca5..c2f398d4 100644 --- a/backend/gn_modulator/module/base.py +++ b/backend/gn_modulator/module/base.py @@ -153,7 +153,7 @@ def process_module_assets(cls, module_code): return [] module_assets_dir = Path(cls.module_dir_path(module_code)) / "assets" - assets_static_dir.mkdir(exist_ok=True, parents=True) + assets_static_dir().mkdir(exist_ok=True, parents=True) module_img_path = Path(module_assets_dir / "module.jpg") # on teste si le fichier assets/module.jpg est bien présent @@ -169,7 +169,7 @@ def process_module_assets(cls, module_code): # - on crée le lien des assets vers le dossize static de geonature symlink( module_assets_dir, - assets_static_dir / module_code.lower(), + assets_static_dir() / module_code.lower(), ) return [] diff --git a/backend/gn_modulator/routes/utils/decorators.py b/backend/gn_modulator/routes/utils/decorators.py index 1b6f3a86..a38005ab 100644 --- a/backend/gn_modulator/routes/utils/decorators.py +++ b/backend/gn_modulator/routes/utils/decorators.py @@ -101,7 +101,6 @@ def __check_module_object_route(*args, **kwargs): # verification des champs field_errors = check_fields(module_code, object_code) if field_errors: - print("yakou") return field_errors, 403 return check_cruved_scope(action_cruved, module_code=module_code)(fn)(*args, **kwargs) diff --git a/backend/gn_modulator/tests/test_import_api.py b/backend/gn_modulator/tests/test_import_api.py index 7657d515..4f11137a 100644 --- a/backend/gn_modulator/tests/test_import_api.py +++ b/backend/gn_modulator/tests/test_import_api.py @@ -2,8 +2,7 @@ from flask import url_for from werkzeug.datastructures import Headers -from geonature.tests.utils import set_logged_user_cookie - +from geonature.tests.utils import set_logged_user_cookie, unset_logged_user_cookie from gn_modulator import ModuleMethods from gn_modulator.utils.env import import_test_dir @@ -33,6 +32,8 @@ def test_import_synthese(self, users): assert r.json["id_digitiser"] == users["admin_user"].id_role + unset_logged_user_cookie(self.client) + def test_import_synthese2(self, users): ModuleMethods.add_actions("MODULATOR", "syn.synthese", "I") @@ -53,3 +54,5 @@ def test_import_synthese2(self, users): assert r.json["res"]["nb_data"] == 2 assert r.json["res"]["nb_insert"] == 2 + + unset_logged_user_cookie(self.client) diff --git a/backend/gn_modulator/utils/env.py b/backend/gn_modulator/utils/env.py index 9f2e0894..b9ac2ba0 100644 --- a/backend/gn_modulator/utils/env.py +++ b/backend/gn_modulator/utils/env.py @@ -1,4 +1,5 @@ from geonature.utils.env import db, BACKEND_DIR +from flask import current_app from ref_geo.utils import get_local_srid from .cache import get_global_cache, set_global_cache from pathlib import Path @@ -6,9 +7,10 @@ gn_modulator_DIR = Path(gn_modulator.__file__).parent -assets_static_dir = BACKEND_DIR / "static" / "external_assets/modules/" -IMPORT_DIR = BACKEND_DIR / "static" / "imports" +# assets_static_dir = BACKEND_DIR / current_app.config['MEDIA_DIR'] / "external_assets/modules/" +# IMPORT_DIR = BACKEND_DIR / current_app.config['MEDIA_DIR'] / "imports" +# TODO redo config_directory = gn_modulator_DIR / "../../config/" migrations_directory = gn_modulator_DIR / "migrations" definitions_test_dir = Path(__file__).parent / "../tests/definitions_test" @@ -18,6 +20,14 @@ schema_import = "gn_modulator_import" +def assets_static_dir(): + return BACKEND_DIR / current_app.config["MEDIA_FOLDER"] / "external_assets/modules/" + + +def import_dir(): + return BACKEND_DIR / current_app.config["MEDIA_FOLDER"] / "imports" + + def local_srid(): """ renvoie le local_srid depuis le cache diff --git a/config/modules/contrib/m_sipaf/config.yml b/config/modules/contrib/m_sipaf/config.yml index d50baddd..402e2671 100644 --- a/config/modules/contrib/m_sipaf/config.yml +++ b/config/modules/contrib/m_sipaf/config.yml @@ -6,7 +6,7 @@ site_filters_fields: items: - code_passage_faune - nom_usuel_passage_faune - - nomenclatures_ouvrage_materiaux + - key: nomenclatures_ouvrage_materiaux - key: pi_ou_ps title: Passage inférieur / supérieur type: list_form @@ -222,7 +222,6 @@ site_details_fields: prefilters: __f__`id_passage_faune = ${o.object(x, 'site').value}` sort: date_diagnostic- - site_form_fields: display: tabs overflow: true @@ -341,13 +340,13 @@ site_form_fields: - ouvrag_hydrau_tirant_air - label: __f__ `Médias (${data?.medias?.length || 0})` items: - items: - - hidden: __f__!data?.medias?.some(m => !m.title_fr) - type: message - class: warning - html: Le champs 'Titre' du média est obligatoire - - type: dyn_form - key: medias - type_widget: medias - schema_dot_table: pr_sipaf.t_passages_faune - details: [] + items: + - hidden: __f__!data?.medias?.some(m => !m.title_fr) + type: message + class: warning + html: Le champs 'Titre' du média est obligatoire + - type: dyn_form + key: medias + type_widget: medias + schema_dot_table: pr_sipaf.t_passages_faune + details: [] diff --git a/doc/changelog.md b/doc/changelog.md index 307de879..05de865d 100644 --- a/doc/changelog.md +++ b/doc/changelog.md @@ -2,12 +2,18 @@ ## 1.0.6 (unreleased) + +- Version de GN requise 2.12 + +**✨ Nouveauté** +- Première version de la fonctionalité d'import (commande + interface frontend) + **✨ Améliorations** - Clarification dans la gestion des routes REST - Meilleure gestion des `tabs` et des `scrolls` -- Première version de la fonctionalité d'import (commande + interface frontend) - sécurisation des api (controle des `fields` en lecture et écriture) + ## 1.0.5 (13-03-2023) **✨ Améliorations** diff --git a/frontend/app/components/base/base.scss b/frontend/app/components/base/base.scss index 757341ba..105b5a6f 100644 --- a/frontend/app/components/base/base.scss +++ b/frontend/app/components/base/base.scss @@ -30,20 +30,20 @@ } // couleur custom des bouttons -.mat-button-base.mat-success { +.mat-mdc-button-base.mat-success { background-color: green; color: #fff; } // couleur custom des bouttons -.mat-button-base.mat-info { +.mat-mdc-button-base.mat-info { background-color: #4b8ed5; color: #fff; } // couleur custom des bouttons -.mat-button-base.mat-error { +.mat-mdc-button-base.mat-error { background-color: red; color: #fff; } diff --git a/frontend/app/components/layout/base/layout.component.ts b/frontend/app/components/layout/base/layout.component.ts index 770579e3..03a48d69 100644 --- a/frontend/app/components/layout/base/layout.component.ts +++ b/frontend/app/components/layout/base/layout.component.ts @@ -442,17 +442,19 @@ export class ModulesLayoutComponent implements OnInit { } if (this.docHeightSave > docHeight || !this.docHeightSave) { - this.computedLayout.style = { - ...(this.computedLayout.style || {}), - height: '200px', - ...overflowStyle, - }; - - this.layout.style = { - ...(this.layout.style || {}), - height: `200px`, - ...overflowStyle, - }; + setTimeout(() => { + this.computedLayout.style = { + ...(this.computedLayout.style || {}), + height: '200px', + ...overflowStyle, + }; + + this.layout.style = { + ...(this.layout.style || {}), + height: `200px`, + ...overflowStyle, + }; + }, 10); } this.docHeightSave = docHeight; diff --git a/frontend/app/components/layout/form/form-element.component.html b/frontend/app/components/layout/form/form-element.component.html index 21883a34..f4ce5b58 100644 --- a/frontend/app/components/layout/form/form-element.component.html +++ b/frontend/app/components/layout/form/form-element.component.html @@ -25,7 +25,7 @@ hidden [disabled]="computedLayout.disabled" (change)="fileChange($event.target.files)" - /> + /> + /> + + /> + + /> + + > + {{ computedLayout.hint }} diff --git a/frontend/app/components/layout/form/list-form.component.html b/frontend/app/components/layout/form/list-form.component.html index 97a293df..d7271379 100644 --- a/frontend/app/components/layout/form/list-form.component.html +++ b/frontend/app/components/layout/form/list-form.component.html @@ -11,9 +11,9 @@ [placeholder]="listFormOptions.placeholder" [required]="listFormOptions.required" [compareWith]="compareFn" - [disabled]="computedLayout.disabled" (selectionChange)="inputChange($event)" - > + > +
+ + +

diff --git a/frontend/app/components/layout/base/layout.component.ts b/frontend/app/components/layout/base/layout.component.ts index 56af53ba..082eb72b 100644 --- a/frontend/app/components/layout/base/layout.component.ts +++ b/frontend/app/components/layout/base/layout.component.ts @@ -225,7 +225,7 @@ export class ModulesLayoutComponent implements OnInit { 'hidden_options', ]) { if (this.parentContext[key] != null || layout[key] != null) { - this.context[key] = this.parentContext[key] || layout[key]; + this.context[key] = layout[key] == null ? this.parentContext[key] : layout[key]; } } diff --git a/frontend/app/components/layout/form/form-element.component.html b/frontend/app/components/layout/form/form-element.component.html index f4ce5b58..1ea5a73b 100644 --- a/frontend/app/components/layout/form/form-element.component.html +++ b/frontend/app/components/layout/form/form-element.component.html @@ -44,13 +44,12 @@ [placeholder]="computedLayout.placeholder" [type]="computedLayout.type" [formControl]="formControl" - [required]="computedLayout.required && !context.skip_required" [min]="computedLayout.min" [max]="computedLayout.max" (change)="onInputChange()" [errorStateMatcher]="_mForm.matcher" /> - + - - - {{ computedLayout.hint }} diff --git a/frontend/app/components/layout/form/generic-form.component.ts b/frontend/app/components/layout/form/generic-form.component.ts index d4cbdf94..381ef17a 100644 --- a/frontend/app/components/layout/form/generic-form.component.ts +++ b/frontend/app/components/layout/form/generic-form.component.ts @@ -85,6 +85,7 @@ export class ModulesGenericFormComponent extends ModulesLayoutComponent implemen this.context.appearance = this.layout.appearance; this.context.skip_required = this.layout.skip_required; this._formService.setControls({ context: this.context, layout: this.layout, data: this.data }); + this._formService.updateData(this.data, this.formGroup.value); this.formGroup.valueChanges.subscribe((value) => { this.onFormGroupChange(); }); diff --git a/frontend/app/components/page.component.ts b/frontend/app/components/page.component.ts index 27e3f7f9..a7867246 100644 --- a/frontend/app/components/page.component.ts +++ b/frontend/app/components/page.component.ts @@ -4,6 +4,7 @@ import { ModulesDataService } from '../services/data.service'; import { ModulesLayoutService } from '../services/layout.service'; import { ModulesContextService } from '../services/context.service'; import { ModulesActionService } from '../services/action.service'; +import { ModulesNomenclatureService } from '../services/nomenclature.service'; import { ModuleService } from '@geonature/services/module.service'; import { ActivatedRoute } from '@angular/router'; import { mergeMap } from '@librairies/rxjs/operators'; @@ -23,7 +24,7 @@ export class PageComponent implements OnInit { _mAction: ModulesActionService; _mContext: ModulesContextService; _gnModuleService: ModuleService; - + _mNomenclature: ModulesNomenclatureService; debug = false; // pour activer le mode debug (depuis les queryParams) routeParams; // paramètre d'url @@ -51,6 +52,7 @@ export class PageComponent implements OnInit { this._mLayout = this._injector.get(ModulesLayoutService); this._mContext = this._injector.get(ModulesContextService); this._mAction = this._injector.get(ModulesActionService); + this._mNomenclature = this._injector.get(ModulesNomenclatureService); this._gnModuleService = this._injector.get(ModuleService); } @@ -69,6 +71,11 @@ export class PageComponent implements OnInit { this._sub = this._mConfig .init() .pipe( + mergeMap(() => { + // processRigths + + return this._mNomenclature.init(); + }), mergeMap(() => { // processRigths diff --git a/frontend/app/components/test/test-layout.component.ts b/frontend/app/components/test/test-layout.component.ts index c13bc305..50fadf06 100644 --- a/frontend/app/components/test/test-layout.component.ts +++ b/frontend/app/components/test/test-layout.component.ts @@ -69,7 +69,7 @@ export class TestLayoutComponent implements OnInit { layout_definition: '' }); formGroup.patchValue({ - layout_definition: x.utils.YML.dump(event.layout_from_list) + layout_definition: x.u.YML.dump(event.layout_from_list) }); } } diff --git a/frontend/app/services/form.service.ts b/frontend/app/services/form.service.ts index f714fc30..a9eaf7d4 100644 --- a/frontend/app/services/form.service.ts +++ b/frontend/app/services/form.service.ts @@ -225,13 +225,14 @@ export class ModulesFormService { // control pour array if (layout.type == 'array') { let controlData = utils.getAttr(data || {}, [...context.data_keys, computedLayout.key]) || []; - if (controlData.length == control.value.length) { - return; + if (controlData.length != control.value.length) { + control.clear(); + for (let [index, elem] of Object.entries(controlData)) { + let elemControl = this.createFormGroup(layout.items, context); + control.push(elemControl); + } } - control.clear(); for (let [index, elem] of Object.entries(controlData)) { - let elemControl = this.createFormGroup(layout.items, context); - control.push(elemControl); const arrayItemContext = { ...context, data_keys: utils.addKey(utils.copy(context.data_keys), `${layout.key}.${index}`), diff --git a/frontend/app/services/index.ts b/frontend/app/services/index.ts index 3d3ef926..12971aca 100644 --- a/frontend/app/services/index.ts +++ b/frontend/app/services/index.ts @@ -12,6 +12,7 @@ import { ModulesTableService } from './table.service'; import { ModulesObjectService } from './object.service'; import { ModulesSchemaService } from './schema.service'; import { ListFormService } from './list-form.service'; +import { ModulesNomenclatureService } from './nomenclature.service'; export default [ ModulesActionService, @@ -28,4 +29,5 @@ export default [ ModulesTableService, ModulesObjectService, ModulesSchemaService, + ModulesNomenclatureService, ]; diff --git a/frontend/app/services/layout.service.ts b/frontend/app/services/layout.service.ts index 2e137ca3..dcf64fe0 100644 --- a/frontend/app/services/layout.service.ts +++ b/frontend/app/services/layout.service.ts @@ -4,12 +4,14 @@ import { Subject } from '@librairies/rxjs'; import { ModulesConfigService } from '../services/config.service'; import { ModulesRequestService } from '../services/request.service'; import { ModulesObjectService } from './object.service'; +import { ModulesNomenclatureService } from './nomenclature.service'; @Injectable() export class ModulesLayoutService { _mConfig: ModulesConfigService; _mRequest: ModulesRequestService; _mObject: ModulesObjectService; + _mNomenclature: ModulesNomenclatureService; _utils: any; _utilsObject: any; @@ -20,6 +22,7 @@ export class ModulesLayoutService { constructor(private _injector: Injector) { this._mConfig = this._injector.get(ModulesConfigService); this._mObject = this._injector.get(ModulesObjectService); + this._mNomenclature = this._injector.get(ModulesNomenclatureService); } $reComputeLayout = new Subject(); @@ -57,6 +60,7 @@ export class ModulesLayoutService { today: utils.today, // renvoie la date du jour (defaut) departementsForRegion: utils.departementsForRegion, // liste des dept pour une region YML: utils.YML, + get_cd_nomenclature: this._mNomenclature.get_cd_nomenclature.bind(this._mNomenclature), }; this._utilsObject = this._mObject.utilsObject(); @@ -255,7 +259,7 @@ export class ModulesLayoutService { } strFunction = `{ - const {layout, data, globalData, utils, context, formGroup, o} = x; + const {layout, data, globalData, u, context, formGroup, o} = x; ${strFunction.substr(1)} `; @@ -270,17 +274,18 @@ export class ModulesLayoutService { if (typeof element == 'function') { const globalData = data; - const localData = utils.getAttr(globalData, context.keys); + const localData = utils.getAttr(globalData, context.data_keys); const formGroup = context.form_group_id && this._formControls[context.form_group_id]; const val = element({ layout, data: localData, globalData, - utils: this._utils, + u: this._utils, o: this._utilsObject, context, formGroup, }); + return val !== undefined ? val : null; // on veut eviter le undefined } diff --git a/frontend/app/services/nomenclature.service.ts b/frontend/app/services/nomenclature.service.ts new file mode 100644 index 00000000..2e989de1 --- /dev/null +++ b/frontend/app/services/nomenclature.service.ts @@ -0,0 +1,40 @@ +import { Injectable, Injector } from '@angular/core'; +import { ModulesDataService } from './data.service'; +import { mergeMap, map, filter, switchMap } from 'rxjs/operators'; +import { of } from 'rxjs'; + +@Injectable() +export class ModulesNomenclatureService { + _nomenclatures: any[] = []; + + _mData: ModulesDataService; + + constructor(private _injector: Injector) { + this._mData = this._injector.get(ModulesDataService); + this.init().subscribe(() => {}); + } + + init() { + if (this._nomenclatures.length) { + return of(true); + } + return this._mData + .dataRequest('get', 'MODULATOR', 'ref_nom.nomenclature', { + params: { fields: ['id_nomenclature', 'cd_nomenclature'] }, + }) + .pipe( + mergeMap((res) => { + this._nomenclatures = res.data; + return of(true); + }) + ); + } + + get_cd_nomenclature(id_nomenclature) { + if (!(this._nomenclatures.length && !!id_nomenclature)) { + return; + } + let nomenclature = this._nomenclatures.find((n) => n.id_nomenclature == id_nomenclature); + return nomenclature?.cd_nomenclature; + } +} diff --git a/frontend/app/utils/commons.ts b/frontend/app/utils/commons.ts index 21dd18bb..615065a9 100644 --- a/frontend/app/utils/commons.ts +++ b/frontend/app/utils/commons.ts @@ -37,6 +37,10 @@ const addKey = (keys, key) => { }; const getAttr = (obj, paths, index = 0) => { + if (paths == null && index == 0) { + console.log('?????'); + console.trace(); + } if (paths == null) { return obj; } From 256f5de6957611ad922ee86be5170a6c80a0c649 Mon Sep 17 00:00:00 2001 From: "joel.clement" Date: Wed, 19 Apr 2023 15:43:19 +0200 Subject: [PATCH 077/142] pf diag clotures --- .../tests/test_form_constraint.layout.yml | 21 + config/references/data.reference.yml | 4 +- ....site_template.module-tempate_defaults.yml | 6 +- .../migrations/data/schema_diagnostic.sql | 299 +++++++++--- .../90f6e5531f7c_diagnostic_m_sipaf.py | 13 +- contrib/m_sipaf/backend/m_sipaf/models.py | 129 ++++- contrib/m_sipaf/config/config.yml | 46 +- .../definitions/m_sipaf.diag.schema.yml | 81 +++- .../m_sipaf.diag_cloture.schema.yml | 29 ++ .../config/features/m_sipaf.utils.data.yml | 446 +++++------------- .../m_sipaf.diagnostic_edit.layout.yml | 92 +++- 11 files changed, 725 insertions(+), 441 deletions(-) create mode 100644 config/layouts/tests/test_form_constraint.layout.yml create mode 100644 contrib/m_sipaf/config/definitions/m_sipaf.diag_cloture.schema.yml diff --git a/config/layouts/tests/test_form_constraint.layout.yml b/config/layouts/tests/test_form_constraint.layout.yml new file mode 100644 index 00000000..f65d8cb9 --- /dev/null +++ b/config/layouts/tests/test_form_constraint.layout.yml @@ -0,0 +1,21 @@ +type: layout +code: test_form_constraint +title: Layout formulaire et contraintes +description: Layout de test pour l'affichage + +data: + +layout: + title: Test Form and display + items: + - direction: row + items: + - title: Formulaire + type: form + items: + - key: a + type: string + - key: b + type: string + required: __f__data.a==1 + disabled: __f__data.a!=1 diff --git a/config/references/data.reference.yml b/config/references/data.reference.yml index 7fd1112b..7cb3b080 100644 --- a/config/references/data.reference.yml +++ b/config/references/data.reference.yml @@ -33,7 +33,9 @@ properties: items: type: array items: - type: object + OneOf: + - type: object, + - type: array required: - items - schema_code diff --git a/contrib/m_monitoring/config/m_monitoring.site_template.module-tempate_defaults.yml b/contrib/m_monitoring/config/m_monitoring.site_template.module-tempate_defaults.yml index 7aaa3bdb..a146b8f6 100644 --- a/contrib/m_monitoring/config/m_monitoring.site_template.module-tempate_defaults.yml +++ b/contrib/m_monitoring/config/m_monitoring.site_template.module-tempate_defaults.yml @@ -41,7 +41,7 @@ site_filters_fields: sort: code_name filters: | __f__data?.region - ? `area_code in ${utils.departementsForRegion(data.region.area_code).join(';')}` + ? `area_code in ${u.departementsForRegion(data.region.area_code).join(';')}` : null - key: commune @@ -54,7 +54,7 @@ site_filters_fields: __f__data?.departement ? `area_code like ${data.departement.area_code}%` : data?.region - ? utils.departementsForRegion(data.region.area_code) + ? u.departementsForRegion(data.region.area_code) .map(departementCode => `area_code like ${departementCode}%`) .join(',|,') : null @@ -166,7 +166,7 @@ visit_form_fields: default: __f__context.current_user?.id_role hidden: true - key: date_min - default: __f__utils.today() + default: u.today() - date_max - key: id_module object_code: module diff --git a/contrib/m_sipaf/backend/m_sipaf/migrations/data/schema_diagnostic.sql b/contrib/m_sipaf/backend/m_sipaf/migrations/data/schema_diagnostic.sql index 432fff07..a6083c0a 100644 --- a/contrib/m_sipaf/backend/m_sipaf/migrations/data/schema_diagnostic.sql +++ b/contrib/m_sipaf/backend/m_sipaf/migrations/data/schema_diagnostic.sql @@ -1,56 +1,247 @@ -- schema diagnostic +-- table diagnostic +CREATE TABLE pr_sipaf.t_diagnostics ( + id_diagnostic SERIAL NOT NULL, + id_passage_faune INTEGER NOT NULL, + id_role INTEGER, + id_organisme INTEGER, + date_diagnostic DATE NOT NULL, + commentaire_diagnostic VARCHAR, + commentaire_perturbation_obstacle VARCHAR, + obstacle_autre VARCHAR, + perturbation_autre VARCHAR, + id_nomenclature_diagnostic_ouvrage_hydrau_racc_banq INTEGER, + amenagement_biodiv_autre VARCHAR +); - -- table diagnostic - - CREATE TABLE pr_sipaf.t_diagnostics ( - id_diagnostic SERIAL NOT NULL, - id_passage_faune INTEGER NOT NULL, - id_role INTEGER, - id_organisme INTEGER, - date_diagnostic DATE NOT NULL, - comment VARCHAR, - obstacle_autre VARCHAR - ); - - ALTER TABLE pr_sipaf.t_diagnostics - ADD CONSTRAINT pk_sipaf_t_diagnostic_id_diagnostic PRIMARY KEY (id_diagnostic); - - ALTER TABLE pr_sipaf.t_diagnostics - ADD CONSTRAINT fk_sipaf_t_diag_t_pf_id_passage_faune FOREIGN KEY (id_passage_faune) - REFERENCES pr_sipaf.t_passages_faune(id_passage_faune) - ON UPDATE CASCADE ON DELETE CASCADE; - - ALTER TABLE pr_sipaf.t_diagnostics - ADD CONSTRAINT fk_sipaf_t_diag_t_rol_id_role FOREIGN KEY (id_role) - REFERENCES utilisateurs.t_roles(id_role) - ON UPDATE CASCADE ON DELETE SET NULL; - - ALTER TABLE pr_sipaf.t_diagnostics - ADD CONSTRAINT fk_sipaf_t_diag_b_org_id_organisme FOREIGN KEY (id_organisme) - REFERENCES utilisateurs.bib_organismes(id_organisme) - ON UPDATE CASCADE ON DELETE SET NULL; - - - -- cor diag nomenclature obstacle - CREATE TABLE IF NOT EXISTS pr_sipaf.cor_diag_nomenclature_obstacle ( - id_diagnostic INTEGER NOT NULL NOT NULL, - id_nomenclature INTEGER NOT NULL NOT NULL - ); - - ALTER TABLE pr_sipaf.cor_diag_nomenclature_obstacle - ADD CONSTRAINT pk_pr_sipaf_cor_diag_nomenclature_obstacle_id_diagnostic_id_nomenclature PRIMARY KEY (id_diagnostic, id_nomenclature); - - ALTER TABLE pr_sipaf.cor_diag_nomenclature_obstacle - ADD CONSTRAINT fk_pr_sipaf_cor_diag_nomenclature_obstacle_id_diagnostic FOREIGN KEY (id_diagnostic) - REFERENCES pr_sipaf.t_diagnostics (id_diagnostic) - ON UPDATE CASCADE ON DELETE CASCADE; - - ALTER TABLE pr_sipaf.cor_diag_nomenclature_obstacle - ADD CONSTRAINT fk_pr_sipaf_cor_diag_nomenclature_obstacle_id_nomenclature FOREIGN KEY (id_nomenclature) - REFERENCES ref_nomenclatures.t_nomenclatures (id_nomenclature) - ON UPDATE CASCADE ON DELETE CASCADE; - - ALTER TABLE pr_sipaf.cor_diag_nomenclature_obstacle - ADD CONSTRAINT check_nom_type_pr_sipaf_cor_diag_nomenclature_obstacle_id_ure_pf_ype - CHECK (ref_nomenclatures.check_nomenclature_type_by_mnemonique(id_nomenclature,'PF_DIAG_OBSTACLE')) - NOT VALID; +ALTER TABLE + pr_sipaf.t_diagnostics +ADD + CONSTRAINT pk_sipaf_t_diagnostic_id_diagnostic PRIMARY KEY (id_diagnostic); + +ALTER TABLE + pr_sipaf.t_diagnostics +ADD + CONSTRAINT fk_sipaf_t_diag_t_pf_id_passage_faune FOREIGN KEY (id_passage_faune) REFERENCES pr_sipaf.t_passages_faune(id_passage_faune) ON UPDATE CASCADE ON DELETE CASCADE; + +ALTER TABLE + pr_sipaf.t_diagnostics +ADD + CONSTRAINT fk_sipaf_t_diag_t_rol_id_role FOREIGN KEY (id_role) REFERENCES utilisateurs.t_roles(id_role) ON UPDATE CASCADE ON DELETE +SET + NULL; + +ALTER TABLE + pr_sipaf.t_diagnostics +ADD + CONSTRAINT fk_sipaf_t_diag_b_org_id_organisme FOREIGN KEY (id_organisme) REFERENCES utilisateurs.bib_organismes(id_organisme) ON UPDATE CASCADE ON DELETE +SET + NULL; + +-- cor diag nomenclature obstacle +CREATE TABLE IF NOT EXISTS pr_sipaf.cor_diag_nomenclature_obstacle ( + id_diagnostic INTEGER NOT NULL NOT NULL, + id_nomenclature INTEGER NOT NULL NOT NULL +); + +ALTER TABLE + pr_sipaf.cor_diag_nomenclature_obstacle +ADD + CONSTRAINT pk_pr_sipaf_cor_diag_nomenclature_obstacle_id_diagnostic_id_nomenclature PRIMARY KEY (id_diagnostic, id_nomenclature); + +ALTER TABLE + pr_sipaf.cor_diag_nomenclature_obstacle +ADD + CONSTRAINT fk_pr_sipaf_cor_diag_nomenclature_obstacle_id_diagnostic FOREIGN KEY (id_diagnostic) REFERENCES pr_sipaf.t_diagnostics (id_diagnostic) ON UPDATE CASCADE ON DELETE CASCADE; + +ALTER TABLE + pr_sipaf.cor_diag_nomenclature_obstacle +ADD + CONSTRAINT fk_pr_sipaf_cor_diag_nomenclature_obstacle_id_nomenclature FOREIGN KEY (id_nomenclature) REFERENCES ref_nomenclatures.t_nomenclatures (id_nomenclature) ON UPDATE CASCADE ON DELETE CASCADE; + +-- cor diag nomenclature perturbation +CREATE TABLE IF NOT EXISTS pr_sipaf.cor_diag_nomenclature_perturbation ( + id_diagnostic INTEGER NOT NULL NOT NULL, + id_nomenclature INTEGER NOT NULL NOT NULL +); + +ALTER TABLE + pr_sipaf.cor_diag_nomenclature_perturbation +ADD + CONSTRAINT pk_pr_sipaf_cor_diag_nomenclature_perturbation_id_diagnostic_id_nomenclature PRIMARY KEY (id_diagnostic, id_nomenclature); + +ALTER TABLE + pr_sipaf.cor_diag_nomenclature_perturbation +ADD + CONSTRAINT fk_pr_sipaf_cor_diag_nomenclature_perturbation_id_diagnostic FOREIGN KEY (id_diagnostic) REFERENCES pr_sipaf.t_diagnostics (id_diagnostic) ON UPDATE CASCADE ON DELETE CASCADE; + +ALTER TABLE + pr_sipaf.cor_diag_nomenclature_perturbation +ADD + CONSTRAINT fk_pr_sipaf_cor_diag_nomenclature_perturbation_id_nomenclature FOREIGN KEY (id_nomenclature) REFERENCES ref_nomenclatures.t_nomenclatures (id_nomenclature) ON UPDATE CASCADE ON DELETE CASCADE; + +ALTER TABLE + pr_sipaf.t_diagnostics +ADD + CONSTRAINT fk_pr_sipaf_t_d_id_nomenclature_diagnostic_ouvrage_hydrau_racc_banq FOREIGN KEY ( + id_nomenclature_diagnostic_ouvrage_hydrau_racc_banq + ) REFERENCES ref_nomenclatures.t_nomenclatures (id_nomenclature) ON UPDATE CASCADE ON DELETE CASCADE; + +-- cor diag nomenclature ouvrage_hydrau_etat_berge +CREATE TABLE IF NOT EXISTS pr_sipaf.cor_diag_nomenclature_ouvrage_hydrau_etat_berge ( + id_diagnostic INTEGER NOT NULL NOT NULL, + id_nomenclature INTEGER NOT NULL NOT NULL +); + +ALTER TABLE + pr_sipaf.cor_diag_nomenclature_ouvrage_hydrau_etat_berge +ADD + CONSTRAINT pk_ouvrage_hydray_etat_berge_id_diagnostic_id_nomenclature PRIMARY KEY (id_diagnostic, id_nomenclature); + +ALTER TABLE + pr_sipaf.cor_diag_nomenclature_ouvrage_hydrau_etat_berge +ADD + CONSTRAINT fk_ouvrage_hydray_etat_berge_id_diagnostic FOREIGN KEY (id_diagnostic) REFERENCES pr_sipaf.t_diagnostics (id_diagnostic) ON UPDATE CASCADE ON DELETE CASCADE; + +ALTER TABLE + pr_sipaf.cor_diag_nomenclature_ouvrage_hydrau_etat_berge +ADD + CONSTRAINT fk_ouvrage_hydray_etat_berge_id_nomenclature FOREIGN KEY (id_nomenclature) REFERENCES ref_nomenclatures.t_nomenclatures (id_nomenclature) ON UPDATE CASCADE ON DELETE CASCADE; + +-- cor diag nomenclature ouvrage_hydreau_dimensionnement +CREATE TABLE IF NOT EXISTS pr_sipaf.cor_diag_nomenclature_ouvrage_hydrau_dim ( + id_diagnostic INTEGER NOT NULL NOT NULL, + id_nomenclature INTEGER NOT NULL NOT NULL +); + +ALTER TABLE + pr_sipaf.cor_diag_nomenclature_ouvrage_hydrau_dim +ADD + CONSTRAINT pk_pr_sipaf_cor_diag_nomenclature_ouvrage_hydrau_dim_id_diagnostic_id_nomenclature PRIMARY KEY (id_diagnostic, id_nomenclature); + +ALTER TABLE + pr_sipaf.cor_diag_nomenclature_ouvrage_hydrau_dim +ADD + CONSTRAINT fk_pr_sipaf_cor_diag_nomenclature_ouvrage_hydrau_dim_id_diagnostic FOREIGN KEY (id_diagnostic) REFERENCES pr_sipaf.t_diagnostics (id_diagnostic) ON UPDATE CASCADE ON DELETE CASCADE; + +ALTER TABLE + pr_sipaf.cor_diag_nomenclature_ouvrage_hydrau_dim +ADD + CONSTRAINT fk_pr_sipaf_cor_diag_nomenclature_ouvrage_hydrau_dim_id_nomenclature FOREIGN KEY (id_nomenclature) REFERENCES ref_nomenclatures.t_nomenclatures (id_nomenclature) ON UPDATE CASCADE ON DELETE CASCADE; + +-- cor diag nomenclature amenagement_biodiv +CREATE TABLE IF NOT EXISTS pr_sipaf.cor_diag_nomenclature_amenagement_biodiv ( + id_diagnostic INTEGER NOT NULL NOT NULL, + id_nomenclature INTEGER NOT NULL NOT NULL +); + +ALTER TABLE + pr_sipaf.cor_diag_nomenclature_amenagement_biodiv +ADD + CONSTRAINT pk_pr_sipaf_cor_diag_nomenclature_amenagement_biodiv_id_diagnostic_id_nomenclature PRIMARY KEY (id_diagnostic, id_nomenclature); + +ALTER TABLE + pr_sipaf.cor_diag_nomenclature_amenagement_biodiv +ADD + CONSTRAINT fk_pr_sipaf_cor_diag_nomenclature_amenagement_biodiv_id_diagnostic FOREIGN KEY (id_diagnostic) REFERENCES pr_sipaf.t_diagnostics (id_diagnostic) ON UPDATE CASCADE ON DELETE CASCADE; + +ALTER TABLE + pr_sipaf.cor_diag_nomenclature_amenagement_biodiv +ADD + CONSTRAINT fk_pr_sipaf_cor_diag_nomenclature_amenagement_biodiv_id_nomenclature FOREIGN KEY (id_nomenclature) REFERENCES ref_nomenclatures.t_nomenclatures (id_nomenclature) ON UPDATE CASCADE ON DELETE CASCADE; + +-- clôture guidage +CREATE TABLE IF NOT EXISTS pr_sipaf.t_diagnostic_clotures ( + id_diagnostic INTEGER NOT NULL NOT NULL, + id_nomenclature_clotures_guidage_type INTEGER NOT NULL NOT NULL, + id_nomenclature_clotures_guidage_etat INTEGER NOT NULL NOT NULL, + clotures_guidage_type_autre VARCHAR, + clotures_guidage_etat_autre VARCHAR +); + +ALTER TABLE + pr_sipaf.t_diagnostic_clotures +ADD + CONSTRAINT fk_pr_sipaf_t_diagnostic_clotures_id_diagnostic FOREIGN KEY (id_diagnostic) REFERENCES pr_sipaf.t_diagnostics (id_diagnostic) ON UPDATE CASCADE ON DELETE CASCADE; + +ALTER TABLE + pr_sipaf.t_diagnostic_clotures +ADD + CONSTRAINT fk_pr_sipaf_t_d_c_g_id_nomenclature_clotures_guidage_type FOREIGN KEY (id_nomenclature_clotures_guidage_type) REFERENCES ref_nomenclatures.t_nomenclatures (id_nomenclature) ON UPDATE CASCADE ON DELETE CASCADE; + +ALTER TABLE + pr_sipaf.t_diagnostic_clotures +ADD + CONSTRAINT fk_pr_sipaf_t_d_c_g_id_nomenclature_clotures_guidage_etat FOREIGN KEY (id_nomenclature_clotures_guidage_etat) REFERENCES ref_nomenclatures.t_nomenclatures (id_nomenclature) ON UPDATE CASCADE ON DELETE CASCADE; + +-- check constraint nomenclature type +ALTER TABLE + pr_sipaf.t_diagnostics +ADD + CONSTRAINT check_nom_type_diag_ouvr_hydrau_racc_banq_id_ure_pf_ype CHECK ( + ref_nomenclatures.check_nomenclature_type_by_mnemonique( + id_nomenclature_diagnostic_ouvrage_hydrau_racc_banq, + 'PF_DIAG_OUVRAGE_HYDRAULIQUE_RACCORDEMENT_BANQUETTE' + ) + ) NOT VALID; + +ALTER TABLE + pr_sipaf.cor_diag_nomenclature_obstacle +ADD + CONSTRAINT check_nom_type_pr_sipaf_cor_diag_nomenclature_obstacle_id_ure_pf_ype CHECK ( + ref_nomenclatures.check_nomenclature_type_by_mnemonique(id_nomenclature, 'PF_DIAG_OBSTACLE') + ) NOT VALID; + +ALTER TABLE + pr_sipaf.t_diagnostic_clotures +ADD + CONSTRAINT check_nom_type_diag_clot_gui_type CHECK ( + ref_nomenclatures.check_nomenclature_type_by_mnemonique( + id_nomenclature_clotures_guidage_type, + 'PF_DIAG_CLOTURES_GUIDAGE_TYPE' + ) + ) NOT VALID; + +ALTER TABLE + pr_sipaf.t_diagnostic_clotures +ADD + CONSTRAINT check_nom_type_diag_clot_gui_etat CHECK ( + ref_nomenclatures.check_nomenclature_type_by_mnemonique( + id_nomenclature_clotures_guidage_etat, + 'PF_DIAG_CLOTURES_GUIDAGE_ETAT' + ) + ) NOT VALID; + +ALTER TABLE + pr_sipaf.cor_diag_nomenclature_amenagement_biodiv +ADD + CONSTRAINT check_nom_type_pr_sipaf_cor_diag_nomenclature_amenagement_biodiv_id_ure_pf_ype CHECK ( + ref_nomenclatures.check_nomenclature_type_by_mnemonique(id_nomenclature, 'PF_DIAG_AMENAGEMENT_BIODIV') + ) NOT VALID; + +ALTER TABLE + pr_sipaf.cor_diag_nomenclature_ouvrage_hydrau_dim +ADD + CONSTRAINT check_nom_type_pr_sipaf_cor_diag_nomenclature_ouvrage_hydrau_dim_id_ure_pf_ype CHECK ( + ref_nomenclatures.check_nomenclature_type_by_mnemonique( + id_nomenclature, + 'PF_DIAG_OUVRAGE_HYDRAU_DIMENSIONNEMENT' + ) + ) NOT VALID; + +ALTER TABLE + pr_sipaf.cor_diag_nomenclature_ouvrage_hydrau_etat_berge +ADD + CONSTRAINT check_nom_type_ouvrage_hydrau_etat_berge_id_ure_pf_ype CHECK ( + ref_nomenclatures.check_nomenclature_type_by_mnemonique( + id_nomenclature, + 'PF_DIAG_OUVRAGE_HYDRAULIQUE_ETAT_BERGE' + ) + ) NOT VALID; + +ALTER TABLE + pr_sipaf.cor_diag_nomenclature_perturbation +ADD + CONSTRAINT check_nom_type_pr_sipaf_cor_diag_nomenclature_perturbation_id_ure_pf_ype CHECK ( + ref_nomenclatures.check_nomenclature_type_by_mnemonique(id_nomenclature, 'PF_DIAG_PERTURBATION') + ) NOT VALID; \ No newline at end of file diff --git a/contrib/m_sipaf/backend/m_sipaf/migrations/versions/90f6e5531f7c_diagnostic_m_sipaf.py b/contrib/m_sipaf/backend/m_sipaf/migrations/versions/90f6e5531f7c_diagnostic_m_sipaf.py index a127dfba..485defac 100644 --- a/contrib/m_sipaf/backend/m_sipaf/migrations/versions/90f6e5531f7c_diagnostic_m_sipaf.py +++ b/contrib/m_sipaf/backend/m_sipaf/migrations/versions/90f6e5531f7c_diagnostic_m_sipaf.py @@ -28,10 +28,17 @@ def upgrade(): def downgrade(): + if_exists = "" + # if_exists = "IF EXISTS" op.execute( - """ - DROP TABLE IF EXISTS pr_sipaf.cor_diag_nomenclature_obstacle; - DROP TABLE IF EXISTS pr_sipaf.t_diagnostics; + f""" + DROP TABLE {if_exists} pr_sipaf.cor_diag_nomenclature_obstacle; + DROP TABLE {if_exists} pr_sipaf.cor_diag_nomenclature_perturbation; + DROP TABLE {if_exists} pr_sipaf.cor_diag_nomenclature_ouvrage_hydrau_etat_berge; + DROP TABLE {if_exists} pr_sipaf.cor_diag_nomenclature_ouvrage_hydrau_dim; + DROP TABLE {if_exists} pr_sipaf.cor_diag_nomenclature_amenagement_biodiv; + DROP TABLE {if_exists} pr_sipaf.t_diagnostic_clotures; + DROP TABLE {if_exists} pr_sipaf.t_diagnostics; """ ) pass diff --git a/contrib/m_sipaf/backend/m_sipaf/models.py b/contrib/m_sipaf/backend/m_sipaf/models.py index a3c17465..6270d3db 100644 --- a/contrib/m_sipaf/backend/m_sipaf/models.py +++ b/contrib/m_sipaf/backend/m_sipaf/models.py @@ -274,11 +274,70 @@ class CorDiagObstacle(db.Model): ) +class CorDiagPerturbation(db.Model): + __tablename__ = "cor_diag_nomenclature_perturbation" + __table_args__ = {"schema": "pr_sipaf"} + + id_diagnostic = db.Column( + db.Integer, db.ForeignKey("pr_sipaf.t_diagnostics.id_diagnostic"), primary_key=True + ) + id_nomenclature = db.Column( + db.Integer, + db.ForeignKey("ref_nomenclatures.t_nomenclatures.id_nomenclature"), + primary_key=True, + ) + + +class CorDiagOuvrageHydrauEtatBerge(db.Model): + __tablename__ = "cor_diag_nomenclature_ouvrage_hydrau_etat_berge" + __table_args__ = {"schema": "pr_sipaf"} + + id_diagnostic = db.Column( + db.Integer, db.ForeignKey("pr_sipaf.t_diagnostics.id_diagnostic"), primary_key=True + ) + id_nomenclature = db.Column( + db.Integer, + db.ForeignKey("ref_nomenclatures.t_nomenclatures.id_nomenclature"), + primary_key=True, + ) + + +class CorDiagOuvrageHydrauDim(db.Model): + __tablename__ = "cor_diag_nomenclature_ouvrage_hydrau_dim" + __table_args__ = {"schema": "pr_sipaf"} + + id_diagnostic = db.Column( + db.Integer, db.ForeignKey("pr_sipaf.t_diagnostics.id_diagnostic"), primary_key=True + ) + id_nomenclature = db.Column( + db.Integer, + db.ForeignKey("ref_nomenclatures.t_nomenclatures.id_nomenclature"), + primary_key=True, + ) + + +class CorDiagAmenagementBiodiv(db.Model): + __tablename__ = "cor_diag_nomenclature_amenagement_biodiv" + __table_args__ = {"schema": "pr_sipaf"} + + id_diagnostic = db.Column( + db.Integer, db.ForeignKey("pr_sipaf.t_diagnostics.id_diagnostic"), primary_key=True + ) + id_nomenclature = db.Column( + db.Integer, + db.ForeignKey("ref_nomenclatures.t_nomenclatures.id_nomenclature"), + primary_key=True, + ) + + class Diagnostic(db.Model): __tablename__ = "t_diagnostics" __table_args__ = {"schema": "pr_sipaf"} + # communs id_diagnostic = db.Column(db.Integer, primary_key=True) + date_diagnostic = db.Column(db.Date, nullable=False) + commentaire_diagnostic = db.Column(db.Unicode) id_passage_faune = db.Column( db.Integer, @@ -289,20 +348,80 @@ class Diagnostic(db.Model): ), nullable=False, ) - passage_faune = db.relationship(PassageFaune, backref="diagnostics") - date_diagnostic = db.Column(db.Date, nullable=False) - id_role = db.Column(db.Integer, db.ForeignKey("utilisateurs.t_roles.id_role")) role = db.relationship(User) id_organisme = db.Column(db.Integer, db.ForeignKey("utilisateurs.bib_organismes.id_organisme")) organisme = db.relationship(Organisme) - comment = db.Column(db.Unicode) + # perturbation / obstacle + + commentaire_perturbation_obstacle = db.Column(db.Unicode) + obstacle_autre = db.Column(db.Unicode) + perturbation_autre = db.Column(db.Unicode) + + id_nomenclature_diagnostic_ouvrage_hydrau_racc_banq = db.Column( + db.Integer, db.ForeignKey("ref_nomenclatures.t_nomenclatures.id_nomenclature") + ) + nomenclature_diagnostic_ouvrage_hydrau_raccordement_banquette = db.relationship( + TNomenclatures, + foreign_keys=[id_nomenclature_diagnostic_ouvrage_hydrau_racc_banq], + ) nomenclatures_diagnostic_obstacle = db.relationship( TNomenclatures, secondary=CorDiagObstacle.__table__ ) - obstacle_autre = db.Column(db.Unicode) + + nomenclatures_diagnostic_perturbation = db.relationship( + TNomenclatures, secondary=CorDiagPerturbation.__table__ + ) + + nomenclatures_diagnostic_ouvrage_hydrau_etat_berge = db.relationship( + TNomenclatures, secondary=CorDiagOuvrageHydrauEtatBerge.__table__ + ) + + nomenclatures_diagnostic_ouvrage_hydrau_dim = db.relationship( + TNomenclatures, secondary=CorDiagOuvrageHydrauDim.__table__ + ) + + # Amenagements + amenagement_biodiv_autre = db.Column(db.Unicode) + + nomenclatures_diagnostic_amenagement_biodiv = db.relationship( + TNomenclatures, secondary=CorDiagAmenagementBiodiv.__table__ + ) + + +class DiagnosticCloture(db.Model): + __tablename__ = "t_diagnostic_clotures" + __table_args__ = {"schema": "pr_sipaf"} + + id_diagnostic = db.Column( + db.Integer, db.ForeignKey("pr_sipaf.t_diagnostics.id_diagnostic"), primary_key=True + ) + id_nomenclature_clotures_guidage_type = db.Column( + db.Integer, + db.ForeignKey("ref_nomenclatures.t_nomenclatures.id_nomenclature"), + primary_key=True, + nullable=False, + ) + id_nomenclature_clotures_guidage_etat = db.Column( + db.Integer, + db.ForeignKey("ref_nomenclatures.t_nomenclatures.id_nomenclature"), + primary_key=True, + nullable=False, + ) + + clotures_guidage_type_autre = db.Column(db.Unicode) + clotures_guidage_etat_autre = db.Column(db.Unicode) + + diagnostic = db.relationship(Diagnostic, backref="clotures") + + nomenclature_clotures_guidage_etat = db.relationship( + TNomenclatures, foreign_keys=[id_nomenclature_clotures_guidage_etat] + ) + nomenclature_clotures_guidage_type = db.relationship( + TNomenclatures, foreign_keys=[id_nomenclature_clotures_guidage_type] + ) diff --git a/contrib/m_sipaf/config/config.yml b/contrib/m_sipaf/config/config.yml index 62d8038a..8c192174 100644 --- a/contrib/m_sipaf/config/config.yml +++ b/contrib/m_sipaf/config/config.yml @@ -43,7 +43,7 @@ site_filters_fields: sort: code_name filters: | __f__data?.region - ? `area_code in ${utils.departementsForRegion(data.region.area_code).join(';')}` + ? `area_code in ${u.departementsForRegion(data.region.area_code).join(';')}` : null - key: commune @@ -219,7 +219,6 @@ site_details_fields: - date_diagnostic - organisme.nom_organisme - role.nom_complet - - comment prefilters: __f__`id_passage_faune = ${o.object(x, 'site').value}` sort: date_diagnostic- @@ -351,39 +350,26 @@ site_form_fields: type_widget: medias schema_dot_table: pr_sipaf.t_passages_faune details: [] -diagnostic_form_fields: + + + +diagnostic_details_fields: overflow: true items: - - hidden: true - items: - - id_diagnostic - - id_passage_faunes - - key: id_passage_faune - default: __f__context.params.id_passage_faune - - id_organisme - - id_role + - passage_faune.code_passage_faune - date_diagnostic + - organisme.nom_organisme + - role.nom_complet - direction: row items: - - key: nomenclatures_diagnostic_obstacle - additional_fields: - - cd_nomenclature - type: list_form - multiple: true - return_object: true + - nomenclatures_diagnostic_obstacle.label_fr - key: obstacle_autre hidden: __f__!data.nomenclatures_diagnostic_obstacle?.some(n => n.cd_nomenclature == 'AUT') - required: __f__data.nomenclatures_diagnostic_obstacle?.some(n => n.cd_nomenclature == 'AUT') - -diagnostic_details_fields: - overflow: true - items: - - hidden: true + - direction: row items: - - nomenclatures_diagnostic_obstacle.cd_nomenclature - - passage_faune.code_passage_faune - - organisme.nom_organisme - - role.nom_complet - - nomenclatures_diagnostic_obstacle.label_fr - - key: obstacle_autre - hidden: __f__!data.nomenclatures_diagnostic_obstacle?.some(n => n.cd_nomenclature == 'AUT') \ No newline at end of file + - nomenclatures_diagnostic_perturbation.label_fr + - key: perturbation_autre + hidden: __f__!data.nomenclatures_diagnostic_perturbation?.some(n => n.cd_nomenclature == 'AUT') + - nomenclatures_diagnostic_ouvrage_hydrau_etat_berge.label_fr + - nomenclature_diagnostic_ouvrage_hydrau_raccordement_banquette.label_fr + - nomenclatures_diagnostic_ouvrage_hydrau_dim.label_fr diff --git a/contrib/m_sipaf/config/definitions/m_sipaf.diag.schema.yml b/contrib/m_sipaf/config/definitions/m_sipaf.diag.schema.yml index 2e85b8d0..d577b5cd 100644 --- a/contrib/m_sipaf/config/definitions/m_sipaf.diag.schema.yml +++ b/contrib/m_sipaf/config/definitions/m_sipaf.diag.schema.yml @@ -4,27 +4,62 @@ title: schema diagnostic passage faune description: schema pour les diagnostics des passages à faune meta: - autoschema: true - model: m_sipaf.models.Diagnostic - module_code: m_sipaf - genre: M - label: diagnostic - label_field_name: date_diagnostic - unique: - - id_passage_faune - - date_diagnostic - - id_organism - unique_in_db: true + autoschema: true + model: m_sipaf.models.Diagnostic + module_code: m_sipaf + genre: M + label: diagnostic + label_field_name: date_diagnostic + unique: + - id_passage_faune + - date_diagnostic + - id_organism + unique_in_db: true properties: - date_diagnostic: - title: Date - id_role: - title: Agent - id_organisme: - title: Organisme - comment: - title: Commentaire - nomenclatures_diagnostic_obstacle: - title: Obstacle(s) - obstacle_autre: - title: Obstacle autre \ No newline at end of file + # commons + date_diagnostic: + title: Date + description: Date d'établissemnt du diagnostic de fonctionalité + id_role: + title: Responsable du suivi + description: Personne en charge du suivi + id_organisme: + title: Organisme + description: Organisme en charge du suivi + commentaire_diagnostic: + title: Commentaire (diagnostic) + description: champs libre pour information complémentaire indicatives + + # obstacles + commentaire_perturbation_obstacle: + title: Commentaire (perturbation / obstacle) + description: champs libre pour information complémentaire indicatives + nomenclatures_diagnostic_obstacle: + title: Obstacle(s) + description: Obstacles aux déplacement pouvant affecter la fonctionalité d'n ouvrage + obstacle_autre: + title: Obstacle autre + nomenclatures_diagnostic_perturbation: + title: Perturbation(s) + description: Éléments pouvant perturber la fonctionalité d'un ouvrage + perturbation_autre: + title: Perturbation autre + nomenclatures_diagnostic_ouvrage_hydrau_etat_berge: + title: État des berges + description: État des berges à l'entrée de l'ouvrage (ouvrage hydraulique) + id_nomenclature_diagnostic_ouvrage_hydrau_racc_banq: + title: Raccordement banquette-berge + description: État du raccordement entre la banquette et la berge aux sorties d'un ouvrage mixte hydraulique + nomenclatures_diagnostic_ouvrage_hydrau_dim: + title: Défaut de dimensionnement + description: Dimensions de l'ouvrage hydraulique inadaptées + + # amenagements + nomenclatures_diagnostic_amenagement_biodiv: + title: Types d'aménagements + description: Types d'aménagement complémentaires en faveur de la faune + amenagement_biodiv_autre: + title: Aménagement autre + clotures: + title: Clôtures + description: Présence de clôtures pouvant guider les animaux vers le passage \ No newline at end of file diff --git a/contrib/m_sipaf/config/definitions/m_sipaf.diag_cloture.schema.yml b/contrib/m_sipaf/config/definitions/m_sipaf.diag_cloture.schema.yml new file mode 100644 index 00000000..d06d492a --- /dev/null +++ b/contrib/m_sipaf/config/definitions/m_sipaf.diag_cloture.schema.yml @@ -0,0 +1,29 @@ +type: schema +code: m_sipaf.diag_cloture +title: schema diagnostic passage faune (clotures) +description: schema pour les diagnostics des passages à faune (clotures) + +meta: + autoschema: true + model: m_sipaf.models.DiagnosticCloture + module_code: m_sipaf + genre: M + label: Diagnostic de clôture + labels: Diagnostics de clôture + label_field_name: id_diagnostic + unique: + - id_diagnostic + - id_nomenclature_clotures_guidage_type + - id_nomenclature_clotures_guidage_etat + unique_in_db: true +properties: + clotures_guidage_type_autre: + title: Autre type de clôture + clotures_guidage_etat_autre: + title: Autre état de clôture + id_nomenclature_clotures_guidage_type: + title: Nature des clôtures + description: Nature des clôtures pouvant guider les animaux vers le passage + id_nomenclature_clotures_guidage_etat: + title: État des clôtures + description: État des clôtures pouvant guider les animaux vers le passage diff --git a/contrib/m_sipaf/config/features/m_sipaf.utils.data.yml b/contrib/m_sipaf/config/features/m_sipaf.utils.data.yml index 215a8521..02c75fb5 100644 --- a/contrib/m_sipaf/config/features/m_sipaf.utils.data.yml +++ b/contrib/m_sipaf/config/features/m_sipaf.utils.data.yml @@ -18,331 +18,135 @@ items: pk_field: id_passage_faune uuid_field_name: uuid_passage_faune - schema_code: ref_nom.type + keys: [mnemonique, label_default, definition_default] + defaults: + source: SIPAF items: - - mnemonique: PF_OUVRAGE_MATERIAUX - label_default: Matériaux - definition_default: "Matériaux composant l'ouvrage" - source: SIPAF - - mnemonique: PF_OUVRAGE_HYDRAULIQUE_POSITION - label_default: OH Position - definition_default: "Position de l'ouvrage hydrolique" - source: SIPAF - - mnemonique: PF_OUVRAGE_HYDRAULIQUE_BANQ_CARACT - label_default: OH Caractérisation banquette - definition_default: Caractérisation de la banquette pour un ouvrage hydraulique - source: SIPAF - - mnemonique: PF_OUVRAGE_HYDRAULIQUE_BANQ_TYPE - label_default: OH Type de banquette - definition_default: Type de banquette pour un ouvrage hydrolique - source: SIPAF - - mnemonique: PF_INFRASTRUCTURE_TYPE - label_default: "Type d'infrastructure" - definition_default: "Type d'infrastructure pour les passages à faune" - source: SIPAF - - mnemonique: PF_OUVRAGE_SPECIFICITE - label_default: Spécificité - definition_default: Exclusivité du passage pour le passage de la faune - source: SIPAF - - mnemonique: PF_OUVRAGE_TYPE - label_default: "Type d'ouvrage" - definition_default: "Type d'ouvrage d'art pour le passage faune" - source: SIPAF - - mnemonique: PF_TYPE_ACTOR - label_default: "Type d'acteur" - definition_default: "Type d'acteur pour les passages faune" - source: SIPAF - - mnemonique: PF_DIAG_OBSTACLE - label_default: "Diagnostic obstacle" - definition_default: "Diagnostic obstacle" - source: SIPAF + - [PF_OUVRAGE_MATERIAUX, Matériaux, "Matériaux composant l'ouvrage"] + - [PF_OUVRAGE_HYDRAULIQUE_POSITION, OH Position, "Position de l'ouvrage hydrolique"] + - [PF_OUVRAGE_HYDRAULIQUE_BANQ_CARACT, OH Caractérisation banquette, Caractérisation de la banquette pour un ouvrage hydraulique] + - [PF_OUVRAGE_HYDRAULIQUE_BANQ_TYPE, OH Type de banquette, Type de banquette pour un ouvrage hydrolique] + - [PF_INFRASTRUCTURE_TYPE, "Type d'infrastructure", "Type d'infrastructure pour les passages à faune"] + - [PF_OUVRAGE_SPECIFICITE, Spécificité, Exclusivité du passage pour le passage de la faune] + - [PF_OUVRAGE_TYPE, "Type d'ouvrage", "Type d'ouvrage d'art pour le passage faune"] + - [PF_TYPE_ACTOR, "Type d'acteur", "Type d'acteur pour les passages faune"] + - [PF_DIAG_OBSTACLE, Diagnostic obstacle, Diagnostic obstacle] + - [PF_DIAG_PERTURBATION, Diagnostic perturbation, Diagnostic perturbation] + - [PF_DIAG_OUVRAGE_HYDRAULIQUE_ETAT_BERGE, Diagnostic état berge, État des berges à l'entrée de l'ouvrage (ouvrage hydraulique)] + - [PF_DIAG_OUVRAGE_HYDRAULIQUE_RACCORDEMENT_BANQUETTE, Diagnostic Raccordement banquette-berge, État du raccordement entre la banquette et la berge aux sorties d'un ouvrage mixte hydraulique] + - [PF_DIAG_OUVRAGE_HYDRAU_DIMENSIONNEMENT, Défaut de dimensionnement, Défaut de dimensionnement] + - [PF_DIAG_AMENAGEMENT_BIODIV, Types d'aménagements, Types d'aménagement complémentaires en faveur de la faune] + - [PF_DIAG_CLOTURES_GUIDAGE_TYPE, Nature des clôtures, Nature des clôtures pouvant guider les animaux vers le passage] + - [PF_DIAG_CLOTURES_GUIDAGE_ETAT, État des clôtures, État des clôtures pouvant guider les animaux vers le passage] + # PF_DIAG_VEGETATION_PRESENTE_TABLIER_TYPE + # PF_DIAG_VEGETATION_PRESENTE_DEBOUCH_TYPE - schema_code: ref_nom.nomenclature defaults: source: SIPAF active: true + keys: + [id_type, cd_nomenclature, mnemonique, label_default, definition_default] items: - - id_type: PF_OUVRAGE_MATERIAUX - cd_nomenclature: BET - mnemonique: Béta. - label_default: Béton - definition_default: Béton - - id_type: PF_OUVRAGE_MATERIAUX - cd_nomenclature: MET - mnemonique: Mét. - label_default: Métal - definition_default: Métal - - id_type: PF_OUVRAGE_MATERIAUX - cd_nomenclature: PLT - mnemonique: Pla. - label_default: Plastique - definition_default: Plastique - - id_type: PF_OUVRAGE_MATERIAUX - cd_nomenclature: BOI - mnemonique: Boi. - label_default: Bois - definition_default: Bois - - id_type: PF_OUVRAGE_MATERIAUX - cd_nomenclature: MAC - mnemonique: Maç. - label_default: Maçonnerie - definition_default: Maçonnerie - - id_type: PF_OUVRAGE_MATERIAUX - cd_nomenclature: AUT - mnemonique: Aut. - label_default: Autre - definition_default: Autre - - id_type: PF_OUVRAGE_MATERIAUX - cd_nomenclature: IND - mnemonique: Ind. - label_default: Indéterminé - definition_default: Indéterminé - - id_type: PF_OUVRAGE_HYDRAULIQUE_POSITION - cd_nomenclature: RD - mnemonique: R. d. - label_default: Rive droite - definition_default: Rive droite - - id_type: PF_OUVRAGE_HYDRAULIQUE_POSITION - cd_nomenclature: RG - mnemonique: R. g. - label_default: Rive Gauche - definition_default: Rive Gauche - - id_type: PF_OUVRAGE_HYDRAULIQUE_POSITION - cd_nomenclature: RGD - mnemonique: "R. g. & d." - label_default: Rive gauche et rive droite - definition_default: Rive gauche et rive droite (la rive se détermine dans le sens amont/aval) - - id_type: PF_OUVRAGE_HYDRAULIQUE_BANQ_CARACT - cd_nomenclature: SIM - mnemonique: Spl. - label_default: Simple - definition_default: Banquette simple - - id_type: PF_OUVRAGE_HYDRAULIQUE_BANQ_CARACT - cd_nomenclature: DOU - mnemonique: Dbl. - label_default: Double - definition_default: Banquette double - - id_type: PF_OUVRAGE_HYDRAULIQUE_BANQ_TYPE - cd_nomenclature: NAT - mnemonique: Nat. - label_default: Banquette naturelle - definition_default: Banquette naturelle / bande enherbée - - id_type: PF_OUVRAGE_HYDRAULIQUE_BANQ_TYPE - cd_nomenclature: BET - mnemonique: Bet. - label_default: Banquette béton - definition_default: Banquette béton - - id_type: PF_OUVRAGE_HYDRAULIQUE_BANQ_TYPE - cd_nomenclature: ECB - mnemonique: Ecb. - label_default: Encorbellement - definition_default: Encorbellement - - id_type: PF_OUVRAGE_HYDRAULIQUE_BANQ_TYPE - cd_nomenclature: POF - mnemonique: Po. F. - label_default: Ponton flottant - definition_default: Ponton flottant - - id_type: PF_OUVRAGE_HYDRAULIQUE_BANQ_TYPE - cd_nomenclature: AUT - mnemonique: Aut. - label_default: Autre - definition_default: Autre - - id_type: PF_INFRASTRUCTURE_TYPE - cd_nomenclature: AU - mnemonique: Auto. - label_default: Autoroute - definition_default: Autoroute - - id_type: PF_INFRASTRUCTURE_TYPE - cd_nomenclature: RN - mnemonique: R. N. - label_default: Route Nationale - definition_default: Route Nationale - - id_type: PF_INFRASTRUCTURE_TYPE - cd_nomenclature: RD - mnemonique: R. D. - label_default: Route Départementale - definition_default: Route Départementale - - id_type: PF_INFRASTRUCTURE_TYPE - cd_nomenclature: VF - mnemonique: V. F. - label_default: Voie ferrée - definition_default: Voie ferrée - - id_type: PF_INFRASTRUCTURE_TYPE - cd_nomenclature: CA - mnemonique: Ca. - label_default: Canal / Rivère navigable - definition_default: Canal / Rivère navigable - - id_type: PF_OUVRAGE_SPECIFICITE - cd_nomenclature: SPE - mnemonique: Spé. - label_default: Spécifique - definition_default: Ouvrage construit que pour le passage des animaux - - id_type: PF_OUVRAGE_SPECIFICITE - cd_nomenclature: MIX - mnemonique: Mixt. - label_default: Mixte - definition_default: Ouvrage mixte construit pour le passage des animaux concomitamment à un ou plusieurs autres usages - - id_type: PF_OUVRAGE_SPECIFICITE - cd_nomenclature: ND - mnemonique: Non déd. - label_default: Non dédié - definition_default: Ouvrage non dédié au passage de la faune mais pouvant servir à cet usage - - id_type: PF_OUVRAGE_TYPE - cd_nomenclature: BUS - mnemonique: Bus. - label_default: Buse - definition_default: Buse - - id_type: PF_OUVRAGE_TYPE - cd_nomenclature: CAD - mnemonique: Cad. - label_default: Cadre - definition_default: Cadre - - id_type: PF_OUVRAGE_TYPE - cd_nomenclature: VOU+R - mnemonique: Voût. Rad. - label_default: Voûte avec radier - definition_default: Voûte maçonnée avec radier - - id_type: PF_OUVRAGE_TYPE - cd_nomenclature: AUT - mnemonique: Aut. - label_default: Autre (préciser) - definition_default: Autre (préciser) - - id_type: PF_OUVRAGE_TYPE - cd_nomenclature: POR - mnemonique: Por. - label_default: Portique - definition_default: Portique en béton - - id_type: PF_OUVRAGE_TYPE - cd_nomenclature: VOU - mnemonique: Voû. - label_default: Voûte sans radier - definition_default: Voûte maçonnée sans radier - - id_type: PF_OUVRAGE_TYPE - cd_nomenclature: DAL+P - mnemonique: Dal. pal. - label_default: Dalle et palpaplanche - definition_default: Dalle et palpaplanche - - id_type: PF_OUVRAGE_TYPE - cd_nomenclature: DAL - mnemonique: Dal. - label_default: Dalle - definition_default: Dalle - - id_type: PF_OUVRAGE_TYPE - cd_nomenclature: ARC - mnemonique: Arc. - label_default: Arc - definition_default: Arc - - id_type: PF_OUVRAGE_TYPE - cd_nomenclature: VIA - mnemonique: via. - label_default: Viaduc - definition_default: Viaduc - - id_type: PF_OUVRAGE_TYPE - cd_nomenclature: PON - mnemonique: pon. - label_default: Pont - definition_default: Pont - - id_type: PF_OUVRAGE_TYPE - cd_nomenclature: CAN - mnemonique: can. - label_default: Canalisation - definition_default: Canalisation - - id_type: PF_OUVRAGE_TYPE - cd_nomenclature: DALO - mnemonique: dalo. - label_default: Dalot - definition_default: Dalot - - id_type: PF_OUVRAGE_TYPE - cd_nomenclature: DIAB - mnemonique: diab. - label_default: Diabolo - definition_default: Diabolo - - id_type: PF_OUVRAGE_TYPE - cd_nomenclature: TRA - mnemonique: Tra. - label_default: Tranchée - definition_default: Tranchée - - id_type: PF_OUVRAGE_TYPE - cd_nomenclature: TUN - mnemonique: Tun. - label_default: Tunnel - definition_default: Tunnel - - id_type: PF_TYPE_ACTOR - cd_nomenclature: PRO - mnemonique: Prop. - label_default: Propriétaire - definition_default: Propriétaire du passage faune - - id_type: PF_TYPE_ACTOR - cd_nomenclature: CON - mnemonique: Conc. - label_default: Concessionaire - definition_default: Concessionnaire - - id_type: PF_TYPE_ACTOR - cd_nomenclature: INT - mnemonique: Int. - label_default: Intervenant - definition_default: Intervenant sur ce passage faune - - id_type: PF_TYPE_ACTOR - cd_nomenclature: GES - mnemonique: Ges. - label_default: Gestionnaire - definition_default: Gestionnaire du passage faune - - id_type: PF_TYPE_ACTOR - cd_nomenclature: ETA - mnemonique: État - label_default: État - definition_default: État - - id_type: PF_TYPE_ACTOR - cd_nomenclature: DEP - mnemonique: Dépt. - label_default: Département - definition_default: Département - - id_type: PF_DIAG_OBSTACLE - cd_nomenclature: NEA - mnemonique: Néa. - label_default: Néant - definition_default: Pas de présence d'obstacle - - id_type: PF_DIAG_OBSTACLE - cd_nomenclature: CLOT - mnemonique: Clôt. - label_default: Clôtures - definition_default: Clôture fermant l'ouvrage - - id_type: PF_DIAG_OBSTACLE - cd_nomenclature: TROT - mnemonique: Trot. - label_default: Trottoirs - definition_default: Trottoirs - - id_type: PF_DIAG_OBSTACLE - cd_nomenclature: TROT - mnemonique: Trot. - label_default: Trottoirs - definition_default: Trottoirs - - id_type: PF_DIAG_OBSTACLE - cd_nomenclature: GLIS - mnemonique: Glis. - label_default: Glissières - definition_default: Glissières - - id_type: PF_DIAG_OBSTACLE - cd_nomenclature: DENIV - mnemonique: Déniv. - label_default: Dénivelé - definition_default: Dénivelé - - id_type: PF_DIAG_OBSTACLE - cd_nomenclature: DEP - mnemonique: Dép. - label_default: Dépôts - definition_default: Dépôts - - id_type: PF_DIAG_OBSTACLE - cd_nomenclature: STAG - mnemonique: Stag. - label_default: Stagnation d'eau - definition_default: Stagnation d'eau - - id_type: PF_DIAG_OBSTACLE - cd_nomenclature: INFR - mnemonique: Infr. - label_default: Infrastructure - definition_default: Infrastructure au débouché - - id_type: PF_DIAG_OBSTACLE - cd_nomenclature: AUT - mnemonique: Aut. - label_default: Autre (Préciser) - definition_default: Autre (Préciser) + - [PF_OUVRAGE_MATERIAUX, BET, Béta., Béton, Béton] + - [PF_OUVRAGE_MATERIAUX, MET, Mét., Métal, Métal] + - [PF_OUVRAGE_MATERIAUX, PLT, Pla., Plastique, Plastique] + - [PF_OUVRAGE_MATERIAUX, BOI, Boi., Bois, Bois] + - [PF_OUVRAGE_MATERIAUX, MAC, Maç., Maçonnerie, Maçonnerie] + - [PF_OUVRAGE_MATERIAUX, AUT, Aut., Autre, Autre] + - [PF_OUVRAGE_MATERIAUX, IND, Ind., Indéterminé, Indéterminé] + + - [PF_OUVRAGE_HYDRAULIQUE_POSITION, RG, R. g., Rive Gauche, Rive Gauche] + - [PF_OUVRAGE_HYDRAULIQUE_POSITION, RGD, R. g. & d.", Rive gauche et rive droite, Rive gauche et rive droite (la rive se détermine dans le sens amont/aval)] + + - [PF_OUVRAGE_HYDRAULIQUE_BANQ_CARACT, DOU, Dbl., Double, Banquette double] + + - [PF_OUVRAGE_HYDRAULIQUE_BANQ_TYPE, BET, Bet., Banquette béton, Banquette béton] + - [PF_OUVRAGE_HYDRAULIQUE_BANQ_TYPE, ECB, Ecb., Encorbellement, Encorbellement] + - [PF_OUVRAGE_HYDRAULIQUE_BANQ_TYPE, POF, Po. F., Ponton flottant, Ponton flottant] + - [PF_OUVRAGE_HYDRAULIQUE_BANQ_TYPE, AUT, Aut., Autre, Autre] + + - [PF_INFRASTRUCTURE_TYPE, RN, R. N., Route Nationale, Route Nationale] + - [PF_INFRASTRUCTURE_TYPE, RD, R. D., Route Départementale, Route Départementale] + - [PF_INFRASTRUCTURE_TYPE, VF, V. F., Voie ferrée, Voie ferrée] + - [PF_INFRASTRUCTURE_TYPE, CA, Ca., Canal / Rivère navigable, Canal / Rivère navigable] + + - [PF_OUVRAGE_SPECIFICITE, MIX, Mixt., Mixte, Ouvrage mixte construit pour le passage des animaux concomitamment à un ou plusieurs autres usages] + - [PF_OUVRAGE_SPECIFICITE, ND, Non déd., Non dédié, Ouvrage non dédié au passage de la faune mais pouvant servir à cet usage] + + - [PF_OUVRAGE_TYPE, CAD, Cad., Cadre, Cadre] + - [PF_OUVRAGE_TYPE, VOU+R, Voût. Rad., Voûte avec radier, Voûte maçonnée avec radier] + - [PF_OUVRAGE_TYPE, AUT, Aut., Autre (préciser), Autre (préciser)] + - [PF_OUVRAGE_TYPE, POR, Por., Portique, Portique en béton] + - [PF_OUVRAGE_TYPE, VOU, Voû., Voûte sans radier, Voûte maçonnée sans radier] + - [PF_OUVRAGE_TYPE, DAL+P, Dal. pal., Dalle et palpaplanche, Dalle et palpaplanche] + - [PF_OUVRAGE_TYPE, DAL, Dal., Dalle, Dalle] + - [PF_OUVRAGE_TYPE, ARC, Arc., Arc, Arc] + - [PF_OUVRAGE_TYPE, VIA, via., Viaduc, Viaduc] + - [PF_OUVRAGE_TYPE, PON, pon., Pont, Pont] + - [PF_OUVRAGE_TYPE, CAN, can., Canalisation, Canalisation] + - [PF_OUVRAGE_TYPE, DALO, dalo., Dalot, Dalot] + - [PF_OUVRAGE_TYPE, DIAB, diab., Diabolo, Diabolo] + - [PF_OUVRAGE_TYPE, TRA, Tra., Tranchée, Tranchée] + - [PF_OUVRAGE_TYPE, TUN, Tun., Tunnel, Tunnel] + + - [PF_TYPE_ACTOR, CON, Conc., Concessionaire, Concessionnaire] + - [PF_TYPE_ACTOR, INT, Int., Intervenant, Intervenant sur ce passage faune] + - [PF_TYPE_ACTOR, GES, Ges., Gestionnaire, Gestionnaire du passage faune] + - [PF_TYPE_ACTOR, ETA, État, État, État] + - [PF_TYPE_ACTOR, DEP, Dépt., Département, Département] + + - [PF_DIAG_OBSTACLE, CLOT, Clôt., Clôtures, Clôture fermant l'ouvrage] + - [PF_DIAG_OBSTACLE, TROT, Trot., Trottoirs, Trottoirs] + - [PF_DIAG_OBSTACLE, TROT, Trot., Trottoirs, Trottoirs] + - [PF_DIAG_OBSTACLE, GLIS, Glis., Glissières, Glissières] + - [PF_DIAG_OBSTACLE, DENIV, Déniv., Dénivelé, Dénivelé] + - [PF_DIAG_OBSTACLE, DEP, Dép., Dépôts, Dépôts] + - [PF_DIAG_OBSTACLE, STAG, Stag., Stagnation d'eau, Stagnation d'eau] + - [PF_DIAG_OBSTACLE, INFR, Infr., Infrastructure, Infrastructure au débouché] + - [PF_DIAG_OBSTACLE, AUT, Aut., Autre (préciser), Autre (préciser)] + + - [PF_DIAG_PERTURBATION, C_P, Circ. Piet., Circulation Piéton, Circulation Piéton] + - [PF_DIAG_PERTURBATION, CV, Circ. Voit., Circulation Voiture, Circulation Voiture] + - [PF_DIAG_PERTURBATION, C2RQ, Circ. 2R. Qu., Circulation 2-roues & quad, Circulation 2-roues & quad] + - [PF_DIAG_PERTURBATION, CTR, Circ. tr., Circulation tracteur, Circulation tracteur] + - [PF_DIAG_PERTURBATION, CHA, Cha., Chasse, Chasse] + - [PF_DIAG_PERTURBATION, SONO, Sono., Sonore, "Perturbations sonores (vibration, bruit de circulation, etc.)"] + - [PF_DIAG_PERTURBATION, VISU, Visu., Visuelle, "Perturbations visuelles (lumières, éclairage, etc.)"] + - [PF_DIAG_PERTURBATION, AUT, Aut., Autre (préciser), Autre (préciser)] + + - [PF_DIAG_OUVRAGE_HYDRAULIQUE_ETAT_BERGE, STA, Sta., Stable, Stable] + - [PF_DIAG_OUVRAGE_HYDRAULIQUE_ETAT_BERGE, ERO, Éro., Érodé, Érodé] + - [PF_DIAG_OUVRAGE_HYDRAULIQUE_ETAT_BERGE, RIPC, Rip. Cont., Ripisylve continue, Ripisylve continue] + - [PF_DIAG_OUVRAGE_HYDRAULIQUE_ETAT_BERGE, RIPD, Rip. Dis., Ripisylve discontinue, Ripisylve discontinue] + - [PF_DIAG_OUVRAGE_HYDRAULIQUE_ETAT_BERGE, ENRO, Enroch., Enrochement, Enrochement] + - [PF_DIAG_OUVRAGE_HYDRAULIQUE_ETAT_BERGE, TECHV, Tech. Vég., Technique végétale, Technique végétale] + - [PF_DIAG_OUVRAGE_HYDRAULIQUE_ETAT_BERGE, ENHB, Herb., Enherbées, Enherbées] + + - [PF_DIAG_OUVRAGE_HYDRAULIQUE_RACCORDEMENT_BANQUETTE, BON, Bon, Bon, "Bon : raccordement amont et aval"] + - [PF_DIAG_OUVRAGE_HYDRAULIQUE_RACCORDEMENT_BANQUETTE, INS, Insuff., Insuffisant, "Insuffisant : raccordement d'un seul côté"] + - [PF_DIAG_OUVRAGE_HYDRAULIQUE_RACCORDEMENT_BANQUETTE, ABS, Abs., Absent, "Absent : pas de raccordement ni en amont ni en aval"] + + - [PF_DIAG_OUVRAGE_HYDRAU_DIMENSIONNEMENT, LARG_INF, Larg. Faib., Largeur trop faible, "Largeur trop faible: augmentation de la vitesse d'écoulement empêchant le franchissement piscicole"] + - [PF_DIAG_OUVRAGE_HYDRAU_DIMENSIONNEMENT, LARG_SUP, Larg. Élev., Largeur trop élevée, "Largeur trop élevée: diminution de la lame d'eau"] + - [PF_DIAG_OUVRAGE_HYDRAU_DIMENSIONNEMENT, HAUT_INF, Larg. Élev., Hauteur insuffisante, "Hauteur insuffisante: en période de crue, submersion des aménagements"] + - [PF_DIAG_OUVRAGE_HYDRAU_DIMENSIONNEMENT, DEF_PENTE, Déf. Pente, Ne respecte pas la pente, "Ouvrage ne respectant pas la pente du cours d'eau : érosion à l'entrée / sortie de l'ouvrage"] + + - [PF_DIAG_AMENAGEMENT_BIODIV, PAR, Para., Parapet d'accultation, Parapet d'accultation] + - [PF_DIAG_AMENAGEMENT_BIODIV, PLA, Planta., Plantations, Plantations] + - [PF_DIAG_AMENAGEMENT_BIODIV, MUR, Mur., Andains / muret, Andains / muret] + - [PF_DIAG_AMENAGEMENT_BIODIV, MAR, Mar., Mares, Mares] + - [PF_DIAG_AMENAGEMENT_BIODIV, AUT, Aut., Autre (préciser), Autre (préciser)] + + - [PF_DIAG_CLOTURES_GUIDAGE_TYPE, 'GFS', Gd. Faun. Simp., Grande faune simple, Grande faune simple] + - [PF_DIAG_CLOTURES_GUIDAGE_TYPE, 'PFS', Pt. Faun. Simp., Petite faune simple, Petite faune simple] + - [PF_DIAG_CLOTURES_GUIDAGE_TYPE, 'MAIP', Mail. Prog., Mailles progressives, Mailles progressives] + - [PF_DIAG_CLOTURES_GUIDAGE_TYPE, 'MUR', Mur., Muret, Muret] + - [PF_DIAG_CLOTURES_GUIDAGE_TYPE, AUT, Aut., Autre (préciser), Autre (préciser)] + + - [PF_DIAG_CLOTURES_GUIDAGE_ETAT, BON, Bon, Bon, Bon] + - [PF_DIAG_CLOTURES_GUIDAGE_ETAT, MOY, Moy., Moyen, Moyen] + - [PF_DIAG_CLOTURES_GUIDAGE_ETAT, DEG, Dég., Dégradée, Dégradée] + - [PF_DIAG_CLOTURES_GUIDAGE_ETAT, NOJ, Non Jo., Non jointive, Non jointive] + - [PF_DIAG_CLOTURES_GUIDAGE_ETAT, AUT, Aut., Autre (préciser), Autre (préciser)] + diff --git a/contrib/m_sipaf/config/layouts/m_sipaf.diagnostic_edit.layout.yml b/contrib/m_sipaf/config/layouts/m_sipaf.diagnostic_edit.layout.yml index 85433eb6..16efd4d0 100644 --- a/contrib/m_sipaf/config/layouts/m_sipaf.diagnostic_edit.layout.yml +++ b/contrib/m_sipaf/config/layouts/m_sipaf.diagnostic_edit.layout.yml @@ -3,10 +3,100 @@ code: m_sipaf.diagnostic_edit title: page edit diagnostic description: page edit diagnostic +aliases: + - &diag_commons + - hidden: true + items: + - id_diagnostic + - key: id_passage_faune + default: __f__context.params.id_passage_faune + - display: row + items: + - date_diagnostic + - id_organisme + - id_role + - commentaire_diagnostic + + - &diag_perturbation_obstacle + - direction: row + items: + - key: nomenclatures_diagnostic_obstacle + additional_fields: + - cd_nomenclature + type: list_form + multiple: true + return_object: true + - key: obstacle_autre + hidden: __f__!data.nomenclatures_diagnostic_obstacle?.some(n => n.cd_nomenclature == 'AUT') + required: __f__data.nomenclatures_diagnostic_obstacle?.some(n => n.cd_nomenclature == 'AUT') + - direction: row + items: + - key: nomenclatures_diagnostic_perturbation + additional_fields: + - cd_nomenclature + type: list_form + multiple: true + return_object: true + - key: perturbation_autre + hidden: __f__!data.nomenclatures_diagnostic_perturbation?.some(n => n.cd_nomenclature == 'AUT') + required: __f__data.nomenclatures_diagnostic_perturbation?.some(n => n.cd_nomenclature == 'AUT') + - nomenclatures_diagnostic_ouvrage_hydrau_etat_berge + - id_nomenclature_diagnostic_ouvrage_hydrau_racc_banq + - nomenclatures_diagnostic_ouvrage_hydrau_dim + - commentaire_perturbation_obstacle + + - &diag_amenagement + - direction: row + items: + - key: nomenclatures_diagnostic_amenagement_biodiv + additional_fields: + - cd_nomenclature + type: list_form + multiple: true + return_object: true + - key: amenagement_biodiv_autre + disabled: __f__!data.nomenclatures_diagnostic_amenagement_biodiv?.some(n => n.cd_nomenclature == 'AUT') + required: __f__data.nomenclatures_diagnostic_amenagement_biodiv?.some(n => n.cd_nomenclature == 'AUT') + - items: + - key: clotures + type: array + display: fieldset + items: + direction: row + items: + - id_nomenclature_clotures_guidage_type + - key: clotures_guidage_type_autre + disabled: "__f__!(u.get_cd_nomenclature(data?.id_nomenclature_clotures_guidage_type) == 'AUT')" + required: "__f__u.get_cd_nomenclature(data?.id_nomenclature_clotures_guidage_type) == 'AUT'" + - id_nomenclature_clotures_guidage_etat + - key: clotures_guidage_etat_autre + disabled: "__f__!(u.get_cd_nomenclature(data?.id_nomenclature_clotures_guidage_etat) == 'AUT')" + required: "__f__u.get_cd_nomenclature(data?.id_nomenclature_clotures_guidage_etat) == 'AUT'" + + + - &diag_synthese + items: + + layout: height_auto: true items: code: utils.object_form template_params: object_code: diagnostic - layout: __DIAGNOSTIC_FORM_FIELDS__ + layout: + overflow: true + items: + # - title: Diagnostic + # display: fieldset + # items: *diag_commons + # - title: Pertubations / Obstacles + # display: fieldset + # items: *diag_perturbation_obstacle + - title: Aménagements + display: fieldset + items: *diag_amenagement + # - title: Synthese + # display: fieldset + # items: *diag_synthese + \ No newline at end of file From 08516037f183077de6020dbbe4a96db5816decd0 Mon Sep 17 00:00:00 2001 From: "joel.clement" Date: Wed, 19 Apr 2023 15:47:39 +0200 Subject: [PATCH 078/142] fix pytest --- backend/gn_modulator/commands.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/backend/gn_modulator/commands.py b/backend/gn_modulator/commands.py index d06be406..14d11c53 100644 --- a/backend/gn_modulator/commands.py +++ b/backend/gn_modulator/commands.py @@ -47,9 +47,7 @@ def cmd_install_module(module_code=None, module_path=None, force=False): for module_code in ModuleMethods.registred_modules(): print(f"- {module_code}") - raise Exception - - return ModuleMethods.install_module(module_code, module_path, force) + # return ModuleMethods.install_module(module_code, module_path, force) @click.command("remove") From dcdfaf6549c151caa7122ec80e80f30fd9a9e970 Mon Sep 17 00:00:00 2001 From: "joel.clement" Date: Wed, 19 Apr 2023 15:58:25 +0200 Subject: [PATCH 079/142] fix pytest --- backend/gn_modulator/definition/base.py | 5 +++-- backend/gn_modulator/imports/mixins/check.py | 4 +++- backend/gn_modulator/schema/base.py | 3 ++- backend/gn_modulator/schema/features/base.py | 3 ++- backend/gn_modulator/schema/models/base.py | 9 ++++++--- backend/gn_modulator/schema/repositories/utils.py | 3 ++- backend/gn_modulator/schema/serializers.py | 3 ++- backend/gn_modulator/schema/sql/base.py | 3 ++- backend/gn_modulator/schema/validation.py | 3 ++- backend/gn_modulator/utils/errors.py | 3 ++- 10 files changed, 26 insertions(+), 13 deletions(-) diff --git a/backend/gn_modulator/definition/base.py b/backend/gn_modulator/definition/base.py index 49eff9c4..ae235105 100644 --- a/backend/gn_modulator/definition/base.py +++ b/backend/gn_modulator/definition/base.py @@ -413,10 +413,11 @@ def global_check_definition(cls, definition_type, definition_code): ) # dépendancies - if dependencies := definition_type not in [ + dependencies = definition_type not in [ "template", "use_template", - ] and definition.get("dependencies"): + ] and definition.get("dependencies") + if dependencies: definition_codes = cls.definition_codes_for_type(definition_type) missing_dependencies = [ dependency for dependency in dependencies if dependency not in definition_codes diff --git a/backend/gn_modulator/imports/mixins/check.py b/backend/gn_modulator/imports/mixins/check.py index 20cffde3..ee195ac5 100644 --- a/backend/gn_modulator/imports/mixins/check.py +++ b/backend/gn_modulator/imports/mixins/check.py @@ -213,7 +213,9 @@ def check_resolve_keys(self): values = None # Dans le cas des nomenclatures on peut faire remonter les valeurs possible ?? - if code_type := sm.property(key).get("nomenclature_type"): + + code_type = sm.property(key).get("nomenclature_type") + if code_type: values = list( map( lambda x: { diff --git a/backend/gn_modulator/schema/base.py b/backend/gn_modulator/schema/base.py index 686c02e6..54909f6d 100644 --- a/backend/gn_modulator/schema/base.py +++ b/backend/gn_modulator/schema/base.py @@ -355,7 +355,8 @@ def process_csv_data(self, key, data, options={}, process_label=True): None, data[key], options=options, process_label=process_label ) - if labels := options.get("labels") and process_label: + labels = options.get("labels") and process_label + if labels: if data is True: return labels[0] if len(labels) > 0 else True elif data is False: diff --git a/backend/gn_modulator/schema/features/base.py b/backend/gn_modulator/schema/features/base.py index 31253d0c..919935ac 100644 --- a/backend/gn_modulator/schema/features/base.py +++ b/backend/gn_modulator/schema/features/base.py @@ -80,7 +80,8 @@ def get_foreign_key(self, key_process, rel_test_values, process_one=False): cache_key = "__".join([self.schema_code()] + list(map(lambda x: str(x), rel_test_values))) - if cache_value := get_global_cache(["import_pk_keys", self.schema_code(), cache_key]): + cache_value = get_global_cache(["import_pk_keys", self.schema_code(), cache_key]) + if cache_value: return cache_value if None in rel_test_values: diff --git a/backend/gn_modulator/schema/models/base.py b/backend/gn_modulator/schema/models/base.py index ed2af409..befc62a2 100644 --- a/backend/gn_modulator/schema/models/base.py +++ b/backend/gn_modulator/schema/models/base.py @@ -148,7 +148,8 @@ def process_relation_model(self, key, relationship_def, Model): def CorTable(self, relation_def): # cas cor_schema_code - if cor_schema_code := relation_def.get("cor_schema_code"): + cor_schema_code = relation_def.get("cor_schema_code") + if cor_schema_code: sm_cor = self.cls(cor_schema_code) Model = sm_cor.Model() CorTable = Model.__table__ @@ -205,11 +206,13 @@ def Model(self): return None # get Model from cache - if Model := get_global_cache(["schema", self.schema_code(), "model"]): + Model = get_global_cache(["schema", self.schema_code(), "model"]) + if Model: return Model # get Model from existing - if Model := self.get_existing_model(): + Model = self.get_existing_model() + if Model: return Model # dict_model used with type() to list properties and methods for class creation diff --git a/backend/gn_modulator/schema/repositories/utils.py b/backend/gn_modulator/schema/repositories/utils.py index d72c8841..8ed324b0 100644 --- a/backend/gn_modulator/schema/repositories/utils.py +++ b/backend/gn_modulator/schema/repositories/utils.py @@ -108,7 +108,8 @@ def custom_getattr( is_last_field = index == len(fields) - 1 # récupération depuis le cache associé à la query - if res := self.get_query_cache(query, cache_key): + res = self.get_query_cache(query, cache_key) + if res: return self.process_custom_getattr_res(res, query, only_fields) # si non en cache diff --git a/backend/gn_modulator/schema/serializers.py b/backend/gn_modulator/schema/serializers.py index 8fd50702..e566e0ea 100644 --- a/backend/gn_modulator/schema/serializers.py +++ b/backend/gn_modulator/schema/serializers.py @@ -299,7 +299,8 @@ def serialize(self, m, fields=None, as_geojson=False, geometry_field_name=None): sm_rel = self.cls(property["schema_code"]) fields_to_remove.append(field) - if default_fields := sm_rel.attr("meta.default_fields"): + default_fields = sm_rel.attr("meta.default_fields") + if default_fields: for rel_field in default_fields: fields_to_add.append(f"{field}.{rel_field}") else: diff --git a/backend/gn_modulator/schema/sql/base.py b/backend/gn_modulator/schema/sql/base.py index c49aa324..90f5794d 100644 --- a/backend/gn_modulator/schema/sql/base.py +++ b/backend/gn_modulator/schema/sql/base.py @@ -49,7 +49,8 @@ def non_auto_sql_schemas_dot_tables(cls): @classmethod def get_tables(cls): - if tables := get_global_cache(["schema_dot_tables"]): + tables = get_global_cache(["schema_dot_tables"]) + if tables: return tables sql_txt_tables = f""" diff --git a/backend/gn_modulator/schema/validation.py b/backend/gn_modulator/schema/validation.py index f0869299..7518f845 100644 --- a/backend/gn_modulator/schema/validation.py +++ b/backend/gn_modulator/schema/validation.py @@ -139,7 +139,8 @@ def set_definition_from_schema_code(self, definitions, schema_code): if schema_definition_id in definitions: return - if schema_definition := get_global_cache(["js_definition", schema_definition_id]): + schema_definition = get_global_cache(["js_definition", schema_definition_id]) + if schema_definition: definitions[schema_definition_id] = schema_definition deps = schema_definition["deps"] for dep in deps: diff --git a/backend/gn_modulator/utils/errors.py b/backend/gn_modulator/utils/errors.py index 78da0c5e..31826b7e 100644 --- a/backend/gn_modulator/utils/errors.py +++ b/backend/gn_modulator/utils/errors.py @@ -98,7 +98,8 @@ def errors_txt(): # on affiche les erreurs par fichier pour simplifier la lecture for definition_error_file_path in sorted(definition_error_file_paths): txt_errors += f"\n- {definition_error_file_path}\n" - if template_file_path := template_file_paths.get(definition_error_file_path): + template_file_path = template_file_paths.get(definition_error_file_path) + if template_file_path: txt_errors += f" {template_file_path}\n" txt_errors += "\n" From 3728e69804c840fac736dadde7a1874f57f05764 Mon Sep 17 00:00:00 2001 From: "joel.clement" Date: Wed, 19 Apr 2023 16:05:26 +0200 Subject: [PATCH 080/142] pk diag cloture --- .../backend/m_sipaf/migrations/data/schema_diagnostic.sql | 8 +++++++- contrib/m_sipaf/backend/m_sipaf/models.py | 1 - 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/contrib/m_sipaf/backend/m_sipaf/migrations/data/schema_diagnostic.sql b/contrib/m_sipaf/backend/m_sipaf/migrations/data/schema_diagnostic.sql index a6083c0a..d894ec53 100644 --- a/contrib/m_sipaf/backend/m_sipaf/migrations/data/schema_diagnostic.sql +++ b/contrib/m_sipaf/backend/m_sipaf/migrations/data/schema_diagnostic.sql @@ -152,13 +152,18 @@ ADD -- clôture guidage CREATE TABLE IF NOT EXISTS pr_sipaf.t_diagnostic_clotures ( - id_diagnostic INTEGER NOT NULL NOT NULL, + id_diagnostic SERIAL NOT NULL NOT NULL, id_nomenclature_clotures_guidage_type INTEGER NOT NULL NOT NULL, id_nomenclature_clotures_guidage_etat INTEGER NOT NULL NOT NULL, clotures_guidage_type_autre VARCHAR, clotures_guidage_etat_autre VARCHAR ); +ALTER TABLE + pr_sipaf.t_diagnostic_clotures +ADD + CONSTRAINT pk_sipaf_t_diagnostic_clotures PRIMARY KEY (id_diagnostic, id_nomenclature_clotures_guidage_type); + ALTER TABLE pr_sipaf.t_diagnostic_clotures ADD @@ -174,6 +179,7 @@ ALTER TABLE ADD CONSTRAINT fk_pr_sipaf_t_d_c_g_id_nomenclature_clotures_guidage_etat FOREIGN KEY (id_nomenclature_clotures_guidage_etat) REFERENCES ref_nomenclatures.t_nomenclatures (id_nomenclature) ON UPDATE CASCADE ON DELETE CASCADE; + -- check constraint nomenclature type ALTER TABLE pr_sipaf.t_diagnostics diff --git a/contrib/m_sipaf/backend/m_sipaf/models.py b/contrib/m_sipaf/backend/m_sipaf/models.py index 6270d3db..7a6734b0 100644 --- a/contrib/m_sipaf/backend/m_sipaf/models.py +++ b/contrib/m_sipaf/backend/m_sipaf/models.py @@ -410,7 +410,6 @@ class DiagnosticCloture(db.Model): id_nomenclature_clotures_guidage_etat = db.Column( db.Integer, db.ForeignKey("ref_nomenclatures.t_nomenclatures.id_nomenclature"), - primary_key=True, nullable=False, ) From b69a7936da73b71155a698e16957b014158c2fe9 Mon Sep 17 00:00:00 2001 From: "joel.clement" Date: Thu, 20 Apr 2023 13:51:48 +0200 Subject: [PATCH 081/142] diag --- .../migrations/data/schema_diagnostic.sql | 153 +++++++++++++++++- .../90f6e5531f7c_diagnostic_m_sipaf.py | 2 + contrib/m_sipaf/backend/m_sipaf/models.py | 90 ++++++++++- .../definitions/m_sipaf.diag.schema.yml | 21 ++- ..._sipaf.diag_vegetation_debouche.schema.yml | 25 +++ ...m_sipaf.diag_vegetation_tablier.schema.yml | 25 +++ .../config/features/m_sipaf.utils.data.yml | 31 +++- .../m_sipaf.diagnostic_edit.layout.yml | 143 +++++++++------- contrib/m_sipaf/config/m_sipaf.module.yml | 2 +- 9 files changed, 423 insertions(+), 69 deletions(-) create mode 100644 contrib/m_sipaf/config/definitions/m_sipaf.diag_vegetation_debouche.schema.yml create mode 100644 contrib/m_sipaf/config/definitions/m_sipaf.diag_vegetation_tablier.schema.yml diff --git a/contrib/m_sipaf/backend/m_sipaf/migrations/data/schema_diagnostic.sql b/contrib/m_sipaf/backend/m_sipaf/migrations/data/schema_diagnostic.sql index d894ec53..57a86076 100644 --- a/contrib/m_sipaf/backend/m_sipaf/migrations/data/schema_diagnostic.sql +++ b/contrib/m_sipaf/backend/m_sipaf/migrations/data/schema_diagnostic.sql @@ -10,8 +10,13 @@ CREATE TABLE pr_sipaf.t_diagnostics ( commentaire_perturbation_obstacle VARCHAR, obstacle_autre VARCHAR, perturbation_autre VARCHAR, - id_nomenclature_diagnostic_ouvrage_hydrau_racc_banq INTEGER, - amenagement_biodiv_autre VARCHAR + id_nomenclature_ouvrage_hydrau_racc_banq INTEGER, + amenagement_biodiv_autre VARCHAR, + commentaire_amenagement VARCHAR, + id_nomenclature_amenagement_entretient INTEGER, + id_nomenclature_franchissabilite INTEGER, + id_nomenclature_interet_faune INTEGER, + amenagement_faire VARCHAR ); ALTER TABLE @@ -83,10 +88,32 @@ ADD ALTER TABLE pr_sipaf.t_diagnostics ADD - CONSTRAINT fk_pr_sipaf_t_d_id_nomenclature_diagnostic_ouvrage_hydrau_racc_banq FOREIGN KEY ( - id_nomenclature_diagnostic_ouvrage_hydrau_racc_banq + CONSTRAINT fk_pr_sipaf_t_d_id_nomenclature_ouvrage_hydrau_racc_banq FOREIGN KEY ( + id_nomenclature_ouvrage_hydrau_racc_banq ) REFERENCES ref_nomenclatures.t_nomenclatures (id_nomenclature) ON UPDATE CASCADE ON DELETE CASCADE; +ALTER TABLE + pr_sipaf.t_diagnostics +ADD + CONSTRAINT fk_pr_sipaf_t_d_id_nomenclature_amenagement_entretient FOREIGN KEY ( + id_nomenclature_amenagement_entretient + ) REFERENCES ref_nomenclatures.t_nomenclatures (id_nomenclature) ON UPDATE CASCADE ON DELETE CASCADE; + +ALTER TABLE + pr_sipaf.t_diagnostics +ADD + CONSTRAINT fk_pr_sipaf_t_d_id_nomenclature_franchissablite FOREIGN KEY ( + id_nomenclature_franchissabilite + ) REFERENCES ref_nomenclatures.t_nomenclatures (id_nomenclature) ON UPDATE CASCADE ON DELETE CASCADE; + +ALTER TABLE + pr_sipaf.t_diagnostics +ADD + CONSTRAINT fk_pr_sipaf_t_d_id_nomenclature_interet_faune FOREIGN KEY ( + id_nomenclature_interet_faune + ) REFERENCES ref_nomenclatures.t_nomenclatures (id_nomenclature) ON UPDATE CASCADE ON DELETE CASCADE; + + -- cor diag nomenclature ouvrage_hydrau_etat_berge CREATE TABLE IF NOT EXISTS pr_sipaf.cor_diag_nomenclature_ouvrage_hydrau_etat_berge ( id_diagnostic INTEGER NOT NULL NOT NULL, @@ -179,6 +206,62 @@ ALTER TABLE ADD CONSTRAINT fk_pr_sipaf_t_d_c_g_id_nomenclature_clotures_guidage_etat FOREIGN KEY (id_nomenclature_clotures_guidage_etat) REFERENCES ref_nomenclatures.t_nomenclatures (id_nomenclature) ON UPDATE CASCADE ON DELETE CASCADE; +-- vegetation tablier +CREATE TABLE IF NOT EXISTS pr_sipaf.t_diagnostic_vegetation_presente_tablier ( + id_diagnostic INTEGER NOT NULL NOT NULL, + id_nomenclature_vegetation_type INTEGER NOT NULL NOT NULL, + id_nomenclature_vegetation_couvert INTEGER NOT NULL NOT NULL +); + +ALTER TABLE + pr_sipaf.t_diagnostic_vegetation_presente_tablier +ADD + CONSTRAINT pk_sipaf_t_diagnostic_vegetation_presente_tablier PRIMARY KEY (id_diagnostic, id_nomenclature_vegetation_type); + + +ALTER TABLE + pr_sipaf.t_diagnostic_vegetation_presente_tablier +ADD + CONSTRAINT fk_pr_sipaf_t_diagnostic_v_p_t_id_diagnostic FOREIGN KEY (id_diagnostic) REFERENCES pr_sipaf.t_diagnostics (id_diagnostic) ON UPDATE CASCADE ON DELETE CASCADE; + +ALTER TABLE + pr_sipaf.t_diagnostic_vegetation_presente_tablier +ADD + CONSTRAINT fk_pr_sipaf_t_diagnostic_v_p_t_id_nom_type FOREIGN KEY (id_nomenclature_vegetation_type) REFERENCES ref_nomenclatures.t_nomenclatures (id_nomenclature) ON UPDATE CASCADE ON DELETE CASCADE; + +ALTER TABLE + pr_sipaf.t_diagnostic_vegetation_presente_tablier +ADD + CONSTRAINT fk_pr_sipaf_t_diagnostic_v_p_t_id_nom_couvert FOREIGN KEY (id_nomenclature_vegetation_couvert) REFERENCES ref_nomenclatures.t_nomenclatures (id_nomenclature) ON UPDATE CASCADE ON DELETE CASCADE; + +-- vegetation debouche +CREATE TABLE IF NOT EXISTS pr_sipaf.t_diagnostic_vegetation_presente_debouche ( + id_diagnostic INTEGER NOT NULL NOT NULL, + id_nomenclature_vegetation_type INTEGER NOT NULL NOT NULL, + id_nomenclature_vegetation_couvert INTEGER NOT NULL NOT NULL +); + +ALTER TABLE + pr_sipaf.t_diagnostic_vegetation_presente_debouche +ADD + CONSTRAINT pk_sipaf_t_diagnostic_vegetation_presente_debouche PRIMARY KEY (id_diagnostic, id_nomenclature_vegetation_type); + + +ALTER TABLE + pr_sipaf.t_diagnostic_vegetation_presente_debouche +ADD + CONSTRAINT fk_pr_sipaf_t_diagnostic_v_p_t_id_diagnostic FOREIGN KEY (id_diagnostic) REFERENCES pr_sipaf.t_diagnostics (id_diagnostic) ON UPDATE CASCADE ON DELETE CASCADE; + +ALTER TABLE + pr_sipaf.t_diagnostic_vegetation_presente_debouche +ADD + CONSTRAINT fk_pr_sipaf_t_diagnostic_v_p_t_id_nom_type FOREIGN KEY (id_nomenclature_vegetation_type) REFERENCES ref_nomenclatures.t_nomenclatures (id_nomenclature) ON UPDATE CASCADE ON DELETE CASCADE; + +ALTER TABLE + pr_sipaf.t_diagnostic_vegetation_presente_debouche +ADD + CONSTRAINT fk_pr_sipaf_t_diagnostic_v_p_t_id_nom_couvert FOREIGN KEY (id_nomenclature_vegetation_couvert) REFERENCES ref_nomenclatures.t_nomenclatures (id_nomenclature) ON UPDATE CASCADE ON DELETE CASCADE; + -- check constraint nomenclature type ALTER TABLE @@ -186,11 +269,43 @@ ALTER TABLE ADD CONSTRAINT check_nom_type_diag_ouvr_hydrau_racc_banq_id_ure_pf_ype CHECK ( ref_nomenclatures.check_nomenclature_type_by_mnemonique( - id_nomenclature_diagnostic_ouvrage_hydrau_racc_banq, + id_nomenclature_ouvrage_hydrau_racc_banq, 'PF_DIAG_OUVRAGE_HYDRAULIQUE_RACCORDEMENT_BANQUETTE' ) ) NOT VALID; + +ALTER TABLE + pr_sipaf.t_diagnostics +ADD + CONSTRAINT check_nom_type_diag_amenagement_entretient CHECK ( + ref_nomenclatures.check_nomenclature_type_by_mnemonique( + id_nomenclature_amenagement_entretient, + 'PF_DIAG_AMENAGEMENT_ENTRETIENT' + ) + ) NOT VALID; + +ALTER TABLE + pr_sipaf.t_diagnostics +ADD + CONSTRAINT check_nom_type_diag_franchissabilite CHECK ( + ref_nomenclatures.check_nomenclature_type_by_mnemonique( + id_nomenclature_franchissabilite, + 'PF_DIAG_FRANCHISSABILITE' + ) + ) NOT VALID; + +ALTER TABLE + pr_sipaf.t_diagnostics +ADD + CONSTRAINT check_nom_type_diag_interet_faune CHECK ( + ref_nomenclatures.check_nomenclature_type_by_mnemonique( + id_nomenclature_interet_faune, + 'PF_DIAG_INTERET_FAUNE' + ) + ) NOT VALID; + + ALTER TABLE pr_sipaf.cor_diag_nomenclature_obstacle ADD @@ -250,4 +365,32 @@ ALTER TABLE ADD CONSTRAINT check_nom_type_pr_sipaf_cor_diag_nomenclature_perturbation_id_ure_pf_ype CHECK ( ref_nomenclatures.check_nomenclature_type_by_mnemonique(id_nomenclature, 'PF_DIAG_PERTURBATION') + ) NOT VALID; + +ALTER TABLE + pr_sipaf.t_diagnostic_vegetation_presente_tablier +ADD + CONSTRAINT check_nom_type_sipaf_diag_vege_pre_tab_type_nom_type CHECK ( + ref_nomenclatures.check_nomenclature_type_by_mnemonique(id_nomenclature_vegetation_type, 'PF_DIAG_AMENAGEMENT_VEGETATION_TYPE') + ) NOT VALID; + +ALTER TABLE + pr_sipaf.t_diagnostic_vegetation_presente_tablier +ADD + CONSTRAINT check_nom_type_sipaf_diag_vege_pre_tab_couvert_nom_type CHECK ( + ref_nomenclatures.check_nomenclature_type_by_mnemonique(id_nomenclature_vegetation_couvert, 'PF_DIAG_AMENAGEMENT_VEGETATION_COUVERT') + ) NOT VALID; + +ALTER TABLE + pr_sipaf.t_diagnostic_vegetation_presente_debouche +ADD + CONSTRAINT check_nom_type_sipaf_diag_vege_pre_tab_type_nom_type CHECK ( + ref_nomenclatures.check_nomenclature_type_by_mnemonique(id_nomenclature_vegetation_type, 'PF_DIAG_AMENAGEMENT_VEGETATION_TYPE') + ) NOT VALID; + +ALTER TABLE + pr_sipaf.t_diagnostic_vegetation_presente_debouche +ADD + CONSTRAINT check_nom_type_sipaf_diag_vege_pre_tab_couvert_nom_type CHECK ( + ref_nomenclatures.check_nomenclature_type_by_mnemonique(id_nomenclature_vegetation_couvert, 'PF_DIAG_AMENAGEMENT_VEGETATION_COUVERT') ) NOT VALID; \ No newline at end of file diff --git a/contrib/m_sipaf/backend/m_sipaf/migrations/versions/90f6e5531f7c_diagnostic_m_sipaf.py b/contrib/m_sipaf/backend/m_sipaf/migrations/versions/90f6e5531f7c_diagnostic_m_sipaf.py index 485defac..3743929e 100644 --- a/contrib/m_sipaf/backend/m_sipaf/migrations/versions/90f6e5531f7c_diagnostic_m_sipaf.py +++ b/contrib/m_sipaf/backend/m_sipaf/migrations/versions/90f6e5531f7c_diagnostic_m_sipaf.py @@ -37,6 +37,8 @@ def downgrade(): DROP TABLE {if_exists} pr_sipaf.cor_diag_nomenclature_ouvrage_hydrau_etat_berge; DROP TABLE {if_exists} pr_sipaf.cor_diag_nomenclature_ouvrage_hydrau_dim; DROP TABLE {if_exists} pr_sipaf.cor_diag_nomenclature_amenagement_biodiv; + DROP TABLE {if_exists} pr_sipaf.t_diagnostic_vegetation_presente_tablier; + DROP TABLE {if_exists} pr_sipaf.t_diagnostic_vegetation_presente_debouche; DROP TABLE {if_exists} pr_sipaf.t_diagnostic_clotures; DROP TABLE {if_exists} pr_sipaf.t_diagnostics; """ diff --git a/contrib/m_sipaf/backend/m_sipaf/models.py b/contrib/m_sipaf/backend/m_sipaf/models.py index 7a6734b0..38120bec 100644 --- a/contrib/m_sipaf/backend/m_sipaf/models.py +++ b/contrib/m_sipaf/backend/m_sipaf/models.py @@ -362,12 +362,12 @@ class Diagnostic(db.Model): obstacle_autre = db.Column(db.Unicode) perturbation_autre = db.Column(db.Unicode) - id_nomenclature_diagnostic_ouvrage_hydrau_racc_banq = db.Column( + id_nomenclature_ouvrage_hydrau_racc_banq = db.Column( db.Integer, db.ForeignKey("ref_nomenclatures.t_nomenclatures.id_nomenclature") ) nomenclature_diagnostic_ouvrage_hydrau_raccordement_banquette = db.relationship( TNomenclatures, - foreign_keys=[id_nomenclature_diagnostic_ouvrage_hydrau_racc_banq], + foreign_keys=[id_nomenclature_ouvrage_hydrau_racc_banq], ) nomenclatures_diagnostic_obstacle = db.relationship( @@ -393,6 +393,32 @@ class Diagnostic(db.Model): TNomenclatures, secondary=CorDiagAmenagementBiodiv.__table__ ) + id_nomenclature_amenagement_entretient = db.Column( + db.Integer, db.ForeignKey("ref_nomenclatures.t_nomenclatures.id_nomenclature") + ) + nomenclature_amenagement_entretient = db.relationship( + TNomenclatures, foreign_keys=[id_nomenclature_amenagement_entretient] + ) + + commentaire_amenagement = db.Column(db.Unicode) + + # synthese + id_nomenclature_interet_faune = db.Column( + db.Integer, db.ForeignKey("ref_nomenclatures.t_nomenclatures.id_nomenclature") + ) + nomenclature_interet_faune = db.relationship( + TNomenclatures, foreign_keys=[id_nomenclature_interet_faune] + ) + + id_nomenclature_franchissabilite = db.Column( + db.Integer, db.ForeignKey("ref_nomenclatures.t_nomenclatures.id_nomenclature") + ) + nomenclature_franchissabilite = db.relationship( + TNomenclatures, foreign_keys=[id_nomenclature_franchissabilite] + ) + + amenagement_faire = db.Column(db.Unicode) + class DiagnosticCloture(db.Model): __tablename__ = "t_diagnostic_clotures" @@ -424,3 +450,63 @@ class DiagnosticCloture(db.Model): nomenclature_clotures_guidage_type = db.relationship( TNomenclatures, foreign_keys=[id_nomenclature_clotures_guidage_type] ) + + +class DiagnosticVegetationTablier(db.Model): + __tablename__ = "t_diagnostic_vegetation_presente_tablier" + __table_args__ = {"schema": "pr_sipaf"} + + id_diagnostic = db.Column( + db.Integer, db.ForeignKey("pr_sipaf.t_diagnostics.id_diagnostic"), primary_key=True + ) + id_nomenclature_vegetation_type = db.Column( + db.Integer, + db.ForeignKey("ref_nomenclatures.t_nomenclatures.id_nomenclature"), + primary_key=True, + nullable=False, + ) + id_nomenclature_vegetation_couvert = db.Column( + db.Integer, + db.ForeignKey("ref_nomenclatures.t_nomenclatures.id_nomenclature"), + nullable=False, + ) + + diagnostic = db.relationship(Diagnostic, backref="vegetation_tablier") + + nomenclature_vegetation_type = db.relationship( + TNomenclatures, foreign_keys=[id_nomenclature_vegetation_type] + ) + + nomenclature_vegetation_couvert = db.relationship( + TNomenclatures, foreign_keys=[id_nomenclature_vegetation_couvert] + ) + + +class DiagnosticVegetationDebouche(db.Model): + __tablename__ = "t_diagnostic_vegetation_presente_debouche" + __table_args__ = {"schema": "pr_sipaf"} + + id_diagnostic = db.Column( + db.Integer, db.ForeignKey("pr_sipaf.t_diagnostics.id_diagnostic"), primary_key=True + ) + id_nomenclature_vegetation_type = db.Column( + db.Integer, + db.ForeignKey("ref_nomenclatures.t_nomenclatures.id_nomenclature"), + primary_key=True, + nullable=False, + ) + id_nomenclature_vegetation_couvert = db.Column( + db.Integer, + db.ForeignKey("ref_nomenclatures.t_nomenclatures.id_nomenclature"), + nullable=False, + ) + + diagnostic = db.relationship(Diagnostic, backref="vegetation_debouche") + + nomenclature_vegetation_type = db.relationship( + TNomenclatures, foreign_keys=[id_nomenclature_vegetation_type] + ) + + nomenclature_vegetation_couvert = db.relationship( + TNomenclatures, foreign_keys=[id_nomenclature_vegetation_couvert] + ) diff --git a/contrib/m_sipaf/config/definitions/m_sipaf.diag.schema.yml b/contrib/m_sipaf/config/definitions/m_sipaf.diag.schema.yml index d577b5cd..3940a975 100644 --- a/contrib/m_sipaf/config/definitions/m_sipaf.diag.schema.yml +++ b/contrib/m_sipaf/config/definitions/m_sipaf.diag.schema.yml @@ -47,7 +47,7 @@ properties: nomenclatures_diagnostic_ouvrage_hydrau_etat_berge: title: État des berges description: État des berges à l'entrée de l'ouvrage (ouvrage hydraulique) - id_nomenclature_diagnostic_ouvrage_hydrau_racc_banq: + id_nomenclature_ouvrage_hydrau_racc_banq: title: Raccordement banquette-berge description: État du raccordement entre la banquette et la berge aux sorties d'un ouvrage mixte hydraulique nomenclatures_diagnostic_ouvrage_hydrau_dim: @@ -62,4 +62,21 @@ properties: title: Aménagement autre clotures: title: Clôtures - description: Présence de clôtures pouvant guider les animaux vers le passage \ No newline at end of file + description: Présence de clôtures pouvant guider les animaux vers le passage + vegetation_tablier: + title: Vegetation (tablier) + description: Végétation présente sur le tablier + vegetation_debouche: + title: Vegetation (débouchés) + description: Végétation présente sur aux débouchés de l'ouvrage + + # synthese + id_nomenclature_franchissabilite: + title: Franchissibilité + description: Estimation de la franchissabilité de l'ouvrage pour les animaux + id_nomenclature_interet_faune: + title: Intérêt + description: Intérêt pour les espèces cibles + amenagement_faire: + title: Aménagements à faire + description: Détails aménagements ou autres mesures à réaliser pour rendre l'ouvrage plus fonctionel diff --git a/contrib/m_sipaf/config/definitions/m_sipaf.diag_vegetation_debouche.schema.yml b/contrib/m_sipaf/config/definitions/m_sipaf.diag_vegetation_debouche.schema.yml new file mode 100644 index 00000000..f13f8e91 --- /dev/null +++ b/contrib/m_sipaf/config/definitions/m_sipaf.diag_vegetation_debouche.schema.yml @@ -0,0 +1,25 @@ +type: schema +code: m_sipaf.diag_vegetation_debouche +title: schema diagnostic passage faune (vegetation_debouche) +description: schema pour les diagnostics des passages à faune (vegetation_debouche) + +meta: + autoschema: true + model: m_sipaf.models.DiagnosticVegetationDebouche + module_code: m_sipaf + genre: M + label: Diagnostic de vegetation débouchés + labels: Diagnostics de vegetation débouchés + label_field_name: id_diagnostic + unique: + - id_diagnostic + - id_nomenclature_vegetation_type + - id_nomenclature_vegetation_couvert + unique_in_db: true +properties: + id_nomenclature_vegetation_type: + title: Type de vegation + description: Type de vegation présente sur aux débouchés de l'ouvrage + id_nomenclature_vegetation_couvert: + title: Couverture végétale + description: Couverture végétale pour ce type de végétation diff --git a/contrib/m_sipaf/config/definitions/m_sipaf.diag_vegetation_tablier.schema.yml b/contrib/m_sipaf/config/definitions/m_sipaf.diag_vegetation_tablier.schema.yml new file mode 100644 index 00000000..af1f229f --- /dev/null +++ b/contrib/m_sipaf/config/definitions/m_sipaf.diag_vegetation_tablier.schema.yml @@ -0,0 +1,25 @@ +type: schema +code: m_sipaf.diag_vegetation_tablier +title: schema diagnostic passage faune (vegetation_tablier) +description: schema pour les diagnostics des passages à faune (vegetation_tablier) + +meta: + autoschema: true + model: m_sipaf.models.DiagnosticVegetationTablier + module_code: m_sipaf + genre: M + label: Diagnostic de vegetation tablier + labels: Diagnostics de vegetation tablier + label_field_name: id_diagnostic + unique: + - id_diagnostic + - id_nomenclature_vegetation_type + - id_nomenclature_vegetation_couvert + unique_in_db: true +properties: + id_nomenclature_vegetation_type: + title: Type de vegation + description: Type de vegation présente sur le tablier + id_nomenclature_vegetation_couvert: + title: Couverture végétale + description: Couverture végétale pour ce type de végétationd diff --git a/contrib/m_sipaf/config/features/m_sipaf.utils.data.yml b/contrib/m_sipaf/config/features/m_sipaf.utils.data.yml index 02c75fb5..3c45f98b 100644 --- a/contrib/m_sipaf/config/features/m_sipaf.utils.data.yml +++ b/contrib/m_sipaf/config/features/m_sipaf.utils.data.yml @@ -38,8 +38,11 @@ items: - [PF_DIAG_AMENAGEMENT_BIODIV, Types d'aménagements, Types d'aménagement complémentaires en faveur de la faune] - [PF_DIAG_CLOTURES_GUIDAGE_TYPE, Nature des clôtures, Nature des clôtures pouvant guider les animaux vers le passage] - [PF_DIAG_CLOTURES_GUIDAGE_ETAT, État des clôtures, État des clôtures pouvant guider les animaux vers le passage] - # PF_DIAG_VEGETATION_PRESENTE_TABLIER_TYPE - # PF_DIAG_VEGETATION_PRESENTE_DEBOUCH_TYPE + - [PF_DIAG_AMENAGEMENT_VEGETATION_TYPE, Type de végétation, Type de végétation présente] + - [PF_DIAG_AMENAGEMENT_VEGETATION_COUVERT, Couverture végétale (%), Couverture végétale (%)] + - [PF_DIAG_AMENAGEMENT_ENTRETIENT, Entretient dispositif et végétation, Entretient dispositif et végétation] + - [PF_DIAG_FRANCHISSABILITE, Franchissabilité, Estimation de la franchissabilité de l'ouvrage pour les animaux] + - [PF_DIAG_INTERET_FAUNE, Intérêt pour les espèces cibles, Intérêt pour les espèces cibles] - schema_code: ref_nom.nomenclature defaults: source: SIPAF @@ -149,4 +152,26 @@ items: - [PF_DIAG_CLOTURES_GUIDAGE_ETAT, NOJ, Non Jo., Non jointive, Non jointive] - [PF_DIAG_CLOTURES_GUIDAGE_ETAT, AUT, Aut., Autre (préciser), Autre (préciser)] - + - [PF_DIAG_AMENAGEMENT_VEGETATION_TYPE, NU, Nu, Sol nu, Sol nu] + - [PF_DIAG_AMENAGEMENT_VEGETATION_TYPE, HER, Herb.,Herbacé (<1m), Herbacé (<1m)] + - [PF_DIAG_AMENAGEMENT_VEGETATION_TYPE, BUI, Buis., Buissonant arbustif (1-3m), Buissonant arbustif (1-3m)] + - [PF_DIAG_AMENAGEMENT_VEGETATION_TYPE, ARB, Arb., Arboré (>3m), Arboré (>3m)] + + - [PF_DIAG_AMENAGEMENT_VEGETATION_COUVERT, "1", 0-25 , 0-25 %, 0-25 %] + - [PF_DIAG_AMENAGEMENT_VEGETATION_COUVERT, "2", 25-50, 25-50 %, 25-50 %] + - [PF_DIAG_AMENAGEMENT_VEGETATION_COUVERT, "3", 50-75, 50-75 %, 50-75 %] + - [PF_DIAG_AMENAGEMENT_VEGETATION_COUVERT, "4", 75-100, 75-100 %, 75-100 %] + + - [PF_DIAG_AMENAGEMENT_ENTRETIENT, BON, Bon., Bonne, Bonne] + - [PF_DIAG_AMENAGEMENT_ENTRETIENT, MOY, Moy., Moyenne, Moyenne] + - [PF_DIAG_AMENAGEMENT_ENTRETIENT, OCC, Occ., Occasionelle, Occasionelle] + - [PF_DIAG_AMENAGEMENT_ENTRETIENT, NUL, Nul., Nulle, Nulle] + + - [PF_DIAG_FRANCHISSABILITE, BON, Bon., Bonne, Bonne] + - [PF_DIAG_FRANCHISSABILITE, MOY, Moy., Moyenne, Moyenne] + - [PF_DIAG_FRANCHISSABILITE, OCC, Occ., Occasionelle, Occasionelle] + - [PF_DIAG_FRANCHISSABILITE, NUL, Nul., Nulle, Nulle] + + - [PF_DIAG_INTERET_FAUNE, FAI, Fai., Faible, Faible] + - [PF_DIAG_INTERET_FAUNE, MOY, Moy., Moyen, Moyen] + - [PF_DIAG_INTERET_FAUNE, FOR, For., Fort, Fort] diff --git a/contrib/m_sipaf/config/layouts/m_sipaf.diagnostic_edit.layout.yml b/contrib/m_sipaf/config/layouts/m_sipaf.diagnostic_edit.layout.yml index 16efd4d0..8d6f5650 100644 --- a/contrib/m_sipaf/config/layouts/m_sipaf.diagnostic_edit.layout.yml +++ b/contrib/m_sipaf/config/layouts/m_sipaf.diagnostic_edit.layout.yml @@ -15,38 +15,50 @@ aliases: - date_diagnostic - id_organisme - id_role - - commentaire_diagnostic + - key: commentaire_diagnostic + type: textarea - &diag_perturbation_obstacle - - direction: row - items: - - key: nomenclatures_diagnostic_obstacle - additional_fields: - - cd_nomenclature - type: list_form - multiple: true - return_object: true - - key: obstacle_autre - hidden: __f__!data.nomenclatures_diagnostic_obstacle?.some(n => n.cd_nomenclature == 'AUT') - required: __f__data.nomenclatures_diagnostic_obstacle?.some(n => n.cd_nomenclature == 'AUT') - - direction: row - items: - - key: nomenclatures_diagnostic_perturbation - additional_fields: - - cd_nomenclature - type: list_form - multiple: true - return_object: true - - key: perturbation_autre - hidden: __f__!data.nomenclatures_diagnostic_perturbation?.some(n => n.cd_nomenclature == 'AUT') - required: __f__data.nomenclatures_diagnostic_perturbation?.some(n => n.cd_nomenclature == 'AUT') - - nomenclatures_diagnostic_ouvrage_hydrau_etat_berge - - id_nomenclature_diagnostic_ouvrage_hydrau_racc_banq - - nomenclatures_diagnostic_ouvrage_hydrau_dim - - commentaire_perturbation_obstacle + items: + - display: fieldset + title: Obstacles + direction: row + items: + - key: nomenclatures_diagnostic_obstacle + additional_fields: + - cd_nomenclature + type: list_form + multiple: true + return_object: true + - key: obstacle_autre + disabled: __f__!data.nomenclatures_diagnostic_obstacle?.some(n => n.cd_nomenclature == 'AUT') + required: __f__data.nomenclatures_diagnostic_obstacle?.some(n => n.cd_nomenclature == 'AUT') + - display: fieldset + title: perturbation + direction: row + items: + - key: nomenclatures_diagnostic_perturbation + additional_fields: + - cd_nomenclature + type: list_form + multiple: true + return_object: true + - key: perturbation_autre + disabled: __f__!data.nomenclatures_diagnostic_perturbation?.some(n => n.cd_nomenclature == 'AUT') + required: __f__data.nomenclatures_diagnostic_perturbation?.some(n => n.cd_nomenclature == 'AUT') + - display: fieldset + title: Ouvrage hydrau + items: + - nomenclatures_diagnostic_ouvrage_hydrau_etat_berge + - id_nomenclature_ouvrage_hydrau_racc_banq + - nomenclatures_diagnostic_ouvrage_hydrau_dim + - type: textarea + key: commentaire_perturbation_obstacle - &diag_amenagement - - direction: row + - title: Aménagements + display: fieldset + direction: row items: - key: nomenclatures_diagnostic_amenagement_biodiv additional_fields: @@ -57,26 +69,47 @@ aliases: - key: amenagement_biodiv_autre disabled: __f__!data.nomenclatures_diagnostic_amenagement_biodiv?.some(n => n.cd_nomenclature == 'AUT') required: __f__data.nomenclatures_diagnostic_amenagement_biodiv?.some(n => n.cd_nomenclature == 'AUT') - - items: - - key: clotures + - key: clotures + type: array + display: fieldset + items: + direction: row + items: + - id_nomenclature_clotures_guidage_type + - key: clotures_guidage_type_autre + disabled: "__f__!(u.get_cd_nomenclature(data?.id_nomenclature_clotures_guidage_type) == 'AUT')" + required: "__f__u.get_cd_nomenclature(data?.id_nomenclature_clotures_guidage_type) == 'AUT'" + - id_nomenclature_clotures_guidage_etat + - key: clotures_guidage_etat_autre + disabled: "__f__!(u.get_cd_nomenclature(data?.id_nomenclature_clotures_guidage_etat) == 'AUT')" + required: "__f__u.get_cd_nomenclature(data?.id_nomenclature_clotures_guidage_etat) == 'AUT'" + - title: Végétation + display: fieldset + items: + - key: vegetation_tablier type: array display: fieldset items: direction: row items: - - id_nomenclature_clotures_guidage_type - - key: clotures_guidage_type_autre - disabled: "__f__!(u.get_cd_nomenclature(data?.id_nomenclature_clotures_guidage_type) == 'AUT')" - required: "__f__u.get_cd_nomenclature(data?.id_nomenclature_clotures_guidage_type) == 'AUT'" - - id_nomenclature_clotures_guidage_etat - - key: clotures_guidage_etat_autre - disabled: "__f__!(u.get_cd_nomenclature(data?.id_nomenclature_clotures_guidage_etat) == 'AUT')" - required: "__f__u.get_cd_nomenclature(data?.id_nomenclature_clotures_guidage_etat) == 'AUT'" - + - id_nomenclature_vegetation_type + - id_nomenclature_vegetation_couvert + - key: vegetation_debouche + type: array + display: fieldset + items: + direction: row + items: + - id_nomenclature_vegetation_type + - id_nomenclature_vegetation_couvert + - key: commentaire_amenagement + type: textarea - &diag_synthese - items: - + - id_nomenclature_franchissabilite + - id_nomenclature_interet_faune + - key: amenagement_faire + type: textarea layout: height_auto: true @@ -85,18 +118,16 @@ layout: template_params: object_code: diagnostic layout: - overflow: true - items: - # - title: Diagnostic - # display: fieldset - # items: *diag_commons - # - title: Pertubations / Obstacles - # display: fieldset - # items: *diag_perturbation_obstacle - - title: Aménagements - display: fieldset - items: *diag_amenagement - # - title: Synthese - # display: fieldset - # items: *diag_synthese - \ No newline at end of file + - type: breadcrumbs + flex: "0" + - overflow: true + display: tabs + items: + - label: Champs communs + items: *diag_commons + - label: Perturbations / Obstacles + items: *diag_perturbation_obstacle + - label: Aménagement + items: *diag_amenagement + - label: Synthese + items: *diag_synthese diff --git a/contrib/m_sipaf/config/m_sipaf.module.yml b/contrib/m_sipaf/config/m_sipaf.module.yml index b7ad7f3a..73e17224 100644 --- a/contrib/m_sipaf/config/m_sipaf.module.yml +++ b/contrib/m_sipaf/config/m_sipaf.module.yml @@ -26,7 +26,7 @@ objects: cruved: CRUD tree: - pf: + site: diagnostic: pages_definition: From bf46d225aaca504783b1ede2ee2b989667a4b197 Mon Sep 17 00:00:00 2001 From: "joel.clement" Date: Thu, 20 Apr 2023 13:52:02 +0200 Subject: [PATCH 082/142] fix fields and tabs table --- backend/gn_modulator/module/config/utils.py | 35 ++++++++++++--------- 1 file changed, 20 insertions(+), 15 deletions(-) diff --git a/backend/gn_modulator/module/config/utils.py b/backend/gn_modulator/module/config/utils.py index 84f0ac19..7a47b8a9 100644 --- a/backend/gn_modulator/module/config/utils.py +++ b/backend/gn_modulator/module/config/utils.py @@ -369,17 +369,34 @@ def process_layout_fields(cls, module_code): context = {"module_code": module_code} for page_code, page_definition in pages.items(): keys = cls.get_layout_keys(page_definition["layout"], config_params, context, keys) + # if page_code == 'diagnostic_create': + # keyss = keys.get('m_sipaf', {}).get('diagnostic', {}).get('read') + # print('get keys from page', module_code, page_code) + # for k in sorted(keyss): + # print(f'- {k}') set_global_cache(["keys"], keys) @classmethod def get_layout_keys(cls, layout, params, context, keys): + if isinstance(layout, list): for item in layout: cls.get_layout_keys(item, params, context, keys) return keys + if isinstance(layout, dict): + if layout.get("object_code"): + context = {**context, "object_code": layout["object_code"]} + + if layout.get("type") == "form": + context = {**context, "form": True} + + if layout.get("module_code"): + context = {**context, "module_code": layout["module_code"]} + if isinstance(layout, dict) and layout.get("type") in ["dict", "array"]: + data_keys = context.get("data_keys", []) data_keys.append(layout["key"]) context = {**context, "data_keys": data_keys} @@ -388,7 +405,6 @@ def get_layout_keys(cls, layout, params, context, keys): if ( isinstance(layout, dict) and layout.get("type") == "list_form" - and layout.get("object_code") ): key_add = [] if layout.get("label_field_name"): @@ -398,14 +414,11 @@ def get_layout_keys(cls, layout, params, context, keys): if layout.get("additional_fields"): key_add += layout["additional_fields"] if key_add: + print(context.get('module_code'), context.get('object_code'), layout.get("key")) cls.get_layout_keys( key_add, params, - { - **context, - "module_code": layout.get("module_code") or context["module_code"], - "object_code": layout["object_code"], - }, + context, keys, ) if layout.get("return_object") and layout.get("additional_fields"): @@ -430,7 +443,7 @@ def get_layout_keys(cls, layout, params, context, keys): if not sm.has_property(key): # raise error ? - print(f"pb ? {sm} has no {key}") + # print(f"pb ? {sm} has no {key}") return keys if key not in object_keys["read"]: object_keys["read"].append(key) @@ -438,14 +451,6 @@ def get_layout_keys(cls, layout, params, context, keys): object_keys["write"].append(key) return keys - if layout.get("object_code"): - context = {**context, "object_code": layout["object_code"]} - - if layout.get("type") == "form": - context = {**context, "form": True} - - if layout.get("module_code"): - context = {**context, "module_code": layout["module_code"]} if layout.get("code"): template_params = {**params, **layout.get("template_params", {})} From f6632ab6747e6c9649fe91cf72c6ac54cbcb25a0 Mon Sep 17 00:00:00 2001 From: "joel.clement" Date: Thu, 20 Apr 2023 13:52:23 +0200 Subject: [PATCH 083/142] fix fields and tabs table --- frontend/app/components/base/base.scss | 8 ++- .../layout/base/layout-section.component.html | 24 +++++---- .../layout/base/layout.component.ts | 54 ++++++++++--------- .../object/layout-object-table.component.html | 2 +- .../object/layout-object-table.component.ts | 1 + 5 files changed, 51 insertions(+), 38 deletions(-) diff --git a/frontend/app/components/base/base.scss b/frontend/app/components/base/base.scss index e55e9d85..729574bf 100644 --- a/frontend/app/components/base/base.scss +++ b/frontend/app/components/base/base.scss @@ -15,9 +15,13 @@ // border: 1px solid black; } -.layout-tab { +.layout-tab-out { + height: 100%; + padding: 10px; +} + +.layout-tab-in { height: 100%; - // padding: 10px; } .element-container { diff --git a/frontend/app/components/layout/base/layout-section.component.html b/frontend/app/components/layout/base/layout-section.component.html index 7743cfc3..4375e1c3 100644 --- a/frontend/app/components/layout/base/layout-section.component.html +++ b/frontend/app/components/layout/base/layout-section.component.html @@ -7,7 +7,7 @@
-
- - +
+
+ + +
diff --git a/frontend/app/components/layout/base/layout.component.ts b/frontend/app/components/layout/base/layout.component.ts index 082eb72b..c56493a1 100644 --- a/frontend/app/components/layout/base/layout.component.ts +++ b/frontend/app/components/layout/base/layout.component.ts @@ -436,24 +436,10 @@ export class ModulesLayoutComponent implements OnInit { // si on a reduit la fenetre // -> on remet à 0 - const overflowStyle = {}; - if (this.computedLayout.display != 'tabs') { - overflowStyle['overflow-y'] = 'scroll'; - } if (this.docHeightSave > docHeight || !this.docHeightSave) { setTimeout(() => { - this.computedLayout.style = { - ...(this.computedLayout.style || {}), - height: '200px', - ...overflowStyle, - }; - - this.layout.style = { - ...(this.layout.style || {}), - height: `200px`, - ...overflowStyle, - }; + this.setStyleHeight(200); }, 10); } @@ -462,20 +448,38 @@ export class ModulesLayoutComponent implements OnInit { setTimeout(() => { const parent = elem.closest('div.layout-item'); const height = parent?.clientHeight; - this.layout.style = { - ...(this.layout.style || {}), - height: `${height}px`, - ...overflowStyle, - }; - this.computedLayout.style = { - ...(this.computedLayout.style || {}), - height: `${height}px`, - ...overflowStyle, - }; + this.setStyleHeight(height); }, 200); } + setStyleHeight(height) { + let overflowStyle = {}; + if (this.computedLayout.display != 'tabs') { + overflowStyle['overflow-y'] = 'scroll'; + } + let style = { + height: `${height}px`, + ...overflowStyle, + }; + this.layout.style = { + ...(this.layout.style || {}), + ...style, + }; + this.computedLayout.style = { + ...(this.computedLayout.style || {}), + ...style, + }; + + if (this.computedLayout.display == 'tabs') { + let heightTab = height - 50; + let styleTab = { + height: `${heightTab}px` + } + this.computedLayout.style_tab = this.layout.style_tab = styleTab; + } + } + /** * Pour gérer les élément dont on souhaite que la taille correspondent à la taille de la fenètre */ diff --git a/frontend/app/components/layout/object/layout-object-table.component.html b/frontend/app/components/layout/object/layout-object-table.component.html index 5f2117e3..fdef9bd0 100644 --- a/frontend/app/components/layout/object/layout-object-table.component.html +++ b/frontend/app/components/layout/object/layout-object-table.component.html @@ -1,5 +1,5 @@ -
+
diff --git a/frontend/app/components/layout/object/layout-object-table.component.ts b/frontend/app/components/layout/object/layout-object-table.component.ts index b37ca65f..6dcae1da 100644 --- a/frontend/app/components/layout/object/layout-object-table.component.ts +++ b/frontend/app/components/layout/object/layout-object-table.component.ts @@ -288,6 +288,7 @@ export class ModulesLayoutObjectTableComponent this.tableHeight = `${elem.clientHeight}px`; this.table.setHeight(elem.clientHeight); const pageSize = Math.floor((elem.clientHeight - 90) / 50); + console.log(pageSize, elem.clientHeight) if ( !this.computedLayout.page_size && From ab3acc19affd20671c1a3eaba3d5032f9c746583 Mon Sep 17 00:00:00 2001 From: "joel.clement" Date: Thu, 20 Apr 2023 13:54:05 +0200 Subject: [PATCH 084/142] lint + clean print --- backend/gn_modulator/module/config/utils.py | 14 +------------- .../app/components/layout/base/layout.component.ts | 4 ++-- .../layout/object/layout-object-table.component.ts | 1 - 3 files changed, 3 insertions(+), 16 deletions(-) diff --git a/backend/gn_modulator/module/config/utils.py b/backend/gn_modulator/module/config/utils.py index 7a47b8a9..ec7c56a9 100644 --- a/backend/gn_modulator/module/config/utils.py +++ b/backend/gn_modulator/module/config/utils.py @@ -369,17 +369,11 @@ def process_layout_fields(cls, module_code): context = {"module_code": module_code} for page_code, page_definition in pages.items(): keys = cls.get_layout_keys(page_definition["layout"], config_params, context, keys) - # if page_code == 'diagnostic_create': - # keyss = keys.get('m_sipaf', {}).get('diagnostic', {}).get('read') - # print('get keys from page', module_code, page_code) - # for k in sorted(keyss): - # print(f'- {k}') set_global_cache(["keys"], keys) @classmethod def get_layout_keys(cls, layout, params, context, keys): - if isinstance(layout, list): for item in layout: cls.get_layout_keys(item, params, context, keys) @@ -396,16 +390,12 @@ def get_layout_keys(cls, layout, params, context, keys): context = {**context, "module_code": layout["module_code"]} if isinstance(layout, dict) and layout.get("type") in ["dict", "array"]: - data_keys = context.get("data_keys", []) data_keys.append(layout["key"]) context = {**context, "data_keys": data_keys} return cls.get_layout_keys(layout["items"], params, context, keys) - if ( - isinstance(layout, dict) - and layout.get("type") == "list_form" - ): + if isinstance(layout, dict) and layout.get("type") == "list_form": key_add = [] if layout.get("label_field_name"): key_add.append(layout["label_field_name"]) @@ -414,7 +404,6 @@ def get_layout_keys(cls, layout, params, context, keys): if layout.get("additional_fields"): key_add += layout["additional_fields"] if key_add: - print(context.get('module_code'), context.get('object_code'), layout.get("key")) cls.get_layout_keys( key_add, params, @@ -451,7 +440,6 @@ def get_layout_keys(cls, layout, params, context, keys): object_keys["write"].append(key) return keys - if layout.get("code"): template_params = {**params, **layout.get("template_params", {})} layout_from_code = SchemaMethods.get_layout_from_code( diff --git a/frontend/app/components/layout/base/layout.component.ts b/frontend/app/components/layout/base/layout.component.ts index c56493a1..56a1f16e 100644 --- a/frontend/app/components/layout/base/layout.component.ts +++ b/frontend/app/components/layout/base/layout.component.ts @@ -474,8 +474,8 @@ export class ModulesLayoutComponent implements OnInit { if (this.computedLayout.display == 'tabs') { let heightTab = height - 50; let styleTab = { - height: `${heightTab}px` - } + height: `${heightTab}px`, + }; this.computedLayout.style_tab = this.layout.style_tab = styleTab; } } diff --git a/frontend/app/components/layout/object/layout-object-table.component.ts b/frontend/app/components/layout/object/layout-object-table.component.ts index 6dcae1da..b37ca65f 100644 --- a/frontend/app/components/layout/object/layout-object-table.component.ts +++ b/frontend/app/components/layout/object/layout-object-table.component.ts @@ -288,7 +288,6 @@ export class ModulesLayoutObjectTableComponent this.tableHeight = `${elem.clientHeight}px`; this.table.setHeight(elem.clientHeight); const pageSize = Math.floor((elem.clientHeight - 90) / 50); - console.log(pageSize, elem.clientHeight) if ( !this.computedLayout.page_size && From cc364df7bb50f1f541b37a0625ddcdc2e0bf106a Mon Sep 17 00:00:00 2001 From: "joel.clement" Date: Thu, 20 Apr 2023 14:11:20 +0200 Subject: [PATCH 085/142] fix migration diag --- backend/gn_modulator/blueprint.py | 14 ++------------ backend/gn_modulator/utils/commons.py | 18 ++++++++++++++++++ .../90f6e5531f7c_diagnostic_m_sipaf.py | 2 +- doc/changelog.md | 14 ++++++++++++++ 4 files changed, 35 insertions(+), 13 deletions(-) diff --git a/backend/gn_modulator/blueprint.py b/backend/gn_modulator/blueprint.py index 5360fd8f..a3686b71 100644 --- a/backend/gn_modulator/blueprint.py +++ b/backend/gn_modulator/blueprint.py @@ -8,6 +8,7 @@ from gn_modulator import init_gn_modulator from gn_modulator.utils.api import process_dict_path from gn_modulator.utils.errors import get_errors, errors_txt +from gn_modulator.utils.commons import test_is_app_running from gn_modulator import MODULE_CODE from geonature.core.gn_permissions.decorators import check_cruved_scope from geonature.core.gn_commons.models.base import TModules @@ -33,19 +34,8 @@ def set_current_module(endpoint, values): ) -# On teste sys.argv pour éviter de charger les définitions -# si on est dans le cadre d'une commande -# On initialise dans le cadre d'une application lancée avec -# - gunicorn -# - celery -# - pytest -# - flask run -# - geonature run -test_init = any(sys.argv[0].endswith(x) for x in ["gunicorn", "celery", "pytest"]) or ( - len(sys.argv) >= 2 and sys.argv[1] == "run" -) -if test_init: +if test_is_app_running(): init_gn_modulator() if get_errors(): print(f"\n{errors_txt()}") diff --git a/backend/gn_modulator/utils/commons.py b/backend/gn_modulator/utils/commons.py index 6dd62587..0a3ddbed 100644 --- a/backend/gn_modulator/utils/commons.py +++ b/backend/gn_modulator/utils/commons.py @@ -4,6 +4,7 @@ import unicodedata +import sys from importlib import import_module @@ -79,3 +80,20 @@ def getAttr(obj, path, index=0): path_cur = path[index] cur = obj[path_cur] return getAttr(cur, path, index + 1) + +def test_is_app_running(): + """ + On teste sys.argv pour éviter de charger les définitions + si on est dans le cadre d'une commande + On initialise dans le cadre d'une application lancée avec + - gunicorn + - celery + - pytest + - flask run + - geonature run + """ + + + return any(sys.argv[0].endswith(x) for x in ["gunicorn", "celery", "pytest"]) or ( + len(sys.argv) >= 2 and sys.argv[1] == "run" + ) diff --git a/contrib/m_sipaf/backend/m_sipaf/migrations/versions/90f6e5531f7c_diagnostic_m_sipaf.py b/contrib/m_sipaf/backend/m_sipaf/migrations/versions/90f6e5531f7c_diagnostic_m_sipaf.py index 3743929e..d356ebc5 100644 --- a/contrib/m_sipaf/backend/m_sipaf/migrations/versions/90f6e5531f7c_diagnostic_m_sipaf.py +++ b/contrib/m_sipaf/backend/m_sipaf/migrations/versions/90f6e5531f7c_diagnostic_m_sipaf.py @@ -29,7 +29,7 @@ def upgrade(): def downgrade(): if_exists = "" - # if_exists = "IF EXISTS" + if_exists = "IF EXISTS" op.execute( f""" DROP TABLE {if_exists} pr_sipaf.cor_diag_nomenclature_obstacle; diff --git a/doc/changelog.md b/doc/changelog.md index 503430af..4907cfaf 100644 --- a/doc/changelog.md +++ b/doc/changelog.md @@ -26,6 +26,20 @@ - [ ] amélioration du composant list_form - [ ] ajout diagnostic sipaf +**⚠️ Notes de version** + +- Mettre à jour la base + +``` +geonature db autoupgrade +``` + +- Mettre à jour les `features` de `m_sipaf` + +``` +geonature modulator features m_sipaf.pf +``` + ## 1.0.5 (13-03-2023) From fa50c83da210d891d37a02d60114ceb7549f4a97 Mon Sep 17 00:00:00 2001 From: "joel.clement" Date: Thu, 20 Apr 2023 14:18:32 +0200 Subject: [PATCH 086/142] lint --- backend/gn_modulator/blueprint.py | 1 - backend/gn_modulator/utils/commons.py | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/backend/gn_modulator/blueprint.py b/backend/gn_modulator/blueprint.py index a3686b71..08ceba5c 100644 --- a/backend/gn_modulator/blueprint.py +++ b/backend/gn_modulator/blueprint.py @@ -34,7 +34,6 @@ def set_current_module(endpoint, values): ) - if test_is_app_running(): init_gn_modulator() if get_errors(): diff --git a/backend/gn_modulator/utils/commons.py b/backend/gn_modulator/utils/commons.py index 0a3ddbed..9087c431 100644 --- a/backend/gn_modulator/utils/commons.py +++ b/backend/gn_modulator/utils/commons.py @@ -81,6 +81,7 @@ def getAttr(obj, path, index=0): cur = obj[path_cur] return getAttr(cur, path, index + 1) + def test_is_app_running(): """ On teste sys.argv pour éviter de charger les définitions @@ -93,7 +94,6 @@ def test_is_app_running(): - geonature run """ - return any(sys.argv[0].endswith(x) for x in ["gunicorn", "celery", "pytest"]) or ( - len(sys.argv) >= 2 and sys.argv[1] == "run" + len(sys.argv) >= 2 and sys.argv[1] == "run" ) From f5855b3521ef791259e41c3bf3b0ec98bfe88001 Mon Sep 17 00:00:00 2001 From: "joel.clement" Date: Thu, 20 Apr 2023 14:23:49 +0200 Subject: [PATCH 087/142] ne plus cacher loption update --- contrib/m_sipaf/config/layouts/m_sipaf.site_list.layout.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/contrib/m_sipaf/config/layouts/m_sipaf.site_list.layout.yml b/contrib/m_sipaf/config/layouts/m_sipaf.site_list.layout.yml index e3ca316f..176cfe67 100644 --- a/contrib/m_sipaf/config/layouts/m_sipaf.site_list.layout.yml +++ b/contrib/m_sipaf/config/layouts/m_sipaf.site_list.layout.yml @@ -68,8 +68,8 @@ layout: # width: 1200px items: type: import - hidden_options: - - enable_update + # hidden_options: + # - enable_update flex: "0" - type: object From c528a0673cf764c06b8341e03a3ea44fe2e46e8f Mon Sep 17 00:00:00 2001 From: "joel.clement" Date: Thu, 20 Apr 2023 17:12:42 +0200 Subject: [PATCH 088/142] modal delete --- .../nomenclature/ref_nom.nomenclature.schema.yml | 1 + config/layouts/tests/test_list_form.layout.yml | 1 - .../layouts/utils/utils.buttons_form.layout.yml | 16 +--------------- .../layouts/utils/utils.modal_delete.layout.yml | 10 +++++----- 4 files changed, 7 insertions(+), 21 deletions(-) diff --git a/config/definitions/utils/nomenclature/ref_nom.nomenclature.schema.yml b/config/definitions/utils/nomenclature/ref_nom.nomenclature.schema.yml index bec3c5d1..c95e8d48 100644 --- a/config/definitions/utils/nomenclature/ref_nom.nomenclature.schema.yml +++ b/config/definitions/utils/nomenclature/ref_nom.nomenclature.schema.yml @@ -26,5 +26,6 @@ meta: - nomenclature_type.mnemonique - nomenclature_type.label_fr label_field_name: label_fr + title_field_name: definition_fr relations: - nomenclature_type diff --git a/config/layouts/tests/test_list_form.layout.yml b/config/layouts/tests/test_list_form.layout.yml index 82ed3241..72cda52f 100644 --- a/config/layouts/tests/test_list_form.layout.yml +++ b/config/layouts/tests/test_list_form.layout.yml @@ -77,7 +77,6 @@ layout: flex: 1 - display: tabs flex: 2 - selected_tab: advance items: - label: basique items: *set_basique diff --git a/config/layouts/utils/utils.buttons_form.layout.yml b/config/layouts/utils/utils.buttons_form.layout.yml index ffd08971..e3f3a0fa 100644 --- a/config/layouts/utils/utils.buttons_form.layout.yml +++ b/config/layouts/utils/utils.buttons_form.layout.yml @@ -31,18 +31,4 @@ layout: action: type: modal modal_name: delete - - type: modal - modal_name: delete - title: Confirmer la suppression de l'élément - direction: row - items: - - type: button - title: Suppression - action: delete - icon: delete - color: warn - - type: button - title: Annuler - action: close - icon: refresh - color: primary + - code: utils.modal_delete diff --git a/config/layouts/utils/utils.modal_delete.layout.yml b/config/layouts/utils/utils.modal_delete.layout.yml index 1e422e5b..56645ec5 100644 --- a/config/layouts/utils/utils.modal_delete.layout.yml +++ b/config/layouts/utils/utils.modal_delete.layout.yml @@ -8,13 +8,13 @@ layout: title: __f__`Confirmer la suppression ${o.du_label(x)} ${o.data_label(x)}` direction: row items: - - type: button - title: Suppression - action: delete - icon: delete - color: warn - type: button title: Annuler action: close icon: refresh color: primary + - type: button + title: Suppression + action: delete + icon: delete + color: warn From b1cf08b1c8a49ccac5472cf65873d9085cb92856 Mon Sep 17 00:00:00 2001 From: "joel.clement" Date: Thu, 20 Apr 2023 17:14:01 +0200 Subject: [PATCH 089/142] lazy loading tabs fix #38 --- .../layout/base/layout-section.component.html | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/frontend/app/components/layout/base/layout-section.component.html b/frontend/app/components/layout/base/layout-section.component.html index 4375e1c3..dc074cb5 100644 --- a/frontend/app/components/layout/base/layout-section.component.html +++ b/frontend/app/components/layout/base/layout-section.component.html @@ -46,20 +46,20 @@ class="layout-section" #tabGroup > -
-
- - + +
+
+ + +
-
+ From 96854d3f33035a546b6e71867d6ddf3419dc35e8 Mon Sep 17 00:00:00 2001 From: "joel.clement" Date: Tue, 25 Apr 2023 15:06:25 +0200 Subject: [PATCH 090/142] git fix update & is_new_data --- backend/gn_modulator/module/config/utils.py | 113 ++++++++++-------- .../gn_modulator/routes/utils/repository.py | 3 + .../gn_modulator/schema/repositories/base.py | 18 ++- .../gn_modulator/schema/repositories/utils.py | 102 ++++------------ backend/gn_modulator/schema/serializers.py | 18 ++- 5 files changed, 120 insertions(+), 134 deletions(-) diff --git a/backend/gn_modulator/module/config/utils.py b/backend/gn_modulator/module/config/utils.py index ec7c56a9..be3ddf37 100644 --- a/backend/gn_modulator/module/config/utils.py +++ b/backend/gn_modulator/module/config/utils.py @@ -359,7 +359,6 @@ def add_basic_fields(cls, module_code, object_code): @classmethod def process_layout_fields(cls, module_code): - keys = get_global_cache(["keys"], {}) module_config = cls.module_config(module_code) pages = module_config.get("pages", {}) @@ -367,35 +366,42 @@ def process_layout_fields(cls, module_code): config_defaults = module_config.get("config_defaults", {}) config_params = {**config_defaults, **config_params} context = {"module_code": module_code} - for page_code, page_definition in pages.items(): - keys = cls.get_layout_keys(page_definition["layout"], config_params, context, keys) - - set_global_cache(["keys"], keys) + for page_code in pages: + cls.get_layout_keys(pages[page_code]["layout"], config_params, context) @classmethod - def get_layout_keys(cls, layout, params, context, keys): + def get_layout_keys(cls, layout, params, context): + # if isinstance(layout, list): for item in layout: - cls.get_layout_keys(item, params, context, keys) - return keys + cls.get_layout_keys(item, params, context) + return + + # ajout d'une clé + if isinstance(layout, str): + return cls.add_key(context, layout) + + if layout.get("key") and layout.get("type") not in ["dict", "array"]: + cls.add_key(context, layout["key"]) - if isinstance(layout, dict): - if layout.get("object_code"): - context = {**context, "object_code": layout["object_code"]} + if layout.get("object_code"): + context = {**context, "object_code": layout["object_code"]} - if layout.get("type") == "form": - context = {**context, "form": True} + if layout.get("type") == "form": + context = {**context, "form": True} - if layout.get("module_code"): - context = {**context, "module_code": layout["module_code"]} + if layout.get("module_code"): + context = {**context, "module_code": layout["module_code"]} + # traitement dict array if isinstance(layout, dict) and layout.get("type") in ["dict", "array"]: data_keys = context.get("data_keys", []) data_keys.append(layout["key"]) context = {**context, "data_keys": data_keys} - return cls.get_layout_keys(layout["items"], params, context, keys) + return cls.get_layout_keys(layout["items"], params, context) - if isinstance(layout, dict) and layout.get("type") == "list_form": + # traitement list_form + if layout.get("type") == "list_form": key_add = [] if layout.get("label_field_name"): key_add.append(layout["label_field_name"]) @@ -407,49 +413,62 @@ def get_layout_keys(cls, layout, params, context, keys): cls.get_layout_keys( key_add, params, - context, - keys, + {**context, "data_keys": [*context.get("data_keys", []), layout["key"]]}, ) - if layout.get("return_object") and layout.get("additional_fields"): + if ( + layout.get("return_object") + and layout.get("additional_fields") + and not context.get("form") + ): additional_keys = list( map(lambda x: f"{layout['key']}.{x}", layout["additional_fields"]) ) - cls.get_layout_keys(additional_keys, params, context, keys) - - if isinstance(layout, str) or layout.get("key"): - key = layout if isinstance(layout, str) else layout["key"] - if context.get("data_keys"): - key = f"{''.join(context['data_keys'])}.{key}" - module_keys = keys[context["module_code"]] = keys.get(context["module_code"], {}) - object_keys = module_keys[context["object_code"]] = module_keys.get( - context["object_code"], {"read": [], "write": []} - ) - - object_config = cls.object_config(context["module_code"], context["object_code"]) - schema_code = object_config["schema_code"] - - sm = SchemaMethods(schema_code) - - if not sm.has_property(key): - # raise error ? - # print(f"pb ? {sm} has no {key}") - return keys - if key not in object_keys["read"]: - object_keys["read"].append(key) - if context.get("form"): - object_keys["write"].append(key) - return keys + cls.get_layout_keys(additional_keys, params, context) if layout.get("code"): template_params = {**params, **layout.get("template_params", {})} layout_from_code = SchemaMethods.get_layout_from_code( layout.get("code"), template_params ) - return cls.get_layout_keys(layout_from_code, params, context, keys) + return cls.get_layout_keys(layout_from_code, params, context) if layout.get("items"): - return cls.get_layout_keys(layout.get("items"), params, context, keys) + return cls.get_layout_keys(layout.get("items"), params, context) + + @classmethod + def add_key(cls, context, key): + keys = get_global_cache(["keys"]) + if context.get("data_keys"): + key = f"{''.join(context['data_keys'])}.{key}" + + module_keys = keys[context["module_code"]] = keys.get(context["module_code"], {}) + object_keys = module_keys[context["object_code"]] = module_keys.get( + context["object_code"], {"read": [], "write": []} + ) + + object_config = cls.object_config(context["module_code"], context["object_code"]) + schema_code = object_config["schema_code"] + + sm = SchemaMethods(schema_code) + + if not sm.has_property(key): + # raise error ? + print(f"pb ? {sm} has no {key}") + return keys + # ajout en lecture + if key not in object_keys["read"]: + object_keys["read"].append(key) + + # ajout en ecriture + if context.get("form"): + # key si relationship + write_key = key + if sm.is_relationship(key): + rel = SchemaMethods(sm.property(key)["schema_code"]) + write_key = f"{key}.{rel.pk_field_name()}" + if write_key not in object_keys["write"]: + object_keys["write"].append(write_key) return keys @classmethod diff --git a/backend/gn_modulator/routes/utils/repository.py b/backend/gn_modulator/routes/utils/repository.py index 9fb8db48..2e2ed230 100644 --- a/backend/gn_modulator/routes/utils/repository.py +++ b/backend/gn_modulator/routes/utils/repository.py @@ -119,6 +119,9 @@ def patch_rest(module_code, object_code, value): except sm.errors.SchemaUnsufficientCruvedRigth as e: return "Erreur Cruved : {}".format(str(e)), 403 + except Exception as e: + print(e) + raise (e) return sm.serialize(m, fields=params.get("fields"), as_geojson=params.get("as_geojson")) diff --git a/backend/gn_modulator/schema/repositories/base.py b/backend/gn_modulator/schema/repositories/base.py index 46d3e860..78c8c41b 100644 --- a/backend/gn_modulator/schema/repositories/base.py +++ b/backend/gn_modulator/schema/repositories/base.py @@ -108,11 +108,22 @@ def is_new_data(self, model, data): if model is None and data is not None: return True + # data_fields = self.get_data_fields(data) + # data_db = m = self.serialize(model, fields=fields)[key] + if isinstance(data, dict) and not isinstance(model, dict): for key, data_value in data.items(): if not hasattr(model, key): - return True - m = self.serialize(model, fields=[key])[key] + continue + fields = [key] + if self.is_relation_1_n(key) or self.is_relation_n_n(key): + fields = [] + for item in data_value: + for k in item: + kk = f"{key}.{k}" + if kk not in fields: + fields.append(kk) + m = self.serialize(model, fields=fields)[key] if self.is_new_data(m, data_value): return True return False @@ -165,7 +176,6 @@ def update_row( # TODO deserialiser """ - self.validate_data(data, check_required=False) m = self.get_row( @@ -178,10 +188,10 @@ def update_row( ).one() if not self.is_new_data(m, data): + print("not new") return m, False db.session.flush() - self.unserialize(m, data, authorized_write_fields) if commit: diff --git a/backend/gn_modulator/schema/repositories/utils.py b/backend/gn_modulator/schema/repositories/utils.py index 8ed324b0..abb83faf 100644 --- a/backend/gn_modulator/schema/repositories/utils.py +++ b/backend/gn_modulator/schema/repositories/utils.py @@ -24,22 +24,24 @@ def get_query_cache(self, query, key): return None return query._cache.get(key) - def process_custom_getattr_res(self, res, query, only_fields=[]): + def process_custom_getattr_res(self, res, query, field_name, index, only_fields=[]): # si c'est une propriété - if not res["is_relationship"]: + fields = field_name.split(".") + is_relationship = self.is_val_relationship(res["val"]) + is_last_field = index == len(fields) - 1 + + if not is_relationship: # on ne peut pas avoir de field apres une propriété - if not res["is_last_field"]: - raise Exception( - f"pb fields {res['field_name']}, il ne devrait plus rester de champs" - ) + if not is_last_field: + raise Exception(f"pb fields {field_name}, il ne devrait plus rester de champs") return res["val"], query - if not res["is_last_field"]: + if not is_last_field: return self.custom_getattr( res["relation_alias"], - res["field_name"], - index=res["index"] + 1, + field_name, + index=index + 1, query=query, only_fields=only_fields, ) @@ -92,6 +94,9 @@ def eager_load_only(self, field_name, query, only_fields, index): return query + def is_val_relationship(self, val): + return hasattr(val, "mapper") and hasattr(val.mapper, "entity") + def custom_getattr( self, Model, field_name, query=None, only_fields="", index=0, condition=None ): @@ -110,25 +115,25 @@ def custom_getattr( # récupération depuis le cache associé à la query res = self.get_query_cache(query, cache_key) if res: - return self.process_custom_getattr_res(res, query, only_fields) + return self.process_custom_getattr_res(res, query, field_name, index, only_fields) # si non en cache # on le calcule # dictionnaire de résultat pour le cache res = { - "field_name": field_name, - "index": index, - "is_last_field": is_last_field, + # "field_name": field_name, + # "index": index, + # "is_last_field": is_last_field, "val": getattr(Model, current_field), } - res["is_relationship"] = hasattr(res["val"], "mapper") and hasattr( - res["val"].mapper, "entity" - ) + # res["is_relationship"] = hasattr(res["val"], "mapper") and hasattr( + # res["val"].mapper, "entity" + # ) # si c'est une propriété - if res["is_relationship"]: + if self.is_val_relationship(res["val"]): res["relation_model"] = res["val"].mapper.entity res["relation_alias"] = orm.aliased(res["relation_model"]) res["val_of_type"] = res["val"].of_type(res["relation_alias"]) @@ -138,70 +143,11 @@ def custom_getattr( query = self.set_query_cache(query, cache_key, res) # chargement des champs si is last field - if res["is_relationship"] and is_last_field and only_fields: + if self.is_val_relationship(res["val"]) and is_last_field and only_fields: query = self.eager_load_only(field_name, query, only_fields, index) # mise en cache et retour - return self.process_custom_getattr_res(res, query, only_fields) - - def custom_getattr2(self, Model, field_name, query=None, condition=None, fields=None): - """ - - obselete - - getattr pour un modèle, étendu pour pouvoir traiter les 'rel.field_name' - - on utilise des alias pour pouvoir gérer les cas plus compliqués - - query pour les filtres dans les api - condition pour les filtres dans les column_properties - - exemple: - - on a deux relations de type nomenclature - et l'on souhaite filtrer la requête par rapport aux deux - - TODO gerer plusieurs '.' - exemple - http://localhost:8000/modules/schemas.sipaf.pf/rest/?page=1&page_size=13&sorters=[{%22field%22:%22id_pf%22,%22dir%22:%22asc%22}]&filters=[{%22field%22:%22areas.type.coe_type%22,%22type%22:%22=%22,%22value%22:%22DEP%22}]&fields=[%22id_pf%22,%22nom_pf%22,%22ownership%22] - """ - - if "." not in field_name: - # cas simple - model_attribute = getattr(Model, field_name) - - return model_attribute, query - - else: - # cas avec un ou plusieurs '.', recursif - - field_names = field_name.split(".") - - rel = field_names[0] - relationship = getattr(Model, rel) - - col = ".".join(field_names[1:]) - - # pour recupérer le modèle correspondant à la relation - relation_entity = relationship.mapper.entity - - if query is not None and condition is None: - # on fait un alias - relation_entity = orm.aliased(relationship.mapper.entity) - # relation_entity = relationship.mapper.entity - - if fields: - query = query.join(relation_entity, isouter=True) - else: - query = query.join(relation_entity, isouter=True) - # query = query.join(relation_entity, relationship, isouter=True) - # if fields: - # query = query.options(orm.joinedload(relationship).load_only(*fields)) - elif condition: - # TODO gérer les alias si filtres un peu plus tordus ?? - query = and_(query, relationship._query_clause_element()) - - return self.custom_getattr(relation_entity, col, query, condition) + return self.process_custom_getattr_res(res, query, field_name, index, only_fields) def get_sorters(self, Model, sort, query): order_bys = [] diff --git a/backend/gn_modulator/schema/serializers.py b/backend/gn_modulator/schema/serializers.py index e566e0ea..009b612c 100644 --- a/backend/gn_modulator/schema/serializers.py +++ b/backend/gn_modulator/schema/serializers.py @@ -195,10 +195,17 @@ def MarshmallowSchema(self, force=False): def pre_load_make_object(self_marshmallow, data, **kwargs): for key in self.pk_field_names(): if key in data and data[key] is None: - print("\nmarsh remove pk null\n", key) data.pop(key, None) - # # pour les champs null avec default defini dans les proprietés + # enleve les clés si non dans only + for k in list(data.keys()): + if self_marshmallow.only and k not in self_marshmallow.only: + print(self, "pop not in only", k) + data.pop(k) + + # # pour les champs null avec default d + # + # efini dans les proprietés # for key, column_def in self.columns().items(): # if key in data and data[key] is None and column_def.get('default'): # data.pop(key, None) @@ -422,16 +429,17 @@ def as_geojson(self, data, geometry_field_name=None): geometry = data.pop(geometry_field_name) return {"type": "Feature", "geometry": geometry, "properties": data} - def unserialize(self, m, data, autorized_write_fields=None): + def unserialize(self, m, data, authorized_write_fields=None): """ unserialize using marshmallow """ kwargs = {} - if autorized_write_fields: - kwargs = {"only": autorized_write_fields, "unknown": EXCLUDE} + if authorized_write_fields: + kwargs = {"only": authorized_write_fields, "unknown": EXCLUDE} MS = self.MarshmallowSchema() ms = MS(**kwargs) + ms.load(data, instance=m) @classmethod From 38ad71934047ed519770502e05853dad9becc065 Mon Sep 17 00:00:00 2001 From: "joel.clement" Date: Tue, 25 Apr 2023 15:15:51 +0200 Subject: [PATCH 091/142] fix table css --- frontend/app/components/base/base.scss | 3 ++- .../app/components/layout/form/list-form.component.scss | 4 ++-- .../layout/object/layout-object-table.component.ts | 1 + frontend/app/services/list-form.service.ts | 1 + frontend/app/services/object.service.ts | 7 ++++--- 5 files changed, 10 insertions(+), 6 deletions(-) diff --git a/frontend/app/components/base/base.scss b/frontend/app/components/base/base.scss index 729574bf..baaada33 100644 --- a/frontend/app/components/base/base.scss +++ b/frontend/app/components/base/base.scss @@ -17,7 +17,8 @@ .layout-tab-out { height: 100%; - padding: 10px; + padding-bottom: 4px; + padding-top: 4px; } .layout-tab-in { diff --git a/frontend/app/components/layout/form/list-form.component.scss b/frontend/app/components/layout/form/list-form.component.scss index 186361d8..e6ebd72e 100644 --- a/frontend/app/components/layout/form/list-form.component.scss +++ b/frontend/app/components/layout/form/list-form.component.scss @@ -1,10 +1,10 @@ .reset-list-form-button { - font-size: 1.2em; + // font-size: 1.2em; color: gray; } :host ::ng-deep .mdc-text-field--disabled .reset-list-form-button { - font-size: 1.2em; + // font-size: 1.2em; color: lightgrey; } diff --git a/frontend/app/components/layout/object/layout-object-table.component.ts b/frontend/app/components/layout/object/layout-object-table.component.ts index b37ca65f..a09ad445 100644 --- a/frontend/app/components/layout/object/layout-object-table.component.ts +++ b/frontend/app/components/layout/object/layout-object-table.component.ts @@ -286,6 +286,7 @@ export class ModulesLayoutObjectTableComponent return; } this.tableHeight = `${elem.clientHeight}px`; + this.tableHeight = `${elem.clientHeight}px`; this.table.setHeight(elem.clientHeight); const pageSize = Math.floor((elem.clientHeight - 90) / 50); diff --git a/frontend/app/services/list-form.service.ts b/frontend/app/services/list-form.service.ts index a2f23b83..f4d3da5c 100644 --- a/frontend/app/services/list-form.service.ts +++ b/frontend/app/services/list-form.service.ts @@ -154,6 +154,7 @@ export class ListFormService { options.object_code = 'ref_nom.nomenclature'; schemaFilters.push(`nomenclature_type.mnemonique = ${options.nomenclature_type}`); options.module_code = this._mConfig.MODULE_CODE; + options.additional_fields = options.additional_fields || []; options.cache = true; } if (options.area_type) { diff --git a/frontend/app/services/object.service.ts b/frontend/app/services/object.service.ts index d370413c..460fe488 100644 --- a/frontend/app/services/object.service.ts +++ b/frontend/app/services/object.service.ts @@ -229,9 +229,10 @@ export class ModulesObjectService { const nbTotal = objectConfig.nb_total; const nbFiltered = objectConfig.nb_filtered; const labels = this.labels({ context }); - const objectTabLabel = nbTotal - ? `${utils.capitalize(labels)} (${nbFiltered}/${nbTotal})` - : `${utils.capitalize(labels)} (0)`; + const objectTabLabel = + nbFiltered == nbTotal + ? `${utils.capitalize(labels)} (${nbTotal || 0})` + : `${utils.capitalize(labels)} (${nbFiltered}/${nbTotal})`; return objectTabLabel; } From 7680daf9ff433b932697a1393569736ecd3ca6cd Mon Sep 17 00:00:00 2001 From: "joel.clement" Date: Tue, 25 Apr 2023 15:16:27 +0200 Subject: [PATCH 092/142] up diagnostics --- .../migrations/data/schema_diagnostic.sql | 31 ++++-- contrib/m_sipaf/backend/m_sipaf/models.py | 36 ++++--- contrib/m_sipaf/config/config.yml | 25 +---- .../definitions/m_sipaf.diag.schema.yml | 18 +++- .../m_sipaf.diagnostic_details.layout.yml | 36 ++++++- .../m_sipaf.diagnostic_edit.layout.yml | 52 ++++----- .../layouts/m_sipaf.site_list.layout.yml | 102 ++++++++++-------- 7 files changed, 181 insertions(+), 119 deletions(-) diff --git a/contrib/m_sipaf/backend/m_sipaf/migrations/data/schema_diagnostic.sql b/contrib/m_sipaf/backend/m_sipaf/migrations/data/schema_diagnostic.sql index 57a86076..af84c84a 100644 --- a/contrib/m_sipaf/backend/m_sipaf/migrations/data/schema_diagnostic.sql +++ b/contrib/m_sipaf/backend/m_sipaf/migrations/data/schema_diagnostic.sql @@ -15,8 +15,10 @@ CREATE TABLE pr_sipaf.t_diagnostics ( commentaire_amenagement VARCHAR, id_nomenclature_amenagement_entretient INTEGER, id_nomenclature_franchissabilite INTEGER, - id_nomenclature_interet_faune INTEGER, - amenagement_faire VARCHAR + id_nomenclature_interet_petite_faune INTEGER, + id_nomenclature_interet_grande_faune INTEGER, + amenagement_faire VARCHAR, + commentaire_synthese VARCHAR ); ALTER TABLE @@ -109,8 +111,15 @@ ADD ALTER TABLE pr_sipaf.t_diagnostics ADD - CONSTRAINT fk_pr_sipaf_t_d_id_nomenclature_interet_faune FOREIGN KEY ( - id_nomenclature_interet_faune + CONSTRAINT fk_pr_sipaf_t_d_id_nomenclature_interet_petite_faune FOREIGN KEY ( + id_nomenclature_interet_petite_faune + ) REFERENCES ref_nomenclatures.t_nomenclatures (id_nomenclature) ON UPDATE CASCADE ON DELETE CASCADE; + +ALTER TABLE + pr_sipaf.t_diagnostics +ADD + CONSTRAINT fk_pr_sipaf_t_d_id_nomenclature_interet_grande_faune FOREIGN KEY ( + id_nomenclature_interet_grande_faune ) REFERENCES ref_nomenclatures.t_nomenclatures (id_nomenclature) ON UPDATE CASCADE ON DELETE CASCADE; @@ -298,9 +307,19 @@ ADD ALTER TABLE pr_sipaf.t_diagnostics ADD - CONSTRAINT check_nom_type_diag_interet_faune CHECK ( + CONSTRAINT check_nom_type_diag_interet_petite_faune CHECK ( + ref_nomenclatures.check_nomenclature_type_by_mnemonique( + id_nomenclature_interet_petite_faune, + 'PF_DIAG_INTERET_FAUNE' + ) + ) NOT VALID; + +ALTER TABLE + pr_sipaf.t_diagnostics +ADD + CONSTRAINT check_nom_type_diag_interet_grande_faune CHECK ( ref_nomenclatures.check_nomenclature_type_by_mnemonique( - id_nomenclature_interet_faune, + id_nomenclature_interet_grande_faune, 'PF_DIAG_INTERET_FAUNE' ) ) NOT VALID; diff --git a/contrib/m_sipaf/backend/m_sipaf/models.py b/contrib/m_sipaf/backend/m_sipaf/models.py index 38120bec..912ea0a1 100644 --- a/contrib/m_sipaf/backend/m_sipaf/models.py +++ b/contrib/m_sipaf/backend/m_sipaf/models.py @@ -2,7 +2,7 @@ from datetime import datetime from sqlalchemy.dialects.postgresql import UUID, JSONB -from sqlalchemy.orm import column_property +from sqlalchemy.orm import column_property, backref from sqlalchemy import ( func, literal, @@ -21,10 +21,6 @@ from pypnnomenclature.models import TNomenclatures from ref_geo.models import LAreas, LLinears, BibAreasTypes, BibLinearsTypes -# class TActors(db.Model): -# __tablename__ = "t_actors" -# __table_args__ = {"schema": "pr_sipaf"} - class CorPfNomenclatureOuvrageType(db.Model): __tablename__ = "cor_pf_nomenclature_ouvrage_type" @@ -348,7 +344,9 @@ class Diagnostic(db.Model): ), nullable=False, ) - passage_faune = db.relationship(PassageFaune, backref="diagnostics") + passage_faune = db.relationship( + PassageFaune, backref=backref("diagnostics", cascade="all,delete,delete-orphan") + ) id_role = db.Column(db.Integer, db.ForeignKey("utilisateurs.t_roles.id_role")) role = db.relationship(User) @@ -403,11 +401,18 @@ class Diagnostic(db.Model): commentaire_amenagement = db.Column(db.Unicode) # synthese - id_nomenclature_interet_faune = db.Column( + id_nomenclature_interet_petite_faune = db.Column( db.Integer, db.ForeignKey("ref_nomenclatures.t_nomenclatures.id_nomenclature") ) - nomenclature_interet_faune = db.relationship( - TNomenclatures, foreign_keys=[id_nomenclature_interet_faune] + nomenclature_interet_petite_faune = db.relationship( + TNomenclatures, foreign_keys=[id_nomenclature_interet_petite_faune] + ) + + id_nomenclature_interet_grande_faune = db.Column( + db.Integer, db.ForeignKey("ref_nomenclatures.t_nomenclatures.id_nomenclature") + ) + nomenclature_interet_grande_faune = db.relationship( + TNomenclatures, foreign_keys=[id_nomenclature_interet_grande_faune] ) id_nomenclature_franchissabilite = db.Column( @@ -418,6 +423,7 @@ class Diagnostic(db.Model): ) amenagement_faire = db.Column(db.Unicode) + commentaire_synthese = db.Column(db.Unicode) class DiagnosticCloture(db.Model): @@ -442,7 +448,9 @@ class DiagnosticCloture(db.Model): clotures_guidage_type_autre = db.Column(db.Unicode) clotures_guidage_etat_autre = db.Column(db.Unicode) - diagnostic = db.relationship(Diagnostic, backref="clotures") + diagnostic = db.relationship( + Diagnostic, backref=backref("clotures", cascade="all,delete,delete-orphan") + ) nomenclature_clotures_guidage_etat = db.relationship( TNomenclatures, foreign_keys=[id_nomenclature_clotures_guidage_etat] @@ -471,7 +479,9 @@ class DiagnosticVegetationTablier(db.Model): nullable=False, ) - diagnostic = db.relationship(Diagnostic, backref="vegetation_tablier") + diagnostic = db.relationship( + Diagnostic, backref=backref("vegetation_tablier", cascade="all,delete,delete-orphan") + ) nomenclature_vegetation_type = db.relationship( TNomenclatures, foreign_keys=[id_nomenclature_vegetation_type] @@ -501,7 +511,9 @@ class DiagnosticVegetationDebouche(db.Model): nullable=False, ) - diagnostic = db.relationship(Diagnostic, backref="vegetation_debouche") + diagnostic = db.relationship( + Diagnostic, backref=backref("vegetation_debouche", cascade="all,delete,delete-orphan") + ) nomenclature_vegetation_type = db.relationship( TNomenclatures, foreign_keys=[id_nomenclature_vegetation_type] diff --git a/contrib/m_sipaf/config/config.yml b/contrib/m_sipaf/config/config.yml index 8c192174..11bfdea9 100644 --- a/contrib/m_sipaf/config/config.yml +++ b/contrib/m_sipaf/config/config.yml @@ -353,23 +353,8 @@ site_form_fields: -diagnostic_details_fields: - overflow: true - items: - - passage_faune.code_passage_faune - - date_diagnostic - - organisme.nom_organisme - - role.nom_complet - - direction: row - items: - - nomenclatures_diagnostic_obstacle.label_fr - - key: obstacle_autre - hidden: __f__!data.nomenclatures_diagnostic_obstacle?.some(n => n.cd_nomenclature == 'AUT') - - direction: row - items: - - nomenclatures_diagnostic_perturbation.label_fr - - key: perturbation_autre - hidden: __f__!data.nomenclatures_diagnostic_perturbation?.some(n => n.cd_nomenclature == 'AUT') - - nomenclatures_diagnostic_ouvrage_hydrau_etat_berge.label_fr - - nomenclature_diagnostic_ouvrage_hydrau_raccordement_banquette.label_fr - - nomenclatures_diagnostic_ouvrage_hydrau_dim.label_fr +diagnostic_table_fields: + - date_diagnostic + - passage_faune.code_passage_faune + - organisme.nom_organisme + - role.nom_complet diff --git a/contrib/m_sipaf/config/definitions/m_sipaf.diag.schema.yml b/contrib/m_sipaf/config/definitions/m_sipaf.diag.schema.yml index 3940a975..56acfbe0 100644 --- a/contrib/m_sipaf/config/definitions/m_sipaf.diag.schema.yml +++ b/contrib/m_sipaf/config/definitions/m_sipaf.diag.schema.yml @@ -17,6 +17,8 @@ meta: unique_in_db: true properties: # commons + id_passage_faune: + title: Passage faune date_diagnostic: title: Date description: Date d'établissemnt du diagnostic de fonctionalité @@ -69,14 +71,24 @@ properties: vegetation_debouche: title: Vegetation (débouchés) description: Végétation présente sur aux débouchés de l'ouvrage + commentaire_amenagement: + title: Commentaire (aménagement) + description: champs libre pour information complémentaire indicatives # synthese id_nomenclature_franchissabilite: title: Franchissibilité description: Estimation de la franchissabilité de l'ouvrage pour les animaux - id_nomenclature_interet_faune: - title: Intérêt - description: Intérêt pour les espèces cibles + id_nomenclature_interet_petite_faune: + title: Intérêt petite_faune + description: Intérêt pour la petite_faune + id_nomenclature_interet_grande_faune: + title: Intérêt grande_faune + description: Intérêt pour la grande_faune + commentaire_synthese: + title: Commentaire (synthèse) + description: champs libre pour information complémentaire indicatives + amenagement_faire: title: Aménagements à faire description: Détails aménagements ou autres mesures à réaliser pour rendre l'ouvrage plus fonctionel diff --git a/contrib/m_sipaf/config/layouts/m_sipaf.diagnostic_details.layout.yml b/contrib/m_sipaf/config/layouts/m_sipaf.diagnostic_details.layout.yml index 8062b711..75ec6933 100644 --- a/contrib/m_sipaf/config/layouts/m_sipaf.diagnostic_details.layout.yml +++ b/contrib/m_sipaf/config/layouts/m_sipaf.diagnostic_details.layout.yml @@ -3,10 +3,44 @@ code: m_sipaf.diagnostic_details title: page details diagnostic description: page details diagnostic +aliases: +- &diag_commons + - hidden: true + items: + - id_diagnostic + - key: id_passage_faune + default: __f__context.params.id_passage_faune + - display: row + items: + - passage_faune.code_passage_faune + - passage_faune.nom_usuel_passage_faune + - date_diagnostic + - organisme.nom_organisme + - role.nom_complet + - commentaire_diagnostic + +- &diag_perturbation_obstacle +- &diag_amenagement +- &diag_synthese + + layout: height_auto: true items: + - type: breadcrumbs + flex: "0" - code: utils.object_details template_params: object_code: diagnostic - layout: __DIAGNOSTIC_DETAILS_FIELDS__ + layout: + display: tabs + overflow: true + items: + - label: Champs communs + items: *diag_commons + - label: Perturbations / Obstacles + items: *diag_perturbation_obstacle + - label: Aménagement + items: *diag_amenagement + - label: Synthese + items: *diag_synthese diff --git a/contrib/m_sipaf/config/layouts/m_sipaf.diagnostic_edit.layout.yml b/contrib/m_sipaf/config/layouts/m_sipaf.diagnostic_edit.layout.yml index 8d6f5650..5ed78476 100644 --- a/contrib/m_sipaf/config/layouts/m_sipaf.diagnostic_edit.layout.yml +++ b/contrib/m_sipaf/config/layouts/m_sipaf.diagnostic_edit.layout.yml @@ -20,8 +20,7 @@ aliases: - &diag_perturbation_obstacle items: - - display: fieldset - title: Obstacles + - title: Obstacles direction: row items: - key: nomenclatures_diagnostic_obstacle @@ -33,8 +32,7 @@ aliases: - key: obstacle_autre disabled: __f__!data.nomenclatures_diagnostic_obstacle?.some(n => n.cd_nomenclature == 'AUT') required: __f__data.nomenclatures_diagnostic_obstacle?.some(n => n.cd_nomenclature == 'AUT') - - display: fieldset - title: perturbation + - title: Perturbation direction: row items: - key: nomenclatures_diagnostic_perturbation @@ -46,8 +44,7 @@ aliases: - key: perturbation_autre disabled: __f__!data.nomenclatures_diagnostic_perturbation?.some(n => n.cd_nomenclature == 'AUT') required: __f__data.nomenclatures_diagnostic_perturbation?.some(n => n.cd_nomenclature == 'AUT') - - display: fieldset - title: Ouvrage hydrau + - title: Ouvrage hydrau items: - nomenclatures_diagnostic_ouvrage_hydrau_etat_berge - id_nomenclature_ouvrage_hydrau_racc_banq @@ -57,7 +54,6 @@ aliases: - &diag_amenagement - title: Aménagements - display: fieldset direction: row items: - key: nomenclatures_diagnostic_amenagement_biodiv @@ -71,7 +67,6 @@ aliases: required: __f__data.nomenclatures_diagnostic_amenagement_biodiv?.some(n => n.cd_nomenclature == 'AUT') - key: clotures type: array - display: fieldset items: direction: row items: @@ -83,34 +78,31 @@ aliases: - key: clotures_guidage_etat_autre disabled: "__f__!(u.get_cd_nomenclature(data?.id_nomenclature_clotures_guidage_etat) == 'AUT')" required: "__f__u.get_cd_nomenclature(data?.id_nomenclature_clotures_guidage_etat) == 'AUT'" - - title: Végétation - display: fieldset + - key: vegetation_tablier + type: array items: - - key: vegetation_tablier - type: array - display: fieldset - items: - direction: row - items: - - id_nomenclature_vegetation_type - - id_nomenclature_vegetation_couvert - - key: vegetation_debouche - type: array - display: fieldset - items: - direction: row - items: - - id_nomenclature_vegetation_type - - id_nomenclature_vegetation_couvert - - key: commentaire_amenagement - type: textarea + direction: row + items: + - id_nomenclature_vegetation_type + - id_nomenclature_vegetation_couvert + - key: vegetation_debouche + type: array + items: + direction: row + items: + - id_nomenclature_vegetation_type + - id_nomenclature_vegetation_couvert + - key: commentaire_amenagement + type: textarea - &diag_synthese - id_nomenclature_franchissabilite - - id_nomenclature_interet_faune + - id_nomenclature_interet_petite_faune + - id_nomenclature_interet_grande_faune - key: amenagement_faire type: textarea - + - key: commentaire_synthese + type: textarea layout: height_auto: true items: diff --git a/contrib/m_sipaf/config/layouts/m_sipaf.site_list.layout.yml b/contrib/m_sipaf/config/layouts/m_sipaf.site_list.layout.yml index 176cfe67..d4fce92a 100644 --- a/contrib/m_sipaf/config/layouts/m_sipaf.site_list.layout.yml +++ b/contrib/m_sipaf/config/layouts/m_sipaf.site_list.layout.yml @@ -25,54 +25,62 @@ layout: items: - type: breadcrumbs flex: "0" - - direction: row + - display: tabs + overflow: true items: - - code: utils.button_create - flex: "0" - - type: button - description: Exporter les passages à faune - color: primary - flex: "0" - icon: download - hidden: __f__!o.is_action_allowed(x, 'E') - action: - type: modal - modal_name: exports - - type: modal - flex: "0" - modal_name: exports + - label: __f__o.tab_label(x) + object_code: site items: - - title: Exports pour les passages à faune - - type: button + - direction: row + items: + - code: utils.button_create + flex: "0" + - type: button + description: Exporter les passages à faune + color: primary + flex: "0" + icon: download + hidden: __f__!o.is_action_allowed(x, 'E') + action: + type: modal + modal_name: exports + - type: modal + flex: "0" + modal_name: exports + items: + - title: Exports pour les passages à faune + - type: button + flex: "0" + title: "Export complet" + description: Télécharger les passages à faune (les filtres sont appliqués) + href: __f__o.url_export(x, 'm_sipaf.pf') + - type: button + flex: "0" + title: "Export import" + description: Export destiné à l'import (les filtres sont appliqués) + href: __f__o.url_export(x, 'm_sipaf.pf_import') + - type: button + flex: "0" + icon: upload + color: primary + description: Importer des passages à faune + action: + type: modal + modal_name: import + hidden: __f__!o.is_action_allowed(x, 'I') + - type: modal + modal_name: import + items: + type: import flex: "0" - title: "Export complet" - description: Télécharger les passages à faune (les filtres sont appliqués) - href: __f__o.url_export(x, 'm_sipaf.pf') - - type: button - flex: "0" - title: "Export import" - description: Export destiné à l'import (les filtres sont appliqués) - href: __f__o.url_export(x, 'm_sipaf.pf_import') - - type: button - flex: "0" - icon: upload - color: primary - description: Importer des passages à faune - action: - type: modal - modal_name: import - hidden: __f__!o.is_action_allowed(x, 'I') - - type: modal - modal_name: import - # style: - # width: 1200px + - type: object + display: table + sort: code_passage_faune + items: __SITE_TABLE_FIELDS__ + - object_code: diagnostic + label: __f__o.tab_label(x) items: - type: import - # hidden_options: - # - enable_update - - flex: "0" - - type: object - display: table - sort: code_passage_faune - items: __SITE_TABLE_FIELDS__ + - type: object + display: table + sort: date_diagnostic- + items: __DIAGNOSTIC_TABLE_FIELDS__ From 14c6cd9a4368bf5828c026d3b80a6eb52ad4b6dd Mon Sep 17 00:00:00 2001 From: "joel.clement" Date: Tue, 25 Apr 2023 16:59:09 +0200 Subject: [PATCH 093/142] fix eager_load_only --- .../gn_modulator/schema/repositories/utils.py | 5 +- contrib/m_sipaf/backend/m_sipaf/models.py | 2 +- .../m_sipaf.diagnostic_details.layout.yml | 70 +++++++++++++++++-- 3 files changed, 71 insertions(+), 6 deletions(-) diff --git a/backend/gn_modulator/schema/repositories/utils.py b/backend/gn_modulator/schema/repositories/utils.py index abb83faf..a8336c27 100644 --- a/backend/gn_modulator/schema/repositories/utils.py +++ b/backend/gn_modulator/schema/repositories/utils.py @@ -87,7 +87,10 @@ def eager_load_only(self, field_name, query, only_fields, index): if not only_columns_i: rel_schema_code = self.property(key_cache_eager)["schema_code"] rel = self.cls(rel_schema_code) - only_columns_i = [getattr(cache["relation_alias"], rel.pk_field_name())] + only_columns_i = [ + getattr(cache["relation_alias"], pk_field_name) + for pk_field_name in rel.pk_field_names() + ] # chargement de relation en eager et choix des champs query = query.options(orm.contains_eager(*eagers).load_only(*only_columns_i)) diff --git a/contrib/m_sipaf/backend/m_sipaf/models.py b/contrib/m_sipaf/backend/m_sipaf/models.py index 912ea0a1..6ce3d605 100644 --- a/contrib/m_sipaf/backend/m_sipaf/models.py +++ b/contrib/m_sipaf/backend/m_sipaf/models.py @@ -363,7 +363,7 @@ class Diagnostic(db.Model): id_nomenclature_ouvrage_hydrau_racc_banq = db.Column( db.Integer, db.ForeignKey("ref_nomenclatures.t_nomenclatures.id_nomenclature") ) - nomenclature_diagnostic_ouvrage_hydrau_raccordement_banquette = db.relationship( + nomenclature_ouvrage_hydrau_racc_banq = db.relationship( TNomenclatures, foreign_keys=[id_nomenclature_ouvrage_hydrau_racc_banq], ) diff --git a/contrib/m_sipaf/config/layouts/m_sipaf.diagnostic_details.layout.yml b/contrib/m_sipaf/config/layouts/m_sipaf.diagnostic_details.layout.yml index 75ec6933..7c717062 100644 --- a/contrib/m_sipaf/config/layouts/m_sipaf.diagnostic_details.layout.yml +++ b/contrib/m_sipaf/config/layouts/m_sipaf.diagnostic_details.layout.yml @@ -4,7 +4,7 @@ title: page details diagnostic description: page details diagnostic aliases: -- &diag_commons + - &diag_commons - hidden: true items: - id_diagnostic @@ -19,10 +19,71 @@ aliases: - role.nom_complet - commentaire_diagnostic -- &diag_perturbation_obstacle -- &diag_amenagement -- &diag_synthese + - &diag_perturbation_obstacle + - title: Obstacles + items: + - nomenclatures_diagnostic_obstacle.label_fr + - key: nomenclatures_diagnostic_obstacle.cd_nomenclature + hidden: true + - key: obstacle_autre + hidden: __f__!data.nomenclatures_diagnostic_obstacle?.some(n => n.cd_nomenclature == 'AUT') + - title: Perturbation + items: + - nomenclatures_diagnostic_perturbation.label_fr + - key: nomenclatures_diagnostic_perturbation.cd_nomenclature + hidden: true + - key: perturbation_autre + hidden: __f__!data.nomenclatures_diagnostic_perturbation?.some(n => n.cd_nomenclature == 'AUT') + + - title: Ouvrage hydrau + items: + - nomenclatures_diagnostic_ouvrage_hydrau_etat_berge.label_fr + - nomenclature_ouvrage_hydrau_racc_banq.label_fr + - nomenclatures_diagnostic_ouvrage_hydrau_dim.label_fr + - commentaire_perturbation_obstacle + + - &diag_amenagement + - title: Aménagements + direction: row + items: + - nomenclatures_diagnostic_amenagement_biodiv.label_fr + - key: nomenclatures_diagnostic_amenagement_biodiv.cd_nomenclature + hidden: true + - key: amenagement_biodiv_autre + hidden: __f__!data.nomenclatures_diagnostic_amenagement_biodiv?.some(n => n.cd_nomenclature == 'AUT') + - key: clotures + type: array + items: + direction: row + items: + - nomenclature_clotures_guidage_type.label_fr + - key: clotures_guidage_type_autre + hidden: "__f__!(u.get_cd_nomenclature(data?.id_nomenclature_clotures_guidage_type) == 'AUT')" + - nomenclature_clotures_guidage_etat.label_fr + - key: clotures_guidage_etat_autre + hidden: "__f__!(u.get_cd_nomenclature(data?.id_nomenclature_clotures_guidage_etat) == 'AUT')" + - key: vegetation_tablier + type: array + items: + direction: row + items: + - nomenclature_vegetation_type.label_fr + - nomenclature_vegetation_couvert.label_fr + - key: vegetation_debouche + type: array + items: + direction: row + items: + - nomenclature_vegetation_type.label_fr + - nomenclature_vegetation_couvert.label_fr + - commentaire_amenagement + - &diag_synthese + - nomenclature_franchissabilite.label_fr + - nomenclature_interet_petite_faune.label_fr + - nomenclature_interet_grande_faune.label_fr + - amenagement_faire + - commentaire_synthese layout: height_auto: true @@ -35,6 +96,7 @@ layout: layout: display: tabs overflow: true + selected_tab: Aménagement items: - label: Champs communs items: *diag_commons From 5c56e114ea65b4d046ce181de78b494049b2f7c2 Mon Sep 17 00:00:00 2001 From: "joel.clement" Date: Mon, 15 May 2023 09:35:56 +0200 Subject: [PATCH 094/142] display config error --- backend/gn_modulator/blueprint.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/backend/gn_modulator/blueprint.py b/backend/gn_modulator/blueprint.py index 08ceba5c..062b979b 100644 --- a/backend/gn_modulator/blueprint.py +++ b/backend/gn_modulator/blueprint.py @@ -53,7 +53,10 @@ def api_modules_config(config_path): # s'il y a des erreurs à l'initialisation du module => on le fait remonter if len(errors_init_module) > 0: - return f"Il y a {len(errors_init_module)} erreur(s) dans les définitions.", 500 + txt = f"Il y a {len(errors_init_module)} erreur(s) dans les définitions.
" + for error in errors_init_module: + txt += f"- {error.error_code} : {error.error_msg}
{error.file_path}" + return txt, 500 return process_dict_path( ModuleMethods.modules_config(), From d03b54a18891771da413348742a5003fedc7fc36 Mon Sep 17 00:00:00 2001 From: "joel.clement" Date: Mon, 15 May 2023 09:37:36 +0200 Subject: [PATCH 095/142] display config error --- backend/gn_modulator/blueprint.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/backend/gn_modulator/blueprint.py b/backend/gn_modulator/blueprint.py index 062b979b..24b5f243 100644 --- a/backend/gn_modulator/blueprint.py +++ b/backend/gn_modulator/blueprint.py @@ -55,7 +55,7 @@ def api_modules_config(config_path): if len(errors_init_module) > 0: txt = f"Il y a {len(errors_init_module)} erreur(s) dans les définitions.
" for error in errors_init_module: - txt += f"- {error.error_code} : {error.error_msg}
{error.file_path}" + txt += f"- {error['error_code']} : {error['error_msg']}
{error['file_path']}

" return txt, 500 return process_dict_path( From 27bdd096ee2317e2fa757a231a860be03a062cc8 Mon Sep 17 00:00:00 2001 From: "joel.clement" Date: Mon, 15 May 2023 10:17:43 +0200 Subject: [PATCH 096/142] fix search authorized keys --- backend/gn_modulator/blueprint.py | 4 +++- backend/gn_modulator/module/config/utils.py | 2 +- config/definitions/utils/ref_geo/ref_geo.area.schema.yml | 3 +++ 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/backend/gn_modulator/blueprint.py b/backend/gn_modulator/blueprint.py index 24b5f243..0e99d70e 100644 --- a/backend/gn_modulator/blueprint.py +++ b/backend/gn_modulator/blueprint.py @@ -55,7 +55,9 @@ def api_modules_config(config_path): if len(errors_init_module) > 0: txt = f"Il y a {len(errors_init_module)} erreur(s) dans les définitions.
" for error in errors_init_module: - txt += f"- {error['error_code']} : {error['error_msg']}
{error['file_path']}

" + txt += ( + f"- {error['error_code']} : {error['error_msg']}
{error['file_path']}

" + ) return txt, 500 return process_dict_path( diff --git a/backend/gn_modulator/module/config/utils.py b/backend/gn_modulator/module/config/utils.py index be3ddf37..4f9f3484 100644 --- a/backend/gn_modulator/module/config/utils.py +++ b/backend/gn_modulator/module/config/utils.py @@ -413,7 +413,7 @@ def get_layout_keys(cls, layout, params, context): cls.get_layout_keys( key_add, params, - {**context, "data_keys": [*context.get("data_keys", []), layout["key"]]}, + {**context, "data_keys": []}, ) if ( layout.get("return_object") diff --git a/config/definitions/utils/ref_geo/ref_geo.area.schema.yml b/config/definitions/utils/ref_geo/ref_geo.area.schema.yml index 6e514062..010cbaa0 100644 --- a/config/definitions/utils/ref_geo/ref_geo.area.schema.yml +++ b/config/definitions/utils/ref_geo/ref_geo.area.schema.yml @@ -14,6 +14,9 @@ meta: unique: - id_type - area_code + authorized_fields: + - name_code + - code_name properties: name_code: type: string From 4d9f592274bbc66822373e6aece3745193b3e83c Mon Sep 17 00:00:00 2001 From: "joel.clement" Date: Mon, 15 May 2023 10:30:44 +0200 Subject: [PATCH 097/142] fix communes filters utils. -> u. --- contrib/m_sipaf/config/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/m_sipaf/config/config.yml b/contrib/m_sipaf/config/config.yml index 11bfdea9..eaf0b01b 100644 --- a/contrib/m_sipaf/config/config.yml +++ b/contrib/m_sipaf/config/config.yml @@ -58,7 +58,7 @@ site_filters_fields: __f__data?.departement ? `area_code like ${data.departement.area_code}%` : data?.region - ? utils.departementsForRegion(data.region.area_code) + ? u.departementsForRegion(data.region.area_code) .map(departementCode => `area_code like ${departementCode}%`) .join(',|,') : null From b12e28e29c8e6c0c07e37a29197214bdfc1b3749 Mon Sep 17 00:00:00 2001 From: "joel.clement" Date: Tue, 30 May 2023 17:15:39 +0200 Subject: [PATCH 098/142] frontend tabs choice for lazy loading or not --- .../m_sipaf.diagnostic_edit.layout.yml | 1 + .../layout/base/layout-section.component.html | 76 ++++++++++++++----- .../layout/base/layout-section.component.ts | 2 +- 3 files changed, 59 insertions(+), 20 deletions(-) diff --git a/contrib/m_sipaf/config/layouts/m_sipaf.diagnostic_edit.layout.yml b/contrib/m_sipaf/config/layouts/m_sipaf.diagnostic_edit.layout.yml index 5ed78476..98077009 100644 --- a/contrib/m_sipaf/config/layouts/m_sipaf.diagnostic_edit.layout.yml +++ b/contrib/m_sipaf/config/layouts/m_sipaf.diagnostic_edit.layout.yml @@ -114,6 +114,7 @@ layout: flex: "0" - overflow: true display: tabs + lazy_loading: true items: - label: Champs communs items: *diag_commons diff --git a/frontend/app/components/layout/base/layout-section.component.html b/frontend/app/components/layout/base/layout-section.component.html index dc074cb5..f46dd6b9 100644 --- a/frontend/app/components/layout/base/layout-section.component.html +++ b/frontend/app/components/layout/base/layout-section.component.html @@ -32,21 +32,59 @@ - - - - + + + lazy + + + + +
+
+ + +
+
+ + + + + + + + + +
- - - - + + + + diff --git a/frontend/app/components/layout/base/layout-section.component.ts b/frontend/app/components/layout/base/layout-section.component.ts index 27035162..f40c31c3 100644 --- a/frontend/app/components/layout/base/layout-section.component.ts +++ b/frontend/app/components/layout/base/layout-section.component.ts @@ -32,7 +32,7 @@ export class ModulesLayoutSectionComponent extends ModulesLayoutComponent implem return item; } const computedItem = {}; - for (const key of ['label', 'hidden', 'disabled']) { + for (const key of ['label', 'hidden', 'disabled', 'lazy_loading']) { computedItem[key] = this._mLayout.evalLayoutElement({ element: item[key], layout: item, From 7975faed062b137564d9e4eb5545c431b7254e90 Mon Sep 17 00:00:00 2001 From: "joel.clement" Date: Wed, 31 May 2023 09:59:22 +0200 Subject: [PATCH 099/142] raise exeption if module doesnt exists --- backend/gn_modulator/commands.py | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/backend/gn_modulator/commands.py b/backend/gn_modulator/commands.py index 14d11c53..83952054 100644 --- a/backend/gn_modulator/commands.py +++ b/backend/gn_modulator/commands.py @@ -39,13 +39,16 @@ def cmd_install_module(module_code=None, module_path=None, force=False): print(f"Le module demandé {module_code} n'existe pas.") print("Veuillez choisir un code parmi la liste suivante\n") - for module_code in ModuleMethods.unregistred_modules(): - print(f"- {module_code}") + for unregistred_module_code in ModuleMethods.unregistred_modules(): + print(f"- {unregistred_module_code}") print() print("Modules installés\n") - for module_code in ModuleMethods.registred_modules(): - print(f"- {module_code}") + for registred_module_code in ModuleMethods.registred_modules(): + print(f"- {registred_module_code}") + + if module_code: + raise Exception("Le module demandé {module_code} n'existe pas.") # return ModuleMethods.install_module(module_code, module_path, force) From c193b93585ffe2475bef269fb41b93107a633e26 Mon Sep 17 00:00:00 2001 From: "joel.clement" Date: Wed, 31 May 2023 10:15:02 +0200 Subject: [PATCH 100/142] remove monitoring from test --- .github/workflows/pytest.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/pytest.yml b/.github/workflows/pytest.yml index b77ff4fe..4f96eb31 100644 --- a/.github/workflows/pytest.yml +++ b/.github/workflows/pytest.yml @@ -129,14 +129,14 @@ jobs: - name: list modules run: geonature modulator install - - name: install m_monitoring - run: geonature modulator install -p ./contrib/m_monitoring + # - name: install m_monitoring + # run: geonature modulator install -p ./contrib/m_monitoring - - name: install m_monitoring test 1 - run: geonature modulator install m_monitoring_test_1 + # - name: install m_monitoring test 1 + # run: geonature modulator install m_monitoring_test_1 - - name: install m_monitoring test 2 - run: geonature modulator install m_monitoring_test_2 + # - name: install m_monitoring test 2 + # run: geonature modulator install m_monitoring_test_2 - name: install m_sipaf run: geonature modulator install -p ./contrib/m_sipaf From 087eafd356d42e04a0663172eab4afaaad26d60c Mon Sep 17 00:00:00 2001 From: "joel.clement" Date: Wed, 31 May 2023 10:22:46 +0200 Subject: [PATCH 101/142] 'ownership' -> 'scope' --- backend/gn_modulator/module/config/utils.py | 4 ++-- backend/gn_modulator/routes/utils/decorators.py | 2 +- backend/gn_modulator/schema/models/base.py | 2 +- backend/gn_modulator/schema/repositories/base.py | 9 ++++----- backend/gn_modulator/schema/repositories/cruved.py | 12 ++++++------ backend/gn_modulator/schema/serializers.py | 8 ++++---- ...oring.site_template.module-tempate_defaults.yml | 4 ++-- doc/changelog.md | 1 + .../object/layout-object-geojson.component.ts | 10 +++++----- .../layout/object/layout-object.component.ts | 2 +- frontend/app/services/object.service.ts | 14 +++++++------- frontend/app/services/table.service.ts | 10 +++++----- 12 files changed, 39 insertions(+), 39 deletions(-) diff --git a/backend/gn_modulator/module/config/utils.py b/backend/gn_modulator/module/config/utils.py index 4f9f3484..8f18b5b3 100644 --- a/backend/gn_modulator/module/config/utils.py +++ b/backend/gn_modulator/module/config/utils.py @@ -346,13 +346,13 @@ def add_basic_fields(cls, module_code, object_code): # - label_field_name # - title_field_name # - champs d'unicité - # - ownership + # - scope for elem in [ sm.pk_field_name(), sm.label_field_name(), sm.title_field_name(), *sm.unique(), - "ownership", + "scope", ]: if elem is not None and elem not in authorized_read_fields: authorized_read_fields.append(elem) diff --git a/backend/gn_modulator/routes/utils/decorators.py b/backend/gn_modulator/routes/utils/decorators.py index ebcbcbd0..9b68afdc 100644 --- a/backend/gn_modulator/routes/utils/decorators.py +++ b/backend/gn_modulator/routes/utils/decorators.py @@ -32,7 +32,7 @@ def check_fields(module_code, object_code): # liste des champs invalides # - cad ne correspondent pas à un champs du schema unvalid_fields = sorted( - list(filter(lambda f: not sm.has_property(f) and f != "ownership", fields)) + list(filter(lambda f: not sm.has_property(f) and f != "scope", fields)) ) # liste des champs non autorisés diff --git a/backend/gn_modulator/schema/models/base.py b/backend/gn_modulator/schema/models/base.py index befc62a2..9ea43aba 100644 --- a/backend/gn_modulator/schema/models/base.py +++ b/backend/gn_modulator/schema/models/base.py @@ -235,7 +235,7 @@ def Model(self): Model = type(self.model_name(), (ModelBaseClass,), dict_model) # patch cruved - Model.ownership = 0 + Model.scope = 0 # store in cache before relations (avoid circular dependencies) set_global_cache(["schema", self.schema_code(), "model"], Model) diff --git a/backend/gn_modulator/schema/repositories/base.py b/backend/gn_modulator/schema/repositories/base.py index 78c8c41b..46586a98 100644 --- a/backend/gn_modulator/schema/repositories/base.py +++ b/backend/gn_modulator/schema/repositories/base.py @@ -188,7 +188,6 @@ def update_row( ).one() if not self.is_new_data(m, data): - print("not new") return m, False db.session.flush() @@ -224,15 +223,15 @@ def delete_row(self, value, field_name=None, module_code=MODULE_CODE, params={}, def process_query_columns(self, params, query, order_by): """ permet d'ajouter de colonnes selon les besoin - - ownership pour cruved (toujours?) + - scope pour cruved (toujours?) - row_number (si dans fields) """ fields = params.get("fields") or [] # cruved - if "ownership" in fields: - query = self.add_column_ownership(query) + if "scope" in fields: + query = self.add_column_scope(query) # row_number if "row_number" in fields: @@ -275,7 +274,7 @@ def query_list(self, module_code=MODULE_CODE, cruved_type="R", params={}, query_ # ).load_only(self.cls('ref_nom.nomenclature').Model().label_fr, self.cls('ref_nom.nomenclature').Model().cd_nomenclature) # ) - # ajout colonnes row_number, ownership (cruved) + # ajout colonnes row_number, scope (cruved) query = self.process_query_columns(params, query, order_bys) # prefiltrage diff --git a/backend/gn_modulator/schema/repositories/cruved.py b/backend/gn_modulator/schema/repositories/cruved.py index 3d34e873..1461e0ea 100644 --- a/backend/gn_modulator/schema/repositories/cruved.py +++ b/backend/gn_modulator/schema/repositories/cruved.py @@ -13,10 +13,10 @@ class SchemaRepositoriesCruved: methodes pour l'accès aux données TODO voire comment parametre les schema - pour avoir différentes façon de calculer cruved ownership + pour avoir différentes façon de calculer cruved scope """ - def expression_ownership(self): + def expression_scope(self): Model = self.Model() if self.attr("meta.check_cruved") is None: @@ -36,9 +36,9 @@ def expression_ownership(self): else_=3, ) - def add_column_ownership(self, query): + def add_column_scope(self, query): """ - ajout d'une colonne 'ownership' à la requête + ajout d'une colonne 'scope' à la requête afin de - filter dans la requete de liste - verifier les droit sur un donnée pour les action unitaire (post update delete) @@ -46,7 +46,7 @@ def add_column_ownership(self, query): - affichage de boutton, vérification d'accès aux pages etc .... """ - query = query.add_columns(self.expression_ownership().label("ownership")) + query = query.add_columns(self.expression_scope().label("scope")) return query @@ -63,6 +63,6 @@ def process_cruved_filter(self, cruved_type, module_code, query): cruved_for_type = user_cruved.get(cruved_type) if cruved_for_type < 3: - query = query.filter(self.expression_ownership() <= cruved_for_type) + query = query.filter(self.expression_scope() <= cruved_for_type) return query diff --git a/backend/gn_modulator/schema/serializers.py b/backend/gn_modulator/schema/serializers.py index 009b612c..d32ca8a5 100644 --- a/backend/gn_modulator/schema/serializers.py +++ b/backend/gn_modulator/schema/serializers.py @@ -253,10 +253,10 @@ def pre_load_make_object(self_marshmallow, data, **kwargs): ) # if self.attr('meta.check_cruved'): - marshmallow_schema_dict["ownership"] = fields.Integer(metadata={"dumps_only": True}) + marshmallow_schema_dict["scope"] = fields.Integer(metadata={"dumps_only": True}) marshmallow_schema_dict["row_number"] = fields.Integer(metadata={"dumps_only": True}) # else: - # marshmallow_schema_dict['ownership'] = 0 + # marshmallow_schema_dict['scope'] = 0 # store in cache before relation (avoid circular dependencies) @@ -328,7 +328,7 @@ def serialize(self, m, fields=None, as_geojson=False, geometry_field_name=None): data = self.MarshmallowSchema()(**kwargs).dump(m[0] if isinstance(m, tuple) else m) - # pour gérer les champs supplémentaire (ownership, row_number, etc....) + # pour gérer les champs supplémentaire (scope, row_number, etc....) if isinstance(m, tuple): keys = list(m.keys()) if len(keys) > 1: @@ -403,7 +403,7 @@ def serialize_list( map(lambda x: x[0] if isinstance(x, tuple) else x, m_list), many=True ) - # pour gérer les champs supplémentaire (ownership, row_number, etc....) + # pour gérer les champs supplémentaire (scope, row_number, etc....) if len(data_list) and isinstance(m_list[0], tuple): keys = list(m_list[0].keys()) if len(keys) > 1: diff --git a/contrib/m_monitoring/config/m_monitoring.site_template.module-tempate_defaults.yml b/contrib/m_monitoring/config/m_monitoring.site_template.module-tempate_defaults.yml index a146b8f6..2fd22006 100644 --- a/contrib/m_monitoring/config/m_monitoring.site_template.module-tempate_defaults.yml +++ b/contrib/m_monitoring/config/m_monitoring.site_template.module-tempate_defaults.yml @@ -88,7 +88,7 @@ site_form_fields: - hidden: true items: - id_site - - ownership + - scope - code - name - description @@ -128,7 +128,7 @@ site_details_fields: - hidden: true items: - id_site - - ownership + - scope - code - name - description diff --git a/doc/changelog.md b/doc/changelog.md index 4907cfaf..fd828ae2 100644 --- a/doc/changelog.md +++ b/doc/changelog.md @@ -22,6 +22,7 @@ - utilisation de `raise_load` - on charge le minimum de champs possibles - déplacement des config dans le dossier `media/modulator/config` +- changement de nom `ownership` -> `scope` - [ ] separation des tests par modules (m_sipaf, m_monitoring) - [ ] amélioration du composant list_form - [ ] ajout diagnostic sipaf diff --git a/frontend/app/components/layout/object/layout-object-geojson.component.ts b/frontend/app/components/layout/object/layout-object-geojson.component.ts index 8854dcd8..10a38281 100644 --- a/frontend/app/components/layout/object/layout-object-geojson.component.ts +++ b/frontend/app/components/layout/object/layout-object-geojson.component.ts @@ -146,7 +146,7 @@ export class ModulesLayoutObjectGeoJSONComponent var propertiesHTML = ''; propertiesHTML += '
    \n'; propertiesHTML += fields - .filter((fieldKey) => fieldKey != 'ownership') + .filter((fieldKey) => fieldKey != 'scope') .map((fieldKey) => { // gerer les '.' const fieldKeyLabel = fieldKey.split('.')[0]; @@ -157,16 +157,16 @@ export class ModulesLayoutObjectGeoJSONComponent .join('\n'); propertiesHTML += '
\n'; - const htmlDetails = this._mObject.checkAction(this.context, 'R', properties.ownership) + const htmlDetails = this._mObject.checkAction(this.context, 'R', properties.scope) .actionAllowed ? '' : ''; - const htmlEdit = this._mObject.checkAction(this.context, 'U', properties.ownership) + const htmlEdit = this._mObject.checkAction(this.context, 'U', properties.scope) .actionAllowed ? '' : ''; - const htmlDelete = this._mObject.checkAction(this.context, 'D', properties.ownership) + const htmlDelete = this._mObject.checkAction(this.context, 'D', properties.scope) .actionAllowed ? '' : ''; @@ -190,7 +190,7 @@ export class ModulesLayoutObjectGeoJSONComponent onPopupOpen(layer) { const value = layer.feature.properties[this.pkFieldName()]; const fields = this.popupFields(); // ?? computedItems - fields.push('ownership'); + fields.push('scope'); this._mData .getOne(this.moduleCode(), this.objectCode(), value, { fields }) .subscribe((data) => { diff --git a/frontend/app/components/layout/object/layout-object.component.ts b/frontend/app/components/layout/object/layout-object.component.ts index 251be0ce..e019f205 100644 --- a/frontend/app/components/layout/object/layout-object.component.ts +++ b/frontend/app/components/layout/object/layout-object.component.ts @@ -176,7 +176,7 @@ export class ModulesLayoutObjectComponent extends ModulesLayoutComponent impleme /** champs par defaut si non définis dans items */ defaultFields({ geometry = false } = {}) { - const defaultFields = [this.pkFieldName(), this.labelFieldName(), 'ownership']; + const defaultFields = [this.pkFieldName(), this.labelFieldName(), 'scope']; if (this.computedLayout.display == 'geojson' && geometry) { defaultFields.push(this.geometryFieldName()); } diff --git a/frontend/app/services/object.service.ts b/frontend/app/services/object.service.ts index 460fe488..b3331d5d 100644 --- a/frontend/app/services/object.service.ts +++ b/frontend/app/services/object.service.ts @@ -240,7 +240,7 @@ export class ModulesObjectService { if (!(context.module_code, context.object_code)) { return false; } - const checkAction = this.checkAction(context, action, data?.ownership); + const checkAction = this.checkAction(context, action, data?.scope); return checkAction.actionAllowed; } @@ -284,7 +284,7 @@ export class ModulesObjectService { * - tableaux * - boutton (detail / edit / etc...) */ - checkAction(context, action, ownership = null) { + checkAction(context, action, scope = null) { // 1) cruved defini pour cet objet ? const objectConfig = this.objectConfigContext(context); @@ -327,7 +327,7 @@ export class ModulesObjectService { // si les droit du module sont de 2 pour l'édition // et que l'appartenance de la données est 3 (données autres (ni l'utilisateur ni son organisme)) // alors le test echoue - // - si ownership est à null => on teste seulement si l'action est bien définie sur cet object + // - si scope est à null => on teste seulement si l'action est bien définie sur cet object // (ce qui a été testé précédemment) donc à true // par exemple pour les actions d'export @@ -341,12 +341,12 @@ export class ModulesObjectService { testUserCruved = true; // pour EDIT ET READ // si on a pas d'info d'appartenance - // ownership null => False (par sécurité) - } else if (ownership == null) { + // scope null => False (par sécurité) + } else if (scope == null) { testUserCruved = false; - // on compare ownership, l'appartenance qui doit être supérieur aet les droits du module + // on compare scope, l'appartenance qui doit être supérieur aet les droits du module } else { - testUserCruved = moduleCruvedAction >= ownership; + testUserCruved = moduleCruvedAction >= scope; } if (!testUserCruved) { diff --git a/frontend/app/services/table.service.ts b/frontend/app/services/table.service.ts index 117d9ec0..fb3fe4e4 100644 --- a/frontend/app/services/table.service.ts +++ b/frontend/app/services/table.service.ts @@ -53,7 +53,7 @@ export class ModulesTableService { * - Renvoie la définition de la colonne pour les actions: * voir, éditer, supprimer * - On utilise mPage.chekcLink pour voir si et comment on affiche l'action en question - * - L'appartenance (ownership) sera fournie par les données du rang de la cellule dans les fonction formatter et tooltip) + * - L'appartenance (scope) sera fournie par les données du rang de la cellule dans les fonction formatter et tooltip) * */ columnAction(context, action) { // test si l'action est possible (ou avant) @@ -78,8 +78,8 @@ export class ModulesTableService { return { headerSort: false, formatter: (cell, formatterParams, onRendered) => { - const ownership = cell._cell.row.data['ownership']; - const { actionAllowed, actionMsg } = this._mObject.checkAction(context, action, ownership); + const scope = cell._cell.row.data['scope']; + const { actionAllowed, actionMsg } = this._mObject.checkAction(context, action, scope); return ``; @@ -87,8 +87,8 @@ export class ModulesTableService { width: 22, hozAlign: 'center', tooltip: (cell) => { - const ownership = cell._cell.row.data['ownership']; - const { actionAllowed, actionMsg } = this._mObject.checkAction(context, action, ownership); + const scope = cell._cell.row.data['scope']; + const { actionAllowed, actionMsg } = this._mObject.checkAction(context, action, scope); return actionMsg; }, }; From 2807a3393d79d79b2746208010f49e16a3a44d85 Mon Sep 17 00:00:00 2001 From: "joel.clement" Date: Wed, 31 May 2023 10:33:46 +0200 Subject: [PATCH 102/142] lint --- .../layout/object/layout-object-geojson.component.ts | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/frontend/app/components/layout/object/layout-object-geojson.component.ts b/frontend/app/components/layout/object/layout-object-geojson.component.ts index 10a38281..1d4363e6 100644 --- a/frontend/app/components/layout/object/layout-object-geojson.component.ts +++ b/frontend/app/components/layout/object/layout-object-geojson.component.ts @@ -157,17 +157,14 @@ export class ModulesLayoutObjectGeoJSONComponent .join('\n'); propertiesHTML += '\n'; - const htmlDetails = this._mObject.checkAction(this.context, 'R', properties.scope) - .actionAllowed + const htmlDetails = this._mObject.checkAction(this.context, 'R', properties.scope).actionAllowed ? '' : ''; - const htmlEdit = this._mObject.checkAction(this.context, 'U', properties.scope) - .actionAllowed + const htmlEdit = this._mObject.checkAction(this.context, 'U', properties.scope).actionAllowed ? '' : ''; - const htmlDelete = this._mObject.checkAction(this.context, 'D', properties.scope) - .actionAllowed + const htmlDelete = this._mObject.checkAction(this.context, 'D', properties.scope).actionAllowed ? '' : ''; From 403c5a65ae45b98fa305e97d237ff33b96a6a18c Mon Sep 17 00:00:00 2001 From: "joel.clement" Date: Wed, 31 May 2023 10:53:58 +0200 Subject: [PATCH 103/142] add error_values in import check errors --- backend/gn_modulator/imports/mixins/check.py | 14 ++++++++------ backend/gn_modulator/imports/mixins/utils.py | 13 +++++++++++-- 2 files changed, 19 insertions(+), 8 deletions(-) diff --git a/backend/gn_modulator/imports/mixins/check.py b/backend/gn_modulator/imports/mixins/check.py index ee195ac5..76c9bd2e 100644 --- a/backend/gn_modulator/imports/mixins/check.py +++ b/backend/gn_modulator/imports/mixins/check.py @@ -112,7 +112,7 @@ def check_types(self): # Ajout d'une erreur qui référence les lignes concernées nb_lines = res[0] lines = res[1] - values = res[2] + error_values = res[2] str_lines = lines and ", ".join(map(lambda x: str(x), lines)) or "" if nb_lines == 0: continue @@ -120,7 +120,7 @@ def check_types(self): error_code="ERR_IMPORT_INVALID_VALUE_FOR_TYPE", key=key, lines=lines, - values=values, + error_values=error_values, error_msg=f"Il y a des valeurs invalides pour la colonne {key} de type {sql_type}. {nb_lines} ligne(s) concernée(s) : [{str_lines}]", ) @@ -192,7 +192,7 @@ def check_resolve_keys(self): # - non nulles dans 'raw' # - et nulles dans 'process txt_check_resolve_keys = f""" -SELECT COUNT(*), ARRAY_AGG(r.id_import) +SELECT COUNT(*), ARRAY_AGG(r.id_import), ARRAY_AGG(r.{key}) FROM {raw_table} r JOIN {process_table} p ON r.id_import = p.id_import @@ -203,6 +203,7 @@ def check_resolve_keys(self): res = SchemaMethods.c_sql_exec_txt(txt_check_resolve_keys).fetchone() nb_lines = res[0] lines = res[1] + error_values = res[2] # s'il n'y a pas de résultat, on passe à la colonne suivante if nb_lines == 0: @@ -210,13 +211,13 @@ def check_resolve_keys(self): # sinon on ajoute une erreur référençant les lignes concernée - values = None + valid_values = None # Dans le cas des nomenclatures on peut faire remonter les valeurs possible ?? code_type = sm.property(key).get("nomenclature_type") if code_type: - values = list( + valid_values = list( map( lambda x: { "cd_nomenclature": x["cd_nomenclature"], @@ -230,5 +231,6 @@ def check_resolve_keys(self): key=key, lines=lines, error_msg="Clé étrangère non résolue", - values=values, + valid_values=valid_values, + error_values=error_values, ) diff --git a/backend/gn_modulator/imports/mixins/utils.py b/backend/gn_modulator/imports/mixins/utils.py index b65779a0..8883f485 100644 --- a/backend/gn_modulator/imports/mixins/utils.py +++ b/backend/gn_modulator/imports/mixins/utils.py @@ -121,7 +121,15 @@ def table_name(self, type, key=None): rel = f"_{key}" if key is not None else "" return f"{schema_import}.v_{self.id_import}_{type}_{self.schema_code.replace('.', '_')}{rel}" - def add_error(self, error_code=None, error_msg=None, key=None, lines=None, values=None): + def add_error( + self, + error_code=None, + error_msg=None, + key=None, + lines=None, + valid_values=None, + error_values=None, + ): """ ajout d'une erreur lorsque qu'elle est rencontrée """ @@ -131,7 +139,8 @@ def add_error(self, error_code=None, error_msg=None, key=None, lines=None, value "msg": error_msg, "key": key, "lines": lines, - "values": values, + "valid_values": valid_values, + "error_values": error_values, } ) self.status = "ERROR" From 1bc3b8d3163e7f60d497958a9dd467d859b6085a Mon Sep 17 00:00:00 2001 From: "joel.clement" Date: Wed, 31 May 2023 11:25:00 +0200 Subject: [PATCH 104/142] fix missing sipaf nomenclature --- .github/workflows/pytest2.yml | 164 ------------------ .../config/features/m_sipaf.utils.data.yml | 8 + 2 files changed, 8 insertions(+), 164 deletions(-) delete mode 100644 .github/workflows/pytest2.yml diff --git a/.github/workflows/pytest2.yml b/.github/workflows/pytest2.yml deleted file mode 100644 index f7cd9cb9..00000000 --- a/.github/workflows/pytest2.yml +++ /dev/null @@ -1,164 +0,0 @@ -name: pytest - -on: - push: - branches: - - develop - - main - pull_request: - branches: - - develop - - main - -env: - GEONATURE_CONFIG_FILE: ./dependencies/GeoNature/config/test_config.toml - -jobs: - build: - runs-on: ubuntu-latest - - strategy: - fail-fast: false - matrix: - include: - - name: "Debian 10" - python-version: "3.7" - postgres-version: 11 - postgis-version: 2.5 - - name: "Debian 11" - python-version: "3.9" - postgres-version: 13 - postgis-version: 3.2 - - name: ${{ matrix.name }} - - services: - postgres: - image: postgis/postgis:${{ matrix.postgres-version }}-${{ matrix.postgis-version }} - env: - POSTGRES_DB: geonature2db - POSTGRES_PASSWORD: geonatpasswd - POSTGRES_USER: geonatadmin - ports: - - 5432:5432 - options: >- - --health-cmd pg_isready - --health-interval 10s - --health-timeout 5s - --health-retries 5 - steps: - - name: Clone gn_modulator repository - uses: actions/checkout@v3 - with: - submodules: recursive - - name: Add postgis_raster database extension - if: ${{ matrix.postgis-version >= 3 }} - run: | - psql -h localhost -U geonatadmin -d geonature2db -tc 'CREATE EXTENSION "postgis_raster";' - env: - PGPASSWORD: geonatpasswd - - name: Add database extensions - run: | - psql -h localhost -U geonatadmin -d geonature2db -tc 'CREATE EXTENSION "hstore";' - psql -h localhost -U geonatadmin -d geonature2db -tc 'CREATE EXTENSION "uuid-ossp";' - psql -h localhost -U geonatadmin -d geonature2db -tc 'CREATE EXTENSION "pg_trgm";' - psql -h localhost -U geonatadmin -d geonature2db -tc 'CREATE EXTENSION "unaccent";' - env: - PGPASSWORD: geonatpasswd - - name: Set up Python ${{ matrix.python-version }} - uses: actions/setup-python@v2 - with: - python-version: ${{ matrix.python-version }} - - name: Install GDAL - run: | - sudo apt update - sudo apt install -y libgdal-dev - - name: Install dependencies - run: | - python -m pip install --upgrade pip - python -m pip install \ - -e ..[tests] \ - -r requirements-dev.txt - working-directory: ./dependencies/GeoNature/backend - - - name: Install core modules - run: | - pip install -e ./dependencies/GeoNature/contrib/occtax - pip install -e ./dependencies/GeoNature/contrib/gn_module_occhab - pip install -e ./dependencies/GeoNature/contrib/gn_module_validation - - - name: Install GN Modulator - run: | - pip install -e . - - - name: Show database branches and dependencies - run: | - geonature db status --dependencies - - - name: Install database - run: | - geonature db upgrade geonature@head -x local-srid=2154 - geonature db autoupgrade -x local-srid=2154 - geonature taxref import-v15 --skip-bdc-statuts - geonature db upgrade geonature-samples@head - geonature db upgrade nomenclatures_taxonomie_data@head - geonature db upgrade ref_geo_fr_departments@head - geonature db upgrade ref_geo_fr_municipalities@head - geonature db upgrade ref_geo_inpn_grids_5@head - geonature db upgrade ref_sensitivity_inpn@head - env: - GEONATURE_CONFIG_FILE: ./dependencies/GeoNature/config/test_config.toml - - name: Show database status - run: | - geonature db status - env: - GEONATURE_CONFIG_FILE: ./dependencies/GeoNature/config/test_config.toml - - - name: Install modules db - run: | - geonature upgrade-modules-db - env: - GEONATURE_CONFIG_FILE: ./dependencies/GeoNature/config/test_config.toml - - - name: check gn_modulator - run: geonature modulator check - env: - GEONATURE_CONFIG_FILE: ./dependencies/GeoNature/config/test_config.toml - - - name: list modules - run: geonature modulator install - env: - GEONATURE_CONFIG_FILE: ./dependencies/GeoNature/config/test_config.toml - - - name: install m_monitoring - run: geonature modulator install contrib/m_monitring - env: - GEONATURE_CONFIG_FILE: ./dependencies/GeoNature/config/test_config.toml - - - - name: install m_monitoring test 1 - run: geonature modulator install m_monitoring_test_1 - env: - GEONATURE_CONFIG_FILE: ./dependencies/GeoNature/config/test_config.toml - - - name: install m_monitoring test 2 - run: geonature modulator install m_monitoring_test_2 - env: - GEONATURE_CONFIG_FILE: ./dependencies/GeoNature/config/test_config.toml - - - name: install m_sipaf - run: geonature modulator install contrib/m_sipaf - env: - GEONATURE_CONFIG_FILE: ./dependencies/GeoNature/config/test_config.toml - - - - name: Pytest gn_modulator - run: pytest -v --cov --cov-report xml - env: - GEONATURE_CONFIG_FILE: ./dependencies/GeoNature/config/test_config.toml - - - name: Upload coverage to Codecov - if: ${{ matrix.name == 'Debian 11' }} - uses: codecov/codecov-action@v2 - with: - flags: pytest diff --git a/contrib/m_sipaf/config/features/m_sipaf.utils.data.yml b/contrib/m_sipaf/config/features/m_sipaf.utils.data.yml index 3c45f98b..3bc229b4 100644 --- a/contrib/m_sipaf/config/features/m_sipaf.utils.data.yml +++ b/contrib/m_sipaf/config/features/m_sipaf.utils.data.yml @@ -59,15 +59,20 @@ items: - [PF_OUVRAGE_MATERIAUX, IND, Ind., Indéterminé, Indéterminé] - [PF_OUVRAGE_HYDRAULIQUE_POSITION, RG, R. g., Rive Gauche, Rive Gauche] + - [PF_OUVRAGE_HYDRAULIQUE_POSITION, RD, R. d., Rive Droite, Rive Droite] - [PF_OUVRAGE_HYDRAULIQUE_POSITION, RGD, R. g. & d.", Rive gauche et rive droite, Rive gauche et rive droite (la rive se détermine dans le sens amont/aval)] - [PF_OUVRAGE_HYDRAULIQUE_BANQ_CARACT, DOU, Dbl., Double, Banquette double] + - [PF_OUVRAGE_HYDRAULIQUE_BANQ_CARACT, SIM, Simp., Simple, Banquette simple] + - [PF_OUVRAGE_HYDRAULIQUE_BANQ_TYPE, NAT, Nat., Banquette naturelle, Banquette naturelle] - [PF_OUVRAGE_HYDRAULIQUE_BANQ_TYPE, BET, Bet., Banquette béton, Banquette béton] - [PF_OUVRAGE_HYDRAULIQUE_BANQ_TYPE, ECB, Ecb., Encorbellement, Encorbellement] - [PF_OUVRAGE_HYDRAULIQUE_BANQ_TYPE, POF, Po. F., Ponton flottant, Ponton flottant] - [PF_OUVRAGE_HYDRAULIQUE_BANQ_TYPE, AUT, Aut., Autre, Autre] + + - [PF_INFRASTRUCTURE_TYPE, AU, Auto., Autoroute, Autoroute] - [PF_INFRASTRUCTURE_TYPE, RN, R. N., Route Nationale, Route Nationale] - [PF_INFRASTRUCTURE_TYPE, RD, R. D., Route Départementale, Route Départementale] - [PF_INFRASTRUCTURE_TYPE, VF, V. F., Voie ferrée, Voie ferrée] @@ -75,7 +80,9 @@ items: - [PF_OUVRAGE_SPECIFICITE, MIX, Mixt., Mixte, Ouvrage mixte construit pour le passage des animaux concomitamment à un ou plusieurs autres usages] - [PF_OUVRAGE_SPECIFICITE, ND, Non déd., Non dédié, Ouvrage non dédié au passage de la faune mais pouvant servir à cet usage] + - [PF_OUVRAGE_SPECIFICITE, SPE, Spé., Spécifique, Ouvrage construit que pour le passage des animaux] + - [PF_OUVRAGE_TYPE, BUS, Bus., Buse, Buse] - [PF_OUVRAGE_TYPE, CAD, Cad., Cadre, Cadre] - [PF_OUVRAGE_TYPE, VOU+R, Voût. Rad., Voûte avec radier, Voûte maçonnée avec radier] - [PF_OUVRAGE_TYPE, AUT, Aut., Autre (préciser), Autre (préciser)] @@ -92,6 +99,7 @@ items: - [PF_OUVRAGE_TYPE, TRA, Tra., Tranchée, Tranchée] - [PF_OUVRAGE_TYPE, TUN, Tun., Tunnel, Tunnel] + - [PF_TYPE_ACTOR, PRO, Prop., Propriétaire, Propriétaire] - [PF_TYPE_ACTOR, CON, Conc., Concessionaire, Concessionnaire] - [PF_TYPE_ACTOR, INT, Int., Intervenant, Intervenant sur ce passage faune] - [PF_TYPE_ACTOR, GES, Ges., Gestionnaire, Gestionnaire du passage faune] From 69778b4bbaa37a60f6375aa088cd87483ecf2efd Mon Sep 17 00:00:00 2001 From: "joel.clement" Date: Thu, 1 Jun 2023 11:17:12 +0200 Subject: [PATCH 105/142] up permissions cruved_scope_for_user_in_module --- backend/gn_modulator/module/config/base.py | 1 - .../{perm.action.schema.yml => perm.action.schema.yml_} | 0 .../{perm.filter.schema.yml => perm.filter.schema.yml_} | 0 .../{perm.object.schema.yml => perm.object.schema.yml_} | 0 .../{perm.permission.schema.yml => perm.permission.schema.yml_} | 0 5 files changed, 1 deletion(-) rename config/definitions/utils/permission/{perm.action.schema.yml => perm.action.schema.yml_} (100%) rename config/definitions/utils/permission/{perm.filter.schema.yml => perm.filter.schema.yml_} (100%) rename config/definitions/utils/permission/{perm.object.schema.yml => perm.object.schema.yml_} (100%) rename config/definitions/utils/permission/{perm.permission.schema.yml => perm.permission.schema.yml_} (100%) diff --git a/backend/gn_modulator/module/config/base.py b/backend/gn_modulator/module/config/base.py index 20a86f14..0667d906 100644 --- a/backend/gn_modulator/module/config/base.py +++ b/backend/gn_modulator/module/config/base.py @@ -6,7 +6,6 @@ from flask import g from gn_modulator.schema import SchemaMethods from gn_modulator.utils.cache import get_global_cache, set_global_cache -from geonature.core.gn_permissions.tools import cruved_scope_for_user_in_module class ModulesConfigBase: diff --git a/config/definitions/utils/permission/perm.action.schema.yml b/config/definitions/utils/permission/perm.action.schema.yml_ similarity index 100% rename from config/definitions/utils/permission/perm.action.schema.yml rename to config/definitions/utils/permission/perm.action.schema.yml_ diff --git a/config/definitions/utils/permission/perm.filter.schema.yml b/config/definitions/utils/permission/perm.filter.schema.yml_ similarity index 100% rename from config/definitions/utils/permission/perm.filter.schema.yml rename to config/definitions/utils/permission/perm.filter.schema.yml_ diff --git a/config/definitions/utils/permission/perm.object.schema.yml b/config/definitions/utils/permission/perm.object.schema.yml_ similarity index 100% rename from config/definitions/utils/permission/perm.object.schema.yml rename to config/definitions/utils/permission/perm.object.schema.yml_ diff --git a/config/definitions/utils/permission/perm.permission.schema.yml b/config/definitions/utils/permission/perm.permission.schema.yml_ similarity index 100% rename from config/definitions/utils/permission/perm.permission.schema.yml rename to config/definitions/utils/permission/perm.permission.schema.yml_ From 71eac78c2080b85057d30bccee89a202560cb773 Mon Sep 17 00:00:00 2001 From: "joel.clement" Date: Thu, 1 Jun 2023 15:39:57 +0200 Subject: [PATCH 106/142] tab label display ... when still unknown --- frontend/app/services/object.service.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/app/services/object.service.ts b/frontend/app/services/object.service.ts index b3331d5d..fa1481ae 100644 --- a/frontend/app/services/object.service.ts +++ b/frontend/app/services/object.service.ts @@ -231,7 +231,7 @@ export class ModulesObjectService { const labels = this.labels({ context }); const objectTabLabel = nbFiltered == nbTotal - ? `${utils.capitalize(labels)} (${nbTotal || 0})` + ? `${utils.capitalize(labels)} (${nbTotal != null ? nbTotal : '...'})` : `${utils.capitalize(labels)} (${nbFiltered}/${nbTotal})`; return objectTabLabel; } From ecba68b387738eee5caa7969e80a156484b0f305 Mon Sep 17 00:00:00 2001 From: "joel.clement" Date: Tue, 13 Jun 2023 11:21:35 +0200 Subject: [PATCH 107/142] disabled button color && tooltip --- .../layouts/utils/utils.buttons_form.layout.yml | 2 +- frontend/app/components/base/base.scss | 17 +++++++++-------- .../layout/base/layout-section.component.html | 1 - .../layout/base/layout.component.html | 4 +--- .../object/layout-object-geojson.component.ts | 10 +++++----- 5 files changed, 16 insertions(+), 18 deletions(-) diff --git a/config/layouts/utils/utils.buttons_form.layout.yml b/config/layouts/utils/utils.buttons_form.layout.yml index e3f3a0fa..08866fca 100644 --- a/config/layouts/utils/utils.buttons_form.layout.yml +++ b/config/layouts/utils/utils.buttons_form.layout.yml @@ -18,7 +18,7 @@ layout: color: success title: Valider icon: done - description: Enregistrer le contenu du formulaire + description: "__f__formGroup.valid ? `Enregistrer le contenu du formulaire` : `Le formulaire comporte des erreurs`" action: submit disabled: __f__!formGroup.valid - flex: "0" diff --git a/frontend/app/components/base/base.scss b/frontend/app/components/base/base.scss index baaada33..83e54e7c 100644 --- a/frontend/app/components/base/base.scss +++ b/frontend/app/components/base/base.scss @@ -50,7 +50,6 @@ color: #fff; } - // couleur custom des bouttons .mat-mdc-button-base.mat-error { background-color: red; @@ -63,12 +62,15 @@ color: #fff; } - -.mat-button-base.mat-button-disabled { - color: rgba(0,0,0,.26); - background-color: rgba(0,0,0,.12); +.mat-mdc-raised-button[disabled][disabled] { + color: rgba(0, 0, 0, 0.26); + background-color: rgba(0, 0, 0, 0.12); } +.mat-stroked-button.mat-button-disabled.mat-button-disabled { + color: #ffffff; + background-color: #008cba; +} // :host ::ng-deep .button-just-icon { // font-size: 1.5rem !important; // } @@ -215,7 +217,6 @@ div.layout-items > div { background-color: lightgreen; } - .layout-message.error { color: darkred; background-color: lightcoral; @@ -308,7 +309,8 @@ div.layout-items > div { cursor: pointer; } -.geojsons {} +.geojsons { +} .test-layout { border: solid 1px lightgray; @@ -347,4 +349,3 @@ div.layout-items > div { background-color: lightgray; border-radius: 10px; } - diff --git a/frontend/app/components/layout/base/layout-section.component.html b/frontend/app/components/layout/base/layout-section.component.html index f46dd6b9..04e5c26b 100644 --- a/frontend/app/components/layout/base/layout-section.component.html +++ b/frontend/app/components/layout/base/layout-section.component.html @@ -34,7 +34,6 @@ - lazy -
+
' + ? '' : ''; const htmlEdit = this._mObject.checkAction(this.context, 'U', properties.scope).actionAllowed ? '' @@ -191,10 +191,10 @@ export class ModulesLayoutObjectGeoJSONComponent this._mData .getOne(this.moduleCode(), this.objectCode(), value, { fields }) .subscribe((data) => { - layer.setPopupContent(this.popupHTML(data)); - }); - this._mapService.L.DomEvent.on(layer.getPopup().getElement(), 'click', (e) => { - const action = e && e.target && e.target.attributes.getNamedItem('action')?.nodeValue; + layer.setPopupContent(this.popupHTML(data)); + }); + this._mapService.L.DomEvent.on(layer.getPopup().getElement(), 'click', (e) => { + const action = e && e.target && e.target.attributes.getNamedItem('action')?.nodeValue; if (action) { this._mAction.processAction({ action, From 570b993828d279bd9d584d41556b43acb9ecd874 Mon Sep 17 00:00:00 2001 From: "joel.clement" Date: Tue, 13 Jun 2023 11:47:15 +0200 Subject: [PATCH 108/142] fix is_new_data --- backend/gn_modulator/schema/repositories/base.py | 6 +++--- .../layout/object/layout-object-geojson.component.ts | 8 ++++---- frontend/app/services/config.service.ts | 2 -- 3 files changed, 7 insertions(+), 9 deletions(-) diff --git a/backend/gn_modulator/schema/repositories/base.py b/backend/gn_modulator/schema/repositories/base.py index 46586a98..cfa1c8c4 100644 --- a/backend/gn_modulator/schema/repositories/base.py +++ b/backend/gn_modulator/schema/repositories/base.py @@ -117,13 +117,13 @@ def is_new_data(self, model, data): continue fields = [key] if self.is_relation_1_n(key) or self.is_relation_n_n(key): - fields = [] for item in data_value: for k in item: kk = f"{key}.{k}" - if kk not in fields: + if kk not in fields and self.has_property(kk): fields.append(kk) - m = self.serialize(model, fields=fields)[key] + m_ = self.serialize(model, fields=fields) + m = m_[key] if self.is_new_data(m, data_value): return True return False diff --git a/frontend/app/components/layout/object/layout-object-geojson.component.ts b/frontend/app/components/layout/object/layout-object-geojson.component.ts index 3d1bc20f..94846f10 100644 --- a/frontend/app/components/layout/object/layout-object-geojson.component.ts +++ b/frontend/app/components/layout/object/layout-object-geojson.component.ts @@ -191,10 +191,10 @@ export class ModulesLayoutObjectGeoJSONComponent this._mData .getOne(this.moduleCode(), this.objectCode(), value, { fields }) .subscribe((data) => { - layer.setPopupContent(this.popupHTML(data)); - }); - this._mapService.L.DomEvent.on(layer.getPopup().getElement(), 'click', (e) => { - const action = e && e.target && e.target.attributes.getNamedItem('action')?.nodeValue; + layer.setPopupContent(this.popupHTML(data)); + }); + this._mapService.L.DomEvent.on(layer.getPopup().getElement(), 'click', (e) => { + const action = e && e.target && e.target.attributes.getNamedItem('action')?.nodeValue; if (action) { this._mAction.processAction({ action, diff --git a/frontend/app/services/config.service.ts b/frontend/app/services/config.service.ts index 0d3ea85f..6a9d0034 100644 --- a/frontend/app/services/config.service.ts +++ b/frontend/app/services/config.service.ts @@ -139,11 +139,9 @@ export class ModulesConfigService { } moduleImg(moduleCode) { - console.log(this.AppConfig); const moduleImg = `${this.backendUrl()}/${ this.AppConfig.MEDIA_URL }/modulator/assets/${moduleCode.toLowerCase()}/module.jpg`; - console.log(moduleImg); return moduleImg; } From 63a258a58d4c1ec50943c5afa0e4bf8ced28c840 Mon Sep 17 00:00:00 2001 From: "joel.clement" Date: Tue, 13 Jun 2023 12:24:33 +0200 Subject: [PATCH 109/142] =?UTF-8?q?table=20layout=20ne=20pas=20recharger?= =?UTF-8?q?=20les=20lignes=20si=20non=20n=C3=A9cessaire?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/layout/object/layout-object-table.component.ts | 3 +++ 1 file changed, 3 insertions(+) diff --git a/frontend/app/components/layout/object/layout-object-table.component.ts b/frontend/app/components/layout/object/layout-object-table.component.ts index a09ad445..46e8263a 100644 --- a/frontend/app/components/layout/object/layout-object-table.component.ts +++ b/frontend/app/components/layout/object/layout-object-table.component.ts @@ -290,9 +290,12 @@ export class ModulesLayoutObjectTableComponent this.table.setHeight(elem.clientHeight); const pageSize = Math.floor((elem.clientHeight - 90) / 50); + const nbTotal = this._mObject.objectConfigContext(this.context).nb_total; + if ( !this.computedLayout.page_size && this.pageSize != pageSize && + nbTotal > pageSize && pageSize > 1 && !this.context.debug ) { From 3c59740f5f660245deca404344a67a282969f3d7 Mon Sep 17 00:00:00 2001 From: "joel.clement" Date: Tue, 13 Jun 2023 12:25:16 +0200 Subject: [PATCH 110/142] diagnostic details -> pas de tab par defaut --- .../m_sipaf/config/layouts/m_sipaf.diagnostic_details.layout.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/contrib/m_sipaf/config/layouts/m_sipaf.diagnostic_details.layout.yml b/contrib/m_sipaf/config/layouts/m_sipaf.diagnostic_details.layout.yml index 7c717062..e3399d7b 100644 --- a/contrib/m_sipaf/config/layouts/m_sipaf.diagnostic_details.layout.yml +++ b/contrib/m_sipaf/config/layouts/m_sipaf.diagnostic_details.layout.yml @@ -96,7 +96,6 @@ layout: layout: display: tabs overflow: true - selected_tab: Aménagement items: - label: Champs communs items: *diag_commons From d03b82dd02268741607df07c096382eb06d57887 Mon Sep 17 00:00:00 2001 From: "joel.clement" Date: Tue, 13 Jun 2023 12:26:06 +0200 Subject: [PATCH 111/142] fu custom icon --- frontend/app/services/map/base.ts | 9 --------- frontend/app/services/map/draw.ts | 2 +- 2 files changed, 1 insertion(+), 10 deletions(-) diff --git a/frontend/app/services/map/base.ts b/frontend/app/services/map/base.ts index 2bcf1da8..6b12746d 100644 --- a/frontend/app/services/map/base.ts +++ b/frontend/app/services/map/base.ts @@ -179,15 +179,6 @@ export default { map.isInitialized = true; - // init PM - const customIcon = L.icon({ - iconUrl: 'assets/marker-icon.png', - shadowUrl: 'assets/marker-shadow.png', - iconAnchor: [12, 41], - }); - - var customMarker = map.pm.Toolbar.copyDrawControl('drawMarker', { name: 'customMarker' }); - customMarker.drawInstance.setOptions({ markerStyle: { icon: customIcon } }); resolve(map); }, 100); }); diff --git a/frontend/app/services/map/draw.ts b/frontend/app/services/map/draw.ts index f898006b..a8cbacf5 100644 --- a/frontend/app/services/map/draw.ts +++ b/frontend/app/services/map/draw.ts @@ -4,7 +4,7 @@ import utils from '../../utils'; const defautDrawOptions = { position: 'topleft', customMarker: true, - drawMarker: false, + drawMarker: true, editMode: true, drawCircle: false, drawCircleMarker: false, From cd0c48934c683c7ca2322962280a81da1fc14722 Mon Sep 17 00:00:00 2001 From: "joel.clement" Date: Tue, 13 Jun 2023 12:27:03 +0200 Subject: [PATCH 112/142] sipaf site edit detail set zoom to 12 --- contrib/m_sipaf/config/layouts/m_sipaf.site_details.layout.yml | 2 ++ contrib/m_sipaf/config/layouts/m_sipaf.site_edit.layout.yml | 1 + 2 files changed, 3 insertions(+) diff --git a/contrib/m_sipaf/config/layouts/m_sipaf.site_details.layout.yml b/contrib/m_sipaf/config/layouts/m_sipaf.site_details.layout.yml index 08536f8d..7416e012 100644 --- a/contrib/m_sipaf/config/layouts/m_sipaf.site_details.layout.yml +++ b/contrib/m_sipaf/config/layouts/m_sipaf.site_details.layout.yml @@ -9,8 +9,10 @@ layout: items: - type: map flex: 2 + zoom: 12 items: - type: object + zoom: true display: geojson object_code: site prefilters: __f__`id_passage_faune = ${o.object(x, 'site').value}` diff --git a/contrib/m_sipaf/config/layouts/m_sipaf.site_edit.layout.yml b/contrib/m_sipaf/config/layouts/m_sipaf.site_edit.layout.yml index 369d271b..15df8440 100644 --- a/contrib/m_sipaf/config/layouts/m_sipaf.site_edit.layout.yml +++ b/contrib/m_sipaf/config/layouts/m_sipaf.site_edit.layout.yml @@ -10,3 +10,4 @@ layout: template_params: object_code: site layout: __SITE_FORM_FIELDS__ + zoom: 12 From e32c5897e1a0c7de64eaae5aaf8b6a8b4a2260d5 Mon Sep 17 00:00:00 2001 From: "joel.clement" Date: Tue, 13 Jun 2023 16:12:22 +0200 Subject: [PATCH 113/142] fix api query cache --- backend/gn_modulator/schema/base.py | 2 +- backend/gn_modulator/schema/repositories/base.py | 3 +++ backend/gn_modulator/schema/repositories/filters.py | 8 +------- backend/gn_modulator/schema/repositories/utils.py | 12 +++++++++--- 4 files changed, 14 insertions(+), 11 deletions(-) diff --git a/backend/gn_modulator/schema/base.py b/backend/gn_modulator/schema/base.py index 54909f6d..7bf54974 100644 --- a/backend/gn_modulator/schema/base.py +++ b/backend/gn_modulator/schema/base.py @@ -332,7 +332,7 @@ def process_csv_data(self, key, data, options={}, process_label=True): if isinstance(data, list): return ", ".join( - [self.process_csv_data(key, d, process_label=process_label) for d in data] + [str(self.process_csv_data(key, d, process_label=process_label)) for d in data] ) if isinstance(data, dict): diff --git a/backend/gn_modulator/schema/repositories/base.py b/backend/gn_modulator/schema/repositories/base.py index cfa1c8c4..db99a387 100644 --- a/backend/gn_modulator/schema/repositories/base.py +++ b/backend/gn_modulator/schema/repositories/base.py @@ -264,6 +264,9 @@ def query_list(self, module_code=MODULE_CODE, cruved_type="R", params={}, query_ query = self.process_fields(query, params.get("fields") or []) + # clear_query_cache + self.clear_query_cache(query) + order_bys, query = self.get_sorters(Model, params.get("sort", []), query) # if params.get('test'): diff --git a/backend/gn_modulator/schema/repositories/filters.py b/backend/gn_modulator/schema/repositories/filters.py index 696aa8d9..2dece377 100644 --- a/backend/gn_modulator/schema/repositories/filters.py +++ b/backend/gn_modulator/schema/repositories/filters.py @@ -182,13 +182,7 @@ def get_filter(self, Model, filter, query=None, condition=None): filter_out = cast(model_attribute, db.String) != (str(filter_value)) elif filter_type == "in": - filter_out = cast(model_attribute, db.String).in_( - [str(x) for x in filter_value] - # map( - # lambda x: str(x), - # filter_value - # ) - ) + filter_out = cast(model_attribute, db.String).in_([str(x) for x in filter_value]) else: raise SchemaRepositoryFilterTypeError( diff --git a/backend/gn_modulator/schema/repositories/utils.py b/backend/gn_modulator/schema/repositories/utils.py index a8336c27..df5de38f 100644 --- a/backend/gn_modulator/schema/repositories/utils.py +++ b/backend/gn_modulator/schema/repositories/utils.py @@ -17,6 +17,10 @@ def set_query_cache(self, query, key, value): query._cache[key] = value return query + def clear_query_cache(self, query): + if hasattr(query, "_cache"): + delattr(query, "_cache") + def get_query_cache(self, query, key): if not query: return @@ -142,14 +146,16 @@ def custom_getattr( res["val_of_type"] = res["val"].of_type(res["relation_alias"]) query = query.join(res["val_of_type"], isouter=True) - # mise en cache - query = self.set_query_cache(query, cache_key, res) + if only_fields: + query = self.set_query_cache(query, cache_key, res) # chargement des champs si is last field if self.is_val_relationship(res["val"]) and is_last_field and only_fields: + # mise en cache seulement dans ce cas + # query = self.set_query_cache(query, cache_key, res) query = self.eager_load_only(field_name, query, only_fields, index) - # mise en cache et retour + # retour return self.process_custom_getattr_res(res, query, field_name, index, only_fields) def get_sorters(self, Model, sort, query): From 1c703051d2bee571017e4c5c500fe9b2ab3d7a3b Mon Sep 17 00:00:00 2001 From: "joel.clement" Date: Tue, 13 Jun 2023 16:14:18 +0200 Subject: [PATCH 114/142] fix filters --- .../layout/object/layout-object-filters.component.ts | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/frontend/app/components/layout/object/layout-object-filters.component.ts b/frontend/app/components/layout/object/layout-object-filters.component.ts index 5b8afb69..bd115a37 100644 --- a/frontend/app/components/layout/object/layout-object-filters.component.ts +++ b/frontend/app/components/layout/object/layout-object-filters.component.ts @@ -60,8 +60,11 @@ export class ModulesLayoutObjectFiltersComponent .filter(([key, val]: any) => val != null) .map(([key, val]: any) => { const field = filterDefs[key]?.field || key; - const type = filterDefs[key]?.type || '='; - const value = filterDefs[key]?.key ? val[filterDefs[key].key] : utils.getAttr(data, key); + let value = filterDefs[key].key ? utils.getAttr(val, filterDefs[key].key) : val; + let type = filterDefs[key]?.type || Array.isArray(value) ? 'in' : '='; + if (Array.isArray(value)) { + value = value.join(';'); + } return { field, type, From f2aa4a325901c5289a94c0918a9bf6337d5fc9aa Mon Sep 17 00:00:00 2001 From: "joel.clement" Date: Tue, 13 Jun 2023 16:14:35 +0200 Subject: [PATCH 115/142] up hidden fields --- contrib/m_sipaf/config/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/m_sipaf/config/config.yml b/contrib/m_sipaf/config/config.yml index eaf0b01b..a0ce5b2d 100644 --- a/contrib/m_sipaf/config/config.yml +++ b/contrib/m_sipaf/config/config.yml @@ -93,6 +93,7 @@ site_filters_defs: field: linears.groups.id_group nomenclatures_ouvrage_materiaux: field: nomenclatures_ouvrage_materiaux.id_nomenclature + key: id_nomenclature site_table_fields: - code_passage_faune @@ -236,7 +237,6 @@ site_form_fields: items: - key: id_digitiser default: __f__context.current_user?.id_role - hidden: true - geom - key: id_passage_faune required: false From 8c620246408d87f9c98a1c228ae579a118526ab2 Mon Sep 17 00:00:00 2001 From: "joel.clement" Date: Tue, 20 Jun 2023 14:54:52 +0200 Subject: [PATCH 116/142] sipaf obs --- backend/gn_modulator/definition/utils.py | 6 +++ backend/gn_modulator/module/config/utils.py | 1 + .../schema/models/column_properties.py | 12 +++-- .../schema/repositories/filters.py | 11 +++- .../gn_modulator/schema/repositories/utils.py | 34 +++++++----- backend/gn_modulator/utils/filters.py | 2 +- .../utils/synthese/syn.synthese.schema.yml | 19 ++++++- contrib/m_sipaf/config/config.yml | 27 +++++++++- .../layouts/m_sipaf.site_details.layout.yml | 20 ++++++- .../layouts/m_sipaf.site_edit.layout.yml | 2 +- contrib/m_sipaf/config/m_sipaf.module.yml | 9 ++++ .../layout/base/layout-map.component.html | 6 +-- .../layout/base/layout-map.component.scss | 44 +++++++++++---- .../layout/base/layout-modal.component.html | 4 +- .../layout/base/layout-modal.component.scss | 6 +-- .../layout/form/generic-form.component.scss | 6 +-- .../layout/import/layout-import.component.ts | 1 - .../object/layout-object-geojson.component.ts | 36 ++++++++----- .../object/layout-object-table.component.ts | 22 +------- frontend/app/services/map/base.ts | 1 - frontend/app/services/map/layer.ts | 6 +++ frontend/app/services/route.service.ts | 3 ++ frontend/app/services/table.service.ts | 53 +++++++++++++++---- frontend/app/utils/commons.ts | 2 +- 24 files changed, 240 insertions(+), 93 deletions(-) diff --git a/backend/gn_modulator/definition/utils.py b/backend/gn_modulator/definition/utils.py index 22ee12b8..fff0814b 100644 --- a/backend/gn_modulator/definition/utils.py +++ b/backend/gn_modulator/definition/utils.py @@ -2,6 +2,9 @@ import json import yaml from pathlib import Path + +from flask import current_app + from gn_modulator.utils.env import local_srid from gn_modulator.utils.commons import replace_in_dict from gn_modulator.utils.yaml import YmlLoader @@ -51,6 +54,9 @@ def load_definition_from_file(cls, file_path): # traitement du local_srid data = replace_in_dict(data, "__LOCAL_SRID__", local_srid()) data = replace_in_dict(data, "__REF_MODULE_CODE__", MODULE_CODE) + data = replace_in_dict( + data, "__CONFIG.URL_APPLICATION__", current_app.config["URL_APPLICATION"] + ) # on enleve aliases if isinstance(data, dict): diff --git a/backend/gn_modulator/module/config/utils.py b/backend/gn_modulator/module/config/utils.py index 8f18b5b3..f4d9b271 100644 --- a/backend/gn_modulator/module/config/utils.py +++ b/backend/gn_modulator/module/config/utils.py @@ -351,6 +351,7 @@ def add_basic_fields(cls, module_code, object_code): sm.pk_field_name(), sm.label_field_name(), sm.title_field_name(), + sm.geometry_field_name(), *sm.unique(), "scope", ]: diff --git a/backend/gn_modulator/schema/models/column_properties.py b/backend/gn_modulator/schema/models/column_properties.py index 9a5470a9..7449cd00 100644 --- a/backend/gn_modulator/schema/models/column_properties.py +++ b/backend/gn_modulator/schema/models/column_properties.py @@ -55,9 +55,10 @@ def cp_select(self, key, column_property_def, Model): if column_property_type == "concat": # label = ' ' - # 1 => ['', '', ''] + # 1 => ['', ' ', ''] # 2 => map getattr # 3 *dans concat + conditions = [] label = column_property_def["label"] index = 0 items = [] @@ -70,14 +71,19 @@ def cp_select(self, key, column_property_def, Model): items2.append(txt) txt = "" elif label[index] == ">": - model_attribute, _ = self.custom_getattr(Model, txt) + model_attribute, condition = self.custom_getattr(Model, txt) + if condition is not None: + conditions.append(condition) items2.append(txt) items.append(model_attribute) txt = "" else: txt += label[index] index += 1 - return func.concat(*items) + cp = func.concat(*items) + if conditions: + cp = select([cp]).where(and_(*conditions)) + return cp if column_property_type in ["st_astext"]: return func.st_astext(getattr(Model, column_property_def["key"])) diff --git a/backend/gn_modulator/schema/repositories/filters.py b/backend/gn_modulator/schema/repositories/filters.py index 2dece377..3fa1f902 100644 --- a/backend/gn_modulator/schema/repositories/filters.py +++ b/backend/gn_modulator/schema/repositories/filters.py @@ -2,7 +2,7 @@ repositories - filters """ import unidecode -from sqlalchemy import cast, and_, or_, not_ +from sqlalchemy import cast, and_, or_, not_, func from geonature.utils.env import db from ..errors import SchemaRepositoryFilterError, SchemaRepositoryFilterTypeError from sqlalchemy.sql.functions import ReturnTypeFromArgs @@ -184,6 +184,15 @@ def get_filter(self, Model, filter, query=None, condition=None): elif filter_type == "in": filter_out = cast(model_attribute, db.String).in_([str(x) for x in filter_value]) + elif filter_type == "dwithin": + x, y, radius = filter_value.split(";") + geo_filter = func.ST_DWithin( + func.ST_GeogFromWKB(model_attribute), + func.ST_GeogFromWKB(func.ST_MakePoint(x, y)), + radius, + ) + filter_out = geo_filter + else: raise SchemaRepositoryFilterTypeError( "Le type de filtre {} n'est pas géré".format(filter_type) diff --git a/backend/gn_modulator/schema/repositories/utils.py b/backend/gn_modulator/schema/repositories/utils.py index df5de38f..42ff863f 100644 --- a/backend/gn_modulator/schema/repositories/utils.py +++ b/backend/gn_modulator/schema/repositories/utils.py @@ -28,7 +28,7 @@ def get_query_cache(self, query, key): return None return query._cache.get(key) - def process_custom_getattr_res(self, res, query, field_name, index, only_fields=[]): + def process_custom_getattr_res(self, res, query, condition, field_name, index, only_fields=[]): # si c'est une propriété fields = field_name.split(".") is_relationship = self.is_val_relationship(res["val"]) @@ -38,19 +38,23 @@ def process_custom_getattr_res(self, res, query, field_name, index, only_fields= # on ne peut pas avoir de field apres une propriété if not is_last_field: raise Exception(f"pb fields {field_name}, il ne devrait plus rester de champs") - - return res["val"], query + return res["val"], query or condition if not is_last_field: + if not query: + condition = ( + and_(condition, res["val"].expression) if condition else res["val"].expression + ) return self.custom_getattr( res["relation_alias"], field_name, index=index + 1, query=query, + condition=condition, only_fields=only_fields, ) - return res["relation_alias"], query + return res["relation_alias"], query or condition def eager_load_only(self, field_name, query, only_fields, index): """ @@ -79,6 +83,7 @@ def eager_load_only(self, field_name, query, only_fields, index): ), filter( lambda x: key_cache_eager in x + and x.startswith(f"{key_cache_eager}.") and "." not in x.replace(f"{key_cache_eager}.", "") and hasattr( getattr(cache["relation_alias"], x.replace(f"{key_cache_eager}.", "")), @@ -105,7 +110,7 @@ def is_val_relationship(self, val): return hasattr(val, "mapper") and hasattr(val.mapper, "entity") def custom_getattr( - self, Model, field_name, query=None, only_fields="", index=0, condition=None + self, Model, field_name, query=None, condition=None, only_fields="", index=0 ): # liste des champs 'rel1.rel2.pro1' -> 'rel1', 'rel2', 'prop1' fields = field_name.split(".") @@ -115,14 +120,15 @@ def custom_getattr( # clé pour le cache cache_key = ".".join(fields[: index + 1]) - # test si c'est le dernier champs is_last_field = index == len(fields) - 1 # récupération depuis le cache associé à la query res = self.get_query_cache(query, cache_key) if res: - return self.process_custom_getattr_res(res, query, field_name, index, only_fields) + return self.process_custom_getattr_res( + res, query, condition, field_name, index, only_fields + ) # si non en cache # on le calcule @@ -142,21 +148,25 @@ def custom_getattr( # si c'est une propriété if self.is_val_relationship(res["val"]): res["relation_model"] = res["val"].mapper.entity - res["relation_alias"] = orm.aliased(res["relation_model"]) + res["relation_alias"] = ( + orm.aliased(res["relation_model"]) if query else res["relation_model"] + ) + # res["relation_alias"] = orm.aliased(res["relation_model"]) res["val_of_type"] = res["val"].of_type(res["relation_alias"]) - query = query.join(res["val_of_type"], isouter=True) + if query: + query = query.join(res["val_of_type"], isouter=True) if only_fields: query = self.set_query_cache(query, cache_key, res) # chargement des champs si is last field if self.is_val_relationship(res["val"]) and is_last_field and only_fields: - # mise en cache seulement dans ce cas - # query = self.set_query_cache(query, cache_key, res) query = self.eager_load_only(field_name, query, only_fields, index) # retour - return self.process_custom_getattr_res(res, query, field_name, index, only_fields) + return self.process_custom_getattr_res( + res, query, condition, field_name, index, only_fields + ) def get_sorters(self, Model, sort, query): order_bys = [] diff --git a/backend/gn_modulator/utils/filters.py b/backend/gn_modulator/utils/filters.py index eb60a8a3..e74bd5d6 100644 --- a/backend/gn_modulator/utils/filters.py +++ b/backend/gn_modulator/utils/filters.py @@ -58,7 +58,7 @@ def parse_filter(str_filter): index_min = None filter_type_min = None - for filter_type in ["=", "<", ">", ">=", "<=", "like", "ilike", "in", "~"]: + for filter_type in ["=", "<", ">", ">=", "<=", "like", "ilike", "in", "~", "dwithin"]: try: index = str_filter.index(f" {filter_type} ") except ValueError: diff --git a/config/definitions/utils/synthese/syn.synthese.schema.yml b/config/definitions/utils/synthese/syn.synthese.schema.yml index 67faa832..3fbc9709 100644 --- a/config/definitions/utils/synthese/syn.synthese.schema.yml +++ b/config/definitions/utils/synthese/syn.synthese.schema.yml @@ -9,7 +9,7 @@ meta: genre: M label: element de la synthese labels: elements de la synthese - label_field_name: cd_nom + label_field_name: taxref.nom_vern geometry_field_name: the_geom_4326 unique: - id_source @@ -23,3 +23,20 @@ properties: nomenclature_type: OCC_COMPORTEMENT nomenclature_determination_method: nomenclature_type: METH_DETERMIN + nomenclature_bio_condition: + title: État biologique + taxref: + title: taxon + dataset: + title: Jeu de données + cor_observers: + title: Observateur(s) + date_min: + title: Date (min) + url_source: + type: string + column_property: concat + title: Url source + # label: '__CONFIG.URL_APPLICATION__//' + label: '/' + diff --git a/contrib/m_sipaf/config/config.yml b/contrib/m_sipaf/config/config.yml index a0ce5b2d..7fe409c9 100644 --- a/contrib/m_sipaf/config/config.yml +++ b/contrib/m_sipaf/config/config.yml @@ -223,6 +223,31 @@ site_details_fields: prefilters: __f__`id_passage_faune = ${o.object(x, 'site').value}` sort: date_diagnostic- + - label: __f__o.tab_label(x) + object_code: synthese + hidden: "__f__!o.config({...context, object_code: 'site'})?.value_xy" + items: + - type: object + display: table + prefilters: | + __f__{ + const xy = o.config({...context, object_code: 'site'})?.value_xy; + return xy + ? `the_geom_4326 dwithin ${xy.x};${xy.y};1000` + : `id_synthese = -1` + } + actions: + R: + url: "#/synthese/occurrence/" + title: Liens vers le module de synthese + items: + - date_min + - dataset.dataset_name + - taxref.nom_vern + - nomenclature_bio_condition.label_fr + - cor_observers.nom_complet + sort: date_min- + site_form_fields: display: tabs overflow: true @@ -351,8 +376,6 @@ site_form_fields: schema_dot_table: pr_sipaf.t_passages_faune details: [] - - diagnostic_table_fields: - date_diagnostic - passage_faune.code_passage_faune diff --git a/contrib/m_sipaf/config/layouts/m_sipaf.site_details.layout.yml b/contrib/m_sipaf/config/layouts/m_sipaf.site_details.layout.yml index 7416e012..e593fc72 100644 --- a/contrib/m_sipaf/config/layouts/m_sipaf.site_details.layout.yml +++ b/contrib/m_sipaf/config/layouts/m_sipaf.site_details.layout.yml @@ -9,7 +9,7 @@ layout: items: - type: map flex: 2 - zoom: 12 + zoom: 14 items: - type: object zoom: true @@ -17,6 +17,24 @@ layout: object_code: site prefilters: __f__`id_passage_faune = ${o.object(x, 'site').value}` popup_fields: __SITE_MAP_POPUP_FIELDS__ + bring_to_front: true + tooltip_permanent: true + - type: object + display: geojson + object_code: synthese + prefilters: | + __f__{ + const xy = o.config({...context, object_code: 'site'})?.value_xy; + return xy + ? `the_geom_4326 dwithin ${xy.x};${xy.y};1000` + : `id_synthese = -1` + } + popup_fields: + - date_min + - dataset.dataset_name + - taxref.nom_vern + - nomenclature_bio_condition.label_fr + - cor_observers.nom_complet - flex: 3 items: diff --git a/contrib/m_sipaf/config/layouts/m_sipaf.site_edit.layout.yml b/contrib/m_sipaf/config/layouts/m_sipaf.site_edit.layout.yml index 15df8440..8b6141a9 100644 --- a/contrib/m_sipaf/config/layouts/m_sipaf.site_edit.layout.yml +++ b/contrib/m_sipaf/config/layouts/m_sipaf.site_edit.layout.yml @@ -10,4 +10,4 @@ layout: template_params: object_code: site layout: __SITE_FORM_FIELDS__ - zoom: 12 + zoom: 13 diff --git a/contrib/m_sipaf/config/m_sipaf.module.yml b/contrib/m_sipaf/config/m_sipaf.module.yml index 73e17224..564765ba 100644 --- a/contrib/m_sipaf/config/m_sipaf.module.yml +++ b/contrib/m_sipaf/config/m_sipaf.module.yml @@ -24,6 +24,15 @@ objects: diagnostic: schema_code: m_sipaf.diag cruved: CRUD + synthese: + schema_code: syn.synthese + label: observation + labels: observations + cruved: R + map: + style: + color: red + tree: site: diff --git a/frontend/app/components/layout/base/layout-map.component.html b/frontend/app/components/layout/base/layout-map.component.html index db6f68c7..d540b421 100644 --- a/frontend/app/components/layout/base/layout-map.component.html +++ b/frontend/app/components/layout/base/layout-map.component.html @@ -22,15 +22,15 @@
-
+
-
-
+
+
{{ _map?.coordinatesTxt }}
diff --git a/frontend/app/components/layout/base/layout-map.component.scss b/frontend/app/components/layout/base/layout-map.component.scss index e31b3e6c..e9487f15 100644 --- a/frontend/app/components/layout/base/layout-map.component.scss +++ b/frontend/app/components/layout/base/layout-map.component.scss @@ -1,18 +1,40 @@ @import '../../../../node_modules/@geoman-io/leaflet-geoman-free/dist/leaflet-geoman.css'; +// patch pour les modal en fixed absolute +// pour que la carte (ou ses contrôles ne passent pas devant la modale +.map .leaflet-map-pane, +.map .leaflet-top, +.map .leaflet-bottom { + z-index: 1; +} + +.map { + height: 100%; + z-index: 1 important; +} + +.map > div { + height: 100%; +} + +.map-container { + height: 100%; + position: relative; +} + .button-container { padding: Opx; } .coordinates { - position: absolute; - bottom: 10px; - z-index: 9999; - text-align: center; - width: 400px; - left: 50%; - margin-left: -200px; - background-color: rgba(255, 255, 255, 0.5); - border-radius: 5px; - border-color: gray; - } \ No newline at end of file + position: absolute; + bottom: 10px; + z-index: 999; + text-align: center; + width: 400px; + left: 50%; + margin-left: -200px; + background-color: rgba(255, 255, 255, 0.5); + border-radius: 5px; + border-color: gray; +} diff --git a/frontend/app/components/layout/base/layout-modal.component.html b/frontend/app/components/layout/base/layout-modal.component.html index 44ed3b39..53014a49 100644 --- a/frontend/app/components/layout/base/layout-modal.component.html +++ b/frontend/app/components/layout/base/layout-modal.component.html @@ -1,6 +1,6 @@
-
+
-
+
diff --git a/frontend/app/components/layout/base/layout-modal.component.scss b/frontend/app/components/layout/base/layout-modal.component.scss index 9cf504f1..1a3bde46 100644 --- a/frontend/app/components/layout/base/layout-modal.component.scss +++ b/frontend/app/components/layout/base/layout-modal.component.scss @@ -1,7 +1,7 @@ .modal-container { z-index: 100000; background-color: rgba(0,0,0,0.7); - position: absolute; + position: fixed; top:0px; left:0px; height: 100%; @@ -11,12 +11,12 @@ justify-content: center; } -.modal-container > div { +.modal-container > div{ width: fit-content; padding: 10px; opacity: 1; } -.modal-container > div > div{ +.modal-container > div > div { background-color: red; } diff --git a/frontend/app/components/layout/form/generic-form.component.scss b/frontend/app/components/layout/form/generic-form.component.scss index ac0fefe3..f9873669 100644 --- a/frontend/app/components/layout/form/generic-form.component.scss +++ b/frontend/app/components/layout/form/generic-form.component.scss @@ -1,7 +1,3 @@ :host::ng-deep .ng-invalid { border-left: none !important; -} - -// :host::ng-deep .ng-invalid > .ng-invalid { -// border-left: none; -// } \ No newline at end of file +} \ No newline at end of file diff --git a/frontend/app/components/layout/import/layout-import.component.ts b/frontend/app/components/layout/import/layout-import.component.ts index 4498854a..bd0a135f 100644 --- a/frontend/app/components/layout/import/layout-import.component.ts +++ b/frontend/app/components/layout/import/layout-import.component.ts @@ -101,7 +101,6 @@ export class ModulesLayoutImportComponent extends ModulesLayoutComponent impleme this._mLayout.stopActionProcessing(''); const response = importEvent.body as any; this.importData = { ...this.importData, ...response }; - console.log(this.importData); this.setStep(); if (response.status == 'DONE') { if (response.res.nb_unchanged != response.res.nb_process) { diff --git a/frontend/app/components/layout/object/layout-object-geojson.component.ts b/frontend/app/components/layout/object/layout-object-geojson.component.ts index 94846f10..baf6aed1 100644 --- a/frontend/app/components/layout/object/layout-object-geojson.component.ts +++ b/frontend/app/components/layout/object/layout-object-geojson.component.ts @@ -51,6 +51,10 @@ export class ModulesLayoutObjectGeoJSONComponent console.error(`le layer (${this.pkFieldName()}==${value}) n'est pas présent`); return; } + if (layer._latlng) { + this.setObject({ value_xy: { x: layer._latlng.lng, y: layer._latlng.lat } }); + } + layer.bringToFront(); layer.openPopup(); } @@ -72,10 +76,11 @@ export class ModulesLayoutObjectGeoJSONComponent const currentZoom = this._mapService.getZoom(this.context.map_id); const currentMapBounds = this._mapService.getMapBounds(this.context.map_id); - const layerStyle = this.computedLayout.style || this.context.map?.style; + const layerStyle = + this.computedLayout.style || this.objectConfig()?.map?.style || this.context.map?.style; const paneName = this.computedLayout.pane || this.context.map?.pane || `P1`; const bZoom = this.computedLayout.zoom || this.context.map?.zoom; - + const bTooltipPermanent = this.computedLayout.tooltip_permanent; const bring_to_front = this.computedLayout.bring_to_front || this.context.map?.bring_to_front; this.mapData = { geojson, @@ -98,7 +103,7 @@ export class ModulesLayoutObjectGeoJSONComponent }); /** tooltip */ - const label = feature.properties[label_field_name]; + const label = utils.getAttr(feature.properties, label_field_name); if (label) { const action = this._mapService.actionTooltipDisplayZoomThreshold( this.context.map_id, @@ -109,19 +114,21 @@ export class ModulesLayoutObjectGeoJSONComponent currentMapBounds ); layer - .bindTooltip(label, { + .bindTooltip(label.toString(), { direction: 'top', - permanent: action == 'display', + permanent: action == 'display' && bTooltipPermanent, className: 'anim-tooltip', }) .openTooltip(); /** tooltip - zoom et emprise */ - layer.onZoomMoveEnd = this._mapService.layerZoomMoveEndListener( - this.context.map_id, - layer, - this.tooltipDisplayZoomTreshold - ); + if (bTooltipPermanent) { + layer.onZoomMoveEnd = this._mapService.layerZoomMoveEndListener( + this.context.map_id, + layer, + this.tooltipDisplayZoomTreshold + ); + } } layer.bindPopup(this.popupHTML(feature.properties)).on('popupopen', (event) => { this.onPopupOpen(layer); @@ -130,7 +137,7 @@ export class ModulesLayoutObjectGeoJSONComponent }, }; const d = {}; - d[this.computedLayout.key] = this.mapData; + d[this.context.object_code] = this.mapData; this._mapService.processData(this.context.map_id, d, { // key: this.computedLayout.key, zoom: this.computedLayout.zoom, @@ -140,9 +147,10 @@ export class ModulesLayoutObjectGeoJSONComponent popupHTML(properties) { const fields = this.popupFields(); - const label = `${this.utils.capitalize(this.objectConfig().display.label)}: ${ - properties[this.labelFieldName()] - }`; + + const label = `${this.utils.capitalize( + this.objectConfig().display.label + )}: ${utils.getAttr(properties, this.labelFieldName())}`; var propertiesHTML = ''; propertiesHTML += '
    \n'; propertiesHTML += fields diff --git a/frontend/app/components/layout/object/layout-object-table.component.ts b/frontend/app/components/layout/object/layout-object-table.component.ts index 46e8263a..20613542 100644 --- a/frontend/app/components/layout/object/layout-object-table.component.ts +++ b/frontend/app/components/layout/object/layout-object-table.component.ts @@ -82,28 +82,8 @@ export class ModulesLayoutObjectTableComponent } onRowClick = (e, row) => { - let action = utils.getAttr(e, 'target.attributes.action.nodeValue') - ? utils.getAttr(e, 'target.attributes.action.nodeValue') - : e.target.getElementsByClassName('action').length - ? utils.getAttr(e.target.getElementsByClassName('action')[0], 'attributes.action.nodeValue') - : 'selected'; const value = this.getRowValue(row); - - if (['details', 'edit'].includes(action)) { - this._mAction.processAction({ - action, - context: this.context, - value, - }); - } - - if (action == 'delete') { - this._mLayout.openModal('delete', this.getRowData(row)); - } - - if (action == 'selected') { - this.setObject({ value }); - } + this.setObject({ value }); }; getRowValue(row) { diff --git a/frontend/app/services/map/base.ts b/frontend/app/services/map/base.ts index 6b12746d..dfd98472 100644 --- a/frontend/app/services/map/base.ts +++ b/frontend/app/services/map/base.ts @@ -167,7 +167,6 @@ export default { map.on('contextmenu', (event: any) => { map.coordinatesTxt = `${event.latlng.lng}, ${event.latlng.lat}`; navigator.clipboard.writeText(`${event.latlng.lng}, ${event.latlng.lat}`); - console.log(`${event.latlng.lng} ${event.latlng.lat}`); }); // init panes diff --git a/frontend/app/services/map/layer.ts b/frontend/app/services/map/layer.ts index c7cb828d..c93e28f5 100644 --- a/frontend/app/services/map/layer.ts +++ b/frontend/app/services/map/layer.ts @@ -254,6 +254,10 @@ export default { if (bring_to_front) { setTimeout(() => { layer.bringToFront(); + const tooltip = layer.getTooltip(); + if (tooltip) { + layer.unbindTooltip().bindTooltip(tooltip); + } }, 500); } if (!!onEachFeature) { @@ -308,6 +312,7 @@ export default { layerZoomMoveEndListener(mapId, layer, tooltipDisplayZoomTreshold) { // on garde en mémoire le dernier zoom + var lastZoomLevel; var lastMapBounds; @@ -316,6 +321,7 @@ export default { if (!tooltip) { return; } + const tooltipDisplayed = tooltip.options.permanent; const action = this.actionTooltipDisplayZoomThreshold( mapId, diff --git a/frontend/app/services/route.service.ts b/frontend/app/services/route.service.ts index b4687b50..1ff9fca8 100644 --- a/frontend/app/services/route.service.ts +++ b/frontend/app/services/route.service.ts @@ -113,6 +113,9 @@ export class ModulesRouteService { * patch pour pouvoir rediriger sur la meme url */ redirect(url) { + if (url[0] == '#') { + url = url.substring(1); + } this._router.navigateByUrl('/', { skipLocationChange: true }).then(() => { this._router.navigateByUrl(url); }); diff --git a/frontend/app/services/table.service.ts b/frontend/app/services/table.service.ts index fb3fe4e4..034158ed 100644 --- a/frontend/app/services/table.service.ts +++ b/frontend/app/services/table.service.ts @@ -2,14 +2,23 @@ import { Injectable, Injector } from '@angular/core'; import utils from '../utils'; import { ModulesConfigService } from './config.service'; import { ModulesObjectService } from './object.service'; +import { ModulesActionService } from './action.service'; +import { ModulesRouteService } from './route.service'; +import { ModulesLayoutService } from './layout.service'; @Injectable() export class ModulesTableService { + _mAction: ModulesActionService; _mConfig: ModulesConfigService; _mObject: ModulesObjectService; + _mRoute: ModulesRouteService; + _mLayout: ModulesLayoutService; constructor(private _injector: Injector) { this._mConfig = this._injector.get(ModulesConfigService); this._mObject = this._injector.get(ModulesObjectService); + this._mAction = this._injector.get(ModulesActionService); + this._mRoute = this._injector.get(ModulesRouteService); + this._mLayout = this._injector.get(ModulesLayoutService); } /** permet de passer des paramètre de tri du format tabulator @@ -55,7 +64,7 @@ export class ModulesTableService { * - On utilise mPage.chekcLink pour voir si et comment on affiche l'action en question * - L'appartenance (scope) sera fournie par les données du rang de la cellule dans les fonction formatter et tooltip) * */ - columnAction(context, action) { + columnAction(layout, context, action) { // test si l'action est possible (ou avant) const iconAction = { @@ -71,7 +80,8 @@ export class ModulesTableService { }; const { actionAllowed, actionMsg } = this._mObject.checkAction(context, action); - if (actionAllowed == null) { + + if (actionAllowed == null && !(layout?.actions && layout?.actions[action])) { return; } @@ -79,14 +89,40 @@ export class ModulesTableService { headerSort: false, formatter: (cell, formatterParams, onRendered) => { const scope = cell._cell.row.data['scope']; - const { actionAllowed, actionMsg } = this._mObject.checkAction(context, action, scope); - return ``; + }'>`; + return html; }, width: 22, hozAlign: 'center', + cellClick: (e, cell) => { + const data = cell._cell.row.data; + const value = this._mObject.objectId({ context, data }); + if (layout?.actions?.[action]) { + const href = layout.actions[action].url.replace('', value); + this._mRoute.redirect(href); + return; + } + + if (['R', 'U'].includes(action)) { + this._mAction.processAction({ + action: actionTxt[action], + context, + value, + }); + } + + if (action == 'D') { + this._mLayout.openModal('delete', data); + } + }, tooltip: (cell) => { + if (layout.actions?.[action]) { + return layout?.actions[action].title; + } const scope = cell._cell.row.data['scope']; const { actionAllowed, actionMsg } = this._mObject.checkAction(context, action, scope); return actionMsg; @@ -101,10 +137,10 @@ export class ModulesTableService { * U: update / edit * D: delete */ - columnsAction(context) { + columnsAction(layout, context) { const columnsAction = 'RUD' .split('') - .map((action) => this.columnAction(context, action)) + .map((action) => this.columnAction(layout, context, action)) .filter((columnAction) => !!columnAction); return columnsAction; } @@ -116,7 +152,7 @@ export class ModulesTableService { */ columnsTable(fields, layout, context) { //column definition in the columns array - return [...this.columnsAction(context), ...this.columns(fields, layout, context)]; + return [...this.columnsAction(layout, context), ...this.columns(fields, layout, context)]; } columnLayoutItem(layoutItem, context) { @@ -137,7 +173,6 @@ export class ModulesTableService { columns(fields, layout, context) { const columns = fields.map((item) => this.columnLayoutItem(item, context)); - return columns.map((col) => { const column = utils.copy(col); column.headerFilter = column.headerFilter && layout.display_filters; diff --git a/frontend/app/utils/commons.ts b/frontend/app/utils/commons.ts index 615065a9..c759fbeb 100644 --- a/frontend/app/utils/commons.ts +++ b/frontend/app/utils/commons.ts @@ -38,7 +38,7 @@ const addKey = (keys, key) => { const getAttr = (obj, paths, index = 0) => { if (paths == null && index == 0) { - console.log('?????'); + console.log('????? GetAtrr'); console.trace(); } if (paths == null) { From fda2b80f45143417afb07229fb4bf0434ca34abb Mon Sep 17 00:00:00 2001 From: "joel.clement" Date: Wed, 21 Jun 2023 15:33:20 +0200 Subject: [PATCH 117/142] permissions --- backend/gn_modulator/__init__.py | 2 +- ...0a6e3_gn_modulator_permission_available.py | 69 +++++++++++++++++++ backend/gn_modulator/module/base.py | 5 +- backend/gn_modulator/module/commands.py | 5 +- backend/gn_modulator/module/config/utils.py | 7 +- backend/gn_modulator/schema/__init__.py | 3 +- .../gn_modulator/schema/repositories/base.py | 13 +++- ...ion.schema.yml_ => perm.action.schema.yml} | 6 +- ...ect.schema.yml_ => perm.object.schema.yml} | 2 +- .../permission/perm.perm_dispo.schema.yml | 15 ++++ ...schema.yml_ => perm.permission.schema.yml} | 2 +- .../features/m_sipaf.permissions.data.yml | 14 ++++ contrib/m_sipaf/config/m_sipaf.module.yml | 1 + frontend/app/components/page.component.html | 6 +- frontend/app/components/page.component.ts | 6 +- 15 files changed, 139 insertions(+), 17 deletions(-) create mode 100644 backend/gn_modulator/migrations/versions/b78eaab0a6e3_gn_modulator_permission_available.py rename config/definitions/utils/permission/{perm.action.schema.yml_ => perm.action.schema.yml} (63%) rename config/definitions/utils/permission/{perm.object.schema.yml_ => perm.object.schema.yml} (81%) create mode 100644 config/definitions/utils/permission/perm.perm_dispo.schema.yml rename config/definitions/utils/permission/{perm.permission.schema.yml_ => perm.permission.schema.yml} (78%) create mode 100644 contrib/m_sipaf/config/features/m_sipaf.permissions.data.yml diff --git a/backend/gn_modulator/__init__.py b/backend/gn_modulator/__init__.py index 6038274f..59cbaab1 100644 --- a/backend/gn_modulator/__init__.py +++ b/backend/gn_modulator/__init__.py @@ -19,7 +19,7 @@ def init_gn_modulator(): config_dir().mkdir(parents=True, exist_ok=True) symlink(config_modulator_dir, config_dir() / "modulator") - verbose = False + verbose = True # - definitions start_time = time.time() DefinitionMethods.init_definitions() diff --git a/backend/gn_modulator/migrations/versions/b78eaab0a6e3_gn_modulator_permission_available.py b/backend/gn_modulator/migrations/versions/b78eaab0a6e3_gn_modulator_permission_available.py new file mode 100644 index 00000000..bd47124d --- /dev/null +++ b/backend/gn_modulator/migrations/versions/b78eaab0a6e3_gn_modulator_permission_available.py @@ -0,0 +1,69 @@ +"""gn_modulator permissions available + +Revision ID: b78eaab0a6e3 +Revises: 3920371728d8 +Create Date: 2023-06-20 15:19:21.097194 + +""" +from alembic import op +import sqlalchemy as sa + + +# revision identifiers, used by Alembic. +revision = "b78eaab0a6e3" +down_revision = "3920371728d8" +depends_on = None + + +def upgrade(): + pass + + op.execute( + """ +INSERT INTO + gn_permissions.t_permissions_available ( + id_module, + id_object, + id_action, + label, + scope_filter + ) + SELECT + m.id_module, + o.id_object, + a.id_action, + v.label, + v.scope_filter + FROM + ( + VALUES + ('MODULATOR', 'ALL', 'C', False, 'Droit sur le module MODULATOR en création'), + ('MODULATOR', 'ALL', 'R', False, 'Droit sur le module MODULATOR en lecture'), + ('MODULATOR', 'ALL', 'U', False, 'Droit sur le module MODULATOR en édition'), + ('MODULATOR', 'ALL', 'D', False, 'Droit sur le module MODULATOR en suppression') + ) AS v (module_code, object_code, action_code, scope_filter, label) + JOIN + gn_commons.t_modules m ON m.module_code = v.module_code + JOIN + gn_permissions.t_objects o ON o.code_object = v.object_code + JOIN + gn_permissions.bib_actions a ON a.code_action = v.action_code + """ + ) + + +def downgrade(): + # suppression des droits disponibles pour le module MODULATOR + + op.execute( + """ + DELETE FROM + gn_permissions.t_permissions_available pa + USING + gn_commons.t_modules m + WHERE + pa.id_module = m.id_module + AND + module_code = 'MODULATOR' + """ + ) diff --git a/backend/gn_modulator/module/base.py b/backend/gn_modulator/module/base.py index 17b0db7c..f860809e 100644 --- a/backend/gn_modulator/module/base.py +++ b/backend/gn_modulator/module/base.py @@ -101,6 +101,9 @@ def register_db_module(cls, module_code): @classmethod def delete_db_module(cls, module_code): schema_module = SchemaMethods("commons.module") + id_module = schema_module.get_row(module_code, "module_code").one().id_module + SchemaMethods("perm.perm_dispo").delete_row(id_module, "id_module", multiple=True) + schema_module.delete_row(module_code, field_name="module_code", params={}) @classmethod @@ -136,8 +139,8 @@ def process_module_features(cls, module_code): print("- Ajout de données depuis les features") + infos = {} for data_code in data_codes: - infos = {} infos[data_code] = SchemaMethods.process_features(data_code) SchemaMethods.log(SchemaMethods.txt_data_infos(infos)) diff --git a/backend/gn_modulator/module/commands.py b/backend/gn_modulator/module/commands.py index 35a87b7a..499b97ea 100644 --- a/backend/gn_modulator/module/commands.py +++ b/backend/gn_modulator/module/commands.py @@ -84,10 +84,7 @@ def remove_module(cls, module_code, force=False): # suppression du module en base print("- suppression du module {} en base".format(module_code)) - try: - cls.delete_db_module(module_code) - except Exception: - print("Le module n'est pas présent en base") + cls.delete_db_module(module_code) # suppression de la config diff --git a/backend/gn_modulator/module/config/utils.py b/backend/gn_modulator/module/config/utils.py index f4d9b271..b43863dd 100644 --- a/backend/gn_modulator/module/config/utils.py +++ b/backend/gn_modulator/module/config/utils.py @@ -288,6 +288,8 @@ def process_fields(cls, module_code): @classmethod def process_base_fields(cls, module_code): module_config = cls.module_config(module_code) + if not module_config["registred"]: + return for object_code in module_config["objects"]: object_config = cls.object_config(module_code, object_code) if "R" in object_config["cruved"]: @@ -296,7 +298,8 @@ def process_base_fields(cls, module_code): @classmethod def add_basic_fields(cls, module_code, object_code): sm = SchemaMethods(cls.schema_code(module_code, object_code)) - + if sm.definition is None: + return authorized_read_fields = ( get_global_cache( [ @@ -451,6 +454,8 @@ def add_key(cls, context, key): schema_code = object_config["schema_code"] sm = SchemaMethods(schema_code) + if sm.definition is None: + return if not sm.has_property(key): # raise error ? diff --git a/backend/gn_modulator/schema/__init__.py b/backend/gn_modulator/schema/__init__.py index a28abe24..96b2f2e1 100644 --- a/backend/gn_modulator/schema/__init__.py +++ b/backend/gn_modulator/schema/__init__.py @@ -71,8 +71,9 @@ def init(self): """ Initialise le schema et le place dans le cache """ - definition = self.definition + if definition is None: + return None schema_code = definition["code"] if not definition: diff --git a/backend/gn_modulator/schema/repositories/base.py b/backend/gn_modulator/schema/repositories/base.py index db99a387..dcbbeac2 100644 --- a/backend/gn_modulator/schema/repositories/base.py +++ b/backend/gn_modulator/schema/repositories/base.py @@ -198,7 +198,15 @@ def update_row( return m, True - def delete_row(self, value, field_name=None, module_code=MODULE_CODE, params={}, commit=True): + def delete_row( + self, + value, + field_name=None, + module_code=MODULE_CODE, + params={}, + commit=True, + multiple=False, + ): """ delete row (Model. == value) """ @@ -211,7 +219,8 @@ def delete_row(self, value, field_name=None, module_code=MODULE_CODE, params={}, query_type="delete", ) # pour être sûr qu'il n'y a qu'une seule ligne de supprimée - m.one() + if not multiple: + m.one() # https://stackoverflow.com/questions/49794899/flask-sqlalchemy-delete-query-failing-with-could-not-evaluate-current-criteria?noredirect=1&lq=1 m.delete(synchronize_session=False) db.session.flush() diff --git a/config/definitions/utils/permission/perm.action.schema.yml_ b/config/definitions/utils/permission/perm.action.schema.yml similarity index 63% rename from config/definitions/utils/permission/perm.action.schema.yml_ rename to config/definitions/utils/permission/perm.action.schema.yml index bcd03009..b5b18564 100644 --- a/config/definitions/utils/permission/perm.action.schema.yml_ +++ b/config/definitions/utils/permission/perm.action.schema.yml @@ -5,9 +5,9 @@ description: Définition du schema des actions meta: autoschema: true - model: geonature.core.gn_permissions.models.TActions + model: geonature.core.gn_permissions.models.PermAction label: action - label_field_name: label_action - genre: M + label_field_name: code_action + genre: F unique: - code_action diff --git a/config/definitions/utils/permission/perm.object.schema.yml_ b/config/definitions/utils/permission/perm.object.schema.yml similarity index 81% rename from config/definitions/utils/permission/perm.object.schema.yml_ rename to config/definitions/utils/permission/perm.object.schema.yml index d28474dd..f4def9c6 100644 --- a/config/definitions/utils/permission/perm.object.schema.yml_ +++ b/config/definitions/utils/permission/perm.object.schema.yml @@ -6,7 +6,7 @@ description: Définition du schema des object de permission meta: schema_code: perm.object autoschema: true - model: geonature.core.gn_permissions.models.TObjects + model: geonature.core.gn_permissions.models.PermObject label: object label_field_name: label_object genre: M diff --git a/config/definitions/utils/permission/perm.perm_dispo.schema.yml b/config/definitions/utils/permission/perm.perm_dispo.schema.yml new file mode 100644 index 00000000..51d35de4 --- /dev/null +++ b/config/definitions/utils/permission/perm.perm_dispo.schema.yml @@ -0,0 +1,15 @@ +type: schema +code: perm.perm_dispo +title: Schema perm.perm_dispo +description: Définition du schema des permissions disponibles + +meta: + autoschema: true + model: geonature.core.gn_permissions.models.PermissionAvailable + label: permission + label_field_name: id_permssion + genre: F + unique: + - id_module + - id_action + - id_object diff --git a/config/definitions/utils/permission/perm.permission.schema.yml_ b/config/definitions/utils/permission/perm.permission.schema.yml similarity index 78% rename from config/definitions/utils/permission/perm.permission.schema.yml_ rename to config/definitions/utils/permission/perm.permission.schema.yml index 9b71d7cf..23ab2dd5 100644 --- a/config/definitions/utils/permission/perm.permission.schema.yml_ +++ b/config/definitions/utils/permission/perm.permission.schema.yml @@ -5,7 +5,7 @@ description: Définition du schema des permissions meta: autoschema: true - model: geonature.core.gn_permissions.models.CorRoleActionFilterModuleObject + model: geonature.core.gn_permissions.models.Permission label: permission label_field_name: id_permssion genre: F diff --git a/contrib/m_sipaf/config/features/m_sipaf.permissions.data.yml b/contrib/m_sipaf/config/features/m_sipaf.permissions.data.yml new file mode 100644 index 00000000..6aac9816 --- /dev/null +++ b/contrib/m_sipaf/config/features/m_sipaf.permissions.data.yml @@ -0,0 +1,14 @@ +type: data +code: m_sipaf.permissions +title: Data utils m_sipaf +description: feature pour sipaf (nomenclature, groupe de module) +items: + - schema_code: perm.perm_dispo + defaults: + id_module: m_sipaf + keys: [id_object, id_action, scope_filter, label] + items: + - [ALL, C, true, "Accès au module m_sipaf en création"] + - [ALL, R, true, "Accès au module m_sipaf en lecture"] + - [ALL, U, true, "Accès au module m_sipaf en édition"] + - [ALL, D, true, "Accès au module m_sipaf en suppression"] diff --git a/contrib/m_sipaf/config/m_sipaf.module.yml b/contrib/m_sipaf/config/m_sipaf.module.yml index 564765ba..267e7c8a 100644 --- a/contrib/m_sipaf/config/m_sipaf.module.yml +++ b/contrib/m_sipaf/config/m_sipaf.module.yml @@ -13,6 +13,7 @@ module: features: - m_sipaf.utils + - m_sipaf.permissions objects: site: diff --git a/frontend/app/components/page.component.html b/frontend/app/components/page.component.html index 71eff584..25676a38 100644 --- a/frontend/app/components/page.component.html +++ b/frontend/app/components/page.component.html @@ -5,10 +5,14 @@
    +
    + Vous n'avez pas les accès requis pour le module {{ moduleCode}} +
    + diff --git a/frontend/app/components/page.component.ts b/frontend/app/components/page.component.ts index a7867246..b24e7a46 100644 --- a/frontend/app/components/page.component.ts +++ b/frontend/app/components/page.component.ts @@ -39,7 +39,7 @@ export class PageComponent implements OnInit { data; // data pour le layout pageInitialized: boolean; // test si la page est initialisée (pour affichage) - + pageAuthorized: boolean; // test si on a au moins les accès en lecture sur le module moduleCode; pageCode; params; @@ -125,7 +125,11 @@ export class PageComponent implements OnInit { }) ) .subscribe(() => { + const cruved = this._gnModuleService.modules.find( + (m) => m.module_code == this.moduleCode + ).cruved; this.pageInitialized = true; + this.pageAuthorized = !!cruved.R; }); } From 56a64279351cda9add02e7a8c40fe8b36c49f29c Mon Sep 17 00:00:00 2001 From: "joel.clement" Date: Wed, 21 Jun 2023 15:45:54 +0200 Subject: [PATCH 118/142] up deps GN --- dependencies/GeoNature | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dependencies/GeoNature b/dependencies/GeoNature index aeb2cd19..367b67ea 160000 --- a/dependencies/GeoNature +++ b/dependencies/GeoNature @@ -1 +1 @@ -Subproject commit aeb2cd1939cb4d498ea575a02ac34a2d08494445 +Subproject commit 367b67ea3ca4d929ade15441138add838f6b29a8 From 635ed80db6a86fe0230970571edbbe1daa5acadb Mon Sep 17 00:00:00 2001 From: "joel.clement" Date: Wed, 21 Jun 2023 16:56:36 +0200 Subject: [PATCH 119/142] fix import display --- ...78eaab0a6e3_gn_modulator_permission_available.py | 9 +++++---- .../config/features/m_sipaf.permissions.data.yml | 13 +++++++------ frontend/app/services/object.service.ts | 8 ++++++-- 3 files changed, 18 insertions(+), 12 deletions(-) diff --git a/backend/gn_modulator/migrations/versions/b78eaab0a6e3_gn_modulator_permission_available.py b/backend/gn_modulator/migrations/versions/b78eaab0a6e3_gn_modulator_permission_available.py index bd47124d..bbf4c4ea 100644 --- a/backend/gn_modulator/migrations/versions/b78eaab0a6e3_gn_modulator_permission_available.py +++ b/backend/gn_modulator/migrations/versions/b78eaab0a6e3_gn_modulator_permission_available.py @@ -37,10 +37,11 @@ def upgrade(): FROM ( VALUES - ('MODULATOR', 'ALL', 'C', False, 'Droit sur le module MODULATOR en création'), - ('MODULATOR', 'ALL', 'R', False, 'Droit sur le module MODULATOR en lecture'), - ('MODULATOR', 'ALL', 'U', False, 'Droit sur le module MODULATOR en édition'), - ('MODULATOR', 'ALL', 'D', False, 'Droit sur le module MODULATOR en suppression') + ('MODULATOR', 'ALL', 'C', False, 'Accès création'), + ('MODULATOR', 'ALL', 'R', False, 'Accès lecture'), + ('MODULATOR', 'ALL', 'U', False, 'Accès édition'), + ('MODULATOR', 'ALL', 'D', False, 'Accès suppression') + ('MODULATOR', 'ALL', 'E', False, 'Accès export') ) AS v (module_code, object_code, action_code, scope_filter, label) JOIN gn_commons.t_modules m ON m.module_code = v.module_code diff --git a/contrib/m_sipaf/config/features/m_sipaf.permissions.data.yml b/contrib/m_sipaf/config/features/m_sipaf.permissions.data.yml index 6aac9816..22faf7ad 100644 --- a/contrib/m_sipaf/config/features/m_sipaf.permissions.data.yml +++ b/contrib/m_sipaf/config/features/m_sipaf.permissions.data.yml @@ -1,14 +1,15 @@ type: data code: m_sipaf.permissions -title: Data utils m_sipaf -description: feature pour sipaf (nomenclature, groupe de module) +title: Data permissions m_sipaf +description: Permissions disponibles pour le module m_sipaf items: - schema_code: perm.perm_dispo defaults: id_module: m_sipaf keys: [id_object, id_action, scope_filter, label] items: - - [ALL, C, true, "Accès au module m_sipaf en création"] - - [ALL, R, true, "Accès au module m_sipaf en lecture"] - - [ALL, U, true, "Accès au module m_sipaf en édition"] - - [ALL, D, true, "Accès au module m_sipaf en suppression"] + - [ALL, C, true, "Créer des passage à faune"] + - [ALL, R, true, "Accéder aux passage à faune"] + - [ALL, U, true, "Éditer les passages à faune"] + - [ALL, D, true, "Supprimer les passages à faune"] + - [ALL, E, true, "Exporter les passages à faune"] diff --git a/frontend/app/services/object.service.ts b/frontend/app/services/object.service.ts index fa1481ae..73a6eb3a 100644 --- a/frontend/app/services/object.service.ts +++ b/frontend/app/services/object.service.ts @@ -292,6 +292,7 @@ export class ModulesObjectService { const moduleConfig = this._mConfig.moduleConfig(context.module_code); const testObjectCruved = (objectConfig.cruved || '').includes(action); + if ('CRU'.includes(action)) { const moduleConfig = this._mConfig.moduleConfig(context.module_code); @@ -319,7 +320,10 @@ export class ModulesObjectService { // 2) l'utilisateur à t'il le droit // - les droit de l'utilisateur pour ce module et pour un action (CRUVED) - const moduleCruvedAction = moduleConfig.cruved[action]; + + // patch pour import on teste les droits en 'C' (creation) + const cruvedAction = action == 'I' ? 'C' : action; + const moduleCruvedAction = moduleConfig.cruved[cruvedAction]; // - on compare ce droit avec l'appartenance de la données // la possibilité d'action doit être supérieure à l'appartenance @@ -334,7 +338,7 @@ export class ModulesObjectService { let testUserCruved; // si les droit du module sont nul pour cet action => FALSE - if (moduleCruvedAction == 0) { + if (!moduleCruvedAction) { testUserCruved = false; // si l'action est CREATE, EXPORT, IMPORT (ne concerne pas une ligne précise) => TRUE } else if ('CEI'.includes(action)) { From b5c85c1642ce8ea29162cd4ad17d79c51741af5f Mon Sep 17 00:00:00 2001 From: "joel.clement" Date: Wed, 21 Jun 2023 17:14:30 +0200 Subject: [PATCH 120/142] fix migration permission modulator --- .../versions/b78eaab0a6e3_gn_modulator_permission_available.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/backend/gn_modulator/migrations/versions/b78eaab0a6e3_gn_modulator_permission_available.py b/backend/gn_modulator/migrations/versions/b78eaab0a6e3_gn_modulator_permission_available.py index bbf4c4ea..d96fbfa0 100644 --- a/backend/gn_modulator/migrations/versions/b78eaab0a6e3_gn_modulator_permission_available.py +++ b/backend/gn_modulator/migrations/versions/b78eaab0a6e3_gn_modulator_permission_available.py @@ -40,7 +40,7 @@ def upgrade(): ('MODULATOR', 'ALL', 'C', False, 'Accès création'), ('MODULATOR', 'ALL', 'R', False, 'Accès lecture'), ('MODULATOR', 'ALL', 'U', False, 'Accès édition'), - ('MODULATOR', 'ALL', 'D', False, 'Accès suppression') + ('MODULATOR', 'ALL', 'D', False, 'Accès suppression'), ('MODULATOR', 'ALL', 'E', False, 'Accès export') ) AS v (module_code, object_code, action_code, scope_filter, label) JOIN From 192eb8b1881c1c23162cec8d976dc0a8000401b0 Mon Sep 17 00:00:00 2001 From: Camille Monchicourt Date: Thu, 22 Jun 2023 14:49:51 +0200 Subject: [PATCH 121/142] Review SIPAF available permissions --- .../m_sipaf/config/features/m_sipaf.permissions.data.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/contrib/m_sipaf/config/features/m_sipaf.permissions.data.yml b/contrib/m_sipaf/config/features/m_sipaf.permissions.data.yml index 22faf7ad..dbd7f469 100644 --- a/contrib/m_sipaf/config/features/m_sipaf.permissions.data.yml +++ b/contrib/m_sipaf/config/features/m_sipaf.permissions.data.yml @@ -8,8 +8,8 @@ items: id_module: m_sipaf keys: [id_object, id_action, scope_filter, label] items: - - [ALL, C, true, "Créer des passage à faune"] - - [ALL, R, true, "Accéder aux passage à faune"] - - [ALL, U, true, "Éditer les passages à faune"] - - [ALL, D, true, "Supprimer les passages à faune"] + - [ALL, C, true, "Créer des passages à faune"] + - [ALL, R, true, "Voir les passages à faune"] + - [ALL, U, true, "Modifier les passages à faune"] + - [ALL, D, true, "Supprimer des passages à faune"] - [ALL, E, true, "Exporter les passages à faune"] From fce06805ffda590e69eb7b1686a71f0ce18e0c88 Mon Sep 17 00:00:00 2001 From: "joel.clement" Date: Thu, 22 Jun 2023 15:50:14 +0200 Subject: [PATCH 122/142] permission available modulator R only --- .../b78eaab0a6e3_gn_modulator_permission_available.py | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/backend/gn_modulator/migrations/versions/b78eaab0a6e3_gn_modulator_permission_available.py b/backend/gn_modulator/migrations/versions/b78eaab0a6e3_gn_modulator_permission_available.py index d96fbfa0..ee10c860 100644 --- a/backend/gn_modulator/migrations/versions/b78eaab0a6e3_gn_modulator_permission_available.py +++ b/backend/gn_modulator/migrations/versions/b78eaab0a6e3_gn_modulator_permission_available.py @@ -37,11 +37,7 @@ def upgrade(): FROM ( VALUES - ('MODULATOR', 'ALL', 'C', False, 'Accès création'), - ('MODULATOR', 'ALL', 'R', False, 'Accès lecture'), - ('MODULATOR', 'ALL', 'U', False, 'Accès édition'), - ('MODULATOR', 'ALL', 'D', False, 'Accès suppression'), - ('MODULATOR', 'ALL', 'E', False, 'Accès export') + ('MODULATOR', 'ALL', 'R', False, 'Accéder aux modules') ) AS v (module_code, object_code, action_code, scope_filter, label) JOIN gn_commons.t_modules m ON m.module_code = v.module_code From 6471330af2c83e7336d36467dada77965d348eb5 Mon Sep 17 00:00:00 2001 From: Camille Monchicourt Date: Thu, 22 Jun 2023 15:53:17 +0200 Subject: [PATCH 123/142] Readme - Review doc install Harmonisation de la doc avec les autres modules --- README.md | 24 ++++++++++++++++++------ 1 file changed, 18 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 30812848..80bfa7a0 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,7 @@ ## Présentation Ce module GeoNature est un générateur de modules, qui permet construire dynamiquement des sous-modules disposant de leur propre modèle de données, -à partir de fichiers de configuration JSON. +à partir de fichiers de configuration YAML. Chaque sous-module dispose d'une page d'accueil avec une carte, liste et filtres des objets du sous-module : @@ -15,18 +15,30 @@ Et une fiche détail et de saisie de chaque objet : ## Installation -Compatible avec la version 2.11.2 (et plus) de GeoNature. +Compatible avec la version 2.13.0 (et plus) de GeoNature. -Se placer dans le répertoire backend de GeoNature et activer le virtualenv +- Téléchargez le module dans ``/home//``, en remplacant ``X.Y.Z`` par la version souhaitée ```bash -source venv/bin/activate +cd +wget https://github.com/PnX-SI/gn_modulator/archive/X.Y.Z.zip +unzip X.Y.Z.zip +rm X.Y.Z.zip ``` -Lancer la commande d'installation +- Renommez le répertoire du module ```bash -geonature install_gn_module MODULATOR +mv ~/gn_modulator-X.Y.Z ~/gn_modulator +``` + +- Lancez l'installation du module + +```bash +source ~/geonature/backend/venv/bin/activate +geonature install-gn-module ~/gn_modulator MODULATOR +sudo systemctl restart geonature +deactivate ``` - [Liste des commandes du module](./doc/commandes.md) From c2b9730a692c2a5c9f0b3dd1533967e5f2586f2b Mon Sep 17 00:00:00 2001 From: "joel.clement" Date: Thu, 22 Jun 2023 16:14:04 +0200 Subject: [PATCH 124/142] up geoman --- frontend/package-lock.json | 528 +------------------------------------ frontend/package.json | 2 +- 2 files changed, 8 insertions(+), 522 deletions(-) diff --git a/frontend/package-lock.json b/frontend/package-lock.json index f0bdbbbc..97b5e332 100644 --- a/frontend/package-lock.json +++ b/frontend/package-lock.json @@ -1,521 +1,13 @@ { "name": "gn_modulator", "version": "0.0.1", - "lockfileVersion": 2, + "lockfileVersion": 1, "requires": true, - "packages": { - "": { - "name": "gn_modulator", - "version": "0.0.1", - "license": "ISC", - "dependencies": { - "@geoman-io/leaflet-geoman-free": "^2.14.1", - "js-yaml": "^4.1.0", - "tabulator": "^0.2.40", - "tabulator-tables": "^4.9.3" - } - }, - "node_modules/@geoman-io/leaflet-geoman-free": { - "version": "2.14.1", - "resolved": "https://registry.npmjs.org/@geoman-io/leaflet-geoman-free/-/leaflet-geoman-free-2.14.1.tgz", - "integrity": "sha512-Uvynea84IVnT7CNkxyF68gU+qerhDi1ybRJRWbwvMG09isIZzCiVbVkdQzXqlLRMRwY/FIYFwlbCCuv94ML5Gw==", - "dependencies": { - "@turf/boolean-contains": "^6.5.0", - "@turf/kinks": "^6.5.0", - "@turf/line-intersect": "^6.5.0", - "@turf/line-split": "^6.5.0", - "lodash": "4.17.21", - "polygon-clipping": "0.15.3" - }, - "peerDependencies": { - "leaflet": "^1.2.0" - } - }, - "node_modules/@turf/bbox": { - "version": "6.5.0", - "resolved": "https://registry.npmjs.org/@turf/bbox/-/bbox-6.5.0.tgz", - "integrity": "sha512-RBbLaao5hXTYyyg577iuMtDB8ehxMlUqHEJiMs8jT1GHkFhr6sYre3lmLsPeYEi/ZKj5TP5tt7fkzNdJ4GIVyw==", - "dependencies": { - "@turf/helpers": "^6.5.0", - "@turf/meta": "^6.5.0" - }, - "funding": { - "url": "https://opencollective.com/turf" - } - }, - "node_modules/@turf/bearing": { - "version": "6.5.0", - "resolved": "https://registry.npmjs.org/@turf/bearing/-/bearing-6.5.0.tgz", - "integrity": "sha512-dxINYhIEMzgDOztyMZc20I7ssYVNEpSv04VbMo5YPQsqa80KO3TFvbuCahMsCAW5z8Tncc8dwBlEFrmRjJG33A==", - "dependencies": { - "@turf/helpers": "^6.5.0", - "@turf/invariant": "^6.5.0" - }, - "funding": { - "url": "https://opencollective.com/turf" - } - }, - "node_modules/@turf/boolean-contains": { - "version": "6.5.0", - "resolved": "https://registry.npmjs.org/@turf/boolean-contains/-/boolean-contains-6.5.0.tgz", - "integrity": "sha512-4m8cJpbw+YQcKVGi8y0cHhBUnYT+QRfx6wzM4GI1IdtYH3p4oh/DOBJKrepQyiDzFDaNIjxuWXBh0ai1zVwOQQ==", - "dependencies": { - "@turf/bbox": "^6.5.0", - "@turf/boolean-point-in-polygon": "^6.5.0", - "@turf/boolean-point-on-line": "^6.5.0", - "@turf/helpers": "^6.5.0", - "@turf/invariant": "^6.5.0" - }, - "funding": { - "url": "https://opencollective.com/turf" - } - }, - "node_modules/@turf/boolean-point-in-polygon": { - "version": "6.5.0", - "resolved": "https://registry.npmjs.org/@turf/boolean-point-in-polygon/-/boolean-point-in-polygon-6.5.0.tgz", - "integrity": "sha512-DtSuVFB26SI+hj0SjrvXowGTUCHlgevPAIsukssW6BG5MlNSBQAo70wpICBNJL6RjukXg8d2eXaAWuD/CqL00A==", - "dependencies": { - "@turf/helpers": "^6.5.0", - "@turf/invariant": "^6.5.0" - }, - "funding": { - "url": "https://opencollective.com/turf" - } - }, - "node_modules/@turf/boolean-point-on-line": { - "version": "6.5.0", - "resolved": "https://registry.npmjs.org/@turf/boolean-point-on-line/-/boolean-point-on-line-6.5.0.tgz", - "integrity": "sha512-A1BbuQ0LceLHvq7F/P7w3QvfpmZqbmViIUPHdNLvZimFNLo4e6IQunmzbe+8aSStH9QRZm3VOflyvNeXvvpZEQ==", - "dependencies": { - "@turf/helpers": "^6.5.0", - "@turf/invariant": "^6.5.0" - }, - "funding": { - "url": "https://opencollective.com/turf" - } - }, - "node_modules/@turf/destination": { - "version": "6.5.0", - "resolved": "https://registry.npmjs.org/@turf/destination/-/destination-6.5.0.tgz", - "integrity": "sha512-4cnWQlNC8d1tItOz9B4pmJdWpXqS0vEvv65bI/Pj/genJnsL7evI0/Xw42RvEGROS481MPiU80xzvwxEvhQiMQ==", - "dependencies": { - "@turf/helpers": "^6.5.0", - "@turf/invariant": "^6.5.0" - }, - "funding": { - "url": "https://opencollective.com/turf" - } - }, - "node_modules/@turf/distance": { - "version": "6.5.0", - "resolved": "https://registry.npmjs.org/@turf/distance/-/distance-6.5.0.tgz", - "integrity": "sha512-xzykSLfoURec5qvQJcfifw/1mJa+5UwByZZ5TZ8iaqjGYN0vomhV9aiSLeYdUGtYRESZ+DYC/OzY+4RclZYgMg==", - "dependencies": { - "@turf/helpers": "^6.5.0", - "@turf/invariant": "^6.5.0" - }, - "funding": { - "url": "https://opencollective.com/turf" - } - }, - "node_modules/@turf/helpers": { - "version": "6.5.0", - "resolved": "https://registry.npmjs.org/@turf/helpers/-/helpers-6.5.0.tgz", - "integrity": "sha512-VbI1dV5bLFzohYYdgqwikdMVpe7pJ9X3E+dlr425wa2/sMJqYDhTO++ec38/pcPvPE6oD9WEEeU3Xu3gza+VPw==", - "funding": { - "url": "https://opencollective.com/turf" - } - }, - "node_modules/@turf/invariant": { - "version": "6.5.0", - "resolved": "https://registry.npmjs.org/@turf/invariant/-/invariant-6.5.0.tgz", - "integrity": "sha512-Wv8PRNCtPD31UVbdJE/KVAWKe7l6US+lJItRR/HOEW3eh+U/JwRCSUl/KZ7bmjM/C+zLNoreM2TU6OoLACs4eg==", - "dependencies": { - "@turf/helpers": "^6.5.0" - }, - "funding": { - "url": "https://opencollective.com/turf" - } - }, - "node_modules/@turf/kinks": { - "version": "6.5.0", - "resolved": "https://registry.npmjs.org/@turf/kinks/-/kinks-6.5.0.tgz", - "integrity": "sha512-ViCngdPt1eEL7hYUHR2eHR662GvCgTc35ZJFaNR6kRtr6D8plLaDju0FILeFFWSc+o8e3fwxZEJKmFj9IzPiIQ==", - "dependencies": { - "@turf/helpers": "^6.5.0" - }, - "funding": { - "url": "https://opencollective.com/turf" - } - }, - "node_modules/@turf/line-intersect": { - "version": "6.5.0", - "resolved": "https://registry.npmjs.org/@turf/line-intersect/-/line-intersect-6.5.0.tgz", - "integrity": "sha512-CS6R1tZvVQD390G9Ea4pmpM6mJGPWoL82jD46y0q1KSor9s6HupMIo1kY4Ny+AEYQl9jd21V3Scz20eldpbTVA==", - "dependencies": { - "@turf/helpers": "^6.5.0", - "@turf/invariant": "^6.5.0", - "@turf/line-segment": "^6.5.0", - "@turf/meta": "^6.5.0", - "geojson-rbush": "3.x" - }, - "funding": { - "url": "https://opencollective.com/turf" - } - }, - "node_modules/@turf/line-segment": { - "version": "6.5.0", - "resolved": "https://registry.npmjs.org/@turf/line-segment/-/line-segment-6.5.0.tgz", - "integrity": "sha512-jI625Ho4jSuJESNq66Mmi290ZJ5pPZiQZruPVpmHkUw257Pew0alMmb6YrqYNnLUuiVVONxAAKXUVeeUGtycfw==", - "dependencies": { - "@turf/helpers": "^6.5.0", - "@turf/invariant": "^6.5.0", - "@turf/meta": "^6.5.0" - }, - "funding": { - "url": "https://opencollective.com/turf" - } - }, - "node_modules/@turf/line-split": { - "version": "6.5.0", - "resolved": "https://registry.npmjs.org/@turf/line-split/-/line-split-6.5.0.tgz", - "integrity": "sha512-/rwUMVr9OI2ccJjw7/6eTN53URtGThNSD5I0GgxyFXMtxWiloRJ9MTff8jBbtPWrRka/Sh2GkwucVRAEakx9Sw==", - "dependencies": { - "@turf/bbox": "^6.5.0", - "@turf/helpers": "^6.5.0", - "@turf/invariant": "^6.5.0", - "@turf/line-intersect": "^6.5.0", - "@turf/line-segment": "^6.5.0", - "@turf/meta": "^6.5.0", - "@turf/nearest-point-on-line": "^6.5.0", - "@turf/square": "^6.5.0", - "@turf/truncate": "^6.5.0", - "geojson-rbush": "3.x" - }, - "funding": { - "url": "https://opencollective.com/turf" - } - }, - "node_modules/@turf/meta": { - "version": "6.5.0", - "resolved": "https://registry.npmjs.org/@turf/meta/-/meta-6.5.0.tgz", - "integrity": "sha512-RrArvtsV0vdsCBegoBtOalgdSOfkBrTJ07VkpiCnq/491W67hnMWmDu7e6Ztw0C3WldRYTXkg3SumfdzZxLBHA==", - "dependencies": { - "@turf/helpers": "^6.5.0" - }, - "funding": { - "url": "https://opencollective.com/turf" - } - }, - "node_modules/@turf/nearest-point-on-line": { - "version": "6.5.0", - "resolved": "https://registry.npmjs.org/@turf/nearest-point-on-line/-/nearest-point-on-line-6.5.0.tgz", - "integrity": "sha512-WthrvddddvmymnC+Vf7BrkHGbDOUu6Z3/6bFYUGv1kxw8tiZ6n83/VG6kHz4poHOfS0RaNflzXSkmCi64fLBlg==", - "dependencies": { - "@turf/bearing": "^6.5.0", - "@turf/destination": "^6.5.0", - "@turf/distance": "^6.5.0", - "@turf/helpers": "^6.5.0", - "@turf/invariant": "^6.5.0", - "@turf/line-intersect": "^6.5.0", - "@turf/meta": "^6.5.0" - }, - "funding": { - "url": "https://opencollective.com/turf" - } - }, - "node_modules/@turf/square": { - "version": "6.5.0", - "resolved": "https://registry.npmjs.org/@turf/square/-/square-6.5.0.tgz", - "integrity": "sha512-BM2UyWDmiuHCadVhHXKIx5CQQbNCpOxB6S/aCNOCLbhCeypKX5Q0Aosc5YcmCJgkwO5BERCC6Ee7NMbNB2vHmQ==", - "dependencies": { - "@turf/distance": "^6.5.0", - "@turf/helpers": "^6.5.0" - }, - "funding": { - "url": "https://opencollective.com/turf" - } - }, - "node_modules/@turf/truncate": { - "version": "6.5.0", - "resolved": "https://registry.npmjs.org/@turf/truncate/-/truncate-6.5.0.tgz", - "integrity": "sha512-pFxg71pLk+eJj134Z9yUoRhIi8vqnnKvCYwdT4x/DQl/19RVdq1tV3yqOT3gcTQNfniteylL5qV1uTBDV5sgrg==", - "dependencies": { - "@turf/helpers": "^6.5.0", - "@turf/meta": "^6.5.0" - }, - "funding": { - "url": "https://opencollective.com/turf" - } - }, - "node_modules/@types/geojson": { - "version": "7946.0.8", - "resolved": "https://registry.npmjs.org/@types/geojson/-/geojson-7946.0.8.tgz", - "integrity": "sha512-1rkryxURpr6aWP7R786/UQOkJ3PcpQiWkAXBmdWc7ryFWqN6a4xfK7BtjXvFBKO9LjQ+MWQSWxYeZX1OApnArA==" - }, - "node_modules/adler-32": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/adler-32/-/adler-32-1.1.0.tgz", - "integrity": "sha512-lRKKX9RZQBPy6CrdUqiDUsxVcZujjbkkUg++0zLLyi0EwRui+aFyEDJBXRXCqwp+pmmybdZgBNHxOAOQcgdJYg==", - "dependencies": { - "exit-on-epipe": "~1.0.1", - "printj": "~1.1.0" - }, - "bin": { - "adler32": "bin/adler32.njs" - }, - "engines": { - "node": ">=0.8" - } - }, - "node_modules/argparse": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz", - "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==" - }, - "node_modules/best-globals": { - "version": "0.10.34", - "resolved": "https://registry.npmjs.org/best-globals/-/best-globals-0.10.34.tgz", - "integrity": "sha512-B3Y9VQOYWb/qb0AAzVWGnryvHIOlBRbD09a9wofIrZkJLIoqBVQtDX8E9Eq/Ka0mkjIxrx3ZOnIsmbZ4VhT15g==", - "engines": { - "node": ">= 12" - } - }, - "node_modules/cfb": { - "version": "1.0.8", - "resolved": "https://registry.npmjs.org/cfb/-/cfb-1.0.8.tgz", - "integrity": "sha512-oA7VomcgZRWTo8V20UYLlXu4ZOCFEAfwwrcxE8PcVzXW12WOhsi38PVnymb6Xoj8y7ghoZQOOOVRBMdLJ4jCjg==", - "dependencies": { - "commander": "^2.14.1", - "printj": "~1.1.2" - }, - "bin": { - "cfb": "bin/cfb.njs" - }, - "engines": { - "node": ">=0.8" - } - }, - "node_modules/cfb/node_modules/commander": { - "version": "2.20.3", - "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz", - "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==" - }, - "node_modules/codenautas-xlsx": { - "version": "0.11.12", - "resolved": "https://registry.npmjs.org/codenautas-xlsx/-/codenautas-xlsx-0.11.12.tgz", - "integrity": "sha512-9PcE3yxXknFnx86tS8Az5HxnNgbqV8I9RUYT1O+eqqCs7znNB98ERUYYQn8TzaFvNQ4TVoCNMy+2aFt1CJYSLQ==", - "dependencies": { - "adler-32": "~1.1.0", - "cfb": "~1.0.0", - "codepage": "~1.11.0", - "commander": "~2.11.0", - "crc-32": "~1.1.1", - "exit-on-epipe": "~1.0.1", - "ssf": "~0.10.1" - }, - "bin": { - "xlsx": "bin/xlsx.njs" - }, - "engines": { - "node": ">=0.8" - } - }, - "node_modules/codepage": { - "version": "1.11.1", - "resolved": "https://registry.npmjs.org/codepage/-/codepage-1.11.1.tgz", - "integrity": "sha512-8O+HHxMgdoSy3w/tyiStZGOnE2uOMep8vAoBtoQXbeOT7q3Ir+jwseM0bUVmeYvhfB2UX04Cb7D72ZzJbxSi5w==", - "dependencies": { - "commander": "~2.11.0", - "exit-on-epipe": "~1.0.1", - "voc": "~1.0.0" - }, - "bin": { - "codepage": "bin/codepage.njs" - }, - "engines": { - "node": ">=0.8" - } - }, - "node_modules/commander": { - "version": "2.11.0", - "resolved": "https://registry.npmjs.org/commander/-/commander-2.11.0.tgz", - "integrity": "sha512-b0553uYA5YAEGgyYIGYROzKQ7X5RAqedkfjiZxwi0kL1g3bOaBNNZfYkzt/CL0umgD5wc9Jec2FbB98CjkMRvQ==" - }, - "node_modules/crc-32": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/crc-32/-/crc-32-1.1.1.tgz", - "integrity": "sha512-DWXuRN3Wtu43YRfYZ9r17720WZqM0caEjIfT6Dk1J/3sAxIyyXbUWqIACbz3cjV8l7guJRW+9pZlYMluKJ69wg==", - "dependencies": { - "exit-on-epipe": "~1.0.1", - "printj": "~1.1.0" - }, - "bin": { - "crc32": "bin/crc32.njs" - }, - "engines": { - "node": ">=0.8" - } - }, - "node_modules/exit-on-epipe": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/exit-on-epipe/-/exit-on-epipe-1.0.1.tgz", - "integrity": "sha512-h2z5mrROTxce56S+pnvAV890uu7ls7f1kEvVGJbw1OlFH3/mlJ5bkXu0KRyW94v37zzHPiUd55iLn3DA7TjWpw==", - "engines": { - "node": ">=0.8" - } - }, - "node_modules/file-saver": { - "version": "2.0.5", - "resolved": "https://registry.npmjs.org/file-saver/-/file-saver-2.0.5.tgz", - "integrity": "sha512-P9bmyZ3h/PRG+Nzga+rbdI4OEpNDzAVyy74uVO9ATgzLK6VtAsYybF/+TOCvrc0MO793d6+42lLyZTw7/ArVzA==" - }, - "node_modules/frac": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/frac/-/frac-1.1.2.tgz", - "integrity": "sha512-w/XBfkibaTl3YDqASwfDUqkna4Z2p9cFSr1aHDt0WoMTECnRfBOv2WArlZILlqgWlmdIlALXGpM2AOhEk5W3IA==", - "engines": { - "node": ">=0.8" - } - }, - "node_modules/geojson-rbush": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/geojson-rbush/-/geojson-rbush-3.2.0.tgz", - "integrity": "sha512-oVltQTXolxvsz1sZnutlSuLDEcQAKYC/uXt9zDzJJ6bu0W+baTI8LZBaTup5afzibEH4N3jlq2p+a152wlBJ7w==", - "dependencies": { - "@turf/bbox": "*", - "@turf/helpers": "6.x", - "@turf/meta": "6.x", - "@types/geojson": "7946.0.8", - "rbush": "^3.0.1" - } - }, - "node_modules/js-to-html": { - "version": "1.0.11", - "resolved": "https://registry.npmjs.org/js-to-html/-/js-to-html-1.0.11.tgz", - "integrity": "sha512-B3cyNVI2uQLDFafnYTRLyRabWCp2E59VY0j3FFGD11rC9ISBNapiPF9+mh7w+SVN0cJeDDjQR2P1ZxHdEmocbQ==", - "engines": { - "node": ">= 8" - } - }, - "node_modules/js-yaml": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz", - "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==", - "dependencies": { - "argparse": "^2.0.1" - }, - "bin": { - "js-yaml": "bin/js-yaml.js" - } - }, - "node_modules/leaflet": { - "version": "1.9.3", - "resolved": "https://registry.npmjs.org/leaflet/-/leaflet-1.9.3.tgz", - "integrity": "sha512-iB2cR9vAkDOu5l3HAay2obcUHZ7xwUBBjph8+PGtmW/2lYhbLizWtG7nTeYht36WfOslixQF9D/uSIzhZgGMfQ==", - "peer": true - }, - "node_modules/like-ar": { - "version": "0.2.19", - "resolved": "https://registry.npmjs.org/like-ar/-/like-ar-0.2.19.tgz", - "integrity": "sha512-JGW4ymj2AbDaKDGm+D4bn45MHxoHv25yua+aJ4nu1NwbJbQBGpGueLKneETcFygVj1AMFG9yuSWkWGC7IAbWkQ==", - "engines": { - "node": ">= 4.0.0" - } - }, - "node_modules/lodash": { - "version": "4.17.21", - "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz", - "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==" - }, - "node_modules/polygon-clipping": { - "version": "0.15.3", - "resolved": "https://registry.npmjs.org/polygon-clipping/-/polygon-clipping-0.15.3.tgz", - "integrity": "sha512-ho0Xx5DLkgxRx/+n4O74XyJ67DcyN3Tu9bGYKsnTukGAW6ssnuak6Mwcyb1wHy9MZc9xsUWqIoiazkZB5weECg==", - "dependencies": { - "splaytree": "^3.1.0" - } - }, - "node_modules/printj": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/printj/-/printj-1.1.2.tgz", - "integrity": "sha512-zA2SmoLaxZyArQTOPj5LXecR+RagfPSU5Kw1qP+jkWeNlrq+eJZyY2oS68SU1Z/7/myXM4lo9716laOFAVStCQ==", - "bin": { - "printj": "bin/printj.njs" - }, - "engines": { - "node": ">=0.8" - } - }, - "node_modules/quickselect": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/quickselect/-/quickselect-2.0.0.tgz", - "integrity": "sha512-RKJ22hX8mHe3Y6wH/N3wCM6BWtjaxIyyUIkpHOvfFnxdI4yD4tBXEBKSbriGujF6jnSVkJrffuo6vxACiSSxIw==" - }, - "node_modules/rbush": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/rbush/-/rbush-3.0.1.tgz", - "integrity": "sha512-XRaVO0YecOpEuIvbhbpTrZgoiI6xBlz6hnlr6EHhd+0x9ase6EmeN+hdwwUaJvLcsFFQ8iWVF1GAK1yB0BWi0w==", - "dependencies": { - "quickselect": "^2.0.0" - } - }, - "node_modules/splaytree": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/splaytree/-/splaytree-3.1.1.tgz", - "integrity": "sha512-9FaQ18FF0+sZc/ieEeXHt+Jw2eSpUgUtTLDYB/HXKWvhYVyOc7h1hzkn5MMO3GPib9MmXG1go8+OsBBzs/NMww==" - }, - "node_modules/ssf": { - "version": "0.10.3", - "resolved": "https://registry.npmjs.org/ssf/-/ssf-0.10.3.tgz", - "integrity": "sha512-pRuUdW0WwyB2doSqqjWyzwCD6PkfxpHAHdZp39K3dp/Hq7f+xfMwNAWIi16DyrRg4gg9c/RvLYkJTSawTPTm1w==", - "dependencies": { - "frac": "~1.1.2" - }, - "bin": { - "ssf": "bin/ssf.njs" - }, - "engines": { - "node": ">=0.8" - } - }, - "node_modules/tabulator": { - "version": "0.2.40", - "resolved": "https://registry.npmjs.org/tabulator/-/tabulator-0.2.40.tgz", - "integrity": "sha512-62i/Vgnf55xPRaNd9xnGajMvul0GtZK1khud4Vv6f4EllkKYIvN3CDB5+jquyVMIqi0aBlThjgYZ6zm4BnRvIA==", - "dependencies": { - "best-globals": "~0.10.10", - "codenautas-xlsx": "0.11.12", - "file-saver": "~2.0.0", - "js-to-html": "~1.0.4", - "like-ar": "~0.2.9" - }, - "engines": { - "node": ">= 0.8.0" - } - }, - "node_modules/tabulator-tables": { - "version": "4.9.3", - "resolved": "https://registry.npmjs.org/tabulator-tables/-/tabulator-tables-4.9.3.tgz", - "integrity": "sha512-iwwQqAEGGxlgrBpcmJJvMJrfjGLcCXOB3AOb/DGkXqBy1YKoYA36hIl7qXGp6Jo8dSkzFAlDT6pKLZgyhs9OnQ==" - }, - "node_modules/voc": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/voc/-/voc-1.0.0.tgz", - "integrity": "sha512-mQwxWlK+zosxxDTqiFb9ZQBNgd794scgkhVwca7h9sEhvA52f3VzbOK+TOWeS8eSrFXnfuKrxElSPc5oLAetfw==", - "bin": { - "voc": "voc.njs" - }, - "engines": { - "node": ">=0.8" - } - } - }, "dependencies": { "@geoman-io/leaflet-geoman-free": { - "version": "2.14.1", - "resolved": "https://registry.npmjs.org/@geoman-io/leaflet-geoman-free/-/leaflet-geoman-free-2.14.1.tgz", - "integrity": "sha512-Uvynea84IVnT7CNkxyF68gU+qerhDi1ybRJRWbwvMG09isIZzCiVbVkdQzXqlLRMRwY/FIYFwlbCCuv94ML5Gw==", + "version": "2.14.2", + "resolved": "https://registry.npmjs.org/@geoman-io/leaflet-geoman-free/-/leaflet-geoman-free-2.14.2.tgz", + "integrity": "sha512-6lIyG8RvSVdFjVjiQgBPyNASjymSyqzsiUeBW0pA+q41lB5fAg4SDC6SfJvWdEyDHa81Jb5FWjUkCc9O+u0gbg==", "requires": { "@turf/boolean-contains": "^6.5.0", "@turf/kinks": "^6.5.0", @@ -809,12 +301,6 @@ "argparse": "^2.0.1" } }, - "leaflet": { - "version": "1.9.3", - "resolved": "https://registry.npmjs.org/leaflet/-/leaflet-1.9.3.tgz", - "integrity": "sha512-iB2cR9vAkDOu5l3HAay2obcUHZ7xwUBBjph8+PGtmW/2lYhbLizWtG7nTeYht36WfOslixQF9D/uSIzhZgGMfQ==", - "peer": true - }, "like-ar": { "version": "0.2.19", "resolved": "https://registry.npmjs.org/like-ar/-/like-ar-0.2.19.tgz", @@ -852,9 +338,9 @@ } }, "splaytree": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/splaytree/-/splaytree-3.1.1.tgz", - "integrity": "sha512-9FaQ18FF0+sZc/ieEeXHt+Jw2eSpUgUtTLDYB/HXKWvhYVyOc7h1hzkn5MMO3GPib9MmXG1go8+OsBBzs/NMww==" + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/splaytree/-/splaytree-3.1.2.tgz", + "integrity": "sha512-4OM2BJgC5UzrhVnnJA4BkHKGtjXNzzUfpQjCO8I05xYPsfS/VuQDwjCGGMi8rYQilHEV4j8NBqTFbls/PZEE7A==" }, "ssf": { "version": "0.10.3", diff --git a/frontend/package.json b/frontend/package.json index 34520d9d..d60484d8 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -9,7 +9,7 @@ "author": "PNX", "license": "ISC", "dependencies": { - "@geoman-io/leaflet-geoman-free": "^2.14.1", + "@geoman-io/leaflet-geoman-free": "^2.14.2", "js-yaml": "^4.1.0", "tabulator": "^0.2.40", "tabulator-tables": "^4.9.3" From a439181b79acf605540ce517aa40ee803f1432a6 Mon Sep 17 00:00:00 2001 From: Camille Monchicourt Date: Thu, 22 Jun 2023 21:42:10 +0200 Subject: [PATCH 125/142] Update m_sipaf.permissions.data.yml --- contrib/m_sipaf/config/features/m_sipaf.permissions.data.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/m_sipaf/config/features/m_sipaf.permissions.data.yml b/contrib/m_sipaf/config/features/m_sipaf.permissions.data.yml index dbd7f469..5b5b17c4 100644 --- a/contrib/m_sipaf/config/features/m_sipaf.permissions.data.yml +++ b/contrib/m_sipaf/config/features/m_sipaf.permissions.data.yml @@ -8,7 +8,7 @@ items: id_module: m_sipaf keys: [id_object, id_action, scope_filter, label] items: - - [ALL, C, true, "Créer des passages à faune"] + - [ALL, C, true, "Créer et importer des passages à faune"] - [ALL, R, true, "Voir les passages à faune"] - [ALL, U, true, "Modifier les passages à faune"] - [ALL, D, true, "Supprimer des passages à faune"] From fdf090bc5ddbba59276dcab1e3a2a48405a6adab Mon Sep 17 00:00:00 2001 From: "joel.clement" Date: Fri, 23 Jun 2023 15:33:04 +0200 Subject: [PATCH 126/142] remove process assets --- backend/gn_modulator/module/__init__.py | 1 - backend/gn_modulator/module/commands.py | 3 --- backend/gn_modulator/utils/files.py | 1 + frontend/app/services/config.service.ts | 2 +- 4 files changed, 2 insertions(+), 5 deletions(-) diff --git a/backend/gn_modulator/module/__init__.py b/backend/gn_modulator/module/__init__.py index a41b42dc..42bbbcb8 100644 --- a/backend/gn_modulator/module/__init__.py +++ b/backend/gn_modulator/module/__init__.py @@ -27,7 +27,6 @@ def init_modules(cls): for module_code in cls.module_codes(): cls.init_module_config(module_code) - cls.process_module_assets(module_code) for module_code in cls.module_codes(): cls.process_fields(module_code) diff --git a/backend/gn_modulator/module/commands.py b/backend/gn_modulator/module/commands.py index 499b97ea..d35e7cb5 100644 --- a/backend/gn_modulator/module/commands.py +++ b/backend/gn_modulator/module/commands.py @@ -160,9 +160,6 @@ def install_module(cls, module_code=None, module_path=None, force=False): SchemaMethods.reinit_marshmallow_schemas() cls.process_module_features(module_code) - # assets - cls.process_module_assets(module_code) - # register module_config["registred"] = True diff --git a/backend/gn_modulator/utils/files.py b/backend/gn_modulator/utils/files.py index baec7472..7776f34a 100644 --- a/backend/gn_modulator/utils/files.py +++ b/backend/gn_modulator/utils/files.py @@ -4,5 +4,6 @@ def symlink(path_source, path_dest): """create (or recreate) symlink""" if os.path.islink(path_dest): + print(f'rm {path_dest}') os.remove(path_dest) os.symlink(path_source, path_dest) diff --git a/frontend/app/services/config.service.ts b/frontend/app/services/config.service.ts index 6a9d0034..951d1c27 100644 --- a/frontend/app/services/config.service.ts +++ b/frontend/app/services/config.service.ts @@ -141,7 +141,7 @@ export class ModulesConfigService { moduleImg(moduleCode) { const moduleImg = `${this.backendUrl()}/${ this.AppConfig.MEDIA_URL - }/modulator/assets/${moduleCode.toLowerCase()}/module.jpg`; + }/modulator/config/${moduleCode.toLowerCase()}/assets/module.jpg`; return moduleImg; } From 4e38e8e5a804b5262ff2dc24309a47f1f71bb039 Mon Sep 17 00:00:00 2001 From: "joel.clement" Date: Fri, 23 Jun 2023 15:40:59 +0200 Subject: [PATCH 127/142] lint --- backend/gn_modulator/module/base.py | 32 ----------------------------- backend/gn_modulator/utils/files.py | 1 - 2 files changed, 33 deletions(-) diff --git a/backend/gn_modulator/module/base.py b/backend/gn_modulator/module/base.py index f860809e..91e6cb20 100644 --- a/backend/gn_modulator/module/base.py +++ b/backend/gn_modulator/module/base.py @@ -145,38 +145,6 @@ def process_module_features(cls, module_code): SchemaMethods.log(SchemaMethods.txt_data_infos(infos)) - @classmethod - def process_module_assets(cls, module_code): - """ - copie le dossier assets d'un module dans le repertoire media de geonature - dans le dossier 'media/modulator/assets/{module_code.lower()}' - """ - - if module_code == MODULE_CODE: - return [] - - module_assets_dir = Path(cls.module_dir_path(module_code)) / "assets" - module_img_path = Path(module_assets_dir / "module.jpg") - - # on teste si le fichier assets/module.jpg est bien présent - if not module_img_path.exists(): - return [ - { - "file_path": module_img_path.resolve(), - "msg": f"Le fichier de l'image du module {module_code} n'existe pas", - } - ] - - # s'il y a bien une image du module, - # - on crée le lien des assets vers le dossize static de geonature - assets_dir().mkdir(exist_ok=True, parents=True) - symlink( - module_assets_dir, - assets_dir() / module_code.lower(), - ) - - return [] - @classmethod def test_module_dependencies(cls, module_code): """ diff --git a/backend/gn_modulator/utils/files.py b/backend/gn_modulator/utils/files.py index 7776f34a..baec7472 100644 --- a/backend/gn_modulator/utils/files.py +++ b/backend/gn_modulator/utils/files.py @@ -4,6 +4,5 @@ def symlink(path_source, path_dest): """create (or recreate) symlink""" if os.path.islink(path_dest): - print(f'rm {path_dest}') os.remove(path_dest) os.symlink(path_source, path_dest) From 04f96e62f39e48d67eb97b5672a35a721e235965 Mon Sep 17 00:00:00 2001 From: Camille Monchicourt Date: Sun, 25 Jun 2023 23:18:51 +0200 Subject: [PATCH 128/142] Changelog 1.1.0 --- doc/changelog.md | 52 ++++++++++++++++++++++++++++-------------------- 1 file changed, 30 insertions(+), 22 deletions(-) diff --git a/doc/changelog.md b/doc/changelog.md index fd828ae2..52d3cc79 100644 --- a/doc/changelog.md +++ b/doc/changelog.md @@ -1,46 +1,54 @@ # Changelog -## 1.0.6 (unreleased) +## 1.1.0 (unreleased) +Nécessite la version 2.13.0 (ou plus) de GeoNature. -- Version de GN requise 2.12 +**🚀 Nouveautés** -**✨ Nouveauté** -- Première version de la fonctionalité d'import (commande + interface frontend) +- Ajout de fonctionalités d'import depuis des fichiers CSV (commande + interface frontend) (#25) +- Compatibilité avec GeoNature 2.13.0 et la refonte des permissions, en définissant les permissions disponibles du module (#232) +- Possibilité pour chaque sous-module de déclarer ses permissions disponibles +- [SIPAF] Ajout d'un onglet et du formulaire des diagnostics fonctionnels (#37) +- [SIPAF] Ajout d'un onglet listant les observations à proximité d'un passage à faune (#42) **✨ Améliorations** - Clarification dans la gestion des routes REST -- Meilleure gestion des `tabs` et des `scrolls` -- sécurisation des api (controle des `fields` en lecture et écriture) +- Meilleure gestion des `tabs` et des `scrolls` (#32) +- Sécurisation des API (controle des `fields` en lecture et écriture) (#29) - champs listés à partir de la config - écriture : si un champs demandé n'est pas dans la config -> erreur 403 - - lecture : ce champs n'est pas pris en compte (utilisation de `only` dans l'initialisation des champs mashmallow) -- requetes sql (fonction `query_list`) - - chargement des relations et des champs pour les requetes - - pour éviter les chargement n+1 (1 requête supplémentaire par relation) + - lecture : ce champs n'est pas pris en compte (utilisation de `only` dans l'initialisation des champs marshmallow) +- Requêtes SQL (fonction `query_list`) + - chargement des relations et des champs pour les requêtes + - pour éviter les chargements n+1 (1 requête supplémentaire par relation) - utilisation de `raise_load` - on charge le minimum de champs possibles -- déplacement des config dans le dossier `media/modulator/config` -- changement de nom `ownership` -> `scope` +- Déplacement des configurations dans le dossier `media/modulator/config` (de GeoNature ???) +- Changement de nom `ownership` -> `scope` - [ ] separation des tests par modules (m_sipaf, m_monitoring) - [ ] amélioration du composant list_form - [ ] ajout diagnostic sipaf -**⚠️ Notes de version** - -- Mettre à jour la base +**🐛 Corrections** -``` -geonature db autoupgrade -``` +- Correction des formulaires dans les onglets (#38) -- Mettre à jour les `features` de `m_sipaf` +**⚠️ Notes de version** -``` -geonature modulator features m_sipaf.pf -``` +Si vous mettez à jour le module : +- Mettre à jour la base de données (pas besoin de le dire car fait automatiquement lors de la MAJ par GN) + ``` + geonature db autoupgrade + ``` +- Mettre à jour les `features` de `m_sipaf` + ``` + geonature modulator features m_sipaf.pf + ``` +- Déplacer configuration dans dossier de GeoNature ?? +- Commande à lancer pour ajouter les permissions disponibles de SIPAF ?? ## 1.0.5 (13-03-2023) From 48f1286f0ec6acf1500d4f12bd638c97d912dd8e Mon Sep 17 00:00:00 2001 From: "joel.clement" Date: Mon, 26 Jun 2023 11:03:44 +0200 Subject: [PATCH 129/142] sipaf fix filters --- contrib/m_sipaf/config/config.yml | 6 +++--- .../object/layout-object-filters.component.ts | 13 ++++++++++--- frontend/app/services/config.service.ts | 19 +++++++++++-------- 3 files changed, 24 insertions(+), 14 deletions(-) diff --git a/contrib/m_sipaf/config/config.yml b/contrib/m_sipaf/config/config.yml index 7fe409c9..0332a3fa 100644 --- a/contrib/m_sipaf/config/config.yml +++ b/contrib/m_sipaf/config/config.yml @@ -76,11 +76,11 @@ site_filters_fields: site_filters_defs: code_passage_faune: - type: ilike + type: '~' nom_usuel_passage_faune: - type: ilike + type: '~' code_ouvrage_gestionnaire: - type: ilike + type: '~' region: field: areas.id_area key: id_area diff --git a/frontend/app/components/layout/object/layout-object-filters.component.ts b/frontend/app/components/layout/object/layout-object-filters.component.ts index bd115a37..039322dd 100644 --- a/frontend/app/components/layout/object/layout-object-filters.component.ts +++ b/frontend/app/components/layout/object/layout-object-filters.component.ts @@ -59,12 +59,19 @@ export class ModulesLayoutObjectFiltersComponent this.filters = Object.entries(data) .filter(([key, val]: any) => val != null) .map(([key, val]: any) => { - const field = filterDefs[key]?.field || key; - let value = filterDefs[key].key ? utils.getAttr(val, filterDefs[key].key) : val; - let type = filterDefs[key]?.type || Array.isArray(value) ? 'in' : '='; + const filterDef = filterDefs[key] || {}; + const field = filterDef?.field || key; + let value = filterDef.key ? utils.getAttr(val, filterDef.key) : val; + let type = filterDef?.type; + if (Array.isArray(value)) { value = value.join(';'); + type = type || 'in'; } + + type = type || '='; + + value != null && console.log(field, type, value, key); return { field, type, diff --git a/frontend/app/services/config.service.ts b/frontend/app/services/config.service.ts index 951d1c27..2eab2078 100644 --- a/frontend/app/services/config.service.ts +++ b/frontend/app/services/config.service.ts @@ -1,7 +1,6 @@ import { Injectable } from '@angular/core'; -import { ModuleConfig } from '../module.config'; -import { ModuleService } from '@geonature/services/module.service'; +import { ModuleService as GnModuleService } from '@geonature/services/module.service'; import { of, forkJoin } from '@librairies/rxjs'; import { mergeMap } from '@librairies/rxjs/operators'; @@ -17,15 +16,15 @@ export class ModulesConfigService { }; constructor( - private _moduleService: ModuleService, + private _gnModuleService: GnModuleService, private _mRequest: ModulesRequestService, private AppConfig: GNConfigService ) {} /** Configuration */ - MODULE_CODE = ModuleConfig.MODULE_CODE; - MODULE_URL = ModuleConfig.MODULE_URL; + MODULE_CODE = 'MODULATOR'; + MODULE_URL = 'modulator'; init() { return forkJoin({ @@ -58,11 +57,11 @@ export class ModulesConfigService { setModuleCruved(modules) { for (const [moduleCode, moduleConfig] of Object.entries(modules)) { - const moduleGN = this._moduleService.getModule(moduleCode); + const moduleGN = this._gnModuleService.getModule(moduleCode); if (!moduleGN) { continue; } - (moduleConfig as any)['cruved'] = this._moduleService.getModule(moduleCode)['cruved']; + (moduleConfig as any)['cruved'] = this._gnModuleService.getModule(moduleCode)['cruved']; } } @@ -133,9 +132,13 @@ export class ModulesConfigService { return this.AppConfig; } + moduleURL() { + return this.AppConfig[this.MODULE_CODE].MODULE_URL; + } + /** Backend Module Url */ backendModuleUrl() { - return `${this.AppConfig.API_ENDPOINT}${ModuleConfig.MODULE_URL}`; + return `${this.AppConfig.API_ENDPOINT}${this.moduleURL()}`; } moduleImg(moduleCode) { From 7be876d93c340180f984a77d4708e26295491ffa Mon Sep 17 00:00:00 2001 From: "joel.clement" Date: Mon, 26 Jun 2023 11:22:08 +0200 Subject: [PATCH 130/142] remove bad permissions --- ...0a6e3_gn_modulator_permission_available.py | 32 ++++++++++++++++++- 1 file changed, 31 insertions(+), 1 deletion(-) diff --git a/backend/gn_modulator/migrations/versions/b78eaab0a6e3_gn_modulator_permission_available.py b/backend/gn_modulator/migrations/versions/b78eaab0a6e3_gn_modulator_permission_available.py index ee10c860..27272c7d 100644 --- a/backend/gn_modulator/migrations/versions/b78eaab0a6e3_gn_modulator_permission_available.py +++ b/backend/gn_modulator/migrations/versions/b78eaab0a6e3_gn_modulator_permission_available.py @@ -7,7 +7,7 @@ """ from alembic import op import sqlalchemy as sa - +from gn_modulator import MODULE_CODE # revision identifiers, used by Alembic. revision = "b78eaab0a6e3" @@ -48,6 +48,36 @@ def upgrade(): """ ) + op.execute( + f""" + WITH bad_permissions AS ( + SELECT + p.id_permission + FROM + gn_permissions.t_permissions p + JOIN gn_commons.t_modules m + USING (id_module) + WHERE + m.module_code IN ('{MODULE_CODE}') + EXCEPT + SELECT + p.id_permission + FROM + gn_permissions.t_permissions p + JOIN gn_permissions.t_permissions_available pa ON + (p.id_module = pa.id_module + AND p.id_object = pa.id_object + AND p.id_action = pa.id_action) + ) + DELETE + FROM + gn_permissions.t_permissions p + USING bad_permissions bp + WHERE + bp.id_permission = p.id_permission; + """ + ) + def downgrade(): # suppression des droits disponibles pour le module MODULATOR From a53936966836cce08a956029254b46d1f14800d6 Mon Sep 17 00:00:00 2001 From: "joel.clement" Date: Mon, 26 Jun 2023 11:25:06 +0200 Subject: [PATCH 131/142] fix label for perm & perm_dispo --- config/definitions/utils/permission/perm.perm_dispo.schema.yml | 2 +- config/definitions/utils/permission/perm.permission.schema.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/config/definitions/utils/permission/perm.perm_dispo.schema.yml b/config/definitions/utils/permission/perm.perm_dispo.schema.yml index 51d35de4..8e19b686 100644 --- a/config/definitions/utils/permission/perm.perm_dispo.schema.yml +++ b/config/definitions/utils/permission/perm.perm_dispo.schema.yml @@ -7,7 +7,7 @@ meta: autoschema: true model: geonature.core.gn_permissions.models.PermissionAvailable label: permission - label_field_name: id_permssion + label_field_name: label genre: F unique: - id_module diff --git a/config/definitions/utils/permission/perm.permission.schema.yml b/config/definitions/utils/permission/perm.permission.schema.yml index 23ab2dd5..adc67cd7 100644 --- a/config/definitions/utils/permission/perm.permission.schema.yml +++ b/config/definitions/utils/permission/perm.permission.schema.yml @@ -7,7 +7,7 @@ meta: autoschema: true model: geonature.core.gn_permissions.models.Permission label: permission - label_field_name: id_permssion + label_field_name: id_permission genre: F unique: - id_role From aa87be7eb0984293baacbedad5c8e009735838a4 Mon Sep 17 00:00:00 2001 From: "joel.clement" Date: Mon, 26 Jun 2023 11:30:04 +0200 Subject: [PATCH 132/142] sipaf hide observation for release --- contrib/m_sipaf/config/config.yml | 4 +++- .../m_sipaf/config/layouts/m_sipaf.site_details.layout.yml | 2 ++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/contrib/m_sipaf/config/config.yml b/contrib/m_sipaf/config/config.yml index 0332a3fa..a2974d1f 100644 --- a/contrib/m_sipaf/config/config.yml +++ b/contrib/m_sipaf/config/config.yml @@ -225,7 +225,9 @@ site_details_fields: - label: __f__o.tab_label(x) object_code: synthese - hidden: "__f__!o.config({...context, object_code: 'site'})?.value_xy" + # M_SIPAF_OBS à reprendre après la release + hidden: true + # hidden: "__f__!o.config({...context, object_code: 'site'})?.value_xy" items: - type: object display: table diff --git a/contrib/m_sipaf/config/layouts/m_sipaf.site_details.layout.yml b/contrib/m_sipaf/config/layouts/m_sipaf.site_details.layout.yml index e593fc72..63ea27c4 100644 --- a/contrib/m_sipaf/config/layouts/m_sipaf.site_details.layout.yml +++ b/contrib/m_sipaf/config/layouts/m_sipaf.site_details.layout.yml @@ -20,6 +20,8 @@ layout: bring_to_front: true tooltip_permanent: true - type: object + # M_SIPAF_OBS à reprendre après la release + hidden: true display: geojson object_code: synthese prefilters: | From d5e9afa7e3f4e2200fc7fd2fa141334dc7254c1c Mon Sep 17 00:00:00 2001 From: "joel.clement" Date: Mon, 26 Jun 2023 12:08:37 +0200 Subject: [PATCH 133/142] get authorized fields from popup_list --- backend/gn_modulator/module/config/utils.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/backend/gn_modulator/module/config/utils.py b/backend/gn_modulator/module/config/utils.py index b43863dd..1255c4c9 100644 --- a/backend/gn_modulator/module/config/utils.py +++ b/backend/gn_modulator/module/config/utils.py @@ -436,12 +436,14 @@ def get_layout_keys(cls, layout, params, context): ) return cls.get_layout_keys(layout_from_code, params, context) - if layout.get("items"): - return cls.get_layout_keys(layout.get("items"), params, context) + for field_list_type in ["items", "popup_fields"]: + if layout.get(field_list_type): + return cls.get_layout_keys(layout.get(field_list_type), params, context) @classmethod def add_key(cls, context, key): keys = get_global_cache(["keys"]) + if context.get("data_keys"): key = f"{''.join(context['data_keys'])}.{key}" @@ -459,7 +461,7 @@ def add_key(cls, context, key): if not sm.has_property(key): # raise error ? - print(f"pb ? {sm} has no {key}") + # print(f"pb ? {sm} has no {key}") return keys # ajout en lecture From bc42f3cf112f7055a18d83a979292fc361f009bf Mon Sep 17 00:00:00 2001 From: "joel.clement" Date: Mon, 26 Jun 2023 14:54:10 +0200 Subject: [PATCH 134/142] changelog upgrade sipaf --- doc/changelog.md | 23 ++++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/doc/changelog.md b/doc/changelog.md index 52d3cc79..6bc0b81d 100644 --- a/doc/changelog.md +++ b/doc/changelog.md @@ -17,7 +17,7 @@ Nécessite la version 2.13.0 (ou plus) de GeoNature. - Clarification dans la gestion des routes REST - Meilleure gestion des `tabs` et des `scrolls` (#32) - Sécurisation des API (controle des `fields` en lecture et écriture) (#29) - - champs listés à partir de la config + - champs listés à partir de la config - écriture : si un champs demandé n'est pas dans la config -> erreur 403 - lecture : ce champs n'est pas pris en compte (utilisation de `only` dans l'initialisation des champs marshmallow) - Requêtes SQL (fonction `query_list`) @@ -25,11 +25,9 @@ Nécessite la version 2.13.0 (ou plus) de GeoNature. - pour éviter les chargements n+1 (1 requête supplémentaire par relation) - utilisation de `raise_load` - on charge le minimum de champs possibles -- Déplacement des configurations dans le dossier `media/modulator/config` (de GeoNature ???) +- Déplacement des configurations dans le dossier `media/modulator/config` de GeoNature - Changement de nom `ownership` -> `scope` -- [ ] separation des tests par modules (m_sipaf, m_monitoring) -- [ ] amélioration du composant list_form -- [ ] ajout diagnostic sipaf +- amélioration du composant list_form **🐛 Corrections** @@ -39,16 +37,23 @@ Nécessite la version 2.13.0 (ou plus) de GeoNature. Si vous mettez à jour le module : +- Déplacer configuration dans dossier de GeoNature ?? - Mettre à jour la base de données (pas besoin de le dire car fait automatiquement lors de la MAJ par GN) ``` geonature db autoupgrade ``` -- Mettre à jour les `features` de `m_sipaf` +- Mettre à jour le module sipaf ``` - geonature modulator features m_sipaf.pf + geonature modulator install m_sipaf ``` -- Déplacer configuration dans dossier de GeoNature ?? -- Commande à lancer pour ajouter les permissions disponibles de SIPAF ?? + + - cette commande va effectuer les actions suivantes: + - créer le dossier `/backend/media/modulator` + - déplacer la config du sous-module dans le dossier `/backend/media/modulator/config` + - mettre à jour les `features` du module et notamment: + - ajouter des nomenclatures pour les permissions + - corriger de nomenclatures pour les passages à faune + - ajouter des permissions disponibles pour le module ## 1.0.5 (13-03-2023) From ef848adf60ce966fa694037523f3d88ced045a7d Mon Sep 17 00:00:00 2001 From: Camille Monchicourt Date: Mon, 26 Jun 2023 22:00:25 +0200 Subject: [PATCH 135/142] Changelog 1.1.0 --- doc/changelog.md | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) diff --git a/doc/changelog.md b/doc/changelog.md index 6bc0b81d..34e6c21f 100644 --- a/doc/changelog.md +++ b/doc/changelog.md @@ -10,13 +10,12 @@ Nécessite la version 2.13.0 (ou plus) de GeoNature. - Compatibilité avec GeoNature 2.13.0 et la refonte des permissions, en définissant les permissions disponibles du module (#232) - Possibilité pour chaque sous-module de déclarer ses permissions disponibles - [SIPAF] Ajout d'un onglet et du formulaire des diagnostics fonctionnels (#37) -- [SIPAF] Ajout d'un onglet listant les observations à proximité d'un passage à faune (#42) **✨ Améliorations** - Clarification dans la gestion des routes REST - Meilleure gestion des `tabs` et des `scrolls` (#32) -- Sécurisation des API (controle des `fields` en lecture et écriture) (#29) +- Sécurisation des API (contrôle des `fields` en lecture et écriture) (#29) - champs listés à partir de la config - écriture : si un champs demandé n'est pas dans la config -> erreur 403 - lecture : ce champs n'est pas pris en compte (utilisation de `only` dans l'initialisation des champs marshmallow) @@ -27,7 +26,7 @@ Nécessite la version 2.13.0 (ou plus) de GeoNature. - on charge le minimum de champs possibles - Déplacement des configurations dans le dossier `media/modulator/config` de GeoNature - Changement de nom `ownership` -> `scope` -- amélioration du composant list_form +- Amélioration du composant list_form **🐛 Corrections** @@ -37,20 +36,14 @@ Nécessite la version 2.13.0 (ou plus) de GeoNature. Si vous mettez à jour le module : -- Déplacer configuration dans dossier de GeoNature ?? -- Mettre à jour la base de données (pas besoin de le dire car fait automatiquement lors de la MAJ par GN) - ``` - geonature db autoupgrade - ``` -- Mettre à jour le module sipaf +- Mettre à jour le module SIPAF ``` geonature modulator install m_sipaf ``` - - - cette commande va effectuer les actions suivantes: + - Cette commande va effectuer les actions suivantes : - créer le dossier `/backend/media/modulator` - déplacer la config du sous-module dans le dossier `/backend/media/modulator/config` - - mettre à jour les `features` du module et notamment: + - mettre à jour les `features` du module et notamment : - ajouter des nomenclatures pour les permissions - corriger de nomenclatures pour les passages à faune - ajouter des permissions disponibles pour le module From 5fd1c32d8ec9327a726776c6d4c72edeb2dd1a1b Mon Sep 17 00:00:00 2001 From: "joel.clement" Date: Mon, 26 Jun 2023 23:46:23 +0200 Subject: [PATCH 136/142] fix marker --- frontend/app/services/map/draw.ts | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/frontend/app/services/map/draw.ts b/frontend/app/services/map/draw.ts index a8cbacf5..aa637303 100644 --- a/frontend/app/services/map/draw.ts +++ b/frontend/app/services/map/draw.ts @@ -72,6 +72,21 @@ export default { if (!utils.fastDeepEqual(drawOptions, map.drawOptions)) { map.drawOptions = drawOptions; map.pm.addControls(drawOptions); + if (drawOptions.drawMarker) { + const iconRetinaUrl = './marker-icon-2x.png'; + const iconUrl = './marker-icon.png'; + const shadowUrl = './marker-shadow.png'; + map.pm.enableDraw('Marker', { + iconRetinaUrl: iconRetinaUrl, + iconUrl: iconUrl, + shadowUrl: shadowUrl, + iconSize: [25, 41], + iconAnchor: [12, 41], + popupAnchor: [1, -34], + tooltipAnchor: [16, -28], + shadowSize: [41, 41], + }); + } } // init $editedLayer From af23c92301bf57e3d3aed12b8040ae25c7dcc0b8 Mon Sep 17 00:00:00 2001 From: "joel.clement" Date: Tue, 27 Jun 2023 00:46:35 +0200 Subject: [PATCH 137/142] fix marker again --- frontend/app/services/map/draw.ts | 25 +++++++++---------------- 1 file changed, 9 insertions(+), 16 deletions(-) diff --git a/frontend/app/services/map/draw.ts b/frontend/app/services/map/draw.ts index aa637303..9c2aefac 100644 --- a/frontend/app/services/map/draw.ts +++ b/frontend/app/services/map/draw.ts @@ -1,10 +1,12 @@ import { BehaviorSubject } from '@librairies/rxjs'; import utils from '../../utils'; +import { CustomMarkerIcon } from '@geonature_common/map/marker/marker.component'; const defautDrawOptions = { position: 'topleft', customMarker: true, - drawMarker: true, + drawMarker: false, + drawMarker2: true, editMode: true, drawCircle: false, drawCircleMarker: false, @@ -69,24 +71,15 @@ export default { options.geometry_type == 'geometry' || options.geometry_type.includes('linestring'); } + if(!map.initDrawMarker2) { + map.initDrawMarker2 = true; + map.pm.Toolbar.copyDrawControl('drawMarker',{name: "drawMarker2"}) + .drawInstance.setOptions({markerStyle: {icon : new CustomMarkerIcon()}}) + } + if (!utils.fastDeepEqual(drawOptions, map.drawOptions)) { map.drawOptions = drawOptions; map.pm.addControls(drawOptions); - if (drawOptions.drawMarker) { - const iconRetinaUrl = './marker-icon-2x.png'; - const iconUrl = './marker-icon.png'; - const shadowUrl = './marker-shadow.png'; - map.pm.enableDraw('Marker', { - iconRetinaUrl: iconRetinaUrl, - iconUrl: iconUrl, - shadowUrl: shadowUrl, - iconSize: [25, 41], - iconAnchor: [12, 41], - popupAnchor: [1, -34], - tooltipAnchor: [16, -28], - shadowSize: [41, 41], - }); - } } // init $editedLayer From 17bb838a0d9935067787060212ffc32946056fe6 Mon Sep 17 00:00:00 2001 From: "joel.clement" Date: Tue, 27 Jun 2023 09:33:35 +0200 Subject: [PATCH 138/142] lint & up GN --- dependencies/GeoNature | 2 +- frontend/app/services/map/draw.ts | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/dependencies/GeoNature b/dependencies/GeoNature index 367b67ea..b327a6a6 160000 --- a/dependencies/GeoNature +++ b/dependencies/GeoNature @@ -1 +1 @@ -Subproject commit 367b67ea3ca4d929ade15441138add838f6b29a8 +Subproject commit b327a6a6c0f4c4ae6a10161b793ca442715a3fc9 diff --git a/frontend/app/services/map/draw.ts b/frontend/app/services/map/draw.ts index 9c2aefac..1b08f66e 100644 --- a/frontend/app/services/map/draw.ts +++ b/frontend/app/services/map/draw.ts @@ -71,10 +71,11 @@ export default { options.geometry_type == 'geometry' || options.geometry_type.includes('linestring'); } - if(!map.initDrawMarker2) { + if (!map.initDrawMarker2) { map.initDrawMarker2 = true; - map.pm.Toolbar.copyDrawControl('drawMarker',{name: "drawMarker2"}) - .drawInstance.setOptions({markerStyle: {icon : new CustomMarkerIcon()}}) + map.pm.Toolbar.copyDrawControl('drawMarker', { name: 'drawMarker2' }).drawInstance.setOptions( + { markerStyle: { icon: new CustomMarkerIcon() } } + ); } if (!utils.fastDeepEqual(drawOptions, map.drawOptions)) { From 7f3ccbbada7a6a4f4f6656c5849db4e3b47acc88 Mon Sep 17 00:00:00 2001 From: "joel.clement" Date: Tue, 27 Jun 2023 10:28:14 +0200 Subject: [PATCH 139/142] saisie carto + fluide --- .../app/components/layout/base/layout-map.component.ts | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/frontend/app/components/layout/base/layout-map.component.ts b/frontend/app/components/layout/base/layout-map.component.ts index f40594ac..2c02bfa6 100644 --- a/frontend/app/components/layout/base/layout-map.component.ts +++ b/frontend/app/components/layout/base/layout-map.component.ts @@ -16,7 +16,6 @@ export class ModulesLayoutMapComponent extends ModulesLayoutComponent implements firstEdit = true; - editedLayerSubscription; modalData = {}; modalsLayout: any; @@ -62,8 +61,8 @@ export class ModulesLayoutMapComponent extends ModulesLayoutComponent implements // souscrire aux changements de geometrie // (si ce n'est pas déjà fait) - if (!this.editedLayerSubscription) { - this.editedLayerSubscription = this._map.$editedLayer.subscribe((layer) => { + if (!this._subs['edited_layer']) { + this._subs['edited_layer'] = this._map.$editedLayer.subscribe((layer) => { layer && this.onEditedLayerChange(layer); }); } @@ -118,6 +117,11 @@ export class ModulesLayoutMapComponent extends ModulesLayoutComponent implements } this.data[this.computedLayout.key] = dataGeom; + + this._mapService.processData(this.mapId, this.data, { + key: this.computedLayout.key, + }); + this.dataSave[this.computedLayout.key] = dataGeom; this._mLayout.reComputeLayout('map'); } } From 7c0291e518453c3f596419e0e5db1f7b11a6f81e Mon Sep 17 00:00:00 2001 From: "joel.clement" Date: Tue, 27 Jun 2023 10:31:16 +0200 Subject: [PATCH 140/142] map fix marker button --- frontend/app/services/map/draw.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/frontend/app/services/map/draw.ts b/frontend/app/services/map/draw.ts index 1b08f66e..815af14a 100644 --- a/frontend/app/services/map/draw.ts +++ b/frontend/app/services/map/draw.ts @@ -26,6 +26,7 @@ const hiddenDrawOptions = { drawRectangle: false, customMarker: false, drawMarker: false, + drawMarker2: false, drawPolygon: false, drawPolyline: false, drawText: false, From 0a17605780d709a7f7ba77632cdafdd1b3da20fe Mon Sep 17 00:00:00 2001 From: Camille Monchicourt Date: Tue, 27 Jun 2023 12:02:07 +0200 Subject: [PATCH 141/142] Update VERSION / 1.1.0 --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index 1464c521..9084fa2f 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.0.5 \ No newline at end of file +1.1.0 From e5090c843faacc9909ab48ff28a60d2fa524a82e Mon Sep 17 00:00:00 2001 From: Camille Monchicourt Date: Tue, 27 Jun 2023 13:25:24 +0200 Subject: [PATCH 142/142] Changelog 1.1.0 --- doc/changelog.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/changelog.md b/doc/changelog.md index 34e6c21f..88b59124 100644 --- a/doc/changelog.md +++ b/doc/changelog.md @@ -1,6 +1,6 @@ # Changelog -## 1.1.0 (unreleased) +## 1.1.0 (2023-06-27) Nécessite la version 2.13.0 (ou plus) de GeoNature.