Merge branch 'master' into chimdi/workout-logging-testing

Author: cejiogu

src/schema.py

@@ -637,14 +637,11 @@ class Query(graphene.ObjectType):
     )
     get_user_friends = graphene.List(
         User, user_id=graphene.Int(required=True), description="Get all friends for a user."
-        User, user_id=graphene.Int(required=True), description="Get all friends for a user."
     )
     get_capacity_reminder_by_id = graphene.Field(
         CapacityReminder, id=graphene.Int(required=True), description="Get a specific capacity reminder by its ID."
-        CapacityReminder, id=graphene.Int(required=True), description="Get a specific capacity reminder by its ID."
     )
     get_all_capacity_reminders = graphene.List(CapacityReminder, description="Get all capacity reminders.")
-    get_all_capacity_reminders = graphene.List(CapacityReminder, description="Get all capacity reminders.")
 
     def resolve_get_all_gyms(self, info):
         query = Gym.get_query(info)
@@ -727,23 +724,13 @@ def resolve_get_user_friends(self, info, user_id):
             .filter((FriendshipModel.user_id == user_id) & (FriendshipModel.is_accepted == True))
             .all()
         )
-        direct_friendships = (
-            Friendship.get_query(info)
-            .filter((FriendshipModel.user_id == user_id) & (FriendshipModel.is_accepted == True))
-            .all()
-        )
 
         # Reverse friendships where user is the recipient
         reverse_friendships = (
             Friendship.get_query(info)
             .filter((FriendshipModel.friend_id == user_id) & (FriendshipModel.is_accepted == True))
             .all()
         )
-        reverse_friendships = (
-            Friendship.get_query(info)
-            .filter((FriendshipModel.friend_id == user_id) & (FriendshipModel.is_accepted == True))
-            .all()
-        )
 
         friend_ids = set()
         for friendship in direct_friendships:
@@ -755,7 +742,6 @@ def resolve_get_user_friends(self, info, user_id):
         # Query for all friends at once
         return User.get_query(info).filter(UserModel.id.in_(friend_ids)).all()
 
-
     @jwt_required()
     def resolve_get_capacity_reminder_by_id(self, info, id):
         reminder = CapacityReminder.get_query(info).filter(CapacityReminderModel.id == id).first()
@@ -765,7 +751,6 @@ def resolve_get_capacity_reminder_by_id(self, info, id):
 
         return reminder
 
-
     @jwt_required()
     def resolve_get_all_capacity_reminders(self, info):
         query = CapacityReminder.get_query(info)
@@ -1124,9 +1109,39 @@ def mutate(self, info, description, issue, created_at, gym_id):
         report = ReportModel(description=description, issue=issue, created_at=created_at_utc, gym_id=gym_id)
         db_session.add(report)
         db_session.commit()
+
+        try:
+            sh.worksheet(SHEET_REPORTS).append_row([report.id, issue, gym.name, description, created_at.isoformat()])
+        except Exception as e:
+            print(f"Error logging report to sheet: {e}")
+
         return CreateReport(report=report)
 
 
+class DeleteReport(graphene.Mutation):
+    class Arguments:
+        report_id = graphene.Int(required=True)
+
+    Output = Report
+
+    def mutate(self, info, report_id):
+        # Check if report exists
+        report = Report.get_query(info).filter(ReportModel.id == report_id).first()
+        if not report:
+            raise GraphQLError("Report with given ID does not exist.")
+
+        try:
+            worksheet = sh.worksheet(SHEET_REPORTS)
+            cell = worksheet.find(str(report_id), in_column=1)
+            worksheet.delete_rows(cell.row)
+        except Exception as e:
+            print(f"Error deleting report from sheet: {e}")
+
+        db_session.delete(report)
+        db_session.commit()
+        return report
+
+
 class DeleteUserById(graphene.Mutation):
     class Arguments:
         user_id = graphene.Int(required=True)
