Mia Cheng 1 рік тому
батько
коміт
ce6387b8e3
1 змінених файлів з 15 додано та 5 видалено
  1. 15 5
      app/api/classes.py

+ 15 - 5
app/api/classes.py

@@ -362,13 +362,23 @@ async def delete(id: int):
         return {"msg": "success", "code": 200}
 
 @classes.get("/get_event")
-async def search_event(class_name_id: int = 0):
+async def search_event(
+    class_name_id: Optional[int] = None,
+    event_id : Optional[int] = None
+):
     try:
-        class_list = await Class_list.filter(name_id=class_name_id).all()
-        class_name_obj = await Class_name.get(id=class_name_id)
-        class_name = class_name_obj.name
+        if event_id :
+            class_list = await Class_list.filter(id=event_id).all()
+        elif class_name_id:
+            class_list = await Class_list.filter(name_id=class_name_id).all()
+        else :
+            return {"msg": "please input class_name_id or event_id", "code": 200}
+
         classes = []
         for class_obj in class_list:
+            class_name_obj = await Class_name.get(id=class_obj.name_id)
+            class_name = class_name_obj.name
+
             class_data = {
             "class_name" : class_name,
             "event_id": class_obj.id,
@@ -480,7 +490,7 @@ async def get_class_name(
     
 @classes.get("/get_session")
 async def get_session(
-    event_id : int = 0
+    event_id : Optional[int] = None
 ):
     try:
         class_session_list = await Class_detail.filter(class_list_id=event_id).all()