фильтр
This commit is contained in:
@@ -72,143 +72,153 @@ function setupTaskEndpoints(app, db, upload) {
|
||||
}
|
||||
|
||||
// API для задач
|
||||
app.get('/api/tasks', requireAuth, (req, res) => {
|
||||
const userId = req.session.user.id;
|
||||
const showDeleted = req.session.user.role === 'admin' && req.query.showDeleted === 'true';
|
||||
const search = req.query.search || '';
|
||||
const statusFilter = req.query.status || 'active,in_progress,assigned,overdue,rework';
|
||||
const creatorFilter = req.query.creator || '';
|
||||
const assigneeFilter = req.query.assignee || '';
|
||||
const deadlineFilter = req.query.deadline || '';
|
||||
app.get('/api/tasks', requireAuth, (req, res) => {
|
||||
const userId = req.session.user.id;
|
||||
const showDeleted = req.session.user.role === 'admin' && req.query.showDeleted === 'true';
|
||||
const search = req.query.search || '';
|
||||
const statusFilter = req.query.status || 'active,in_progress,assigned,overdue,rework';
|
||||
const creatorFilter = req.query.creator || '';
|
||||
const assigneeFilter = req.query.assignee || '';
|
||||
const deadlineFilter = req.query.deadline || '';
|
||||
const taskType = req.query.task_type || ''; // Новый параметр для фильтрации по типу задачи
|
||||
|
||||
let query = `
|
||||
SELECT DISTINCT
|
||||
t.*,
|
||||
u.name as creator_name,
|
||||
u.login as creator_login,
|
||||
ot.title as original_task_title,
|
||||
ou.name as original_creator_name,
|
||||
GROUP_CONCAT(DISTINCT ta.user_id) as assigned_user_ids,
|
||||
GROUP_CONCAT(DISTINCT u2.name) as assigned_user_names
|
||||
FROM tasks t
|
||||
LEFT JOIN users u ON t.created_by = u.id
|
||||
LEFT JOIN tasks ot ON t.original_task_id = ot.id
|
||||
LEFT JOIN users ou ON ot.created_by = ou.id
|
||||
LEFT JOIN task_assignments ta ON t.id = ta.task_id
|
||||
LEFT JOIN users u2 ON ta.user_id = u2.id
|
||||
WHERE 1=1
|
||||
`;
|
||||
let query = `
|
||||
SELECT DISTINCT
|
||||
t.*,
|
||||
u.name as creator_name,
|
||||
u.login as creator_login,
|
||||
ot.title as original_task_title,
|
||||
ou.name as original_creator_name,
|
||||
GROUP_CONCAT(DISTINCT ta.user_id) as assigned_user_ids,
|
||||
GROUP_CONCAT(DISTINCT u2.name) as assigned_user_names
|
||||
FROM tasks t
|
||||
LEFT JOIN users u ON t.created_by = u.id
|
||||
LEFT JOIN tasks ot ON t.original_task_id = ot.id
|
||||
LEFT JOIN users ou ON ot.created_by = ou.id
|
||||
LEFT JOIN task_assignments ta ON t.id = ta.task_id
|
||||
LEFT JOIN users u2 ON ta.user_id = u2.id
|
||||
WHERE 1=1
|
||||
`;
|
||||
|
||||
const params = [];
|
||||
const params = [];
|
||||
|
||||
if (req.session.user.role !== 'admin') {
|
||||
query += ` AND (t.created_by = ? OR ta.user_id = ?)`;
|
||||
params.push(userId, userId);
|
||||
}
|
||||
// ===== ДОБАВЛЯЕМ ФИЛЬТР ПО ТИПУ ЗАДАЧИ =====
|
||||
if (taskType) {
|
||||
query += ` AND t.task_type = ?`;
|
||||
params.push(taskType);
|
||||
}
|
||||
|
||||
if (!showDeleted) {
|
||||
query += " AND t.status = 'active'";
|
||||
}
|
||||
if (req.session.user.role !== 'admin') {
|
||||
query += ` AND (t.created_by = ? OR ta.user_id = ?)`;
|
||||
params.push(userId, userId);
|
||||
}
|
||||
|
||||
if (statusFilter && statusFilter !== 'all') {
|
||||
const statuses = statusFilter.split(',');
|
||||
|
||||
if (statuses.includes('closed')) {
|
||||
if (req.session.user.role !== 'admin') {
|
||||
query += ` AND (t.closed_at IS NOT NULL AND t.created_by = ?)`;
|
||||
params.push(userId);
|
||||
} else {
|
||||
query += ` AND t.closed_at IS NOT NULL`;
|
||||
}
|
||||
if (!showDeleted) {
|
||||
query += " AND t.status = 'active'";
|
||||
}
|
||||
|
||||
if (statusFilter && statusFilter !== 'all') {
|
||||
const statuses = statusFilter.split(',');
|
||||
|
||||
if (statuses.includes('closed')) {
|
||||
if (req.session.user.role !== 'admin') {
|
||||
query += ` AND (t.closed_at IS NOT NULL AND t.created_by = ?)`;
|
||||
params.push(userId);
|
||||
} else {
|
||||
query += ` AND t.closed_at IS NULL`;
|
||||
|
||||
if (statuses.length > 0 && !statuses.includes('all')) {
|
||||
query += ` AND EXISTS (
|
||||
SELECT 1 FROM task_assignments ta2
|
||||
WHERE ta2.task_id = t.id AND ta2.status IN (${statuses.map(() => '?').join(',')})
|
||||
)`;
|
||||
statuses.forEach(status => params.push(status));
|
||||
}
|
||||
query += ` AND t.closed_at IS NOT NULL`;
|
||||
}
|
||||
} else {
|
||||
if (req.session.user.role !== 'admin') {
|
||||
query += ` AND (t.closed_at IS NULL OR t.created_by = ?)`;
|
||||
params.push(userId);
|
||||
query += ` AND t.closed_at IS NULL`;
|
||||
|
||||
if (statuses.length > 0 && !statuses.includes('all')) {
|
||||
query += ` AND EXISTS (
|
||||
SELECT 1 FROM task_assignments ta2
|
||||
WHERE ta2.task_id = t.id AND ta2.status IN (${statuses.map(() => '?').join(',')})
|
||||
)`;
|
||||
statuses.forEach(status => params.push(status));
|
||||
}
|
||||
}
|
||||
} else {
|
||||
if (req.session.user.role !== 'admin') {
|
||||
query += ` AND (t.closed_at IS NULL OR t.created_by = ?)`;
|
||||
params.push(userId);
|
||||
}
|
||||
}
|
||||
|
||||
if (creatorFilter) {
|
||||
query += ` AND t.created_by = ?`;
|
||||
params.push(creatorFilter);
|
||||
if (creatorFilter) {
|
||||
query += ` AND t.created_by = ?`;
|
||||
params.push(creatorFilter);
|
||||
}
|
||||
|
||||
if (assigneeFilter) {
|
||||
query += ` AND ta.user_id = ?`;
|
||||
params.push(assigneeFilter);
|
||||
}
|
||||
|
||||
if (deadlineFilter) {
|
||||
const now = new Date();
|
||||
let hours = 48;
|
||||
if (deadlineFilter === '24h') hours = 24;
|
||||
|
||||
const deadlineTime = new Date(now.getTime() + hours * 60 * 60 * 1000);
|
||||
const deadlineISO = deadlineTime.toISOString();
|
||||
const nowISO = now.toISOString();
|
||||
|
||||
query += ` AND ta.due_date IS NOT NULL
|
||||
AND ta.due_date > ?
|
||||
AND ta.due_date <= ?
|
||||
AND ta.status NOT IN ('completed', 'overdue')`;
|
||||
params.push(nowISO, deadlineISO);
|
||||
}
|
||||
|
||||
if (search) {
|
||||
query += ` AND (t.title LIKE ? OR t.description LIKE ?)`;
|
||||
const searchPattern = `%${search}%`;
|
||||
params.push(searchPattern, searchPattern);
|
||||
}
|
||||
|
||||
query += " GROUP BY t.id ORDER BY t.created_at DESC";
|
||||
|
||||
console.log('SQL Query:', query);
|
||||
console.log('Params:', params);
|
||||
|
||||
db.all(query, params, (err, tasks) => {
|
||||
if (err) {
|
||||
res.status(500).json({ error: err.message });
|
||||
return;
|
||||
}
|
||||
|
||||
if (assigneeFilter) {
|
||||
query += ` AND ta.user_id = ?`;
|
||||
params.push(assigneeFilter);
|
||||
}
|
||||
|
||||
if (deadlineFilter) {
|
||||
const now = new Date();
|
||||
let hours = 48;
|
||||
if (deadlineFilter === '24h') hours = 24;
|
||||
|
||||
const deadlineTime = new Date(now.getTime() + hours * 60 * 60 * 1000);
|
||||
const deadlineISO = deadlineTime.toISOString();
|
||||
const nowISO = now.toISOString();
|
||||
|
||||
query += ` AND ta.due_date IS NOT NULL
|
||||
AND ta.due_date > ?
|
||||
AND ta.due_date <= ?
|
||||
AND ta.status NOT IN ('completed', 'overdue')`;
|
||||
params.push(nowISO, deadlineISO);
|
||||
}
|
||||
|
||||
if (search) {
|
||||
query += ` AND (t.title LIKE ? OR t.description LIKE ?)`;
|
||||
const searchPattern = `%${search}%`;
|
||||
params.push(searchPattern, searchPattern);
|
||||
}
|
||||
|
||||
query += " GROUP BY t.id ORDER BY t.created_at DESC";
|
||||
|
||||
db.all(query, params, (err, tasks) => {
|
||||
if (err) {
|
||||
res.status(500).json({ error: err.message });
|
||||
return;
|
||||
}
|
||||
|
||||
const taskPromises = tasks.map(task => {
|
||||
return new Promise((resolve) => {
|
||||
db.all(`
|
||||
SELECT ta.*, u.name as user_name, u.login as user_login
|
||||
FROM task_assignments ta
|
||||
LEFT JOIN users u ON ta.user_id = u.id
|
||||
WHERE ta.task_id = ?
|
||||
`, [task.id], (err, assignments) => {
|
||||
if (err) {
|
||||
task.assignments = [];
|
||||
resolve(task);
|
||||
return;
|
||||
}
|
||||
|
||||
assignments.forEach(assignment => {
|
||||
if (checkIfOverdue(assignment.due_date, assignment.status) && assignment.status !== 'completed') {
|
||||
assignment.status = 'overdue';
|
||||
}
|
||||
});
|
||||
|
||||
task.assignments = assignments || [];
|
||||
const taskPromises = tasks.map(task => {
|
||||
return new Promise((resolve) => {
|
||||
db.all(`
|
||||
SELECT ta.*, u.name as user_name, u.login as user_login
|
||||
FROM task_assignments ta
|
||||
LEFT JOIN users u ON ta.user_id = u.id
|
||||
WHERE ta.task_id = ?
|
||||
`, [task.id], (err, assignments) => {
|
||||
if (err) {
|
||||
task.assignments = [];
|
||||
resolve(task);
|
||||
return;
|
||||
}
|
||||
|
||||
assignments.forEach(assignment => {
|
||||
if (checkIfOverdue(assignment.due_date, assignment.status) && assignment.status !== 'completed') {
|
||||
assignment.status = 'overdue';
|
||||
}
|
||||
});
|
||||
|
||||
task.assignments = assignments || [];
|
||||
resolve(task);
|
||||
});
|
||||
});
|
||||
});
|
||||
|
||||
Promise.all(taskPromises).then(completedTasks => {
|
||||
res.json(completedTasks);
|
||||
});
|
||||
Promise.all(taskPromises).then(completedTasks => {
|
||||
res.json(completedTasks);
|
||||
});
|
||||
});
|
||||
});
|
||||
// API для задач по типу
|
||||
app.get('/api/tasks_by_type', requireAuth, (req, res) => {
|
||||
const userId = req.session.user.id;
|
||||
|
||||
Reference in New Issue
Block a user