diff --git a/backend/routers/patients.py b/backend/routers/patients.py index 1c6440e4..5b509d66 100644 --- a/backend/routers/patients.py +++ b/backend/routers/patients.py @@ -97,8 +97,8 @@ async def read_all_patientsByUser(email: str): query = "Select * from patients " query += "inner join users " query += "on doc_office_id = docOffice_id " - query += "where users.email= %s" - cursor.execute(query, (email,)) + query += "where lower(users.email)= %s" + cursor.execute(query, (email.lower(),)) items = [ { "idpatients": item[0], diff --git a/backend/routers/users.py b/backend/routers/users.py index 158e4567..0705997c 100644 --- a/backend/routers/users.py +++ b/backend/routers/users.py @@ -11,6 +11,12 @@ class userRequest(BaseModel): class userInsertRequest(BaseModel): email: str app_id: str + +class userUpdateRequest(BaseModel): + idusers: int + username: str + fnam: str + lname: str #get user by email & doc Office ID @router.get("/users/profile/{email}", tags="users") @@ -25,10 +31,12 @@ async def read_all_users(email: str): "docOffice_id": item[2], "fname":item[3], "lname":item[4], - "title": item[5] + "type": item[5], + "app_id": item[6], + "username": item[7], } for item in cursor.fetchall() - ] + ]# cursor.close() db.close() return items[0] @@ -45,10 +53,12 @@ async def read_all_users(): { "idUser": item[0], "email": item[1], - "docOffice_ID": item[2], + "docOffice_id": item[2], "fname": item[3], "lname": item[4], - "title": item[5], + "type": item[5], + "app_id": item[6], + "username": item[7], } for item in cursor.fetchall() ] @@ -67,11 +77,12 @@ async def read_all_users(uid: str): { "idUser": item[0], "email": item[1], - "docOffice_ID": item[2], + "docOffice_id": item[2], "fname": item[3], "lname": item[4], - "title": item[5], + "type": item[5], "app_id": item[6], + "username": item[7], } for item in cursor.fetchall() ] @@ -85,10 +96,10 @@ async def insertPatient(itemRequest : userInsertRequest): db = dbConnection.dbConnect() cursor = db.cursor() query = "insert into users " - query += "(email, app_id) " - query += "values (%s, %s)" - userData = (itemRequest.email, - itemRequest.app_id) + query += "(email, docOffice_id, fname, lname, type, app_id, username) " + query += "values (%s, %s, %s, %s,%s, %s, %s)" + userData = (itemRequest.email, "12345","","","personal", + itemRequest.app_id, "") try: cursor.execute(query, userData) except Exception as error: @@ -97,4 +108,27 @@ async def insertPatient(itemRequest : userInsertRequest): db.commit() cursor.close() db.close() - return {"message": "Successfully Created Record"} \ No newline at end of file + return {"message": "Successfully Created Record"} + +# Update User on table +@router.put("/user/update/", tags="user") +async def UpdateUser(itemRequest : userUpdateRequest): + db = dbConnection.dbConnect() + cursor = db.cursor() + query = "update users " + query += "set username=%s, fname=%s, lname=%s " + query += "where idusers=%s" + userData = (itemRequest.username, + itemRequest.fnam, + itemRequest.lname, + itemRequest.idusers, + ) + try: + cursor.execute(query, userData) + except Exception as error: + raise HTTPException(status_code=404, detail=error) + #return {"query": query, "message": error} + db.commit() + cursor.close() + db.close() + return {"message": "Successfully Updated Record"} \ No newline at end of file