Fast api conversion course and event

src/api/api_models.py

@@ -9,5 +9,10 @@ class SessionPydantic(BaseModel):
 class SessionDeletePydantic(BaseModel):
     sessionID: str
 
+class UserCoursePydantic(BaseModel):
+    name: str
+    semester: str
+    cid: str
+
 class SubsemesterPydantic(BaseModel):
     semester: Optional[str] = None

src/api/app.py

@@ -251,19 +251,17 @@ def log_out(request: Request, session: SessionDeletePydantic):
     return response
 
 
-# @app.route('/api/event', methods=['POST'])
-# def add_user_event():
-#     return event_controller.add_event(json.loads(request.data))
-#
-# @app.route('/api/user/course', methods=['POST'])
-# def add_student_course():
-#     info = request.get_json()
-#
-#     if 'user' not in session:
-#         return Response("Not authorized", status=403)
-#
-#     resp, error = course_select.add_selection(info['name'], info['semester'], session['user']['user_id'], info['cid'])
-#     return Response(status=200) if not error else Response(error, status=500)
+@app.post('/api/event')
+def add_user_event(request: Request, credentials: SessionPydantic):
+    return Response(status_code=501)
+    #return event_controller.add_event(json.loads(request.data))
+
+@app.post('/api/user/course')
+async def add_student_course(request: Request, credentials: UserCoursePydantic):
+    if 'user' not in request.session:
+        return Response("Not authorized", status_code=403)
+    resp, error = course_select.add_selection(credentials.name, credentials.semester, credentials.cid)
+    return Response(status_code=200) if not error else Response(error, status_code=500)
 #
 #
 # @app.route('/api/user/course', methods=['DELETE'])

src/api/tests/test_user_course.py

@@ -1,4 +1,5 @@
-from .util import Client
+from fastapi.testclient import TestClient
+import pytest
 
 TEST_USER = { 'email': 'test@email.com',
               'password': '123456' }
@@ -9,10 +10,12 @@
 }
 
 '''
-Test this api endpoint/file only with the following command line:
-pytest -s tests/test_user_course.py
+Test this api endpoint/file locally with the following command line:
+src/api/tests/test.sh
 '''
-def test_user_course_post_success(post_user, client: Client):
+@pytest.mark.testclient
+@pytest.mark.incompletedependency
+def test_user_course_post_success(post_user, client: TestClient):
     '''
     Test user course post by comparing it to user get course
     '''
@@ -28,7 +31,9 @@ def test_user_course_post_success(post_user, client: Client):
     d = client.delete("/api/session", json={"sessionID": sess.json()['content']['sessionID']})
     assert d.status_code == 200
 
-def test_user_course_post_failure(client: Client):
+@pytest.mark.testclient
+@pytest.mark.incompletedependency
+def test_user_course_post_failure(post_user, client: TestClient):
     '''
     Test user course post with invalid parameter
     '''
@@ -40,9 +45,15 @@ def test_user_course_post_failure(client: Client):
     d = client.delete('/api/session', json={'sessionID': sessID})
     assert d.status_code == 200
 
-def test_course_post_not_authorized(client: Client):
+@pytest.mark.testclient
+#@pytest.mark.incompletedependency
+def test_course_post_not_authorized(client: TestClient):
     '''
     Test user course post without user session/login
     '''
     r = client.post("/api/user/course", json=TEST_USER_COURSE)
-    assert r.status_code == 403
+    print(r.text)
+    assert r.status_code == 403 #422?
+    # data = r.json()
+    # assert data['content']['sessionID'] is not None
+