updates

Backend/src/routes/invoice_routes.py

@@ -8,14 +8,16 @@ from ..models.user import User
 from ..models.invoice import Invoice, InvoiceStatus
 from ..models.booking import Booking
 from ..services.invoice_service import InvoiceService
+from ..utils.role_helpers import can_access_all_invoices, can_create_invoices
+from ..utils.response_helpers import success_response
 router = APIRouter(prefix='/invoices', tags=['invoices'])
 
 @router.get('/')
 async def get_invoices(booking_id: Optional[int]=Query(None), status_filter: Optional[str]=Query(None, alias='status'), page: int=Query(1, ge=1), limit: int=Query(10, ge=1, le=100), current_user: User=Depends(get_current_user), db: Session=Depends(get_db)):
     try:
-        user_id = None if current_user.role_id in [1, 4] else current_user.id  # admin and accountant can see all invoices
+        user_id = None if can_access_all_invoices(current_user, db) else current_user.id
         result = InvoiceService.get_invoices(db=db, user_id=user_id, booking_id=booking_id, status=status_filter, page=page, limit=limit)
-        return {'status': 'success', 'data': result}
+        return success_response(data=result)
     except Exception as e:
         raise HTTPException(status_code=500, detail=str(e))
 
@@ -25,9 +27,9 @@ async def get_invoice_by_id(id: int, current_user: User=Depends(get_current_user
         invoice = InvoiceService.get_invoice(id, db)
         if not invoice:
             raise HTTPException(status_code=404, detail='Invoice not found')
-        if current_user.role_id not in [1, 4] and invoice['user_id'] != current_user.id:  # admin and accountant can see all invoices
+        if not can_access_all_invoices(current_user, db) and invoice['user_id'] != current_user.id:
             raise HTTPException(status_code=403, detail='Forbidden')
-        return {'status': 'success', 'data': {'invoice': invoice}}
+        return success_response(data={'invoice': invoice})
     except HTTPException:
         raise
     except Exception as e:
@@ -36,7 +38,7 @@ async def get_invoice_by_id(id: int, current_user: User=Depends(get_current_user
 @router.post('/')
 async def create_invoice(invoice_data: dict, current_user: User=Depends(get_current_user), db: Session=Depends(get_db)):
     try:
-        if current_user.role_id not in [1, 2, 4]:  # admin, staff, and accountant can create invoices
+        if not can_create_invoices(current_user, db):
             raise HTTPException(status_code=403, detail='Forbidden')
         booking_id = invoice_data.get('booking_id')
         if not booking_id:
@@ -55,7 +57,7 @@ async def create_invoice(invoice_data: dict, current_user: User=Depends(get_curr
             invoice_notes = f'{promotion_note}\n{invoice_notes}'.strip() if invoice_notes else promotion_note
             invoice_kwargs['notes'] = invoice_notes
         invoice = InvoiceService.create_invoice_from_booking(booking_id=booking_id, db=db, created_by_id=current_user.id, tax_rate=invoice_data.get('tax_rate', 0.0), discount_amount=invoice_data.get('discount_amount', 0.0), due_days=invoice_data.get('due_days', 30), **invoice_kwargs)
-        return {'status': 'success', 'message': 'Invoice created successfully', 'data': {'invoice': invoice}}
+        return success_response(data={'invoice': invoice}, message='Invoice created successfully')
     except HTTPException:
         raise
     except ValueError as e:
@@ -70,7 +72,7 @@ async def update_invoice(id: int, invoice_data: dict, current_user: User=Depends
         if not invoice:
             raise HTTPException(status_code=404, detail='Invoice not found')
         updated_invoice = InvoiceService.update_invoice(invoice_id=id, db=db, updated_by_id=current_user.id, **invoice_data)
-        return {'status': 'success', 'message': 'Invoice updated successfully', 'data': {'invoice': updated_invoice}}
+        return success_response(data={'invoice': updated_invoice}, message='Invoice updated successfully')
     except HTTPException:
         raise
     except ValueError as e:
@@ -83,7 +85,7 @@ async def mark_invoice_as_paid(id: int, payment_data: dict, current_user: User=D
     try:
         amount = payment_data.get('amount')
         updated_invoice = InvoiceService.mark_invoice_as_paid(invoice_id=id, db=db, amount=amount, updated_by_id=current_user.id)
-        return {'status': 'success', 'message': 'Invoice marked as paid successfully', 'data': {'invoice': updated_invoice}}
+        return success_response(data={'invoice': updated_invoice}, message='Invoice marked as paid successfully')
     except HTTPException:
         raise
     except ValueError as e:
@@ -99,7 +101,7 @@ async def delete_invoice(id: int, current_user: User=Depends(authorize_roles('ad
             raise HTTPException(status_code=404, detail='Invoice not found')
         db.delete(invoice)
         db.commit()
-        return {'status': 'success', 'message': 'Invoice deleted successfully'}
+        return success_response(message='Invoice deleted successfully')
     except HTTPException:
         raise
     except Exception as e:
@@ -112,10 +114,10 @@ async def get_invoices_by_booking(booking_id: int, current_user: User=Depends(ge
         booking = db.query(Booking).filter(Booking.id == booking_id).first()
         if not booking:
             raise HTTPException(status_code=404, detail='Booking not found')
-        if current_user.role_id not in [1, 4] and booking.user_id != current_user.id:  # admin and accountant can see all invoices
+        if not can_access_all_invoices(current_user, db) and booking.user_id != current_user.id:
             raise HTTPException(status_code=403, detail='Forbidden')
         result = InvoiceService.get_invoices(db=db, booking_id=booking_id)
-        return {'status': 'success', 'data': result}
+        return success_response(data=result)
     except HTTPException:
         raise
     except Exception as e: