Skip to content

Commit

Permalink
fix "1+n" issue in import list
Browse files Browse the repository at this point in the history
modues were missing from joined informations
  • Loading branch information
bouttier committed Sep 19, 2024
1 parent d19f872 commit 368e205
Showing 1 changed file with 4 additions and 3 deletions.
7 changes: 4 additions & 3 deletions backend/geonature/core/imports/routes/imports.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,14 @@
from urllib.parse import quote as url_quote
from sqlalchemy import or_, func, desc, select, delete
from sqlalchemy.inspection import inspect
from sqlalchemy.orm import joinedload, Load, load_only, undefer, contains_eager
from sqlalchemy.orm import joinedload, Load, load_only, undefer, raiseload, contains_eager
from sqlalchemy.orm.attributes import set_committed_value
from sqlalchemy.sql.expression import collate, exists


from geonature.utils.env import db
from geonature.utils.sentry import start_sentry_child
from geonature.core.gn_commons.models import TModules
from geonature.core.gn_permissions import decorators as permissions
from geonature.core.gn_permissions.decorators import login_required
from geonature.core.gn_permissions.tools import get_scopes_by_action
Expand Down Expand Up @@ -111,13 +112,13 @@ def get_import_list(scope, destination=None):

query = (
TImports.query.options(
raiseload("*"),
contains_eager(TImports.dataset),
contains_eager(TImports.authors),
contains_eager(TImports.destination).load_only(Destination.label, Destination.label),
joinedload(TImports.destination).joinedload(Destination.module),
)
.join(TImports.dataset, isouter=True)
.join(TImports.authors, isouter=True)
.join(Destination)
.filter_by_scope(scope)
.filter(or_(*filters) if len(filters) > 0 else True)
.order_by(order_by)
Expand Down

0 comments on commit 368e205

Please sign in to comment.