lookup 1000 groups when attempting to cache them so we are not restricted to 100 w/ burnettk (#1331)

Co-authored-by: jasquat <jasquat@users.noreply.github.com>

spiffworkflow-backend/tests/spiffworkflow_backend/integration/test_process_api.py

@@ -13,7 +13,6 @@ from flask.testing import FlaskClient
 from SpiffWorkflow.util.task import TaskState  # type: ignore
 from spiffworkflow_backend.exceptions.process_entity_not_found_error import ProcessEntityNotFoundError
 from spiffworkflow_backend.models.db import db
-from spiffworkflow_backend.models.process_group import ProcessGroup
 from spiffworkflow_backend.models.process_instance import ProcessInstanceModel
 from spiffworkflow_backend.models.process_instance import ProcessInstanceStatus
 from spiffworkflow_backend.models.process_instance_event import ProcessInstanceEventModel
@@ -669,175 +668,6 @@ class TestProcessApi(BaseTest):
         caller = response.json[0]
         assert caller["identifier"] == "Level1"
 
-    def test_process_group_add(
-        self,
-        app: Flask,
-        client: FlaskClient,
-        with_db_and_bpmn_file_cleanup: None,
-        with_super_admin_user: UserModel,
-    ) -> None:
-        process_group = ProcessGroup(
-            id="test",
-            display_name="Another Test Category",
-            display_order=0,
-            admin=False,
-            description="Test Description",
-        )
-        response = client.post(
-            "/v1.0/process-groups",
-            headers=self.logged_in_headers(with_super_admin_user),
-            content_type="application/json",
-            data=json.dumps(process_group.serialized()),
-        )
-        assert response.status_code == 201
-        assert response.json
-
-        # Check what is returned
-        result = ProcessGroup(**response.json)
-        assert result is not None
-        assert result.display_name == "Another Test Category"
-        assert result.id == "test"
-        assert result.description == "Test Description"
-
-        # Check what is persisted
-        persisted = ProcessModelService.get_process_group("test")
-        assert persisted.display_name == "Another Test Category"
-        assert persisted.id == "test"
-        assert persisted.description == "Test Description"
-
-    def test_process_group_delete(
-        self,
-        app: Flask,
-        client: FlaskClient,
-        with_db_and_bpmn_file_cleanup: None,
-        with_super_admin_user: UserModel,
-    ) -> None:
-        process_group_id = "test"
-        process_group_display_name = "My Process Group"
-
-        self.create_process_group_with_api(
-            client,
-            with_super_admin_user,
-            process_group_id,
-            display_name=process_group_display_name,
-        )
-        persisted = ProcessModelService.get_process_group(process_group_id)
-        assert persisted is not None
-        assert persisted.id == process_group_id
-
-        client.delete(
-            f"/v1.0/process-groups/{process_group_id}",
-            headers=self.logged_in_headers(with_super_admin_user),
-        )
-
-        with pytest.raises(ProcessEntityNotFoundError):
-            ProcessModelService.get_process_group(process_group_id)
-
-    def test_process_group_update(
-        self,
-        app: Flask,
-        client: FlaskClient,
-        with_db_and_bpmn_file_cleanup: None,
-        with_super_admin_user: UserModel,
-    ) -> None:
-        """Test Process Group Update."""
-        group_id = "test_process_group"
-        group_display_name = "Test Group"
-
-        self.create_process_group_with_api(client, with_super_admin_user, group_id, display_name=group_display_name)
-        process_group = ProcessModelService.get_process_group(group_id)
-
-        assert process_group.display_name == group_display_name
-
-        process_group.display_name = "Modified Display Name"
-
-        response = client.put(
-            f"/v1.0/process-groups/{group_id}",
-            headers=self.logged_in_headers(with_super_admin_user),
-            content_type="application/json",
-            data=json.dumps(process_group.serialized()),
-        )
-        assert response.status_code == 200
-
-        process_group = ProcessModelService.get_process_group(group_id)
-        assert process_group.display_name == "Modified Display Name"
-
-    def test_process_group_list(
-        self,
-        app: Flask,
-        client: FlaskClient,
-        with_db_and_bpmn_file_cleanup: None,
-        with_super_admin_user: UserModel,
-    ) -> None:
-        # add 5 groups
-        for i in range(5):
-            group_id = f"test_process_group_{i}"
-            group_display_name = f"Test Group {i}"
-            self.create_process_group_with_api(client, with_super_admin_user, group_id, display_name=group_display_name)
-
-        # get all groups
-        response = client.get(
-            "/v1.0/process-groups",
-            headers=self.logged_in_headers(with_super_admin_user),
-        )
-        assert response.json is not None
-        assert len(response.json["results"]) == 5
-        assert response.json["pagination"]["count"] == 5
-        assert response.json["pagination"]["total"] == 5
-        assert response.json["pagination"]["pages"] == 1
-
-        # get first page, one per page
-        response = client.get(
-            "/v1.0/process-groups?page=1&per_page=1",
-            headers=self.logged_in_headers(with_super_admin_user),
-        )
-        assert response.json is not None
-        assert len(response.json["results"]) == 1
-        assert response.json["results"][0]["id"] == "test_process_group_0"
-        assert response.json["pagination"]["count"] == 1
-        assert response.json["pagination"]["total"] == 5
-        assert response.json["pagination"]["pages"] == 5
-
-        # get second page, one per page
-        response = client.get(
-            "/v1.0/process-groups?page=2&per_page=1",
-            headers=self.logged_in_headers(with_super_admin_user),
-        )
-        assert response.json is not None
-        assert len(response.json["results"]) == 1
-        assert response.json["results"][0]["id"] == "test_process_group_1"
-        assert response.json["pagination"]["count"] == 1
-        assert response.json["pagination"]["total"] == 5
-        assert response.json["pagination"]["pages"] == 5
-
-        # get first page, 3 per page
-        response = client.get(
-            "/v1.0/process-groups?page=1&per_page=3",
-            headers=self.logged_in_headers(with_super_admin_user),
-        )
-        assert response.json is not None
-        assert len(response.json["results"]) == 3
-        assert response.json["results"][0]["id"] == "test_process_group_0"
-        assert response.json["results"][1]["id"] == "test_process_group_1"
-        assert response.json["results"][2]["id"] == "test_process_group_2"
-        assert response.json["pagination"]["count"] == 3
-        assert response.json["pagination"]["total"] == 5
-        assert response.json["pagination"]["pages"] == 2
-
-        # get second page, 3 per page
-        response = client.get(
-            "/v1.0/process-groups?page=2&per_page=3",
-            headers=self.logged_in_headers(with_super_admin_user),
-        )
-        # there should only be 2 left
-        assert response.json is not None
-        assert len(response.json["results"]) == 2
-        assert response.json["results"][0]["id"] == "test_process_group_3"
-        assert response.json["results"][1]["id"] == "test_process_group_4"
-        assert response.json["pagination"]["count"] == 2
-        assert response.json["pagination"]["total"] == 5
-        assert response.json["pagination"]["pages"] == 2
-
     def test_process_model_file_update_fails_if_no_file_given(
         self,
         app: Flask,

spiffworkflow-backend/tests/spiffworkflow_backend/integration/test_process_groups_controller.py

@@ -0,0 +1,183 @@
+import json
+
+import pytest
+from flask.app import Flask
+from flask.testing import FlaskClient
+from spiffworkflow_backend.exceptions.process_entity_not_found_error import ProcessEntityNotFoundError
+from spiffworkflow_backend.models.process_group import ProcessGroup
+from spiffworkflow_backend.models.task import TaskModel  # noqa: F401
+from spiffworkflow_backend.models.user import UserModel
+from spiffworkflow_backend.services.process_model_service import ProcessModelService
+
+from tests.spiffworkflow_backend.helpers.base_test import BaseTest
+
+
+class TestProcessGroupsController(BaseTest):
+    def test_process_group_add(
+        self,
+        app: Flask,
+        client: FlaskClient,
+        with_db_and_bpmn_file_cleanup: None,
+        with_super_admin_user: UserModel,
+    ) -> None:
+        process_group = ProcessGroup(
+            id="test",
+            display_name="Another Test Category",
+            display_order=0,
+            admin=False,
+            description="Test Description",
+        )
+        response = client.post(
+            "/v1.0/process-groups",
+            headers=self.logged_in_headers(with_super_admin_user),
+            content_type="application/json",
+            data=json.dumps(process_group.serialized()),
+        )
+        assert response.status_code == 201
+        assert response.json
+
+        # Check what is returned
+        result = ProcessGroup(**response.json)
+        assert result is not None
+        assert result.display_name == "Another Test Category"
+        assert result.id == "test"
+        assert result.description == "Test Description"
+
+        # Check what is persisted
+        persisted = ProcessModelService.get_process_group("test")
+        assert persisted.display_name == "Another Test Category"
+        assert persisted.id == "test"
+        assert persisted.description == "Test Description"
+
+    def test_process_group_delete(
+        self,
+        app: Flask,
+        client: FlaskClient,
+        with_db_and_bpmn_file_cleanup: None,
+        with_super_admin_user: UserModel,
+    ) -> None:
+        process_group_id = "test"
+        process_group_display_name = "My Process Group"
+
+        self.create_process_group_with_api(
+            client,
+            with_super_admin_user,
+            process_group_id,
+            display_name=process_group_display_name,
+        )
+        persisted = ProcessModelService.get_process_group(process_group_id)
+        assert persisted is not None
+        assert persisted.id == process_group_id
+
+        client.delete(
+            f"/v1.0/process-groups/{process_group_id}",
+            headers=self.logged_in_headers(with_super_admin_user),
+        )
+
+        with pytest.raises(ProcessEntityNotFoundError):
+            ProcessModelService.get_process_group(process_group_id)
+
+    def test_process_group_update(
+        self,
+        app: Flask,
+        client: FlaskClient,
+        with_db_and_bpmn_file_cleanup: None,
+        with_super_admin_user: UserModel,
+    ) -> None:
+        """Test Process Group Update."""
+        group_id = "test_process_group"
+        group_display_name = "Test Group"
+
+        self.create_process_group_with_api(client, with_super_admin_user, group_id, display_name=group_display_name)
+        process_group = ProcessModelService.get_process_group(group_id)
+
+        assert process_group.display_name == group_display_name
+
+        process_group.display_name = "Modified Display Name"
+
+        response = client.put(
+            f"/v1.0/process-groups/{group_id}",
+            headers=self.logged_in_headers(with_super_admin_user),
+            content_type="application/json",
+            data=json.dumps(process_group.serialized()),
+        )
+        assert response.status_code == 200
+
+        process_group = ProcessModelService.get_process_group(group_id)
+        assert process_group.display_name == "Modified Display Name"
+
+    def test_process_group_list(
+        self,
+        app: Flask,
+        client: FlaskClient,
+        with_db_and_bpmn_file_cleanup: None,
+        with_super_admin_user: UserModel,
+    ) -> None:
+        # add 5 groups
+        for i in range(5):
+            group_id = f"test_process_group_{i}"
+            group_display_name = f"Test Group {i}"
+            self.create_process_group_with_api(client, with_super_admin_user, group_id, display_name=group_display_name)
+
+        # get all groups
+        response = client.get(
+            "/v1.0/process-groups",
+            headers=self.logged_in_headers(with_super_admin_user),
+        )
+        assert response.json is not None
+        assert len(response.json["results"]) == 5
+        assert response.json["pagination"]["count"] == 5
+        assert response.json["pagination"]["total"] == 5
+        assert response.json["pagination"]["pages"] == 1
+
+        # get first page, one per page
+        response = client.get(
+            "/v1.0/process-groups?page=1&per_page=1",
+            headers=self.logged_in_headers(with_super_admin_user),
+        )
+        assert response.json is not None
+        assert len(response.json["results"]) == 1
+        assert response.json["results"][0]["id"] == "test_process_group_0"
+        assert response.json["pagination"]["count"] == 1
+        assert response.json["pagination"]["total"] == 5
+        assert response.json["pagination"]["pages"] == 5
+
+        # get second page, one per page
+        response = client.get(
+            "/v1.0/process-groups?page=2&per_page=1",
+            headers=self.logged_in_headers(with_super_admin_user),
+        )
+        assert response.json is not None
+        assert len(response.json["results"]) == 1
+        assert response.json["results"][0]["id"] == "test_process_group_1"
+        assert response.json["pagination"]["count"] == 1
+        assert response.json["pagination"]["total"] == 5
+        assert response.json["pagination"]["pages"] == 5
+
+        # get first page, 3 per page
+        response = client.get(
+            "/v1.0/process-groups?page=1&per_page=3",
+            headers=self.logged_in_headers(with_super_admin_user),
+        )
+        assert response.json is not None
+        assert len(response.json["results"]) == 3
+        assert response.json["results"][0]["id"] == "test_process_group_0"
+        assert response.json["results"][1]["id"] == "test_process_group_1"
+        assert response.json["results"][2]["id"] == "test_process_group_2"
+        assert response.json["pagination"]["count"] == 3
+        assert response.json["pagination"]["total"] == 5
+        assert response.json["pagination"]["pages"] == 2
+
+        # get second page, 3 per page
+        response = client.get(
+            "/v1.0/process-groups?page=2&per_page=3",
+            headers=self.logged_in_headers(with_super_admin_user),
+        )
+        # there should only be 2 left
+        assert response.json is not None
+        assert len(response.json["results"]) == 2
+        assert response.json["results"][0]["id"] == "test_process_group_3"
+        assert response.json["results"][1]["id"] == "test_process_group_4"
+        assert response.json["pagination"]["count"] == 2
+        assert response.json["pagination"]["total"] == 5
+        assert response.json["pagination"]["pages"] == 2

spiffworkflow-frontend/src/hooks/useProcessGroupFetcher.tsx

@@ -44,7 +44,7 @@ export default function useProcessGroupFetcher(processGroupIdentifier: string) {
         .join('/');
 
       HttpService.makeCallToBackend({
-        path: `${targetUris.processGroupListPath}?process_group_identifier=${parentProcessGroupIdentifier}`,
+        path: `${targetUris.processGroupListPath}?process_group_identifier=${parentProcessGroupIdentifier}&per_page=1000`,
         successCallback: handleProcessGroupResponse,
       });
     };