@@ -1236,7 +1251,6 @@ def mutate(self, info, reminder_id, new_gyms, days_of_week, new_capacity_thresho
             try:
                 response = messaging.unsubscribe_from_topic(reminder.fcm_token, topic)
                 logging.info("Unsubscribe %s from %s", reminder.fcm_token[:12], topic)
-                logging.info("Unsubscribe %s from %s", reminder.fcm_token[:12], topic)
                 for error in response.errors:
                     logging.warning(
                         "Error unsubscribing %s from %s -> reason: %s", reminder.fcm_token[:12], topic, error.reason
@@ -1253,7 +1267,6 @@ def mutate(self, info, reminder_id, new_gyms, days_of_week, new_capacity_thresho
             try:
                 response = messaging.subscribe_to_topic(reminder.fcm_token, topic)
                 logging.info("Resubscribing %s to %s", reminder.fcm_token[:12], topic)
-                logging.info("Resubscribing %s to %s", reminder.fcm_token[:12], topic)
                 if response.success_count == 0:
                     raise Exception(response.errors[0].reason)
             except Exception as error:
@@ -1288,10 +1301,8 @@ def mutate(self, info, reminder_id):
             try:
                 response = messaging.unsubscribe_from_topic(reminder.fcm_token, topic)
                 logging.info("Unsubscribe %s from %s", reminder.fcm_token[:12], topic)
-                logging.info("Unsubscribe %s from %s", reminder.fcm_token[:12], topic)
                 if response.success_count == 0:
                     raise Exception(response.errors[0].reason)
-                    raise Exception(response.errors[0].reason)
             except Exception as error:
                 raise GraphQLError(f"Error unsubscribing from topic {topic}: {error}")
 
@@ -1301,7 +1312,6 @@ def mutate(self, info, reminder_id):
         return reminder
 
 
-
 class AddFriend(graphene.Mutation):
     class Arguments:
         user_id = graphene.Int(required=True)
@@ -1329,14 +1339,6 @@ def mutate(self, info, user_id, friend_id):
             )
             .first()
         )
-        existing = (
-            Friendship.get_query(info)
-            .filter(
-                ((FriendshipModel.user_id == user_id) & (FriendshipModel.friend_id == friend_id))
-                | ((FriendshipModel.user_id == friend_id) & (FriendshipModel.friend_id == user_id))
-            )
-            .first()
-        )
 
         if existing:
             raise GraphQLError("Friendship already exists.")
@@ -1349,7 +1351,6 @@ def mutate(self, info, user_id, friend_id):
         return friendship
 
 
-
 class AcceptFriendRequest(graphene.Mutation):
     class Arguments:
         friendship_id = graphene.Int(required=True)
@@ -1393,14 +1394,6 @@ def mutate(self, info, user_id, friend_id):
             )
             .first()
         )
-        friendship = (
-            Friendship.get_query(info)
-            .filter(
-                ((FriendshipModel.user_id == user_id) & (FriendshipModel.friend_id == friend_id))
-                | ((FriendshipModel.user_id == friend_id) & (FriendshipModel.friend_id == user_id))
-            )
-            .first()
-        )
 
         if not friendship:
             raise GraphQLError("Friendship not found.")
@@ -1412,7 +1405,6 @@ def mutate(self, info, user_id, friend_id):
         return RemoveFriend(success=True)
 
 
-
 class GetPendingFriendRequests(graphene.Mutation):
     class Arguments:
         user_id = graphene.Int(required=True)
@@ -1432,11 +1424,6 @@ def mutate(self, info, user_id):
             .filter((FriendshipModel.friend_id == user_id) & (FriendshipModel.is_accepted == False))
             .all()
         )
-        pending = (
-            Friendship.get_query(info)
-            .filter((FriendshipModel.friend_id == user_id) & (FriendshipModel.is_accepted == False))
-            .all()
-        )
 
         return GetPendingFriendRequests(pending_requests=pending)
 
@@ -1453,7 +1440,6 @@ class Mutation(graphene.ObjectType):
     refresh_access_token = RefreshAccessToken.Field(description="Refreshes the access token.")
     create_report = CreateReport.Field(description="Creates a new report.")
     delete_report = DeleteReport.Field(description="Deletes a report by ID.")
-    delete_report = DeleteReport.Field(description="Deletes a report by ID.")
     delete_user = DeleteUserById.Field(description="Deletes a user by ID.")
     add_friend = AddFriend.Field(description="Adds a friend to a user.")
     remove_friend = RemoveFriend.Field(description="Removes a friend from a user.")
@@ -1466,8 +1452,6 @@ class Mutation(graphene.ObjectType):
     get_pending_friend_requests = GetPendingFriendRequests.Field(
         description="Get all pending friend requests for a user."
     )
-        description="Get all pending friend requests for a user."
-    )
 
 
 schema = graphene.Schema(query=Query, mutation=Mutation)