Skip to content

Commit

Permalink
fix test
Browse files Browse the repository at this point in the history
  • Loading branch information
@TheoLechemia
TheoLechemia committed Mar 14, 2024
1 parent 65c72e4 commit 693f911
Show file tree
Hide file tree
Showing 2 changed files with 31 additions and 65 deletions.
21 changes: 0 additions & 21 deletions backend/geonature/core/gn_synthese/schemas.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -70,24 +70,3 @@ class Meta:
last_validation = ma.Nested(TValidationSchema, dump_only=True)
reports = ma.Nested(ReportSchema, many=True)
# Missing nested schemas: taxref


class CustomRequiredConverter(GeoModelConverter):
"""Custom converter to add kwargs required for mandatory and asked fields in get_observations_for_web view
Use to validate response in test"""

def _add_column_kwargs(self, kwargs, column):
super()._add_column_kwargs(kwargs, column)
default_cols = map(lambda col: col["prop"], config["SYNTHESE"]["LIST_COLUMNS_FRONTEND"])
required_cols = list(default_cols) + MANDATORY_COLUMNS
kwargs["required"] = column.name in required_cols


# Only used in test for now
class VSyntheseForWebAppSchema(GeoAlchemyAutoSchema):

class Meta:
model = VSyntheseForWebApp
feature_geometry = "the_geom_4326"
sqla_session = db.session
model_converter = CustomRequiredConverter
75 changes: 31 additions & 44 deletions backend/geonature/tests/test_synthese.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
from geonature.utils.config import config
from geonature.core.gn_permissions.tools import get_permissions
from geonature.core.gn_synthese.utils.blurring import split_blurring_precise_permissions
from geonature.core.gn_synthese.schemas import SyntheseSchema
from geonature.core.gn_synthese.utils.query_select_sqla import remove_accents
from geonature.core.sensitivity.models import cor_sensitivity_area_type
from geonature.core.gn_meta.models import TDatasets
Expand Down Expand Up @@ -111,6 +112,7 @@ def synthese_for_observers(source, datasets):
)


# TODO : move and use those schemas in routes one day !
class CustomRequiredConverter(GeoModelConverter):
"""Custom converter to add kwargs required for mandatory and asked fields in get_observations_for_web view
Use to validate response in test"""
Expand All @@ -122,8 +124,9 @@ def _add_column_kwargs(self, kwargs, column):
kwargs["required"] = column.name in required_cols


# Only used in test for now
class VSyntheseForWebAppSchema(GeoAlchemyAutoSchema):
count_min_max = fields.Str()
nom_vern_or_lb_nom = fields.Str()

