Merge again

Author: cejiogu

src/schema.py

@@ -535,6 +535,7 @@ class UserInput(graphene.InputObjectType):
 
 # MARK: - Friendship
 
+
 class Friendship(SQLAlchemyObjectType):
     class Meta:
         model = FriendshipModel
@@ -636,11 +637,14 @@ 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)
@@ -723,13 +727,23 @@ 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:
@@ -741,6 +755,7 @@ 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()
@@ -750,6 +765,7 @@ 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)
@@ -945,6 +961,7 @@ def mutate(self, info, name):
         db_session.commit()
         return giveaway
 
+
 class AddFriend(graphene.Mutation):
     class Arguments:
         user_net_id = graphene.String(required=True, description="The Net ID of the user.")
@@ -968,6 +985,7 @@ def mutate(self, info, user_net_id, friend_net_id):
         db_session.commit()
         return user
 
+
 class RemoveFriend(graphene.Mutation):
     class Arguments:
         user_net_id = graphene.String(required=True, description="The Net ID of the user.")
@@ -991,6 +1009,7 @@ def mutate(self, info, user_net_id, friend_net_id):
         db_session.commit()
         return user
 
+
 class SetWorkoutGoals(graphene.Mutation):
     class Arguments:
         user_id = graphene.Int(required=True, description="The ID of the user.")
@@ -1217,6 +1236,7 @@ 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
@@ -1233,6 +1253,7 @@ 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:
@@ -1267,8 +1288,10 @@ 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}")
 
@@ -1278,6 +1301,7 @@ def mutate(self, info, reminder_id):
         return reminder
 
 
+
 class AddFriend(graphene.Mutation):
     class Arguments:
         user_id = graphene.Int(required=True)
@@ -1305,6 +1329,14 @@ 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.")
@@ -1317,6 +1349,7 @@ def mutate(self, info, user_id, friend_id):
         return friendship
 
 
+
 class AcceptFriendRequest(graphene.Mutation):
     class Arguments:
         friendship_id = graphene.Int(required=True)
@@ -1341,6 +1374,7 @@ def mutate(self, info, friendship_id):
 
         return friendship
 
+
 class RemoveFriend(graphene.Mutation):
     class Arguments:
         user_id = graphene.Int(required=True)
@@ -1359,6 +1393,14 @@ 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.")
@@ -1370,6 +1412,7 @@ def mutate(self, info, user_id, friend_id):
         return RemoveFriend(success=True)
 
 
+
 class GetPendingFriendRequests(graphene.Mutation):
     class Arguments:
         user_id = graphene.Int(required=True)
@@ -1389,6 +1432,11 @@ 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)
 
@@ -1405,6 +1453,7 @@ 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.")
@@ -1417,6 +1466,8 @@ 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)