feat: enhance task and reward management by clearing pending confirmations on unassignment

backend/api/child_action_helpers.py

@@ -42,6 +42,10 @@ def approve_chore(user_id: str, child_id: str, task_id: str) -> dict | None:
         raise ValueError(f'Child {child_id} not found for user {user_id}')
     child = Child.from_dict(child_result)
 
+    if task_id not in child.tasks:
+        logger.info(f'Task {task_id} no longer assigned to child {child_id}; skipping approve')
+        return None
+
     PendingQ = Query()
     existing = pending_confirmations_db.get(
         (PendingQ.child_id == child_id) & (PendingQ.entity_id == task_id) &
@@ -161,6 +165,10 @@ def approve_reward_request(user_id: str, child_id: str, reward_id: str) -> dict:
         raise ValueError(f'Child {child_id} not found for user {user_id}')
     child = Child.from_dict(child_result)
 
+    if reward_id not in child.rewards:
+        logger.info(f'Reward {reward_id} no longer assigned to child {child_id}; skipping approve')
+        return None
+
     RewardQ = Query()
     reward_result = reward_db.get(
         (RewardQ.id == reward_id) & ((RewardQ.user_id == user_id) | (RewardQ.user_id == None))
@@ -176,13 +184,21 @@ def approve_reward_request(user_id: str, child_id: str, reward_id: str) -> dict:
         raise ValueError(f'Child {child_id} has insufficient points for reward {reward_id}')
 
     PendingQ = Query()
-    removed = pending_confirmations_db.remove(
+    existing = pending_confirmations_db.get(
         (PendingQ.child_id == child_id) & (PendingQ.entity_id == reward_id) &
-        (PendingQ.entity_type == 'reward')
+        (PendingQ.entity_type == 'reward') & (PendingQ.status == 'pending') &
+        (PendingQ.user_id == user_id)
     )
-    if removed:
-        send_event_to_user(user_id, Event(EventType.CHILD_REWARD_REQUEST.value,
-                                         ChildRewardRequest(child_id, reward_id, ChildRewardRequest.REQUEST_GRANTED)))
+    if not existing:
+        logger.info(f'No pending reward for child {child_id}, reward {reward_id} — already resolved')
+        return None
+
+    pending_confirmations_db.remove(
+        (PendingQ.child_id == child_id) & (PendingQ.entity_id == reward_id) &
+        (PendingQ.entity_type == 'reward') & (PendingQ.user_id == user_id)
+    )
+    send_event_to_user(user_id, Event(EventType.CHILD_REWARD_REQUEST.value,
+                                     ChildRewardRequest(child_id, reward_id, ChildRewardRequest.REQUEST_GRANTED)))
 
     points_before = child.points
     child.points -= cost_value