From 58f3de250d4b2c7456491343c19ec671ee6af7aa Mon Sep 17 00:00:00 2001 From: mike8385 <146226367+mike8385@users.noreply.github.com> Date: Wed, 14 May 2025 15:36:29 -0400 Subject: [PATCH 1/2] approved by professor --- routes/patient_routes.py | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/routes/patient_routes.py b/routes/patient_routes.py index 761373d..cd79c73 100644 --- a/routes/patient_routes.py +++ b/routes/patient_routes.py @@ -1337,7 +1337,7 @@ def get_past_appointments(patient_id): DOCTOR D ON PA.doctor_id = D.doctor_id WHERE PA.patient_id = %s - AND (pa.appointment_datetime < NOW() OR pa.appt_status = 2) + AND (PA.appointment_datetime < NOW() OR PA.appt_status = 2) ORDER BY PA.appointment_datetime DESC; @@ -2230,28 +2230,28 @@ def edit_patient(): city = data.get('city') state = data.get('state') - patient_picture_url = None - patient_picture = data.get('patient_picture') # Base64 encoded image data - if patient_picture: - try: - patient_picture = base64.b64decode(patient_picture) - filename = f"patients/{data['first_name']}_{data['last_name']}_{int(time.time())}.png" - bucket = storage_client.bucket(GCS_BUCKET) - blob = bucket.blob(filename) - blob.upload_from_string(patient_picture, content_type='image/png') - - patient_picture_url = f"https://storage.googleapis.com/{GCS_BUCKET}/{filename}" - except Exception as e: - return jsonify({"error": f"Failed to upload image: {str(e)}"}), 400 + # patient_picture_url = None + # patient_picture = data.get('patient_picture') # Base64 encoded image data + # if patient_picture: + # try: + # patient_picture = base64.b64decode(patient_picture) + # filename = f"patients/{data['first_name']}_{data['last_name']}_{int(time.time())}.png" + # bucket = storage_client.bucket(GCS_BUCKET) + # blob = bucket.blob(filename) + # blob.upload_from_string(patient_picture, content_type='image/png') + + # patient_picture_url = f"https://storage.googleapis.com/{GCS_BUCKET}/{filename}" + # except Exception as e: + # return jsonify({"error": f"Failed to upload image: {str(e)}"}), 400 cursor = mysql.connection.cursor() try: # Update PATIENT table cursor.execute(""" UPDATE PATIENT - SET patient_email = %s, first_name = %s, last_name = %s, patient_picture_url = %s + SET patient_email = %s, first_name = %s, last_name = %s WHERE patient_id = %s - """, (patient_email, first, last, patient_id), patient_picture_url) + """, (patient_email, first, last, patient_id)) # Update PATIENT_INIT_SURVEY table cursor.execute(""" @@ -2346,7 +2346,7 @@ def get_past_appointments_with_doctor(patient_id, doctor_id): cursor = mysql.connection.cursor() query = """ - SELECT * FROM PATIENT_APPOINTMENT + SELECT * FROM PATIENT_APPOINTMENT pa WHERE patient_id = %s AND doctor_id = %s AND (pa.appointment_datetime < NOW() OR pa.appt_status = 2) ORDER BY appointment_datetime DESC From 30f3c0f681d63973d62f182855d858369b7648a3 Mon Sep 17 00:00:00 2001 From: jennatnguyen Date: Wed, 14 May 2025 16:23:03 -0400 Subject: [PATCH 2/2] approved change by professor --- routes/doctor_routes.py | 28 +++++++++++++--------------- 1 file changed, 13 insertions(+), 15 deletions(-) diff --git a/routes/doctor_routes.py b/routes/doctor_routes.py index 2736038..d7ddc91 100644 --- a/routes/doctor_routes.py +++ b/routes/doctor_routes.py @@ -1416,7 +1416,6 @@ def edit_doctor(): zipcode: { type: string } city: { type: string } state: { type: string } - doctor_picture: { type: string, description: "Base64-encoded image" } example: doctor_id: 3 first_name: "Jane" @@ -1449,19 +1448,19 @@ def edit_doctor(): city = data.get('city') state = data.get('state') - doctor_picture_url = None - doctor_picture = data.get('doctor_picture') # Base64 encoded image data - if doctor_picture: - try: - doctor_picture = base64.b64decode(doctor_picture) - filename = f"doctors/{data['first_name']}_{data['last_name']}_{int(time.time())}.png" - bucket = storage_client.bucket(GCS_BUCKET) - blob = bucket.blob(filename) - blob.upload_from_string(doctor_picture, content_type='image/png') + # doctor_picture_url = None + # doctor_picture = data.get('doctor_picture') # Base64 encoded image data + # if doctor_picture: + # try: + # doctor_picture = base64.b64decode(doctor_picture) + # filename = f"doctors/{data['first_name']}_{data['last_name']}_{int(time.time())}.png" + # bucket = storage_client.bucket(GCS_BUCKET) + # blob = bucket.blob(filename) + # blob.upload_from_string(doctor_picture, content_type='image/png') - doctor_picture_url = f"https://storage.googleapis.com/{GCS_BUCKET}/{filename}" - except Exception as e: - return jsonify({"error": f"Failed to upload image: {str(e)}"}), 400 + # doctor_picture_url = f"https://storage.googleapis.com/{GCS_BUCKET}/{filename}" + # except Exception as e: + # return jsonify({"error": f"Failed to upload image: {str(e)}"}), 400 cursor = mysql.connection.cursor() try: @@ -1480,13 +1479,12 @@ def edit_doctor(): zipcode = %s, city = %s, state = %s, - doctor_picture = %s, updated_at = NOW() WHERE doctor_id = %s """, ( first_name, last_name, email, description, years_of_practice, specialty, payment_fee, gender, - phone_number, address, zipcode, city, state, doctor_picture_url, doctor_id + phone_number, address, zipcode, city, state, doctor_id )) mysql.connection.commit()