resolved merge conflicts

Author: Sophie Strausberg

migrations/versions/0fde4435424e_added_fitness_center_to_workout_model.py

@@ -0,0 +1,30 @@
+"""Added fitness center to workout model
+
+Revision ID: 0fde4435424e
+Revises: 6b01a81bb92b
+Create Date: 2025-03-06 20:50:25.488572
+
+"""
+from alembic import op
+import sqlalchemy as sa
+
+
+# revision identifiers, used by Alembic.
+revision = '0fde4435424e'
+down_revision = '6b01a81bb92b'
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.add_column('workout', sa.Column('facility_id', sa.Integer(), nullable=False))
+    op.create_foreign_key(None, 'workout', 'facility', ['facility_id'], ['id'])
+    # ### end Alembic commands ###
+
+
+def downgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.drop_constraint(None, 'workout', type_='foreignkey')
+    op.drop_column('workout', 'facility_id')
+    # ### end Alembic commands ###

schema.graphql

@@ -177,10 +177,14 @@ type Mutation {
   createUser(email: String!, name: String!, netId: String!): User
   enterGiveaway(giveawayId: Int!, userNetId: String!): GiveawayInstance
   setWorkoutGoals(userId: Int!, workoutGoal: [String]!): User
+<<<<<<< HEAD
   logWorkout(userId: Int!, workoutTime: DateTime!): Workout
   loginUser(netId: String!): LoginUser
   logoutUser: LogoutUser
   refreshAccessToken: RefreshAccessToken
+=======
+  logWorkout(facilityId: Int!, userId: Int!, workoutTime: DateTime!): Workout
+>>>>>>> f9a58592618c0a8743aeeaadf2753e083905cb66
   createReport(createdAt: DateTime!, description: String!, gymId: Int!, issue: String!): CreateReport
   deleteUser(userId: Int!): User
 }
@@ -260,4 +264,5 @@ type Workout {
   id: ID!
   workoutTime: DateTime!
   userId: Int!
+  facilityId: Int!
 }

src/models/workout.py

@@ -11,10 +11,12 @@ class Workout(Base):
         - `id`              The ID of user.
         - `workout_time`    The date and time of the workout.
         - `user_id`         The ID of the user who completed the workout.
+        - `facility_id`     The ID of the facility visited
     """
 
     __tablename__ = "workout"
 
     id = Column(Integer, primary_key=True)
     workout_time = Column(DateTime(), nullable=False)  # should this be nullable?
     user_id = Column(Integer, ForeignKey("users.id"), nullable=False)
+    facility_id = Column(Integer, ForeignKey("facility.id"), nullable=False)

src/schema.py

@@ -249,14 +249,10 @@ class Query(graphene.ObjectType):
     get_workouts_by_id = graphene.List(Workout, id=graphene.Int(), description="Get all of a user's workouts by ID.")
     activities = graphene.List(Activity)
     get_all_reports = graphene.List(Report, description="Get all reports.")
-    get_workout_goals = graphene.List(
-        graphene.String, id=graphene.Int(required=True), description="Get the workout goals of a user by ID."
-    )
-    get_user_streak = graphene.Field(
-        graphene.JSONString,
-        id=graphene.Int(required=True),
-        description="Get the current and max workout streak of a user.",
-    )
+    get_workout_goals = graphene.List(graphene.String, id=graphene.Int(required=True),
+                                      description="Get the workout goals of a user by ID.")
+    get_user_streak = graphene.Field(graphene.JSONString, id=graphene.Int(
+        required=True), description="Get the current and max workout streak of a user.")
     get_hourly_average_capacities_by_facility_id = graphene.List(
         HourlyAverageCapacity, facility_id=graphene.Int(), description="Get all facility hourly average capacities."
     )
@@ -363,6 +359,7 @@ def resolve_get_user_streak(self, info, id):
 
         return {"active_streak": active_streak, "max_streak": max_streak}
 
+
     def resolve_get_hourly_average_capacities_by_facility_id(self, info, facility_id):
         valid_facility_ids = [14492437, 8500985, 7169406, 10055021, 2323580, 16099753, 15446768, 12572681]
         if facility_id not in valid_facility_ids:
@@ -533,6 +530,7 @@ class logWorkout(graphene.Mutation):
     class Arguments:
         workout_time = graphene.DateTime(required=True)
         user_id = graphene.Int(required=True)
+        facility_id = graphene.Int(required=True)
 
     Output = Workout
 
@@ -541,8 +539,11 @@ def mutate(self, info, workout_time, user_id):
         user = User.get_query(info).filter(UserModel.id == user_id).first()
         if not user:
             raise GraphQLError("User with given ID does not exist.")
+        facility = Facility.get_query(info).filter(FacilityModel.id == facility_id).first()
+        if not facility:
+            raise GraphQLError("Facility with given ID does not exist.")
 
-        workout = WorkoutModel(workout_time=workout_time, user_id=user.id)
+        workout = WorkoutModel(workout_time=workout_time, user_id=user.id, facility_id=facility.id)
 
         db_session.add(workout)
         db_session.commit()