🎨 Bill dynamic service in case of error. (#5706)

Author: matusdrobuliak66

services/resource-usage-tracker/src/simcore_service_resource_usage_tracker/models/resource_tracker_service_runs.py

@@ -74,7 +74,7 @@ class ServiceRunDB(BaseModel):
     node_name: str
     service_key: ServiceKey
     service_version: ServiceVersion
-    service_type: str
+    service_type: ResourceTrackerServiceType
     service_resources: dict
     started_at: datetime
     stopped_at: datetime | None

services/resource-usage-tracker/src/simcore_service_resource_usage_tracker/resource_tracker_background_task.py

@@ -5,6 +5,7 @@
 from fastapi import FastAPI
 from models_library.resource_tracker import (
     CreditTransactionStatus,
+    ResourceTrackerServiceType,
     ServiceRunId,
     ServiceRunStatus,
 )
@@ -102,7 +103,12 @@ async def _close_unhealthy_service(
         update_credit_transaction = CreditTransactionCreditsAndStatusUpdate(
             service_run_id=service_run_id,
             osparc_credits=make_negative(computed_credits),
-            transaction_status=CreditTransactionStatus.NOT_BILLED,
+            transaction_status=(
+                CreditTransactionStatus.NOT_BILLED
+                if running_service.service_type
+                == ResourceTrackerServiceType.COMPUTATIONAL_SERVICE
+                else CreditTransactionStatus.BILLED
+            ),
         )
         await resource_tracker_repo.update_credit_transaction_credits_and_status(
             update_credit_transaction

services/resource-usage-tracker/tests/unit/with_dbs/test_background_task.py

@@ -3,7 +3,11 @@
 
 import pytest
 import sqlalchemy as sa
-from models_library.resource_tracker import CreditTransactionStatus, ServiceRunStatus
+from models_library.resource_tracker import (
+    CreditTransactionStatus,
+    ResourceTrackerServiceType,
+    ServiceRunStatus,
+)
 from servicelib.rabbitmq import RabbitMQClient
 from simcore_postgres_database.models.resource_tracker_credit_transactions import (
     resource_tracker_credit_transactions,
@@ -50,6 +54,7 @@ def resource_tracker_setup_db(
             resource_tracker_service_runs.insert().values(
                 **random_resource_tracker_service_run(
                     service_run_id=_SERVICE_RUN_ID_OSPARC_10_MIN_OLD,
+                    service_type=ResourceTrackerServiceType.COMPUTATIONAL_SERVICE,
                     product_name="osparc",
                     last_heartbeat_at=_LAST_HEARTBEAT_10_MIN_OLD,
                     modified=_LAST_HEARTBEAT_10_MIN_OLD,
@@ -61,6 +66,7 @@ def resource_tracker_setup_db(
             resource_tracker_service_runs.insert().values(
                 **random_resource_tracker_service_run(
                     service_run_id=_SERVICE_RUN_ID_S4L_10_MIN_OLD,
+                    service_type=ResourceTrackerServiceType.DYNAMIC_SERVICE,
                     product_name="s4l",
                     last_heartbeat_at=_LAST_HEARTBEAT_10_MIN_OLD,
                     modified=_LAST_HEARTBEAT_10_MIN_OLD,
@@ -186,6 +192,13 @@ async def test_process_event_functions(
             _SERVICE_RUN_ID_OSPARC_10_MIN_OLD,
             _SERVICE_RUN_ID_S4L_10_MIN_OLD,
         ):
-            assert transaction.transaction_status == CreditTransactionStatus.NOT_BILLED
+            if transaction.service_run_id == _SERVICE_RUN_ID_OSPARC_10_MIN_OLD:
+                # Computational service is not billed
+                assert (
+                    transaction.transaction_status == CreditTransactionStatus.NOT_BILLED
+                )
+            else:
+                # Dynamic service is billed
+                assert transaction.transaction_status == CreditTransactionStatus.BILLED
         else:
             assert transaction.transaction_status == CreditTransactionStatus.PENDING