Small fix for sqlalchemy warnings (#1602)

bcgov · Jul 5, 2024 · 97323df · 97323df
1 parent 8682974
commit 97323df
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/pay-api/src/pay_api/services/eft_short_names.py b/pay-api/src/pay_api/services/eft_short_names.py
@@ -291,7 +291,7 @@ def get_pending_payment_count():
                 .filter(InvoiceModel.payment_account_id == PaymentAccountModel.id)
                 .filter(EFTCreditInvoiceLinkModel.status_code.in_([EFTCreditInvoiceStatus.PENDING.value]))
                 .correlate(PaymentAccountModel)
-                .as_scalar())
+                .scalar_subquery())
 
     @classmethod
     def get_search_query(cls, search_criteria: EFTShortnamesSearch, is_count: bool = False):

diff --git a/pay-api/src/pay_api/services/statement.py b/pay-api/src/pay_api/services/statement.py
@@ -187,7 +187,7 @@ def get_payment_methods_query(statement: StatementModel):
             )
         )
 
-        return query.as_scalar()
+        return query.scalar_subquery()
 
     @staticmethod
     def get_statement_owing_query():
@@ -334,6 +334,7 @@ def get_statement_eft_transactions(statement: StatementModel) -> List[EFTTransac
             .join(EFTCreditModel, EFTCreditModel.eft_transaction_id == EFTTransactionModel.id) \
             .join(EFTCreditInvoiceLinkModel, EFTCreditInvoiceLinkModel.eft_credit_id == EFTCreditModel.id) \
             .join(StatementInvoicesModel, StatementInvoicesModel.invoice_id == EFTCreditInvoiceLinkModel.invoice_id) \
+            .join(StatementModel, StatementModel.id == StatementInvoicesModel.statement_id) \
             .filter(StatementModel.id == statement.id) \
             .filter(EFTTransactionModel.status_code == EFTProcessStatus.COMPLETED.value) \
             .filter(EFTTransactionModel.line_type == EFTFileLineType.TRANSACTION.value).all()