fix tests

Author: matusdrobuliak66

services/web/server/tests/unit/with_dbs/03/resource_usage/conftest.py

@@ -9,6 +9,7 @@
 from faker import Faker
 from models_library.api_schemas_resource_usage_tracker.pricing_plans import (
     PricingPlanGet,
+    PricingPlanPage,
     PricingPlanToServiceGet,
     PricingUnitGet,
 )
@@ -45,60 +46,63 @@ def mock_rpc_resource_usage_tracker_service_api(
     return {
         ## Pricing plans
         "list_pricing_plans": mocker.patch(
-            "simcore_service_webserver.resource_usage._pricing_plans_admin_api.pricing_plans.list_pricing_plans",
+            "simcore_service_webserver.resource_usage._pricing_plans_admin_service.pricing_plans.list_pricing_plans",
             autospec=True,
-            return_value=[
-                PricingPlanGet.model_validate(
-                    PricingPlanGet.model_config["json_schema_extra"]["examples"][0],
-                )
-            ],
+            return_value=PricingPlanPage(
+                items=[
+                    PricingPlanGet.model_validate(
+                        PricingPlanGet.model_config["json_schema_extra"]["examples"][0],
+                    )
+                ],
+                total=1,
+            ),
         ),
         "get_pricing_plan": mocker.patch(
-            "simcore_service_webserver.resource_usage._pricing_plans_admin_api.pricing_plans.get_pricing_plan",
+            "simcore_service_webserver.resource_usage._pricing_plans_admin_service.pricing_plans.get_pricing_plan",
             autospec=True,
             return_value=PricingPlanGet.model_validate(
                 PricingPlanGet.model_config["json_schema_extra"]["examples"][0],
             ),
         ),
         "create_pricing_plan": mocker.patch(
-            "simcore_service_webserver.resource_usage._pricing_plans_admin_api.pricing_plans.create_pricing_plan",
+            "simcore_service_webserver.resource_usage._pricing_plans_admin_service.pricing_plans.create_pricing_plan",
             autospec=True,
             return_value=PricingPlanGet.model_validate(
                 PricingPlanGet.model_config["json_schema_extra"]["examples"][0],
             ),
         ),
         "update_pricing_plan": mocker.patch(
-            "simcore_service_webserver.resource_usage._pricing_plans_admin_api.pricing_plans.update_pricing_plan",
+            "simcore_service_webserver.resource_usage._pricing_plans_admin_service.pricing_plans.update_pricing_plan",
             autospec=True,
             return_value=PricingPlanGet.model_validate(
                 PricingPlanGet.model_config["json_schema_extra"]["examples"][0],
             ),
         ),
         ## Pricing units
         "get_pricing_unit": mocker.patch(
-            "simcore_service_webserver.resource_usage._pricing_plans_admin_api.pricing_units.get_pricing_unit",
+            "simcore_service_webserver.resource_usage._pricing_plans_admin_service.pricing_units.get_pricing_unit",
             autospec=True,
             return_value=PricingUnitGet.model_validate(
                 PricingUnitGet.model_config["json_schema_extra"]["examples"][0],
             ),
         ),
         "create_pricing_unit": mocker.patch(
-            "simcore_service_webserver.resource_usage._pricing_plans_admin_api.pricing_units.create_pricing_unit",
+            "simcore_service_webserver.resource_usage._pricing_plans_admin_service.pricing_units.create_pricing_unit",
             autospec=True,
             return_value=PricingUnitGet.model_validate(
                 PricingUnitGet.model_config["json_schema_extra"]["examples"][0],
             ),
         ),
         "update_pricing_unit": mocker.patch(
-            "simcore_service_webserver.resource_usage._pricing_plans_admin_api.pricing_units.update_pricing_unit",
+            "simcore_service_webserver.resource_usage._pricing_plans_admin_service.pricing_units.update_pricing_unit",
             autospec=True,
             return_value=PricingUnitGet.model_validate(
                 PricingUnitGet.model_config["json_schema_extra"]["examples"][0],
             ),
         ),
         ## Pricing plan to service
         "list_connected_services_to_pricing_plan_by_pricing_plan": mocker.patch(
-            "simcore_service_webserver.resource_usage._pricing_plans_admin_api.pricing_plans.list_connected_services_to_pricing_plan_by_pricing_plan",
+            "simcore_service_webserver.resource_usage._pricing_plans_admin_service.pricing_plans.list_connected_services_to_pricing_plan_by_pricing_plan",
             autospec=True,
             return_value=[
                 PricingPlanToServiceGet.model_validate(
@@ -109,7 +113,7 @@ def mock_rpc_resource_usage_tracker_service_api(
             ],
         ),
         "connect_service_to_pricing_plan": mocker.patch(
-            "simcore_service_webserver.resource_usage._pricing_plans_admin_api.pricing_plans.connect_service_to_pricing_plan",
+            "simcore_service_webserver.resource_usage._pricing_plans_admin_service.pricing_plans.connect_service_to_pricing_plan",
             autospec=True,
             return_value=PricingPlanToServiceGet.model_validate(
                 PricingPlanToServiceGet.model_config["json_schema_extra"]["examples"][

services/web/server/tests/unit/with_dbs/03/resource_usage/test_admin_pricing_plans.py

@@ -23,7 +23,7 @@
 def mock_catalog_client(mocker: MockerFixture, faker: Faker) -> dict[str, MagicMock]:
     return {
         "get_service": mocker.patch(
-            "simcore_service_webserver.resource_usage._pricing_plans_admin_api.catalog_client.get_service",
+            "simcore_service_webserver.resource_usage._pricing_plans_admin_service.catalog_client.get_service",
             autospec=True,
         )
     }

services/web/server/tests/unit/with_dbs/03/resource_usage/test_list_osparc_credits_aggregated_usages.py

@@ -39,7 +39,7 @@
 @pytest.fixture
 def mock_get_osparc_credits_aggregated_usages_page(mocker: MockerFixture) -> MagicMock:
     return mocker.patch(
-        "simcore_service_webserver.resource_usage._service_runs_api.service_runs.get_osparc_credits_aggregated_usages_page",
+        "simcore_service_webserver.resource_usage._service_runs_service.service_runs.get_osparc_credits_aggregated_usages_page",
         spec=True,
         return_value=_SERVICE_RUN_GET,
     )

services/web/server/tests/unit/with_dbs/03/resource_usage/test_usage_services__export.py

@@ -27,7 +27,7 @@
 @pytest.fixture
 def mock_export_usage_services(mocker: MockerFixture) -> MagicMock:
     return mocker.patch(
-        "simcore_service_webserver.resource_usage._service_runs_api.service_runs.export_service_runs",
+        "simcore_service_webserver.resource_usage._service_runs_service.service_runs.export_service_runs",
         spec=True,
         return_value=TypeAdapter(AnyUrl).validate_python("https://www.google.com/"),
     )

services/web/server/tests/unit/with_dbs/03/resource_usage/test_usage_services__list.py

@@ -58,7 +58,7 @@
 @pytest.fixture
 def mock_list_usage_services(mocker: MockerFixture) -> tuple:
     return mocker.patch(
-        "simcore_service_webserver.resource_usage._service_runs_api.service_runs.get_service_run_page",
+        "simcore_service_webserver.resource_usage._service_runs_service.service_runs.get_service_run_page",
         spec=True,
         return_value=_SERVICE_RUN_GET,
     )