web/task-svr
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

优化代码

Browse Source
This commit is contained in:
CounterFire2023 2023-12-21 19:28:37 +08:00
parent bb3e8dabe8
commit a61247d344
1 changed files with 8 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/controllers/tasks.controller.ts
View File

@ -2,7 +2,7 @@ import { ZError } from "common/ZError";
import BaseController, { ROLE_ANON } from "common/base.controller"; import BaseController, { ROLE_ANON } from "common/base.controller";
import { role, router } from "decorators/router"; import { role, router } from "decorators/router";
import { all } from "deepmerge"; import { all } from "deepmerge";
import { ActivityInfo } from "models/ActivityInfo"; import { ActivityInfo, TaskCfg } from "models/ActivityInfo";
import { ActivityUser, TaskStatus, TaskStatusEnum } from "models/ActivityUser"; import { ActivityUser, TaskStatus, TaskStatusEnum } from "models/ActivityUser";
import { join } from 'path' import { join } from 'path'
const fs = require('fs') const fs = require('fs')
@ -66,7 +66,8 @@ const parseCurrentTask = (user: typeof ActivityUser, task: string) => {
const parseNextTask = async ( const parseNextTask = async (
user: typeof ActivityUser, user: typeof ActivityUser,
activity: typeof ActivityInfo, activity: typeof ActivityInfo,
task: string) => { task: string
) => {
let nextTask = findNextTask(user, task); let nextTask = findNextTask(user, task);
if (!nextTask) { if (!nextTask) {
return true return true
@ -95,18 +96,12 @@ export default class TasksController extends BaseController {
await user.save(); await user.save();
} }
let visibleTasks = new Set(); let visibleTasks = new Set();
for (let task of activity.tasks) { activity.tasks.forEach((t:TaskCfg) => {
if (task.show) { if (t.show) {
visibleTasks.add(task.id) visibleTasks.add(t.id)
} }
} })
let taskProgress = []; return user.taskProgress.filter((t: TaskStatus) => visibleTasks.has(t.id));
for (let task of user.taskProgress) {
if (visibleTasks.has(task.id)) {
taskProgress.push(task)
}
}
return taskProgress
} }