Added offer and charge

app/api/routes/routes.py

@@ -8,6 +8,8 @@ from app.api.services.loan_service import LoanService
 from app.api.services.transaction_service import TransactionService
 from app.api.services.auth_service import AuthService
 from app.api.services.dashboard_service import DashboardService
+from app.api.services.offer_service import OfferService
+from app.api.services.charge_service import ChargeService
 from functools import wraps
 from app.utils.logger import logger
 from app.api.middlewares import enforce_json, require_auth
@@ -183,6 +185,7 @@ def get_all_repayment_schedules():
     filters = {
         'loan_id': request.args.get('loan_id'),
         'product_id': request.args.get('product_id'),
+        'transaction_id': request.args.get('transaction_id'),
         'paid': request.args.get('paid'),
         'due_before': request.args.get('due_before'),
         'due_after': request.args.get('due_after'),
@@ -192,4 +195,36 @@ def get_all_repayment_schedules():
     }
     # logger.info(f"Get repayment schedules request received with filters: {filters}")
     response = LoanRepaymentScheduleService.get_all_repayment_schedules(filters)
-    return response
+    return response
+
+@api.route('/offers', methods=['GET'])
+# @token_required
+def get_all_offers():
+    # Extract query parameters for filtering
+    filters = {
+        'id': request.args.get('id'),
+        'product_id': request.args.get('product_id'),
+        'start_date': request.args.get('start_date'),
+        'end_date': request.args.get('end_date'),
+        'page': request.args.get('page', 1),
+        'limit': request.args.get('limit', 20)
+    }
+    # logger.info(f"Get offers request received with filters: {filters}")
+    response = OfferService.get_all_offers(filters)
+    return jsonify(response)
+
+@api.route('/charges', methods=['GET'])
+# @token_required
+def get_all_charges():
+    # Extract query parameters for filtering
+    filters = {
+        'offer_id': request.args.get('offer_id'),
+        'code': request.args.get('code'),
+        'start_date': request.args.get('start_date'),
+        'end_date': request.args.get('end_date'),
+        'page': request.args.get('page', 1),
+        'limit': request.args.get('limit', 20)
+    }
+    # logger.info(f"Get charges request received with filters: {filters}")
+    response = ChargeService.get_all_charges(filters)
+    return jsonify(response)

app/api/services/charge_service.py

@@ -0,0 +1,88 @@
+import logging
+from datetime import datetime
+from flask import jsonify
+from app.models.charge import Charge
+
+# Configure logging
+logger = logging.getLogger(__name__)
+
+class ChargeService:
+    """
+    Service class for handling charge-related operations.
+    """
+
+    @staticmethod
+    def get_all_charges(filters=None):
+        """
+        Get all charges with optional filtering.
+
+        Args:
+            filters (dict, optional): Filters for the charges query.
+
+        Returns:
+            dict: A standardized response with charges data.
+        """
+        try:
+            if filters is None:
+                filters = {}
+
+            # Extract filters
+            offer_id = filters.get('offer_id')
+            code = filters.get('code')
+            start_date = filters.get('start_date')
+            end_date = filters.get('end_date')
+
+            # Extract pagination parameters
+            page = int(filters.get('page', 1))
+            limit = int(filters.get('limit', 20))
+
+            # Ensure page and limit are valid
+            if page < 1:
+                page = 1
+            if limit < 1 or limit > 100:
+                limit = 20
+
+            # Convert string dates to datetime objects if provided
+            if start_date and isinstance(start_date, str):
+                start_date = datetime.fromisoformat(start_date.replace('Z', '+00:00'))
+            if end_date and isinstance(end_date, str):
+                end_date = datetime.fromisoformat(end_date.replace('Z', '+00:00'))
+
+            # Get charges with optional filters and pagination
+            charges, total_count = Charge.get_all_charges(
+                offer_id=offer_id,
+                code=code,
+                start_date=start_date,
+                end_date=end_date,
+                page=page,
+                limit=limit
+            )
+
+            # Convert charges to dictionary format
+            charges_data = []
+            for charge in charges:
+                charges_data.append(charge.to_dict())
+
+            # Calculate total pages
+            total_pages = (total_count + limit - 1) // limit
+
+            response_data = {
+                'charges': charges_data,
+                'count': len(charges_data),
+                'pagination': {
+                    'total_count': total_count,
+                    'total_pages': total_pages,
+                    'current_page': page,
+                    'limit': limit,
+                    'has_next': page < total_pages,
+                    'has_prev': page > 1
+                }
+            }
+
+            return response_data
+
+        except Exception as e:
+            logger.error(f"An error occurred: {str(e)}", exc_info=True)
+            return jsonify({
+                "message": "Internal Server Error"
+            }), 500

