From 7baf79c3fa796086150ebf5ae230114d5c2c470b Mon Sep 17 00:00:00 2001 From: tanshu Date: Sun, 11 Oct 2020 11:20:12 +0530 Subject: [PATCH] Fix: ValueErrors should be HTTPException --- .../routers/reports/beer_consumption_report.py | 7 +++++-- .../routers/reports/bill_settlement_report.py | 7 +++++-- barker/barker/routers/reports/cashier_report.py | 17 +++++++++++++---- .../barker/routers/reports/discount_report.py | 7 +++++-- .../routers/reports/product_sale_report.py | 7 +++++-- barker/barker/routers/reports/sale_report.py | 7 +++++-- barker/barker/routers/reports/tax_report.py | 7 +++++-- barker/barker/routers/voucher/__init__.py | 3 +-- 8 files changed, 44 insertions(+), 18 deletions(-) diff --git a/barker/barker/routers/reports/beer_consumption_report.py b/barker/barker/routers/reports/beer_consumption_report.py index 1d8fa72..ab5c8bb 100644 --- a/barker/barker/routers/reports/beer_consumption_report.py +++ b/barker/barker/routers/reports/beer_consumption_report.py @@ -1,7 +1,7 @@ from datetime import date, datetime, timedelta from barker.core.config import settings -from fastapi import APIRouter, Depends, Security +from fastapi import APIRouter, Depends, HTTPException, Security, status from sqlalchemy.orm import Session from sqlalchemy.sql.expression import func @@ -35,7 +35,10 @@ def beer_consumption( if ( date.today() - start_date ).days > 5 and "accounts-audit" not in user.permissions: - raise ValueError("Accounts Audit") + raise HTTPException( + status_code=status.HTTP_403_FORBIDDEN, + detail="Accounts Audit", + ) day = func.date_trunc( "day", Voucher.date - timedelta(minutes=settings.NEW_DAY_OFFSET_MINUTES) diff --git a/barker/barker/routers/reports/bill_settlement_report.py b/barker/barker/routers/reports/bill_settlement_report.py index 38cda07..de41f27 100644 --- a/barker/barker/routers/reports/bill_settlement_report.py +++ b/barker/barker/routers/reports/bill_settlement_report.py @@ -1,7 +1,7 @@ from datetime import date, datetime, timedelta from barker.core.config import settings -from fastapi import APIRouter, Depends, Security +from fastapi import APIRouter, Depends, HTTPException, Security, status from sqlalchemy.orm import Session from ...core.security import get_current_active_user as get_user @@ -34,7 +34,10 @@ def bill_details( if ( date.today() - start_date ).days > 5 and "accounts-audit" not in user.permissions: - raise ValueError("Accounts Audit") + raise HTTPException( + status_code=status.HTTP_403_FORBIDDEN, + detail="Accounts Audit", + ) return { "startDate": start_date.strftime("%d-%b-%Y"), diff --git a/barker/barker/routers/reports/cashier_report.py b/barker/barker/routers/reports/cashier_report.py index 6b4a53f..c01a620 100644 --- a/barker/barker/routers/reports/cashier_report.py +++ b/barker/barker/routers/reports/cashier_report.py @@ -2,7 +2,7 @@ import uuid from datetime import date, datetime, timedelta -from fastapi import APIRouter, Depends, Security +from fastapi import APIRouter, Depends, HTTPException, Security, status from sqlalchemy import distinct from sqlalchemy.orm import Session, joinedload @@ -37,7 +37,10 @@ def active_cashiers( if ( date.today() - start_date ).days > 5 and "accounts-audit" not in user.permissions: - raise ValueError("Accounts Audit") + raise HTTPException( + status_code=status.HTTP_403_FORBIDDEN, + detail="Accounts Audit", + ) users = ( db.query(User) @@ -72,7 +75,10 @@ def show_id( if ( date.today() - start_date ).days > 5 and "accounts-audit" not in user.permissions: - raise ValueError("Accounts Audit") + raise HTTPException( + status_code=status.HTTP_403_FORBIDDEN, + detail="Accounts Audit", + ) vouchers = ( db.query(Voucher) @@ -130,7 +136,10 @@ def show_blank( if ( date.today() - start_date ).days > 5 and "accounts-audit" not in user.permissions: - raise ValueError("Accounts Audit") + raise HTTPException( + status_code=status.HTTP_403_FORBIDDEN, + detail="Accounts Audit", + ) return { "startDate": start_date.strftime("%d-%b-%Y"), diff --git a/barker/barker/routers/reports/discount_report.py b/barker/barker/routers/reports/discount_report.py index c555bbb..6de1d55 100644 --- a/barker/barker/routers/reports/discount_report.py +++ b/barker/barker/routers/reports/discount_report.py @@ -1,7 +1,7 @@ from datetime import date, datetime, timedelta from barker.core.config import settings -from fastapi import APIRouter, Depends, Security +from fastapi import APIRouter, Depends, HTTPException, Security, status from sqlalchemy import func from sqlalchemy.orm import Session @@ -45,7 +45,10 @@ def discount_report_view( if ( date.today() - start_date ).days > 5 and "accounts-audit" not in user.permissions: - raise ValueError("Accounts Audit") + raise HTTPException( + status_code=status.HTTP_403_FORBIDDEN, + detail="Accounts Audit", + ) return { "startDate": start_date.strftime("%d-%b-%Y"), diff --git a/barker/barker/routers/reports/product_sale_report.py b/barker/barker/routers/reports/product_sale_report.py index 05f4e62..467ba4b 100644 --- a/barker/barker/routers/reports/product_sale_report.py +++ b/barker/barker/routers/reports/product_sale_report.py @@ -1,7 +1,7 @@ from datetime import date, datetime, timedelta from barker.core.config import settings -from fastapi import APIRouter, Depends, Security +from fastapi import APIRouter, Depends, HTTPException, Security, status from sqlalchemy import func from sqlalchemy.orm import Session @@ -44,7 +44,10 @@ def product_sale_report_view( if ( date.today() - start_date ).days > 5 and "accounts-audit" not in user.permissions: - raise ValueError("Accounts Audit") + raise HTTPException( + status_code=status.HTTP_403_FORBIDDEN, + detail="Accounts Audit", + ) return { "startDate": start_date.strftime("%d-%b-%Y"), diff --git a/barker/barker/routers/reports/sale_report.py b/barker/barker/routers/reports/sale_report.py index 4fbb1c0..973f959 100644 --- a/barker/barker/routers/reports/sale_report.py +++ b/barker/barker/routers/reports/sale_report.py @@ -1,7 +1,7 @@ from datetime import date, datetime, timedelta from barker.core.config import settings -from fastapi import APIRouter, Depends, Security +from fastapi import APIRouter, Depends, HTTPException, Security, status from sqlalchemy import func from sqlalchemy.orm import Session @@ -45,7 +45,10 @@ def get_sale_analysis( if ( date.today() - start_date ).days > 5 and "accounts-audit" not in user.permissions: - raise ValueError("Accounts Audit") + raise HTTPException( + status_code=status.HTTP_403_FORBIDDEN, + detail="Accounts Audit", + ) return { "startDate": start_date.strftime("%d-%b-%Y"), diff --git a/barker/barker/routers/reports/tax_report.py b/barker/barker/routers/reports/tax_report.py index feb8ba1..260ffac 100644 --- a/barker/barker/routers/reports/tax_report.py +++ b/barker/barker/routers/reports/tax_report.py @@ -1,7 +1,7 @@ from datetime import date, datetime, timedelta from barker.core.config import settings -from fastapi import APIRouter, Depends, Security +from fastapi import APIRouter, Depends, HTTPException, Security, status from sqlalchemy import func from sqlalchemy.orm import Session @@ -35,7 +35,10 @@ def get_tax_report( if ( date.today() - start_date ).days > 5 and "accounts-audit" not in user.permissions: - raise ValueError("Accounts Audit") + raise HTTPException( + status_code=status.HTTP_403_FORBIDDEN, + detail="Accounts Audit", + ) return { "startDate": start_date.strftime("%d-%b-%Y"), diff --git a/barker/barker/routers/voucher/__init__.py b/barker/barker/routers/voucher/__init__.py index 83958f4..c3a47c9 100644 --- a/barker/barker/routers/voucher/__init__.py +++ b/barker/barker/routers/voucher/__init__.py @@ -11,10 +11,9 @@ from barker.models import ( VoucherType, ) from barker.schemas.receive_payment import ReceivePaymentItem as SettleSchema -from fastapi import HTTPException +from fastapi import HTTPException, status from sqlalchemy import func from sqlalchemy.orm import Session -from starlette import status def get_tax(tax, voucher_type):