Ryan Kegel
7e7a2ef49e
Some checks failed
Chore App Build and Push Docker Images / build-and-push (push) Has been cancelled
- Added checks for accounts marked for deletion in signup, verification, and password reset processes. - Updated reward and task listing to sort user-created items first. - Enhanced user API to clear verification and reset tokens when marking accounts for deletion. - Introduced tests for marked accounts to ensure proper handling in various scenarios. - Updated profile and reward edit components to reflect changes in validation and data handling.
164 lines
6.8 KiB
Python
164 lines
6.8 KiB
Python
from flask import Blueprint, request, jsonify
|
|
from tinydb import Query
|
|
|
|
from api.utils import send_event_for_current_user, get_validated_user_id
|
|
from events.types.child_tasks_set import ChildTasksSet
|
|
from db.db import task_db, child_db
|
|
from db.child_overrides import delete_overrides_for_entity
|
|
from events.types.event import Event
|
|
from events.types.event_types import EventType
|
|
from events.types.task_modified import TaskModified
|
|
from models.task import Task
|
|
|
|
task_api = Blueprint('task_api', __name__)
|
|
|
|
# Task endpoints
|
|
@task_api.route('/task/add', methods=['PUT'])
|
|
def add_task():
|
|
user_id = get_validated_user_id()
|
|
if not user_id:
|
|
return jsonify({'error': 'Unauthorized', 'code': 'UNAUTHORIZED'}), 401
|
|
data = request.get_json()
|
|
name = data.get('name')
|
|
points = data.get('points')
|
|
is_good = data.get('is_good')
|
|
image = data.get('image_id', '')
|
|
if not name or points is None or is_good is None:
|
|
return jsonify({'error': 'Name, points, and is_good are required'}), 400
|
|
task = Task(name=name, points=points, is_good=is_good, image_id=image, user_id=user_id)
|
|
task_db.insert(task.to_dict())
|
|
send_event_for_current_user(Event(EventType.TASK_MODIFIED.value,
|
|
TaskModified(task.id, TaskModified.OPERATION_ADD)))
|
|
return jsonify({'message': f'Task {name} added.'}), 201
|
|
|
|
@task_api.route('/task/<id>', methods=['GET'])
|
|
def get_task(id):
|
|
user_id = get_validated_user_id()
|
|
if not user_id:
|
|
return jsonify({'error': 'Unauthorized', 'code': 'UNAUTHORIZED'}), 401
|
|
TaskQuery = Query()
|
|
result = task_db.search((TaskQuery.id == id) & ((TaskQuery.user_id == user_id) | (TaskQuery.user_id == None)))
|
|
if not result:
|
|
return jsonify({'error': 'Task not found'}), 404
|
|
return jsonify(result[0]), 200
|
|
|
|
@task_api.route('/task/list', methods=['GET'])
|
|
def list_tasks():
|
|
user_id = get_validated_user_id()
|
|
if not user_id:
|
|
return jsonify({'error': 'Unauthorized', 'code': 'UNAUTHORIZED'}), 401
|
|
ids_param = request.args.get('ids')
|
|
TaskQuery = Query()
|
|
tasks = task_db.search((TaskQuery.user_id == user_id) | (TaskQuery.user_id == None))
|
|
if ids_param is not None:
|
|
if ids_param.strip() == '':
|
|
tasks = []
|
|
else:
|
|
ids = set(ids_param.split(','))
|
|
tasks = [task for task in tasks if task.get('id') in ids]
|
|
|
|
user_tasks = {t['name'].strip().lower(): t for t in tasks if t.get('user_id') == user_id}
|
|
filtered_tasks = []
|
|
for t in tasks:
|
|
if t.get('user_id') is None and t['name'].strip().lower() in user_tasks:
|
|
continue # Skip default if user version exists
|
|
filtered_tasks.append(t)
|
|
|
|
# Sort: user-created items first (by name), then default items (by name)
|
|
user_created = sorted([t for t in filtered_tasks if t.get('user_id') == user_id], key=lambda x: x['name'].lower())
|
|
default_items = sorted([t for t in filtered_tasks if t.get('user_id') is None], key=lambda x: x['name'].lower())
|
|
sorted_tasks = user_created + default_items
|
|
|
|
return jsonify({'tasks': sorted_tasks}), 200
|
|
|
|
@task_api.route('/task/<id>', methods=['DELETE'])
|
|
def delete_task(id):
|
|
user_id = get_validated_user_id()
|
|
if not user_id:
|
|
return jsonify({'error': 'Unauthorized', 'code': 'UNAUTHORIZED'}), 401
|
|
TaskQuery = Query()
|
|
task = task_db.get(TaskQuery.id == id)
|
|
if not task:
|
|
return jsonify({'error': 'Task not found'}), 404
|
|
if task.get('user_id') is None:
|
|
import logging
|
|
logging.warning(f"Forbidden delete attempt on system task: id={id}, by user_id={user_id}")
|
|
return jsonify({'error': 'System tasks cannot be deleted.'}), 403
|
|
removed = task_db.remove((TaskQuery.id == id) & (TaskQuery.user_id == user_id))
|
|
if removed:
|
|
# Cascade delete overrides for this task
|
|
deleted_count = delete_overrides_for_entity(id)
|
|
if deleted_count > 0:
|
|
import logging
|
|
logging.info(f"Cascade deleted {deleted_count} overrides for task {id}")
|
|
|
|
# remove the task id from any child's task list
|
|
ChildQuery = Query()
|
|
for child in child_db.all():
|
|
child_tasks = child.get('tasks', [])
|
|
if id in child_tasks:
|
|
child_tasks.remove(id)
|
|
child_db.update({'tasks': child_tasks}, ChildQuery.id == child.get('id'))
|
|
send_event_for_current_user(Event(EventType.CHILD_TASKS_SET.value, ChildTasksSet(id, child_tasks)))
|
|
send_event_for_current_user(Event(EventType.TASK_MODIFIED.value, TaskModified(id, TaskModified.OPERATION_DELETE)))
|
|
return jsonify({'message': f'Task {id} deleted.'}), 200
|
|
return jsonify({'error': 'Task not found'}), 404
|
|
|
|
@task_api.route('/task/<id>/edit', methods=['PUT'])
|
|
def edit_task(id):
|
|
user_id = get_validated_user_id()
|
|
if not user_id:
|
|
return jsonify({'error': 'Unauthorized', 'code': 'UNAUTHORIZED'}), 401
|
|
TaskQuery = Query()
|
|
existing = task_db.get((TaskQuery.id == id) & ((TaskQuery.user_id == user_id) | (TaskQuery.user_id == None)))
|
|
if not existing:
|
|
return jsonify({'error': 'Task not found'}), 404
|
|
|
|
task = Task.from_dict(existing)
|
|
is_dirty = False
|
|
|
|
data = request.get_json(force=True) or {}
|
|
updates = {}
|
|
|
|
if 'name' in data:
|
|
name = data.get('name', '').strip()
|
|
if not name:
|
|
return jsonify({'error': 'Name cannot be empty'}), 400
|
|
task.name = name
|
|
is_dirty = True
|
|
|
|
if 'points' in data:
|
|
points = data.get('points')
|
|
if not isinstance(points, int):
|
|
return jsonify({'error': 'Points must be an integer'}), 400
|
|
if points <= 0:
|
|
return jsonify({'error': 'Points must be a positive integer'}), 400
|
|
task.points = points
|
|
is_dirty = True
|
|
|
|
if 'is_good' in data:
|
|
is_good = data.get('is_good')
|
|
if not isinstance(is_good, bool):
|
|
return jsonify({'error': 'is_good must be a boolean'}), 400
|
|
task.is_good = is_good
|
|
is_dirty = True
|
|
|
|
if 'image_id' in data:
|
|
task.image_id = data.get('image_id', '')
|
|
is_dirty = True
|
|
|
|
if not is_dirty:
|
|
return jsonify({'error': 'No valid fields to update'}), 400
|
|
|
|
if task.user_id is None: # public task
|
|
new_task = Task(name=task.name, points=task.points, is_good=task.is_good, image_id=task.image_id, user_id=user_id)
|
|
task_db.insert(new_task.to_dict())
|
|
send_event_for_current_user(Event(EventType.TASK_MODIFIED.value,
|
|
TaskModified(new_task.id, TaskModified.OPERATION_ADD)))
|
|
|
|
return jsonify(new_task.to_dict()), 200
|
|
|
|
task_db.update(task.to_dict(), (TaskQuery.id == id) & ((TaskQuery.user_id == user_id) | (TaskQuery.user_id == None)))
|
|
send_event_for_current_user(Event(EventType.TASK_MODIFIED.value,
|
|
TaskModified(id, TaskModified.OPERATION_EDIT)))
|
|
return jsonify(task.to_dict()), 200 |