Custom templates fix

2025-09-20 20:00:24 -04:00
parent ff8513292b
commit 4d894d8214
12 changed files with 762 additions and 732 deletions
@@ -1,91 +1,91 @@
-from datetime import datetime, timezone, timedelta
-from app.extensions import db
-from sqlalchemy.orm import relationship
-from app.utils.logger import logger
-from sqlalchemy.sql import func
-
-
-class LoanCharge(db.Model):
-    __tablename__ = 'loan_charges'
-
-    id = db.Column(db.Integer, primary_key=True, autoincrement=True)
-    loan_id = db.Column(db.Integer, nullable=False)
-    transaction_id = db.Column(db.String(50), nullable=True)
-    code = db.Column(db.String(50), nullable=False) 
-    amount = db.Column(db.Float, default=0.0)
-    percent = db.Column(db.Float, default=0.0)
-    description = db.Column(db.Text, nullable=True)
-    due = db.Column(db.Integer, nullable=False)
-    due_date = db.Column(db.DateTime, nullable=True)
-    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())
-    # loan = relationship(
-    #     "Loan",
-    #     primaryjoin="LoanCharge.loan_id == Loan.id",
-    #     foreign_keys=[loan_id],
-    #     back_populates="loan_charges",
-    # )
-
-    @classmethod
-    def create_charges_for_loan(cls, loan_id, transaction_id, charges, referenced_amount = 0.0):
-        """
-        Create loan charges for a given loan.
-
-        Args:
-            loan_id (int): ID of the loan to associate charges with.
-            charges (list): A list of dictionaries with keys: 
-            code (str), amount (float), percent (float), description (str), due (int)
-        """
-        # if not charges or not isinstance(charges, list):
-        #     raise ValueError("Charges must be a non-empty list of dictionaries")
-        
-        if loan_id is None:
-            raise ValueError("loan_id cannot be None")
-
-        loan_charges = []
-        now = datetime.now(timezone.utc)
-
-
-        subset_keys = ['interest', 'management', 'insurance', 'vat']
-        for item in subset_keys:
-            charge =  charges[item]
-            due_days = charge['due_days'] #  getattr(charge, "due_days", 0)
-            amount =  charge['fee'] # getattr(charge, "fee", 0.0)
-            percent =  charge['rate'] # getattr(charge, "rate", 0.0)
-            code =  charge['code'] # getattr(charge, "code","")
-            description =  charge['description'] # getattr(charge, "description", "")
-
-            charge_obj = cls(
-                loan_id = loan_id,
-                transaction_id = transaction_id,
-                code = code,
-                amount = round(amount, 2),
-                percent = percent,
-                description = description,
-                due = due_days,
-                due_date = now + timedelta(days=due_days),
-                created_at=datetime.now(timezone.utc),
-                updated_at=datetime.now(timezone.utc)
-            )
-
-            db.session.add(charge_obj)
-            loan_charges.append(charge_obj)
-
-        return loan_charges
-
-    
-
-    def to_dict(self):
-        return {
-            'id': self.id,
-            'loanId': self.loan_id,
-            'transactionId': self.transaction_id,
-            'code': self.code,
-            'amount': self.amount,
-            'percent': self.percent,
-            'description': self.description,
-            'due': self.due,
-        }
-
-    def __repr__(self):
-        return f"<LoanCharge {self.id} - Loan {self.loan_id} - {self.code}>"
+# from datetime import datetime, timezone, timedelta
+# from app.extensions import db
+# from sqlalchemy.orm import relationship
+# from app.utils.logger import logger
+# from sqlalchemy.sql import func
+#
+#
+# class LoanCharge(db.Model):
+#     __tablename__ = 'loan_charges'
+#
+#     id = db.Column(db.Integer, primary_key=True, autoincrement=True)
+#     loan_id = db.Column(db.Integer, nullable=False)
+#     transaction_id = db.Column(db.String(50), nullable=True)
+#     code = db.Column(db.String(50), nullable=False)
+#     amount = db.Column(db.Float, default=0.0)
+#     percent = db.Column(db.Float, default=0.0)
+#     description = db.Column(db.Text, nullable=True)
+#     due = db.Column(db.Integer, nullable=False)
+#     due_date = db.Column(db.DateTime, nullable=True)
+#     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())
+#     # loan = relationship(
+#     #     "Loan",
+#     #     primaryjoin="LoanCharge.loan_id == Loan.id",
+#     #     foreign_keys=[loan_id],
+#     #     back_populates="loan_charges",
+#     # )
+#
+#     @classmethod
+#     def create_charges_for_loan(cls, loan_id, transaction_id, charges, referenced_amount = 0.0):
+#         """
+#         Create loan charges for a given loan.
+#
+#         Args:
+#             loan_id (int): ID of the loan to associate charges with.
+#             charges (list): A list of dictionaries with keys:
+#             code (str), amount (float), percent (float), description (str), due (int)
+#         """
+#         # if not charges or not isinstance(charges, list):
+#         #     raise ValueError("Charges must be a non-empty list of dictionaries")
+#
+#         if loan_id is None:
+#             raise ValueError("loan_id cannot be None")
+#
+#         loan_charges = []
+#         now = datetime.now(timezone.utc)
+#
+#
+#         subset_keys = ['interest', 'management', 'insurance', 'vat']
+#         for item in subset_keys:
+#             charge =  charges[item]
+#             due_days = charge['due_days'] #  getattr(charge, "due_days", 0)
+#             amount =  charge['fee'] # getattr(charge, "fee", 0.0)
+#             percent =  charge['rate'] # getattr(charge, "rate", 0.0)
+#             code =  charge['code'] # getattr(charge, "code","")
+#             description =  charge['description'] # getattr(charge, "description", "")
+#
+#             charge_obj = cls(
+#                 loan_id = loan_id,
+#                 transaction_id = transaction_id,
+#                 code = code,
+#                 amount = round(amount, 2),
+#                 percent = percent,
+#                 description = description,
+#                 due = due_days,
+#                 due_date = now + timedelta(days=due_days),
+#                 created_at=datetime.now(timezone.utc),
+#                 updated_at=datetime.now(timezone.utc)
+#             )
+#
+#             db.session.add(charge_obj)
+#             loan_charges.append(charge_obj)
+#
+#         return loan_charges
+#
+#
+#
+#     def to_dict(self):
+#         return {
+#             'id': self.id,
+#             'loanId': self.loan_id,
+#             'transactionId': self.transaction_id,
+#             'code': self.code,
+#             'amount': self.amount,
+#             'percent': self.percent,
+#             'description': self.description,
+#             'due': self.due,
+#         }
+#
+#     def __repr__(self):
+#         return f"<LoanCharge {self.id} - Loan {self.loan_id} - {self.code}>"