Use DatastoreConfiguration#client, and remove DatastoreClientFactory

gumo-py · Jul 5, 2019 · d3c860f · d3c860f
1 parent a020f19
commit d3c860f
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 27 deletions.
diff --git a/gumo/datastore/infrastructure/key_id_allocator/__init__.py b/gumo/datastore/infrastructure/key_id_allocator/__init__.py
@@ -11,7 +11,7 @@
 from gumo.core.domain.entity_key import EntityKeyFactory
 from gumo.core.domain.entity_key import IncompleteKey
 
-from gumo.datastore.infrastructure.repository import DatastoreClientFactory
+from gumo.datastore.infrastructure.configuration import DatastoreConfiguration
 
 from google.cloud import datastore
 
@@ -60,8 +60,8 @@ def __init__(
     @property
     def datastore_client(self) -> datastore.Client:
         if self._datastore_client is None:
-            factory = injector.get(DatastoreClientFactory)  # type: DatastoreClientFactory
-            self._datastore_client = factory.build()
+            configuration = injector.get(DatastoreConfiguration)  # type: DatastoreConfiguration
+            self._datastore_client = configuration.client
 
         return self._datastore_client
 

diff --git a/gumo/datastore/infrastructure/repository/__init__.py b/gumo/datastore/infrastructure/repository/__init__.py
@@ -1,33 +1,12 @@
-from injector import inject
 from contextlib import contextmanager
 
 from gumo.core.injector import injector
-
-from gumo.core import GumoConfiguration
 from gumo.datastore.infrastructure.configuration import DatastoreConfiguration
-
 from gumo.datastore.infrastructure.entity_key_mapper import EntityKeyMapper
 
 from google.cloud import datastore
 
 
-class DatastoreClientFactory:
-    @inject
-    def __init__(
-            self,
-            gumo_config: GumoConfiguration,
-            datastore_config: DatastoreConfiguration
-    ):
-        self._gumo_config = gumo_config
-        self._datastore_config = datastore_config
-
-    def build(self) -> datastore.Client:
-        return datastore.Client(
-            project=self._gumo_config.google_cloud_project.value,
-            namespace=self._datastore_config.namespace,
-        )
-
-
 class DatastoreRepositoryMixin:
     _datastore_client = None
     _entity_key_mapper = None
@@ -37,8 +16,8 @@ class DatastoreRepositoryMixin:
     @property
     def datastore_client(self) -> datastore.Client:
         if self._datastore_client is None:
-            factory = injector.get(DatastoreClientFactory)  # type: DatastoreClientFactory
-            self._datastore_client = factory.build()
+            configuration = injector.get(DatastoreConfiguration)  # type: DatastoreConfiguration
+            self._datastore_client = configuration.client
 
         return self._datastore_client
 
@@ -52,7 +31,7 @@ def entity_key_mapper(self) -> EntityKeyMapper:
 
 @contextmanager
 def datastore_transaction():
-    datastore_client = injector.get(DatastoreClientFactory).build()  # type: datastore.Client
+    datastore_client = injector.get(DatastoreConfiguration).client  # type: datastore.Client
 
     with datastore_client.transaction():
         yield