latest

routers/database/init/schools.py

@@ -15,7 +15,7 @@ logging = logger.get_logger(
 from fastapi import APIRouter, File, UploadFile, Form, HTTPException, BackgroundTasks
 import pandas as pd
 import modules.database.tools.neo4j_driver_tools as driver
-from modules.database.tools.neo4j_session_tools import get_node_by_unique_id
+from modules.database.tools.neo4j_session_tools import get_node_by_uuid_string
 import modules.database.init.init_school_timetable as init_school_timetable
 import modules.database.init.init_worker_timetable as init_worker_timetable
 from modules.database.schemas.nodes.schools.schools import SchoolNode
@@ -28,18 +28,16 @@ router = APIRouter()
 async def upload_school_timetable(
     file: UploadFile = File(...),
     db_name: str = Form(...),
-    unique_id: str = Form(...),
-    school_uuid: str = Form(...),
+    school_uuid_string: str = Form(...),
     school_name: str = Form(...),
     school_website: str = Form(...),
-    path: str = Form(...)
+    school_node_storage_path: str = Form(...)
 ):
     school_node = SchoolNode(
-        unique_id=unique_id,
-        school_uuid=school_uuid,
-        school_name=school_name,
-        school_website=school_website,
-        path=path
+        uuid_string=school_uuid_string,
+        name=school_name,
+        website=school_website,
+        node_storage_path=school_node_storage_path
     )
     if file.content_type != 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet':
         return {"status": "Error", "message": "Invalid file format"}
@@ -91,13 +89,13 @@ async def process_worker_timetable(file_content, worker_node_data):
         timetable_df = pd.read_excel(BytesIO(file_content))
         
         # Get the school version of the worker node
-        logging.info(f"Getting school worker node for {worker_node_data['unique_id']} from {worker_node_data['worker_db_name']}")
+        logging.info(f"Getting school worker node for {worker_node_data['uuid_string']} from {worker_node_data['worker_db_name']}")
         
         with neo_driver.session(database=worker_node_data['worker_db_name']) as neo_session:
-            school_worker_node = get_node_by_unique_id(session=neo_session, unique_id=worker_node_data['unique_id'])
+            school_worker_node = get_node_by_uuid_string(session=neo_session, uuid_string=worker_node_data['uuid_string'])
             
             if school_worker_node is None:
-                error_msg = f"School worker node not found for unique_id: {worker_node_data['unique_id']}"
+                error_msg = f"School worker node not found for uuid_string: {worker_node_data['uuid_string']}"
                 logging.error(error_msg)
                 raise Exception(error_msg)