Update server.js

server.js

@@ -37,7 +37,8 @@ const InMemoryDB = {
 
 const connectDB = async () => {
   try {
-    await mongoose.connect(MONGO_URI, { serverSelectionTimeoutMS: 5000 });
+    // Increased timeout to 30s to prevent premature fallback
+    await mongoose.connect(MONGO_URI, { serverSelectionTimeoutMS: 30000 });
     console.log('✅ MongoDB 连接成功 (Real Data)');
   } catch (err) {
     console.error('❌ MongoDB 连接失败:', err.message);
@@ -53,7 +54,6 @@ const connectDB = async () => {
 connectDB();
 
 // ... All Schema Definitions ...
-// (Retain existing Schemas: School, User, Student, Course, Score, Class, Subject, Exam, Schedule, Config, Notification)
 const SchoolSchema = new mongoose.Schema({ name: String, code: String });
 const School = mongoose.model('School', SchoolSchema);
 const UserSchema = new mongoose.Schema({ username: String, password: String, trueName: String, phone: String, email: String, schoolId: String, role: String, status: String, avatar: String, createTime: Date, teachingSubject: String, homeroomClass: String, studentNo: String, parentName: String, parentPhone: String, address: String, gender: String });
@@ -85,17 +85,23 @@ const StudentRewardModel = mongoose.model('StudentReward', StudentRewardSchema);
 const LuckyDrawConfigSchema = new mongoose.Schema({ schoolId: String, prizes: [{ id: String, name: String, probability: Number, count: Number, icon: String }], dailyLimit: Number, cardCount: Number, defaultPrize: String });
 const LuckyDrawConfigModel = mongoose.model('LuckyDrawConfig', LuckyDrawConfigSchema);
 
-// ... Helpers (notify, syncTeacher, syncStudent, initData, getQueryFilter, injectSchoolId) ...
-const getQueryFilter = (req) => { const s = req.headers['x-school-id']; return s ? {schoolId:s} : {}; };
+// ... Helpers ...
+// IMPORTANT FIX: Allow fetching legacy data that doesn't have a schoolId yet
+const getQueryFilter = (req) => { 
+  const s = req.headers['x-school-id']; 
+  if (!s) return {};
+  // Return records that match schoolId OR have no schoolId (legacy data)
+  return { 
+    $or: [
+      { schoolId: s },
+      { schoolId: { $exists: false } },
+      { schoolId: null }
+    ]
+  }; 
+};
 const injectSchoolId = (req, b) => ({ ...b, schoolId: req.headers['x-school-id'] });
 
-// ... Routes (retain all existing routes except Lucky Draw override below) ...
-// (I will omit re-declaring all previous routes to keep response concise, ONLY replacing modified ones)
-
-// --- ALL EXISTING ROUTES HERE ---
-// (Assume standard CRUD routes exist)
-
-// REPLACING/ADDING Game Routes
+// ... Routes ...
 
 app.get('/api/games/lucky-config', async (req, res) => {
    const filter = getQueryFilter(req);
@@ -105,25 +111,29 @@ app.get('/api/games/lucky-config', async (req, res) => {
 app.post('/api/games/lucky-config', async (req, res) => {
    const data = injectSchoolId(req, req.body);
    if (InMemoryDB.isFallback) { InMemoryDB.luckyConfig = data; return res.json({}); }
+   // Use updateOne with upsert to handle legacy data without schoolId more gracefully if needed, 
+   // but findOneAndUpdate is fine. We force schoolId on save.
    await LuckyDrawConfigModel.findOneAndUpdate({ schoolId: data.schoolId }, data, { upsert: true });
    res.json({ success: true });
 });
 
-// Secure Lucky Draw Endpoint (Modified for Teacher Proxy)
+// Secure Lucky Draw Endpoint
 app.post('/api/games/lucky-draw', async (req, res) => {
-   const { studentId } = req.body; // Passed from frontend (Teacher selects student, or Student uses self)
+   const { studentId } = req.body; 
    const schoolId = req.headers['x-school-id'];
    
    try {
       if (InMemoryDB.isFallback) return res.json({ prize: '模拟奖品' });
 
-      // 1. Get Student & Check Attempts
+      // 1. Get Student
       const student = await Student.findById(studentId);
       if (!student) return res.status(404).json({ error: 'Student not found' });
       if (student.drawAttempts <= 0) return res.status(403).json({ error: '次数不足' });
 
       // 2. Get Config
-      const config = await LuckyDrawConfigModel.findOne({ schoolId });
+      // Use permissive filter for reading config
+      const filter = schoolId ? { $or: [{ schoolId }, { schoolId: { $exists: false } }] } : {};
+      const config = await LuckyDrawConfigModel.findOne(filter);
       const prizes = config?.prizes || [];
       const defaultPrize = config?.defaultPrize || '再接再厉';
 
@@ -149,11 +159,16 @@ app.post('/api/games/lucky-draw', async (req, res) => {
 
       if (matchedPrize) {
          selectedPrize = matchedPrize.name;
+         // Only decrease count if it's not infinite (undefined)
          if (matchedPrize.count !== undefined && matchedPrize.count > 0) {
-            await LuckyDrawConfigModel.updateOne(
-               { schoolId, "prizes.id": matchedPrize.id },
-               { $inc: { "prizes.$.count": -1 } }
-            );
+            // Need to update the specific array element. 
+            // If config has no ID, we might have trouble updating. Assuming config has _id.
+            if (config._id) {
+                await LuckyDrawConfigModel.updateOne(
+                    { _id: config._id, "prizes.id": matchedPrize.id },
+                    { $inc: { "prizes.$.count": -1 } }
+                );
+            }
          }
       }
 
@@ -161,8 +176,6 @@ app.post('/api/games/lucky-draw', async (req, res) => {
       await Student.findByIdAndUpdate(studentId, { $inc: { drawAttempts: -1 } });
 
       // 6. Record Reward
-      // Important: If it's a DRAW_COUNT reward (rare in direct draw, usually Item), handle it.
-      // But usually Draw yields Items. Assuming Items here.
       await StudentRewardModel.create({
          schoolId,
          studentId,
@@ -181,26 +194,25 @@ app.post('/api/games/lucky-draw', async (req, res) => {
    }
 });
 
-app.get('*', (req, res) => {
-  res.sendFile(path.join(__dirname, 'dist', 'index.html'));
-});
-
-// Start Server
-// (If standard routes are missing in this block, assume they are part of the original file context provided by user)
-// Since I must output full file content if updating, I will include a placeholder comment for standard routes or rely on the fact that I am rewriting the file.
-// I will output the FULL server.js content to ensure consistency.
-
-// ... (Re-inserting all standard routes for completeness) ...
+// Standard Routes with permissive filter
 app.get('/api/notifications', async (req, res) => {
   const schoolId = req.headers['x-school-id'];
   const { role, userId } = req.query; 
   if (InMemoryDB.isFallback) return res.json(InMemoryDB.notifications);
-  const query = { schoolId, $or: [ { targetRole: null, targetUserId: null }, { targetRole: role }, { targetUserId: userId } ] };
+  // Relaxed query
+  const query = { 
+      $and: [
+          getQueryFilter(req),
+          { $or: [ { targetRole: null, targetUserId: null }, { targetRole: role }, { targetUserId: userId } ] }
+      ]
+  };
   res.json(await NotificationModel.find(query).sort({ createTime: -1 }).limit(20));
 });
+
 app.get('/api/public/schools', async (req, res) => { res.json(await School.find({}, 'name code _id')); });
 app.get('/api/public/config', async (req, res) => { res.json(await ConfigModel.findOne({ key: 'main' }) || { allowRegister: true }); });
 app.get('/api/public/meta', async (req, res) => { res.json({ classes: await ClassModel.find({ schoolId: req.query.schoolId }), subjects: await SubjectModel.find({ schoolId: req.query.schoolId }) }); });
+
 app.post('/api/auth/login', async (req, res) => {
   const { username, password } = req.body;
   const user = await User.findOne({ username, password });
@@ -211,16 +223,20 @@ app.post('/api/auth/login', async (req, res) => {
 app.post('/api/auth/register', async (req, res) => {
   try { await User.create({...req.body, status: 'pending'}); res.json({}); } catch(e) { res.status(500).json({}); }
 });
+
 app.get('/api/schools', async (req, res) => { res.json(await School.find()); });
 app.post('/api/schools', async (req, res) => { res.json(await School.create(req.body)); });
 app.put('/api/schools/:id', async (req, res) => { await School.findByIdAndUpdate(req.params.id, req.body); res.json({}); });
+
 app.get('/api/users', async (req, res) => { res.json(await User.find(getQueryFilter(req))); });
 app.put('/api/users/:id', async (req, res) => { await User.findByIdAndUpdate(req.params.id, req.body); res.json({}); });
 app.delete('/api/users/:id', async (req, res) => { await User.findByIdAndDelete(req.params.id); res.json({}); });
+
 app.get('/api/students', async (req, res) => { res.json(await Student.find(getQueryFilter(req))); });
 app.post('/api/students', async (req, res) => { await Student.findOneAndUpdate({ studentNo: req.body.studentNo }, injectSchoolId(req, req.body), {upsert:true}); res.json({}); });
 app.put('/api/students/:id', async (req, res) => { await Student.findByIdAndUpdate(req.params.id, req.body); res.json({}); });
 app.delete('/api/students/:id', async (req, res) => { await Student.findByIdAndDelete(req.params.id); res.json({}); });
+
 app.get('/api/classes', async (req, res) => { 
     const cls = await ClassModel.find(getQueryFilter(req)); 
     const resData = await Promise.all(cls.map(async c => ({...c.toObject(), studentCount: await Student.countDocuments({className:c.grade+c.className})})));
@@ -228,36 +244,67 @@ app.get('/api/classes', async (req, res) => {
 });
 app.post('/api/classes', async (req, res) => { await ClassModel.create(injectSchoolId(req, req.body)); res.json({}); });
 app.delete('/api/classes/:id', async (req, res) => { await ClassModel.findByIdAndDelete(req.params.id); res.json({}); });
+
 app.get('/api/subjects', async (req, res) => { res.json(await SubjectModel.find(getQueryFilter(req))); });
 app.post('/api/subjects', async (req, res) => { await SubjectModel.create(injectSchoolId(req, req.body)); res.json({}); });
 app.put('/api/subjects/:id', async (req, res) => { await SubjectModel.findByIdAndUpdate(req.params.id, req.body); res.json({}); });
 app.delete('/api/subjects/:id', async (req, res) => { await SubjectModel.findByIdAndDelete(req.params.id); res.json({}); });
+
 app.get('/api/courses', async (req, res) => { res.json(await Course.find(getQueryFilter(req))); });
 app.post('/api/courses', async (req, res) => { await Course.create(injectSchoolId(req, req.body)); res.json({}); });
 app.put('/api/courses/:id', async (req, res) => { await Course.findByIdAndUpdate(req.params.id, req.body); res.json({}); });
 app.delete('/api/courses/:id', async (req, res) => { await Course.findByIdAndDelete(req.params.id); res.json({}); });
+
 app.get('/api/scores', async (req, res) => { res.json(await Score.find(getQueryFilter(req))); });
 app.post('/api/scores', async (req, res) => { await Score.create(injectSchoolId(req, req.body)); res.json({}); });
 app.put('/api/scores/:id', async (req, res) => { await Score.findByIdAndUpdate(req.params.id, req.body); res.json({}); });
 app.delete('/api/scores/:id', async (req, res) => { await Score.findByIdAndDelete(req.params.id); res.json({}); });
+
 app.get('/api/exams', async (req, res) => { res.json(await ExamModel.find(getQueryFilter(req))); });
 app.post('/api/exams', async (req, res) => { await ExamModel.findOneAndUpdate({name:req.body.name}, injectSchoolId(req, req.body), {upsert:true}); res.json({}); });
+
 app.get('/api/schedules', async (req, res) => { res.json(await ScheduleModel.find({...getQueryFilter(req), ...req.query})); });
-app.post('/api/schedules', async (req, res) => { await ScheduleModel.findOneAndUpdate({schoolId:req.headers['x-school-id'], className:req.body.className, dayOfWeek:req.body.dayOfWeek, period:req.body.period}, injectSchoolId(req, req.body), {upsert:true}); res.json({}); });
+app.post('/api/schedules', async (req, res) => { 
+    // For upsert, we need to include schoolId in the query to avoid overwriting other schools' schedules
+    const filter = { className:req.body.className, dayOfWeek:req.body.dayOfWeek, period:req.body.period };
+    const sId = req.headers['x-school-id'];
+    if(sId) filter.schoolId = sId;
+    
+    await ScheduleModel.findOneAndUpdate(filter, injectSchoolId(req, req.body), {upsert:true}); 
+    res.json({}); 
+});
 app.delete('/api/schedules', async (req, res) => { await ScheduleModel.deleteOne({...getQueryFilter(req), ...req.query}); res.json({}); });
+
 app.get('/api/stats', async (req, res) => { res.json({studentCount: await Student.countDocuments(getQueryFilter(req))}); });
+
 app.get('/api/config', async (req, res) => { res.json(await ConfigModel.findOne({key:'main'})); });
 app.post('/api/config', async (req, res) => { await ConfigModel.findOneAndUpdate({key:'main'}, req.body, {upsert:true}); res.json({}); });
 
 // Additional Game Routes
 app.get('/api/games/mountain', async (req, res) => { res.json(await GameSessionModel.findOne({...getQueryFilter(req), className: req.query.className})); });
-app.post('/api/games/mountain', async (req, res) => { await GameSessionModel.findOneAndUpdate({schoolId:req.headers['x-school-id'], className:req.body.className}, injectSchoolId(req, req.body), {upsert:true}); res.json({}); });
+app.post('/api/games/mountain', async (req, res) => { 
+    const filter = { className: req.body.className };
+    const sId = req.headers['x-school-id'];
+    if(sId) filter.schoolId = sId;
+    await GameSessionModel.findOneAndUpdate(filter, injectSchoolId(req, req.body), {upsert:true}); 
+    res.json({}); 
+});
+
 app.post('/api/games/grant-draw', async (req, res) => { 
     const { studentId, count } = req.body;
     await Student.findByIdAndUpdate(studentId, { $inc: { drawAttempts: count } });
-    await StudentRewardModel.create({ schoolId: req.headers['x-school-id'], studentId, studentName: (await Student.findById(studentId)).name, rewardType: 'DRAW_COUNT', name: '抽奖券', status: 'REDEEMED', source: '教师发放' });
+    await StudentRewardModel.create({ 
+        schoolId: req.headers['x-school-id'], 
+        studentId, 
+        studentName: (await Student.findById(studentId)).name, 
+        rewardType: 'DRAW_COUNT', 
+        name: '抽奖券', 
+        status: 'REDEEMED', 
+        source: '教师发放' 
+    });
     res.json({}); 
 });
+
 app.get('/api/rewards', async (req, res) => { 
     const filter = getQueryFilter(req);
     if(req.query.studentId) filter.studentId = req.query.studentId;
@@ -265,15 +312,23 @@ app.get('/api/rewards', async (req, res) => {
 });
 app.post('/api/rewards', async (req, res) => { 
     const data = injectSchoolId(req, req.body);
-    if(data.rewardType==='DRAW_COUNT') { data.status='REDEEMED'; await Student.findByIdAndUpdate(data.studentId, {$inc:{drawAttempts:1}}); }
+    if(data.rewardType==='DRAW_COUNT') { 
+        data.status='REDEEMED'; 
+        await Student.findByIdAndUpdate(data.studentId, {$inc:{drawAttempts:1}}); 
+    }
     await StudentRewardModel.create(data); 
     res.json({}); 
 });
 app.post('/api/rewards/:id/redeem', async (req, res) => { await StudentRewardModel.findByIdAndUpdate(req.params.id, {status:'REDEEMED'}); res.json({}); });
+
 app.post('/api/batch-delete', async (req, res) => { 
     if(req.body.type==='student') await Student.deleteMany({_id:{$in:req.body.ids}});
     if(req.body.type==='score') await Score.deleteMany({_id:{$in:req.body.ids}});
     res.json({}); 
 });
 
+app.get('*', (req, res) => {
+  res.sendFile(path.join(__dirname, 'dist', 'index.html'));
+});
+
 app.listen(PORT, () => console.log(`🚀 Server running on port ${PORT}`));