class Meta:
model = VSyntheseForWebApp
Expand Down Expand Up @@ -163,6 +166,11 @@ class TestSynthese:
def test_required_fields_and_format(self, app, users):
# Test required fields base on VSyntheseForWebAppSchema surrounded by a custom converter : CustomRequiredConverter
# also test geojson serialization (grouped by geometry and not)
app.config["SYNTHESE"]["LIST_COLUMNS_FRONTEND"] += [
{"prop": "altitude_min", "name": "Altitude min"},
{"prop": "count_min_max", "name": "Dénombrement"},
{"prop": "nom_vern_or_lb_nom", "name": "Taxon"},
]
url_ungrouped = url_for("gn_synthese.get_observations_for_web")
set_logged_user(self.client, users["admin_user"])
resp = self.client.get(url_ungrouped)
Expand Down Expand Up @@ -252,10 +260,10 @@ def test_get_observations_for_web(self, app, users, synthese_data, taxon_attribu
r = self.client.post(url, json=filters)
assert r.status_code == 200
assert {synthese_data[k].id_synthese for k in ["p1_af1", "p1_af2"]}.issubset(
{f["properties"]["id"] for f in r.json["features"]}
{f["properties"]["id_synthese"] for f in r.json["features"]}
)
assert {synthese_data[k].id_synthese for k in ["p2_af1", "p2_af2"]}.isdisjoint(
{f["properties"]["id"] for f in r.json["features"]}
{f["properties"]["id_synthese"] for f in r.json["features"]}
)

# test geometry filter with circle radius
Expand All @@ -274,10 +282,10 @@ def test_get_observations_for_web(self, app, users, synthese_data, taxon_attribu
r = self.client.post(url, json=filters)
assert r.status_code == 200
assert {synthese_data[k].id_synthese for k in ["p1_af1", "p1_af2"]}.issubset(
{f["properties"]["id"] for f in r.json["features"]}
{f["properties"]["id_synthese"] for f in r.json["features"]}
)
assert {synthese_data[k].id_synthese for k in ["p2_af1", "p2_af2"]}.isdisjoint(
{f["properties"]["id"] for f in r.json["features"]}
{f["properties"]["id_synthese"] for f in r.json["features"]}
)

# test ref geo area filter
Expand All @@ -289,10 +297,10 @@ def test_get_observations_for_web(self, app, users, synthese_data, taxon_attribu
r = self.client.post(url, json=filters)
assert r.status_code == 200
assert {synthese_data[k].id_synthese for k in ["p1_af1", "p1_af2"]}.issubset(
{f["properties"]["id"] for f in r.json["features"]}
{f["properties"]["id_synthese"] for f in r.json["features"]}
)
assert {synthese_data[k].id_synthese for k in ["p2_af1", "p2_af2"]}.isdisjoint(
{f["properties"]["id"] for f in r.json["features"]}
{f["properties"]["id_synthese"] for f in r.json["features"]}
)

# test organism
Expand Down Expand Up @@ -349,7 +357,9 @@ def test_get_observations_for_web_filter_comment(self, users, synthese_data, tax
filters = {"has_comment": True}
r = self.client.get(url, json=filters)

assert id_synthese in (feature["properties"]["id"] for feature in r.json["features"])
assert id_synthese in (
feature["properties"]["id_synthese"] for feature in r.json["features"]
)

def test_get_observations_for_web_filter_id_source(self, users, synthese_data, source):
set_logged_user(self.client, users["self_user"])
Expand All @@ -364,7 +374,7 @@ def test_get_observations_for_web_filter_id_source(self, users, synthese_data, s
for synthese in synthese_data.values()
if synthese.id_source == id_source
}
response_data = {feature["properties"]["id"] for feature in r.json["features"]}
response_data = {feature["properties"]["id_synthese"] for feature in r.json["features"]}
assert expected_data.issubset(response_data)

@pytest.mark.parametrize(
Expand Down Expand Up @@ -397,7 +407,7 @@ def test_get_observations_for_web_filter_source_by_id_module(
for synthese in synthese_data.values()
if synthese.id_module in id_modules_selected
}
response_data = {feature["properties"]["id"] for feature in r.json["features"]}
response_data = {feature["properties"]["id_synthese"] for feature in r.json["features"]}
assert expected_data.issubset(response_data)
assert len(response_data) == expected_length

Expand Down Expand Up @@ -435,7 +445,9 @@ def test_get_synthese_data_cruved(self, app, users, synthese_data, datasets):
assert len(features) > 0

for feat in features:
assert feat["properties"]["id"] in [synt.id_synthese for synt in synthese_data.values()]
assert feat["properties"]["id_synthese"] in [
synt.id_synthese for synt in synthese_data.values()
]
assert response.status_code == 200

def test_get_synthese_data_aggregate(self, users, datasets, synthese_data):
Expand Down Expand Up @@ -490,35 +502,6 @@ def test_filter_cor_observers(self, users, synthese_data):
# le requete doit etre OK marlgré la geom NULL
assert response.status_code == 200

@pytest.mark.parametrize(
"additionnal_column",
[("altitude_min"), ("count_min_max"), ("nom_vern_or_lb_nom")],
)
def test_get_observations_for_web_param_column_frontend(
self, app, users, synthese_data, additionnal_column
):
"""
Test de renseigner le paramètre LIST_COLUMNS_FRONTEND pour renvoyer uniquement
les colonnes souhaitées
"""
app.config["SYNTHESE"]["LIST_COLUMNS_FRONTEND"] = [
{
"prop": additionnal_column,
"name": "My label",
}
]

set_logged_user(self.client, users["self_user"])

response = self.client.get(url_for("gn_synthese.get_observations_for_web"))
data = response.get_json()

expected_columns = {"id", "url_source", additionnal_column}

assert all(
set(feature["properties"].keys()) == expected_columns for feature in data["features"]
)

@pytest.mark.parametrize(
"group_inpn",
[
Expand All @@ -541,7 +524,7 @@ def test_get_observations_for_web_filter_group_inpn(self, users, synthese_data,
)
response_json = response.json
assert obs.id_synthese in {
synthese["properties"]["id"] for synthese in response_json["features"]
synthese["properties"]["id_synthese"] for synthese in response_json["features"]
}

def test_export(self, users):
Expand Down Expand Up @@ -1409,7 +1392,9 @@ def blur_sensitive_observations(monkeypatch):

def get_one_synthese_reponse_from_id(response: dict, id_synthese: int):
return [
synthese for synthese in response["features"] if synthese["properties"]["id"] == id_synthese
synthese
for synthese in response["features"]
if synthese["properties"]["id_synthese"] == id_synthese
][0]


Expand Down Expand Up @@ -1537,7 +1522,9 @@ def test_get_observations_for_web_blurring_excluded(
]
)

json_synthese_ids = (feature["properties"]["id"] for feature in response_json["features"])
json_synthese_ids = (
feature["properties"]["id_synthese"] for feature in response_json["features"]
)
assert all(synthese_id not in json_synthese_ids for synthese_id in sensitive_synthese_ids)

def test_get_observations_for_web_blurring_grouped_geom(
Expand Down Expand Up @@ -1584,7 +1571,7 @@ def test_get_observations_for_web_blurring_grouped_geom(
feature["geometry"] is None
for feature in json_resp["features"]
if all(
observation["id"] in sensitive_synthese_ids
observation["id_synthese"] in sensitive_synthese_ids
for observation in feature["properties"]["observations"]
)
)
Expand Down

0 comments on commit 693f911

Please sign in to comment.