mirror of
https://github.com/sartography/spiffworkflow-backend.git
synced 2025-02-24 05:18:22 +00:00
fixed tests w/ burnettk
This commit is contained in:
parent
8f2c68d7d6
commit
a074b2dc0c
@ -1,14 +1,13 @@
|
|||||||
"""__init__."""
|
"""__init__."""
|
||||||
import json
|
|
||||||
import os
|
import os
|
||||||
from typing import Any
|
from typing import Any
|
||||||
|
|
||||||
import connexion # type: ignore
|
import connexion # type: ignore
|
||||||
import flask.app
|
import flask.app
|
||||||
import flask.json
|
import flask.json
|
||||||
from flask import jsonify
|
|
||||||
import sqlalchemy
|
import sqlalchemy
|
||||||
from apscheduler.schedulers.background import BackgroundScheduler # type: ignore
|
from apscheduler.schedulers.background import BackgroundScheduler # type: ignore
|
||||||
|
from flask.json.provider import DefaultJSONProvider
|
||||||
from flask_bpmn.api.api_error import api_error_blueprint
|
from flask_bpmn.api.api_error import api_error_blueprint
|
||||||
from flask_bpmn.models.db import db
|
from flask_bpmn.models.db import db
|
||||||
from flask_bpmn.models.db import migrate
|
from flask_bpmn.models.db import migrate
|
||||||
@ -24,7 +23,6 @@ from spiffworkflow_backend.services.background_processing_service import (
|
|||||||
BackgroundProcessingService,
|
BackgroundProcessingService,
|
||||||
)
|
)
|
||||||
|
|
||||||
from flask.json.provider import DefaultJSONProvider, _default
|
|
||||||
|
|
||||||
class MyJSONEncoder(DefaultJSONProvider):
|
class MyJSONEncoder(DefaultJSONProvider):
|
||||||
"""MyJSONEncoder."""
|
"""MyJSONEncoder."""
|
||||||
@ -45,10 +43,12 @@ class MyJSONEncoder(DefaultJSONProvider):
|
|||||||
return return_dict
|
return return_dict
|
||||||
return super().default(obj)
|
return super().default(obj)
|
||||||
|
|
||||||
def dumps(self, obj, **kwargs):
|
def dumps(self, obj: Any, **kwargs: Any) -> Any:
|
||||||
|
"""Dumps."""
|
||||||
kwargs.setdefault("default", self.default)
|
kwargs.setdefault("default", self.default)
|
||||||
return super().dumps(obj, **kwargs)
|
return super().dumps(obj, **kwargs)
|
||||||
|
|
||||||
|
|
||||||
def start_scheduler(app: flask.app.Flask) -> None:
|
def start_scheduler(app: flask.app.Flask) -> None:
|
||||||
"""Start_scheduler."""
|
"""Start_scheduler."""
|
||||||
scheduler = BackgroundScheduler()
|
scheduler = BackgroundScheduler()
|
||||||
|
@ -477,7 +477,7 @@ def message_instance_list(
|
|||||||
ProcessInstanceModel.process_model_identifier,
|
ProcessInstanceModel.process_model_identifier,
|
||||||
ProcessInstanceModel.process_group_identifier,
|
ProcessInstanceModel.process_group_identifier,
|
||||||
)
|
)
|
||||||
.paginate(page, per_page, False)
|
.paginate(page=page, per_page=per_page, error_out=False)
|
||||||
)
|
)
|
||||||
|
|
||||||
response_json = {
|
response_json = {
|
||||||
@ -635,7 +635,7 @@ def process_instance_list(
|
|||||||
|
|
||||||
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
|
||||||
).paginate(page, per_page, False)
|
).paginate(page=page, per_page=per_page, error_out=False)
|
||||||
|
|
||||||
response_json = {
|
response_json = {
|
||||||
"results": process_instances.items,
|
"results": process_instances.items,
|
||||||
@ -788,7 +788,7 @@ def process_instance_report_show(
|
|||||||
.order_by(
|
.order_by(
|
||||||
ProcessInstanceModel.start_in_seconds.desc(), ProcessInstanceModel.id.desc() # type: ignore
|
ProcessInstanceModel.start_in_seconds.desc(), ProcessInstanceModel.id.desc() # type: ignore
|
||||||
)
|
)
|
||||||
.paginate(page, per_page, False)
|
.paginate(page=page, per_page=per_page, error_out=False)
|
||||||
)
|
)
|
||||||
|
|
||||||
process_instance_report = ProcessInstanceReportModel.query.filter_by(
|
process_instance_report = ProcessInstanceReportModel.query.filter_by(
|
||||||
@ -838,7 +838,7 @@ def task_list_my_tasks(page: int = 1, per_page: int = 100) -> flask.wrappers.Res
|
|||||||
ActiveTaskModel.process_model_display_name,
|
ActiveTaskModel.process_model_display_name,
|
||||||
ActiveTaskModel.process_instance_id,
|
ActiveTaskModel.process_instance_id,
|
||||||
)
|
)
|
||||||
.paginate(page, per_page, False)
|
.paginate(page=page, per_page=per_page, error_out=False)
|
||||||
)
|
)
|
||||||
|
|
||||||
tasks = [ActiveTaskModel.to_task(active_task) for active_task in active_tasks.items]
|
tasks = [ActiveTaskModel.to_task(active_task) for active_task in active_tasks.items]
|
||||||
@ -1289,7 +1289,7 @@ def secret_list(
|
|||||||
.add_columns(
|
.add_columns(
|
||||||
UserModel.username,
|
UserModel.username,
|
||||||
)
|
)
|
||||||
.paginate(page, per_page, False)
|
.paginate(page=page, per_page=per_page, error_out=False)
|
||||||
)
|
)
|
||||||
response_json = {
|
response_json = {
|
||||||
"results": secrets.items,
|
"results": secrets.items,
|
||||||
|
Loading…
x
Reference in New Issue
Block a user