Merge pull request #3250 from specify/issue-2480

Make api endpoint return distinct divisions
specify · Apr 5, 2023 · a89a552 · a89a552
2 parents e779e0e + c1ee21e
commit a89a552
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 2 deletions.
diff --git a/specifyweb/specify/api_tests.py b/specifyweb/specify/api_tests.py
@@ -473,8 +473,22 @@ def test_set_user_agents(self):
         self.assertEqual(response.status_code, 204)
 
     def test_set_user_agents_missing_exception(self):
+        collection2 = models.Collection.objects.create(
+            catalognumformatname='test2',
+            collectionname='TestCollection2',
+            isembeddedcollectingevent=False,
+            discipline=self.discipline)
+
+        UserPolicy.objects.create(
+            collection_id=collection2.id,
+            specifyuser_id=self.specifyuser.id,
+            resource='%',
+            action='%',
+        )
+
         c = Client()
         c.force_login(self.specifyuser)
+
         response = c.post(
             f'/api/set_agents/{self.specifyuser.id}/',
             data=[],
@@ -486,7 +500,7 @@ def test_set_user_agents_missing_exception(self):
             {'MissingAgentForAccessibleCollection': {
                 'all_accessible_divisions': [self.division.id],
                 'missing_for_6': [],
-                'missing_for_7': [self.collection.id]
+                'missing_for_7': [self.collection.id, collection2.id]
             }}
         )
 

diff --git a/specifyweb/specify/views.py b/specifyweb/specify/views.py
@@ -337,7 +337,7 @@ def check_collection_access_against_agents(userid: int) -> None:
     if missing_for_6 or missing_for_7:
         all_divisions = models.Division.objects.filter(
             disciplines__collections__id__in=[cid for cid, _ in sp6_collections] + [c.id for c in sp7_collections]
-        ).values_list('id', flat=True)
+        ).values_list('id', flat=True).distinct()
         raise MissingAgentForAccessibleCollection({
             'missing_for_6': missing_for_6,
             'missing_for_7': missing_for_7,