renames

Author: pcrespov

services/api-server/src/simcore_service_api_server/_service_studies.py

@@ -13,7 +13,7 @@
 DEFAULT_PAGINATION_LIMIT = MAXIMUM_NUMBER_OF_ITEMS_PER_PAGE - 1
 
 
-class StudiesService:
+class StudyService:
     _job_service: JobService
 
     def __init__(

services/api-server/src/simcore_service_api_server/api/dependencies/services.py

@@ -7,7 +7,7 @@
 from models_library.products import ProductName
 from models_library.users import UserID
 from servicelib.rabbitmq import RabbitMQRPCClient
-from simcore_service_api_server._service_studies import StudiesService
+from simcore_service_api_server._service_studies import StudyService
 
 from ..._service_jobs import JobService
 from ..._service_solvers import SolverService
@@ -88,9 +88,9 @@ def get_solver_service(
     )
 
 
-def get_studies_service(
+def get_study_service(
     job_service: Annotated[JobService, Depends(get_job_service)],
-) -> StudiesService:
-    return StudiesService(
+) -> StudyService:
+    return StudyService(
         job_service=job_service,
     )

services/api-server/src/simcore_service_api_server/api/routes/studies_jobs.py

@@ -17,7 +17,7 @@
 from pydantic import HttpUrl, PositiveInt
 from pydantic.types import PositiveInt
 from servicelib.logging_utils import log_context
-from simcore_service_api_server._service_studies import StudiesService
+from simcore_service_api_server._service_studies import StudyService
 from simcore_service_api_server.models.api_resources import parse_resources_ids
 
 from ...exceptions.backend_errors import ProjectAlreadyStartedError
@@ -51,7 +51,7 @@
 from ...services_rpc.wb_api_server import WbApiRpcClient
 from ..dependencies.application import get_reverse_url_mapper
 from ..dependencies.authentication import get_current_user_id, get_product_name
-from ..dependencies.services import get_api_client, get_studies_service
+from ..dependencies.services import get_api_client, get_study_service
 from ..dependencies.webserver_http import AuthSession, get_webserver_session
 from ..dependencies.webserver_rpc import (
     get_wb_api_rpc_client,
@@ -97,13 +97,13 @@ def _compose_job_resource_name(study_key, job_id) -> str:
 async def list_study_jobs(
     study_id: StudyID,
     page_params: Annotated[PaginationParams, Depends()],
-    studies_service: Annotated[StudiesService, Depends(get_studies_service)],
+    study_service: Annotated[StudyService, Depends(get_study_service)],
     url_for: Annotated[Callable, Depends(get_reverse_url_mapper)],
 ):
     msg = f"list study jobs study_id={study_id!r} with pagination={page_params!r}. SEE https://github.com/ITISFoundation/osparc-simcore/issues/4177"
     _logger.debug(msg)
 
-    jobs, meta = await studies_service.list_jobs(
+    jobs, meta = await study_service.list_jobs(
         study_id=study_id,
         offset=page_params.offset,
         limit=page_params.limit,

services/api-server/tests/unit/test_service_solvers.py

@@ -17,6 +17,7 @@
 @pytest.fixture
 def job_service(
     mocker: MockerFixture,
+    mocked_webserver_rest_api_base: dict[str, MockType],
     mocked_webserver_rpc_api: dict[str, MockType],
     product_name: ProductName,
     user_id: UserID,
@@ -65,14 +66,9 @@ async def test_get_solver(
 async def test_list_jobs(
     solver_service: SolverService,
     mocked_webserver_rpc_api: dict[str, MockType],
-    product_name: ProductName,
-    user_id: UserID,
 ):
     # Test default parameters
-    jobs, page_meta = await solver_service.list_jobs(
-        user_id=user_id,
-        product_name=product_name,
-    )
+    jobs, page_meta = await solver_service.list_jobs()
     assert isinstance(jobs, list)
     mocked_webserver_rpc_api["list_projects_marked_as_jobs"].assert_called_once()
     assert page_meta.total >= 0