Skip to content

Commit 5705c8c

Browse files
committed
files
1 parent 52961f1 commit 5705c8c

File tree

2 files changed

+29
-9
lines changed

2 files changed

+29
-9
lines changed

packages/backend-server/app/api/v1/web/drive/files/services.py

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,19 @@
22
from app.managers.collection_names import FILES, FOLDERS
33
from app.utils.utils import response_helper, create_uuid, get_file_extension, get_folders_from_path, create_timestamp
44
from app.utils.i8ns import translate
5-
from app.utils.s3_utils import generate_upload_url
5+
from app.utils.s3_utils import generate_upload_url, generate_download_url
6+
7+
8+
9+
def get_files_list(user, parent_id=None):
10+
db = user.get("db")
11+
query = {"created_by": user.get("user_id")}
12+
if parent_id:
13+
query["parent_id"] = parent_id
14+
files = db_manager.find(db, FILES, query)
15+
for file in files:
16+
file["file_url"]= generate_download_url(file.get("key"), 360000)
17+
return files
618

719
async def get_presigned_url(user, payload):
820
db = user.get("db")

packages/backend-server/app/api/v1/web/drive/folders/services.py

Lines changed: 16 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
from app.managers.collection_names import FILES, FOLDERS
44
from app.utils.utils import response_helper, create_uuid, create_timestamp
55
from app.utils.i8ns import translate
6+
from app.api.v1.web.drive.files.services import get_files_list
67

78
async 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

7677
async 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

Comments
 (0)