added salary table

app/models/__init__.py

@@ -5,5 +5,6 @@ from .loan_charge import LoanCharge
 from .customer import Customer
 from .account import Account
 from .repayments_data import RepaymentsData
+from .salary import Salary
 
-__all__ = ['Transaction', 'Repayment', 'Loan', 'LoanCharge', 'Customer', 'Account', 'RepaymentsData']
+__all__ = ['Transaction', 'Repayment', 'Loan', 'LoanCharge', 'Customer', 'Account', 'RepaymentsData','Salary']

app/models/repayment.py

@@ -161,6 +161,14 @@ class Repayment(db.Model):
         return cls.query.filter(
             cls.repay_date.is_(None)
         ).order_by(cls.created_at.desc()).first()
+    @classmethod
+    def get_latest_repayment_with_loanId(cls, loan_id):
+        """
+        Get the latest repayment with loan Id.
+        """
+        return cls.query.filter(
+            cls.loan_id == loan_id
+        ).order_by(cls.created_at.desc()).first()
 
     @classmethod
     def get_latest_loan_with_repay_date(cls):

app/models/repayments_data.py

@@ -15,6 +15,7 @@ class RepaymentsData(db.Model):
     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)
+    balance = db.Column(db.Float, nullable=True, default=0.0)
 
     def to_dict(self):
         return {
@@ -27,7 +28,8 @@ class RepaymentsData(db.Model):
             "accountId": self.customer_id,
             "fbnTransactionId": self.fbn_transaction_id,
             "repaymentAmount": self.repayment_amount,
-            "amountCollected": self.amount_collected
+            "amountCollected": self.amount_collected,
+            "balance": self.balance
         }
 
 

app/models/salary.py

@@ -0,0 +1,61 @@
+from app.extensions import db
+from datetime import datetime, timezone
+from app.utils.logger import logger
+
+class Salary(db.Model):
+    __tablename__ = "salaries"
+
+    id = db.Column(
+        db.Integer,
+        primary_key=True,
+        autoincrement=True,
+    )
+    customer_id = db.Column(db.String(50), nullable=False)
+    account_id = db.Column(db.String(50), nullable=False)
+    amount = db.Column(db.Float, nullable=True, default=0.0)
+    status = db.Column(db.String(20), nullable=True)
+    created_at = db.Column(db.DateTime, default=datetime.now)
+    updated_at = db.Column(db.DateTime, default=datetime.now, onupdate=datetime.now)
+    salary_date = db.Column(db.DateTime, nullable=True)
+    
+    def __repr__(self):
+        return f'<Salary {self.id}>'
+    
+    def to_dict(self):
+        """
+        Convert the Salary object to a dictionary format for JSON serialization.
+        """
+        return {
+            'id': self.id,
+            'customerId': self.customer_id,
+            'accountId' : self.account_id,
+            'amount': self.amount,
+            'status': self.status,
+            'createdAt': self.created_at.isoformat() if self.created_at else None,
+            'updatedAt': self.updated_at.isoformat() if self.updated_at else None,
+            'salaryDate': self.salary_date.isoformat() if self.salary_date else None,
+        }
+
+    @classmethod
+    def add_salary_data(cls, data):
+        """
+        Add a new salary data entry.
+        """
+        logger.info(f"receieved data:{data}")
+        try:
+            new_data = cls(
+                customer_id=data.get('customerId'),
+               
+                amount=data.get('amount', 0.0),
+                status=data.get('status'),
+                salary_date = datetime.strptime(data.get('salaryDate'), "%Y-%m-%d").date() if data.get('salaryDate') else None,
+                account_id=data.get('accountId')
+            )
+            db.session.add(new_data)
+            db.session.commit()
+            logger.info("Salary data has been committed.")
+            return new_data
+        except Exception as e:
+            db.session.rollback()
+            logger.info(f"error : {str(e)}")
+            raise Exception(f"Error adding salary data: {str(e)}")