app/api/services/loan_repayment_schedule_service.py

@@ -28,6 +28,7 @@ class LoanRepaymentScheduleService:
 
             # Extract filters
             loan_id = filters.get('loan_id')
+            transaction_id = filters.get('transaction_id')
             product_id = filters.get('product_id')
             paid = filters.get('paid')
             due_before = filters.get('due_before')
@@ -57,6 +58,7 @@ class LoanRepaymentScheduleService:
             # Get loan repayment schedules with optional filters and pagination
             schedules, total_count = LoanRepaymentSchedule.get_all_repayment_schedules(
                 loan_id=loan_id,
+                transaction_id=transaction_id,
                 product_id=product_id,
                 paid=paid,
                 due_before=due_before,
@@ -73,6 +75,7 @@ class LoanRepaymentScheduleService:
                     'id': schedule.id,
                     'loan_id': schedule.loan_id,
                     'product_id': schedule.product_id,
+                    'transaction_id': schedule.transaction_id,
                     'installment_number': schedule.installment_number,
                     'due_date': schedule.due_date.isoformat() if schedule.due_date else None,
                     'installment_amount': schedule.installment_amount,

app/api/services/offer_service.py

@@ -0,0 +1,88 @@
+import logging
+from datetime import datetime
+from flask import jsonify
+from app.models.offer import Offer
+
+# Configure logging
+logger = logging.getLogger(__name__)
+
+class OfferService:
+    """
+    Service class for handling offer-related operations.
+    """
+
+    @staticmethod
+    def get_all_offers(filters=None):
+        """
+        Get all offers with optional filtering.
+
+        Args:
+            filters (dict, optional): Filters for the offers query.
+
+        Returns:
+            dict: A standardized response with offers data.
+        """
+        try:
+            if filters is None:
+                filters = {}
+
+            # Extract filters
+            id = filters.get('id')
+            product_id = filters.get('product_id')
+            start_date = filters.get('start_date')
+            end_date = filters.get('end_date')
+
+            # Extract pagination parameters
+            page = int(filters.get('page', 1))
+            limit = int(filters.get('limit', 20))
+
+            # Ensure page and limit are valid
+            if page < 1:
+                page = 1
+            if limit < 1 or limit > 100:
+                limit = 20
+
+            # Convert string dates to datetime objects if provided
+            if start_date and isinstance(start_date, str):
+                start_date = datetime.fromisoformat(start_date.replace('Z', '+00:00'))
+            if end_date and isinstance(end_date, str):
+                end_date = datetime.fromisoformat(end_date.replace('Z', '+00:00'))
+
+            # Get offers with optional filters and pagination
+            offers, total_count = Offer.get_all_offers(
+                id=id,
+                product_id=product_id,
+                start_date=start_date,
+                end_date=end_date,
+                page=page,
+                limit=limit
+            )
+
+            # Convert offers to dictionary format
+            offers_data = []
+            for offer in offers:
+                offers_data.append(offer.to_dict())
+
+            # Calculate total pages
+            total_pages = (total_count + limit - 1) // limit
+
+            response_data = {
+                'offers': offers_data,
+                'count': len(offers_data),
+                'pagination': {
+                    'total_count': total_count,
+                    'total_pages': total_pages,
+                    'current_page': page,
+                    'limit': limit,
+                    'has_next': page < total_pages,
+                    'has_prev': page > 1
+                }
+            }
+
+            return response_data
+
+        except Exception as e:
+            logger.error(f"An error occurred: {str(e)}", exc_info=True)
+            return jsonify({
+                "message": "Internal Server Error"
+            }), 500