33from app .managers .collection_names import FILES , FOLDERS
44from app .utils .utils import response_helper , create_uuid , create_timestamp
55from app .utils .i8ns import translate
6+ from app .api .v1 .web .drive .files .services import get_files_list
67
78async def create_folder (user , payload ):
89 db = user .get ("db" )
@@ -74,21 +75,28 @@ async def move_folders(user, payload):
7475 return response_helper (200 , translate ("drive.folders.moved" ), folders_moved = folders_moved )
7576
7677async def get_folders_list (user , parent_id ):
77- db = user .get ("db" )
7878 query = {"created_by" : user .get ("user_id" )}
7979 if parent_id :
8080 query ["parent_id" ] = parent_id
8181
82- folders = db_manager . find ( db , FOLDERS , query )
82+ folders = get_folders ( user , parent_id )
8383
8484 for folder in folders :
85- parent_query = {"parent_id" : folder .get ("doc_id" ),"created_by" : user .get ("user_id" )}
86- files = db_manager .find (db , FILES ,parent_query )
87- folder ["files" ] = files
88- folder ["sub_folders" ] = db_manager .find (db , FOLDERS , parent_query )
85+ folder ["files" ] = get_files_list (user , folder .get ("doc_id" ))
86+ folder ["sub_folders" ] = get_folders (user , folder .get ("doc_id" ))
8987
9088 data = {
9189 "folders" : folders ,
92- "files" : db_manager . find ( db , FILES , query )
90+ "files" : get_files_list ( user , parent_id )
9391 }
94- return response_helper (200 , translate ("drive.folders.list" ), data = data )
92+ return response_helper (200 , translate ("drive.folders.list" ), data = data )
93+
94+
95+
96+ def get_folders (user , parent_id = None ):
97+ db = user .get ("db" )
98+ query = {"created_by" : user .get ("user_id" )}
99+ if parent_id :
100+ query ["parent_id" ] = parent_id
101+ folders = db_manager .find (db , FOLDERS , query )
102+ return folders
0 commit comments