refactoring

api/child_api.py

@@ -1,3 +1,5 @@
+from time import sleep
+
 from flask import Blueprint, request, jsonify
 from tinydb import Query
 
@@ -137,6 +139,12 @@ def assign_task_to_child(id):
 def set_child_tasks(id):
     data = request.get_json() or {}
     task_ids = data.get('task_ids')
+    if 'type' not in data:
+        return jsonify({'error': 'type is required (good or bad)'}), 400
+    task_type = data.get('type', 'good')
+    if task_type not in ['good', 'bad']:
+        return jsonify({'error': 'type must be either good or bad'}), 400
+    is_good = task_type == 'good'
     if not isinstance(task_ids, list):
         return jsonify({'error': 'task_ids must be a list'}), 400
 
@@ -147,22 +155,25 @@ def set_child_tasks(id):
     result = child_db.search(ChildQuery.id == id)
     if not result:
         return jsonify({'error': 'Child not found'}), 404
+    child = Child.from_dict(result[0])
+    new_task_ids = set(task_ids)
 
-    # Optional: validate task IDs exist in the task DB
-    TaskQuery = Query()
-    valid_task_ids = []
-    for tid in new_task_ids:
-        if task_db.get(TaskQuery.id == tid):
-            valid_task_ids.append(tid)
+    # Add all existing child tasks of the opposite type
+    for task in task_db.all():
+        if task['id'] in child.tasks and task['is_good'] != is_good:
+            new_task_ids.add(task['id'])
+
+    # Convert back to list if needed
+    new_tasks = list(new_task_ids)
     # Replace tasks with validated IDs
-    child_db.update({'tasks': valid_task_ids}, ChildQuery.id == id)
-    resp = send_event_for_current_user(Event(EventType.CHILD_TASKS_SET.value, ChildTasksSet(id, valid_task_ids)))
+    child_db.update({'tasks': new_tasks}, ChildQuery.id == id)
+    resp = send_event_for_current_user(Event(EventType.CHILD_TASKS_SET.value, ChildTasksSet(id, new_tasks)))
     if resp:
         return resp
     return jsonify({
         'message': f'Tasks set for child {id}.',
-        'task_ids': valid_task_ids,
-        'count': len(valid_task_ids)
+        'task_ids': new_tasks,
+        'count': len(new_tasks)
     }), 200
 
 
@@ -242,6 +253,10 @@ def list_all_tasks(id):
     result = child_db.search(ChildQuery.id == id)
     if not result:
         return jsonify({'error': 'Child not found'}), 404
+    has_type = "type" in request.args
+    if has_type and request.args.get('type') not in ['good', 'bad']:
+        return jsonify({'error': 'type must be either good or bad'}), 400
+    good = request.args.get('type', False) == 'good'
 
     child = result[0]
     assigned_ids = set(child.get('tasks', []))
@@ -249,8 +264,7 @@ def list_all_tasks(id):
     # Get all tasks from database
     all_tasks = task_db.all()
 
-    assigned_tasks = []
-    assignable_tasks = []
+    tasks = []
 
     for task in all_tasks:
         if not task or not task.get('id'):
@@ -263,18 +277,15 @@ def list_all_tasks(id):
             task.get('image_id'),
             task.get('id')
         )
+        task_dict = ct.to_dict()
+        if has_type and task.get('is_good') != good:
+            continue
 
-        if task.get('id') in assigned_ids:
-            assigned_tasks.append(ct.to_dict())
-        else:
-            assignable_tasks.append(ct.to_dict())
+        task_dict.update({'assigned': task.get('id') in assigned_ids})
+        tasks.append(task_dict)
+        tasks.sort(key=lambda t: (not t['assigned'], t['name'].lower()))
 
-    return jsonify({
-        'assigned_tasks': assigned_tasks,
-        'assignable_tasks': assignable_tasks,
-        'assigned_count': len(assigned_tasks),
-        'assignable_count': len(assignable_tasks)
-    }), 200
+    return jsonify({ 'tasks': tasks }), 200
 
 
 @child_api.route('/child/<id>/trigger-task', methods=['POST'])
@@ -341,9 +352,7 @@ def list_all_rewards(id):
 
     # Get all rewards from database
     all_rewards = reward_db.all()
-
-    assigned_rewards = []
-    assignable_rewards = []
+    rewards = []
 
     for reward in all_rewards:
         if not reward or not reward.get('id'):
@@ -356,16 +365,15 @@ def list_all_rewards(id):
             reward.get('id')
         )
 
-        if reward.get('id') in assigned_ids:
-            assigned_rewards.append(cr.to_dict())
-        else:
-            assignable_rewards.append(cr.to_dict())
+        reward_dict = cr.to_dict()
+
+        reward_dict.update({'assigned': reward.get('id') in assigned_ids})
+        rewards.append(reward_dict)
+        rewards.sort(key=lambda t: (not t['assigned'], t['name'].lower()))
 
     return jsonify({
-        'assigned_rewards': assigned_rewards,
-        'assignable_rewards': assignable_rewards,
-        'assigned_count': len(assigned_rewards),
-        'assignable_count': len(assignable_rewards)
+        'rewards': rewards,
+        'rewards_count': len(rewards)
     }), 200