| @@ -108,12 +108,15 @@ class AccountService: | |||
| if account.status == AccountStatus.BANNED.value: | |||
| raise Unauthorized("Account is banned.") | |||
| current_tenant = TenantAccountJoin.query.filter_by(account_id=account.id, current=True).first() | |||
| current_tenant = db.session.query(TenantAccountJoin).filter_by(account_id=account.id, current=True).first() | |||
| if current_tenant: | |||
| account.set_tenant_id(current_tenant.tenant_id) | |||
| else: | |||
| available_ta = ( | |||
| TenantAccountJoin.query.filter_by(account_id=account.id).order_by(TenantAccountJoin.id.asc()).first() | |||
| db.session.query(TenantAccountJoin) | |||
| .filter_by(account_id=account.id) | |||
| .order_by(TenantAccountJoin.id.asc()) | |||
| .first() | |||
| ) | |||
| if not available_ta: | |||
| return None | |||