Cheatsheet List Fix

app/common/enums.py

@@ -31,6 +31,21 @@ def get_user_class_number(user_class: NativeUserClass) -> int:
     return int(_class.split(".")[0])
 
 
+def get_user_class_name(user_class: int):
+    if user_class == 1:
+        return NativeUserClass.FIRST
+    elif user_class == 2:
+        return NativeUserClass.SECOND
+    elif user_class == 3:
+        return NativeUserClass.THIRD
+    elif user_class == 4:
+        return NativeUserClass.FOURTH
+    elif user_class == 5:
+        return NativeUserClass.FIFTH
+    else:
+        return NativeUserClass.ALUMNI
+
+
 # This can't be removed because it is used in the migrations. It is not used in the code
 class UserStudy(ChoiceEnum):
     DATAING = "Dataingeniør"

app/content/views/cheatsheet.py

@@ -4,7 +4,8 @@
 
 from sentry_sdk import capture_exception
 
-from app.common.enums import UserClass, UserStudy
+from app.common.enums import NativeUserStudy as UserStudy
+from app.common.enums import get_user_class_name
 from app.common.pagination import BasePagination
 from app.common.permissions import BasicViewPermission, is_admin_user
 from app.common.viewsets import BaseViewSet
@@ -24,8 +25,9 @@ class CheatsheetViewSet(BaseViewSet):
 
     def get_object(self):
         if "pk" not in self.kwargs:
+            grade = get_user_class_name(int(self.kwargs["grade"]))
             return self.filter_queryset(self.queryset).filter(
-                grade=UserClass(int(self.kwargs["grade"])),
+                grade=grade,
                 study=UserStudy[self.kwargs["study"]],
             )
 

app/group/filters/group.py

@@ -15,11 +15,9 @@ class Meta:
         fields = ["type", "overview"]
 
     def filter_type(self, queryset, _, value):
-        """Django Rest does not know hot to convert incoming string values into EnumChoiceField values and we must do this manually."""
-        mapped = list(GroupType[v] for v in value)
-        return queryset.filter(type__in=mapped)
+        return queryset.filter(type__in=value)
 
-    def filter_overview(self, queryset, _):
+    def filter_overview(self, queryset, *_):
         if is_admin_user(self.request):
             return queryset
         return queryset.filter(type__in=GroupType.public_groups())

app/tests/content/test_cheatsheet_integration.py

@@ -47,16 +47,17 @@ def test_list_as_anonymous_user(default_client, cheatsheet):
 
 
 @pytest.mark.django_db
-def test_list_as_member(cheatsheet, member):
+def test_list_cheatsheets_as_member(cheatsheet, member):
     """
     A member of TIHLDE should be able to list all cheatsheets.
     """
     client = get_api_client(user=member)
     url = _get_cheatsheet_url(cheatsheet)
     response = client.get(url)
+    data = response.data
 
     assert response.status_code == status.HTTP_200_OK
-    assert len(response.json())
+    assert len(data.get("results"))
 
 
 @pytest.mark.django_db

app/tests/groups/test_group_integration.py

@@ -4,6 +4,7 @@
 
 from app.common.enums import AdminGroup
 from app.common.enums import NativeGroupType as GroupType
+from app.group.factories import GroupFactory
 from app.util.test_utils import get_api_client
 
 GROUP_URL = "/groups/"
@@ -13,6 +14,14 @@ def _get_group_url(group=None):
     return f"{GROUP_URL}{group.slug}/" if (group) else f"{GROUP_URL}"
 
 
+def _get_overview_group_url():
+    return f"{GROUP_URL}?overview=true"
+
+
+def _get_group_type_filtered_list(slug: str):
+    return f"{GROUP_URL}?type={slug}"
+
+
 def _get_group_post_data(group):
     return {
         "name": group.name,
@@ -38,6 +47,32 @@ def test_list_as_anonymous_user(default_client):
     assert response.status_code == status.HTTP_200_OK
 
 
+@pytest.mark.django_db
+def test_list_overview_of_groups_as_member(member):
+    """Tests if a member can list an overview of groups"""
+
+    client = get_api_client(user=member)
+    url = _get_overview_group_url()
+    response = client.get(url)
+
+    assert response.status_code == status.HTTP_200_OK
+
+
+@pytest.mark.django_db
+def test_list_type_of_groups_as_member(member):
+    """Tests if a member can list a type of groups"""
+
+    GroupFactory(type=GroupType.BOARD)
+    GroupFactory(type=GroupType.COMMITTEE)
+
+    client = get_api_client(user=member)
+    url = _get_group_type_filtered_list(GroupType.BOARD.value)
+    response = client.get(url)
+
+    assert response.status_code == status.HTTP_200_OK
+    assert len(response.data) == 1
+
+
 @pytest.mark.django_db
 def test_retrieve_as_anonymous_user(default_client, group):
     """Tests if an anonymous user can retrieve a group"""