Merge pull request #29 from BUAA-SE-coders007/feature/tag_order&rename

[feat]: 指定文献所有Tag及顺序，改名

Author: coder0xe

app/api/v1/endpoints/article.py

@@ -2,7 +2,7 @@
 from fastapi.responses import FileResponse
 from fastapi import BackgroundTasks
 from sqlalchemy.ext.asyncio import AsyncSession
-from typing import Optional
+from typing import Optional, List
 import os
 import io
 from zipfile import ZipFile
@@ -11,7 +11,7 @@
 
 from app.utils.get_db import get_db
 from app.utils.auth import get_current_user
-from app.curd.article import crud_upload_to_self_folder, crud_get_self_folders, crud_get_articles_in_folder, crud_self_create_folder, crud_self_article_to_recycle_bin, crud_self_folder_to_recycle_bin, crud_read_article, crud_import_self_folder, crud_export_self_folder,crud_create_tag, crud_delete_tag, crud_get_article_tags
+from app.curd.article import crud_upload_to_self_folder, crud_get_self_folders, crud_get_articles_in_folder, crud_self_create_folder, crud_self_article_to_recycle_bin, crud_self_folder_to_recycle_bin, crud_read_article, crud_import_self_folder, crud_export_self_folder,crud_create_tag, crud_delete_tag, crud_get_article_tags, crud_all_tags_order, crud_change_folder_name, crud_change_article_name
 from app.schemas.article import SelfCreateFolder
 
 router = APIRouter()
@@ -130,7 +130,7 @@ async def import_self_folder(folder_name: str = Query(...), zip: UploadFile = Fi
             with open(target_path, "wb") as out_file:
                 out_file.write(source_file.read())
 
-    return {"msg": "Succesfully import articles"}
+    return {"msg": "Successfully import articles"}
 
 @router.get("/exportSelfFolder", response_class=FileResponse)
 async def export_self_folder(background_tasks: BackgroundTasks, folder_id: int = Query(...), db: AsyncSession = Depends(get_db)):
@@ -158,7 +158,7 @@ async def create_tag(article_id: int = Body(...), content: str = Body(...), db:
     if len(content) > 30:
         raise HTTPException(status_code=405, detail="Invalid tag content, longer than 30")
     await crud_create_tag(article_id, content, db)
-    return {"msg": "Tag Created Succesfully"}
+    return {"msg": "Tag Created Successfully"}
 
 @router.delete("/deleteTag", response_model="dict")
 async def delete_tag(tag_id: int = Query(...), db: AsyncSession = Depends(get_db)):
@@ -169,4 +169,24 @@ async def delete_tag(tag_id: int = Query(...), db: AsyncSession = Depends(get_db
 async def get_article_tags(article_id: int = Query(...), db: AsyncSession = Depends(get_db)):
     tags = await crud_get_article_tags(article_id, db)
     result = [{"tag_id": tag.id, "tag_content": tag.content} for tag in tags]
-    return {"result": result}
+    return {"result": result}
+
+@router.post("/allTagsOrder", response_model="dict")
+async def all_tags_order(article_id: int = Body(...), tag_contents: List[str] = Body(...), db: AsyncSession = Depends(get_db)):
+    for tag_content in tag_contents:
+        if len(tag_content) > 30:
+            raise HTTPException(status_code=405, detail="Invalid tag content existed, longer than 30")
+    await crud_all_tags_order(article_id, tag_contents, db)
+    return {"msg": "Tags and order changed successfully"}
+
+@router.post("/changeFolderName", response_model="dict")
+async def change_folder_name(folder_id: int = Body(...), folder_name: str = Body(...), db: AsyncSession = Depends(get_db)):
+    if folder_name == "" or len(folder_name) > 30:
+        raise HTTPException(status_code=405, detail="Invalid folder name, empty or longer than 30")
+    await crud_change_folder_name(folder_id, folder_name, db)
+    return {"msg": "Folder name changed successfully"}
+
+@router.post("/changeArticleName", response_model="dict")
+async def change_article_name(article_id: int = Body(...), article_name: str = Body(...), db: AsyncSession = Depends(get_db)):
+    await crud_change_article_name(article_id, article_name, db)
+    return {"msg": "Article name changed successfully"}

app/curd/article.py

@@ -1,5 +1,5 @@
 from sqlalchemy.ext.asyncio import AsyncSession
-from sqlalchemy.future import select
+from sqlalchemy import select, delete
 from app.models.model import User, Group, Folder, Article, Note, Tag, user_group
 
 async def crud_upload_to_self_folder(name: str, folder_id: int, db: AsyncSession):
@@ -114,7 +114,38 @@ async def crud_delete_tag(tag_id: int, db: AsyncSession):
     await db.commit()
 
 async def crud_get_article_tags(article_id: int, db: AsyncSession):
-    query = select(Tag).filter(Tag.article_id == article_id)
+    query = select(Tag).where(Tag.article_id == article_id).order_by(Tag.id.asc())
     result = await db.execute(query)
     tags = result.scalars().all()
-    return tags
+    return tags
+
+async def crud_all_tags_order(article_id: int, tag_contents, db: AsyncSession):
+    query = delete(Tag).where(Tag.article_id == article_id)
+    await db.execute(query)
+    await db.commit()
+
+    new_tags = []
+    for i in range(0, len(tag_contents)):
+        new_tags.append(Tag(content=tag_contents[i], article_id=article_id))
+    db.add_all(new_tags)
+    await db.commit()
+    for i in range(0, len(new_tags)):
+        await db.refresh(new_tags[i])
+
+async def crud_change_folder_name(folder_id: int, folder_name: str, db: AsyncSession):
+    query = select(Folder).where(Folder.id == folder_id)
+    result = await db.execute(query)
+    folder = result.scalar_one_or_none()
+
+    folder.name = folder_name
+    await db.commit()
+    await db.refresh(folder)
+
+async def crud_change_article_name(article_id: int, article_name: str, db: AsyncSession):
+    query = select(Article).where(Article.id == article_id)
+    result = await db.execute(query)
+    article = result.scalar_one_or_none()
+
+    article.name = article_name
+    await db.commit()
+    await db.refresh(article)