added repayment data

app/models/loan.py

@@ -93,6 +93,9 @@ class Loan(db.Model):
     @classmethod
     def get_loan_by_transaction_id(cls, transaction_id):
         return cls.query.filter_by(transaction_id=transaction_id).first()
+    @classmethod
+    def get_loan_by_loan_id(cls, loan_id):
+        return cls.query.filter_by(id=loan_id).first()
 
     @classmethod
     def set_disbursement_date(cls, loan_id, customer_id):

app/models/repayments_data.py

@@ -10,6 +10,11 @@ class RepaymentsData(db.Model):
     added_date = db.Column(db.DateTime(timezone=True), default=datetime.now(timezone.utc), nullable=False)
     response_code = db.Column(db.String(10), nullable=True)
     response_descr = db.Column(db.String(255), nullable=True)
+    fbn_transaction_id = db.Column(db.String(255),nullable=True)
+    account_id = db.Column(db.String(50), nullable=True)
+    customer_id = db.Column(db.String(50), nullable=True)
+    repayment_amount = db.Column(db.Float, nullable=True)
+    amount_collected = db.Column(db.Float, nullable=True)
 
     def to_dict(self):
         return {
@@ -18,6 +23,11 @@ class RepaymentsData(db.Model):
             "added_date": self.added_date.isoformat() if self.added_date else None,
             "response_code": self.response_code,
             "response_descr": self.response_descr,
+            "customerId": self.customer_id,
+            "accountId": self.customer_id,
+            "fbnTransactionId": self.fbn_transaction_id,
+            "repaymentAmount": self.repayment_amount,
+            "amountCollected": self.amount_collected
         }
 
 
@@ -33,7 +43,12 @@ class RepaymentsData(db.Model):
             new_data = cls(
                 transaction_id=data.get('transactionId'),
                 response_code=data.get('responseCode'),
-                response_descr=data.get('responseMessage')
+                response_descr=data.get('responseDescr'),
+                fbn_transaction_id=data.get('fbnTransactionId'),
+                account_id=data.get('accountId'),
+                customer_id=data.get('customerId'),
+                amount_collected=data.get('amountCollected'),
+                repayment_amount=data.get('repaymentAmount'),
             )
             db.session.add(new_data)
             db.session.commit()

app/models/transactions.py

@@ -14,6 +14,7 @@ class Transaction(db.Model):
     customer_id = db.Column(db.String(50), nullable=True)
     type = db.Column(db.String(50), nullable=False)
     channel = db.Column(db.String(50), nullable=False)
+    phone_number = db.Column(db.String(50), nullable=True)
     created_at = db.Column(db.DateTime, default=datetime.now(timezone.utc))
     updated_at = db.Column(db.DateTime, default=datetime.now(timezone.utc), onupdate=datetime.now(timezone.utc))
 
@@ -29,6 +30,7 @@ class Transaction(db.Model):
             'transaction_id': self.transaction_id,
             'account_id': self.account_id,
             'customer_id': self.customer_id,
+            'phone_number':self.phone_number,
             'type': self.type,
             'channel': self.channel,
         }