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

app/api/classes.py

@@ -273,31 +273,32 @@ async def delete(id: int):
 async def search_class(id: int):
     try:
         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[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
-        }
+        print(class_obj)
+        # 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[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}
 
@@ -305,7 +306,6 @@ async def search_class(id: int):
 async def get_school():
     try:
         school_list =  list(Schools.all())
-        print(school_list)
         schools = []
         for school_obj in school_list:
             school_data = {