[add]: salary model fix

app/api/services/offer_analysis.py

@@ -93,7 +93,7 @@ class OfferAnalysis:
         
 
 
-        logger.info(f"These are the salarie amounts ***** : {str(salaries)}", exc_info=True)
+        logger.info(f"These are the salary amounts ***** : {str(salaries)}", exc_info=True)
 
         #Least salary in the last 6 months
         min_salary = min(salaries)
@@ -113,7 +113,7 @@ class OfferAnalysis:
            
         else:  # Income is not consistent
             eligible_amount = 0
-            logger.info("Applying np percentage on least salary due unstable income.")
+            logger.info("Applying no percentage on least salary due unstable income.")
             
 
 

app/models/__init__.py

@@ -10,6 +10,7 @@ from .rac_checks import RACCheck
 from .loan_repayment_schedule import LoanRepaymentSchedule
 from .transaction_offers import TransactionOffer
 from .repayments_data import RepaymentsData
+from .salary import Salary
 
 
-__all__ = ['Customer', 'Account', 'Loan', 'Transaction', 'Repayment', 'LoanCharge', 'Offer', 'Charge', 'RACCheck', 'LoanRepaymentSchedule', 'TransactionOffer', 'RepaymentsData']
+__all__ = ['Customer', 'Account', 'Loan', 'Transaction', 'Repayment', 'LoanCharge', 'Offer', 'Charge', 'RACCheck', 'LoanRepaymentSchedule', 'TransactionOffer', 'RepaymentsData', 'Salary']

app/models/repayment.py

@@ -21,12 +21,16 @@ class Repayment(db.Model):
     created_at = db.Column(db.DateTime(timezone=True), server_default=func.now())
     updated_at = db.Column(db.DateTime(timezone=True), server_default=func.now(), onupdate=func.now())
     transaction_id = db.Column(db.String(50), nullable=True)
-    repay_date = db.Column(db.DateTime, default=datetime.now(timezone.utc))
+    # repay_date = db.Column(db.DateTime, default=datetime.now(timezone.utc))
+    repay_date = db.Column(db.DateTime, nullable=True)
     repay_result = db.Column(db.String(10), nullable=True)
     repay_description = db.Column(db.String(100), nullable=True)
-    verify_date = db.Column(db.DateTime, default=datetime.now(timezone.utc))
+    # verify_date = db.Column(db.DateTime, default=datetime.now(timezone.utc))
+    verify_date = db.Column(db.DateTime, nullable=True)
     verify_result = db.Column(db.String(10), nullable=True)
     verify_description = db.Column(db.String(100), nullable=True)
+    initiated_by = db.Column(db.String(50), nullable=True)
+    salary_amount = db.Column(db.Float, nullable=True, default=0.0)
 
     @classmethod
     def create_repayment(cls, customer_id, loan, transaction_id):
@@ -42,7 +46,8 @@ class Repayment(db.Model):
             product_id=loan.product_id,
             transaction_id = transaction_id,
             created_at=datetime.now(timezone.utc),
-            updated_at=datetime.now(timezone.utc)
+            updated_at=datetime.now(timezone.utc),
+            initiated_by='USER_INITIATED'
         )
 
         try:
@@ -51,6 +56,25 @@ class Repayment(db.Model):
             raise ValueError(f"Database integrity error: {err}")
 
         return repayment
+    
+    def to_dict(self):
+        return {
+            "id": self.id,
+            "loan_id": self.loan_id,
+            "customer_id": self.customer_id,
+            "product_id": self.product_id,
+            "created_at": self.created_at.isoformat() if self.created_at else None,
+            "updated_at": self.updated_at.isoformat() if self.updated_at else None,
+            "transaction_id": self.transaction_id,
+            "repay_date": self.repay_date.isoformat() if self.repay_date else None,
+            "repay_result": self.repay_result,
+            "repay_description": self.repay_description,
+            "verify_date": self.verify_date.isoformat() if self.verify_date else None,
+            "verify_result": self.verify_result,
+            "verify_description": self.verify_description,
+            "initiated_by": self.initiated_by,
+            "salary_amount": self.salary_amount
+        }
 
     def __repr__(self):
         return f'<Repayment {self.id}>'

app/models/repayments_data.py

