Prechádzať zdrojové kódy

Merge branch 'master' of http://git.choozmo.com:3000/zooey/ntcri

conrad 1 rok pred
rodič
commit
a2700d0c9f
1 zmenil súbory, kde vykonal 23 pridanie a 23 odobranie
  1. 23 23
      app/api/classes.py

+ 23 - 23
app/api/classes.py

@@ -272,31 +272,31 @@ async def delete(id: int):
 @classes.get("/search_class")
 async def search_class(id: int):
     try:
-        class_obj = Class_list.get(id=id).first()
-        class_name =  Class_name.get(id=class_obj.name_id).first()
-        school_obj = Schools.get(id=class_name.school_id).first()
+        class_obj = Class_list.get(id=id)
+        class_name =  Class_name.get(id=class_obj[0].name_id)
+        school_obj = Schools.get(id=class_name[0].school_id)
         return {
             "msg": "success",
             "code": 200,
-            "class_id": class_obj.id,
-            "name": class_name.name,
-            "school":school_obj.name,
-            "category": class_name.category,
-            "introduction": class_name.introduction,
-            "organizer": class_name.organizer,
-            "cover_img": class_name.cover_img,
-            "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
+            "class_id": class_obj[0].id,
+            "name": class_name[0].name,
+            "school":school_obj[0].name,
+            "category": class_name[0].category,
+            "introduction": class_name[0].introduction,
+            "organizer": class_name[0].organizer,
+            "cover_img": class_name[0].cover_img,
+            "event": class_obj[0].event,
+            "start_time": class_obj[0].start_time,
+            "end_time": class_obj[0].end_time,
+            "location": class_obj[0].location,
+            "lecturer": class_obj[0].lecturer,
+            "contact": class_obj[0].contact,
+            "content": class_obj[0].content,
+            "URL": class_obj[0].URL,
+            "people": class_obj[0].people,
+            "fee_method": class_obj[0].fee_method,
+            "registration_way": class_obj[0].registration_way,
+            "remark": class_obj[0].remark
         }
     except Exception as e:
         return {"msg": str(e), "code": 500}
@@ -304,7 +304,7 @@ async def search_class(id: int):
 @classes.get("/get_school")
 async def get_school():
     try:
-        school_list =  Schools.all()
+        school_list =  list(Schools.all())
         print(school_list)
         schools = []
         for school_obj in school_list: