Fix functions assignment task (#1423)

* Fix functions assignment task * Include a test taking into account this use case
Qiskit · Jul 26, 2024 · b9b4f85 · b9b4f85
1 parent 3c1fff4
commit b9b4f85
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 9 deletions.
diff --git a/gateway/api/tasks/programs.py b/gateway/api/tasks/programs.py
@@ -51,15 +51,15 @@ def assign_run_permission():
         else:
             run_permission = Permission.objects.get(codename=RUN_PROGRAM_PERMISSION)
 
+            groups = []
             for instance_title in instances_titles:
-                groups = []
                 group = Group.objects.filter(name=instance_title).first()
                 if group is None:
                     logger.warning("Group [%s] does not exist", instance_title)
                 else:
                     logger.info("Group [%s] does not exist", instance_title)
                     group.permissions.add(run_permission)
-                groups.append(group)
+                    groups.append(group)
 
             logger.info(
                 "Program [%s] is going to be updated with [%s] groups",

diff --git a/gateway/tests/api/tasks/test_tasks.py b/gateway/tests/api/tasks/test_tasks.py
@@ -26,7 +26,7 @@ def test_assign_admin_group(self):
         PROVIDERS_CONFIGURATION='{"test_provider": {"admin_group": "runner", "registry": "docker.io/"}}'
     )
     @override_settings(
-        FUNCTIONS_PERMISSIONS='{"function_provider": {"provider": "test_provider", "instances": ["runner"]}}'
+        FUNCTIONS_PERMISSIONS='{"function_provider": {"provider": "test_provider", "instances": ["runner", "manager"]}}'
     )
     def test_assign_run_permission(self):
         providers.assign_admin_group()
@@ -44,17 +44,20 @@ def test_assign_run_permission(self):
                 "provider": "test_provider",
             },
         )
-        print(programs_response.content)
         self.assertEqual(programs_response.status_code, status.HTTP_200_OK)
 
         programs.assign_run_permission()
 
         program = Program.objects.get(title="function_provider")
-        self.assertEqual(len(program.instances.all()), 1)
+        self.assertEqual(len(program.instances.all()), 2)
         self.assertEqual(program.instances.all()[0].name, "runner")
-
-        group = program.instances.all()[0]
-        self.assertEqual(len(group.permissions.all()), 2)
+        self.assertEqual(program.instances.all()[1].name, "manager")
 
         run_permission = models.Permission.objects.get(codename=RUN_PROGRAM_PERMISSION)
-        self.assertTrue(group.permissions.filter(id=run_permission.pk).exists())
+        runner_group = program.instances.all()[0]
+        self.assertEqual(len(runner_group.permissions.all()), 2)
+        self.assertTrue(runner_group.permissions.filter(id=run_permission.pk).exists())
+
+        manager_group = program.instances.all()[1]
+        self.assertEqual(len(manager_group.permissions.all()), 2)
+        self.assertTrue(manager_group.permissions.filter(id=run_permission.pk).exists())
diff --git a/gateway/tests/fixtures/tasks_fixtures.json b/gateway/tests/fixtures/tasks_fixtures.json
@@ -19,6 +19,14 @@
           "name": "runner",
             "permissions": [60]
         }
+    },
+    {
+      "model": "auth.group",
+        "pk": 101,
+        "fields": {
+          "name": "manager",
+            "permissions": [60]
+        }
     }
   ]