[feat]: 组织管理基本功能

Author: Xian-Yu0

.env

@@ -1,3 +1,4 @@
 SECRET_KEY=bN3hZ6LbHG7nH9YXWULCr-crcS3GAaRELbNBdAyHBuiHH5TRctd0Zbd6OuLRHHa4Fbs
 SENDER_PASSWORD=TXVU2unpCAE2EtEX
-KIMI_API_KEY=sk-icdiHIiv6x8XjJCaN6J6Un7uoVxm6df5WPhflq10ZVFo03D9
+KIMI_API_KEY=sk-icdiHIiv6x8XjJCaN6J6Un7uoVxm6df5WPhflq10ZVFo03D9
+FERNET_SECRET_KEY=6WssEkvinI_YqwKXdokii2yI6iBiLO_Cjoyq0bBBC5o=

alembic/versions/fd8714315ad3_优化user_group和group表.py

@@ -0,0 +1,47 @@
+"""优化user_group和group表
+
+Revision ID: fd8714315ad3
+Revises: 004c4aa2b3f3
+Create Date: 2025-05-23 13:09:52.425623
+
+"""
+from typing import Sequence, Union
+
+from alembic import op
+import sqlalchemy as sa
+from sqlalchemy.dialects import mysql
+
+# revision identifiers, used by Alembic.
+revision: str = 'fd8714315ad3'
+down_revision: Union[str, None] = '004c4aa2b3f3'
+branch_labels: Union[str, Sequence[str], None] = None
+depends_on: Union[str, Sequence[str], None] = None
+
+
+def upgrade() -> None:
+    """Upgrade schema."""
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.drop_table('enter_application')
+    op.add_column('groups', sa.Column('avatar', sa.String(length=100), nullable=True))
+    op.add_column('user_group', sa.Column('level', sa.Integer(), nullable=True))
+    op.drop_column('user_group', 'is_admin')
+    # ### end Alembic commands ###
+
+
+def downgrade() -> None:
+    """Downgrade schema."""
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.add_column('user_group', sa.Column('is_admin', mysql.TINYINT(display_width=1), autoincrement=False, nullable=True))
+    op.drop_column('user_group', 'level')
+    op.drop_column('groups', 'avatar')
+    op.create_table('enter_application',
+    sa.Column('user_id', mysql.INTEGER(), autoincrement=False, nullable=False),
+    sa.Column('group_id', mysql.INTEGER(), autoincrement=False, nullable=False),
+    sa.ForeignKeyConstraint(['group_id'], ['groups.id'], name='enter_application_ibfk_1'),
+    sa.ForeignKeyConstraint(['user_id'], ['users.id'], name='enter_application_ibfk_2'),
+    sa.PrimaryKeyConstraint('user_id', 'group_id'),
+    mysql_collate='utf8mb4_0900_ai_ci',
+    mysql_default_charset='utf8mb4',
+    mysql_engine='InnoDB'
+    )
+    # ### end Alembic commands ###

app/api/v1/endpoints/group.py

@@ -2,13 +2,13 @@
 from sqlalchemy.ext.asyncio import AsyncSession
 from cryptography.fernet import Fernet
 import os
-import glob
+import uuid
 from datetime import date, datetime
 import json
 
 from app.utils.get_db import get_db
 from app.utils.auth import get_current_user
-from app.curd.group import crud_create, crud_gen_invite_code, crud_enter_group, crud_modify_basic_info, crud_modify_admin_list, crud_remove_member, crud_leave_group, crud_get_basic_info, crud_get_people_info, crud_get_my_level
+from app.curd.group import crud_create, crud_gen_invite_code, crud_enter_group, crud_modify_basic_info, crud_modify_admin_list, crud_remove_member, crud_leave_group, crud_get_basic_info, crud_get_people_info, crud_get_my_level, crud_all_groups
 from app.schemas.group import EnterGroup, LeaveGroup
 
 router = APIRouter()
