Merge pull request #100 from SWM14-Architect/dev

Release v1.1
SWM14-Architect · Sep 19, 2023 · 3b11826 · 3b11826
2 parents 51e151a + 6ee7448
commit 3b11826
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 3 deletions.
diff --git a/moview/repository/input_data/input_data_repository.py b/moview/repository/input_data/input_data_repository.py
@@ -9,11 +9,20 @@
 from moview.domain.entity.input_data.initial_input_data_document import InitialInputData
 from moview.utils.singleton_meta_class import SingletonMeta
 from bson import ObjectId
+from moview.environment.environment_loader import EnvironmentLoader
+
+DB_HOST = "db-host"
+DB_PORT = "db-port"
+DB_USERNAME = "db-username"
+DB_PASSWORD = "db-password"
 
 
 class InputDataRepository(metaclass=SingletonMeta):
     def __init__(self, mongo_config: MongoConfig):
-        self.client = MongoClient(mongo_config.host, mongo_config.port)
+        self.client = MongoClient(host=EnvironmentLoader.getenv(DB_HOST),
+                                  port=int(EnvironmentLoader.getenv(DB_PORT)),
+                                  username=EnvironmentLoader.getenv(DB_USERNAME),
+                                  password=EnvironmentLoader.getenv(DB_PASSWORD))
         self.db = self.client[mongo_config.db_name]
         self.collection = self.db["input_data"]
 

diff --git a/moview/repository/interview_repository.py b/moview/repository/interview_repository.py
@@ -6,11 +6,20 @@
 from moview.utils.singleton_meta_class import SingletonMeta
 from moview.config.loggers.mongo_logger import execution_trace_logger
 from moview.domain.entity.interview_session_document import InterviewSession
+from moview.environment.environment_loader import EnvironmentLoader
+
+DB_HOST = "db-host"
+DB_PORT = "db-port"
+DB_USERNAME = "db-username"
+DB_PASSWORD = "db-password"
 
 
 class InterviewRepository(metaclass=SingletonMeta):
     def __init__(self, mongo_config: MongoConfig):
-        self.client = MongoClient(mongo_config.host, mongo_config.port)
+        self.client = MongoClient(host=EnvironmentLoader.getenv(DB_HOST),
+                                  port=int(EnvironmentLoader.getenv(DB_PORT)),
+                                  username=EnvironmentLoader.getenv(DB_USERNAME),
+                                  password=EnvironmentLoader.getenv(DB_PASSWORD))
         self.db = self.client[mongo_config.db_name]
         self.collection = self.db["interview"]
 

diff --git a/moview/repository/question_answer/question_answer_repository.py b/moview/repository/question_answer/question_answer_repository.py
@@ -7,11 +7,20 @@
 from moview.domain.entity.question_answer.question import Question
 from moview.domain.entity.question_answer.answer import Answer
 from moview.config.loggers.mongo_logger import execution_trace_logger, error_logger
+from moview.environment.environment_loader import EnvironmentLoader
+
+DB_HOST = "db-host"
+DB_PORT = "db-port"
+DB_USERNAME = "db-username"
+DB_PASSWORD = "db-password"
 
 
 class QuestionAnswerRepository(metaclass=SingletonMeta):
     def __init__(self, mongo_config: MongoConfig):
-        self.client = MongoClient(mongo_config.host, mongo_config.port)
+        self.client = MongoClient(host=EnvironmentLoader.getenv(DB_HOST),
+                                  port=int(EnvironmentLoader.getenv(DB_PORT)),
+                                  username=EnvironmentLoader.getenv(DB_USERNAME),
+                                  password=EnvironmentLoader.getenv(DB_PASSWORD))
         self.db = self.client[mongo_config.db_name]
         self.collection = self.db["question_answer"]