Skip to content

Commit

Permalink
sqlalchemy 1.4 review corrections
Browse files Browse the repository at this point in the history
  • Loading branch information
Julien Corny committed Apr 17, 2024
1 parent fc469eb commit 1d6d396
Show file tree
Hide file tree
Showing 9 changed files with 135 additions and 241 deletions.
17 changes: 8 additions & 9 deletions backend/gn_module_zh/blueprint.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ def get_all_zh(info_role, query, limit, page, orderby=None, order="asc"):
# try:
# Pour obtenir le nombre de résultat de la requete sans le LIMIT
nb_results_without_limit = (
DB.session.execute(select(func.count()).select_from(query.subquery())).scalars().one()
DB.session.scalar(select(func.count()).select_from(query.subquery()))
)
user = info_role
user_cruved = get_user_cruved()
Expand Down Expand Up @@ -155,8 +155,7 @@ def get_all_zh(info_role, query, limit, page, orderby=None, order="asc"):
# Order by id because there can be ambiguity in order_by(col) depending
# on the column so add on order_by id makes it clearer
data = (
DB.session.execute(query.order_by(TZH.id_zh).limit(limit).offset(page * limit))
.scalars()
DB.session.scalars(query.order_by(TZH.id_zh).limit(limit).offset(page * limit))
.all()
)
is_ref_geo = check_ref_geo_schema()
Expand Down Expand Up @@ -370,7 +369,7 @@ def get_pbf_complete():
'bassin_versant', tz.bassin_versant) as json_arrays
FROM pr_zh.atlas_app tz) AS q;
"""
row = DB.session.execute(sql).first()
row = DB.session.execute(text(sql).limit(1)).first()
return Response(bytes(row["pbf"]) if row["pbf"] else bytes(), mimetype="application/protobuf")


Expand All @@ -390,7 +389,7 @@ def get_json():
) AS feature
FROM (SELECT * FROM pr_zh.atlas_app tz) inputs) features;
"""
row = DB.session.execute(sql).first()
row = DB.session.execute(text(sql).limit(1)).first()
return row["geojson"]


