呦畫

app/api/classes.py

@@ -530,8 +530,7 @@ async def search_event(
             class_name_obj = await Class_name.get(id=class_obj.name_id)
             class_name = class_name_obj.name
 
-            try:
-                class_date_obj = await Class_date.get(class_list_id=class_obj.id)
+            try : 
                 state = await check_date_state(class_event_id=class_obj.id)
                 class_data = {
                     "class_name" : class_name,
@@ -548,35 +547,26 @@ async def search_event(
                     "people": class_obj.people,
                     "fee_method": class_obj.fee_method,
                     "registration_way": class_obj.registration_way,
-                    "registration_start": class_date_obj.registration_start,
-                    "registration_end": class_date_obj.registration_end,
-                    "number_limit": class_date_obj.number_limit,
-                    "amount_left": class_date_obj.amount_left,
                     "remark": class_obj.remark,
                     "state": state["result"]
                 }
-                classes.append(class_data)
+
+                try:
+                    class_date_obj = await Class_date.get(class_list_id=class_obj.id)
+                    class_data["registration_start"] = class_date_obj.registration_start
+                    class_data["registration_end"] = class_date_obj.registration_end
+                    class_data["number_limit"] = class_date_obj.number_limit
+                    class_data["amount_left"] = class_date_obj.amount_left
+                
+                except:
+                    pass
+
             except:
-                state = await check_date_state(class_event_id=class_obj.id)
                 class_data = {
-                    "class_name" : class_name,
-                    "event_id": class_obj.id,
-                    "name_id": class_obj.name_id,
-                    "event": class_obj.event,
-                    "start_time": class_obj.start_time,
-                    "end_time": class_obj.end_time,
-                    "location": class_obj.location,
-                    "lecturer": class_obj.lecturer,
-                    "contact": class_obj.contact,
-                    "content": class_obj.content,
-                    "URL": class_obj.URL,
-                    "people": class_obj.people,
-                    "fee_method": class_obj.fee_method,
-                    "registration_way": class_obj.registration_way,
-                    "remark": class_obj.remark,
-                    "state": state["result"]
+                    "msg" : "fail to get data"
                 }
-                classes.append(class_data)
+            
+            classes.append(class_data)
 
         return {"msg": "success", "code": 200, "classes": classes}
     except Exception as e:
@@ -685,19 +675,24 @@ async def get_class_name(
                 school_obj = await Schools.get(id=class_name_obj.school_id)
                 school_name = school_obj.name
             if not group_id or class_name_obj.group_id==group_id:
-                state = await check_date_state(class_name_id=class_name_obj.id)
-                class_data = {
-                    "class_name_id": class_name_obj.id,
-                    "name": class_name_obj.name,
-                    "school":school_name,
-                    "category": class_name_obj.category,
-                    "introduction": class_name_obj.introduction,
-                    "organizer": class_name_obj.organizer,
-                    "group_id": class_name_obj.group_id,
-                    "cover_img": class_name_obj.cover_img,
-                    "group_sort":class_name_obj.group_sort,
-                    "state": state["result"]
-                    }
+                try:
+                    state = await check_date_state(class_name_id=class_name_obj.id)
+                    class_data = {
+                        "class_name_id": class_name_obj.id,
+                        "name": class_name_obj.name,
+                        "school":school_name,
+                        "category": class_name_obj.category,
+                        "introduction": class_name_obj.introduction,
+                        "organizer": class_name_obj.organizer,
+                        "group_id": class_name_obj.group_id,
+                        "cover_img": class_name_obj.cover_img,
+                        "group_sort":class_name_obj.group_sort,
+                        "state": state["result"]
+                        }
+                except:
+                    class_data = {
+                        "msg" : "fail to get data"
+                    } 
                 if page_num and page_amount:
                     if count < page_num*page_amount and count >= (page_num-1)*page_amount :
                         classes_name.append(class_data)

app/api/registration.py

@@ -33,16 +33,6 @@ async def check_token(access_token: str):
 
     return user_id
 
-async def check_if_id_exeit(
-    table_name : str,
-    id : int      
-):
-    exec('check_list = await {}.filter(id=id).all()'.format(table_name))
-    if check_list == []:
-        return True
-    else:
-        False
-
 async def check_permissions(user_id):
     user = await User.get(id=user_id)
     if user.is_superuser:
@@ -112,13 +102,13 @@ async def get_registration(
 
 @registration.post("/input_information")
 async def input_information(
-    user_id = Depends(check_token),
     name : str = Form(default=''),
     display_name : str = Form(default=''),
     birthday : date = Form(default=datetime.now().date()),
     gender : str = Form(default=''),
     phone : str = Form(default=''),
-    address : str = Form(default='')
+    address : str = Form(default=''),
+    user_id = Depends(check_token)
 ):
     try :
         if not user_id :
@@ -149,13 +139,13 @@ async def input_information(
     
 @registration.post("/update_information")
 async def update_information(
-    user_id = Depends(check_token),
     name : str = Form(default=''),
     display_name : str = Form(default=''),
     birthday : date = Form(default=datetime.now().date()),
     gender : str = Form(default=''),
     phone : str = Form(default=''),
-    address : str = Form(default='')
+    address : str = Form(default=''),
+    user_id = Depends(check_token)
 ):
     try :
         if not user_id :
@@ -222,8 +212,8 @@ async def get_user_information(
 
 @registration.post("/input_registration")
 async def input_registration(
-    user_id = Depends(check_token),
-    event_id : int = Form(default=0)
+    event_id : int = Form(default=0),
+    user_id = Depends(check_token)
 ): 
     try :
         if not user_id :