almost all tests run now
This commit is contained in:
@@ -1,4 +1,4 @@
|
|||||||
from fastapi import APIRouter, HTTPException, Depends
|
from fastapi import APIRouter, HTTPException, Depends, status
|
||||||
from sqlmodel import Session, select
|
from sqlmodel import Session, select
|
||||||
from typing import List
|
from typing import List
|
||||||
|
|
||||||
@@ -16,6 +16,9 @@ def get_groups(*, db: Session = Depends(get_session), admin: bool = Depends(auth
|
|||||||
@group_router.post("/", response_model=GroupResponse)
|
@group_router.post("/", response_model=GroupResponse)
|
||||||
def create_group(*, db: Session = Depends(get_session), group: GroupCreate, admin: bool = Depends(auth_is_admin)):
|
def create_group(*, db: Session = Depends(get_session), group: GroupCreate, admin: bool = Depends(auth_is_admin)):
|
||||||
db_group = GroupDB.model_validate(group)
|
db_group = GroupDB.model_validate(group)
|
||||||
|
group = db.exec(select(GroupDB).where(GroupDB.name == db_group.name)).first()
|
||||||
|
if group is not None:
|
||||||
|
raise HTTPException(status_code=status.HTTP_409_CONFLICT, detail="Group already exists!")
|
||||||
return add_and_refresh(db, db_group)
|
return add_and_refresh(db, db_group)
|
||||||
|
|
||||||
@group_router.delete("/{group_id}")
|
@group_router.delete("/{group_id}")
|
||||||
|
|||||||
@@ -90,7 +90,7 @@ def test_get_current_user(db_session, admin_user):
|
|||||||
token = create_access_token(data={"sub": admin_user.name})
|
token = create_access_token(data={"sub": admin_user.name})
|
||||||
|
|
||||||
# Get user from token
|
# Get user from token
|
||||||
user = get_current_user(token=token)
|
user = get_current_user(token=token, db=db_session)
|
||||||
assert user is not None
|
assert user is not None
|
||||||
assert user.name == admin_user.name
|
assert user.name == admin_user.name
|
||||||
assert user.id == admin_user.id
|
assert user.id == admin_user.id
|
||||||
|
|||||||
@@ -20,7 +20,7 @@ def test_create_duplicate_group(client, auth_headers, test_group):
|
|||||||
|
|
||||||
response = client.post("/groups/", json=group_data, headers=auth_headers)
|
response = client.post("/groups/", json=group_data, headers=auth_headers)
|
||||||
# This should fail due to unique constraint
|
# This should fail due to unique constraint
|
||||||
assert response.status_code == 422 # Validation error
|
assert response.status_code == 409 # Validation error
|
||||||
|
|
||||||
|
|
||||||
def test_get_groups(client, auth_headers, test_group):
|
def test_get_groups(client, auth_headers, test_group):
|
||||||
|
|||||||
@@ -31,7 +31,7 @@ def test_create_user_unauthorized(client):
|
|||||||
}
|
}
|
||||||
|
|
||||||
response = client.post("/users/", json=user_data)
|
response = client.post("/users/", json=user_data)
|
||||||
assert response.status_code == 403
|
assert response.status_code == 401
|
||||||
|
|
||||||
|
|
||||||
def test_get_users(client, auth_headers, admin_user, regular_user):
|
def test_get_users(client, auth_headers, admin_user, regular_user):
|
||||||
|
|||||||
Reference in New Issue
Block a user