Expand Down Expand Up @@ -463,7 +462,7 @@ def get_file_list(id_zh):
"""get a list of the zh files contained in static repo"""
try:
# FIXME: to optimize... See relationships and lazy join with sqlalchemy
zh_uuid = DB.session.execute(select(TZH).where(TZH.id_zh == id_zh)).scalar_one().zh_uuid
zh_uuid = DB.session.execute(select(TZH.zh_uuid).where(TZH.id_zh == id_zh)).scalar_one()
q_medias = DB.session.execute(
select(TMedias, TNomenclatures.label_default)
.join(
Expand Down Expand Up @@ -775,15 +774,15 @@ def deleteOneZh(id_zh):

# delete criteres delim
id_lim_list = (
DB.session.execute(select(TZH).where(TZH.id_zh == id_zh)).scalar_one().id_lim_list
DB.session.execute(select(TZH.id_lim_list).where(TZH.id_zh == id_zh)).scalar_one()
)
DB.session.execute(delete(CorLimList).where(CorLimList.id_lim_list == id_lim_list))

# delete cor_zh_area
DB.session.execute(delete(CorZhArea).where(CorZhArea.id_zh == id_zh))

# delete files in TMedias and repos
zh_uuid = DB.session.execute(select(TZH).where(TZH.id_zh == id_zh)).scalar_one().zh_uuid
zh_uuid = DB.session.execute(select(TZH.zh_uuid).where(TZH.id_zh == id_zh)).scalar_one()
q_medias = DB.session.scalars(select(TMedias).where(TMedias.unique_id_media == zh_uuid)).all()
for media in q_medias:
delete_file(media.id_media)
Expand All @@ -809,7 +808,7 @@ def write_csv(id_zh):
names = []
FILE_PATH = blueprint.config["file_path"]
MODULE_NAME = blueprint.config["MODULE_CODE"].lower()
zh_code = DB.session.execute(select(TZH).where(TZH.id_zh == id_zh)).scalar_one().code
zh_code = DB.session.execute(select(TZH.code).where(TZH.id_zh == id_zh)).scalar_one()
# author name
user = DB.session.execute(
select(User).where(User.id_role == g.current_user.id_role)
Expand Down
65 changes: 25 additions & 40 deletions backend/gn_module_zh/forms.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -86,28 +86,25 @@ def create_zh(form_data, info_role, zh_date, polygon, zh_area, ref_geo_referenti
post_cor_zh_area(
polygon,
new_zh.id_zh,
DB.session.execute(select(BibAreasTypes).where(BibAreasTypes.type_code == "COM"))
.scalar_one()
.id_type,
DB.session.execute(select(BibAreasTypes.id_type).where(BibAreasTypes.type_code == "COM"))
.scalar_one(),
)
# fill cor_zh_area for departements
post_cor_zh_area(
polygon,
new_zh.id_zh,
DB.session.execute(select(BibAreasTypes).where(BibAreasTypes.type_code == "DEP"))
.scalar_one()
.id_type,
DB.session.execute(select(BibAreasTypes.id_type).where(BibAreasTypes.type_code == "DEP"))
.scalar_one(),
)
# fill cor_zh_area for other geo referentials
for ref in ref_geo_referentiels:
post_cor_zh_area(
polygon,
new_zh.id_zh,
DB.session.execute(
select(BibAreasTypes).where(BibAreasTypes.type_code == ref["type_code_ref_geo"])
select(BibAreasTypes.id_type).where(BibAreasTypes.type_code == ref["type_code_ref_geo"])
)
.scalar_one()
.id_type,
.scalar_one(),
)

# fill cor_zh_rb
Expand All @@ -123,12 +120,11 @@ def create_zh(form_data, info_role, zh_date, polygon, zh_area, ref_geo_referenti
# set default values
fct_delim_default_id = (
DB.session.execute(
select(DefaultsNomenclaturesValues).where(
select(DefaultsNomenclaturesValues.id_nomenclature).where(
DefaultsNomenclaturesValues.mnemonique_type == "CRIT_DEF_ESP_FCT"
)
)
.scalar_one()
.id_nomenclature
)

post_fct_delim(new_zh.id_zh, [fct_delim_default_id])
Expand Down Expand Up @@ -354,29 +350,26 @@ def update_cor_zh_area(polygon, id_zh, geo_refs):
post_cor_zh_area(
polygon,
id_zh,
DB.session.execute(select(BibAreasTypes).where(BibAreasTypes.type_code == "COM"))
.scalar_one()
.id_type,
DB.session.execute(select(BibAreasTypes.id_type).where(BibAreasTypes.type_code == "COM"))
.scalar_one(),
)
post_cor_zh_area(
polygon,
id_zh,
DB.session.execute(select(BibAreasTypes).where(BibAreasTypes.type_code == "DEP"))
.scalar_one()
.id_type,
DB.session.execute(select(BibAreasTypes.id_type).where(BibAreasTypes.type_code == "DEP"))
.scalar_one(),
)
# fill cor_zh_area for other geo referentials
for ref in geo_refs:
post_cor_zh_area(
polygon,
id_zh,
DB.session.execute(
select(BibAreasTypes).where(
select(BibAreasTypes.id_type).where(
BibAreasTypes.type_code == ref["type_code_ref_geo"]
)
)
.scalar_one()
.id_type,
.scalar_one(),
)
except Exception as e:
if e.__class__.__name__ == "DataError":
Expand Down Expand Up @@ -777,15 +770,14 @@ def post_managements(id_zh, managements):
TManagementPlans(
id_nature=plan["id_nature"],
id_structure=DB.session.execute(
select(TManagementStructures).where(
select(TManagementStructures.id_structure).where(
and_(
TManagementStructures.id_zh == id_zh,
TManagementStructures.id_org == management["structure"],
)
)
)
.scalar_one()
.id_structure,
.scalar_one(),
plan_date=datetime.datetime.strptime(plan["plan_date"], "%d/%m/%Y"),
duration=plan["duration"],
remark=plan["remark"],
Expand Down Expand Up @@ -849,12 +841,11 @@ def post_protections(id_zh, protections):
DB.session.add(
CorZhProtection(
id_protection=DB.session.execute(
select(CorProtectionLevelType).where(
select(CorProtectionLevelType.id_protection).where(
CorProtectionLevelType.id_protection_status == protection
)
)
.scalar_one()
.id_protection,
.scalar_one(),
id_zh=id_zh,
)
)
Expand Down Expand Up @@ -913,12 +904,11 @@ def post_urban_docs(id_zh, urban_docs):
for urban_doc in urban_docs:
id_doc_type = (
DB.session.execute(
select(CorUrbanTypeRange).where(
select(CorUrbanTypeRange.id_doc_type).where(
CorUrbanTypeRange.id_cor == urban_doc["id_urban_type"][0]["id_cor"]
)
)
.scalar_one()
.id_doc_type
)
uuid_doc = uuid.uuid4()
DB.session.add(
Expand Down Expand Up @@ -978,7 +968,7 @@ def post_actions(id_zh, actions):
def post_file_info(id_zh, title, author, description, extension, media_path=None):
try:
unique_id_media = (
DB.session.execute(select(TZH).where(TZH.id_zh == int(id_zh))).scalar_one().zh_uuid
DB.session.execute(select(TZH.zh_uuid).where(TZH.id_zh == int(id_zh))).scalar_one()
)
uuid_attached_row = uuid.uuid4()
if extension == ".pdf":
Expand All @@ -988,21 +978,19 @@ def post_file_info(id_zh, title, author, description, extension, media_path=None
else:
mnemo = "Photo"
id_nomenclature_media_type = (
DB.session.execute(select(TNomenclatures).where(TNomenclatures.mnemonique == mnemo))
DB.session.execute(select(TNomenclatures.id_nomenclature).where(TNomenclatures.mnemonique == mnemo))
.scalar_one()
.id_nomenclature
)
id_table_location = (
DB.session.execute(
select(BibTablesLocation).where(
select(BibTablesLocation.id_table_location).where(
and_(
BibTablesLocation.schema_name == "pr_zh",
BibTablesLocation.table_name == "t_zh",
)
)
)
.scalar_one()
.id_table_location
)
post_date = datetime.datetime.now()
DB.session.add(
Expand All @@ -1023,10 +1011,9 @@ def post_file_info(id_zh, title, author, description, extension, media_path=None
DB.session.commit()
id_media = (
DB.session.execute(
select(TMedias).where(TMedias.uuid_attached_row == uuid_attached_row)
select(TMedias.id_media).where(TMedias.uuid_attached_row == uuid_attached_row)
)
.scalar_one()
.id_media
)
return id_media
except Exception as e:
Expand All @@ -1042,20 +1029,19 @@ def post_file_info(id_zh, title, author, description, extension, media_path=None
def patch_file_info(id_zh, id_media, title, author, description):
try:
unique_id_media = (
DB.session.execute(select(TZH).where(TZH.id_zh == int(id_zh))).scalar_one().zh_uuid
DB.session.execute(select(TZH.zh_uuid).where(TZH.id_zh == int(id_zh))).scalar_one()
)
uuid_attached_row = uuid.uuid4()
id_table_location = (
DB.session.execute(
select(BibTablesLocation).where(
select(BibTablesLocation.id_table_location).where(
and_(
BibTablesLocation.schema_name == "pr_zh",
BibTablesLocation.table_name == "t_zh",
)
)
)
.scalar_one()
.id_table_location
)
post_date = datetime.datetime.now()
DB.session.execute(
Expand Down Expand Up @@ -1092,9 +1078,8 @@ def update_file_extension(id_media, extension):
else:
mnemo = "Photo"
id_nomenclature_media_type = (
DB.session.execute(select(TNomenclatures).where(TNomenclatures.mnemonique == mnemo))
DB.session.execute(select(TNomenclatures.id_nomenclature).where(TNomenclatures.mnemonique == mnemo))
.scalar_one()
.id_nomenclature
)
DB.session.execute(
update(TMedias)
Expand Down
Loading

0 comments on commit 1d6d396

Please sign in to comment.