From c8e4965df986ad3c27bbe414dae459b6a6180548 Mon Sep 17 00:00:00 2001 From: Karel van Klink <karel.vanklink@geant.org> Date: Wed, 31 Jul 2024 10:09:52 +0200 Subject: [PATCH] Use ProcessStatus enum values --- gso/services/subscriptions.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/gso/services/subscriptions.py b/gso/services/subscriptions.py index 873984b3..029a4faa 100644 --- a/gso/services/subscriptions.py +++ b/gso/services/subscriptions.py @@ -19,6 +19,7 @@ from orchestrator.db import ( from orchestrator.domain import SubscriptionModel from orchestrator.services.subscriptions import query_in_use_by_subscriptions from orchestrator.types import SubscriptionLifecycle +from orchestrator.workflow import ProcessStatus from pydantic_forms.types import UUIDstr from gso.products import ProductName, ProductType @@ -201,13 +202,15 @@ def count_incomplete_validate_products() -> int: """ return ProcessTable.query.filter( ProcessTable.workflow_name == "validate_geant_products", - ProcessTable.last_status != "completed", + ProcessTable.last_status != ProcessStatus.COMPLETED.value, ).count() def get_failed_tasks() -> list[ProcessTable]: """Get all tasks that have failed.""" - return ProcessTable.query.filter(ProcessTable.is_task.is_(True), ProcessTable.last_status == "failed").all() + return ProcessTable.query.filter( + ProcessTable.is_task.is_(True), ProcessTable.last_status == ProcessStatus.FAILED.value + ).all() def get_subscription_by_process_id(process_id: str) -> SubscriptionModel | None: -- GitLab