collabdocchat 1.2.13 → 2.0.1

package/server/routes/tasks.js

@@ -1,110 +1,257 @@
-import express from 'express';
-import Task from '../models/Task.js';
-import Group from '../models/Group.js';
-import { authenticate, isAdmin } from '../middleware/auth.js';
-
-const router = express.Router();
-
-// 创建任务（仅管理员）
-router.post('/', authenticate, isAdmin, async (req, res) => {
-  try {
-    const { title, description, groupId, assignedTo, relatedDocument, deadline } = req.body;
-    
-    const task = new Task({
-      title,
-      description,
-      group: groupId,
-      creator: req.user.userId,
-      assignedTo,
-      relatedDocument,
-      deadline
-    });
-    
-    await task.save();
-    
-    // 更新群组的任务列表
-    await Group.findByIdAndUpdate(groupId, { $push: { tasks: task._id } });
-
-    res.status(201).json({ message: '任务创建成功', task });
-  } catch (error) {
-    res.status(500).json({ message: '创建任务失败', error: error.message });
-  }
-});
-
-// 获取群组的所有任务
-router.get('/group/:groupId', authenticate, async (req, res) => {
-  try {
-    const tasks = await Task.find({ group: req.params.groupId })
-      .populate('creator', 'username avatar')
-      .populate('assignedTo', 'username avatar')
-      .populate('relatedDocument', 'title')
-      .sort({ createdAt: -1 });
-    
-    res.json({ tasks });
-  } catch (error) {
-    res.status(500).json({ message: '获取任务失败', error: error.message });
-  }
-});
-
-// 获取用户的任务
-router.get('/my', authenticate, async (req, res) => {
-  try {
-    const tasks = await Task.find({ assignedTo: req.user.userId })
-      .populate('creator', 'username avatar')
-      .populate('group', 'name')
-      .populate('relatedDocument', 'title')
-      .sort({ createdAt: -1 });
-    
-    res.json({ tasks });
-  } catch (error) {
-    res.status(500).json({ message: '获取任务失败', error: error.message });
-  }
-});
-
-// 更新任务状态
-router.patch('/:id/status', authenticate, async (req, res) => {
-  try {
-    const { status } = req.body;
-    const task = await Task.findById(req.params.id);
-    
-    if (!task) {
-      return res.status(404).json({ message: '任务不存在' });
-    }
-
-    task.status = status;
-    
-    if (status === 'completed') {
-      task.completedBy.push({
-        user: req.user.userId,
-        completedAt: new Date()
-      });
-    }
-    
-    await task.save();
-
-    res.json({ message: '任务状态更新成功', task });
-  } catch (error) {
-    res.status(500).json({ message: '更新任务状态失败', error: error.message });
-  }
-});
-
-// 删除任务（仅管理员）
-router.delete('/:id', authenticate, isAdmin, async (req, res) => {
-  try {
-    const task = await Task.findByIdAndDelete(req.params.id);
-    
-    if (!task) {
-      return res.status(404).json({ message: '任务不存在' });
-    }
-
-    await Group.findByIdAndUpdate(task.group, { $pull: { tasks: task._id } });
-
-    res.json({ message: '任务删除成功' });
-  } catch (error) {
-    res.status(500).json({ message: '删除任务失败', error: error.message });
-  }
-});
-
-export default router;
-
-
+import express from 'express';
+import Task from '../models/Task.js';
+import Group from '../models/Group.js';
+import { authenticate, isAdmin } from '../middleware/auth.js';
+
+const router = express.Router();
+
+// 创建任务（仅管理员）
+router.post('/', authenticate, isAdmin, async (req, res) => {
+  try {
+    const { title, description, groupId, assignedTo, relatedDocument, deadline, type, pollData } = req.body;
+    
+    const taskData = {
+      title,
+      description,
+      group: groupId,
+      creator: req.user.userId,
+      assignedTo,
+      relatedDocument,
+      deadline
+    };
+
+    // 如果是投票任务，添加投票数据
+    if (type === 'poll' && pollData) {
+      taskData.type = 'poll';
+      taskData.pollData = pollData;
+    }
+    
+    const task = new Task(taskData);
+    
+    await task.save();
+    
+    // 更新群组的任务列表
+    await Group.findByIdAndUpdate(groupId, { $push: { tasks: task._id } });
+
+    res.status(201).json({ message: '任务创建成功', task });
+  } catch (error) {
+    res.status(500).json({ message: '创建任务失败', error: error.message });
+  }
+});
+
+// 获取用户的任务（必须在 /:id 之前）
+router.get('/my', authenticate, async (req, res) => {
+  try {
+    const tasks = await Task.find({ assignedTo: req.user.userId })
+      .populate('creator', 'username avatar')
+      .populate('group', 'name')
+      .populate('relatedDocument', 'title')
+      .sort({ createdAt: -1 });
+    
+    res.json({ tasks });
+  } catch (error) {
+    res.status(500).json({ message: '获取任务失败', error: error.message });
+  }
+});
+
+// 获取群组的所有任务
+router.get('/group/:groupId', authenticate, async (req, res) => {
+  try {
+    const tasks = await Task.find({ group: req.params.groupId })
+      .populate('creator', 'username avatar')
+      .populate('assignedTo', 'username avatar')
+      .populate('relatedDocument', 'title')
+      .sort({ createdAt: -1 });
+    
+    res.json({ tasks });
+  } catch (error) {
+    res.status(500).json({ message: '获取任务失败', error: error.message });
+  }
+});
+
+// 获取单个任务详情
+router.get('/:id', authenticate, async (req, res) => {
+  try {
+    const task = await Task.findById(req.params.id)
+      .populate('creator', 'username avatar')
+      .populate('assignedTo', 'username avatar')
+      .populate('completedBy.user', 'username avatar')
+      .populate({
+        path: 'group',
+        select: 'name description members',
+        populate: {
+          path: 'members',
+          select: 'username avatar'
+        }
+      })
+      .populate('relatedDocument', 'title');
+    
+    if (!task) {
+      return res.status(404).json({ message: '任务不存在' });
+    }
+
+    res.json({ task });
+  } catch (error) {
+    console.error('获取任务详情失败:', error);
+    res.status(500).json({ message: '获取任务详情失败', error: error.message });
+  }
+});
+
+// 更新任务状态
+router.patch('/:id/status', authenticate, async (req, res) => {
+  try {
+    const { status } = req.body;
+    const task = await Task.findById(req.params.id);
+    
+    if (!task) {
+      return res.status(404).json({ message: '任务不存在' });
+    }
+
+    task.status = status;
+    
+    if (status === 'completed') {
+      // 检查用户是否已经标记为完成
+      const alreadyCompleted = task.completedBy.some(
+        item => item.user.toString() === req.user.userId
+      );
+      
+      if (!alreadyCompleted) {
+        task.completedBy.push({
+          user: req.user.userId,
+          completedAt: new Date()
+        });
+      }
+    }
+    
+    await task.save();
+
+    // 重新查询以填充用户信息
+    const updatedTask = await Task.findById(task._id)
+      .populate('creator', 'username avatar')
+      .populate('assignedTo', 'username avatar')
+      .populate('completedBy.user', 'username avatar')
+      .populate('group', 'name');
+
+    res.json({ message: '任务状态更新成功', task: updatedTask });
+  } catch (error) {
+    res.status(500).json({ message: '更新任务状态失败', error: error.message });
+  }
+});
+
+// 删除任务（仅管理员）
+router.delete('/:id', authenticate, isAdmin, async (req, res) => {
+  try {
+    const task = await Task.findByIdAndDelete(req.params.id);
+    
+    if (!task) {
+      return res.status(404).json({ message: '任务不存在' });
+    }
+
+    await Group.findByIdAndUpdate(task.group, { $pull: { tasks: task._id } });
+
+    res.json({ message: '任务删除成功' });
+  } catch (error) {
+    res.status(500).json({ message: '删除任务失败', error: error.message });
+  }
+});
+
+// 提交投票
+router.post('/:id/vote', authenticate, async (req, res) => {
+  try {
+    const { selectedOptions } = req.body; // 选中的选项索引数组
+    const task = await Task.findById(req.params.id);
+    
+    console.log('投票请求:', {
+      taskId: req.params.id,
+      userId: req.user.userId,
+      selectedOptions
+    });
+    
+    if (!task) {
+      return res.status(404).json({ message: '任务不存在' });
+    }
+
+    if (task.type !== 'poll') {
+      return res.status(400).json({ message: '该任务不是投票任务' });
+    }
+
+    if (!task.pollData || !task.pollData.options) {
+      return res.status(400).json({ message: '投票数据不完整' });
+    }
+
+    // 检查用户是否已投票（转换为字符串比较）
+    const userIdStr = req.user.userId.toString();
+    const hasVoted = task.pollData.options.some(opt => 
+      opt.votes && opt.votes.some(voteId => voteId.toString() === userIdStr)
+    );
+
+    if (hasVoted) {
+      return res.status(400).json({ message: '您已经投过票了' });
+    }
+
+    // 验证选项索引
+    if (!Array.isArray(selectedOptions) || selectedOptions.length === 0) {
+      return res.status(400).json({ message: '请选择至少一个选项' });
+    }
+
+    // 添加投票
+    selectedOptions.forEach(optionIndex => {
+      if (task.pollData.options[optionIndex]) {
+        if (!task.pollData.options[optionIndex].votes) {
+          task.pollData.options[optionIndex].votes = [];
+        }
+        task.pollData.options[optionIndex].votes.push(req.user.userId);
+      }
+    });
+
+    // 更新总投票数
+    task.pollData.totalVotes = (task.pollData.totalVotes || 0) + 1;
+
+    // 自动标记任务为已完成
+    const alreadyCompleted = task.completedBy.some(
+      item => item.user.toString() === userIdStr
+    );
+    
+    if (!alreadyCompleted) {
+      task.completedBy.push({
+        user: req.user.userId,
+        completedAt: new Date()
+      });
+    }
+
+    task.status = 'completed';
+    
+    // 标记 pollData 为已修改
+    task.markModified('pollData');
+    await task.save();
+
+    console.log('投票成功:', {
+      taskId: task._id,
+      totalVotes: task.pollData.totalVotes
+    });
+
+    // 重新查询以填充用户信息
+    const updatedTask = await Task.findById(task._id)
+      .populate('creator', 'username avatar')
+      .populate('assignedTo', 'username avatar')
+      .populate('completedBy.user', 'username avatar')
+      .populate('group', 'name');
+
+    res.json({ 
+      success: true,
+      message: '投票成功', 
+      task: updatedTask 
+    });
+  } catch (error) {
+    console.error('投票失败:', error);
+    res.status(500).json({ 
+      success: false,
+      message: '投票失败', 
+      error: error.message 
+    });
+  }
+});
+
+export default router;
+
+