Adding in extra fields

Author: seeker25

pay-api/migrations/versions/2025_03_12_48f199450139_.py

@@ -24,9 +24,25 @@ def upgrade():
     with op.batch_alter_table('eft_refunds', schema=None) as batch_op:
         batch_op.add_column(sa.Column('refund_method', sa.String(length=25), nullable=True))
         batch_op.add_column(sa.Column('cheque_status', sa.String(length=25), nullable=True))
+        batch_op.add_column(sa.Column('entity_name', sa.String(), nullable=True))
+        batch_op.add_column(sa.Column('street', sa.String(), nullable=True))
+        batch_op.add_column(sa.Column('street_additional', sa.String(), nullable=True))
+        batch_op.add_column(sa.Column('city', sa.String(), nullable=True))
+        batch_op.add_column(sa.Column('region', sa.String(), nullable=True))
+        batch_op.add_column(sa.Column('postal_code', sa.String(), nullable=True))
+        batch_op.add_column(sa.Column('country', sa.String(), nullable=True))
+        batch_op.add_column(sa.Column('delivery_instructions', sa.String(), nullable=True))
 
 
 def downgrade():
     with op.batch_alter_table('eft_refunds', schema=None) as batch_op:
         batch_op.drop_column('refund_method')
-        batch_op.drop_column('cheque_Status')
+        batch_op.drop_column('cheque_status')
+        batch_op.drop_column('delivery_instructions')
+        batch_op.drop_column('country')
+        batch_op.drop_column('postal_code')
+        batch_op.drop_column('region')
+        batch_op.drop_column('city')
+        batch_op.drop_column('street_additional')
+        batch_op.drop_column('street')
+        batch_op.drop_column('entity_name')

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

@@ -78,6 +78,15 @@ class EFTRefund(Audit):
     short_name_id = db.Column(db.Integer, ForeignKey("eft_short_names.id"), nullable=False)
     status = db.Column(db.String(25), nullable=True)
 
+    entity_name = db.Column(db.String(), nullable=True)
+    street = db.Column(db.String(), nullable=True)
+    street_additional = db.Column(db.String(), nullable=True)
+    city = db.Column(db.String(), nullable=True)
+    region = db.Column(db.String(), nullable=True)
+    postal_code = db.Column(db.String(), nullable=True)
+    country = db.Column(db.String(), nullable=True)
+    delivery_instructions = db.Column(db.String(), nullable=True)
+
     @classmethod
     def find_refunds(cls, statuses: List[str], short_name_id: int = None):
         """Return all refunds by status."""

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

@@ -119,7 +119,15 @@ def from_row(cls, row: EFTShortnames):
             statement_id=getattr(row, "latest_statement_id", None),
             status_code=getattr(row, "status_code", None),
             cfs_account_status=getattr(row, "cfs_account_status", None),
-            refund_method=getattr(row, "refund_method", None)
+            refund_method=getattr(row, "refund_method", None),
+            entity_name=getattr(row, "entity_name", None),
+            street=getattr(row, "street", None),
+            street_additional=getattr(row, "street_additional", None),
+            city=getattr(row, "city", None),
+            region=getattr(row, "region", None),
+            postal_code=getattr(row, "postal_code", None),
+            country=getattr(row, "country", None),
+            delivery_instructions=getattr(row, "delivery_instructions", None)
         )