read database configuration from config using enums from lapa databas…

…e structure

README.md

@@ -19,6 +19,10 @@ file storage layer for my personal server.
 
 ## changelog
 
+### v0.0.6
+
+- read database configuration from config using enums from lapa database structure.
+
 ### v0.0.5
 
 - use lapa_commons to read config.

lapa_file_store/configuration.py

@@ -2,6 +2,7 @@
 import sys
 
 from lapa_commons.main import read_configuration_from_file_path
+from lapa_database_structure.main import DatabasesEnum, SchemaEnum, TablesEnum
 from square_logger.main import SquareLogger
 
 try:
@@ -25,6 +26,11 @@
     config_str_local_storage_folder_path = ldict_configuration["ENVIRONMENT"][
         "LOCAL_STORAGE_PATH"
     ]
+
+    config_str_database_name = DatabasesEnum.lapa.value
+    config_str_schema_name = SchemaEnum.file_storage.value
+    config_str_file_table_name = TablesEnum.file.value
+
     # initialize logger
     global_object_square_logger = SquareLogger(config_str_log_file_name)
 except Exception as e:

lapa_file_store/utils/Helper.py

@@ -2,7 +2,7 @@
 from fastapi.exceptions import HTTPException
 from lapa_database_helper.main import LAPADatabaseHelper
 
-from lapa_file_store.configuration import global_object_square_logger
+from lapa_file_store.configuration import global_object_square_logger, config_str_config_str_database_name, config_str_config_str_schema_name, config_str_file_table_name
 
 local_object_lapa_database_helper = LAPADatabaseHelper()
 
@@ -16,9 +16,6 @@ def create_entry_in_file_store(
     system_relative_path: str,
 ):
     try:
-        database_name = "file_storage"
-        schema_name = "public"
-        table_name = "file"
 
         data = [
             {
@@ -32,7 +29,7 @@ def create_entry_in_file_store(
         ]
 
         response = local_object_lapa_database_helper.insert_rows(
-            data, database_name, schema_name, table_name
+            data, config_str_database_name, config_str_schema_name, config_str_file_table_name
         )
 
         return response
@@ -42,17 +39,15 @@ def create_entry_in_file_store(
 
 def get_file_row(file_storage_token):
     try:
-        database_name = "file_storage"
-        schema_name = "public"
-        table_name = "file"
+
 
         filters = {"file_storage_token": file_storage_token}
 
         response = local_object_lapa_database_helper.get_rows(
             filters,
-            database_name,
-            schema_name,
-            table_name,
+            config_str_database_name,
+            config_str_schema_name,
+            config_str_file_table_name,
             ignore_filters_and_get_all=False,
         )
         if isinstance(response, list) and len(response) == 1 and response[0]:

setup.py

@@ -4,7 +4,7 @@
 
 setup(
     name=package_name,
-    version="0.0.5",
+    version="0.0.6",
     packages=find_packages(),
     package_data={
         package_name: ["data/*", "pydantic_models/*"],
@@ -17,6 +17,7 @@
         "pydantic>=2.5.3",
         "lapa_database_helper>=0.0.3",
         "lapa_commons>=0.0.1",
+        "lapa_database_structure>=0.0.6"
     ],
     author="Aaditya sangishetty, thePmSquare",
     author_email="adityashetty35@gmail.com, thepmsquare@gmail.com",