feat: Improve balance verification on group leave and member removal, update error handling

Author: Devasy

backend/app/groups/service.py

@@ -313,21 +313,24 @@ async def leave_group(self, group_id: str, user_id: str) -> bool:
                 )
 
         # Block leaving when there are unsettled balances involving this user
-        pending_count = 0
         try:
-            result = await db.settlements.count_documents(
+            pending = await db.settlements.find_one(
                 {
-                    "groupId": group_id,
+                    "groupId": group_id,  # settlements store string groupId
                     "status": "pending",
                     "$or": [{"payerId": user_id}, {"payeeId": user_id}],
-                }
+                },
+                {"_id": 1},
             )
-            pending_count = result if isinstance(result, int) else 0
         except Exception as e:
-            logger.warning(
-                f"Skipping unsettled check on leave due to error: {e} (defaulting to 0)"
+            logger.error(
+                f"Failed to verify unsettled balances for group {group_id}: {e}"
             )
-        if pending_count > 0:
+            raise HTTPException(
+                status_code=503,
+                detail="Unable to verify unsettled balances right now. Please try again later.",
+            )
+        if pending:
             raise HTTPException(
                 status_code=400,
                 detail="Cannot leave group with unsettled balances. Please settle up first.",
@@ -442,21 +445,24 @@ async def remove_member(self, group_id: str, member_id: str, user_id: str) -> bo
             )
 
         # Block removal when there are unsettled balances involving the target member
-        pending_count = 0
         try:
-            result = await db.settlements.count_documents(
+            pending = await db.settlements.find_one(
                 {
-                    "groupId": group_id,
+                    "groupId": group_id,  # settlements store string groupId
                     "status": "pending",
                     "$or": [{"payerId": member_id}, {"payeeId": member_id}],
-                }
+                },
+                {"_id": 1},
             )
-            pending_count = result if isinstance(result, int) else 0
         except Exception as e:
-            logger.warning(
-                f"Skipping unsettled check on removal due to error: {e} (defaulting to 0)"
+            logger.error(
+                f"Failed to verify unsettled balances on removal for group {group_id}: {e}"
+            )
+            raise HTTPException(
+                status_code=503,
+                detail="Unable to verify unsettled balances right now. Please try again later.",
             )
-        if pending_count > 0:
+        if pending:
             raise HTTPException(
                 status_code=400,
                 detail="Cannot remove member with unsettled balances. Please settle up first.",

backend/tests/groups/test_groups_service.py

@@ -208,7 +208,10 @@ async def test_remove_member_blocked_when_unsettled(self):
                 {"userId": member_id, "role": "member"},
             ],
         }
-        settlements.count_documents.return_value = 2  # pending exists
+        settlements.find_one.return_value = {
+            "_id": ObjectId(),
+            "status": "pending",
+        }  # Has pending settlements
 
         with patch.object(self.service, "get_db", return_value=mock_db):
             with pytest.raises(HTTPException) as exc:
@@ -239,7 +242,7 @@ async def test_remove_member_allowed_when_settled(self):
                 ],
             }
         ]
-        settlements.count_documents.return_value = 0
+        settlements.find_one.return_value = None  # No pending settlements
         groups.update_one.return_value = MagicMock(modified_count=1)
 
         with patch.object(self.service, "get_db", return_value=mock_db):
@@ -266,7 +269,7 @@ async def test_leave_group_blocked_when_unsettled(self):
                 {"userId": "other", "role": "admin"},
             ],
         }
-        settlements.count_documents.return_value = 1
+        settlements.find_one.return_value = {"_id": ObjectId(), "status": "pending"}
 
         with patch.object(self.service, "get_db", return_value=mock_db):
             with pytest.raises(HTTPException) as exc:
@@ -296,7 +299,7 @@ async def test_leave_group_allowed_when_settled(self):
                 ],
             }
         ]
-        settlements.count_documents.return_value = 0
+        settlements.find_one.return_value = None  # No pending settlements
         groups.update_one.return_value = MagicMock(modified_count=1)
 
         with patch.object(self.service, "get_db", return_value=mock_db):
@@ -527,7 +530,9 @@ async def test_leave_group_allow_member_to_leave(self):
         """Test allowing regular members to leave"""
         mock_db = AsyncMock()
         mock_collection = AsyncMock()
+        mock_settlements = AsyncMock()
         mock_db.groups = mock_collection
+        mock_db.settlements = mock_settlements
 
         group = {
             "_id": ObjectId("642f1e4a9b3c2d1f6a1b2c3d"),
@@ -547,6 +552,7 @@ async def test_leave_group_allow_member_to_leave(self):
         }
 
         mock_collection.find_one.return_value = group
+        mock_settlements.find_one.return_value = None  # No pending settlements
         mock_result = MagicMock()
         mock_result.modified_count = 1
         mock_collection.update_one.return_value = mock_result

frontend/api/auth.js

@@ -8,9 +8,7 @@ export const signup = (name, email, password) => {
   return apiClient.post("/auth/signup/email", { name, email, password });
 };
 
-export const updateUser = (token, userData) => {
-  return apiClient.patch("/user/", userData);
-};
+export const updateUser = (userData) => apiClient.patch("/user/", userData);
 
 export const refresh = (refresh_token) => {
   return apiClient.post("/auth/refresh", { refresh_token });

frontend/api/client.js

@@ -61,9 +61,8 @@ async function performRefresh() {
       return accessToken;
     } finally {
       isRefreshing = false;
-      const p = refreshPromise; // preserve for awaiting callers
+      // allow GC of the completed promise
       refreshPromise = null;
-      return p; // not used
     }
   })();
   return refreshPromise;

frontend/screens/EditProfileScreen.js

@@ -1,28 +1,28 @@
-import React, { useState, useContext } from 'react';
-import { View, StyleSheet, Alert } from 'react-native';
-import { Button, TextInput, Appbar, Title } from 'react-native-paper';
-import { AuthContext } from '../context/AuthContext';
-import { updateUser } from '../api/auth';
+import { useContext, useState } from "react";
+import { Alert, StyleSheet, View } from "react-native";
+import { Appbar, Button, TextInput, Title } from "react-native-paper";
+import { updateUser } from "../api/auth";
+import { AuthContext } from "../context/AuthContext";
 
 const EditProfileScreen = ({ navigation }) => {
   const { user, token, updateUserInContext } = useContext(AuthContext);
-  const [name, setName] = useState(user?.name || '');
+  const [name, setName] = useState(user?.name || "");
   const [isSubmitting, setIsSubmitting] = useState(false);
 
   const handleUpdateProfile = async () => {
     if (!name) {
-      Alert.alert('Error', 'Name cannot be empty.');
+      Alert.alert("Error", "Name cannot be empty.");
       return;
     }
     setIsSubmitting(true);
     try {
-      const response = await updateUser(token, { name });
+      const response = await updateUser({ name });
       updateUserInContext(response.data);
-      Alert.alert('Success', 'Profile updated successfully.');
+      Alert.alert("Success", "Profile updated successfully.");
       navigation.goBack();
     } catch (error) {
-      console.error('Failed to update profile:', error);
-      Alert.alert('Error', 'Failed to update profile.');
+      console.error("Failed to update profile:", error);
+      Alert.alert("Error", "Failed to update profile.");
     } finally {
       setIsSubmitting(false);
     }

frontend/screens/GroupDetailsScreen.js

@@ -250,7 +250,7 @@ const styles = StyleSheet.create({
   },
   // Settlement Summary Styles
   settlementContainer: {
-    gap: 16,
+    marginBottom: 16,
   },
   settledContainer: {
     alignItems: "center",