@@ -20,15 +20,16 @@ async def create(group_name: str = Query(...), group_desc: str = Query(...), gro
         raise HTTPException(status_code=405, detail="Invalid group name, longer than 30")
     if len(group_desc) > 200:
         raise HTTPException(status_code=405, detail="Invalid group description, longer than 200")
-    group_id = await crud_create(user.get("id"), group_name, group_desc, db)
-    # 存储头像，文件名为 {group_id}.上传文件的扩展名
+    path = "/lhcos-data/group-avatar/default.png"
+    # 存储头像，保留扩展名
     if group_avatar:
         os.makedirs("/lhcos-data/group-avatar", exist_ok=True)
         ext = os.path.splitext(group_avatar.filename)[1]
-        path = os.path.join("/lhcos-data/group-avatar", f"{group_id}{ext}")
+        path = f"/lhcos-data/group-avatar/{uuid.uuid4()}{ext}"
         with open(path, "wb") as f:
             content = await group_avatar.read()
             f.write(content)
+    await crud_create(user.get("id"), group_name, group_desc, path, db)
     return {"msg": "Group created successfully"}
 
 @router.get("/genInviteCode", response_model=dict)
@@ -72,19 +73,18 @@ async def modify_basic_info(group_id: int = Query(...), group_name: str | None =
         raise HTTPException(status_code=405, detail="Invalid group name, longer than 30")
     if group_desc and len(group_desc) > 200:
         raise HTTPException(status_code=405, detail="Invalid group description, longer than 200")
-    await crud_modify_basic_info(db=db, id=group_id, name=group_name, desc=group_desc)
+    new_path = None
     if group_avatar:
         os.makedirs("/lhcos-data/group-avatar", exist_ok=True)
-        # 若之前存储了旧头像，则将其删除；若之前就没头像，则不做处理
-        old_avatar = glob.glob(os.path.join("/lhcos-data/group-avatar", f"{group_id}.*"))   # 基本名为group_id的文件列表，最多有一个元素
-        if old_avatar:
-            os.remove(old_avatar[0])
-        # 存储新头像，文件名为 {group_id}.上传文件的扩展名
+        # 存储新头像，保留扩展名
         ext = os.path.splitext(group_avatar.filename)[1]
-        path = os.path.join("/lhcos-data/group-avatar", f"{group_id}{ext}")
-        with open(path, "wb") as f:
+        new_path = f"/lhcos-data/group-avatar/{uuid.uuid4()}{ext}"
+        with open(new_path, "wb") as f:
             content = await group_avatar.read()
             f.write(content)
+    old_path = await crud_modify_basic_info(db=db, id=group_id, name=group_name, desc=group_desc, avatar=new_path)
+    if group_avatar and old_path != "/lhcos-data/group-avatar/default.png":
+        os.remove(old_path)
     return {"msg": "Basic info modified successfully"}
 
 @router.post("/modifyAdminList", response_model=dict)
@@ -106,10 +106,7 @@ async def leave_group(model: LeaveGroup, db: AsyncSession = Depends(get_db), use
 
 @router.get("/getBasicInfo", response_model=dict)
 async def get_basic_info(group_id: int = Query(...), db: AsyncSession = Depends(get_db)):
-    name, desc = await crud_get_basic_info(group_id, db)
-    find = glob.glob(os.path.join("/lhcos-data/group-avatar", f"{group_id}.*"))
-    avatar = 'default.png' if not find else find[0].removeprefix("/lhcos-data/group-avatar\\\\")
-    avatar = '/lhcos-data/group-avatar/' + avatar
+    name, desc, avatar = await crud_get_basic_info(group_id, db)
     return {"avatar": avatar, "name": name, "desc": desc}
 
 @router.get("/getPeopleInfo", response_model=dict)
@@ -121,4 +118,10 @@ async def get_people_info(group_id: int = Query(...), db: AsyncSession = Depends
 async def get_my_level(group_id: int = Query(...), db: AsyncSession = Depends(get_db), user: dict = Depends(get_current_user)):
     user_id = user.get("id")
     level = await crud_get_my_level(user_id, group_id, db)
-    return {"level": level}
+    return {"level": level}
+
+@router.get("/allGroups", response_model=dict)
+async def all_groups(db: AsyncSession = Depends(get_db), user: dict = Depends(get_current_user)):
+    user_id = user.get("id")
+    leader, admin, member = await crud_all_groups(user_id, db)
+    return {"leader": leader, "admin": admin, "member": member}

app/curd/group.py

@@ -1,14 +1,15 @@
 from fastapi import HTTPException
 from sqlalchemy.ext.asyncio import AsyncSession
 from sqlalchemy import select, insert, delete, update
-from app.models.model import User, Group, Folder, Article, Note, Tag, user_group
+from app.models.model import User, Group, Folder, Article, Note, Tag, user_group, self_recycle_bin
 
-async def crud_create(leader: int, name: str, description: str, db: AsyncSession):
-    new_group = Group(leader=leader, name=name, description=description)
+async def crud_create(leader: int, name: str, description: str, path: str, db: AsyncSession):
+    new_group = Group(leader=leader, name=name, description=description, avatar=path)
     db.add(new_group)
+    await db.flush()  # 仅将数据同步到数据库，事务尚未提交，此时 new_group.id 已可用
+    new_relation = insert(user_group).values(user_id=leader, group_id=new_group.id, level=1)
+    await db.execute(new_relation)
     await db.commit()
-    await db.refresh(new_group)
-    return new_group.id
 
 async def crud_gen_invite_code(user_email: str, db: AsyncSession):
     # 检查邮箱存在性
@@ -20,30 +21,30 @@ async def crud_gen_invite_code(user_email: str, db: AsyncSession):
 
 async def crud_enter_group(user_id: int, group_id: int, db: AsyncSession):
     # 检查是否已经在组织内
-    # 已经是组织leader
-    query = select(Group).where(Group.id == group_id, Group.leader == user_id)
-    result = await db.execute(query)
-    group = result.scalar_one_or_none()
-    # 已经是组织admin或member
     query = select(user_group).where(user_group.c.user_id == user_id, user_group.c.group_id == group_id)
     result = await db.execute(query)
-    row = result.first()
-    if group or row:
-        raise HTTPException(status_code=408, detail="You are already in the group")
-    
+    exist = result.first()
+    if exist:
+        raise HTTPException(status_code=408, detail="You are already in the group")   
     new_relation = insert(user_group).values(user_id=user_id, group_id=group_id)
     await db.execute(new_relation)
     await db.commit()
 
-async def crud_modify_basic_info(db: AsyncSession, id: int, name: str | None = None, desc: str | None = None):
+async def crud_modify_basic_info(db: AsyncSession, id: int, name: str | None = None, desc: str | None = None, avatar: str | None = None):
+    query = select(Group.avatar).where(Group.id == id)
+    result = await db.execute(query)
+    old_path = result.scalar_one_or_none()
     update_data = {}
     if name:
         update_data["name"] = name
     if desc:
         update_data["description"] = desc
+    if avatar:
+        update_data["avatar"] = avatar
     query = update(Group).where(Group.id == id).values(**update_data)
     await db.execute(query)
     await db.commit()
+    return old_path
 
 async def crud_modify_admin_list(group_id: int, user_id: int, add_admin: bool, db: AsyncSession):
     # 检查组织中是否有该成员
@@ -54,7 +55,10 @@ async def crud_modify_admin_list(group_id: int, user_id: int, add_admin: bool, d
         raise HTTPException(status_code=405, detail="User currently not in the group")
 
     # 将该成员设为或取消管理员
-    query = update(user_group).where(user_group.c.group_id == group_id, user_group.c.user_id == user_id).values(is_admin=add_admin)
+    if add_admin:
+        query = update(user_group).where(user_group.c.group_id == group_id, user_group.c.user_id == user_id).values(level=2)
+    else:
+        query = update(user_group).where(user_group.c.group_id == group_id, user_group.c.user_id == user_id).values(level=3)
     await db.execute(query)
     await db.commit()
 
@@ -73,10 +77,10 @@ async def crud_leave_group(group_id: int, user_id: int, db: AsyncSession):
     await db.commit()
 
 async def crud_get_basic_info(group_id: int, db: AsyncSession):
-    query = select(Group.name, Group.description).where(Group.id == group_id)
+    query = select(Group.name, Group.description, Group.avatar).where(Group.id == group_id)
     result = await db.execute(query)
     group = result.first()
-    return group.name, group.description
+    return group.name, group.description, group.avatar
 
 async def crud_get_people_info(group_id: int, db: AsyncSession):
     # 创建者信息
@@ -89,7 +93,7 @@ async def crud_get_people_info(group_id: int, db: AsyncSession):
     leader = {"id": user.id, "name": user.username, "avatar": user.avatar}
 
     # 管理者信息
-    query = select(user_group.c.user_id).where(user_group.c.group_id == group_id, user_group.c.is_admin == True)
+    query = select(user_group.c.user_id).where(user_group.c.group_id == group_id, user_group.c.level == 2)
     result = await db.execute(query)
     admin_ids = result.scalars().all()
     query = select(User).where(User.id.in_(admin_ids))
@@ -98,7 +102,7 @@ async def crud_get_people_info(group_id: int, db: AsyncSession):
     admins = [{"id": user.id, "name": user.username, "avatar": user.avatar} for user in users]
 
     # 普通成员信息
-    query = select(user_group.c.user_id).where(user_group.c.group_id == group_id, user_group.c.is_admin == False)
+    query = select(user_group.c.user_id).where(user_group.c.group_id == group_id, user_group.c.level == 3)
     result = await db.execute(query)
     member_ids = result.scalars().all()
     query = select(User).where(User.id.in_(member_ids))
@@ -109,20 +113,35 @@ async def crud_get_people_info(group_id: int, db: AsyncSession):
     return leader, admins, members
 
 async def crud_get_my_level(user_id: int, group_id: int, db: AsyncSession):
-    # 是否是创建者
-    query = select(Group.leader).where(Group.id == group_id)
-    result = await db.execute(query)
-    leader_id = result.scalar_one_or_none()
-    if user_id == leader_id:
-        return 1
     query = select(user_group).where(user_group.c.user_id == user_id, user_group.c.group_id == group_id)
     result = await db.execute(query)
-    relation = result.first()       # relation[0] relation[1] relation[2] 分别为表的第1、2、3列
-    # 是否是管理员
-    if relation and relation[2]:
-        return 2
-    # 是否是普通成员
+    relation = result.first()
+    # 在组织中       
     if relation:
-        return 3
-    # 未加入组织
-    return 4
+        return relation[2]          # relation[0] relation[1] relation[2] 分别为表的第1、2、3列
+    # 不在组织中
+    return 4
+
+async def crud_all_groups(user_id: int, db: AsyncSession):
+    query = select(Group).where(Group.leader == user_id).order_by(Group.id.desc())
+    result = await db.execute(query)
+    groups = result.scalars().all()
+    leader = [{"group_id": group.id, "group_name": group.name, "group_avatar": group.avatar, "group_desc": group.description} for group in groups]
+    
+    query = select(user_group.c.group_id).where(user_group.c.user_id == user_id, user_group.c.level == 2)
+    result = await db.execute(query)
+    group_ids = result.scalars().all()
+    query = select(Group).where(Group.id.in_(group_ids)).order_by(Group.id.desc())
+    result = await db.execute(query)
+    groups = result.scalars().all()
+    admin = [{"group_id": group.id, "group_name": group.name, "group_avatar": group.avatar, "group_desc": group.description} for group in groups]
+
+    query = select(user_group.c.group_id).where(user_group.c.user_id == user_id, user_group.c.level == 3)
+    result = await db.execute(query)
+    group_ids = result.scalars().all()
+    query = select(Group).where(Group.id.in_(group_ids)).order_by(Group.id.desc())
+    result = await db.execute(query)
+    groups = result.scalars().all()
+    member = [{"group_id": group.id, "group_name": group.name, "group_avatar": group.avatar, "group_desc": group.description} for group in groups]
+
+    return leader, admin, member

app/models/model.py

@@ -8,13 +8,7 @@
     'user_group', Base.metadata,
     Column('user_id', Integer, ForeignKey('users.id'), primary_key=True),
     Column('group_id', Integer, ForeignKey('groups.id'), primary_key=True),
-    Column('is_admin', Boolean, default=False)
-)
-
-enter_application = Table(
-    'enter_application', Base.metadata,
-    Column('user_id', Integer, ForeignKey('users.id'), primary_key=True),
-    Column('group_id', Integer, ForeignKey('groups.id'), primary_key=True),
+    Column('level', Integer, default=3)             # 1: leader 2: admin 3:member
 )
 
 self_recycle_bin = Table(
@@ -51,6 +45,7 @@ class Group(Base):
     leader = Column(Integer)
     name = Column(String(30), nullable=False)
     description = Column(String(200), nullable=False)
+    avatar = Column(String(100))
     create_time = Column(DateTime, default=func.now(), nullable=False)  # 创建时间
     update_time = Column(DateTime, default=func.now(), onupdate=func.now(), nullable=False)  # 更新时间
     users = relationship('User', secondary=user_group, back_populates='groups')

app/schemas/group.py

@@ -1,10 +1,7 @@
 from pydantic import BaseModel
 
-class ApplyToEnter(BaseModel):
-    group_id: int
-
 class LeaveGroup(BaseModel):
     group_id: int
 
-class GetBasicInfo(BaseModel):
-    group_id: int
+class EnterGroup(BaseModel):
+    inviteCode: str