Merge pull request #230 from cuappdev/fix-image-upload

fix image upload

Author: sophiestrausberg

src/schema.py

@@ -1,4 +1,5 @@
 import graphene
+import base64
 import os
 from flask_jwt_extended import create_access_token, create_refresh_token, get_jwt_identity, get_jwt, jwt_required
 from functools import wraps
@@ -68,6 +69,7 @@ def to_local_time(dt):
     # Convert to local timezone (server-local)
     return dt_utc.astimezone()
 
+
 def goal_at(goal_history, window_start_date):
     """
     Determine the workout goal for a given window start date from the goal history.
@@ -83,6 +85,7 @@ def goal_at(goal_history, window_start_date):
 
     return goal_history[-1][0]
 
+
 # MARK: - Gym
 
 
@@ -248,6 +251,7 @@ class Meta:
     def resolve_effective_at(self, info):
         return to_local_time(self.effective_at)
 
+
 # MARK: - User
 
 
@@ -258,8 +262,7 @@ class Meta:
     friendships = graphene.List(lambda: Friendship)
     friends = graphene.List(lambda: User)
     total_gym_days = graphene.Int(
-        required=True,
-        description="Get the total number of gym days (unique workout days) for user."
+        required=True, description="Get the total number of gym days (unique workout days) for user."
     )
     streak_start = graphene.Date(
         description="The start date of the most recent active streak, up until the current date."
@@ -269,7 +272,9 @@ def resolve_total_gym_days(self, info):
         return (
             Workout.get_query(info)
             .filter(WorkoutModel.user_id == self.id)
-            .with_entities(func.count(func.distinct(cast(WorkoutModel.workout_time, Date)))) # We cast the datetiem object as a Date object to get the unique days
+            .with_entities(
+                func.count(func.distinct(cast(WorkoutModel.workout_time, Date)))
+            )  # We cast the datetiem object as a Date object to get the unique days
             .scalar()
         )
 
@@ -290,7 +295,7 @@ def resolve_active_streak(self, info):
         if not workout_date_rows:
             return 0
 
-        workout_dates = [row[0] for row in workout_date_rows] 
+        workout_dates = [row[0] for row in workout_date_rows]
 
         goal_hist = (
             db_session.query(UserWorkoutGoalHistoryModel.workout_goal, UserWorkoutGoalHistoryModel.effective_at)
@@ -316,7 +321,7 @@ def resolve_active_streak(self, info):
 
             day_iterator = day_pointer
             count_in_window = 0
-            
+
             while day_iterator < total_workout_days and workout_dates[day_iterator] >= window_start:
                 count_in_window += 1
                 day_iterator += 1
@@ -357,10 +362,7 @@ def resolve_streak_start(self, info):
             return None
 
         goal_hist = (
-            db_session.query(
-                UserWorkoutGoalHistoryModel.workout_goal,
-                UserWorkoutGoalHistoryModel.effective_at,
-            )
+            db_session.query(UserWorkoutGoalHistoryModel.workout_goal, UserWorkoutGoalHistoryModel.effective_at)
             .filter(UserWorkoutGoalHistoryModel.user_id == user.id)
             .order_by(UserWorkoutGoalHistoryModel.effective_at.desc())
             .all()
@@ -450,7 +452,7 @@ def resolve_max_streak(self, info):
         if not workout_date_rows:
             return 0
 
-        workout_dates = [row[0] for row in workout_date_rows] 
+        workout_dates = [row[0] for row in workout_date_rows]
 
         goal_hist = (
             db_session.query(UserWorkoutGoalHistoryModel.workout_goal, UserWorkoutGoalHistoryModel.effective_at)
@@ -484,7 +486,7 @@ def resolve_max_streak(self, info):
                 count_in_window += 1
                 day_iterator += 1
 
-            goal_days = goal_at(goal_hist, window_start) 
+            goal_days = goal_at(goal_hist, window_start)
 
             if count_in_window == 0:
                 max_met_goal = max(max_met_goal, run_met_goal)
@@ -554,6 +556,7 @@ def resolve_friend(self, info):
     def resolve_accepted_at(self, info):
         return to_local_time(self.accepted_at)
 
+
 # MARK: - Giveaway
 
 
@@ -703,7 +706,7 @@ def resolve_get_weekly_workout_days(self, info, id):
 
     def resolve_get_all_reports(self, info):
         query = ReportModel.query.all()
-        return query    
+        return query
 
     def resolve_get_hourly_average_capacities_by_facility_id(self, info, facility_id):
         valid_facility_ids = [14492437, 8500985, 7169406, 10055021, 2323580, 16099753, 15446768, 12572681]
@@ -829,10 +832,11 @@ def mutate(self, info, name, net_id, email, encoded_image=None):
 
         if encoded_image:
             upload_url = os.getenv("DIGITAL_OCEAN_URL")
-            payload = {"bucket": os.getenv("BUCKET_NAME"), "image": encoded_image}  # Base64-encoded image string
-            headers = {"Content-Type": "application/json"}
+            image_bytes = base64.b64decode(encoded_image)
+            files = {"image": ("profile.png", image_bytes, "image/png")}
+            data = {"bucket": os.getenv("BUCKET_NAME")}
             try:
-                response = requests.post(upload_url, json=payload, headers=headers)
+                response = requests.post(upload_url, files=files, data=data)
                 response.raise_for_status()
                 json_response = response.json()
                 final_photo_url = json_response.get("data")
@@ -999,8 +1003,7 @@ class SetWorkoutGoals(graphene.Mutation):
     class Arguments:
         user_id = graphene.Int(required=True, description="The ID of the user.")
         workout_goal = graphene.Int(
-            required=True,
-            description="The new workout goal for the user in terms of number of days per week.",
+            required=True, description="The new workout goal for the user in terms of number of days per week."
         )
 
     Output = User
@@ -1043,11 +1046,7 @@ def mutate(self, info, user_id, workout_goal):
         user.workout_goal = workout_goal
 
         db_session.add(
-            UserWorkoutGoalHistoryModel(
-                user_id=user.id,
-                workout_goal=workout_goal,
-                effective_at=effective_at,
-            )
+            UserWorkoutGoalHistoryModel(user_id=user.id, workout_goal=workout_goal, effective_at=effective_at)
         )
 
         db_session.commit()