ming пре 3 година
родитељ
комит
c84e32af81
1 измењених фајлова са 14 додато и 10 уклоњено
  1. 14 10
      main.py

+ 14 - 10
main.py

@@ -11,18 +11,23 @@ db = dataset.connect('mysql://choozmo:pAssw0rd@db.ptt.cx:3306/cmm_test?charset=u
 
 @app.get("/tags")
 async def get_tags():
-    tag_dict = {}
-    table = db.load_table('tag_table')
     statement = 'SELECT id,name FROM tag_table'
+    tags = []
     for row in db.query(statement):
-        tag_dict[row['id']]=row['name']
-        json_dump = json.dumps(tag_dict, ensure_ascii=False)
-    
-    return json_dump
+        tags.append({'id':row['id'],'name':row['name']})
+    return tags
+
+@app.get("/tags/{tag_id}")
+async def get_tags(tag_id):
+    statement = 'SELECT id,name FROM tag_table where id = '+tag_id
+    for row in db.query(statement):
+        result = {'id':row['id'],'name':row['name']}
+    return result
+
 
 @app.get("/courses")
 async def get_courses(tag_string):
-    course_dict = {}
+    courses = []
     statement = 'SELECT course_id from course_tag where tag_id IN'+tag_string
 
     course_id_string = '('
@@ -33,7 +38,6 @@ async def get_courses(tag_string):
 
     statement = 'SELECT id,name from course_table where id IN'+course_id_string    
     for row in db.query(statement):
-        course_dict[row['id']]=row['name']
-        json_dump = json.dumps(course_dict, ensure_ascii=False)
-    return json_dump
+        courses.append({'id':row['id'],'name':row['name']})
+    return courses