using CSR pattern

Author: Andrei Neagu

services/notifications/src/simcore_service_notifications/core/application.py

@@ -19,9 +19,9 @@
     SUMMARY,
     VERSION,
 )
-from ..api.rest.routes import initialize_rest_api
-from ..api.rpc.routes import lifespan_rpc_api_routes
-from ..services.rabbitmq import lifespan_rabbitmq
+from ..domains.rabbitmq.service import lifespan_rabbitmq
+from .routing_rest import initialize_rest_api
+from .routing_rpc import lifespan_rpc_api_routes
 from .settings import ApplicationSettings
 
 _logger = logging.getLogger(__name__)

services/notifications/src/simcore_service_notifications/api/rest/_dependencies.py renamed to services/notifications/src/simcore_service_notifications/core/dependencies.py

@@ -4,11 +4,11 @@
     http_exception_as_json_response,
 )
 
-from . import _health
+from ..domains.health.controller import router as health_router
 
 
 def initialize_rest_api(app: FastAPI) -> None:
-    app.include_router(_health.router)
+    app.include_router(health_router)
 
     app.add_exception_handler(Exception, handle_errors_as_500)
     app.add_exception_handler(HTTPException, http_exception_as_json_response)

services/notifications/src/simcore_service_notifications/api/rest/routes.py renamed to services/notifications/src/simcore_service_notifications/core/routing_rest.py

@@ -5,10 +5,10 @@
 from models_library.api_schemas_notifications import NOTIFICATIONS_RPC_NAMESPACE
 from servicelib.rabbitmq import RPCRouter
 
-from ...services.rabbitmq import get_rabbitmq_rpc_server
+from ..domains.rabbitmq.service import get_rabbitmq_rpc_server
 
 ROUTERS: list[RPCRouter] = [
-    #  `_internal_module.router``
+    # import form various domains and attach here
 ]
 
 

services/notifications/src/simcore_service_notifications/api/rpc/routes.py renamed to services/notifications/src/simcore_service_notifications/core/routing_rpc.py

@@ -6,7 +6,7 @@
 from models_library.errors import RABBITMQ_CLIENT_UNHEALTHY_MSG
 from servicelib.rabbitmq import RabbitMQClient
 
-from ._dependencies import get_rabbitmq_client
+from ...core.dependencies import get_rabbitmq_client
 
 router = APIRouter()