From 95c1672f118c621e094d1aa8c7e4cffbdb60ad7e Mon Sep 17 00:00:00 2001
From: Yariv Menachem <yariv220895@gmail.com>
Date: Sun, 5 Jan 2025 16:16:01 +0200
Subject: [PATCH] changed db folder name added codac to position enum

---
 src/{db => model}/Position.py                 |  2 +-
 src/{db => model}/monogo_db.py                | 34 ++++++++++---------
 .../start_handler_constats.py                 |  2 +-
 3 files changed, 20 insertions(+), 18 deletions(-)
 rename src/{db => model}/Position.py (99%)
 rename src/{db => model}/monogo_db.py (50%)

diff --git a/src/db/Position.py b/src/model/Position.py
similarity index 99%
rename from src/db/Position.py
rename to src/model/Position.py
index c78cad1..4b22f78 100644
--- a/src/db/Position.py
+++ b/src/model/Position.py
@@ -16,7 +16,7 @@ class Position(Enum):
     HR_RECRUITMENT = "HR & Recruitment"
     MOBILE_DEVELOPMENT = "Mobile Development"
     HARDWARE_ENGINEERING = "Hardware Engineering"
-    EMBEDDED_ENGINEERING = "Embedded, Low Level & Firmware Engineering",
+    EMBEDDED_ENGINEERING = "Embedded, Low Level & Firmware Engineering"
     CUSTOMER_SUCCESS = "Customer Success"
     PROJECT_MANAGEMENT = "Project Management"
     OPERATIONS = "Operations"
diff --git a/src/db/monogo_db.py b/src/model/monogo_db.py
similarity index 50%
rename from src/db/monogo_db.py
rename to src/model/monogo_db.py
index eea7d84..f15c4c8 100644
--- a/src/db/monogo_db.py
+++ b/src/model/monogo_db.py
@@ -1,5 +1,3 @@
-import os
-
 from pymongo import MongoClient
 from pymongo.synchronous.database import Database
 
@@ -8,29 +6,33 @@ from jobspy import create_logger
 
 
 class MongoDB:
-    _instance = None
-    db:Database = None
-    def __new__(cls):
-
-        if cls._instance is not None:
-            return cls._instance
-
-        self = super().__new__(cls)
-        cls._instance = self
+    def __init__(self):
         logger = create_logger("Mongo Client")
-        mongoUri = settings.mongo_uri
-        if not mongoUri:
+        mongo_uri = settings.mongo_uri
+        if not mongo_uri:
             logger.error("MONGO_URI environment variable is not set")
             raise ValueError("MONGO_URI environment variable is not set")
-        client = MongoClient(mongoUri)
+        client = MongoClient(mongo_uri)
         database_name = settings.mongo_db_name
         if not database_name:
             logger.error("MONGO_DB_NAME environment variable is not set")
             raise ValueError(
                 "MONGO_DB_NAME environment variable is not set")
 
-        self.db = client[database_name]
+        self._db: Database = client[database_name]
         logger.info("Succeed connect to MongoDB")
-        return cls._instance
+
+    def get_collection(self,
+                       name: str,
+                       codec_options=None,
+                       read_preference=None,
+                       write_concern=None,
+                       read_concern=None):
+        return self._db.get_collection(name,
+                                       codec_options,
+                                       read_preference,
+                                       write_concern,
+                                       read_concern)
+
 
 mongo_client = MongoDB()
diff --git a/src/telegram_handler/start_handler_constats.py b/src/telegram_handler/start_handler_constats.py
index a3d2496..5e095d4 100644
--- a/src/telegram_handler/start_handler_constats.py
+++ b/src/telegram_handler/start_handler_constats.py
@@ -1,5 +1,5 @@
 START_MESSAGE: str = "Hi there! I'm Professor Bot, your friendly job search assistant.😊\n" \
-                     "I'm here to help you find the perfect position." \
+                     "I'm here to help you find the perfect position.\n\n" \
                      "To stop chatting with me at any time, just send '/cancel'.\n\n"
 
 POSITION_MESSAGE: str = "What kind of position are you looking for? ✨\n" \