Merge remote-tracking branch 'origin-godeltech/702-nested-resource-resolution'

This commit is contained in:
federinik 2023-05-23 12:39:30 +02:00
commit 43a14df14d
2 changed files with 29 additions and 0 deletions

View File

@ -25,6 +25,11 @@ class FactoryService:
self.service = service self.service = service
class NestedService:
def __init__(self, factory_service: FactoryService):
self.factory_service = factory_service
def init_service(): def init_service():
service = Service() service = Service()
service.init() service.init()
@ -37,6 +42,7 @@ class Container(containers.DeclarativeContainer):
service = providers.Resource(init_service) service = providers.Resource(init_service)
factory_service = providers.Factory(FactoryService, service) factory_service = providers.Factory(FactoryService, service)
factory_service_kwargs = providers.Factory(FactoryService, service=service) factory_service_kwargs = providers.Factory(FactoryService, service=service)
nested_service = providers.Factory(NestedService, factory_service)
@inject @inject
@ -52,3 +58,9 @@ def test_function_dependency(factory: FactoryService = Closing[Provide["factory_
@inject @inject
def test_function_dependency_kwargs(factory: FactoryService = Closing[Provide["factory_service_kwargs"]]): def test_function_dependency_kwargs(factory: FactoryService = Closing[Provide["factory_service_kwargs"]]):
return factory return factory
def test_function_nested_dependency(
nested: NestedService = Closing[Provide["nested_service"]]
):
return nested

View File

@ -319,6 +319,23 @@ def test_closing_dependency_resource_kwargs():
assert result_2.service.shutdown_counter == 2 assert result_2.service.shutdown_counter == 2
@mark.usefixtures("resourceclosing_container")
def test_closing_nested_dependency_resource():
resourceclosing.Service.reset_counter()
result_1 = resourceclosing.test_function_nested_dependency()
assert isinstance(result_1, resourceclosing.NestedService)
assert result_1.factory_service.service.init_counter == 1
assert result_1.factory_service.service.shutdown_counter == 1
result_2 = resourceclosing.test_function_nested_dependency()
assert isinstance(result_2, resourceclosing.NestedService)
assert result_2.factory_service.service.init_counter == 2
assert result_2.factory_service.service.shutdown_counter == 2
assert result_1 is not result_2
@mark.usefixtures("resourceclosing_container") @mark.usefixtures("resourceclosing_container")
def test_closing_resource_bypass_marker_injection(): def test_closing_resource_bypass_marker_injection():
resourceclosing.Service.reset_counter() resourceclosing.Service.reset_counter()