sql_app: Remove hard coded HTTPException codes
Signed-off-by: HeshamTB <hishaminv@gmail.com>
This commit is contained in:
parent
2811b8a5ef
commit
84db98b6f6
@ -31,5 +31,11 @@
|
|||||||
- [X] Expose access list endpoint for doors
|
- [X] Expose access list endpoint for doors
|
||||||
- [X] Access list coutner for iot door
|
- [X] Access list coutner for iot door
|
||||||
- [X] Force close in middle of timed open request
|
- [X] Force close in middle of timed open request
|
||||||
|
- [ ] Record user connections and time
|
||||||
|
- [ ] Record Iot dev connection and time
|
||||||
|
- [ ] Write unit tests
|
||||||
|
- [ ] Develop a program to visualize the data
|
||||||
|
- [ ] CLI frontend
|
||||||
|
|
||||||
|
|
||||||
eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJibHVldG9vdGhfbWFjIjoic3RyaW5nIn0.ELl5AfBR1NdM4_OFhl_SCTm9EMPpqjiCKOSS0CrOJps
|
eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJibHVldG9vdGhfbWFjIjoic3RyaW5nIn0.ELl5AfBR1NdM4_OFhl_SCTm9EMPpqjiCKOSS0CrOJps
|
@ -155,7 +155,8 @@ def get_iot_access_list_for_user(db: Session = Depends(get_db), current_user: sc
|
|||||||
for device in user.authorized_devices:
|
for device in user.authorized_devices:
|
||||||
dev_db : models.IotEntity = device
|
dev_db : models.IotEntity = device
|
||||||
sensors = crud.get_room_data_now(db)
|
sensors = crud.get_room_data_now(db)
|
||||||
if not sensors: raise HTTPException(status_code=500, detail="No Room link")
|
if not sensors: raise HTTPException(status_code=status.HTTP_500_INTERNAL_SERVER_ERROR,
|
||||||
|
detail="No Room link")
|
||||||
entry : schemas.RoomOverview = schemas.RoomOverview(
|
entry : schemas.RoomOverview = schemas.RoomOverview(
|
||||||
id=dev_db.id,
|
id=dev_db.id,
|
||||||
description=dev_db.description,
|
description=dev_db.description,
|
||||||
@ -192,22 +193,26 @@ def create_iot_entities(iot_entity: schemas.IotEntityCreate, db: Session = Depen
|
|||||||
def read_user(user_id: int, db: Session = Depends(get_db)):
|
def read_user(user_id: int, db: Session = Depends(get_db)):
|
||||||
db_user = crud.get_user(db, user_id=user_id)
|
db_user = crud.get_user(db, user_id=user_id)
|
||||||
if db_user is None:
|
if db_user is None:
|
||||||
raise HTTPException(status_code=404, detail="User not found")
|
raise HTTPException(status_code=status.HTTP_404_NOT_FOUND,
|
||||||
|
detail="User not found")
|
||||||
return db_user
|
return db_user
|
||||||
|
|
||||||
@app.post("/admin/users/allowdevice/id", tags=['Admin'])
|
@app.post("/admin/users/allowdevice/id", tags=['Admin'])
|
||||||
def allow_user_for_iot_entity_by_id(request: schemas.UserAllowForIotEntityRequestByID, db: Session = Depends(get_db)):
|
def allow_user_for_iot_entity_by_id(request: schemas.UserAllowForIotEntityRequestByID, db: Session = Depends(get_db)):
|
||||||
user = crud.get_user(db, request.user_id)
|
user = crud.get_user(db, request.user_id)
|
||||||
if not user:
|
if not user:
|
||||||
raise HTTPException(status_code=404, detail="User not found")
|
raise HTTPException(status.HTTP_404_NOT_FOUND,
|
||||||
|
detail="User not found")
|
||||||
|
|
||||||
iot_entity = crud.get_iot_entity(db, request.iot_entity_id)
|
iot_entity = crud.get_iot_entity(db, request.iot_entity_id)
|
||||||
if not iot_entity:
|
if not iot_entity:
|
||||||
raise HTTPException(status_code=404, detail="Iot Entity not found")
|
raise HTTPException(status.HTTP_404_NOT_FOUND,
|
||||||
|
detail="Iot Entity not found")
|
||||||
|
|
||||||
res = crud.create_user_link_to_iot(db, request.user_id, request.iot_entity_id)
|
res = crud.create_user_link_to_iot(db, request.user_id, request.iot_entity_id)
|
||||||
if not res:
|
if not res:
|
||||||
raise HTTPException(status_code=500, detail="Could not complete operation")
|
raise HTTPException(status.HTTP_500_INTERNAL_SERVER_ERROR,
|
||||||
|
detail="Could not complete operation")
|
||||||
|
|
||||||
crud.increment_door_access_list_counter(db, iot_entity)
|
crud.increment_door_access_list_counter(db, iot_entity)
|
||||||
return
|
return
|
||||||
@ -216,15 +221,18 @@ def allow_user_for_iot_entity_by_id(request: schemas.UserAllowForIotEntityReques
|
|||||||
def disallow_user_for_iot_entity_by_id(request: schemas.UserAllowForIotEntityRequestByID, db: Session = Depends(get_db)):
|
def disallow_user_for_iot_entity_by_id(request: schemas.UserAllowForIotEntityRequestByID, db: Session = Depends(get_db)):
|
||||||
user = crud.get_user(db, request.user_id)
|
user = crud.get_user(db, request.user_id)
|
||||||
if not user:
|
if not user:
|
||||||
raise HTTPException(status_code=404, detail="User not found")
|
raise HTTPException(status.HTTP_404_NOT_FOUND,
|
||||||
|
detail="User not found")
|
||||||
|
|
||||||
iot_entity = crud.get_iot_entity(db, request.iot_entity_id)
|
iot_entity = crud.get_iot_entity(db, request.iot_entity_id)
|
||||||
if not iot_entity:
|
if not iot_entity:
|
||||||
raise HTTPException(status_code=404, detail="Iot Entity not found")
|
raise HTTPException(status.HTTP_404_NOT_FOUND,
|
||||||
|
detail="Iot Entity not found")
|
||||||
|
|
||||||
res = crud.remove_user_link_to_iot(db, request.user_id, request.iot_entity_id)
|
res = crud.remove_user_link_to_iot(db, request.user_id, request.iot_entity_id)
|
||||||
if not res:
|
if not res:
|
||||||
raise HTTPException(status_code=500, detail="Could not complete operation")
|
raise HTTPException(status.HTTP_500_INTERNAL_SERVER_ERROR,
|
||||||
|
detail="Could not complete operation")
|
||||||
|
|
||||||
crud.increment_door_access_list_counter(db, iot_entity)
|
crud.increment_door_access_list_counter(db, iot_entity)
|
||||||
return
|
return
|
||||||
@ -233,15 +241,18 @@ def disallow_user_for_iot_entity_by_id(request: schemas.UserAllowForIotEntityReq
|
|||||||
def allow_user_for_iot_entity_by_name(request: schemas.UserAllowForIotEntityRequestByUsername, db: Session = Depends(get_db)):
|
def allow_user_for_iot_entity_by_name(request: schemas.UserAllowForIotEntityRequestByUsername, db: Session = Depends(get_db)):
|
||||||
user = crud.get_user_by_username(db, request.username)
|
user = crud.get_user_by_username(db, request.username)
|
||||||
if not user:
|
if not user:
|
||||||
raise HTTPException(status_code=404, detail="User not found")
|
raise HTTPException(status.HTTP_404_NOT_FOUND,
|
||||||
|
detail="User not found")
|
||||||
|
|
||||||
iot_entity = crud.get_iot_entity_by_description(db, request.description)
|
iot_entity = crud.get_iot_entity_by_description(db, request.description)
|
||||||
if not iot_entity:
|
if not iot_entity:
|
||||||
raise HTTPException(status_code=404, detail="Iot Entity not found")
|
raise HTTPException(status.HTTP_404_NOT_FOUND,
|
||||||
|
detail="Iot Entity not found")
|
||||||
|
|
||||||
res = crud.create_user_link_to_iot(db, user.id, iot_entity.id)
|
res = crud.create_user_link_to_iot(db, user.id, iot_entity.id)
|
||||||
if not res:
|
if not res:
|
||||||
raise HTTPException(status_code=500, detail="Could not complete operation")
|
raise HTTPException(status.HTTP_500_INTERNAL_SERVER_ERROR,
|
||||||
|
detail="Could not complete operation")
|
||||||
|
|
||||||
return
|
return
|
||||||
|
|
||||||
@ -265,21 +276,21 @@ def generate_token_for_iot_device(bluetooth_mac : schemas.IotBluetoothMac,
|
|||||||
def get_access_log_for_door(request : schemas.AccessLogRequest,
|
def get_access_log_for_door(request : schemas.AccessLogRequest,
|
||||||
db : Session = Depends(get_db)):
|
db : Session = Depends(get_db)):
|
||||||
device = crud.get_iot_entity_by_bluetooth_mac(db, request.bluetooth_mac)
|
device = crud.get_iot_entity_by_bluetooth_mac(db, request.bluetooth_mac)
|
||||||
if not device: raise HTTPException(status_code=404, detail="Iot Entity not found")
|
if not device: raise HTTPException(status.HTTP_404_NOT_FOUND, detail="Iot Entity not found")
|
||||||
return crud.get_access_log_for_door_by_door_mac(db, request.bluetooth_mac)
|
return crud.get_access_log_for_door_by_door_mac(db, request.bluetooth_mac)
|
||||||
|
|
||||||
@app.post("/admin/user/accesslog/email/", tags=['Admin'])
|
@app.post("/admin/user/accesslog/email/", tags=['Admin'])
|
||||||
def get_access_log_history_for_user(request : schemas.UserAccessLogRequestEmail,
|
def get_access_log_history_for_user(request : schemas.UserAccessLogRequestEmail,
|
||||||
db : Session = Depends(get_db)):
|
db : Session = Depends(get_db)):
|
||||||
user = crud.get_user_by_email(db, request.email)
|
user = crud.get_user_by_email(db, request.email)
|
||||||
if not user: raise HTTPException(status_code=404, detail="User not found")
|
if not user: raise HTTPException(status.HTTP_404_NOT_FOUND, detail="User not found")
|
||||||
return crud.get_access_log_for_user_by_id(db, user.id)
|
return crud.get_access_log_for_user_by_id(db, user.id)
|
||||||
|
|
||||||
@app.post("/admin/user/accesslog/username/", tags=['Admin'])
|
@app.post("/admin/user/accesslog/username/", tags=['Admin'])
|
||||||
def get_access_log_history_for_user(request : schemas.UserAccessLogRequestUsername,
|
def get_access_log_history_for_user(request : schemas.UserAccessLogRequestUsername,
|
||||||
db : Session = Depends(get_db)):
|
db : Session = Depends(get_db)):
|
||||||
user = crud.get_user_by_username(db, request.username)
|
user = crud.get_user_by_username(db, request.username)
|
||||||
if not user: raise HTTPException(status_code=404, detail="User not found")
|
if not user: raise HTTPException(status.HTTP_404_NOT_FOUND, detail="User not found")
|
||||||
return crud.get_access_log_for_user_by_id(db, user.id)
|
return crud.get_access_log_for_user_by_id(db, user.id)
|
||||||
|
|
||||||
@app.get("/admin/roominfo/now/", tags=['Admin'])
|
@app.get("/admin/roominfo/now/", tags=['Admin'])
|
||||||
|
Loading…
Reference in New Issue
Block a user