From 2f84e3cc4bff981590ab37bd95da64bd72c1f2e0 Mon Sep 17 00:00:00 2001
From: zhaoqingang <zhaoqg0118@163.com>
Date: 星期一, 16 十二月 2024 09:40:00 +0800
Subject: [PATCH] 12-16
---
app/api/group.py | 44 ++++++++++++++++++++++----------------------
1 files changed, 22 insertions(+), 22 deletions(-)
diff --git a/app/api/group.py b/app/api/group.py
index 5498eb1..e1fda78 100644
--- a/app/api/group.py
+++ b/app/api/group.py
@@ -15,49 +15,49 @@
@group_router.get("/list", response_model=Response)
async def user_group_list(current:int, pageSize:int, keyword="", current_user: UserModel = Depends(get_current_user),
db=Depends(get_db)):
- return Response(code=200, msg="", data=await group_list(db, pageSize, current, keyword, current_user.permission, current_user.id))
+ return Response(code=200, msg="", data=await group_list(db, pageSize, current, keyword))
@group_router.post("/add_group", response_model=Response)
async def add_group(group: GroupData, current_user: UserModel = Depends(get_current_user), db=Depends(get_db)):
- if not group.group_name:
+ if not group.groupName:
return Response(code=400, msg="The group_name cannot be empty!")
- db_group = db.query(GroupModel).filter(GroupModel.group_name == group.group_name).first()
+ db_group = db.query(GroupModel).filter(GroupModel.group_name == group.groupName).first()
if db_group:
- return Response(code=200, msg="group already created")
- is_create = await create_group(db, group.group_name, group.group_description, current_user.id)
+ return Response(code=400, msg="group already created")
+ is_create = await create_group(db, group.groupName, group.description, current_user.id)
if not is_create:
return Response(code=200, msg="group create failure", data={})
- return Response(code=200, msg="group create successfully", data={"group_name": group.group_name})
+ return Response(code=200, msg="group create successfully", data={"group_name": group.groupName})
@group_router.put("/edit_group", response_model=Response)
async def edit_group(group: GroupData, current_user: UserModel = Depends(get_current_user), db=Depends(get_db)):
- if not group.group_name:
+ if not group.groupName:
return Response(code=400, msg="The group_name cannot be empty!")
- db_group = db.query(GroupModel).filter(GroupModel.group_name == group.group_name).first()
+ db_group = db.query(GroupModel).filter(GroupModel.group_name == group.groupName).first()
if db_group and db_group.id != group.id:
- return Response(code=200, msg="group_name already created")
+ return Response(code=400, msg="group_name already created")
is_edit = await edit_group_data(db, group.id,
- {"group_name": group.group_name, "group_description": group.group_description,
+ {"group_name": group.groupName, "group_description": group.description,
"updated_at": datetime.now()})
if not is_edit:
return Response(code=200, msg="group edit failure", data={})
- return Response(code=200, msg="group edit successfully", data={"group_name": group.group_name})
+ return Response(code=200, msg="group edit successfully", data={"group_name": group.groupName})
@group_router.put("/edit_group_status", response_model=Response)
async def edit_group_status(group: GroupData, current_user: UserModel = Depends(get_current_user), db=Depends(get_db)):
- if group.group_status not in ["0", "1"]:
- return Response(code=400, msg="The status cannot be {}!".format(group.group_status))
+ if group.status not in ["0", "1"]:
+ return Response(code=400, msg="The status cannot be {}!".format(group.status))
db_group = db.query(GroupModel).filter(GroupModel.id == group.id).first()
if not db_group:
- return Response(code=200, msg="group does not exist")
+ return Response(code=400, msg="group does not exist")
is_edit = await edit_group_data(db, group.id,
- {"status": group.group_status,"updated_at": datetime.now()})
+ {"status": group.status,"updated_at": datetime.now()})
if not is_edit:
return Response(code=200, msg="group status edit failure", data={})
- return Response(code=200, msg="group status edit successfully", data={"group_name": group.group_name})
+ return Response(code=200, msg="group status edit successfully", data={"group_name": group.groupName})
@group_router.delete("/delete_group/{groupId}", response_model=Response)
@@ -73,12 +73,12 @@
return Response(code=200, msg="group delete successfully", data={})
-@group_router.post("/group_users", response_model=Response)
-async def group_users(group: GroupData, current_user: UserModel = Depends(get_current_user), db=Depends(get_db)):
- db_group = db.query(GroupModel).filter(GroupModel.id == group.id).first()
+@group_router.get("/group_users", response_model=Response)
+async def group_users(groupId:int, current_user: UserModel = Depends(get_current_user), db=Depends(get_db)):
+ db_group = db.query(GroupModel).filter(GroupModel.id == groupId).first()
if not db_group:
return Response(code=200, msg="group does not exist", data={})
- return Response(code=200, msg="success", data=await get_group_users(db, group.id))
+ return Response(code=200, msg="success", data=await get_group_users(db, groupId))
@group_router.post("/save_group_user", response_model=Response)
@@ -87,7 +87,7 @@
db_group = db.query(GroupModel).filter(GroupModel.id == group_user.id).first()
if not db_group:
return Response(code=200, msg="group does not exist")
- is_success = await save_user_to_group(db, current_user.id, group_user.id, group_user.user_list)
+ is_success = await save_user_to_group(db, current_user.id, group_user.id, group_user.userList)
if not is_success:
return Response(code=500, msg="save user to group failure", data={})
return Response(code=200, msg="success", data={})
@@ -99,7 +99,7 @@
db_group = db.query(GroupModel).filter(GroupModel.id == group_resource.id).first()
if not db_group:
return Response(code=200, msg="group does not exist")
- is_success = await save_group_resource(db, current_user.id, group_resource.id, group_resource.agents, group_resource.dialogs, group_resource.knowledges)
+ is_success = await save_group_resource(db, current_user.id, group_resource.id, group_resource.llms, group_resource.dialogs, group_resource.knowledges)
if not is_success:
return Response(code=500, msg="save user to group failure", data={})
return Response(code=200, msg="success", data={})
--
Gitblit v1.8.0