yaso_meth/mih-project
2
4
Fork 2
Code Issues 8 Pull Requests Actions Packages Projects Releases 1 Wiki Activity

add lowercase lookup for patient & Update user api

Browse Source
This commit is contained in:
yaso-meth
2024-07-23 15:28:33 +02:00
parent 5dd6a70329
commit 69fe58ffaf
2 changed files with 47 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
backend/routers/patients.py
View File

@@ -97,8 +97,8 @@ async def read_all_patientsByUser(email: str):
query = "Select * from patients " query = "Select * from patients "
query += "inner join users " query += "inner join users "
query += "on doc_office_id = docOffice_id " query += "on doc_office_id = docOffice_id "
query += "where users.email= %s" query += "where lower(users.email)= %s"
cursor.execute(query, (email,)) cursor.execute(query, (email.lower(),))
items = [ items = [
{ {
"idpatients": item[0], "idpatients": item[0],

56
backend/routers/users.py
View File

@@ -11,6 +11,12 @@ class userRequest(BaseModel):
class userInsertRequest(BaseModel): class userInsertRequest(BaseModel):
email: str email: str
app_id: str app_id: str
class userUpdateRequest(BaseModel):
idusers: int
username: str
fnam: str
lname: str
#get user by email & doc Office ID #get user by email & doc Office ID
@router.get("/users/profile/{email}", tags="users") @router.get("/users/profile/{email}", tags="users")
@@ -25,10 +31,12 @@ async def read_all_users(email: str):
"docOffice_id": item[2], "docOffice_id": item[2],
"fname":item[3], "fname":item[3],
"lname":item[4], "lname":item[4],
"title": item[5] "type": item[5],
"app_id": item[6],
"username": item[7],
} }
for item in cursor.fetchall() for item in cursor.fetchall()
] ]#
cursor.close() cursor.close()
db.close() db.close()
return items[0] return items[0]
@@ -45,10 +53,12 @@ async def read_all_users():
{ {
"idUser": item[0], "idUser": item[0],
"email": item[1], "email": item[1],
"docOffice_ID": item[2], "docOffice_id": item[2],
"fname": item[3], "fname": item[3],
"lname": item[4], "lname": item[4],
"title": item[5], "type": item[5],
"app_id": item[6],
"username": item[7],
} }
for item in cursor.fetchall() for item in cursor.fetchall()
] ]
@@ -67,11 +77,12 @@ async def read_all_users(uid: str):
{ {
"idUser": item[0], "idUser": item[0],
"email": item[1], "email": item[1],
"docOffice_ID": item[2], "docOffice_id": item[2],
"fname": item[3], "fname": item[3],
"lname": item[4], "lname": item[4],
"title": item[5], "type": item[5],
"app_id": item[6], "app_id": item[6],
"username": item[7],
} }
for item in cursor.fetchall() for item in cursor.fetchall()
] ]
@@ -85,10 +96,10 @@ async def insertPatient(itemRequest : userInsertRequest):
db = dbConnection.dbConnect() db = dbConnection.dbConnect()
cursor = db.cursor() cursor = db.cursor()
query = "insert into users " query = "insert into users "
query += "(email, app_id) " query += "(email, docOffice_id, fname, lname, type, app_id, username) "
query += "values (%s, %s)" query += "values (%s, %s, %s, %s,%s, %s, %s)"
userData = (itemRequest.email, userData = (itemRequest.email, "12345","","","personal",
itemRequest.app_id) itemRequest.app_id, "")
try: try:
cursor.execute(query, userData) cursor.execute(query, userData)
except Exception as error: except Exception as error:
@@ -97,4 +108,27 @@ async def insertPatient(itemRequest : userInsertRequest):
db.commit() db.commit()
cursor.close() cursor.close()
db.close() db.close()
return {"message": "Successfully Created Record"} 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"}