Minor fixes.

teknologr/api/tests_generikey.py → teknologr/api/tests_members_by_mt.py

@@ -45,7 +45,7 @@ def setUp(self):
     def login_superuser(self):
         self.client.login(username='superuser', password='teknolog')
 
-class GenerikeyTestCases():
+class TestCases():
     def test_get_for_anonymous_users(self):
         response = self.get('PH')
         self.assertEqual(response.status_code, status.HTTP_403_FORBIDDEN)
@@ -91,7 +91,7 @@ def test_get_double(self):
         self.assertEqual(response.json(), self.double)
 
 
-class GenerikeyStudynumbersTestCases(BaseClass, GenerikeyTestCases):
+class StudynumbersByMTTests(BaseClass, TestCases):
     normal = ['123456', '654321']
     null = ['123456', None]
     double = ['654321', None]
@@ -100,7 +100,7 @@ def get(self, type):
         return self.client.get(f'/api/membersByMemberType/{type}/')
 
 
-class GenerikeyUsernamesTestCases(BaseClass, GenerikeyTestCases):
+class UsernamesByMTTests(BaseClass, TestCases):
     normal = ['vonteks1', 'vonteks2']
     null = ['vonteks1', None]
     double = ['vonteks2', None]

teknologr/api/tests_bill.py → teknologr/api/tests_mt_by_member.py

@@ -29,7 +29,7 @@ def login_superuser(self):
         self.client.login(username='superuser', password='teknolog')
 
 
-class BILLTestCases:
+class TestCases:
     def test_get_for_anonymous_users(self):
         response = self.get()
         self.assertEqual(response.status_code, status.HTTP_403_FORBIDDEN)
@@ -48,11 +48,11 @@ def test_get_for_superuser(self):
         else:
             self.assertEqual(self.response, response.json())
 
-class BILLByUsernameTestCases(BILLTestCases):
+class ByUsernameTestCases(TestCases):
     def get(self):
         return self.client.get(f'/api/memberTypesForMember/username/{self.username}/')
 
-class BILLByStudynumberTestCases(BILLTestCases):
+class ByStudynumberTestCases(TestCases):
     def get(self):
         return self.client.get(f'/api/memberTypesForMember/studynumber/{self.studynumber}/')
 
@@ -77,26 +77,26 @@ def get(self):
     }
 }
 
-class BILLByInvalidUsernameTests(BaseClass, BILLByUsernameTestCases):
+class ByInvalidUsernameTests(BaseClass, ByUsernameTestCases):
     def setUp(self):
         super().setUp()
         self.username = 'invalid'
         self.response = None
 
-class BILLByValidUsernameTests(BaseClass, BILLByUsernameTestCases):
+class ByValidUsernameTests(BaseClass, ByUsernameTestCases):
     def setUp(self):
         super().setUp()
         self.username = self.member.username
         self.response = RESPONSE
 
 
-class BILLByInvalidStudynumberTests(BaseClass, BILLByStudynumberTestCases):
+class ByInvalidStudynumberTests(BaseClass, ByStudynumberTestCases):
     def setUp(self):
         super().setUp()
         self.studynumber = '123321'
         self.response = None
 
-class BILLByValidStudynumberTests(BaseClass, BILLByStudynumberTestCases):
+class ByValidStudynumberTests(BaseClass, ByStudynumberTestCases):
     def setUp(self):
         super().setUp()
         self.studynumber = self.member.student_id

teknologr/api/urls.py

@@ -4,7 +4,7 @@
 from api.views import *
 
 class TeknologrRootView(APIRootView):
-    permission_classes = (permissions.IsAuthenticated, )
+    permission_classes = (IsAuthenticated, )
     name = 'Katalogen root API'
     description = ''
     router_list_name = None
@@ -21,7 +21,7 @@ def api_root_dict(self):
         is_staff = self.request.user.is_staff
         for prefix, viewset, basename in self.router_registry:
             # Include the route unless it is staff only
-            if not is_staff and permissions.IsAdminUser in viewset.permission_classes:
+            if not is_staff and IsAdminUser in viewset.permission_classes:
                 continue
             d[prefix] = self.router_list_name.format(basename=basename)
 
@@ -74,8 +74,8 @@ def get_api_root_view(self, api_urls=None):
     url(r'^dump-arsk/$', dump_arsk, name='dump_arsk'),
     url(r'^dump-regemails/$', dump_reg_emails, name='dump_reg_emails'),
     url(r'^dump-studentbladet/$', dump_studentbladet, name='dump_studentbladet'),
-    # Used by BILL
+    # Used by BILL (?)
     url(r'^memberTypesForMember/(?P<mode>username|studynumber)/(?P<query>[A-Za-z0-9]+)/$', member_types_for_member),
-    # Used by Generikey
-    url(r'^membersByMemberType/([A-Z]{2})/(\w+)?$', members_by_member_type),
+    # Used by BILL and Generikey
+    url(r'^membersByMemberType/([A-Z]{2})/(?:(\w+)/?)?$', members_by_member_type),
 ]

teknologr/api/views.py

@@ -519,7 +519,7 @@ def multi_applicant_submissions(request):
 
 # JSON API:s
 
-# Used by BILL
+# Used by BILL (?)
 @api_view(['GET'])
 def member_types_for_member(request, mode, query):
     try:
@@ -548,7 +548,7 @@ def member_types_for_member(request, mode, query):
     return Response(data, status=200)
 
 
-# Used by GeneriKey
+# Used by BILL and GeneriKey
 @api_view(['GET'])
 def members_by_member_type(request, membertype, field=None):
     member_pks = MemberType.objects.filter(type=membertype, end_date=None).values_list("member", flat=True)
@@ -678,14 +678,11 @@ def dump_active(request):
         if membership.group.begin_date < now and membership.group.end_date > now:
             grouped_by_group[membership.group].append(membership.member)
     for group, members in grouped_by_group.items():
-        content.append({
-            'position': str(group.grouptype),
-            'member': ''
-        })
-        content.extend([{
-            'position': '',
-            'member': m.common_name
-        } for m in members])
+        for m in members:
+            content.append({
+                'position': str(group.grouptype),
+                'member': m.full_name,
+            })
 
     return Response(content, status=200)