Model and service changes

pay-api/src/pay_api/models/non_sufficient_funds.py

@@ -15,11 +15,9 @@
 from __future__ import annotations
 
 from attrs import define
-from marshmallow import fields
 from sqlalchemy import ForeignKey
 
 from .base_model import BaseModel
-from .base_schema import BaseSchema
 from .db import db
 
 
@@ -49,21 +47,8 @@ class NonSufficientFundsModel(BaseModel):  # pylint: disable=too-many-instance-a
     description = db.Column(db.String(50), nullable=True)
     invoice_id = db.Column(db.Integer, ForeignKey('invoices.id'), nullable=False)
 
-
-class NonSufficientFundsSchema(BaseSchema):  # pylint: disable=too-many-ancestors
-    """Main schema used to serialize the Non-Sufficient Funds."""
-
-    class Meta(BaseSchema.Meta):  # pylint: disable=too-few-public-methods
-        """Returns all the fields from the SQLAlchemy class."""
-
-        model = NonSufficientFundsModel
-
-    description = fields.String(data_key='description')
-    invoice_id = fields.Integer(data_key='invoice_id')
-
-
 @define
-class NonSufficientFundsSearchModel:  # pylint: disable=too-few-public-methods
+class NonSufficientFundsSchema:  # pylint: disable=too-few-public-methods
     """Used to search for NSF records."""
 
     id: int

pay-api/src/pay_api/services/non_sufficient_funds.py

@@ -77,6 +77,7 @@ def query_all_non_sufficient_funds_invoices(account_id: str):
             .outerjoin(NonSufficientFundsModel, NonSufficientFundsModel.invoice_id == InvoiceModel.id) \
             .filter(PaymentAccountModel.auth_account_id == account_id) \
             .filter(PaymentModel.payment_status_code == 'FAILED') \
+            .filter(PaymentModel.payment_method_code == 'PAD') \
             .order_by(PaymentModel.id.asc())
 
         non_sufficient_funds_invoices = query.all()