diff --git a/app/models/repayment.py b/app/models/repayment.py index f9d6e44..cc5f87a 100644 --- a/app/models/repayment.py +++ b/app/models/repayment.py @@ -21,10 +21,12 @@ 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) @@ -44,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: diff --git a/app/models/salary.py b/app/models/salary.py index 19b67cd..a1e02c1 100644 --- a/app/models/salary.py +++ b/app/models/salary.py @@ -7,7 +7,8 @@ class Salary(db.Model): id = db.Column(db.Integer, primary_key=True, autoincrement=True) customer_id = db.Column(db.String(50), nullable=False) - account_type = db.Column(db.String(50)) + # account_type = db.Column(db.String(50)) + 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()) @@ -18,7 +19,7 @@ class Salary(db.Model): return { "id": self.id, "customer_id": self.customer_id, - "account_type": self.account_type, + "account_id": self.account_id, "status": self.status, "amount": self.amount, "salary_date": self.salary_date.isoformat() if self.salary_date else None,