@@ -15,6 +15,7 @@ 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)
+    balance = db.Column(db.Float, nullable=True, default=0.0)
 
     def to_dict(self):
         return {
@@ -28,6 +29,7 @@ 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,
+            "balance": self.balance,
         }
 
     def __repr__(self):

app/models/salary.py

@@ -0,0 +1,31 @@
+from datetime import datetime, timezone
+from app.extensions import db
+from sqlalchemy.sql import func
+
+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=True)
+    status = db.Column(db.String(20), default='active')
+    amount = db.Column(db.Float, nullable=False, default=0.0)
+    salary_date = db.Column(db.DateTime(timezone=False), server_default=func.now())
+    created_at = db.Column(db.DateTime(timezone=False), server_default=func.now())
+    updated_at = db.Column(db.DateTime(timezone=False), server_default=func.now(), onupdate=func.now())
+
+    def to_dict(self):
+        return {
+            "id": self.id,
+            "customer_id": self.customer_id,
+            "account_id": self.account_id,
+            "status": self.status,
+            "amount": self.amount,
+            "salary_date": self.salary_date.isoformat() if self.salary_date else None,
+            "created_at": self.created_at.isoformat() if self.created_at else None,
+            "updated_at": self.updated_at.isoformat() if self.updated_at else None
+        }
+
+    def __repr__(self):
+        return f'<Salary {self.id} - {self.amount}>'
+    

migrations/versions/1696ee63c28a_.py

@@ -0,0 +1,52 @@
+"""empty message
+
+Revision ID: 1696ee63c28a
+Revises: b54422fb31e0
+Create Date: 2025-06-18 12:28:23.942143
+
+"""
+from alembic import op
+import sqlalchemy as sa
+
+
+# revision identifiers, used by Alembic.
+revision = '1696ee63c28a'
+down_revision = 'b54422fb31e0'
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.create_table('salaries',
+    sa.Column('id', sa.Integer(), autoincrement=True, nullable=False),
+    sa.Column('customer_id', sa.String(length=50), nullable=False),
+    sa.Column('account_type', sa.String(length=50), nullable=True),
+    sa.Column('status', sa.String(length=20), nullable=True),
+    sa.Column('amount', sa.Float(), nullable=False),
+    sa.Column('salary_date', sa.DateTime(), server_default=sa.text('now()'), nullable=True),
+    sa.Column('created_at', sa.DateTime(), server_default=sa.text('now()'), nullable=True),
+    sa.Column('updated_at', sa.DateTime(), server_default=sa.text('now()'), nullable=True),
+    sa.PrimaryKeyConstraint('id')
+    )
+    with op.batch_alter_table('repayments', schema=None) as batch_op:
+        batch_op.add_column(sa.Column('initiated_by', sa.String(length=50), nullable=True))
+        batch_op.add_column(sa.Column('salary_amount', sa.Float(), nullable=True))
+
+    with op.batch_alter_table('repayments_data', schema=None) as batch_op:
+        batch_op.add_column(sa.Column('balance', sa.Float(), nullable=True))
+
+    # ### end Alembic commands ###
+
+
+def downgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    with op.batch_alter_table('repayments_data', schema=None) as batch_op:
+        batch_op.drop_column('balance')
+
+    with op.batch_alter_table('repayments', schema=None) as batch_op:
+        batch_op.drop_column('salary_amount')
+        batch_op.drop_column('initiated_by')
+
+    op.drop_table('salaries')
+    # ### end Alembic commands ###

migrations/versions/7a0caf83d5be_.py

@@ -0,0 +1,34 @@
+"""empty message
+
+Revision ID: 7a0caf83d5be
+Revises: 1696ee63c28a
+Create Date: 2025-06-19 04:35:23.660261
+
+"""
+from alembic import op
+import sqlalchemy as sa
+
+
+# revision identifiers, used by Alembic.
+revision = '7a0caf83d5be'
+down_revision = '1696ee63c28a'
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    with op.batch_alter_table('salaries', schema=None) as batch_op:
+        batch_op.add_column(sa.Column('account_id', sa.String(length=50), nullable=True))
+        batch_op.drop_column('account_type')
+
+    # ### end Alembic commands ###
+
+
+def downgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    with op.batch_alter_table('salaries', schema=None) as batch_op:
+        batch_op.add_column(sa.Column('account_type', sa.VARCHAR(length=50), autoincrement=False, nullable=True))
+        batch_op.drop_column('account_id')
+
+    # ### end Alembic commands ###