sartography
/
spiffworkflow-backend
mirror of https://github.com/sartography/spiffworkflow-backend.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

updated process_models_list to allow getting all process models and udpated tests w/ burnettk

This commit is contained in:
jasquat 2022-09-22 15:40:01 -04:00
parent 4dfd01042e
commit f02a825cec
3 changed files with 53 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/spiffworkflow_backend/api.yml
View File

@ -226,7 +226,7 @@ paths:
/process-models: /process-models:
parameters: parameters:
- name: process_group_id - name: process_group_identifier
in: query in: query
required: false required: false
description: The group containing the models we want to return description: The group containing the models we want to return
@ -259,8 +259,6 @@ paths:
type: array type: array
items: items:
$ref: "#/components/schemas/WorkflowSpec" $ref: "#/components/schemas/WorkflowSpec"
/process-models:
# process_model_add # process_model_add
post: post:
operationId: spiffworkflow_backend.routes.process_api_blueprint.process_model_add operationId: spiffworkflow_backend.routes.process_api_blueprint.process_model_add

31
src/spiffworkflow_backend/routes/process_api_blueprint.py
View File

@ -198,10 +198,12 @@ def process_model_show(process_group_id: str, process_model_id: str) -> Any:
def process_model_list( def process_model_list(
process_group_id: str, page: int = 1, per_page: int = 100 process_group_identifier: Optional[str] = None, page: int = 1, per_page: int = 100
) -> flask.wrappers.Response: ) -> flask.wrappers.Response:
"""Process model list!""" """Process model list!"""
process_models = ProcessModelService().get_process_models(process_group_id) process_models = ProcessModelService().get_process_models(
process_group_id=process_group_identifier
)
batch = ProcessModelService().get_batch( batch = ProcessModelService().get_batch(
process_models, page=page, per_page=per_page process_models, page=page, per_page=per_page
) )
@ -538,10 +540,11 @@ def process_instance_list(
process_status: Optional[str] = None, process_status: Optional[str] = None,
) -> flask.wrappers.Response: ) -> flask.wrappers.Response:
"""Process_instance_list.""" """Process_instance_list."""
process_instance_query = ProcessInstanceModel.query process_instance_query = ProcessInstanceModel.query
if process_model_identifier is not None and process_group_identifier is not None: if process_model_identifier is not None and process_group_identifier is not None:
process_model = get_process_model(process_model_identifier, process_group_identifier) process_model = get_process_model(
process_model_identifier, process_group_identifier
)
process_instance_query = process_instance_query.filter_by( process_instance_query = process_instance_query.filter_by(
process_model_identifier=process_model.id process_model_identifier=process_model.id
@ -561,15 +564,25 @@ def process_instance_list(
) )
if start_from is not None: if start_from is not None:
process_instance_query = process_instance_query.filter(ProcessInstanceModel.start_in_seconds >= start_from) process_instance_query = process_instance_query.filter(
ProcessInstanceModel.start_in_seconds >= start_from
)
if start_till is not None: if start_till is not None:
process_instance_query = process_instance_query.filter(ProcessInstanceModel.start_in_seconds <= start_till) process_instance_query = process_instance_query.filter(
ProcessInstanceModel.start_in_seconds <= start_till
)
if end_from is not None: if end_from is not None:
process_instance_query = process_instance_query.filter(ProcessInstanceModel.end_in_seconds >= end_from) process_instance_query = process_instance_query.filter(
ProcessInstanceModel.end_in_seconds >= end_from
)
if end_till is not None: if end_till is not None:
process_instance_query = process_instance_query.filter(ProcessInstanceModel.end_in_seconds <= end_till) process_instance_query = process_instance_query.filter(
ProcessInstanceModel.end_in_seconds <= end_till
)
if process_status is not None: if process_status is not None:
process_instance_query = process_instance_query.filter(ProcessInstanceModel.status == process_status) process_instance_query = process_instance_query.filter(
ProcessInstanceModel.status == process_status
)
process_instances = process_instance_query.order_by( process_instances = process_instance_query.order_by(
ProcessInstanceModel.start_in_seconds.desc(), ProcessInstanceModel.id.desc() # type: ignore ProcessInstanceModel.start_in_seconds.desc(), ProcessInstanceModel.id.desc() # type: ignore

60
tests/spiffworkflow_backend/integration/test_process_api.py
View File

@ -216,7 +216,7 @@ class TestProcessApi(BaseTest):
# get all models # get all models
response = client.get( response = client.get(
f"/v1.0/process-groups/{group_id}/process-models", f"/v1.0/process-models?process_group_identifier={group_id}",
headers=logged_in_headers(user), headers=logged_in_headers(user),
) )
assert response.json is not None assert response.json is not None
@ -227,7 +227,7 @@ class TestProcessApi(BaseTest):
# get first page, 1 per page # get first page, 1 per page
response = client.get( response = client.get(
f"/v1.0/process-groups/{group_id}/process-models?page=1&per_page=1", f"/v1.0/process-models?page=1&per_page=1&process_group_identifier={group_id}",
headers=logged_in_headers(user), headers=logged_in_headers(user),
) )
assert response.json is not None assert response.json is not None
@ -239,7 +239,7 @@ class TestProcessApi(BaseTest):
# get second page, 1 per page # get second page, 1 per page
response = client.get( response = client.get(
f"/v1.0/process-groups/{group_id}/process-models?page=2&per_page=1", f"/v1.0/process-models?page=2&per_page=1&process_group_identifier={group_id}",
headers=logged_in_headers(user), headers=logged_in_headers(user),
) )
assert response.json is not None assert response.json is not None
@ -251,7 +251,7 @@ class TestProcessApi(BaseTest):
# get first page, 3 per page # get first page, 3 per page
response = client.get( response = client.get(
f"/v1.0/process-groups/{group_id}/process-models?page=1&per_page=3", f"/v1.0/process-models?page=1&per_page=3&process_group_identifier={group_id}",
headers=logged_in_headers(user), headers=logged_in_headers(user),
) )
assert response.json is not None assert response.json is not None
@ -263,7 +263,7 @@ class TestProcessApi(BaseTest):
# get second page, 3 per page # get second page, 3 per page
response = client.get( response = client.get(
f"/v1.0/process-groups/{group_id}/process-models?page=2&per_page=3", f"/v1.0/process-models?page=2&per_page=3&process_group_identifier={group_id}",
headers=logged_in_headers(user), headers=logged_in_headers(user),
) )
# there should only be 2 left # there should only be 2 left
@ -436,11 +436,11 @@ class TestProcessApi(BaseTest):
"""Test_process_model_file_update.""" """Test_process_model_file_update."""
self.create_spec_file(client) self.create_spec_file(client)
spec = load_test_spec("random_fact") process_model = load_test_spec("random_fact")
data = {"key1": "THIS DATA"} data = {"key1": "THIS DATA"}
user = self.find_or_create_user() user = self.find_or_create_user()
response = client.put( response = client.put(
f"/v1.0/process-models/{spec.process_group_id}/{spec.id}/files/random_fact.svg", f"/v1.0/process-models/{process_model.process_group_id}/{process_model.id}/files/random_fact.svg",
data=data, data=data,
follow_redirects=True, follow_redirects=True,
content_type="multipart/form-data", content_type="multipart/form-data",
@ -457,11 +457,11 @@ class TestProcessApi(BaseTest):
"""Test_process_model_file_update.""" """Test_process_model_file_update."""
self.create_spec_file(client) self.create_spec_file(client)
spec = load_test_spec("random_fact") process_model = load_test_spec("random_fact")
data = {"file": (io.BytesIO(b""), "random_fact.svg")} data = {"file": (io.BytesIO(b""), "random_fact.svg")}
user = self.find_or_create_user() user = self.find_or_create_user()
response = client.put( response = client.put(
f"/v1.0/process-models/{spec.process_group_id}/{spec.id}/files/random_fact.svg", f"/v1.0/process-models/{process_model.process_group_id}/{process_model.id}/files/random_fact.svg",
data=data, data=data,
follow_redirects=True, follow_redirects=True,
content_type="multipart/form-data", content_type="multipart/form-data",
@ -478,12 +478,12 @@ class TestProcessApi(BaseTest):
"""Test_process_model_file_update.""" """Test_process_model_file_update."""
original_file = self.create_spec_file(client) original_file = self.create_spec_file(client)
spec = load_test_spec("random_fact") process_model = load_test_spec("random_fact")
new_file_contents = b"THIS_IS_NEW_DATA" new_file_contents = b"THIS_IS_NEW_DATA"
data = {"file": (io.BytesIO(new_file_contents), "random_fact.svg")} data = {"file": (io.BytesIO(new_file_contents), "random_fact.svg")}
user = self.find_or_create_user() user = self.find_or_create_user()
response = client.put( response = client.put(
f"/v1.0/process-models/{spec.process_group_id}/{spec.id}/files/random_fact.svg", f"/v1.0/process-models/{process_model.process_group_id}/{process_model.id}/files/random_fact.svg",
data=data, data=data,
follow_redirects=True, follow_redirects=True,
content_type="multipart/form-data", content_type="multipart/form-data",
@ -495,7 +495,7 @@ class TestProcessApi(BaseTest):
assert response.json["ok"] assert response.json["ok"]
response = client.get( response = client.get(
f"/v1.0/process-models/{spec.process_group_id}/{spec.id}/files/random_fact.svg", f"/v1.0/process-models/{process_model.process_group_id}/{process_model.id}/files/random_fact.svg",
headers=logged_in_headers(user), headers=logged_in_headers(user),
) )
assert response.status_code == 200 assert response.status_code == 200
@ -509,10 +509,10 @@ class TestProcessApi(BaseTest):
"""Test_process_model_file_update.""" """Test_process_model_file_update."""
self.create_spec_file(client) self.create_spec_file(client)
spec = load_test_spec("random_fact") process_model = load_test_spec("random_fact")
user = self.find_or_create_user() user = self.find_or_create_user()
response = client.delete( response = client.delete(
f"/v1.0/process-models/INCORRECT-NON-EXISTENT-GROUP/{spec.id}/files/random_fact.svg", f"/v1.0/process-models/INCORRECT-NON-EXISTENT-GROUP/{process_model.id}/files/random_fact.svg",
follow_redirects=True, follow_redirects=True,
headers=logged_in_headers(user), headers=logged_in_headers(user),
) )
@ -527,10 +527,10 @@ class TestProcessApi(BaseTest):
"""Test_process_model_file_update.""" """Test_process_model_file_update."""
self.create_spec_file(client) self.create_spec_file(client)
spec = load_test_spec("random_fact") process_model = load_test_spec("random_fact")
user = self.find_or_create_user() user = self.find_or_create_user()
response = client.delete( response = client.delete(
f"/v1.0/process-models/{spec.process_group_id}/{spec.id}/files/random_fact_DOES_NOT_EXIST.svg", f"/v1.0/process-models/{process_model.process_group_id}/{process_model.id}/files/random_fact_DOES_NOT_EXIST.svg",
follow_redirects=True, follow_redirects=True,
headers=logged_in_headers(user), headers=logged_in_headers(user),
) )
@ -545,10 +545,10 @@ class TestProcessApi(BaseTest):
"""Test_process_model_file_update.""" """Test_process_model_file_update."""
self.create_spec_file(client) self.create_spec_file(client)
spec = load_test_spec("random_fact") process_model = load_test_spec("random_fact")
user = self.find_or_create_user() user = self.find_or_create_user()
response = client.delete( response = client.delete(
f"/v1.0/process-models/{spec.process_group_id}/{spec.id}/files/random_fact.svg", f"/v1.0/process-models/{process_model.process_group_id}/{process_model.id}/files/random_fact.svg",
follow_redirects=True, follow_redirects=True,
headers=logged_in_headers(user), headers=logged_in_headers(user),
) )
@ -558,7 +558,7 @@ class TestProcessApi(BaseTest):
assert response.json["ok"] assert response.json["ok"]
response = client.get( response = client.get(
f"/v1.0/process-models/{spec.process_group_id}/{spec.id}/files/random_fact.svg", f"/v1.0/process-models/{process_model.process_group_id}/{process_model.id}/files/random_fact.svg",
headers=logged_in_headers(user), headers=logged_in_headers(user),
) )
assert response.status_code == 404 assert response.status_code == 404
@ -586,9 +586,9 @@ class TestProcessApi(BaseTest):
) -> None: ) -> None:
"""Test_get_workflow_from_workflow_spec.""" """Test_get_workflow_from_workflow_spec."""
user = self.find_or_create_user() user = self.find_or_create_user()
spec = load_test_spec("hello_world") process_model = load_test_spec("hello_world")
response = client.post( response = client.post(
f"/v1.0/process-models/{spec.process_group_id}/{spec.id}/process-instances", f"/v1.0/process-models/{process_model.process_group_id}/{process_model.id}/process-instances",
headers=logged_in_headers(user), headers=logged_in_headers(user),
) )
assert response.status_code == 201 assert response.status_code == 201
@ -931,7 +931,7 @@ class TestProcessApi(BaseTest):
) )
response = client.get( response = client.get(
f"/v1.0/process-models/{test_process_group_id}/{process_model_dir_name}/process-instances", "/v1.0/process-instances",
headers=logged_in_headers(user), headers=logged_in_headers(user),
) )
assert response.status_code == 200 assert response.status_code == 200
@ -979,7 +979,7 @@ class TestProcessApi(BaseTest):
) )
response = client.get( response = client.get(
f"/v1.0/process-models/{test_process_group_id}/{process_model_dir_name}/process-instances?per_page=2&page=3", "/v1.0/process-instances?per_page=2&page=3",
headers=logged_in_headers(user), headers=logged_in_headers(user),
) )
assert response.status_code == 200 assert response.status_code == 200
@ -990,7 +990,7 @@ class TestProcessApi(BaseTest):
assert response.json["pagination"]["total"] == 5 assert response.json["pagination"]["total"] == 5
response = client.get( response = client.get(
f"/v1.0/process-models/{test_process_group_id}/{process_model_dir_name}/process-instances?per_page=2&page=1", "/v1.0/process-instances?per_page=2&page=1",
headers=logged_in_headers(user), headers=logged_in_headers(user),
) )
assert response.status_code == 200 assert response.status_code == 200
@ -1027,7 +1027,7 @@ class TestProcessApi(BaseTest):
# Without filtering we should get all 5 instances # Without filtering we should get all 5 instances
response = client.get( response = client.get(
f"/v1.0/process-models/{test_process_group_id}/{test_process_model_id}/process-instances", f"/v1.0/process-instances?process_group_identifier={test_process_group_id}&process_model_identifier={test_process_model_id}",
headers=logged_in_headers(user), headers=logged_in_headers(user),
) )
assert response.json is not None assert response.json is not None
@ -1038,7 +1038,7 @@ class TestProcessApi(BaseTest):
# we should get 1 instance each time # we should get 1 instance each time
for i in range(5): for i in range(5):
response = client.get( response = client.get(
f"/v1.0/process-models/{test_process_group_id}/{test_process_model_id}/process-instances?process_status={ProcessInstanceStatus[statuses[i]].value}", f"/v1.0/process-instances?process_status={ProcessInstanceStatus[statuses[i]].value}&process_group_identifier={test_process_group_id}&process_model_identifier={test_process_model_id}",
headers=logged_in_headers(user), headers=logged_in_headers(user),
) )
assert response.json is not None assert response.json is not None
@ -1049,7 +1049,7 @@ class TestProcessApi(BaseTest):
# filter by start/end seconds # filter by start/end seconds
# start > 1000 - this should eliminate the first # start > 1000 - this should eliminate the first
response = client.get( response = client.get(
f"/v1.0/process-models/{test_process_group_id}/{test_process_model_id}/process-instances?start_from=1001", "/v1.0/process-instances?start_from=1001",
headers=logged_in_headers(user), headers=logged_in_headers(user),
) )
assert response.json is not None assert response.json is not None
@ -1060,7 +1060,7 @@ class TestProcessApi(BaseTest):
# start > 2000, end < 5000 - this should eliminate the first 2 and the last # start > 2000, end < 5000 - this should eliminate the first 2 and the last
response = client.get( response = client.get(
f"/v1.0/process-models/{test_process_group_id}/{test_process_model_id}/process-instances?start_from=2001&end_till=5999", "/v1.0/process-instances?start_from=2001&end_till=5999",
headers=logged_in_headers(user), headers=logged_in_headers(user),
) )
assert response.json is not None assert response.json is not None
@ -1071,7 +1071,7 @@ class TestProcessApi(BaseTest):
# start > 1000, start < 4000 - this should eliminate the first and the last 2 # start > 1000, start < 4000 - this should eliminate the first and the last 2
response = client.get( response = client.get(
f"/v1.0/process-models/{test_process_group_id}/{test_process_model_id}/process-instances?start_from=1001&start_till=3999", "/v1.0/process-instances?start_from=1001&start_till=3999",
headers=logged_in_headers(user), headers=logged_in_headers(user),
) )
assert response.json is not None assert response.json is not None
@ -1082,7 +1082,7 @@ class TestProcessApi(BaseTest):
# end > 2000, end < 6000 - this should eliminate the first and the last # end > 2000, end < 6000 - this should eliminate the first and the last
response = client.get( response = client.get(
f"/v1.0/process-models/{test_process_group_id}/{test_process_model_id}/process-instances?end_from=2001&end_till=5999", "/v1.0/process-instances?end_from=2001&end_till=5999",
headers=logged_in_headers(user), headers=logged_in_headers(user),
) )
assert response.json is not None assert response.json is not None