role group user..

zhaoqingang

2024-11-11 c1768114de381e37e272e9faf7db8e95a93ff381

 app/service/group.py

@@ -1,41 +1,43 @@
from sqlalchemy.testing.pickleable import Order

from app.config.config import settings
from app.models.group_model import GroupInfoModel, UserGroupModel
from app.models.group_model import GroupModel
from app.models.user_model import UserModel
from app.service.ragflow import RagflowService
from app.service.token import get_ragflow_token
from app.Log import logger


async def group_list(db, page_size: int, page_index: int, keyword: str):
    query = db.query(GroupInfoModel)
    logger.info("-------------------------group_list----------------------------------")
    query = db.query(GroupModel)
    if keyword:
        query = query.filter(GroupInfoModel.group_name.like('%{}%'.format(keyword)))
    items = query.order_by(GroupInfoModel.group_id.desc()).limit(page_size).offset(
        query = query.filter(GroupModel.group_name.like('%{}%'.format(keyword)))
    items = query.order_by(GroupModel.id.desc()).limit(page_size).offset(
        (page_index - 1) * page_size).all()
    items_list = [item.to_dict() for item in items]
    groups = [i["id"] for i in items_list]
    group_dict = {}
    for group_user in db.query(UserGroupModel.group_id, UserModel.id, UserModel.username).outerjoin(UserModel,
                                                                                                    UserModel.id == UserGroupModel.user_id).filter(
        UserGroupModel.group_id.in_(groups)).all():
        if group_user.group_id in group_dict:
            group_dict[group_user.group_id].append({"user_id": group_user.id, "user_name": group_user.username})
        else:
            group_dict[group_user.group_id] = [{"user_id": group_user.id, "user_name": group_user.username}]
    for item in items_list:
        item["users"] = group_dict.get(item["id"], [])
    return {"total": query.count(), "items": items_list}
    # items_list = [item.to_dict() for item in items]
    # groups = [i["id"] for i in items_list]
    # group_dict = {}
    # for group_user in db.query(GroupModel.group_id, UserModel.id, UserModel.username).outerjoin(UserModel,
    #                                                                                                 UserModel.id == UserGroupModel.user_id).filter(
    #     GroupModel.group_id.in_(groups)).all():
    #     if group_user.group_id in group_dict:
    #         group_dict[group_user.group_id].append({"user_id": group_user.id, "user_name": group_user.username})
    #     else:
    #         group_dict[group_user.group_id] = [{"user_id": group_user.id, "user_name": group_user.username}]
    # for item in items_list:
    #     item["users"] = group_dict.get(item["id"], [])
    return {"total": query.count(), "items": [item.to_json() for item in items]}


async def create_group(db, group_name: str, group_description: str):
    try:
        group_model = GroupInfoModel(group_name=group_name, group_description=group_description)
        group_model = GroupModel(group_name=group_name, group_description=group_description)
        db.add(group_model)
        db.commit()
        db.refresh(group_model)
    except Exception as e:
        print(e)
        logger.error(e)
        db.rollback()
        return False
    return True
@@ -43,10 +45,10 @@

async def edit_group_data(db, group_id: int, data):
    try:
        db.query(GroupInfoModel).filter(GroupInfoModel.group_id == group_id).update(data)
        db.query(GroupModel).filter(GroupModel.id == group_id).update(data)
        db.commit()
    except Exception as e:
        print(e)
        logger.error(e)
        db.rollback()
        return False
    return True
@@ -54,10 +56,10 @@

async def delete_group_data(db, group_id: int):
    try:
        db.query(GroupInfoModel).filter(GroupInfoModel.group_id == group_id).delete()
        db.query(GroupModel).filter(GroupModel.id == group_id).delete()
        db.commit()
    except Exception as e:
        print(e)
        logger.error(e)
        db.rollback()
        return False
    return True
@@ -66,8 +68,8 @@
async def get_group_users(db, group_id):
    not_group_user = []
    in_group_user = []
    user_list = [i.user_id for i in
                 db.query(UserGroupModel.user_id).filter(UserGroupModel.group_id.__eq__(group_id)).all()]
    user_list = [u.id for i in
                 db.query(GroupModel).filter(GroupModel.id.__eq__(group_id)).all() for u in i.users]
    for u in db.query(UserModel.id, UserModel.username).order_by(UserModel.id.desc()).all():
        if u.id in user_list:
            in_group_user.append({"user_id": u.id, "user_name": u.username})
@@ -77,8 +79,9 @@


async def save_user_to_group(db, user_id, group_id, user_list):
    group_user_list = [i.user_id for i in
                       db.query(UserGroupModel.user_id).filter(UserGroupModel.group_id.__eq__(group_id)).all()]
    group_user_list = [u.id for i in
                 db.query(GroupModel).filter(GroupModel.id.__eq__(group_id)).all() for u in i.users]
    # print(group_user_list)
    new_users = set([i for i in user_list if i not in group_user_list])
    delete_user = [i for i in group_user_list if i not in user_list]
    if new_users:
@@ -105,15 +108,14 @@
                                                              user_dict[user2]["email"],
                                                              user_dict[user2]["rg_id"])
        except Exception as e:
            print(e)
            logger.error(e)
            return False

    try:
        for user in new_users:
            db_user = UserGroupModel(group_id=group_id, user_id=user)
            db.add(db_user)
        db.query(UserGroupModel).filter(UserGroupModel.group_id.__eq__(group_id), UserGroupModel.user_id.in_(delete_user)).delete()
        group = db.query(GroupModel).filter(GroupModel.id.__eq__(group_id)).first()
        group.users = [db.get(UserModel, user) for user in user_list]
        db.commit()
    except Exception as e:
        print(e)
        logger.error(e)
        return False
    return True