Skip to content

Commit

Permalink
Code cleanup
Browse files Browse the repository at this point in the history
  • Loading branch information
chrtorres committed Oct 30, 2024
1 parent cdf9cfb commit aa217dc
Showing 1 changed file with 28 additions and 16 deletions.
44 changes: 28 additions & 16 deletions backend/src/xfd_django/xfd_api/tests/test_saved_searches.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,13 @@
# Third-Party Libraries
from fastapi.testclient import TestClient
import pytest
from xfd_api.models import User, SavedSearch, UserType
from xfd_django.asgi import app
from xfd_api.auth import create_jwt_token
from xfd_api.models import SavedSearch, User, UserType
from xfd_django.asgi import app

client = TestClient(app)


@pytest.mark.django_db
def test_create_saved_search_by_user():
user = User.objects.create(
Expand All @@ -31,7 +32,7 @@ def test_create_saved_search_by_user():
"sortField": "",
"searchTerm": "",
"searchPath": "",
"filters": []
"filters": [],
},
headers={"Authorization": "Bearer " + create_jwt_token(user)},
)
Expand All @@ -40,6 +41,7 @@ def test_create_saved_search_by_user():
assert data["name"] == name
assert data["createdById"] == str(user.id)


@pytest.mark.django_db
def test_update_saved_search_by_global_admin_fails():
body = {
Expand All @@ -49,7 +51,7 @@ def test_update_saved_search_by_global_admin_fails():
"sortField": "",
"searchTerm": "",
"searchPath": "",
"filters": []
"filters": [],
}
search = SavedSearch.objects.create(**body)
body["name"] = f"test-{secrets.token_hex(4)}"
Expand All @@ -61,6 +63,7 @@ def test_update_saved_search_by_global_admin_fails():
)
assert response.status_code == 404


@pytest.mark.django_db
def test_update_saved_search_by_standard_user_with_access():
user = User.objects.create(
Expand All @@ -78,7 +81,7 @@ def test_update_saved_search_by_standard_user_with_access():
"sortField": "",
"searchTerm": "",
"searchPath": "",
"filters": []
"filters": [],
}
search = SavedSearch.objects.create(**body, createdById=user)
body["name"] = f"test-{secrets.token_hex(4)}"
Expand All @@ -93,6 +96,7 @@ def test_update_saved_search_by_standard_user_with_access():
assert data["name"] == body["name"]
assert data["searchTerm"] == body["searchTerm"]


@pytest.mark.django_db
def test_update_saved_search_by_standard_user_without_access_fails():
user = User.objects.create(
Expand All @@ -119,7 +123,7 @@ def test_update_saved_search_by_standard_user_without_access_fails():
"searchTerm": "",
"searchPath": "",
"filters": [],
"createdById": user
"createdById": user,
}
search = SavedSearch.objects.create(**body)
response = client.put(
Expand All @@ -129,6 +133,7 @@ def test_update_saved_search_by_standard_user_without_access_fails():
)
assert response.status_code == 404


@pytest.mark.django_db
def test_delete_saved_search_by_global_admin_fails():
search = SavedSearch.objects.create(
Expand All @@ -138,14 +143,15 @@ def test_delete_saved_search_by_global_admin_fails():
sortField="",
searchTerm="",
searchPath="",
filters=[]
filters=[],
)
response = client.delete(
f"/saved-searches/{search.id}",
headers={"Authorization": "Bearer " + create_jwt_token(UserType.GLOBAL_ADMIN)},
)
assert response.status_code == 404


@pytest.mark.django_db
def test_delete_saved_search_by_user_with_access():
user = User.objects.create(
Expand All @@ -164,7 +170,7 @@ def test_delete_saved_search_by_user_with_access():
searchTerm="",
searchPath="",
filters=[],
createdById=user
createdById=user,
)
response = client.delete(
f"/saved-searches/{search.id}",
Expand All @@ -173,6 +179,7 @@ def test_delete_saved_search_by_user_with_access():
assert response.status_code == 200
assert response.json()["status"] == "success"


@pytest.mark.django_db
def test_delete_saved_search_by_user_without_access_fails():
user = User.objects.create(
Expand All @@ -199,14 +206,15 @@ def test_delete_saved_search_by_user_without_access_fails():
searchTerm="",
searchPath="",
filters=[],
createdById=user
createdById=user,
)
response = client.delete(
f"/saved-searches/{search.id}",
headers={"Authorization": "Bearer " + create_jwt_token(user1)},
)
assert response.status_code == 404


@pytest.mark.django_db
def test_list_saved_searches_by_global_view_returns_none():
search = SavedSearch.objects.create(
Expand All @@ -216,7 +224,7 @@ def test_list_saved_searches_by_global_view_returns_none():
sortField="",
searchTerm="",
searchPath="",
filters=[]
filters=[],
)
response = client.get(
"/saved-searches",
Expand All @@ -225,6 +233,7 @@ def test_list_saved_searches_by_global_view_returns_none():
assert response.status_code == 200
assert response.json()["count"] == 0


@pytest.mark.django_db
def test_list_saved_searches_by_user_only_gets_their_search():
user = User.objects.create(
Expand All @@ -251,7 +260,7 @@ def test_list_saved_searches_by_user_only_gets_their_search():
searchTerm="",
searchPath="",
filters=[],
createdById=user
createdById=user,
)
search2 = SavedSearch.objects.create(
name=f"test-{secrets.token_hex(4)}",
Expand All @@ -261,7 +270,7 @@ def test_list_saved_searches_by_user_only_gets_their_search():
searchTerm="",
searchPath="",
filters=[],
createdById=user1
createdById=user1,
)
response = client.get(
"/saved-searches",
Expand All @@ -271,6 +280,7 @@ def test_list_saved_searches_by_user_only_gets_their_search():
assert response.json()["count"] == 1
assert response.json()["result"][0]["id"] == str(search.id)


@pytest.mark.django_db
def test_get_saved_search_by_global_view_fails():
search = SavedSearch.objects.create(
Expand All @@ -280,14 +290,15 @@ def test_get_saved_search_by_global_view_fails():
sortField="",
searchTerm="",
searchPath="",
filters=[]
filters=[],
)
response = client.get(
f"/saved-searches/{search.id}",
headers={"Authorization": "Bearer " + create_jwt_token(UserType.GLOBAL_VIEW)},
)
assert response.status_code == 404


@pytest.mark.django_db
def test_get_saved_search_by_user_passes():
user = User.objects.create(
Expand All @@ -306,7 +317,7 @@ def test_get_saved_search_by_user_passes():
searchTerm="",
searchPath="",
filters=[],
createdById=user
createdById=user,
)
response = client.get(
f"/saved-searches/{search.id}",
Expand All @@ -315,6 +326,7 @@ def test_get_saved_search_by_user_passes():
assert response.status_code == 200
assert response.json()["name"] == search.name


@pytest.mark.django_db
def test_get_saved_search_by_different_user_fails():
user = User.objects.create(
Expand All @@ -341,11 +353,11 @@ def test_get_saved_search_by_different_user_fails():
searchTerm="",
searchPath="",
filters=[],
createdById=user1
createdById=user1,
)
response = client.get(
f"/saved-searches/{search.id}",
headers={"Authorization": "Bearer " + create_jwt_token(user)},
)
assert response.status_code == 404
assert response.json() == {}
assert response.json() == {}

0 comments on commit aa217dc

Please sign in to comment.