diff --git a/DATA_COLLECTION.md b/DATA_COLLECTION.md new file mode 100644 index 00000000..5f13bd5e --- /dev/null +++ b/DATA_COLLECTION.md @@ -0,0 +1,22 @@ +# Important Disclosure re：XIAOJUSURVEY Data Collection + +XIAOJUSURVEY is open-source software developed and maintained by XIAOJUSURVEY Team and available at https://github.com/didi/xiaoju-survey. +We hereby state the purpose and reason for collecting data. + +## Purpose of data collection + +Data collected is used to help improve XIAOJUSURVEY for all users. It is important that our team understands the usage patterns as soon as possible, so we can best decide how to design future features and prioritize current work. + +## Types of data collected + +XIAOJUSURVEY just collects data about version's information. The data collected is subsequently reported to the XIAOJUSURVEY's backend services. + +All data collected will be used exclusively by the XIAOJUSURVEY team for analytical purposes only. The data will be neither accessible nor sold to any third party. + +## Sensitive data + +XIAOJUSURVEY will never collect and/or report sensitive information, such as private keys, API keys, or passwords. + +## How do I opt-in to or opt-out of data sharing? + +See [docs](https://xiaojusurvey.didi.cn/docs/next/community/%E6%95%B0%E6%8D%AE%E4%B8%8A%E6%8A%A5%E5%A3%B0%E6%98%8E) for information on configuring this functionality. diff --git a/README.md b/README.md index d475636b..d1b9f615 100644 --- a/README.md +++ b/README.md @@ -222,4 +222,4 @@ npm run serve ## CHANGELOG -关注重大变更：[MAJOR CHANGELOG](https://github.com/didi/xiaoju-survey/issues/48) +关注重大项目变更：[MAJOR CHANGELOG](https://github.com/didi/xiaoju-survey/issues/48)。 diff --git a/docker-compose.yaml b/docker-compose.yaml index 33e37dbf..6f5666b7 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -15,7 +15,7 @@ services: - xiaoju-survey xiaoju-survey: - image: "xiaojusurvey/xiaoju-survey:1.1.6-slim" # 最新版本：https://hub.docker.com/r/xiaojusurvey/xiaoju-survey/tags + image: "xiaojusurvey/xiaoju-survey:1.2.0-slim" # 最新版本：https://hub.docker.com/r/xiaojusurvey/xiaoju-survey/tags container_name: xiaoju-survey restart: always ports: diff --git a/server/.env b/server/.env index f534d4ca..ae1549d8 100644 --- a/server/.env +++ b/server/.env @@ -1,5 +1,5 @@ XIAOJU_SURVEY_MONGO_DB_NAME=xiaojuSurvey -XIAOJU_SURVEY_MONGO_URL=mongodb://127.0.0.1:27017 +XIAOJU_SURVEY_MONGO_URL= XIAOJU_SURVEY_MONGO_AUTH_SOURCE=admin XIAOJU_SURVEY_REDIS_HOST= diff --git a/server/.env.development b/server/.env.development index e69de29b..d5d1d565 100644 --- a/server/.env.development +++ b/server/.env.development @@ -0,0 +1,20 @@ +XIAOJU_SURVEY_MONGO_DB_NAME=xiaojuSurvey +XIAOJU_SURVEY_MONGO_URL=mongodb://127.0.0.1:27017 +XIAOJU_SURVEY_MONGO_AUTH_SOURCE=admin + +XIAOJU_SURVEY_REDIS_HOST= +XIAOJU_SURVEY_REDIS_PORT= +XIAOJU_SURVEY_REDIS_USERNAME= +XIAOJU_SURVEY_REDIS_PASSWORD= +XIAOJU_SURVEY_REDIS_DB= + + +XIAOJU_SURVEY_RESPONSE_AES_ENCRYPT_SECRET_KEY=dataAesEncryptSecretKey +XIAOJU_SURVEY_HTTP_DATA_ENCRYPT_TYPE=rsa + +XIAOJU_SURVEY_JWT_SECRET=xiaojuSurveyJwtSecret +XIAOJU_SURVEY_JWT_EXPIRES_IN=8h + +XIAOJU_SURVEY_LOGGER_FILENAME=./logs/app.log + +XIAOJU_SURVEY_REPORT=true diff --git a/server/package.json b/server/package.json index 5222380a..57b81d0f 100644 --- a/server/package.json +++ b/server/package.json @@ -1,7 +1,7 @@ { - "name": "server", - "version": "0.0.1", - "description": "", + "name": "xiaoju-survey-server", + "version": "1.3.0", + "description": "XIAOJUSURVEY的server端", "author": "", "scripts": { "build": "nest build", @@ -22,6 +22,7 @@ "@nestjs/common": "^10.0.0", "@nestjs/config": "^3.1.1", "@nestjs/core": "^10.0.0", + "@nestjs/microservices": "^10.4.4", "@nestjs/platform-express": "^10.0.0", "@nestjs/serve-static": "^4.0.0", "@nestjs/swagger": "^7.3.0", @@ -75,7 +76,7 @@ "prettier": "^3.0.0", "redis-memory-server": "^0.11.0", "source-map-support": "^0.5.21", - "supertest": "^6.3.3", + "supertest": "^7.0.0", "ts-jest": "^29.1.0", "ts-loader": "^9.4.3", "ts-node": "^10.9.1", @@ -94,7 +95,9 @@ "^.+\\.(t|j)s$": "ts-jest" }, "collectCoverageFrom": [ - "**/*.(t|j)s" + "**/*.(t|j)s", + "!**/*.module.ts", + "!**/upgrade.*.ts" ], "coverageDirectory": "../coverage", "testEnvironment": "node", diff --git a/server/scripts/run-report.ts b/server/scripts/run-report.ts new file mode 100644 index 00000000..f26306e5 --- /dev/null +++ b/server/scripts/run-report.ts @@ -0,0 +1,62 @@ +import fs, { promises as fsa } from 'fs-extra'; +import path from 'path'; +import fetch from 'node-fetch'; + +interface PackageJson { + type?: string; + name?: string; + version?: string; + description?: string; + id?: string; + msg?: string; +} + +const getId = () => { + const id = new Date().getTime().toString(); + process.env.XIAOJU_SURVEY_REPORT_ID = id; + + return id; +}; + +const readData = async (directory: string): Promise => { + const packageJsonPath = path.join(directory, 'package.json'); + const id = process.env.XIAOJU_SURVEY_REPORT_ID || getId(); + try { + if (!fs.existsSync(directory)) { + return { + type: 'server', + name: '', + version: '', + description: '', + id, + msg: '文件不存在', + }; + } + const data = await fsa.readFile(packageJsonPath, 'utf8').catch((e) => e); + const { name, version, description } = JSON.parse(data) as PackageJson; + return { type: 'server', name, version, description, id }; + } catch (error) { + return error; + } +}; + +(async (): Promise => { + if ( + process.env.NODE_ENV === 'development' && + !process.env.XIAOJU_SURVEY_REPORT + ) { + return; + } + + const res = await readData(path.join(process.cwd())); + + // 上报 + fetch('https://xiaojusurveysrc.didi.cn/reportSourceData', { + method: 'POST', + headers: { + Accept: 'application/json, */*', + 'Content-Type': 'application/json', + }, + body: JSON.stringify(res), + }).catch(() => {}); +})(); diff --git a/server/src/app.module.ts b/server/src/app.module.ts index d9ea22e3..100eabed 100644 --- a/server/src/app.module.ts +++ b/server/src/app.module.ts @@ -14,6 +14,7 @@ import { AuthModule } from './modules/auth/auth.module'; import { MessageModule } from './modules/message/message.module'; import { FileModule } from './modules/file/file.module'; import { WorkspaceModule } from './modules/workspace/workspace.module'; +import { UpgradeModule } from './modules/upgrade/upgrade.module'; import { join } from 'path'; @@ -35,18 +36,21 @@ import { MessagePushingLog } from './models/messagePushingLog.entity'; import { WorkspaceMember } from './models/workspaceMember.entity'; import { Workspace } from './models/workspace.entity'; import { Collaborator } from './models/collaborator.entity'; +import { DownloadTask } from './models/downloadTask.entity'; +import { Session } from './models/session.entity'; import { LoggerProvider } from './logger/logger.provider'; import { PluginManagerProvider } from './securityPlugin/pluginManager.provider'; import { LogRequestMiddleware } from './middlewares/logRequest.middleware'; import { PluginManager } from './securityPlugin/pluginManager'; import { Logger } from './logger'; -import { DownloadTask } from './models/downloadTask.entity'; -import { Session } from './models/session.entity'; @Module({ imports: [ - ConfigModule.forRoot({}), + ConfigModule.forRoot({ + envFilePath: `.env.${process.env.NODE_ENV}`, // 根据 NODE_ENV 动态加载对应的 .env 文件 + isGlobal: true, // 使配置模块在应用的任何地方可用 + }), TypeOrmModule.forRootAsync({ imports: [ConfigModule], inject: [ConfigService], @@ -104,6 +108,7 @@ import { Session } from './models/session.entity'; MessageModule, FileModule, WorkspaceModule, + UpgradeModule, ], controllers: [AppController], providers: [ diff --git a/server/src/enums/downloadTaskStatus.ts b/server/src/enums/downloadTaskStatus.ts new file mode 100644 index 00000000..1ea35832 --- /dev/null +++ b/server/src/enums/downloadTaskStatus.ts @@ -0,0 +1,6 @@ +export enum DOWNLOAD_TASK_STATUS { + WAITING = 'waiting', // 排队中 + COMPUTING = 'computing', // 计算中 + SUCCEED = 'succeed', // 导出成功 + FAILED = 'failed', // 导出失败 +} diff --git a/server/src/enums/exceptionCode.ts b/server/src/enums/exceptionCode.ts index 8ead165e..e2285e93 100644 --- a/server/src/enums/exceptionCode.ts +++ b/server/src/enums/exceptionCode.ts @@ -21,6 +21,7 @@ export enum EXCEPTION_CODE { RESPONSE_OVER_LIMIT = 9003, // 超出限制 RESPONSE_SCHEMA_REMOVED = 9004, // 问卷已删除 RESPONSE_DATA_DECRYPT_ERROR = 9005, // 问卷已删除 + RESPONSE_PAUSING = 9006, // 问卷已暂停 UPLOAD_FILE_ERROR = 5001, // 上传文件错误 } diff --git a/server/src/enums/index.ts b/server/src/enums/index.ts index 5dc930dc..06d4b0ba 100644 --- a/server/src/enums/index.ts +++ b/server/src/enums/index.ts @@ -1,14 +1,15 @@ // 状态类型 export enum RECORD_STATUS { - NEW = 'new', // 新建 - EDITING = 'editing', // 编辑 - PAUSING = 'pausing', // 暂停 + NEW = 'new', // 新建 | 未发布 PUBLISHED = 'published', // 发布 - REMOVED = 'removed', // 删除 - FORCE_REMOVED = 'forceRemoved', // 从回收站删除 - COMPUTING = 'computing', // 计算中 - FINISHED = 'finished', // 已完成 - ERROR = 'error', // 错误 + EDITING = 'editing', // 编辑 + FINISHED = 'finished', // 已结束 + REMOVED = 'removed', +} + +export const enum RECORD_SUB_STATUS { + DEFAULT = '', // 默认 + PAUSING = 'pausing', // 暂停 } // 历史类型 diff --git a/server/src/enums/surveySessionStatus.ts b/server/src/enums/surveySessionStatus.ts new file mode 100644 index 00000000..8f644be1 --- /dev/null +++ b/server/src/enums/surveySessionStatus.ts @@ -0,0 +1,4 @@ +export enum SESSION_STATUS { + ACTIVATED = 'activated', + DEACTIVATED = 'deactivated', +} diff --git a/server/src/guards/session.guard.ts b/server/src/guards/session.guard.ts index 4a4a51f5..9de14393 100644 --- a/server/src/guards/session.guard.ts +++ b/server/src/guards/session.guard.ts @@ -24,6 +24,7 @@ export class SessionGuard implements CanActivate { } const sessionInfo = await this.sessionService.findOne(sessionId); request.sessionInfo = sessionInfo; + request.surveyId = sessionInfo.surveyId; return true; } } diff --git a/server/src/interfaces/survey.ts b/server/src/interfaces/survey.ts index 34f1659f..c5834544 100644 --- a/server/src/interfaces/survey.ts +++ b/server/src/interfaces/survey.ts @@ -112,7 +112,7 @@ export enum MemberType { } export interface BaseConf { - begTime: string; + beginTime: string; endTime: string; answerBegTime: string; answerEndTime: string; diff --git a/server/src/logger/index.ts b/server/src/logger/index.ts index f6fd8b17..c1fab057 100644 --- a/server/src/logger/index.ts +++ b/server/src/logger/index.ts @@ -1,12 +1,15 @@ import * as log4js from 'log4js'; import moment from 'moment'; -import { Injectable, Scope } from '@nestjs/common'; +import { Injectable, Scope, Inject } from '@nestjs/common'; +import { CONTEXT, RequestContext } from '@nestjs/microservices'; + const log4jsLogger = log4js.getLogger(); @Injectable({ scope: Scope.REQUEST }) export class Logger { private static inited = false; - private traceId: string; + + constructor(@Inject(CONTEXT) private readonly ctx: RequestContext) {} static init(config: { filename: string }) { if (Logger.inited) { @@ -37,16 +40,14 @@ export class Logger { const datetime = moment().format('YYYY-MM-DD HH:mm:ss.SSS'); const level = options?.level; const dltag = options?.dltag ? `${options.dltag}||` : ''; - const traceIdStr = this.traceId ? `traceid=${this.traceId}||` : ''; + const traceIdStr = this.ctx?.['traceId'] + ? `traceid=${this.ctx?.['traceId']}||` + : ''; return log4jsLogger[level]( `[${datetime}][${level.toUpperCase()}]${dltag}${traceIdStr}${message}`, ); } - setTraceId(traceId: string) { - this.traceId = traceId; - } - info(message, options?: { dltag?: string }) { return this._log(message, { ...options, level: 'info' }); } diff --git a/server/src/logger/util.ts b/server/src/logger/util.ts index 4ffc3c1b..1f25d257 100644 --- a/server/src/logger/util.ts +++ b/server/src/logger/util.ts @@ -20,7 +20,9 @@ export const genTraceId = ({ ip }) => { } else { ipArr = ip .split('.') - .map((item) => parseInt(item).toString(16).padStart(2, '0')); + .map((item) => + item ? parseInt(item).toString(16).padStart(2, '0') : '', + ); } return `${ipArr.join('')}${Date.now().toString()}${getCountStr()}${process.pid.toString().slice(-5)}`; diff --git a/server/src/main.ts b/server/src/main.ts index d764600e..95a0a907 100644 --- a/server/src/main.ts +++ b/server/src/main.ts @@ -1,6 +1,7 @@ import { NestFactory } from '@nestjs/core'; import { AppModule } from './app.module'; import { SwaggerModule, DocumentBuilder } from '@nestjs/swagger'; +import 'scripts/run-report'; async function bootstrap() { const PORT = process.env.PORT || 3000; diff --git a/server/src/middlewares/logRequest.middleware.ts b/server/src/middlewares/logRequest.middleware.ts index 20d4b676..752ab9be 100644 --- a/server/src/middlewares/logRequest.middleware.ts +++ b/server/src/middlewares/logRequest.middleware.ts @@ -12,7 +12,7 @@ export class LogRequestMiddleware implements NestMiddleware { const userAgent = req.get('user-agent') || ''; const startTime = Date.now(); const traceId = genTraceId({ ip }); - this.logger.setTraceId(traceId); + req['traceId'] = traceId; const query = JSON.stringify(req.query); const body = JSON.stringify(req.body); this.logger.info( diff --git a/server/src/models/__test/base.entity.spec.ts b/server/src/models/__test/base.entity.spec.ts deleted file mode 100644 index eb4c90c9..00000000 --- a/server/src/models/__test/base.entity.spec.ts +++ /dev/null @@ -1,30 +0,0 @@ -import { BaseEntity } from '../base.entity'; -import { RECORD_STATUS } from 'src/enums'; - -describe('BaseEntity', () => { - let baseEntity: BaseEntity; - - beforeEach(() => { - baseEntity = new BaseEntity(); - }); - - it('should initialize default info before insert', () => { - const now = Date.now(); - baseEntity.initDefaultInfo(); - - expect(baseEntity.curStatus.status).toBe(RECORD_STATUS.NEW); - expect(baseEntity.curStatus.date).toBeCloseTo(now, -3); - expect(baseEntity.statusList).toHaveLength(1); - expect(baseEntity.statusList[0].status).toBe(RECORD_STATUS.NEW); - expect(baseEntity.statusList[0].date).toBeCloseTo(now, -3); - expect(baseEntity.createDate).toBeCloseTo(now, -3); - expect(baseEntity.updateDate).toBeCloseTo(now, -3); - }); - - it('should update updateDate before update', () => { - const now = Date.now(); - baseEntity.onUpdate(); - - expect(baseEntity.updateDate).toBeCloseTo(now, -3); - }); -}); diff --git a/server/src/models/__test/surveyMeta.entity.spec.ts b/server/src/models/__test/surveyMeta.entity.spec.ts new file mode 100644 index 00000000..d927ad7f --- /dev/null +++ b/server/src/models/__test/surveyMeta.entity.spec.ts @@ -0,0 +1,57 @@ +import { SurveyMeta } from '../surveyMeta.entity'; +import { RECORD_STATUS, RECORD_SUB_STATUS } from 'src/enums'; + +// 模拟日期 +const mockDateNow = Date.now(); + +describe('SurveyMeta Entity', () => { + let surveyMeta: SurveyMeta; + + // 在每个测试之前，初始化 SurveyMeta 实例 + beforeEach(() => { + surveyMeta = new SurveyMeta(); + // 模拟 Date.now() 返回固定的时间 + jest.spyOn(Date, 'now').mockReturnValue(mockDateNow); + }); + + afterEach(() => { + jest.restoreAllMocks(); // 每次测试后还原所有 mock + }); + + it('should set default curStatus and subStatus on insert when they are not provided', () => { + surveyMeta.initDefaultInfo(); + + // 验证 curStatus 是否被初始化为默认值 + expect(surveyMeta.curStatus).toEqual({ + status: RECORD_STATUS.NEW, + date: mockDateNow, + }); + + // 验证 statusList 是否包含 curStatus + expect(surveyMeta.statusList).toEqual([ + { + status: RECORD_STATUS.NEW, + date: mockDateNow, + }, + ]); + + // 验证 subStatus 是否被初始化为默认值 + expect(surveyMeta.subStatus).toEqual({ + status: RECORD_SUB_STATUS.DEFAULT, + date: mockDateNow, + }); + }); + + it('should initialize statusList if curStatus is provided but statusList is empty', () => { + surveyMeta.curStatus = null; + + surveyMeta.initDefaultInfo(); + + expect(surveyMeta.statusList).toEqual([ + { + status: RECORD_STATUS.NEW, + date: expect.any(Number), + }, + ]); + }); +}); diff --git a/server/src/models/base.entity.ts b/server/src/models/base.entity.ts index 6f30e043..43216835 100644 --- a/server/src/models/base.entity.ts +++ b/server/src/models/base.entity.ts @@ -1,43 +1,13 @@ -import { Column, ObjectIdColumn, BeforeInsert, BeforeUpdate } from 'typeorm'; +import { ObjectIdColumn, CreateDateColumn, UpdateDateColumn } from 'typeorm'; import { ObjectId } from 'mongodb'; -import { RECORD_STATUS } from '../enums'; export class BaseEntity { @ObjectIdColumn() _id: ObjectId; - @Column() - curStatus: { - status: RECORD_STATUS; - date: number; - }; + @CreateDateColumn({ type: 'timestamp', precision: 3 }) + createdAt: Date; - @Column() - statusList: Array<{ - status: RECORD_STATUS; - date: number; - }>; - - @Column() - createDate: number; - - @Column() - updateDate: number; - - @BeforeInsert() - initDefaultInfo() { - const now = Date.now(); - if (!this.curStatus) { - const curStatus = { status: RECORD_STATUS.NEW, date: now }; - this.curStatus = curStatus; - this.statusList = [curStatus]; - } - this.createDate = now; - this.updateDate = now; - } - - @BeforeUpdate() - onUpdate() { - this.updateDate = Date.now(); - } + @UpdateDateColumn({ type: 'timestamp', precision: 3 }) + updatedAt: Date; } diff --git a/server/src/models/collaborator.entity.ts b/server/src/models/collaborator.entity.ts index 9e17f02b..2d4e35e0 100644 --- a/server/src/models/collaborator.entity.ts +++ b/server/src/models/collaborator.entity.ts @@ -11,4 +11,16 @@ export class Collaborator extends BaseEntity { @Column('jsonb') permissions: Array; + + @Column() + creator: string; + + @Column() + creatorId: string; + + @Column() + operator: string; + + @Column() + operatorId: string; } diff --git a/server/src/models/downloadTask.entity.ts b/server/src/models/downloadTask.entity.ts index a1e371bc..a65bcc12 100644 --- a/server/src/models/downloadTask.entity.ts +++ b/server/src/models/downloadTask.entity.ts @@ -1,5 +1,6 @@ import { Entity, Column } from 'typeorm'; import { BaseEntity } from './base.entity'; +import { DOWNLOAD_TASK_STATUS } from 'src/enums/downloadTaskStatus'; @Entity({ name: 'downloadTask' }) export class DownloadTask extends BaseEntity { @@ -35,4 +36,13 @@ export class DownloadTask extends BaseEntity { @Column() params: string; + + @Column() + isDeleted: boolean; + + @Column() + deletedAt: Date; + + @Column() + status: DOWNLOAD_TASK_STATUS; } diff --git a/server/src/models/messagePushingTask.entity.ts b/server/src/models/messagePushingTask.entity.ts index 90aad278..b23051e9 100644 --- a/server/src/models/messagePushingTask.entity.ts +++ b/server/src/models/messagePushingTask.entity.ts @@ -27,4 +27,16 @@ export class MessagePushingTask extends BaseEntity { @Column() ownerId: string; + + @Column() + isDeleted: boolean; + + @Column() + deletedAt: Date; + + @Column() + operator: string; + + @Column() + operatorId: string; } diff --git a/server/src/models/responseSchema.entity.ts b/server/src/models/responseSchema.entity.ts index 60ee6fe8..fd3cd8e4 100644 --- a/server/src/models/responseSchema.entity.ts +++ b/server/src/models/responseSchema.entity.ts @@ -1,6 +1,7 @@ import { Entity, Column } from 'typeorm'; import { SurveySchemaInterface } from '../interfaces/survey'; import { BaseEntity } from './base.entity'; +import { RECORD_STATUS, RECORD_SUB_STATUS } from '../enums'; @Entity({ name: 'surveyPublish' }) export class ResponseSchema extends BaseEntity { @@ -15,4 +16,19 @@ export class ResponseSchema extends BaseEntity { @Column() pageId: string; + + @Column() + curStatus: { + status: RECORD_STATUS; + date: number; + }; + + @Column() + subStatus: { + status: RECORD_SUB_STATUS; + date: number; + }; + + @Column() + isDeleted: boolean; } diff --git a/server/src/models/session.entity.ts b/server/src/models/session.entity.ts index bee82cc1..6f67e92b 100644 --- a/server/src/models/session.entity.ts +++ b/server/src/models/session.entity.ts @@ -1,6 +1,7 @@ import { Entity, Column, Index, ObjectIdColumn } from 'typeorm'; import { ObjectId } from 'mongodb'; import { BaseEntity } from './base.entity'; +import { SESSION_STATUS } from 'src/enums/surveySessionStatus'; @Entity({ name: 'session' }) export class Session extends BaseEntity { @@ -15,4 +16,7 @@ export class Session extends BaseEntity { @Column() userId: string; + + @Column() + status: SESSION_STATUS; } diff --git a/server/src/models/surveyHistory.entity.ts b/server/src/models/surveyHistory.entity.ts index 5d7650e4..4d573c4b 100644 --- a/server/src/models/surveyHistory.entity.ts +++ b/server/src/models/surveyHistory.entity.ts @@ -19,4 +19,7 @@ export class SurveyHistory extends BaseEntity { username: string; _id: string; }; + + @Column('string') + sessionId: string; } diff --git a/server/src/models/surveyMeta.entity.ts b/server/src/models/surveyMeta.entity.ts index b7543b9b..3e303470 100644 --- a/server/src/models/surveyMeta.entity.ts +++ b/server/src/models/surveyMeta.entity.ts @@ -1,5 +1,6 @@ -import { Entity, Column } from 'typeorm'; +import { Entity, Column, BeforeInsert } from 'typeorm'; import { BaseEntity } from './base.entity'; +import { RECORD_STATUS, RECORD_SUB_STATUS } from '../enums'; @Entity({ name: 'surveyMeta' }) export class SurveyMeta extends BaseEntity { @@ -18,6 +19,9 @@ export class SurveyMeta extends BaseEntity { @Column() creator: string; + @Column() + creatorId: string; + @Column() owner: string; @@ -32,4 +36,48 @@ export class SurveyMeta extends BaseEntity { @Column() workspaceId: string; + + @Column() + curStatus: { + status: RECORD_STATUS; + date: number; + }; + + @Column() + subStatus: { + status: RECORD_SUB_STATUS; + date: number; + }; + + @Column() + statusList: Array<{ + status: RECORD_STATUS | RECORD_SUB_STATUS; + date: number; + }>; + + @Column() + operator: string; + + @Column() + operatorId: string; + + @Column() + isDeleted: boolean; + + @Column() + deletedAt: Date; + + @BeforeInsert() + initDefaultInfo() { + const now = Date.now(); + if (!this.curStatus) { + const curStatus = { status: RECORD_STATUS.NEW, date: now }; + this.curStatus = curStatus; + this.statusList = [curStatus]; + } + if (!this.subStatus) { + const subStatus = { status: RECORD_SUB_STATUS.DEFAULT, date: now }; + this.subStatus = subStatus; + } + } } diff --git a/server/src/models/workspace.entity.ts b/server/src/models/workspace.entity.ts index a918d607..8afb38d0 100644 --- a/server/src/models/workspace.entity.ts +++ b/server/src/models/workspace.entity.ts @@ -3,12 +3,33 @@ import { BaseEntity } from './base.entity'; @Entity({ name: 'workspace' }) export class Workspace extends BaseEntity { + @Column() + creatorId: string; + + @Column() + creator: string; + @Column() ownerId: string; + @Column() + owner: string; + @Column() name: string; @Column() description: string; + + @Column() + operator: string; + + @Column() + operatorId: string; + + @Column() + isDeleted: boolean; + + @Column() + deletedAt: Date; } diff --git a/server/src/models/workspaceMember.entity.ts b/server/src/models/workspaceMember.entity.ts index 72a6d186..3117138a 100644 --- a/server/src/models/workspaceMember.entity.ts +++ b/server/src/models/workspaceMember.entity.ts @@ -11,4 +11,16 @@ export class WorkspaceMember extends BaseEntity { @Column() role: string; + + @Column() + creator: string; + + @Column() + creatorId: string; + + @Column() + operator: string; + + @Column() + operatorId: string; } diff --git a/server/src/modules/auth/__test/user.service.spec.ts b/server/src/modules/auth/__test/user.service.spec.ts index e0cdfc19..9589f24a 100644 --- a/server/src/modules/auth/__test/user.service.spec.ts +++ b/server/src/modules/auth/__test/user.service.spec.ts @@ -5,7 +5,6 @@ import { UserService } from '../services/user.service'; import { User } from 'src/models/user.entity'; import { HttpException } from 'src/exceptions/httpException'; import { hash256 } from 'src/utils/hash256'; -import { RECORD_STATUS } from 'src/enums'; import { ObjectId } from 'mongodb'; describe('UserService', () => { @@ -145,7 +144,6 @@ describe('UserService', () => { expect(userRepository.findOne).toHaveBeenCalledWith({ where: { username: username, - 'curStatus.status': { $ne: RECORD_STATUS.REMOVED }, }, }); expect(user).toEqual(userInfo); @@ -163,7 +161,6 @@ describe('UserService', () => { expect(findOneSpy).toHaveBeenCalledWith({ where: { username: username, - 'curStatus.status': { $ne: RECORD_STATUS.REMOVED }, }, }); expect(user).toBe(null); @@ -184,7 +181,6 @@ describe('UserService', () => { expect(userRepository.findOne).toHaveBeenCalledWith({ where: { _id: new ObjectId(id), - 'curStatus.status': { $ne: RECORD_STATUS.REMOVED }, }, }); expect(user).toEqual(userInfo); @@ -202,7 +198,6 @@ describe('UserService', () => { expect(findOneSpy).toHaveBeenCalledWith({ where: { _id: new ObjectId(id), - 'curStatus.status': { $ne: RECORD_STATUS.REMOVED }, }, }); expect(user).toBe(null); @@ -211,8 +206,8 @@ describe('UserService', () => { it('should return a list of users by username', async () => { const username = 'test'; const userList = [ - { _id: new ObjectId(), username: 'testUser1', createDate: new Date() }, - { _id: new ObjectId(), username: 'testUser2', createDate: new Date() }, + { _id: new ObjectId(), username: 'testUser1', createdAt: new Date() }, + { _id: new ObjectId(), username: 'testUser2', createdAt: new Date() }, ]; jest @@ -228,11 +223,10 @@ describe('UserService', () => { expect(userRepository.find).toHaveBeenCalledWith({ where: { username: new RegExp(username), - 'curStatus.status': { $ne: RECORD_STATUS.REMOVED }, }, skip: 0, take: 10, - select: ['_id', 'username', 'createDate'], + select: ['_id', 'username', 'createdAt'], }); expect(result).toEqual(userList); }); @@ -243,12 +237,12 @@ describe('UserService', () => { { _id: new ObjectId(idList[0]), username: 'testUser1', - createDate: new Date(), + createdAt: new Date(), }, { _id: new ObjectId(idList[1]), username: 'testUser2', - createDate: new Date(), + createdAt: new Date(), }, ]; @@ -263,9 +257,8 @@ describe('UserService', () => { _id: { $in: idList.map((id) => new ObjectId(id)), }, - 'curStatus.status': { $ne: RECORD_STATUS.REMOVED }, }, - select: ['_id', 'username', 'createDate'], + select: ['_id', 'username', 'createdAt'], }); expect(result).toEqual(userList); }); diff --git a/server/src/modules/auth/services/user.service.ts b/server/src/modules/auth/services/user.service.ts index 03e4f497..0cbea97e 100644 --- a/server/src/modules/auth/services/user.service.ts +++ b/server/src/modules/auth/services/user.service.ts @@ -5,7 +5,6 @@ import { User } from 'src/models/user.entity'; import { HttpException } from 'src/exceptions/httpException'; import { EXCEPTION_CODE } from 'src/enums/exceptionCode'; import { hash256 } from 'src/utils/hash256'; -import { RECORD_STATUS } from 'src/enums'; import { ObjectId } from 'mongodb'; @Injectable() @@ -53,9 +52,6 @@ export class UserService { const user = await this.userRepository.findOne({ where: { username: username, - 'curStatus.status': { - $ne: RECORD_STATUS.REMOVED, - }, }, }); @@ -66,9 +62,6 @@ export class UserService { const user = await this.userRepository.findOne({ where: { _id: new ObjectId(id), - 'curStatus.status': { - $ne: RECORD_STATUS.REMOVED, - }, }, }); @@ -79,13 +72,10 @@ export class UserService { const list = await this.userRepository.find({ where: { username: new RegExp(username), - 'curStatus.status': { - $ne: RECORD_STATUS.REMOVED, - }, }, skip, take, - select: ['_id', 'username', 'createDate'], + select: ['_id', 'username', 'createdAt'], }); return list; } @@ -96,11 +86,8 @@ export class UserService { _id: { $in: idList.map((item) => new ObjectId(item)), }, - 'curStatus.status': { - $ne: RECORD_STATUS.REMOVED, - }, }, - select: ['_id', 'username', 'createDate'], + select: ['_id', 'username', 'createdAt'], }); return list; } diff --git a/server/src/modules/message/__test/messagePushingTask.dto.spec.ts b/server/src/modules/message/__test/messagePushingTask.dto.spec.ts index 5a8ba713..9fefb181 100644 --- a/server/src/modules/message/__test/messagePushingTask.dto.spec.ts +++ b/server/src/modules/message/__test/messagePushingTask.dto.spec.ts @@ -8,7 +8,6 @@ import { MESSAGE_PUSHING_TYPE, MESSAGE_PUSHING_HOOK, } from 'src/enums/messagePushing'; -import { RECORD_STATUS } from 'src/enums'; describe('MessagePushingTaskDto', () => { let dto: MessagePushingTaskDto; @@ -34,9 +33,9 @@ describe('MessagePushingTaskDto', () => { }); it('should have a type', () => { - dto.type = MESSAGE_PUSHING_TYPE.HTTP; // Set your desired type here + dto.type = MESSAGE_PUSHING_TYPE.HTTP; expect(dto.type).toBeDefined(); - expect(dto.type).toEqual(MESSAGE_PUSHING_TYPE.HTTP); // Adjust based on your enum + expect(dto.type).toEqual(MESSAGE_PUSHING_TYPE.HTTP); }); it('should have a push address', () => { @@ -46,13 +45,13 @@ describe('MessagePushingTaskDto', () => { }); it('should have a trigger hook', () => { - dto.triggerHook = MESSAGE_PUSHING_HOOK.RESPONSE_INSERTED; // Set your desired hook here + dto.triggerHook = MESSAGE_PUSHING_HOOK.RESPONSE_INSERTED; expect(dto.triggerHook).toBeDefined(); - expect(dto.triggerHook).toEqual(MESSAGE_PUSHING_HOOK.RESPONSE_INSERTED); // Adjust based on your enum + expect(dto.triggerHook).toEqual(MESSAGE_PUSHING_HOOK.RESPONSE_INSERTED); }); it('should have an array of surveys', () => { - dto.surveys = ['survey1', 'survey2']; // Set your desired surveys here + dto.surveys = ['survey1', 'survey2']; expect(dto.surveys).toBeDefined(); expect(dto.surveys).toEqual(['survey1', 'survey2']); }); @@ -62,13 +61,6 @@ describe('MessagePushingTaskDto', () => { expect(dto.owner).toBeDefined(); expect(dto.owner).toBe('test_owner'); }); - - it('should have current status', () => { - dto.curStatus = { status: RECORD_STATUS.NEW, date: Date.now() }; - expect(dto.curStatus).toBeDefined(); - expect(dto.curStatus.status).toEqual(RECORD_STATUS.NEW); - expect(dto.curStatus.date).toBeDefined(); - }); }); describe('CodeDto', () => { diff --git a/server/src/modules/message/__test/messagePushingTask.service.spec.ts b/server/src/modules/message/__test/messagePushingTask.service.spec.ts index 38d8852c..4f5f9c8c 100644 --- a/server/src/modules/message/__test/messagePushingTask.service.spec.ts +++ b/server/src/modules/message/__test/messagePushingTask.service.spec.ts @@ -10,7 +10,6 @@ import { MessagePushingLogService } from '../services/messagePushingLog.service' import { CreateMessagePushingTaskDto } from '../dto/createMessagePushingTask.dto'; import { UpdateMessagePushingTaskDto } from '../dto/updateMessagePushingTask.dto'; -import { RECORD_STATUS } from 'src/enums'; import { MESSAGE_PUSHING_TYPE } from 'src/enums/messagePushing'; import { MESSAGE_PUSHING_HOOK } from 'src/enums/messagePushing'; import { MessagePushingTask } from 'src/models/messagePushingTask.entity'; @@ -118,10 +117,12 @@ describe('MessagePushingTaskService', () => { expect(result).toEqual(tasks); expect(repository.find).toHaveBeenCalledWith({ where: { + isDeleted: { + $ne: true, + }, ownerId: mockOwnerId, surveys: { $all: [surveyId] }, triggerHook: hook, - 'curStatus.status': { $ne: RECORD_STATUS.REMOVED }, }, }); }); @@ -146,10 +147,19 @@ describe('MessagePushingTaskService', () => { where: { ownerId: mockOwnerId, _id: new ObjectId(taskId), - 'curStatus.status': { $ne: RECORD_STATUS.REMOVED }, + isDeleted: { + $ne: true, + }, }, }); }); + it('should throw an error when message pushing task is not found', async () => { + const taskId = '65afc62904d5db18534c0f78'; + jest.spyOn(repository, 'findOne').mockResolvedValue(null); // 模拟未找到任务 + const mockOwnerId = '66028642292c50f8b71a9eee'; + + await expect(service.findOne({ id: taskId, ownerId: mockOwnerId })); + }); }); describe('update', () => { @@ -161,10 +171,6 @@ describe('MessagePushingTaskService', () => { pushAddress: 'http://update.example.com', triggerHook: MESSAGE_PUSHING_HOOK.RESPONSE_INSERTED, surveys: ['new survey id'], - curStatus: { - status: RECORD_STATUS.EDITING, - date: Date.now(), - }, }; const existingTask = new MessagePushingTask(); existingTask._id = new ObjectId(taskId); @@ -190,6 +196,20 @@ describe('MessagePushingTaskService', () => { }); expect(repository.save).toHaveBeenCalledWith(updatedTask); }); + it('should throw an error if the task to be updated is not found', async () => { + const taskId = '65afc62904d5db18534c0f78'; + const updateDto: UpdateMessagePushingTaskDto = { name: 'Updated Task' }; + jest.spyOn(repository, 'findOne').mockResolvedValue(null); // 模拟任务未找到 + const mockOwnerId = '66028642292c50f8b71a9eee'; + + await expect( + service.update({ + ownerId: mockOwnerId, + id: taskId, + updateData: updateDto, + }), + ).rejects.toThrow(`Message pushing task with id ${taskId} not found`); + }); }); describe('remove', () => { @@ -197,38 +217,54 @@ describe('MessagePushingTaskService', () => { const taskId = '65afc62904d5db18534c0f78'; const updateResult = { modifiedCount: 1 }; - const mockOwnerId = '66028642292c50f8b71a9eee'; + const mockOperatorId = '66028642292c50f8b71a9eee'; + const mockOperator = 'mockOperator'; jest.spyOn(repository, 'updateOne').mockResolvedValue(updateResult); const result = await service.remove({ id: taskId, - ownerId: mockOwnerId, + operatorId: mockOperatorId, + operator: mockOperator, }); expect(result).toEqual(updateResult); expect(repository.updateOne).toHaveBeenCalledWith( { - ownerId: mockOwnerId, _id: new ObjectId(taskId), - 'curStatus.status': { $ne: RECORD_STATUS.REMOVED }, }, { $set: { - curStatus: { - status: RECORD_STATUS.REMOVED, - date: expect.any(Number), - }, - }, - $push: { - statusList: { - status: RECORD_STATUS.REMOVED, - date: expect.any(Number), - }, + isDeleted: true, + operatorId: mockOperatorId, + operator: mockOperator, + deletedAt: expect.any(Date), }, }, ); }); + it('should throw an error if the task to be removed is not found', async () => { + const taskId = '65afc62904d5db18534c0f78'; + jest + .spyOn(repository, 'updateOne') + .mockResolvedValue({ modifiedCount: 0 }); // 模拟删除失败 + const mockOperatorId = '66028642292c50f8b71a9eee'; + const mockOperator = 'mockOperator'; + + const result = await service.remove({ + id: taskId, + operatorId: mockOperatorId, + operator: mockOperator, + }); + + expect(result.modifiedCount).toBe(0); + expect(repository.updateOne).toHaveBeenCalledWith( + { + _id: new ObjectId(taskId), + }, + expect.any(Object), + ); + }); }); describe('surveyAuthorizeTask', () => { @@ -258,8 +294,35 @@ describe('MessagePushingTaskService', () => { $push: { surveys: surveyId, }, + $set: { + updatedAt: expect.any(Date), + }, }, ); }); + it('should not add the surveyId if it already exists in the task', async () => { + const taskId = '65afc62904d5db18534c0f78'; + const surveyId = '65af380475b64545e5277dd9'; + const mockOwnerId = '66028642292c50f8b71a9eee'; + + jest + .spyOn(repository, 'updateOne') + .mockResolvedValue({ modifiedCount: 0 }); // 模拟重复添加 + const result = await service.surveyAuthorizeTask({ + taskId, + surveyId, + ownerId: mockOwnerId, + }); + + expect(result.modifiedCount).toBe(0); + expect(repository.updateOne).toHaveBeenCalledWith( + { + _id: new ObjectId(taskId), + surveys: { $nin: [surveyId] }, // 确保只有不包含时才插入 + ownerId: mockOwnerId, + }, + expect.any(Object), + ); + }); }); }); diff --git a/server/src/modules/message/__test/updateMessagePushingTask.dto.spec.ts b/server/src/modules/message/__test/updateMessagePushingTask.dto.spec.ts index ac2bae62..c3d46bec 100644 --- a/server/src/modules/message/__test/updateMessagePushingTask.dto.spec.ts +++ b/server/src/modules/message/__test/updateMessagePushingTask.dto.spec.ts @@ -37,9 +37,4 @@ describe('UpdateMessagePushingTaskDto', () => { dto.surveys = null; expect(dto.surveys).toBeNull(); }); - - it('should have a nullable curStatus', () => { - dto.curStatus = null; - expect(dto.curStatus).toBeNull(); - }); }); diff --git a/server/src/modules/message/controllers/messagePushingTask.controller.ts b/server/src/modules/message/controllers/messagePushingTask.controller.ts index a3938b69..1406a405 100644 --- a/server/src/modules/message/controllers/messagePushingTask.controller.ts +++ b/server/src/modules/message/controllers/messagePushingTask.controller.ts @@ -150,8 +150,9 @@ export class MessagePushingTaskController { async remove(@Request() req, @Param('id') id: string) { const userId = req.user._id; const res = await this.messagePushingTaskService.remove({ - ownerId: userId, id, + operator: req.user.username, + operatorId: userId, }); return { code: 200, diff --git a/server/src/modules/message/dto/messagePushingTask.dto.ts b/server/src/modules/message/dto/messagePushingTask.dto.ts index 5144b178..91bf8e96 100644 --- a/server/src/modules/message/dto/messagePushingTask.dto.ts +++ b/server/src/modules/message/dto/messagePushingTask.dto.ts @@ -4,7 +4,6 @@ import { MESSAGE_PUSHING_TYPE, MESSAGE_PUSHING_HOOK, } from 'src/enums/messagePushing'; -import { RECORD_STATUS } from 'src/enums'; export class MessagePushingTaskDto { @ApiProperty({ description: '任务id' }) @@ -27,12 +26,6 @@ export class MessagePushingTaskDto { @ApiProperty({ description: '所有者' }) owner: string; - - @ApiProperty({ description: '任务状态', required: false }) - curStatus?: { - status: RECORD_STATUS; - date: number; - }; } export class CodeDto { diff --git a/server/src/modules/message/dto/updateMessagePushingTask.dto.ts b/server/src/modules/message/dto/updateMessagePushingTask.dto.ts index bf4eb43b..5560c6b4 100644 --- a/server/src/modules/message/dto/updateMessagePushingTask.dto.ts +++ b/server/src/modules/message/dto/updateMessagePushingTask.dto.ts @@ -1,5 +1,4 @@ import { ApiProperty } from '@nestjs/swagger'; -import { RECORD_STATUS } from 'src/enums'; import { MESSAGE_PUSHING_TYPE, MESSAGE_PUSHING_HOOK, @@ -20,10 +19,4 @@ export class UpdateMessagePushingTaskDto { @ApiProperty({ description: '绑定的问卷id', required: false }) surveys?: string[]; - - @ApiProperty({ description: '任务状态', required: false }) - curStatus?: { - status: RECORD_STATUS; - date: number; - }; } diff --git a/server/src/modules/message/services/messagePushingTask.service.ts b/server/src/modules/message/services/messagePushingTask.service.ts index 14aef5bf..93872ef5 100644 --- a/server/src/modules/message/services/messagePushingTask.service.ts +++ b/server/src/modules/message/services/messagePushingTask.service.ts @@ -6,7 +6,6 @@ import { MESSAGE_PUSHING_HOOK } from 'src/enums/messagePushing'; import { CreateMessagePushingTaskDto } from '../dto/createMessagePushingTask.dto'; import { UpdateMessagePushingTaskDto } from '../dto/updateMessagePushingTask.dto'; import { ObjectId } from 'mongodb'; -import { RECORD_STATUS } from 'src/enums'; import { MESSAGE_PUSHING_TYPE } from 'src/enums/messagePushing'; import { MessagePushingLogService } from './messagePushingLog.service'; import { httpPost } from 'src/utils/request'; @@ -44,8 +43,8 @@ export class MessagePushingTaskService { ownerId?: string; }): Promise { const where: Record = { - 'curStatus.status': { - $ne: RECORD_STATUS.REMOVED, + isDeleted: { + $ne: true, }, }; if (surveyId) { @@ -64,19 +63,19 @@ export class MessagePushingTaskService { }); } - async findOne({ + findOne({ id, ownerId, }: { id: string; ownerId: string; }): Promise { - return await this.messagePushingTaskRepository.findOne({ + return this.messagePushingTaskRepository.findOne({ where: { ownerId, _id: new ObjectId(id), - 'curStatus.status': { - $ne: RECORD_STATUS.REMOVED, + isDeleted: { + $ne: true, }, }, }); @@ -104,25 +103,25 @@ export class MessagePushingTaskService { return await this.messagePushingTaskRepository.save(updatedTask); } - async remove({ id, ownerId }: { id: string; ownerId: string }) { - const curStatus = { - status: RECORD_STATUS.REMOVED, - date: Date.now(), - }; + async remove({ + id, + operator, + operatorId, + }: { + id: string; + operator: string; + operatorId: string; + }) { return this.messagePushingTaskRepository.updateOne( { - ownerId, _id: new ObjectId(id), - 'curStatus.status': { - $ne: RECORD_STATUS.REMOVED, - }, }, { $set: { - curStatus, - }, - $push: { - statusList: curStatus as never, + isDeleted: true, + operator, + operatorId, + deletedAt: new Date(), }, }, ); @@ -147,6 +146,9 @@ export class MessagePushingTaskService { $push: { surveys: surveyId as never, }, + $set: { + updatedAt: new Date(), + }, }, ); } diff --git a/server/src/modules/survey/__test/collaborator.service.spec.ts b/server/src/modules/survey/__test/collaborator.service.spec.ts index 34a1157e..afc9f810 100644 --- a/server/src/modules/survey/__test/collaborator.service.spec.ts +++ b/server/src/modules/survey/__test/collaborator.service.spec.ts @@ -75,6 +75,25 @@ describe('CollaboratorService', () => { }); }); + describe('deleteCollaborator', () => { + it('should delete a collaborator by userId and surveyId', async () => { + const deleteOneSpy = jest + .spyOn(repository, 'deleteOne') + .mockResolvedValue({ acknowledged: true, deletedCount: 1 }); + + const result = await service.deleteCollaborator({ + userId: '1', + surveyId: '1', + }); + + expect(deleteOneSpy).toHaveBeenCalledWith({ + userId: '1', + surveyId: '1', + }); + expect(result).toEqual({ acknowledged: true, deletedCount: 1 }); + }); + }); + describe('batchCreate', () => { it('should batch create collaborators', async () => { const insertManySpy = jest @@ -86,15 +105,193 @@ describe('CollaboratorService', () => { const result = await service.batchCreate({ surveyId: '1', collaboratorList: [{ userId: '1', permissions: [] }], + creator: 'testCreator', + creatorId: 'testCreatorId', }); expect(insertManySpy).toHaveBeenCalledWith([ - { surveyId: '1', userId: '1', permissions: [] }, + { + userId: '1', + permissions: [], + surveyId: '1', + createdAt: expect.any(Date), + updatedAt: expect.any(Date), + creator: 'testCreator', + creatorId: 'testCreatorId', + }, ]); expect(result).toEqual({ insertedCount: 1 }); }); }); + describe('changeUserPermission', () => { + it("should update a user's permissions", async () => { + const updateOneSpy = jest + .spyOn(repository, 'updateOne') + .mockResolvedValue({}); + + const result = await service.changeUserPermission({ + userId: '1', + surveyId: '1', + permission: 'read', + operator: 'testOperator', + operatorId: 'testOperatorId', + }); + + expect(updateOneSpy).toHaveBeenCalledWith( + { + surveyId: '1', + userId: '1', + }, + { + $set: { + permission: 'read', + operator: 'testOperator', + operatorId: 'testOperatorId', + updatedAt: expect.any(Date), + }, + }, + ); + expect(result).toEqual({}); + }); + }); + + describe('batchDelete', () => { + it('should batch delete collaborators', async () => { + const mockResult = { acknowledged: true, deletedCount: 1 }; + const deleteManySpy = jest + .spyOn(repository, 'deleteMany') + .mockResolvedValue(mockResult); + + const collaboratorId = new ObjectId().toString(); + + const result = await service.batchDelete({ + surveyId: '1', + idList: [collaboratorId], + }); + + const expectedQuery = { + surveyId: '1', + $or: [ + { + _id: { + $in: [new ObjectId(collaboratorId)], + }, + }, + ], + }; + + expect(logger.info).toHaveBeenCalledWith(JSON.stringify(expectedQuery)); + expect(deleteManySpy).toHaveBeenCalledWith(expectedQuery); + expect(result).toEqual(mockResult); + }); + it('should batch delete collaborators by idList and userIdList', async () => { + const collaboratorId = new ObjectId().toString(); + const deleteManySpy = jest + .spyOn(repository, 'deleteMany') + .mockResolvedValue({ acknowledged: true, deletedCount: 2 }); + + const result = await service.batchDelete({ + idList: [collaboratorId], + userIdList: ['user1', 'user2'], + surveyId: '1', + }); + + const expectedQuery = { + surveyId: '1', + $or: [ + { + userId: { + $in: ['user1', 'user2'], + }, + }, + { + _id: { + $in: [new ObjectId(collaboratorId)], + }, + }, + ], + }; + + expect(deleteManySpy).toHaveBeenCalledWith(expectedQuery); + expect(result).toEqual({ acknowledged: true, deletedCount: 2 }); + }); + + it('should handle batch delete with neIdList only', async () => { + const neCollaboratorId = new ObjectId().toString(); + const deleteManySpy = jest + .spyOn(repository, 'deleteMany') + .mockResolvedValue({ acknowledged: true, deletedCount: 1 }); + + const result = await service.batchDelete({ + neIdList: [neCollaboratorId], + surveyId: '1', + }); + + const expectedQuery = { + surveyId: '1', + $or: [ + { + _id: { + $nin: [new ObjectId(neCollaboratorId)], + }, + }, + ], + }; + + expect(deleteManySpy).toHaveBeenCalledWith(expectedQuery); + expect(result).toEqual({ acknowledged: true, deletedCount: 1 }); + }); + }); + + describe('batchDeleteBySurveyId', () => { + it('should batch delete collaborators by survey id', async () => { + const mockResult = { acknowledged: true, deletedCount: 1 }; + const deleteManySpy = jest + .spyOn(repository, 'deleteMany') + .mockResolvedValue(mockResult); + + const surveyId = new ObjectId().toString(); + + const result = await service.batchDeleteBySurveyId(surveyId); + + expect(deleteManySpy).toHaveBeenCalledWith({ + surveyId, + }); + expect(result).toEqual(mockResult); + }); + }); + + describe('updateById', () => { + it('should update collaborator by id', async () => { + const updateOneSpy = jest + .spyOn(repository, 'updateOne') + .mockResolvedValue({}); + const collaboratorId = new ObjectId().toString(); + const result = await service.updateById({ + collaboratorId, + permissions: [], + operator: 'testOperator', + operatorId: 'testOperatorId', + }); + + expect(updateOneSpy).toHaveBeenCalledWith( + { + _id: new ObjectId(collaboratorId), + }, + { + $set: { + permissions: [], + operator: 'testOperator', + operatorId: 'testOperatorId', + updatedAt: expect.any(Date), + }, + }, + ); + expect(result).toEqual({}); + }); + }); + describe('getSurveyCollaboratorList', () => { it('should return a list of collaborators for a survey', async () => { const collaboratorId = new ObjectId().toString(); @@ -121,38 +318,6 @@ describe('CollaboratorService', () => { }); }); - describe('getCollaboratorListByIds', () => { - it('should return a list of collaborators by ids', async () => { - const collaboratorId = new ObjectId().toString(); - const findSpy = jest.spyOn(repository, 'find').mockResolvedValue([ - { - _id: new ObjectId(collaboratorId), - surveyId: '1', - userId: '1', - permissions: [], - }, - ] as Collaborator[]); - - const result = await service.getCollaboratorListByIds({ - idList: [collaboratorId], - }); - - expect(findSpy).toHaveBeenCalledWith({ - _id: { - $in: [new ObjectId(collaboratorId)], - }, - }); - expect(result).toEqual([ - { - _id: new ObjectId(collaboratorId), - surveyId: '1', - userId: '1', - permissions: [], - }, - ]); - }); - }); - describe('getCollaborator', () => { it('should return a collaborator', async () => { const collaboratorId = new ObjectId().toString(); @@ -183,127 +348,6 @@ describe('CollaboratorService', () => { }); }); - describe('changeUserPermission', () => { - it("should update a user's permissions", async () => { - const updateOneSpy = jest - .spyOn(repository, 'updateOne') - .mockResolvedValue({}); - - const result = await service.changeUserPermission({ - userId: '1', - surveyId: '1', - permission: 'read', - }); - - expect(updateOneSpy).toHaveBeenCalledWith( - { - surveyId: '1', - userId: '1', - }, - { - $set: { - permission: 'read', - }, - }, - ); - expect(result).toEqual({}); - }); - }); - - describe('deleteCollaborator', () => { - it('should delete a collaborator', async () => { - const mockResult = { acknowledged: true, deletedCount: 1 }; - const deleteOneSpy = jest - .spyOn(repository, 'deleteOne') - .mockResolvedValue(mockResult); - - const result = await service.deleteCollaborator({ - userId: '1', - surveyId: '1', - }); - - expect(deleteOneSpy).toHaveBeenCalledWith({ - userId: '1', - surveyId: '1', - }); - expect(result).toEqual(mockResult); - }); - }); - - describe('batchDelete', () => { - it('should batch delete collaborators', async () => { - const mockResult = { acknowledged: true, deletedCount: 1 }; - const deleteManySpy = jest - .spyOn(repository, 'deleteMany') - .mockResolvedValue(mockResult); - - const collaboratorId = new ObjectId().toString(); - - const result = await service.batchDelete({ - surveyId: '1', - idList: [collaboratorId], - }); - - const expectedQuery = { - surveyId: '1', - $or: [ - { - _id: { - $in: [new ObjectId(collaboratorId)], - }, - }, - ], - }; - - expect(logger.info).toHaveBeenCalledWith(JSON.stringify(expectedQuery)); - expect(deleteManySpy).toHaveBeenCalledWith(expectedQuery); - expect(result).toEqual(mockResult); - }); - }); - - describe('batchDeleteBySurveyId', () => { - it('should batch delete collaborators by survey id', async () => { - const mockResult = { acknowledged: true, deletedCount: 1 }; - const deleteManySpy = jest - .spyOn(repository, 'deleteMany') - .mockResolvedValue(mockResult); - - const surveyId = new ObjectId().toString(); - - const result = await service.batchDeleteBySurveyId(surveyId); - - expect(deleteManySpy).toHaveBeenCalledWith({ - surveyId, - }); - expect(result).toEqual(mockResult); - }); - }); - - describe('updateById', () => { - it('should update collaborator by id', async () => { - const updateOneSpy = jest - .spyOn(repository, 'updateOne') - .mockResolvedValue({}); - const collaboratorId = new ObjectId().toString(); - const result = await service.updateById({ - collaboratorId, - permissions: [], - }); - - expect(updateOneSpy).toHaveBeenCalledWith( - { - _id: new ObjectId(collaboratorId), - }, - { - $set: { - permissions: [], - }, - }, - ); - expect(result).toEqual({}); - }); - }); - describe('getCollaboratorListByUserId', () => { it('should return a list of collaborators by user id', async () => { const userId = new ObjectId().toString(); @@ -327,5 +371,48 @@ describe('CollaboratorService', () => { { _id: '1', surveyId: '1', userId, permissions: [] }, ]); }); + + it('should return a list of collaborators by their IDs', async () => { + const collaboratorId1 = new ObjectId().toString(); + const collaboratorId2 = new ObjectId().toString(); + const findSpy = jest.spyOn(repository, 'find').mockResolvedValue([ + { + _id: new ObjectId(collaboratorId1), + surveyId: '1', + userId: 'user1', + permissions: [], + }, + { + _id: new ObjectId(collaboratorId2), + surveyId: '2', + userId: 'user2', + permissions: [], + }, + ] as Collaborator[]); + + const result = await service.getCollaboratorListByIds({ + idList: [collaboratorId1, collaboratorId2], + }); + + expect(findSpy).toHaveBeenCalledWith({ + _id: { + $in: [new ObjectId(collaboratorId1), new ObjectId(collaboratorId2)], + }, + }); + expect(result).toEqual([ + { + _id: new ObjectId(collaboratorId1), + surveyId: '1', + userId: 'user1', + permissions: [], + }, + { + _id: new ObjectId(collaboratorId2), + surveyId: '2', + userId: 'user2', + permissions: [], + }, + ]); + }); }); }); diff --git a/server/src/modules/survey/__test/dataStatistic.controller.spec.ts b/server/src/modules/survey/__test/dataStatistic.controller.spec.ts index e6c3bd8f..44ac4a91 100644 --- a/server/src/modules/survey/__test/dataStatistic.controller.spec.ts +++ b/server/src/modules/survey/__test/dataStatistic.controller.spec.ts @@ -109,8 +109,8 @@ describe('DataStatisticController', () => { }, ], listBody: [ - { diffTime: '0.5', createDate: '2024-02-11' }, - { diffTime: '0.5', createDate: '2024-02-11' }, + { diffTime: '0.5', createdAt: '2024-02-11' }, + { diffTime: '0.5', createdAt: '2024-02-11' }, ], }; @@ -155,8 +155,8 @@ describe('DataStatisticController', () => { }, ], listBody: [ - { diffTime: '0.5', createDate: '2024-02-11', data123: '15200000000' }, - { diffTime: '0.5', createDate: '2024-02-11', data123: '13800000000' }, + { diffTime: '0.5', createdAt: '2024-02-11', data123: '15200000000' }, + { diffTime: '0.5', createdAt: '2024-02-11', data123: '13800000000' }, ], }; @@ -212,8 +212,8 @@ describe('DataStatisticController', () => { date: 1717158851823, }, ], - createDate: 1717158851823, - updateDate: 1717159136025, + createdAt: 1717158851823, + updatedAt: 1717159136025, title: '问卷调研', surveyPath: 'ZdGNzTTR', code: { @@ -233,7 +233,7 @@ describe('DataStatisticController', () => { }, }, baseConf: { - begTime: '2024-05-31 20:31:36', + beginTime: '2024-05-31 20:31:36', endTime: '2034-05-31 20:31:36', language: 'chinese', showVoteProcess: 'allow', diff --git a/server/src/modules/survey/__test/dataStatistic.service.spec.ts b/server/src/modules/survey/__test/dataStatistic.service.spec.ts index b53bfa0d..e46ea4dd 100644 --- a/server/src/modules/survey/__test/dataStatistic.service.spec.ts +++ b/server/src/modules/survey/__test/dataStatistic.service.spec.ts @@ -151,8 +151,8 @@ describe('DataStatisticService', () => { date: 1710340863123.0, }, ], - createDate: 1710340863123.0, - updateDate: 1710340863123.0, + createdAt: 1710340863123.0, + updatedAt: 1710340863123.0, }, ] as unknown as Array; @@ -196,7 +196,7 @@ describe('DataStatisticService', () => { data413: expect.any(Number), data863: expect.any(String), diffTime: expect.any(String), - createDate: expect.any(String), + createdAt: expect.any(String), }), ]), }); @@ -273,8 +273,8 @@ describe('DataStatisticService', () => { date: 1710400232161.0, }, ], - createDate: 1710400232161.0, - updateDate: 1710400232161.0, + createdAt: 1710400232161.0, + updatedAt: 1710400232161.0, }, ] as unknown as Array; @@ -295,7 +295,7 @@ describe('DataStatisticService', () => { expect(result.listBody).toEqual( expect.arrayContaining([ expect.objectContaining({ - createDate: expect.any(String), + createdAt: expect.any(String), data405: expect.any(String), data450: expect.any(String), data458: expect.any(String), diff --git a/server/src/modules/survey/__test/downloadTask.controller.spec.ts b/server/src/modules/survey/__test/downloadTask.controller.spec.ts index 48cd4f94..617db0c5 100644 --- a/server/src/modules/survey/__test/downloadTask.controller.spec.ts +++ b/server/src/modules/survey/__test/downloadTask.controller.spec.ts @@ -145,7 +145,7 @@ describe('DownloadTaskController', () => { filename: 'mockFile.csv', url: 'http://mock-url.com', fileSize: 1024, - createDate: Date.now(), + createdAt: Date.now(), }, ], }; @@ -219,10 +219,13 @@ describe('DownloadTaskController', () => { describe('deleteFileByName', () => { it('should delete a download task successfully', async () => { const mockBody = { taskId: 'mockTaskId' }; - const mockReq = { user: { _id: 'mockUserId' } }; + const mockUserId = new ObjectId(); + const mockReq = { + user: { _id: mockUserId, username: 'mockUsername' }, + }; const mockTaskInfo: any = { _id: new ObjectId(), - creatorId: 'mockUserId', + creatorId: mockUserId.toString(), }; const mockDelRes = { modifiedCount: 1 }; @@ -237,6 +240,8 @@ describe('DownloadTaskController', () => { expect(downloadTaskService.deleteDownloadTask).toHaveBeenCalledWith({ taskId: mockBody.taskId, + operator: mockReq.user.username, + operatorId: mockReq.user._id.toString(), }); expect(result).toEqual({ code: 200, data: true }); }); diff --git a/server/src/modules/survey/__test/downloadTask.service.spec.ts b/server/src/modules/survey/__test/downloadTask.service.spec.ts index b26b9d20..e0138e35 100644 --- a/server/src/modules/survey/__test/downloadTask.service.spec.ts +++ b/server/src/modules/survey/__test/downloadTask.service.spec.ts @@ -9,7 +9,7 @@ import { DataStatisticService } from '../services/dataStatistic.service'; import { FileService } from 'src/modules/file/services/file.service'; import { Logger } from 'src/logger'; import { ObjectId } from 'mongodb'; -import { RECORD_STATUS } from 'src/enums'; +import { DOWNLOAD_TASK_STATUS } from 'src/enums/downloadTaskStatus'; describe('DownloadTaskService', () => { let service: DownloadTaskService; @@ -93,6 +93,7 @@ describe('DownloadTaskService', () => { title: mockParams.responseSchema.title, }, filename: expect.any(String), + status: DOWNLOAD_TASK_STATUS.WAITING, }); expect(downloadTaskRepository.save).toHaveBeenCalled(); expect(result).toEqual(mockTaskId); @@ -118,11 +119,11 @@ describe('DownloadTaskService', () => { expect(downloadTaskRepository.findAndCount).toHaveBeenCalledWith({ where: { creatorId: mockCreatorId, - 'curStatus.status': { $ne: RECORD_STATUS.REMOVED }, + isDeleted: { $ne: true }, }, take: 10, skip: 0, - order: { createDate: -1 }, + order: { createdAt: -1 }, }); expect(result).toEqual({ @@ -161,32 +162,84 @@ describe('DownloadTaskService', () => { }); describe('deleteDownloadTask', () => { - it('should update task status to REMOVED', async () => { + it('should mark task as deleted and set deletedAt', async () => { const mockTaskId = new ObjectId().toString(); + const mockOperator = 'operatorName'; + const mockOperatorId = 'operatorId1'; const mockUpdateResult = { matchedCount: 1 }; jest .spyOn(downloadTaskRepository, 'updateOne') .mockResolvedValue(mockUpdateResult as any); - const result = await service.deleteDownloadTask({ taskId: mockTaskId }); + const result = await service.deleteDownloadTask({ + taskId: mockTaskId, + operator: mockOperator, + operatorId: mockOperatorId, + }); expect(downloadTaskRepository.updateOne).toHaveBeenCalledWith( - { - _id: new ObjectId(mockTaskId), - 'curStatus.status': { $ne: RECORD_STATUS.REMOVED }, - }, + { _id: new ObjectId(mockTaskId) }, { $set: { - curStatus: { - status: RECORD_STATUS.REMOVED, - date: expect.any(Number), - }, + isDeleted: true, + operator: mockOperator, + operatorId: mockOperatorId, + deletedAt: expect.any(Date), }, - $push: { statusList: expect.any(Object) }, }, ); expect(result).toEqual(mockUpdateResult); }); }); + + describe('processDownloadTask', () => { + it('should push task to queue and execute if not executing', async () => { + const mockTaskId = new ObjectId().toString(); + jest.spyOn(service, 'executeTask').mockImplementation(jest.fn()); + + service.processDownloadTask({ taskId: mockTaskId }); + + expect(DownloadTaskService.taskList).toContain(mockTaskId); + expect(service.executeTask).toHaveBeenCalled(); + }); + + it('should handle already executing case', async () => { + const mockTaskId = new ObjectId().toString(); + DownloadTaskService.isExecuting = true; + jest.spyOn(service, 'executeTask').mockImplementation(jest.fn()); + + service.processDownloadTask({ taskId: mockTaskId }); + + expect(DownloadTaskService.taskList).toContain(mockTaskId); + expect(service.executeTask).not.toHaveBeenCalled(); + }); + }); + + describe('executeTask', () => { + it('should process and execute tasks in queue', async () => { + const mockTaskId = new ObjectId().toString(); + DownloadTaskService.taskList.push(mockTaskId); + + jest.spyOn(service, 'getDownloadTaskById').mockResolvedValue({ + _id: new ObjectId(mockTaskId), + isDeleted: false, + } as any); + + jest.spyOn(service, 'handleDownloadTask').mockResolvedValue(undefined); + + await service.executeTask(); + + expect(service.getDownloadTaskById).toHaveBeenCalledWith({ + taskId: mockTaskId, + }); + expect(service.handleDownloadTask).toHaveBeenCalled(); + }); + + it('should stop executing when queue is empty', async () => { + DownloadTaskService.taskList = []; + await service.executeTask(); + expect(DownloadTaskService.isExecuting).toBe(false); + }); + }); }); diff --git a/server/src/modules/survey/__test/mockResponseSchema.ts b/server/src/modules/survey/__test/mockResponseSchema.ts index 7adb3e0c..bb15c5b3 100644 --- a/server/src/modules/survey/__test/mockResponseSchema.ts +++ b/server/src/modules/survey/__test/mockResponseSchema.ts @@ -14,8 +14,8 @@ export const mockSensitiveResponseSchema: ResponseSchema = { date: 1710399368439, }, ], - createDate: 1710399368440, - updateDate: 1710399368440, + createdAt: 1710399368440, + updatedAt: 1710399368440, title: '加密全流程', surveyPath: 'EBzdmnSp', code: { @@ -32,7 +32,7 @@ export const mockSensitiveResponseSchema: ResponseSchema = { }, }, baseConf: { - begTime: '2024-03-14 14:54:41', + beginTime: '2024-03-14 14:54:41', endTime: '2034-03-14 14:54:41', language: 'chinese', tLimit: 0, @@ -295,7 +295,7 @@ export const mockSensitiveResponseSchema: ResponseSchema = { }, }, pageId: '65f29f3192862d6a9067ad1c', -} as ResponseSchema; +} as unknown as ResponseSchema; export const mockResponseSchema: ResponseSchema = { _id: new ObjectId('65b0d46e04d5db18534c0f7c'), @@ -326,7 +326,7 @@ export const mockResponseSchema: ResponseSchema = { }, }, baseConf: { - begTime: '2024-01-23 21:59:05', + beginTime: '2024-01-23 21:59:05', endTime: '2034-01-23 21:59:05', language: 'chinese', tLimit: 0, @@ -654,6 +654,6 @@ export const mockResponseSchema: ResponseSchema = { }, }, pageId: '65afc62904d5db18534c0f78', - createDate: 1710340841289, - updateDate: 1710340841289.0, -} as ResponseSchema; + createdAt: 1710340841289, + updatedAt: 1710340841289.0, +} as unknown as ResponseSchema; diff --git a/server/src/modules/survey/__test/session.service.spec.ts b/server/src/modules/survey/__test/session.service.spec.ts new file mode 100644 index 00000000..7f8cc904 --- /dev/null +++ b/server/src/modules/survey/__test/session.service.spec.ts @@ -0,0 +1,144 @@ +import { Test, TestingModule } from '@nestjs/testing'; +import { MongoRepository } from 'typeorm'; +import { getRepositoryToken } from '@nestjs/typeorm'; +import { SessionService } from '../services/session.service'; +import { Session } from 'src/models/session.entity'; +import { ObjectId } from 'mongodb'; +import { SESSION_STATUS } from 'src/enums/surveySessionStatus'; + +describe('SessionService', () => { + let service: SessionService; + let repository: MongoRepository; + + beforeEach(async () => { + const module: TestingModule = await Test.createTestingModule({ + providers: [ + SessionService, + { + provide: getRepositoryToken(Session), + useClass: MongoRepository, + }, + ], + }).compile(); + + service = module.get(SessionService); + repository = module.get>( + getRepositoryToken(Session), + ); + }); + + afterEach(() => { + jest.clearAllMocks(); + }); + + describe('create', () => { + it('should create and save a new session', async () => { + const mockSession = { + surveyId: 'survey123', + userId: 'user123', + status: SESSION_STATUS.DEACTIVATED, + }; + + const createdSession: any = { ...mockSession, _id: new ObjectId() }; + jest.spyOn(repository, 'create').mockReturnValue(createdSession); + jest.spyOn(repository, 'save').mockResolvedValue(createdSession); + + const result = await service.create({ + surveyId: mockSession.surveyId, + userId: mockSession.userId, + }); + + expect(result).toEqual(createdSession); + expect(repository.create).toHaveBeenCalledWith(mockSession); + expect(repository.save).toHaveBeenCalledWith(createdSession); + }); + }); + + describe('findOne', () => { + it('should find a session by id', async () => { + const sessionId = '65afc62904d5db18534c0f78'; + const foundSession = { + _id: new ObjectId(sessionId), + surveyId: 'survey123', + userId: 'user123', + status: SESSION_STATUS.ACTIVATED, + }; + + jest + .spyOn(repository, 'findOne') + .mockResolvedValue(foundSession as Session); + + const result = await service.findOne(sessionId); + + expect(result).toEqual(foundSession); + expect(repository.findOne).toHaveBeenCalledWith({ + where: { _id: new ObjectId(sessionId) }, + }); + }); + }); + + describe('findLatestEditingOne', () => { + it('should find the latest editing session for a survey', async () => { + const surveyId = 'survey123'; + const latestSession = { + _id: new ObjectId(), + surveyId: surveyId, + userId: 'user123', + status: SESSION_STATUS.ACTIVATED, + }; + + jest + .spyOn(repository, 'findOne') + .mockResolvedValue(latestSession as Session); + + const result = await service.findLatestEditingOne({ surveyId }); + + expect(result).toEqual(latestSession); + expect(repository.findOne).toHaveBeenCalledWith({ + where: { + surveyId, + status: SESSION_STATUS.ACTIVATED, + }, + }); + }); + }); + + describe('updateSessionToEditing', () => { + it('should update a session to editing and deactivate other sessions', async () => { + const sessionId = '65afc62904d5db18534c0f78'; + const surveyId = 'survey123'; + + const updateResult: any = { affected: 1 }; + const updateManyResult = { modifiedCount: 1 }; + + jest.spyOn(repository, 'update').mockResolvedValue(updateResult); + jest.spyOn(repository, 'updateMany').mockResolvedValue(updateManyResult); + + const result = await service.updateSessionToEditing({ + sessionId, + surveyId, + }); + + expect(result).toEqual([updateResult, updateManyResult]); + expect(repository.update).toHaveBeenCalledWith( + { _id: new ObjectId(sessionId) }, + { + status: SESSION_STATUS.ACTIVATED, + updatedAt: expect.any(Date), + }, + ); + expect(repository.updateMany).toHaveBeenCalledWith( + { + surveyId, + _id: { $ne: new ObjectId(sessionId) }, + }, + { + $set: { + status: SESSION_STATUS.DEACTIVATED, + updatedAt: expect.any(Date), + }, + }, + ); + }); + }); +}); diff --git a/server/src/modules/survey/__test/survey.controller.spec.ts b/server/src/modules/survey/__test/survey.controller.spec.ts index b9906bed..a01f5502 100644 --- a/server/src/modules/survey/__test/survey.controller.spec.ts +++ b/server/src/modules/survey/__test/survey.controller.spec.ts @@ -5,13 +5,12 @@ import { SurveyConfService } from '../services/surveyConf.service'; import { ResponseSchemaService } from '../../surveyResponse/services/responseScheme.service'; import { ContentSecurityService } from '../services/contentSecurity.service'; import { SurveyHistoryService } from '../services/surveyHistory.service'; -import { CounterService } from '../../surveyResponse/services/counter.service'; import { SessionService } from '../services/session.service'; import { UserService } from '../../auth/services/user.service'; import { ObjectId } from 'mongodb'; -import { SurveyMeta } from 'src/models/surveyMeta.entity'; -import { SurveyConf } from 'src/models/surveyConf.entity'; import { Logger } from 'src/logger'; +import { HttpException } from 'src/exceptions/httpException'; +import { Authentication } from 'src/guards/authentication.guard'; jest.mock('../services/surveyMeta.service'); jest.mock('../services/surveyConf.service'); @@ -19,9 +18,7 @@ jest.mock('../../surveyResponse/services/responseScheme.service'); jest.mock('../services/contentSecurity.service'); jest.mock('../services/surveyHistory.service'); jest.mock('../services/session.service'); -jest.mock('../../surveyResponse/services/counter.service'); jest.mock('../../auth/services/user.service'); - jest.mock('src/guards/authentication.guard'); jest.mock('src/guards/survey.guard'); jest.mock('src/guards/workspace.guard'); @@ -31,28 +28,17 @@ describe('SurveyController', () => { let surveyMetaService: SurveyMetaService; let surveyConfService: SurveyConfService; let responseSchemaService: ResponseSchemaService; - let surveyHistoryService: SurveyHistoryService; - let sessionService: SessionService; beforeEach(async () => { const module: TestingModule = await Test.createTestingModule({ controllers: [SurveyController], providers: [ SurveyMetaService, - { - provide: SurveyConfService, - useValue: { - getSurveyConfBySurveyId: jest.fn(), - getSurveyContentByCode: jest.fn(), - createSurveyConf: jest.fn(), - saveSurveyConf: jest.fn(), - }, - }, + SurveyConfService, ResponseSchemaService, ContentSecurityService, SurveyHistoryService, SessionService, - CounterService, UserService, { provide: Logger, @@ -61,6 +47,12 @@ describe('SurveyController', () => { info: jest.fn(), }, }, + { + provide: Authentication, + useClass: jest.fn().mockImplementation(() => ({ + canActivate: () => true, + })), + }, ], }).compile(); @@ -70,9 +62,6 @@ describe('SurveyController', () => { responseSchemaService = module.get( ResponseSchemaService, ); - surveyHistoryService = - module.get(SurveyHistoryService); - sessionService = module.get(SessionService); }); describe('getBannerData', () => { @@ -94,12 +83,11 @@ describe('SurveyController', () => { const newId = new ObjectId(); jest.spyOn(surveyMetaService, 'createSurveyMeta').mockResolvedValue({ _id: newId, - } as SurveyMeta); + } as any); jest.spyOn(surveyConfService, 'createSurveyConf').mockResolvedValue({ _id: new ObjectId(), - pageId: newId.toString(), - } as SurveyConf); + } as any); const result = await controller.createSurvey(surveyInfo, { user: { username: 'testUser', _id: new ObjectId() }, @@ -113,13 +101,15 @@ describe('SurveyController', () => { }); }); + it('should throw an error if validation fails', async () => { + const surveyInfo = {}; // Invalid data + await expect( + controller.createSurvey(surveyInfo as any, { user: {} }), + ).rejects.toThrow(HttpException); + }); + it('should create a new survey by copy', async () => { const existsSurveyId = new ObjectId(); - const existsSurveyMeta = { - _id: existsSurveyId, - surveyType: 'exam', - owner: 'testUser', - } as SurveyMeta; const params = { surveyType: 'normal', remark: '问卷调研', @@ -128,15 +118,15 @@ describe('SurveyController', () => { createFrom: existsSurveyId.toString(), }; - jest.spyOn(surveyMetaService, 'createSurveyMeta').mockResolvedValue({ - _id: new ObjectId(), - } as SurveyMeta); - const request = { user: { username: 'testUser', _id: new ObjectId() }, - surveyMeta: existsSurveyMeta, + surveyMeta: { _id: existsSurveyId, surveyType: 'exam' }, }; + jest.spyOn(surveyMetaService, 'createSurveyMeta').mockResolvedValue({ + _id: new ObjectId(), + } as any); + const result = await controller.createSurvey(params, request); expect(result?.data?.id).toBeDefined(); }); @@ -145,69 +135,30 @@ describe('SurveyController', () => { describe('updateConf', () => { it('should update survey configuration', async () => { const surveyId = new ObjectId(); - const surveyMeta = { - _id: surveyId, - surveyType: 'exam', - owner: 'testUser', - } as SurveyMeta; - - jest - .spyOn(surveyConfService, 'saveSurveyConf') - .mockResolvedValue(undefined); - jest - .spyOn(surveyHistoryService, 'addHistory') - .mockResolvedValue(undefined); - jest - .spyOn(sessionService, 'findLatestEditingOne') - .mockResolvedValue(null); - jest - .spyOn(sessionService, 'updateSessionToEditing') - .mockResolvedValue(undefined); - const reqBody = { surveyId: surveyId.toString(), configData: { - bannerConf: { - titleConfig: {}, - bannerConfig: {}, - }, - baseConf: { - begTime: '2024-01-23 21:59:05', - endTime: '2034-01-23 21:59:05', - }, - bottomConf: { logoImage: '/imgs/Logo.webp', logoImageWidth: '60%' }, - skinConf: { - skinColor: '#4a4c5b', - inputBgColor: '#ffffff', - backgroundConf: { - color: '#fff', - type: 'color', - image: '', - }, - themeConf: { - color: '#ffa600', - }, - contentConf: { - opacity: 100, - }, - }, - submitConf: {}, - dataConf: { - dataList: [], - }, + /* ... your config data here ... */ }, sessionId: 'mock-session-id', }; const result = await controller.updateConf(reqBody, { user: { username: 'testUser', _id: 'testUserId' }, - surveyMeta, + surveyMeta: { _id: surveyId }, }); expect(result).toEqual({ code: 200, }); }); + + it('should throw an error if validation fails', async () => { + const reqBody = {}; // Invalid data + await expect( + controller.updateConf(reqBody, { user: {} }), + ).rejects.toThrow(HttpException); + }); }); describe('deleteSurvey', () => { @@ -217,7 +168,7 @@ describe('SurveyController', () => { _id: surveyId, surveyType: 'exam', owner: 'testUser', - } as SurveyMeta; + }; jest .spyOn(surveyMetaService, 'deleteSurveyMeta') @@ -227,13 +178,10 @@ describe('SurveyController', () => { .mockResolvedValue(undefined); const result = await controller.deleteSurvey({ - user: { username: 'testUser' }, surveyMeta, + user: { username: 'testUser', _id: new ObjectId() }, }); - - expect(result).toEqual({ - code: 200, - }); + expect(result).toEqual({ code: 200 }); }); }); @@ -244,23 +192,19 @@ describe('SurveyController', () => { _id: surveyId, surveyType: 'exam', owner: 'testUser', - } as SurveyMeta; + }; jest .spyOn(surveyConfService, 'getSurveyConfBySurveyId') - .mockResolvedValue({ - _id: new ObjectId(), - pageId: surveyId.toString(), - } as SurveyConf); - - const request = { - user: { username: 'testUser', _id: new ObjectId() }, - surveyMeta, - }; + .mockResolvedValue({} as any); const result = await controller.getSurvey( { surveyId: surveyId.toString() }, - request, + { + surveyMeta, + user: { username: 'testUser', _id: new ObjectId() }, + }, ); + expect(result?.data?.surveyMetaRes).toBeDefined(); expect(result?.data?.surveyConfRes).toBeDefined(); }); @@ -273,28 +217,77 @@ describe('SurveyController', () => { _id: surveyId, surveyType: 'exam', owner: 'testUser', - } as SurveyMeta; + isDeleted: false, + }; jest .spyOn(surveyConfService, 'getSurveyConfBySurveyId') .mockResolvedValue({ - _id: new ObjectId(), - pageId: surveyId.toString(), code: {}, - } as SurveyConf); + } as any); jest .spyOn(surveyConfService, 'getSurveyContentByCode') .mockResolvedValue({ text: '' }); + jest + .spyOn(surveyMetaService, 'publishSurveyMeta') + .mockResolvedValue(undefined); const result = await controller.publishSurvey( { surveyId: surveyId.toString() }, - { - user: { username: 'testUser', _id: new ObjectId() }, - surveyMeta, - }, + { surveyMeta, user: { username: 'testUser', _id: new ObjectId() } }, ); expect(result.code).toBe(200); }); + + it('should throw an error if the survey is deleted', async () => { + const surveyId = new ObjectId(); + const surveyMeta = { _id: surveyId, isDeleted: true }; + + await expect( + controller.publishSurvey( + { surveyId: surveyId.toString() }, + { surveyMeta, user: { username: 'testUser' } }, + ), + ).rejects.toThrow(HttpException); + }); + }); + + // New tests for additional methods + describe('pausingSurvey', () => { + it('should pause the survey successfully', async () => { + const surveyMeta = { surveyPath: 'some/path' }; + + jest + .spyOn(surveyMetaService, 'pausingSurveyMeta') + .mockResolvedValue(undefined); + jest + .spyOn(responseSchemaService, 'pausingResponseSchema') + .mockResolvedValue(undefined); + + const result = await controller.pausingSurvey({ + surveyMeta, + user: { username: 'testUser' }, + }); + expect(result.code).toBe(200); + }); + }); + + describe('getPreviewSchema', () => { + it('should get the preview schema successfully', async () => { + const surveyId = new ObjectId(); + jest + .spyOn(surveyConfService, 'getSurveyConfBySurveyId') + .mockResolvedValue({} as any); + jest.spyOn(surveyMetaService, 'getSurveyById').mockResolvedValue({ + title: 'Test Survey', + surveyPath: 'some/path', + } as any); + + const result = await controller.getPreviewSchema({ + surveyPath: surveyId.toString(), + }); + expect(result.code).toBe(200); + }); }); }); diff --git a/server/src/modules/survey/__test/surveyHistory.service.spec.ts b/server/src/modules/survey/__test/surveyHistory.service.spec.ts index 78001c63..a162f374 100644 --- a/server/src/modules/survey/__test/surveyHistory.service.spec.ts +++ b/server/src/modules/survey/__test/surveyHistory.service.spec.ts @@ -42,7 +42,7 @@ describe('SurveyHistoryService', () => { msgContent: undefined, }, baseConf: { - begTime: '', + beginTime: '', endTime: '', answerBegTime: '', answerEndTime: '', @@ -121,9 +121,9 @@ describe('SurveyHistoryService', () => { }, take: 100, order: { - createDate: -1, + createdAt: -1, }, - select: ['createDate', 'operator', 'type', '_id'], + select: ['createdAt', 'operator', 'type', '_id'], }); }); }); diff --git a/server/src/modules/survey/__test/surveyMeta.controller.spec.ts b/server/src/modules/survey/__test/surveyMeta.controller.spec.ts index 5cd801eb..e70058ab 100644 --- a/server/src/modules/survey/__test/surveyMeta.controller.spec.ts +++ b/server/src/modules/survey/__test/surveyMeta.controller.spec.ts @@ -59,18 +59,25 @@ describe('SurveyMetaController', () => { remark: '', }; + const mockUser = { + username: 'test-user', + _id: new ObjectId(), + }; + const req = { - user: { - username: 'test-user', - }, + user: mockUser, surveyMeta: survey, }; const result = await controller.updateMeta(reqBody, req); expect(surveyMetaService.editSurveyMeta).toHaveBeenCalledWith({ - title: reqBody.title, - remark: reqBody.remark, + operator: mockUser.username, + operatorId: mockUser._id.toString(), + survey: { + title: reqBody.title, + remark: reqBody.remark, + }, }); expect(result).toEqual({ code: 200 }); @@ -116,11 +123,14 @@ describe('SurveyMetaController', () => { data: [ { _id: new ObjectId(), - createDate: date, - updateDate: date, + createdAt: date, + updatedAt: date, curStatus: { date: date, }, + subStatus: { + date: date, + }, surveyType: 'normal', }, ], @@ -135,10 +145,7 @@ describe('SurveyMetaController', () => { count: 10, data: expect.arrayContaining([ expect.objectContaining({ - createDate: expect.stringMatching( - /^\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}$/, - ), - updateDate: expect.stringMatching( + createdAt: expect.stringMatching( /^\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}$/, ), curStatus: expect.objectContaining({ @@ -146,6 +153,11 @@ describe('SurveyMetaController', () => { /^\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}$/, ), }), + subStatus: expect.objectContaining({ + date: expect.stringMatching( + /^\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}$/, + ), + }), surveyType: 'normal', }), ]), @@ -178,7 +190,7 @@ describe('SurveyMetaController', () => { condition: [{ field: 'surveyType', value: 'normal' }], }, ]), - order: JSON.stringify([{ field: 'createDate', value: -1 }]), + order: JSON.stringify([{ field: 'createdAt', value: -1 }]), }; const userId = new ObjectId().toString(); const req = { @@ -198,7 +210,7 @@ describe('SurveyMetaController', () => { surveyIdList: [], userId, filter: { surveyType: 'normal', title: { $regex: 'hahah' } }, - order: { createDate: -1 }, + order: { createdAt: -1 }, workspaceId: undefined, }); }); diff --git a/server/src/modules/survey/__test/surveyMeta.service.spec.ts b/server/src/modules/survey/__test/surveyMeta.service.spec.ts index 74b9e9e2..d566521b 100644 --- a/server/src/modules/survey/__test/surveyMeta.service.spec.ts +++ b/server/src/modules/survey/__test/surveyMeta.service.spec.ts @@ -2,12 +2,10 @@ import { Test, TestingModule } from '@nestjs/testing'; import { SurveyMetaService } from '../services/surveyMeta.service'; import { MongoRepository } from 'typeorm'; import { SurveyMeta } from 'src/models/surveyMeta.entity'; -import { PluginManagerProvider } from 'src/securityPlugin/pluginManager.provider'; import { PluginManager } from 'src/securityPlugin/pluginManager'; -import { RECORD_STATUS } from 'src/enums'; import { getRepositoryToken } from '@nestjs/typeorm'; import { HttpException } from 'src/exceptions/httpException'; -import { SurveyUtilPlugin } from 'src/securityPlugin/surveyUtilPlugin'; +import { RECORD_STATUS, RECORD_SUB_STATUS } from 'src/enums'; import { ObjectId } from 'mongodb'; describe('SurveyMetaService', () => { @@ -26,10 +24,11 @@ describe('SurveyMetaService', () => { count: jest.fn(), create: jest.fn(), save: jest.fn(), + updateOne: jest.fn(), findAndCount: jest.fn(), }, }, - PluginManagerProvider, + PluginManager, ], }).compile(); @@ -38,18 +37,18 @@ describe('SurveyMetaService', () => { getRepositoryToken(SurveyMeta), ); pluginManager = module.get(PluginManager); - pluginManager.registerPlugin(new SurveyUtilPlugin()); }); describe('getNewSurveyPath', () => { it('should generate a new survey path', async () => { - jest.spyOn(surveyRepository, 'count').mockResolvedValueOnce(1); + jest.spyOn(pluginManager, 'triggerHook').mockResolvedValueOnce('path1'); jest.spyOn(surveyRepository, 'count').mockResolvedValueOnce(0); const surveyPath = await service.getNewSurveyPath(); - expect(typeof surveyPath).toBe('string'); - expect(surveyRepository.count).toHaveBeenCalledTimes(2); + expect(surveyPath).toBe('path1'); + expect(pluginManager.triggerHook).toHaveBeenCalledTimes(1); + expect(surveyRepository.count).toHaveBeenCalledTimes(1); }); }); @@ -63,14 +62,11 @@ describe('SurveyMetaService', () => { userId: new ObjectId().toString(), createMethod: '', createFrom: '', + workspaceId: 'workspace1', }; const newSurvey = new SurveyMeta(); - const mockedSurveyPath = 'mockedSurveyPath'; - jest - .spyOn(service, 'getNewSurveyPath') - .mockResolvedValue(mockedSurveyPath); - + jest.spyOn(service, 'getNewSurveyPath').mockResolvedValue('path1'); jest .spyOn(surveyRepository, 'create') .mockImplementation(() => newSurvey); @@ -82,86 +78,118 @@ describe('SurveyMetaService', () => { title: params.title, remark: params.remark, surveyType: params.surveyType, - surveyPath: mockedSurveyPath, + surveyPath: 'path1', creator: params.username, - ownerId: params.userId, + creatorId: params.userId, owner: params.username, + ownerId: params.userId, createMethod: params.createMethod, createFrom: params.createFrom, + workspaceId: params.workspaceId, }); expect(surveyRepository.save).toHaveBeenCalledWith(newSurvey); expect(result).toEqual(newSurvey); }); }); - describe('editSurveyMeta', () => { - it('should edit a survey meta and return it if in NEW or EDITING status', async () => { + describe('pausingSurveyMeta', () => { + it('should throw an exception if survey is in NEW status', async () => { + const survey = new SurveyMeta(); + survey.curStatus = { status: RECORD_STATUS.NEW, date: Date.now() }; + + await expect(service.pausingSurveyMeta(survey)).rejects.toThrow( + HttpException, + ); + }); + + it('should pause a survey and update subStatus', async () => { const survey = new SurveyMeta(); survey.curStatus = { status: RECORD_STATUS.PUBLISHED, date: Date.now() }; survey.statusList = []; + jest.spyOn(surveyRepository, 'save').mockResolvedValue(survey); - const result = await service.editSurveyMeta(survey); + const result = await service.pausingSurveyMeta(survey); - expect(survey.curStatus.status).toEqual(RECORD_STATUS.EDITING); + expect(survey.subStatus.status).toBe(RECORD_SUB_STATUS.PAUSING); expect(survey.statusList.length).toBe(1); - expect(survey.statusList[0].status).toEqual(RECORD_STATUS.EDITING); + expect(survey.statusList[0].status).toBe(RECORD_SUB_STATUS.PAUSING); + expect(surveyRepository.save).toHaveBeenCalledWith(survey); + expect(result).toEqual(survey); + }); + }); + + describe('editSurveyMeta', () => { + it('should edit a survey meta and return it', async () => { + const survey = new SurveyMeta(); + survey.curStatus = { status: RECORD_STATUS.PUBLISHED, date: Date.now() }; + survey.statusList = []; + + const operator = 'editor'; + const operatorId = 'editorId'; + + jest.spyOn(surveyRepository, 'save').mockResolvedValue(survey); + + const result = await service.editSurveyMeta({ + survey, + operator, + operatorId, + }); + + expect(survey.curStatus.status).toBe(RECORD_STATUS.EDITING); + expect(survey.statusList.length).toBe(1); + expect(survey.statusList[0].status).toBe(RECORD_STATUS.EDITING); + expect(survey.operator).toBe(operator); + expect(survey.operatorId).toBe(operatorId); expect(surveyRepository.save).toHaveBeenCalledWith(survey); expect(result).toEqual(survey); }); }); describe('deleteSurveyMeta', () => { - it('should delete survey meta and update status', async () => { - // 准备假的SurveyMeta对象 - const survey = new SurveyMeta(); - survey.curStatus = { status: RECORD_STATUS.NEW, date: Date.now() }; - survey.statusList = []; + it('should mark a survey as deleted', async () => { + const surveyId = new ObjectId().toString(); + const operator = 'deleter'; + const operatorId = 'deleterId'; - // 模拟save方法 - jest.spyOn(surveyRepository, 'save').mockResolvedValue(survey); + jest.spyOn(surveyRepository, 'updateOne').mockResolvedValue({ + matchedCount: 1, + modifiedCount: 1, + acknowledged: true, + }); - // 调用要测试的方法 - const result = await service.deleteSurveyMeta(survey); + const result = await service.deleteSurveyMeta({ + surveyId, + operator, + operatorId, + }); - // 验证结果 - expect(result).toBe(survey); - expect(survey.curStatus.status).toBe(RECORD_STATUS.REMOVED); - expect(survey.statusList.length).toBe(1); - expect(survey.statusList[0].status).toBe(RECORD_STATUS.REMOVED); - expect(surveyRepository.save).toHaveBeenCalledTimes(1); - expect(surveyRepository.save).toHaveBeenCalledWith(survey); - }); - - it('should throw exception when survey is already removed', async () => { - // 准备假的SurveyMeta对象，其状态已设置为REMOVED - const survey = new SurveyMeta(); - survey.curStatus = { status: RECORD_STATUS.REMOVED, date: Date.now() }; - - // 调用要测试的方法并期待异常 - await expect(service.deleteSurveyMeta(survey)).rejects.toThrow( - HttpException, + expect(surveyRepository.updateOne).toHaveBeenCalledWith( + { _id: new ObjectId(surveyId) }, + { + $set: { + isDeleted: true, + operator, + operatorId, + deletedAt: expect.any(Date), + }, + }, ); - - // 验证save方法没有被调用 - expect(surveyRepository.save).not.toHaveBeenCalled(); + expect(result.matchedCount).toBe(1); }); }); describe('getSurveyMetaList', () => { it('should return a list of survey metadata', async () => { - // 准备模拟数据 const mockData = [ { _id: 1, title: 'Survey 1' }, - { _id: 2, title: 'Survey 2' }, ] as unknown as Array; - const mockCount = 2; + const mockCount = 1; jest .spyOn(surveyRepository, 'findAndCount') .mockResolvedValue([mockData, mockCount]); - // 调用方法并检查返回值 const condition = { pageNum: 1, pageSize: 10, @@ -170,40 +198,47 @@ describe('SurveyMetaService', () => { filter: {}, order: {}, }; + const result = await service.getSurveyMetaList(condition); - // 验证返回值 expect(result).toEqual({ data: mockData, count: mockCount }); - // 验证repository方法被正确调用 expect(surveyRepository.findAndCount).toHaveBeenCalledTimes(1); }); }); describe('publishSurveyMeta', () => { - it('should publish a survey meta and add status to statusList', async () => { - // 准备模拟数据 - const surveyMeta = { - id: 1, - title: 'Test Survey', - statusList: [], - } as unknown as SurveyMeta; - const savedSurveyMeta = { - ...surveyMeta, - curStatus: { - status: RECORD_STATUS.PUBLISHED, - date: expect.any(Number), - }, - } as unknown as SurveyMeta; + it('should publish a survey and update curStatus', async () => { + const surveyMeta = new SurveyMeta(); + surveyMeta.statusList = []; - jest.spyOn(surveyRepository, 'save').mockResolvedValue(savedSurveyMeta); + jest.spyOn(surveyRepository, 'save').mockResolvedValue(surveyMeta); - // 调用方法并检查返回值 const result = await service.publishSurveyMeta({ surveyMeta }); - // 验证返回值 - expect(result).toEqual(savedSurveyMeta); - // 验证repository方法被正确调用 - expect(surveyRepository.save).toHaveBeenCalledWith(savedSurveyMeta); + expect(surveyMeta.curStatus.status).toBe(RECORD_STATUS.PUBLISHED); + expect(surveyMeta.statusList.length).toBe(1); + expect(surveyMeta.statusList[0].status).toBe(RECORD_STATUS.PUBLISHED); + expect(surveyRepository.save).toHaveBeenCalledWith(surveyMeta); + expect(result).toEqual(surveyMeta); + }); + }); + + describe('countSurveyMetaByWorkspaceId', () => { + it('should return the count of surveys in a workspace', async () => { + const workspaceId = 'workspace1'; + const mockCount = 5; + + jest.spyOn(surveyRepository, 'count').mockResolvedValue(mockCount); + + const result = await service.countSurveyMetaByWorkspaceId({ + workspaceId, + }); + + expect(result).toBe(mockCount); + expect(surveyRepository.count).toHaveBeenCalledWith({ + workspaceId, + isDeleted: { $ne: true }, + }); }); }); }); diff --git a/server/src/modules/survey/controllers/collaborator.controller.ts b/server/src/modules/survey/controllers/collaborator.controller.ts index da1d5b5e..be6b5a6e 100644 --- a/server/src/modules/survey/controllers/collaborator.controller.ts +++ b/server/src/modules/survey/controllers/collaborator.controller.ts @@ -185,10 +185,14 @@ export class CollaboratorController { userIdList: newCollaboratorUserIdList, }); this.logger.info('batchDelete:' + JSON.stringify(delRes)); + const username = req.user.username; + const userId = req.user._id.toString(); if (Array.isArray(newCollaborator) && newCollaborator.length > 0) { const insertRes = await this.collaboratorService.batchCreate({ surveyId: value.surveyId, collaboratorList: newCollaborator, + creator: username, + creatorId: userId, }); this.logger.info(`${JSON.stringify(insertRes)}`); } @@ -198,6 +202,8 @@ export class CollaboratorController { this.collaboratorService.updateById({ collaboratorId: item._id, permissions: item.permissions, + operator: username, + operatorId: userId, }), ), ); diff --git a/server/src/modules/survey/controllers/downloadTask.controller.ts b/server/src/modules/survey/controllers/downloadTask.controller.ts index 8247acf7..4a83baab 100644 --- a/server/src/modules/survey/controllers/downloadTask.controller.ts +++ b/server/src/modules/survey/controllers/downloadTask.controller.ts @@ -98,7 +98,7 @@ export class DownloadTaskController { list: list.map((data) => { const item: Record = {}; item.taskId = data._id.toString(); - item.curStatus = data.curStatus; + item.status = data.status; item.filename = data.filename; item.url = data.url; const fmt = 'YYYY-MM-DD HH:mm:ss'; @@ -114,7 +114,7 @@ export class DownloadTaskController { } item.fileSize = `${size.toFixed()} ${units[unitIndex]}`; } - item.createDate = moment(Number(data.createDate)).format(fmt); + item.createdAt = moment(data.createdAt).format(fmt); return item; }), }, @@ -177,6 +177,8 @@ export class DownloadTaskController { const delRes = await this.downloadTaskService.deleteDownloadTask({ taskId, + operator: req.user.username, + operatorId: req.user._id.toString(), }); return { diff --git a/server/src/modules/survey/controllers/session.controller.ts b/server/src/modules/survey/controllers/session.controller.ts index f17dbaef..93f01528 100644 --- a/server/src/modules/survey/controllers/session.controller.ts +++ b/server/src/modules/survey/controllers/session.controller.ts @@ -67,9 +67,9 @@ export class SessionController { @Post('/seize') @HttpCode(200) - @UseGuards(SurveyGuard) - @UseGuards(SessionGuard) + @UseGuards(SessionGuard, SurveyGuard) @SetMetadata('sessionId', 'body.sessionId') + @SetMetadata('surveyId', 'surveyId') @SetMetadata('surveyPermission', [SURVEY_PERMISSION.SURVEY_CONF_MANAGE]) @UseGuards(Authentication) async seize( diff --git a/server/src/modules/survey/controllers/survey.controller.ts b/server/src/modules/survey/controllers/survey.controller.ts index 2a7bc4ee..98d32d89 100644 --- a/server/src/modules/survey/controllers/survey.controller.ts +++ b/server/src/modules/survey/controllers/survey.controller.ts @@ -144,7 +144,7 @@ export class SurveyController { if (latestEditingOne && latestEditingOne._id.toString() !== sessionId) { const curSession = await this.sessionService.findOne(sessionId); - if (curSession.createDate <= latestEditingOne.updateDate) { + if (curSession.createdAt <= latestEditingOne.updatedAt) { // 在当前用户打开之后，被其他页面保存过了 const isSameOperator = latestEditingOne.userId === req.user._id.toString(); @@ -194,8 +194,35 @@ export class SurveyController { async deleteSurvey(@Request() req) { const surveyMeta = req.surveyMeta; - await this.surveyMetaService.deleteSurveyMeta(surveyMeta); - await this.responseSchemaService.deleteResponseSchema({ + const delMetaRes = await this.surveyMetaService.deleteSurveyMeta({ + surveyId: surveyMeta._id.toString(), + operator: req.user.username, + operatorId: req.user._id.toString(), + }); + const delResponseRes = + await this.responseSchemaService.deleteResponseSchema({ + surveyPath: surveyMeta.surveyPath, + }); + + this.logger.info(JSON.stringify(delMetaRes)); + this.logger.info(JSON.stringify(delResponseRes)); + + return { + code: 200, + }; + } + + @HttpCode(200) + @Post('/pausingSurvey') + @UseGuards(SurveyGuard) + @SetMetadata('surveyId', 'body.surveyId') + @SetMetadata('surveyPermission', [SURVEY_PERMISSION.SURVEY_CONF_MANAGE]) + @UseGuards(Authentication) + async pausingSurvey(@Request() req) { + const surveyMeta = req.surveyMeta; + + await this.surveyMetaService.pausingSurveyMeta(surveyMeta); + await this.responseSchemaService.pausingResponseSchema({ surveyPath: surveyMeta.surveyPath, }); @@ -305,6 +332,12 @@ export class SurveyController { const username = req.user.username; const surveyId = value.surveyId; const surveyMeta = req.surveyMeta; + if (surveyMeta.isDeleted) { + throw new HttpException( + '问卷已删除，无法发布', + EXCEPTION_CODE.SURVEY_NOT_FOUND, + ); + } const surveyConf = await this.surveyConfService.getSurveyConfBySurveyId(surveyId); @@ -330,7 +363,8 @@ export class SurveyController { pageId: surveyId, }); - await this.surveyHistoryService.addHistory({ + // 添加发布历史可以异步添加 + this.surveyHistoryService.addHistory({ surveyId, schema: surveyConf.code, type: HISTORY_TYPE.PUBLISH_HIS, diff --git a/server/src/modules/survey/controllers/surveyHistory.controller.ts b/server/src/modules/survey/controllers/surveyHistory.controller.ts index 286b47f0..220cae4b 100644 --- a/server/src/modules/survey/controllers/surveyHistory.controller.ts +++ b/server/src/modules/survey/controllers/surveyHistory.controller.ts @@ -18,7 +18,7 @@ import { Logger } from 'src/logger'; import { HttpException } from 'src/exceptions/httpException'; import { EXCEPTION_CODE } from 'src/enums/exceptionCode'; @ApiTags('survey') -@Controller('/api/surveyHisotry') +@Controller('/api/surveyHistory') export class SurveyHistoryController { constructor( private readonly surveyHistoryService: SurveyHistoryService, diff --git a/server/src/modules/survey/controllers/surveyMeta.controller.ts b/server/src/modules/survey/controllers/surveyMeta.controller.ts index ec50148e..5acf41d5 100644 --- a/server/src/modules/survey/controllers/surveyMeta.controller.ts +++ b/server/src/modules/survey/controllers/surveyMeta.controller.ts @@ -58,7 +58,11 @@ export class SurveyMetaController { survey.title = value.title; survey.remark = value.remark; - await this.surveyMetaService.editSurveyMeta(survey); + await this.surveyMetaService.editSurveyMeta({ + survey, + operator: req.user.username, + operatorId: req.user._id.toString(), + }); return { code: 200, @@ -127,9 +131,10 @@ export class SurveyMetaController { if (!item.surveyType) { item.surveyType = item.questionType || 'normal'; } - item.createDate = moment(item.createDate).format(fmt); - item.updateDate = moment(item.updateDate).format(fmt); + item.createdAt = moment(item.createdAt).format(fmt); item.curStatus.date = moment(item.curStatus.date).format(fmt); + item.subStatus.date = moment(item.subStatus.date).format(fmt); + item.updatedAt = moment(item.updatedAt).format(fmt); const surveyId = item._id.toString(); if (cooperSurveyIdMap[surveyId]) { item.isCollaborated = true; diff --git a/server/src/modules/survey/services/collaborator.service.ts b/server/src/modules/survey/services/collaborator.service.ts index cfd6c628..169c24f8 100644 --- a/server/src/modules/survey/services/collaborator.service.ts +++ b/server/src/modules/survey/services/collaborator.service.ts @@ -22,12 +22,17 @@ export class CollaboratorService { return this.collaboratorRepository.save(collaborator); } - async batchCreate({ surveyId, collaboratorList }) { + async batchCreate({ surveyId, collaboratorList, creator, creatorId }) { + const now = new Date(); const res = await this.collaboratorRepository.insertMany( collaboratorList.map((item) => { return { ...item, surveyId, + createdAt: now, + updatedAt: now, + creator, + creatorId, }; }), ); @@ -60,7 +65,13 @@ export class CollaboratorService { return info; } - async changeUserPermission({ userId, surveyId, permission }) { + async changeUserPermission({ + userId, + surveyId, + permission, + operator, + operatorId, + }) { const updateRes = await this.collaboratorRepository.updateOne( { surveyId, @@ -69,6 +80,9 @@ export class CollaboratorService { { $set: { permission, + operator, + operatorId, + updatedAt: new Date(), }, }, ); @@ -134,7 +148,7 @@ export class CollaboratorService { return delRes; } - updateById({ collaboratorId, permissions }) { + updateById({ collaboratorId, permissions, operator, operatorId }) { return this.collaboratorRepository.updateOne( { _id: new ObjectId(collaboratorId), @@ -142,6 +156,9 @@ export class CollaboratorService { { $set: { permissions, + operator, + operatorId, + updatedAt: new Date(), }, }, ); diff --git a/server/src/modules/survey/services/dataStatistic.service.ts b/server/src/modules/survey/services/dataStatistic.service.ts index 0551b432..fbb29ec5 100644 --- a/server/src/modules/survey/services/dataStatistic.service.ts +++ b/server/src/modules/survey/services/dataStatistic.service.ts @@ -34,8 +34,8 @@ export class DataStatisticService { const dataListMap = keyBy(dataList, 'field'); const where = { pageId: surveyId, - 'curStatus.status': { - $ne: 'removed', + isDeleted: { + $ne: true, }, }; const [surveyResponseList, total] = @@ -44,7 +44,7 @@ export class DataStatisticService { take: pageSize, skip: (pageNum - 1) * pageSize, order: { - createDate: -1, + createdAt: -1, }, }); @@ -90,10 +90,10 @@ export class DataStatisticService { } return { ...data, - diffTime: (submitedData.diffTime / 1000).toFixed(2), - createDate: moment(submitedData.createDate).format( - 'YYYY-MM-DD HH:mm:ss', - ), + diffTime: submitedData.diffTime + ? (submitedData.diffTime / 1000).toFixed(2) + : '0', + createdAt: moment(submitedData.createdAt).format('YYYY-MM-DD HH:mm:ss'), }; }); return { @@ -124,8 +124,8 @@ export class DataStatisticService { { $match: { pageId: surveyId, - 'curStatus.status': { - $ne: 'removed', + isDeleted: { + $ne: true, }, }, }, diff --git a/server/src/modules/survey/services/downloadTask.service.ts b/server/src/modules/survey/services/downloadTask.service.ts index 9dce616a..e98eb201 100644 --- a/server/src/modules/survey/services/downloadTask.service.ts +++ b/server/src/modules/survey/services/downloadTask.service.ts @@ -3,7 +3,6 @@ import { InjectRepository } from '@nestjs/typeorm'; import { MongoRepository } from 'typeorm'; import { ResponseSchema } from 'src/models/responseSchema.entity'; import { DownloadTask } from 'src/models/downloadTask.entity'; -import { RECORD_STATUS } from 'src/enums'; import { ObjectId } from 'mongodb'; import { ResponseSchemaService } from 'src/modules/surveyResponse/services/responseScheme.service'; import { SurveyResponse } from 'src/models/surveyResponse.entity'; @@ -14,6 +13,7 @@ import { get } from 'lodash'; import { FileService } from 'src/modules/file/services/file.service'; import { Logger } from 'src/logger'; import moment from 'moment'; +import { DOWNLOAD_TASK_STATUS } from 'src/enums/downloadTaskStatus'; @Injectable() export class DownloadTaskService { @@ -56,6 +56,7 @@ export class DownloadTaskService { title: responseSchema.title, }, filename, + status: DOWNLOAD_TASK_STATUS.WAITING, }); await this.downloadTaskRepository.save(downloadTask); return downloadTask._id.toString(); @@ -72,8 +73,8 @@ export class DownloadTaskService { }) { const where = { creatorId, - 'curStatus.status': { - $ne: RECORD_STATUS.REMOVED, + isDeleted: { + $ne: true, }, }; const [surveyDownloadList, total] = @@ -82,7 +83,7 @@ export class DownloadTaskService { take: pageSize, skip: (pageIndex - 1) * pageSize, order: { - createDate: -1, + createdAt: -1, }, }); return { @@ -103,24 +104,25 @@ export class DownloadTaskService { return null; } - async deleteDownloadTask({ taskId }: { taskId: string }) { - const curStatus = { - status: RECORD_STATUS.REMOVED, - date: Date.now(), - }; + async deleteDownloadTask({ + taskId, + operator, + operatorId, + }: { + taskId: string; + operator: string; + operatorId: string; + }) { return this.downloadTaskRepository.updateOne( { _id: new ObjectId(taskId), - 'curStatus.status': { - $ne: RECORD_STATUS.REMOVED, - }, }, { $set: { - curStatus, - }, - $push: { - statusList: curStatus as never, + isDeleted: true, + operator, + operatorId, + deletedAt: new Date(), }, }, ); @@ -140,7 +142,7 @@ export class DownloadTaskService { const taskId = DownloadTaskService.taskList.shift(); this.logger.info(`handle taskId: ${taskId}`); const taskInfo = await this.getDownloadTaskById({ taskId }); - if (!taskInfo || taskInfo.curStatus.status === RECORD_STATUS.REMOVED) { + if (!taskInfo || taskInfo.isDeleted) { // 不存在或者已删除的，不处理 continue; } @@ -151,7 +153,7 @@ export class DownloadTaskService { } } - private async handleDownloadTask({ taskInfo }) { + async handleDownloadTask({ taskInfo }) { try { // 更新任务状态为计算中 const updateRes = await this.downloadTaskRepository.updateOne( @@ -160,10 +162,8 @@ export class DownloadTaskService { }, { $set: { - curStatus: { - status: RECORD_STATUS.COMPUTING, - date: Date.now(), - }, + status: DOWNLOAD_TASK_STATUS.COMPUTING, + updatedAt: new Date(), }, }, ); @@ -176,9 +176,6 @@ export class DownloadTaskService { await this.responseSchemaService.getResponseSchemaByPageId(surveyId); const where = { pageId: surveyId, - 'curStatus.status': { - $ne: 'removed', - }, }; const total = await this.surveyResponseRepository.count(where); const pageSize = 200; @@ -205,9 +202,13 @@ export class DownloadTaskService { for (const headItem of listHead) { const field = headItem.field; const val = get(bodyItem, field, ''); - const $ = load(val); - const text = $.text(); - bodyData.push(text); + if (typeof val === 'string') { + const $ = load(val); + const text = $.text(); + bodyData.push(text); + } else { + bodyData.push(val); + } } xlsxBody.push(bodyData); } @@ -236,11 +237,6 @@ export class DownloadTaskService { filename: taskInfo.filename, }); - const curStatus = { - status: RECORD_STATUS.FINISHED, - date: Date.now(), - }; - // 更新计算结果 const updateFinishRes = await this.downloadTaskRepository.updateOne( { @@ -248,32 +244,24 @@ export class DownloadTaskService { }, { $set: { - curStatus, + status: DOWNLOAD_TASK_STATUS.SUCCEED, url, fileKey: key, fileSize: buffer.length, - }, - $push: { - statusList: curStatus as never, + updatedAt: new Date(), }, }, ); this.logger.info(JSON.stringify(updateFinishRes)); } catch (error) { - const curStatus = { - status: RECORD_STATUS.ERROR, - date: Date.now(), - }; await this.downloadTaskRepository.updateOne( { _id: taskInfo._id, }, { $set: { - curStatus, - }, - $push: { - statusList: curStatus as never, + status: DOWNLOAD_TASK_STATUS.FAILED, + updatedAt: new Date(), }, }, ); diff --git a/server/src/modules/survey/services/session.service.ts b/server/src/modules/survey/services/session.service.ts index e70fd3da..a0060d8e 100644 --- a/server/src/modules/survey/services/session.service.ts +++ b/server/src/modules/survey/services/session.service.ts @@ -3,7 +3,7 @@ import { InjectRepository } from '@nestjs/typeorm'; import { MongoRepository } from 'typeorm'; import { Session } from 'src/models/session.entity'; import { ObjectId } from 'mongodb'; -import { RECORD_STATUS } from 'src/enums'; +import { SESSION_STATUS } from 'src/enums/surveySessionStatus'; @Injectable() export class SessionService { @@ -16,6 +16,7 @@ export class SessionService { const session = this.sessionRepository.create({ surveyId, userId, + status: SESSION_STATUS.DEACTIVATED, }); return this.sessionRepository.save(session); } @@ -32,33 +33,20 @@ export class SessionService { return this.sessionRepository.findOne({ where: { surveyId, - 'curStatus.status': { - $ne: RECORD_STATUS.NEW, - }, + status: SESSION_STATUS.ACTIVATED, }, }); } updateSessionToEditing({ sessionId, surveyId }) { - const now = Date.now(); - const editingStatus = { - status: RECORD_STATUS.EDITING, - date: now, - }; - const newStatus = { - status: RECORD_STATUS.NEW, - date: now, - }; return Promise.all([ - this.sessionRepository.updateOne( + this.sessionRepository.update( { _id: new ObjectId(sessionId), }, { - $set: { - curStatus: editingStatus, - updateDate: now, - }, + status: SESSION_STATUS.ACTIVATED, + updatedAt: new Date(), }, ), this.sessionRepository.updateMany( @@ -70,8 +58,8 @@ export class SessionService { }, { $set: { - curStatus: newStatus, - updateDate: now, + status: SESSION_STATUS.DEACTIVATED, + updatedAt: new Date(), }, }, ), diff --git a/server/src/modules/survey/services/surveyHistory.service.ts b/server/src/modules/survey/services/surveyHistory.service.ts index 0b512faf..0eda2c8f 100644 --- a/server/src/modules/survey/services/surveyHistory.service.ts +++ b/server/src/modules/survey/services/surveyHistory.service.ts @@ -45,9 +45,9 @@ export class SurveyHistoryService { }, take: 100, order: { - createDate: -1, + createdAt: -1, }, - select: ['createDate', 'operator', 'type', '_id'], + select: ['createdAt', 'operator', 'type', '_id'], }); } } diff --git a/server/src/modules/survey/services/surveyMeta.service.ts b/server/src/modules/survey/services/surveyMeta.service.ts index b61106d7..71a160a8 100644 --- a/server/src/modules/survey/services/surveyMeta.service.ts +++ b/server/src/modules/survey/services/surveyMeta.service.ts @@ -2,7 +2,7 @@ import { Injectable } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; import { MongoRepository, FindOptionsOrder } from 'typeorm'; import { SurveyMeta } from 'src/models/surveyMeta.entity'; -import { RECORD_STATUS } from 'src/enums'; +import { RECORD_STATUS, RECORD_SUB_STATUS } from 'src/enums'; import { ObjectId } from 'mongodb'; import { HttpException } from 'src/exceptions/httpException'; import { EXCEPTION_CODE } from 'src/enums/exceptionCode'; @@ -65,6 +65,7 @@ export class SurveyMetaService { surveyType: surveyType, surveyPath, creator: username, + creatorId: userId, owner: username, ownerId: userId, createMethod, @@ -75,11 +76,36 @@ export class SurveyMetaService { return await this.surveyRepository.save(newSurvey); } - async editSurveyMeta(survey: SurveyMeta) { - if ( - survey.curStatus.status !== RECORD_STATUS.NEW && - survey.curStatus.status !== RECORD_STATUS.EDITING - ) { + async pausingSurveyMeta(survey: SurveyMeta) { + if (survey?.curStatus?.status === RECORD_STATUS.NEW) { + throw new HttpException( + '问卷不能暂停', + EXCEPTION_CODE.SURVEY_STATUS_TRANSFORM_ERROR, + ); + } + const subCurStatus = { + status: RECORD_SUB_STATUS.PAUSING, + date: Date.now(), + }; + survey.subStatus = subCurStatus; + if (Array.isArray(survey.statusList)) { + survey.statusList.push(subCurStatus); + } else { + survey.statusList = [subCurStatus]; + } + return this.surveyRepository.save(survey); + } + + async editSurveyMeta({ + survey, + operator, + operatorId, + }: { + survey: SurveyMeta; + operator: string; + operatorId: string; + }) { + if (survey?.curStatus?.status !== RECORD_STATUS.EDITING) { const newStatus = { status: RECORD_STATUS.EDITING, date: Date.now(), @@ -87,27 +113,26 @@ export class SurveyMetaService { survey.curStatus = newStatus; survey.statusList.push(newStatus); } + survey.updatedAt = new Date(); + survey.operator = operator; + survey.operatorId = operatorId; return this.surveyRepository.save(survey); } - async deleteSurveyMeta(survey: SurveyMeta) { - if (survey.curStatus.status === RECORD_STATUS.REMOVED) { - throw new HttpException( - '问卷已删除，不能重复删除', - EXCEPTION_CODE.SURVEY_STATUS_TRANSFORM_ERROR, - ); - } - const newStatusInfo = { - status: RECORD_STATUS.REMOVED, - date: Date.now(), - }; - survey.curStatus = newStatusInfo; - if (Array.isArray(survey.statusList)) { - survey.statusList.push(newStatusInfo); - } else { - survey.statusList = [newStatusInfo]; - } - return this.surveyRepository.save(survey); + async deleteSurveyMeta({ surveyId, operator, operatorId }) { + return this.surveyRepository.updateOne( + { + _id: new ObjectId(surveyId), + }, + { + $set: { + isDeleted: true, + operator, + operatorId, + deletedAt: new Date(), + }, + }, + ); } async getSurveyMetaList(condition: { @@ -125,14 +150,16 @@ export class SurveyMetaService { const skip = (pageNum - 1) * pageSize; try { const query: Record = Object.assign( - {}, { - 'curStatus.status': { - $ne: 'removed', + isDeleted: { + $ne: true, }, }, condition.filter, ); + if (condition.filter['curStatus.status']) { + query['subStatus.status'] = RECORD_SUB_STATUS.DEFAULT; + } if (workspaceId) { query.workspaceId = workspaceId; } else { @@ -160,9 +187,8 @@ export class SurveyMetaService { condition.order && Object.keys(condition.order).length > 0 ? (condition.order as FindOptionsOrder) : ({ - createDate: -1, + createdAt: -1, } as FindOptionsOrder); - const [data, count] = await this.surveyRepository.findAndCount({ where: query, skip, @@ -181,6 +207,10 @@ export class SurveyMetaService { date: Date.now(), }; surveyMeta.curStatus = curStatus; + surveyMeta.subStatus = { + status: RECORD_SUB_STATUS.DEFAULT, + date: Date.now(), + }; if (Array.isArray(surveyMeta.statusList)) { surveyMeta.statusList.push(curStatus); } else { @@ -192,8 +222,8 @@ export class SurveyMetaService { async countSurveyMetaByWorkspaceId({ workspaceId }) { const total = await this.surveyRepository.count({ workspaceId, - 'curStatus.status': { - $ne: RECORD_STATUS.REMOVED, + isDeleted: { + $ne: true, }, }); return total; diff --git a/server/src/modules/survey/template/surveyTemplate/templateBase.json b/server/src/modules/survey/template/surveyTemplate/templateBase.json index 0a2bc4c4..bbe43911 100644 --- a/server/src/modules/survey/template/surveyTemplate/templateBase.json +++ b/server/src/modules/survey/template/surveyTemplate/templateBase.json @@ -32,7 +32,7 @@ "logoImageWidth": "60%" }, "baseConf": { - "begTime": "2024-01-01 00:00:00", + "beginTime": "2024-01-01 00:00:00", "endTime": "2034-01-01 00:00:00", "tLimit": 0, "language": "chinese", diff --git a/server/src/modules/survey/utils/index.ts b/server/src/modules/survey/utils/index.ts index a6a64ccd..286f0430 100644 --- a/server/src/modules/survey/utils/index.ts +++ b/server/src/modules/survey/utils/index.ts @@ -22,7 +22,7 @@ export async function getSchemaBySurveyType(surveyType: string) { } const code = Object.assign({}, templateBase, codeData); const nowMoment = moment(); - code.baseConf.begTime = nowMoment.format('YYYY-MM-DD HH:mm:ss'); + code.baseConf.beginTime = nowMoment.format('YYYY-MM-DD HH:mm:ss'); code.baseConf.endTime = nowMoment .add(10, 'years') .format('YYYY-MM-DD HH:mm:ss'); @@ -63,7 +63,7 @@ export function getListHeadByDataList(dataList) { type: QUESTION_TYPE.TEXT, }); listHead.push({ - field: 'createDate', + field: 'createdAt', title: '提交时间', type: QUESTION_TYPE.TEXT, }); diff --git a/server/src/modules/surveyResponse/__test/clientEncrypt.service.spec.ts b/server/src/modules/surveyResponse/__test/clientEncrypt.service.spec.ts index 9d2418c6..fd368bbe 100644 --- a/server/src/modules/surveyResponse/__test/clientEncrypt.service.spec.ts +++ b/server/src/modules/surveyResponse/__test/clientEncrypt.service.spec.ts @@ -3,7 +3,6 @@ import { MongoRepository } from 'typeorm'; import { ClientEncryptService } from '../services/clientEncrypt.service'; import { ClientEncrypt } from 'src/models/clientEncrypt.entity'; import { ENCRYPT_TYPE } from 'src/enums/encrypt'; -import { RECORD_STATUS } from 'src/enums'; import { ObjectId } from 'mongodb'; import { getRepositoryToken } from '@nestjs/typeorm'; @@ -22,6 +21,7 @@ describe('ClientEncryptService', () => { save: jest.fn(), findOne: jest.fn(), updateOne: jest.fn(), + deleteOne: jest.fn(), }, }, ], @@ -88,9 +88,6 @@ describe('ClientEncryptService', () => { expect(repository.findOne).toHaveBeenCalledWith({ where: { _id: new ObjectId(id), - 'curStatus.status': { - $ne: RECORD_STATUS.REMOVED, - }, }, }); expect(result).toEqual(encryptInfo); @@ -109,11 +106,13 @@ describe('ClientEncryptService', () => { describe('deleteEncryptInfo', () => { it('should delete encrypt info by id', async () => { const id = new ObjectId().toHexString(); - const updateResult = { matchedCount: 1, modifiedCount: 1 }; - jest.spyOn(repository, 'updateOne').mockResolvedValue(updateResult); + const deleteResult = { matchedCount: 1, modifiedCount: 1 }; + jest + .spyOn(repository, 'deleteOne') + .mockResolvedValue(deleteResult as any); const result = await service.deleteEncryptInfo(id); - expect(result).toEqual(updateResult); + expect(result).toEqual(deleteResult); }); }); }); diff --git a/server/src/modules/surveyResponse/__test/counter.service.spec.ts b/server/src/modules/surveyResponse/__test/counter.service.spec.ts index 41cde4eb..264a4c7e 100644 --- a/server/src/modules/surveyResponse/__test/counter.service.spec.ts +++ b/server/src/modules/surveyResponse/__test/counter.service.spec.ts @@ -50,6 +50,7 @@ describe('CounterService', () => { surveyPath: 'testPath', type: 'testType', data, + updatedAt: expect.any(Date), }, }, { upsert: true }, diff --git a/server/src/modules/surveyResponse/__test/mockResponseSchema.ts b/server/src/modules/surveyResponse/__test/mockResponseSchema.ts index 607de2a2..34b2dfab 100644 --- a/server/src/modules/surveyResponse/__test/mockResponseSchema.ts +++ b/server/src/modules/surveyResponse/__test/mockResponseSchema.ts @@ -1,5 +1,5 @@ import { ResponseSchema } from 'src/models/responseSchema.entity'; -import { RECORD_STATUS } from 'src/enums'; +import { RECORD_STATUS, RECORD_SUB_STATUS } from 'src/enums'; import { ObjectId } from 'mongodb'; export const mockResponseSchema: ResponseSchema = { @@ -8,14 +8,18 @@ export const mockResponseSchema: ResponseSchema = { status: RECORD_STATUS.PUBLISHED, date: 1710399368439, }, + subStatus: { + status: RECORD_SUB_STATUS.DEFAULT, + date: 1710399368439, + }, statusList: [ { status: RECORD_STATUS.PUBLISHED, date: 1710399368439, }, ], - createDate: 1710399368440, - updateDate: 1710399368440, + createdAt: 1710399368440, + updatedAt: 1710399368440, title: '加密全流程', surveyPath: 'EBzdmnSp', code: { @@ -32,7 +36,7 @@ export const mockResponseSchema: ResponseSchema = { }, }, baseConf: { - begTime: '2024-03-14 14:54:41', + beginTime: '2024-03-14 14:54:41', endTime: '2034-03-14 14:54:41', language: 'chinese', tLimit: 10, @@ -247,4 +251,4 @@ export const mockResponseSchema: ResponseSchema = { }, }, pageId: '65f29f3192862d6a9067ad1c', -} as ResponseSchema; +} as unknown as ResponseSchema; diff --git a/server/src/modules/surveyResponse/__test/responseSchema.controller.spec.ts b/server/src/modules/surveyResponse/__test/responseSchema.controller.spec.ts index 497580df..3ba8b3c5 100644 --- a/server/src/modules/surveyResponse/__test/responseSchema.controller.spec.ts +++ b/server/src/modules/surveyResponse/__test/responseSchema.controller.spec.ts @@ -3,27 +3,28 @@ import { ResponseSchemaController } from '../controllers/responseSchema.controll import { ResponseSchemaService } from '../services/responseScheme.service'; import { HttpException } from 'src/exceptions/httpException'; import { EXCEPTION_CODE } from 'src/enums/exceptionCode'; -import { RECORD_STATUS } from 'src/enums'; - +import { RECORD_SUB_STATUS } from 'src/enums'; import { ResponseSchema } from 'src/models/responseSchema.entity'; import { Logger } from 'src/logger'; import { UserService } from 'src/modules/auth/services/user.service'; import { WorkspaceMemberService } from 'src/modules/workspace/services/workspaceMember.service'; -import { AuthService } from 'src/modules/auth/services/auth.service'; import { SurveyNotFoundException } from 'src/exceptions/surveyNotFoundException'; jest.mock('../services/responseScheme.service'); +jest.mock('src/modules/auth/services/user.service'); +jest.mock('src/modules/workspace/services/workspaceMember.service'); describe('ResponseSchemaController', () => { let controller: ResponseSchemaController; let responseSchemaService: ResponseSchemaService; + let userService: UserService; + let workspaceMemberService: WorkspaceMemberService; beforeEach(async () => { const module: TestingModule = await Test.createTestingModule({ controllers: [ResponseSchemaController], providers: [ ResponseSchemaService, - AuthService, { provide: Logger, useValue: { @@ -42,12 +43,6 @@ describe('ResponseSchemaController', () => { findAllByUserId: jest.fn(), }, }, - { - provide: AuthService, - useValue: { - create: jest.fn(), - }, - }, { provide: Logger, useValue: { @@ -61,6 +56,10 @@ describe('ResponseSchemaController', () => { responseSchemaService = module.get( ResponseSchemaService, ); + userService = module.get(UserService); + workspaceMemberService = module.get( + WorkspaceMemberService, + ); }); describe('getSchema', () => { @@ -68,12 +67,20 @@ describe('ResponseSchemaController', () => { const mockQueryInfo = { surveyPath: 'validSurveyPath' }; const mockResponseSchema = { surveyPath: 'testSurveyPath', - curStatus: { status: RECORD_STATUS.PUBLISHED, date: Date.now() }, + curStatus: { status: 'published', date: Date.now() }, + subStatus: { status: RECORD_SUB_STATUS.DEFAULT, date: Date.now() }, + code: { + baseConf: { + passwordSwitch: false, + password: null, + whitelist: [], + }, + }, } as ResponseSchema; jest .spyOn(responseSchemaService, 'getResponseSchemaByPath') - .mockResolvedValue(Promise.resolve(mockResponseSchema)); + .mockResolvedValue(mockResponseSchema); const result = await controller.getSchema(mockQueryInfo); @@ -97,153 +104,180 @@ describe('ResponseSchemaController', () => { jest .spyOn(responseSchemaService, 'getResponseSchemaByPath') .mockResolvedValue({ - curStatus: { status: RECORD_STATUS.REMOVED }, + isDeleted: true, } as ResponseSchema); await expect(controller.getSchema(mockQueryInfo)).rejects.toThrow( - new HttpException('问卷已删除', EXCEPTION_CODE.RESPONSE_SCHEMA_REMOVED), + new HttpException( + '问卷不存在或已删除', + EXCEPTION_CODE.RESPONSE_SCHEMA_REMOVED, + ), ); }); - it('whitelistValidate should throw SurveyNotFoundException when survey is removed', async () => { - const surveyPath = ''; - jest - .spyOn(responseSchemaService, 'getResponseSchemaByPath') - .mockResolvedValue(null); - await expect( - controller.whitelistValidate(surveyPath, { - password: '123456', - }), - ).rejects.toThrow(new SurveyNotFoundException('该问卷不存在,无法提交')); - }); + it('should throw HttpException with RESPONSE_PAUSING code when survey is paused', async () => { + const mockQueryInfo = { surveyPath: 'pausedSurveyPath' }; - it('whitelistValidate should throw WHITELIST_ERROR code when password is incorrect', async () => { - const surveyPath = ''; jest .spyOn(responseSchemaService, 'getResponseSchemaByPath') .mockResolvedValue({ - curStatus: { - status: 'published', - }, - code: { - baseConf: { - passwordSwitch: true, - password: '123456', - }, - }, - } as ResponseSchema); - await expect( - controller.whitelistValidate(surveyPath, { - password: '123457', - }), - ).rejects.toThrow( - new HttpException('验证失败', EXCEPTION_CODE.WHITELIST_ERROR), - ); - }); - - it('whitelistValidate should be successfully', async () => { - const surveyPath = 'test'; - jest - .spyOn(responseSchemaService, 'getResponseSchemaByPath') - .mockResolvedValue({ - curStatus: { - status: 'published', - }, - code: { - baseConf: { - passwordSwitch: true, - password: '123456', - }, - }, + curStatus: { status: 'published' }, + subStatus: { status: RECORD_SUB_STATUS.PAUSING }, } as ResponseSchema); - await expect( - controller.whitelistValidate(surveyPath, { - password: '123456', - }), - ).resolves.toEqual({ code: 200, data: null }); - }); - - it('whitelistValidate should throw WHITELIST_ERROR code when mobile or email is incorrect', async () => { - const surveyPath = ''; - jest - .spyOn(responseSchemaService, 'getResponseSchemaByPath') - .mockResolvedValue({ - curStatus: { - status: 'published', - }, - code: { - baseConf: { - passwordSwitch: true, - password: '123456', - whitelistType: 'CUSTOM', - memberType: 'MOBILE', - whitelist: ['13500000000'], - }, - }, - } as ResponseSchema); - await expect( - controller.whitelistValidate(surveyPath, { - password: '123456', - whitelist: '13500000001', - }), - ).rejects.toThrow( - new HttpException('验证失败', EXCEPTION_CODE.WHITELIST_ERROR), - ); - }); - - it('whitelistValidate should throw WHITELIST_ERROR code when member is incorrect', async () => { - const surveyPath = ''; - jest - .spyOn(responseSchemaService, 'getResponseSchemaByPath') - .mockResolvedValue({ - curStatus: { - status: 'published', - }, - code: { - baseConf: { - passwordSwitch: true, - password: '123456', - whitelistType: 'MEMBER', - whitelist: ['Jack'], - }, - }, - } as ResponseSchema); - await expect( - controller.whitelistValidate(surveyPath, { - password: '123456', - whitelist: 'James', - }), - ).rejects.toThrow( - new HttpException('验证失败', EXCEPTION_CODE.WHITELIST_ERROR), + await expect(controller.getSchema(mockQueryInfo)).rejects.toThrow( + new HttpException('该问卷已暂停回收', EXCEPTION_CODE.RESPONSE_PAUSING), ); }); }); - it('whitelistValidate should return verifyId successfully', async () => { - const surveyPath = ''; - jest - .spyOn(responseSchemaService, 'getResponseSchemaByPath') - .mockResolvedValue({ - curStatus: { - status: 'published', + describe('whitelistValidate', () => { + it('should throw HttpException when parameters are invalid', async () => { + const surveyPath = 'testSurveyPath'; + const body = { password: 1 }; + + await expect( + controller.whitelistValidate(surveyPath, body), + ).rejects.toThrow(HttpException); + }); + + it('should throw SurveyNotFoundException when survey is removed', async () => { + const surveyPath = 'removedSurveyPath'; + jest + .spyOn(responseSchemaService, 'getResponseSchemaByPath') + .mockResolvedValue(null); + + await expect( + controller.whitelistValidate(surveyPath, { password: '123456' }), + ).rejects.toThrow(new SurveyNotFoundException('该问卷不存在,无法提交')); + }); + + it('should throw HttpException when password is incorrect', async () => { + const surveyPath = 'testSurveyPath'; + const mockSchema = { + code: { + baseConf: { + passwordSwitch: true, + password: '123456', + }, }, + }; + + jest + .spyOn(responseSchemaService, 'getResponseSchemaByPath') + .mockResolvedValue(mockSchema as any); + + await expect( + controller.whitelistValidate(surveyPath, { password: 'wrongPassword' }), + ).rejects.toThrow( + new HttpException('密码验证失败', EXCEPTION_CODE.WHITELIST_ERROR), + ); + }); + + it('should validate successfully when password is correct', async () => { + const surveyPath = 'testSurveyPath'; + const mockSchema = { code: { baseConf: { passwordSwitch: true, password: '123456', whitelistType: 'CUSTOM', - memberType: 'MOBILE', - whitelist: ['13500000000'], + whitelist: ['allowed@example.com'], }, }, - } as ResponseSchema); + }; - await expect( - controller.whitelistValidate(surveyPath, { + jest + .spyOn(responseSchemaService, 'getResponseSchemaByPath') + .mockResolvedValue(mockSchema as any); + + const result = await controller.whitelistValidate(surveyPath, { password: '123456', - whitelist: '13500000000', - }), - ).resolves.toEqual({ code: 200, data: null }); + whitelist: 'allowed@example.com', + }); + expect(result).toEqual({ code: 200, data: null }); + }); + + it('should throw HttpException when whitelist value is not in CUSTOM whitelist', async () => { + const surveyPath = 'testSurveyPath'; + const mockSchema = { + code: { + baseConf: { + whitelistType: 'CUSTOM', + whitelist: ['allowed@example.com'], + }, + }, + }; + + jest + .spyOn(responseSchemaService, 'getResponseSchemaByPath') + .mockResolvedValue(mockSchema as any); + + await expect( + controller.whitelistValidate(surveyPath, { + password: '123456', + whitelist: 'notAllowed@example.com', + }), + ).rejects.toThrow( + new HttpException('白名单验证失败', EXCEPTION_CODE.WHITELIST_ERROR), + ); + }); + + it('should throw HttpException when user is not found in MEMBER whitelist', async () => { + const surveyPath = 'testSurveyPath'; + const mockSchema = { + code: { + baseConf: { + whitelistType: 'MEMBER', + whitelist: [], + }, + }, + }; + + jest + .spyOn(responseSchemaService, 'getResponseSchemaByPath') + .mockResolvedValue(mockSchema as any); + jest.spyOn(userService, 'getUserByUsername').mockResolvedValue(null); + + await expect( + controller.whitelistValidate(surveyPath, { + password: '123456', + whitelist: 'nonExistentUser', + }), + ).rejects.toThrow( + new HttpException('名单验证失败', EXCEPTION_CODE.WHITELIST_ERROR), + ); + }); + + it('should throw HttpException when user is not a workspace member', async () => { + const surveyPath = 'testSurveyPath'; + const mockSchema = { + code: { + baseConf: { + whitelistType: 'MEMBER', + whitelist: [], + }, + }, + }; + + jest + .spyOn(responseSchemaService, 'getResponseSchemaByPath') + .mockResolvedValue(mockSchema as any); + jest + .spyOn(userService, 'getUserByUsername') + .mockResolvedValue({ _id: new Object(), username: '' } as any); + jest + .spyOn(workspaceMemberService, 'findAllByUserId') + .mockResolvedValue([]); + + await expect( + controller.whitelistValidate(surveyPath, { + password: '123456', + whitelist: 'testUser', + }), + ).rejects.toThrow( + new HttpException('验证失败', EXCEPTION_CODE.WHITELIST_ERROR), + ); + }); }); }); diff --git a/server/src/modules/surveyResponse/__test/responseScheme.service.spec.ts b/server/src/modules/surveyResponse/__test/responseScheme.service.spec.ts index 06503e4b..885dcbae 100644 --- a/server/src/modules/surveyResponse/__test/responseScheme.service.spec.ts +++ b/server/src/modules/surveyResponse/__test/responseScheme.service.spec.ts @@ -20,6 +20,7 @@ describe('ResponseSchemaService', () => { findOne: jest.fn().mockResolvedValue(mockResponseSchema), create: jest.fn(), save: jest.fn(), + updateOne: jest.fn(), }, }, ], @@ -120,22 +121,24 @@ describe('ResponseSchemaService', () => { describe('deleteResponseSchema', () => { it('should delete response schema by survey path', async () => { jest - .spyOn(responseSchemaRepository, 'findOne') + .spyOn(responseSchemaRepository, 'updateOne') .mockResolvedValueOnce(cloneDeep(mockResponseSchema)); - jest - .spyOn(responseSchemaRepository, 'save') - .mockResolvedValueOnce(undefined); await service.deleteResponseSchema({ surveyPath: mockResponseSchema.surveyPath, }); - expect(responseSchemaRepository.findOne).toHaveBeenCalledWith({ - where: { + expect(responseSchemaRepository.updateOne).toHaveBeenCalledWith( + { surveyPath: mockResponseSchema.surveyPath, }, - }); - expect(responseSchemaRepository.save).toHaveBeenCalledTimes(1); + { + $set: { + isDeleted: true, + updatedAt: new Date(), + }, + }, + ); }); }); }); diff --git a/server/src/modules/surveyResponse/__test/surveyResponse.controller.spec.ts b/server/src/modules/surveyResponse/__test/surveyResponse.controller.spec.ts index 82632bbe..2754f31f 100644 --- a/server/src/modules/surveyResponse/__test/surveyResponse.controller.spec.ts +++ b/server/src/modules/surveyResponse/__test/surveyResponse.controller.spec.ts @@ -18,7 +18,7 @@ import { HttpException } from 'src/exceptions/httpException'; import { SurveyNotFoundException } from 'src/exceptions/surveyNotFoundException'; import { ResponseSecurityPlugin } from 'src/securityPlugin/responseSecurityPlugin'; -import { RECORD_STATUS } from 'src/enums'; +import { RECORD_STATUS, RECORD_SUB_STATUS } from 'src/enums'; import { SurveyResponse } from 'src/models/surveyResponse.entity'; import { Logger } from 'src/logger'; import { ResponseSchema } from 'src/models/responseSchema.entity'; @@ -71,8 +71,8 @@ const mockClientEncryptInfo = { date: 1710399425273.0, }, ], - createDate: 1710399425273.0, - updateDate: 1710399425273.0, + createdAt: 1710399425273.0, + updatedAt: 1710399425273.0, }; describe('SurveyResponseController', () => { @@ -178,7 +178,7 @@ describe('SurveyResponseController', () => { .mockResolvedValueOnce({ _id: new ObjectId('65fc2dd77f4520858046e129'), clientTime: 1711025112552, - createDate: 1711025113146, + createdAt: 1711025113146, curStatus: { status: RECORD_STATUS.NEW, date: 1711025113146, @@ -212,7 +212,7 @@ describe('SurveyResponseController', () => { ], surveyPath: 'EBzdmnSp', - updateDate: 1711025113146, + updatedAt: 1711025113146, secretKeys: [], } as unknown as SurveyResponse); jest @@ -334,6 +334,9 @@ describe('SurveyResponseController', () => { curStatus: { status: RECORD_STATUS.PUBLISHED, }, + subStatus: { + status: RECORD_SUB_STATUS.DEFAULT, + }, code: { baseConf: { passwordSwitch: true, diff --git a/server/src/modules/surveyResponse/__test/surveyResponse.service.spec.ts b/server/src/modules/surveyResponse/__test/surveyResponse.service.spec.ts index f91df266..855f8809 100644 --- a/server/src/modules/surveyResponse/__test/surveyResponse.service.spec.ts +++ b/server/src/modules/surveyResponse/__test/surveyResponse.service.spec.ts @@ -18,6 +18,7 @@ describe('SurveyResponseService', () => { create: jest.fn(), save: jest.fn(), count: jest.fn(), + find: jest.fn(), }, }, ], @@ -69,16 +70,12 @@ describe('SurveyResponseService', () => { it('should get the total survey response count by path', async () => { const surveyPath = 'testPath'; const count = 10; - jest.spyOn(surveyResponseRepository, 'count').mockResolvedValue(count); + jest + .spyOn(surveyResponseRepository, 'find') + .mockResolvedValue(new Array(10)); const result = await service.getSurveyResponseTotalByPath(surveyPath); expect(result).toEqual(count); - expect(surveyResponseRepository.count).toHaveBeenCalledWith({ - where: { - surveyPath, - 'curStatus.status': { $ne: 'removed' }, - }, - }); }); }); diff --git a/server/src/modules/surveyResponse/controllers/responseSchema.controller.ts b/server/src/modules/surveyResponse/controllers/responseSchema.controller.ts index b6070c22..9f2ce285 100644 --- a/server/src/modules/surveyResponse/controllers/responseSchema.controller.ts +++ b/server/src/modules/surveyResponse/controllers/responseSchema.controller.ts @@ -10,7 +10,7 @@ import { import { ResponseSchemaService } from '../services/responseScheme.service'; import { HttpException } from 'src/exceptions/httpException'; import { EXCEPTION_CODE } from 'src/enums/exceptionCode'; -import { RECORD_STATUS } from 'src/enums'; +import { RECORD_SUB_STATUS } from 'src/enums'; import { ApiTags } from '@nestjs/swagger'; import Joi from 'joi'; import { Logger } from 'src/logger'; @@ -44,16 +44,20 @@ export class ResponseSchemaController { await this.responseSchemaService.getResponseSchemaByPath( queryInfo.surveyPath, ); - if ( - !responseSchema || - responseSchema.curStatus.status === RECORD_STATUS.REMOVED - ) { + if (!responseSchema || responseSchema.isDeleted) { throw new HttpException( - '问卷已删除', + '问卷不存在或已删除', EXCEPTION_CODE.RESPONSE_SCHEMA_REMOVED, ); } + if (responseSchema.subStatus.status === RECORD_SUB_STATUS.PAUSING) { + throw new HttpException( + '该问卷已暂停回收', + EXCEPTION_CODE.RESPONSE_PAUSING, + ); + } + // 去掉C端的敏感字段 if (responseSchema.code?.baseConf) { responseSchema.code.baseConf.password = null; @@ -82,7 +86,7 @@ export class ResponseSchemaController { // 问卷信息 const schema = await this.responseSchemaService.getResponseSchemaByPath(surveyPath); - if (!schema || schema.curStatus.status === 'removed') { + if (!schema || schema.isDeleted) { throw new SurveyNotFoundException('该问卷不存在,无法提交'); } diff --git a/server/src/modules/surveyResponse/controllers/surveyResponse.controller.ts b/server/src/modules/surveyResponse/controllers/surveyResponse.controller.ts index f40aa9c0..18621967 100644 --- a/server/src/modules/surveyResponse/controllers/surveyResponse.controller.ts +++ b/server/src/modules/surveyResponse/controllers/surveyResponse.controller.ts @@ -5,6 +5,7 @@ import { checkSign } from 'src/utils/checkSign'; import { ENCRYPT_TYPE } from 'src/enums/encrypt'; import { EXCEPTION_CODE } from 'src/enums/exceptionCode'; import { getPushingData } from 'src/utils/messagePushing'; +import { RECORD_SUB_STATUS } from 'src/enums'; import { ResponseSchemaService } from '../services/responseScheme.service'; import { SurveyResponseService } from '../services/surveyResponse.service'; @@ -82,9 +83,15 @@ export class SurveyResponseController { // 查询schema const responseSchema = await this.responseSchemaService.getResponseSchemaByPath(surveyPath); - if (!responseSchema || responseSchema.curStatus.status === 'removed') { + if (!responseSchema || responseSchema.isDeleted) { throw new SurveyNotFoundException('该问卷不存在,无法提交'); } + if (responseSchema?.subStatus?.status === RECORD_SUB_STATUS.PAUSING) { + throw new HttpException( + '该问卷已暂停，无法提交', + EXCEPTION_CODE.RESPONSE_PAUSING, + ); + } // 白名单的verifyId校验 const baseConf = responseSchema.code.baseConf; @@ -132,12 +139,12 @@ export class SurveyResponseController { const now = Date.now(); // 提交时间限制 - const begTime = responseSchema.code?.baseConf?.begTime || 0; + const beginTime = responseSchema.code?.baseConf?.beginTime || 0; const endTime = responseSchema?.code?.baseConf?.endTime || 0; - if (begTime && endTime) { - const begTimeStamp = new Date(begTime).getTime(); + if (beginTime && endTime) { + const beginTimeStamp = new Date(beginTime).getTime(); const endTimeStamp = new Date(endTime).getTime(); - if (now < begTimeStamp || now > endTimeStamp) { + if (now < beginTimeStamp || now > endTimeStamp) { throw new HttpException( '不在答题有效期内', EXCEPTION_CODE.RESPONSE_CURRENT_TIME_NOT_ALLOW, diff --git a/server/src/modules/surveyResponse/services/clientEncrypt.service.ts b/server/src/modules/surveyResponse/services/clientEncrypt.service.ts index 7d204d99..e679bda8 100644 --- a/server/src/modules/surveyResponse/services/clientEncrypt.service.ts +++ b/server/src/modules/surveyResponse/services/clientEncrypt.service.ts @@ -4,7 +4,6 @@ import { MongoRepository } from 'typeorm'; import { ClientEncrypt } from 'src/models/clientEncrypt.entity'; import { ENCRYPT_TYPE } from 'src/enums/encrypt'; import { ObjectId } from 'mongodb'; -import { RECORD_STATUS } from 'src/enums'; @Injectable() export class ClientEncryptService { @@ -38,26 +37,13 @@ export class ClientEncryptService { return this.clientEncryptRepository.findOne({ where: { _id: new ObjectId(id), - 'curStatus.status': { - $ne: RECORD_STATUS.REMOVED, - }, }, }); } deleteEncryptInfo(id: string) { - return this.clientEncryptRepository.updateOne( - { - _id: new ObjectId(id), - }, - { - $set: { - curStatus: { - status: RECORD_STATUS.REMOVED, - date: Date.now(), - }, - }, - }, - ); + return this.clientEncryptRepository.deleteOne({ + _id: new ObjectId(id), + }); } } diff --git a/server/src/modules/surveyResponse/services/counter.service.ts b/server/src/modules/surveyResponse/services/counter.service.ts index 0b72ab82..d6581e49 100644 --- a/server/src/modules/surveyResponse/services/counter.service.ts +++ b/server/src/modules/surveyResponse/services/counter.service.ts @@ -33,6 +33,7 @@ export class CounterService { surveyPath, type, data, + updatedAt: new Date(), }, }, { diff --git a/server/src/modules/surveyResponse/services/responseScheme.service.ts b/server/src/modules/surveyResponse/services/responseScheme.service.ts index 701192bf..b1dc793c 100644 --- a/server/src/modules/surveyResponse/services/responseScheme.service.ts +++ b/server/src/modules/surveyResponse/services/responseScheme.service.ts @@ -2,7 +2,7 @@ import { Injectable } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; import { MongoRepository } from 'typeorm'; import { ResponseSchema } from 'src/models/responseSchema.entity'; -import { RECORD_STATUS } from 'src/enums'; +import { RECORD_STATUS, RECORD_SUB_STATUS } from 'src/enums'; @Injectable() export class ResponseSchemaService { @@ -23,19 +23,27 @@ export class ResponseSchemaService { status: RECORD_STATUS.PUBLISHED, date: Date.now(), }; + clientSurvey.subStatus = { + status: RECORD_SUB_STATUS.DEFAULT, + date: Date.now(), + }; return this.responseSchemaRepository.save(clientSurvey); } else { const curStatus = { status: RECORD_STATUS.PUBLISHED, date: Date.now(), }; + const subStatus = { + status: RECORD_SUB_STATUS.DEFAULT, + date: Date.now(), + }; const newClientSurvey = this.responseSchemaRepository.create({ title, surveyPath, code, pageId, curStatus, - statusList: [curStatus], + subStatus, }); return this.responseSchemaRepository.save(newClientSurvey); } @@ -53,22 +61,32 @@ export class ResponseSchemaService { }); } - async deleteResponseSchema({ surveyPath }) { + async pausingResponseSchema({ surveyPath }) { const responseSchema = await this.responseSchemaRepository.findOne({ where: { surveyPath }, }); if (responseSchema) { - const newStatus = { - status: RECORD_STATUS.PUBLISHED, + const subStatus = { + status: RECORD_SUB_STATUS.PAUSING, date: Date.now(), }; - responseSchema.curStatus = newStatus; - if (Array.isArray(responseSchema.statusList)) { - responseSchema.statusList.push(newStatus); - } else { - responseSchema.statusList = [newStatus]; - } + responseSchema.subStatus = subStatus; + responseSchema.curStatus.status = RECORD_STATUS.PUBLISHED; return this.responseSchemaRepository.save(responseSchema); } } + + async deleteResponseSchema({ surveyPath }) { + return this.responseSchemaRepository.updateOne( + { + surveyPath, + }, + { + $set: { + isDeleted: true, + updatedAt: new Date(), + }, + }, + ); + } } diff --git a/server/src/modules/surveyResponse/services/surveyResponse.service.ts b/server/src/modules/surveyResponse/services/surveyResponse.service.ts index 78d79333..fefca601 100644 --- a/server/src/modules/surveyResponse/services/surveyResponse.service.ts +++ b/server/src/modules/surveyResponse/services/surveyResponse.service.ts @@ -2,7 +2,7 @@ import { Injectable } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; import { MongoRepository } from 'typeorm'; import { SurveyResponse } from 'src/models/surveyResponse.entity'; -import { RECORD_STATUS } from 'src/enums'; + @Injectable() export class SurveyResponseService { constructor( @@ -39,9 +39,6 @@ export class SurveyResponseService { const data = await this.surveyResponseRepository.find({ where: { surveyPath, - 'curStatus.status': { - $ne: RECORD_STATUS.REMOVED, - }, }, }); return (data || []).length; diff --git a/server/src/modules/upgrade/controllers/upgrade.controller.ts b/server/src/modules/upgrade/controllers/upgrade.controller.ts new file mode 100644 index 00000000..b2c6f4f6 --- /dev/null +++ b/server/src/modules/upgrade/controllers/upgrade.controller.ts @@ -0,0 +1,21 @@ +import { Controller, Get, HttpCode, Request } from '@nestjs/common'; +import { ApiTags } from '@nestjs/swagger'; +import { UpgradeService } from '../services/upgrade.service'; + +@ApiTags('survey') +@Controller('/api/upgrade') +export class UpgradeController { + constructor(private readonly upgradeService: UpgradeService) {} + + @Get('/upgradeFeatureStatus') + @HttpCode(200) + async upgradeSubStatus(@Request() req) { + this.upgradeService.upgradeFeatureStatus(); + return { + code: 200, + data: { + traceId: req.traceId, + }, + }; + } +} diff --git a/server/src/modules/upgrade/services/upgrade.service.ts b/server/src/modules/upgrade/services/upgrade.service.ts new file mode 100644 index 00000000..0364932b --- /dev/null +++ b/server/src/modules/upgrade/services/upgrade.service.ts @@ -0,0 +1,210 @@ +import { Injectable } from '@nestjs/common'; +import { InjectRepository } from '@nestjs/typeorm'; +import { MongoRepository } from 'typeorm'; +import { SurveyMeta } from 'src/models/surveyMeta.entity'; +import { ResponseSchema } from 'src/models/responseSchema.entity'; +import { RECORD_STATUS, RECORD_SUB_STATUS } from 'src/enums'; +import { Workspace } from 'src/models/workspace.entity'; +import { Collaborator } from 'src/models/collaborator.entity'; +import { Counter } from 'src/models/counter.entity'; +import { DownloadTask } from 'src/models/downloadTask.entity'; +import { MessagePushingLog } from 'src/models/messagePushingLog.entity'; +import { MessagePushingTask } from 'src/models/messagePushingTask.entity'; +import { Session } from 'src/models/session.entity'; +import { SurveyConf } from 'src/models/surveyConf.entity'; +import { User } from 'src/models/user.entity'; +import { WorkspaceMember } from 'src/models/workspaceMember.entity'; +import { SESSION_STATUS } from 'src/enums/surveySessionStatus'; +import { Logger } from 'src/logger'; + +@Injectable() +export class UpgradeService { + constructor( + private readonly logger: Logger, + @InjectRepository(Collaborator) + private readonly collaboratorRepository: MongoRepository, + @InjectRepository(Counter) + private readonly counterRepository: MongoRepository, + @InjectRepository(DownloadTask) + private readonly downloadTaskRepository: MongoRepository, + @InjectRepository(MessagePushingLog) + private readonly messagePushingLogRepository: MongoRepository, + @InjectRepository(MessagePushingTask) + private readonly messagePushingTaskRepository: MongoRepository, + @InjectRepository(ResponseSchema) + private readonly responseSchemaRepository: MongoRepository, + @InjectRepository(Session) + private readonly sessionRepository: MongoRepository, + @InjectRepository(SurveyConf) + private readonly surveyConfRepository: MongoRepository, + @InjectRepository(SurveyMeta) + private readonly surveyMetaRepository: MongoRepository, + @InjectRepository(User) + private readonly userRepository: MongoRepository, + @InjectRepository(Workspace) + private readonly workspaceRepository: MongoRepository, + @InjectRepository(WorkspaceMember) + private readonly workspaceMemberRepository: MongoRepository, + ) {} + + async upgradeFeatureStatus() { + const repositories = [ + this.collaboratorRepository, + this.counterRepository, + this.downloadTaskRepository, + this.messagePushingLogRepository, + this.messagePushingTaskRepository, + this.responseSchemaRepository, + this.sessionRepository, + this.surveyConfRepository, + this.surveyMetaRepository, + this.userRepository, + this.workspaceRepository, + this.workspaceMemberRepository, + ]; + const handleCreatedAtAndUpdatedAt = (doc) => { + if (!doc.createdAt) { + if (doc.createDate) { + doc.createdAt = new Date(doc.createDate); + delete doc.createDate; + } else { + doc.createdAt = new Date(); + } + } + if (!doc.updatedAt) { + if (doc.updateDate) { + doc.updatedAt = new Date(doc.updateDate); + delete doc.updateDate; + } else { + doc.updatedAt = new Date(); + } + } + }; + + const handleDelStatus = (doc) => { + // 已删除的字段升级 + if (doc?.curStatus?.status === 'removed') { + delete doc.curStatus; + doc.isDeleted = true; + doc.deletedAt = new Date(doc.updatedAt); + } + }; + + const handleSubStatus = (doc) => { + // 编辑中字段升级 + if ( + !doc?.subStatus && + (doc?.curStatus?.status == RECORD_STATUS.PUBLISHED || + doc?.curStatus?.status == RECORD_STATUS.NEW || + doc?.curStatus?.status === RECORD_STATUS.EDITING) + ) { + const subStatus = { + status: RECORD_SUB_STATUS.DEFAULT, + date: doc.curStatus.date, + }; + doc.subStatus = subStatus; + } + }; + + const handleBegTime = (doc) => { + if (!doc?.baseConf?.beginTime && doc?.baseConf?.begTime) { + doc.baseConf.beginTime = doc.baseConf.begTime; + delete doc.baseConf.begTime; + } + }; + + const handleSessionStatus = (doc) => { + if (!doc.status && doc.curStatus) { + if (doc?.curStatus?.id && doc?.curStatus?.id === 'editing') { + doc.status = SESSION_STATUS.ACTIVATED; + } else { + doc.status = SESSION_STATUS.DEACTIVATED; + } + delete doc.curStatus; + } + }; + + const handleCreatorId = async (doc) => { + if (!doc.ownerId && doc.owner) { + const userInfo = await this.userRepository.findOne({ + where: { + username: doc.owner, + }, + }); + if (userInfo && userInfo._id) { + doc.ownerId = userInfo._id.toString(); + } + } + if (doc.ownerId && doc.owner && !doc.creatorId) { + doc.creatorId = doc.ownerId; + doc.creator = doc.owner; + } + }; + + const save = async ({ doc, repository }) => { + const entity = repository.create(doc); + await repository.updateOne( + { + _id: entity._id, + }, + { + $set: entity, + }, + ); + // this.logger.info(JSON.stringify(updateRes)); + }; + this.logger.info(`upgrading...`); + for (const repository of repositories) { + const name = + typeof repository.target === 'function' + ? repository.target.name + : typeof repository.target === 'string' + ? repository.target + : ''; + + const cursor = repository.createCursor(); + this.logger.info(`upgrading ${name}`); + while (await cursor.hasNext()) { + try { + const doc = await cursor.next(); + // 把createDate和updateDate升级成createdAt和updatedAt + handleCreatedAtAndUpdatedAt(doc); + if ( + repository === this.surveyMetaRepository || + repository === this.responseSchemaRepository + ) { + // 新增subStatus字段 + handleSubStatus(doc); + } + if ( + repository === this.surveyMetaRepository || + repository === this.downloadTaskRepository || + repository === this.messagePushingTaskRepository || + repository === this.workspaceRepository || + repository === this.responseSchemaRepository + ) { + // 新增isDeleted等相关字段 + handleDelStatus(doc); + } + // 同步sessionStatus到新定义的字段 + if (repository === this.sessionRepository) { + handleSessionStatus(doc); + } + // 同步begTime，更新成beginTime + if (repository === this.surveyConfRepository) { + handleBegTime(doc); + } + // 同步ownerId到creatorId + if (repository === this.surveyMetaRepository) { + await handleCreatorId(doc); + } + await save({ repository, doc }); + } catch (error) { + this.logger.error(`upgrade ${name} error ${error.message}`); + } + } + this.logger.info(`finish upgrade ${name}`); + } + this.logger.info(`upgrad finished...`); + } +} diff --git a/server/src/modules/upgrade/upgrade.module.ts b/server/src/modules/upgrade/upgrade.module.ts new file mode 100644 index 00000000..37f36e08 --- /dev/null +++ b/server/src/modules/upgrade/upgrade.module.ts @@ -0,0 +1,51 @@ +import { Module } from '@nestjs/common'; +import { TypeOrmModule } from '@nestjs/typeorm'; +import { ConfigModule } from '@nestjs/config'; +import { UpgradeService } from './services/upgrade.service'; + +import { Collaborator } from 'src/models/collaborator.entity'; +import { Counter } from 'src/models/counter.entity'; +import { DownloadTask } from 'src/models/downloadTask.entity'; +import { MessagePushingLog } from 'src/models/messagePushingLog.entity'; +import { MessagePushingTask } from 'src/models/messagePushingTask.entity'; +import { ResponseSchema } from 'src/models/responseSchema.entity'; +import { Session } from 'src/models/session.entity'; +import { SurveyConf } from 'src/models/surveyConf.entity'; +import { SurveyHistory } from 'src/models/surveyHistory.entity'; +import { SurveyMeta } from 'src/models/surveyMeta.entity'; +import { SurveyResponse } from 'src/models/surveyResponse.entity'; +import { User } from 'src/models/user.entity'; +import { Workspace } from 'src/models/workspace.entity'; +import { WorkspaceMember } from 'src/models/workspaceMember.entity'; + +import { UpgradeController } from './controllers/upgrade.controller'; +import { AuthModule } from '../auth/auth.module'; + +import { Logger } from 'src/logger'; + +@Module({ + imports: [ + TypeOrmModule.forFeature([ + Collaborator, + Counter, + DownloadTask, + MessagePushingLog, + MessagePushingTask, + ResponseSchema, + Session, + SurveyConf, + SurveyHistory, + SurveyMeta, + SurveyResponse, + User, + Workspace, + WorkspaceMember, + ]), + ConfigModule, + AuthModule, + ], + controllers: [UpgradeController], + providers: [UpgradeService, Logger], + exports: [UpgradeService], +}) +export class UpgradeModule {} diff --git a/server/src/modules/workspace/_test/workspace.controller.spec.ts b/server/src/modules/workspace/_test/workspace.controller.spec.ts index 9431b6ce..ffa9aae9 100644 --- a/server/src/modules/workspace/_test/workspace.controller.spec.ts +++ b/server/src/modules/workspace/_test/workspace.controller.spec.ts @@ -12,6 +12,7 @@ import { UserService } from 'src/modules/auth/services/user.service'; import { SurveyMetaService } from 'src/modules/survey/services/surveyMeta.service'; import { Logger } from 'src/logger'; import { User } from 'src/models/user.entity'; +import { GetWorkspaceListDto } from '../dto/getWorkspaceList.dto'; jest.mock('src/guards/authentication.guard'); jest.mock('src/guards/survey.guard'); @@ -22,6 +23,7 @@ describe('WorkspaceController', () => { let workspaceService: WorkspaceService; let workspaceMemberService: WorkspaceMemberService; let userService: UserService; + let logger: Logger; beforeEach(async () => { const module: TestingModule = await Test.createTestingModule({ @@ -31,7 +33,6 @@ describe('WorkspaceController', () => { provide: WorkspaceService, useValue: { create: jest.fn(), - findAllById: jest.fn(), findAllByIdWithPagination: jest.fn(), update: jest.fn(), delete: jest.fn(), @@ -47,7 +48,6 @@ describe('WorkspaceController', () => { batchUpdate: jest.fn(), batchDelete: jest.fn(), countByWorkspaceId: jest.fn(), - batchSearchByWorkspace: jest.fn(), }, }, { @@ -80,24 +80,26 @@ describe('WorkspaceController', () => { WorkspaceMemberService, ); userService = module.get(UserService); + logger = module.get(Logger); }); describe('create', () => { it('should create a workspace and return workspaceId', async () => { + const mockUserId = new ObjectId(), + mockUsername = 'username'; const createWorkspaceDto: CreateWorkspaceDto = { name: 'Test Workspace', description: 'Test Description', - members: [{ userId: 'userId1', role: WORKSPACE_ROLE.USER }], + members: [{ userId: mockUserId.toString(), role: WORKSPACE_ROLE.USER }], }; - const req = { user: { _id: new ObjectId() } }; + const req = { user: { _id: new ObjectId(), username: 'testuser' } }; const createdWorkspace = { _id: new ObjectId() }; - jest.spyOn(userService, 'getUserListByIds').mockResolvedValue([ - { - _id: 'userId1', - }, - ] as unknown as Array); - + jest + .spyOn(userService, 'getUserListByIds') + .mockResolvedValue([ + { _id: mockUserId, username: mockUsername }, + ] as unknown as Array); jest .spyOn(workspaceService, 'create') .mockResolvedValue(createdWorkspace as Workspace); @@ -113,6 +115,7 @@ describe('WorkspaceController', () => { expect(workspaceService.create).toHaveBeenCalledWith({ name: createWorkspaceDto.name, description: createWorkspaceDto.description, + owner: req.user.username, ownerId: req.user._id.toString(), }); expect(workspaceMemberService.create).toHaveBeenCalledWith({ @@ -123,31 +126,31 @@ describe('WorkspaceController', () => { expect(workspaceMemberService.batchCreate).toHaveBeenCalledWith({ workspaceId: createdWorkspace._id.toString(), members: createWorkspaceDto.members, + creator: req.user.username, + creatorId: req.user._id.toString(), }); }); it('should throw an exception if validation fails', async () => { - const createWorkspaceDto: CreateWorkspaceDto = { - name: '', - members: [], - }; + const createWorkspaceDto = { name: '', members: [] }; const req = { user: { _id: new ObjectId() } }; await expect(controller.create(createWorkspaceDto, req)).rejects.toThrow( HttpException, ); + expect(logger.error).toHaveBeenCalledTimes(1); }); }); describe('findAll', () => { it('should return a list of workspaces for the user', async () => { const req = { user: { _id: new ObjectId() } }; + const queryInfo: GetWorkspaceListDto = { curPage: 1, pageSize: 10 }; const memberList = [{ workspaceId: new ObjectId().toString() }]; const workspaces = [{ _id: new ObjectId(), name: 'Test Workspace' }]; - jest .spyOn(workspaceMemberService, 'findAllByUserId') - .mockResolvedValue(memberList as unknown as Array); + .mockResolvedValue(memberList as Array); jest .spyOn(workspaceService, 'findAllByIdWithPagination') @@ -156,12 +159,11 @@ describe('WorkspaceController', () => { count: workspaces.length, }); - jest.spyOn(userService, 'getUserListByIds').mockResolvedValue([]); + jest + .spyOn(userService, 'getUserListByIds') + .mockResolvedValue([{ _id: new ObjectId() }] as unknown as Array); - const result = await controller.findAll(req, { - curPage: 1, - pageSize: 10, - }); + const result = await controller.findAll(req, queryInfo); expect(result.code).toEqual(200); expect(workspaceMemberService.findAllByUserId).toHaveBeenCalledWith({ @@ -174,6 +176,18 @@ describe('WorkspaceController', () => { name: undefined, }); }); + + it('should throw an exception if validation fails', async () => { + const req = { user: { _id: new ObjectId() } }; + const queryInfo: GetWorkspaceListDto = { + curPage: 'not_a_number', + pageSize: 10, + } as any; + + await expect(controller.findAll(req, queryInfo)).rejects.toThrow( + HttpException, + ); + }); }); describe('update', () => { @@ -185,11 +199,9 @@ describe('WorkspaceController', () => { adminMembers: [], userMembers: [], }; - jest.spyOn(userService, 'getUserListByIds').mockResolvedValue([ - { - _id: userId, - }, - ] as Array); + jest + .spyOn(userService, 'getUserListByIds') + .mockResolvedValue([{ _id: userId }] as Array); const updateDto = { name: 'Updated Workspace', members: [ @@ -203,72 +215,41 @@ describe('WorkspaceController', () => { jest.spyOn(workspaceService, 'update').mockResolvedValue(updateResult); jest.spyOn(workspaceMemberService, 'batchCreate').mockResolvedValue(null); jest.spyOn(workspaceMemberService, 'batchUpdate').mockResolvedValue(null); + jest.spyOn(workspaceMemberService, 'batchDelete').mockResolvedValue(null); - const result = await controller.update(id, updateDto); - - expect(result).toEqual({ - code: 200, + const result = await controller.update(id, updateDto, { + user: { username: 'testuser', _id: new ObjectId() }, }); - expect(workspaceService.update).toHaveBeenCalledWith(id, { - name: updateDto.name, + + expect(result).toEqual({ code: 200 }); + expect(workspaceService.update).toHaveBeenCalledWith({ + id, + workspace: { name: updateDto.name }, + operator: 'testuser', + operatorId: expect.any(String), }); expect(workspaceMemberService.batchCreate).toHaveBeenCalledWith({ workspaceId: id, members: members.newMembers, + creator: 'testuser', + creatorId: expect.any(String), }); expect(workspaceMemberService.batchUpdate).toHaveBeenCalledWith({ idList: members.adminMembers, role: WORKSPACE_ROLE.ADMIN, + operator: 'testuser', + operatorId: expect.any(String), }); expect(workspaceMemberService.batchUpdate).toHaveBeenCalledWith({ idList: members.userMembers, role: WORKSPACE_ROLE.USER, + operator: 'testuser', + operatorId: expect.any(String), + }); + expect(workspaceMemberService.batchDelete).toHaveBeenCalledWith({ + idList: [], + neIdList: [], }); }); }); - - describe('delete', () => { - it('should delete a workspace', async () => { - const id = 'workspaceId'; - - jest.spyOn(workspaceService, 'delete').mockResolvedValue(null); - - const result = await controller.delete(id); - - expect(result).toEqual({ code: 200 }); - expect(workspaceService.delete).toHaveBeenCalledWith(id); - }); - }); - - describe('getWorkspaceAndMember', () => { - it('should return a list of workspaces and members for the user', async () => { - const req = { user: { _id: new ObjectId() } }; - - const workspaceId = new ObjectId(); - const userId = new ObjectId(); - const memberList = [{ workspaceId, userId: userId }]; - const workspaces = [{ _id: workspaceId, name: 'Test Workspace' }]; - const userList = [{ _id: userId, username: 'Test User' }]; - - jest - .spyOn(workspaceService, 'findAllByUserId') - .mockResolvedValue(workspaces as Array); - jest - .spyOn(workspaceMemberService, 'batchSearchByWorkspace') - .mockResolvedValue(memberList as unknown as Array); - jest - .spyOn(userService, 'getUserListByIds') - .mockResolvedValue(userList as User[]); - - const result = await controller.getWorkspaceAndMember(req); - - expect(result.code).toEqual(200); - expect(workspaceService.findAllByUserId).toHaveBeenCalledWith( - req.user._id.toString(), - ); - expect( - workspaceMemberService.batchSearchByWorkspace, - ).toHaveBeenCalledWith(workspaces.map((item) => item._id.toString())); - }); - }); }); diff --git a/server/src/modules/workspace/_test/workspace.service.spec.ts b/server/src/modules/workspace/_test/workspace.service.spec.ts index a243dec6..93bd83c3 100644 --- a/server/src/modules/workspace/_test/workspace.service.spec.ts +++ b/server/src/modules/workspace/_test/workspace.service.spec.ts @@ -45,6 +45,7 @@ describe('WorkspaceService', () => { const workspace = { name: 'Test Workspace', description: 'Description', + owner: 'Test Owner', // 添加 owner 属性 ownerId: 'ownerId', }; const createdWorkspace = { ...workspace, _id: new ObjectId() }; @@ -59,7 +60,11 @@ describe('WorkspaceService', () => { const result = await service.create(workspace); expect(result).toEqual(createdWorkspace); - expect(workspaceRepository.create).toHaveBeenCalledWith(workspace); + expect(workspaceRepository.create).toHaveBeenCalledWith({ + ...workspace, + creator: workspace.owner, + creatorId: workspace.ownerId, + }); expect(workspaceRepository.save).toHaveBeenCalledWith(createdWorkspace); }); }); @@ -90,24 +95,35 @@ describe('WorkspaceService', () => { it('should update a workspace', async () => { const workspaceId = 'workspaceId'; const updateData = { name: 'Updated Workspace' }; + const operator = 'Test Operator'; + const operatorId = 'operatorId'; jest .spyOn(workspaceRepository, 'update') .mockResolvedValue({ affected: 1 } as any); - const result = await service.update(workspaceId, updateData); + const result = await service.update({ + id: workspaceId, + workspace: updateData, + operator, + operatorId, + }); expect(result).toEqual({ affected: 1 }); - expect(workspaceRepository.update).toHaveBeenCalledWith( - workspaceId, - updateData, - ); + expect(workspaceRepository.update).toHaveBeenCalledWith(workspaceId, { + ...updateData, + updatedAt: expect.any(Date), + operator, + operatorId, + }); }); }); describe('delete', () => { it('should delete a workspace and update related surveyMeta', async () => { const workspaceId = new ObjectId().toString(); + const operator = 'Test Operator'; + const operatorId = 'operatorId'; jest .spyOn(workspaceRepository, 'updateOne') @@ -116,11 +132,17 @@ describe('WorkspaceService', () => { .spyOn(surveyMetaRepository, 'updateMany') .mockResolvedValue({ modifiedCount: 1 } as any); - await service.delete(workspaceId); + const result = await service.delete(workspaceId, { + operator, + operatorId, + }); expect(workspaceRepository.updateOne).toHaveBeenCalledTimes(1); - expect(surveyMetaRepository.updateMany).toHaveBeenCalledTimes(1); + expect(result).toEqual({ + workspaceRes: { modifiedCount: 1 }, + surveyRes: { modifiedCount: 1 }, + }); }); }); @@ -139,9 +161,43 @@ describe('WorkspaceService', () => { .spyOn(workspaceRepository, 'find') .mockResolvedValue(workspaces as any); - const result = await service.findAllByUserId(''); + const result = await service.findAllByUserId('userId'); + expect(result).toEqual(workspaces); expect(workspaceRepository.find).toHaveBeenCalledTimes(1); }); }); + + describe('findAllByIdWithPagination', () => { + it('should return paginated workspaces', async () => { + const workspaceIdList = [ + new ObjectId().toString(), + new ObjectId().toString(), + ]; + const page = 1; + const limit = 10; + const workspaces = [ + { _id: workspaceIdList[0], name: 'Workspace 1' }, + { _id: workspaceIdList[1], name: 'Workspace 2' }, + ]; + + jest + .spyOn(workspaceRepository, 'findAndCount') + .mockResolvedValue([workspaces, workspaces.length] as any); + + const result = await service.findAllByIdWithPagination({ + workspaceIdList, + page, + limit, + }); + + expect(result).toEqual({ list: workspaces, count: workspaces.length }); + expect(workspaceRepository.findAndCount).toHaveBeenCalledWith({ + where: expect.any(Object), + skip: 0, + take: limit, + order: { createdAt: -1 }, + }); + }); + }); }); diff --git a/server/src/modules/workspace/_test/workspaceMember.controller.spec.ts b/server/src/modules/workspace/_test/workspaceMember.controller.spec.ts index 32e765c7..978c1578 100644 --- a/server/src/modules/workspace/_test/workspaceMember.controller.spec.ts +++ b/server/src/modules/workspace/_test/workspaceMember.controller.spec.ts @@ -115,11 +115,16 @@ describe('WorkspaceMemberController', () => { }; const updateResult = { modifiedCount: 1 }; + // Mock request object + const req = { + user: { username: 'admin', _id: 'operatorId' }, + }; + jest .spyOn(workspaceMemberService, 'updateRole') .mockResolvedValue(updateResult); - const result = await controller.updateRole(updateDto); + const result = await controller.updateRole(updateDto, req); expect(result).toEqual({ code: 200, @@ -128,9 +133,11 @@ describe('WorkspaceMemberController', () => { }, }); expect(workspaceMemberService.updateRole).toHaveBeenCalledWith({ + role: updateDto.role, workspaceId: updateDto.workspaceId, userId: updateDto.userId, - role: updateDto.role, + operator: req.user.username, + operatorId: req.user._id.toString(), }); }); @@ -140,8 +147,11 @@ describe('WorkspaceMemberController', () => { userId: '', role: '', }; + const req = { + user: { username: 'admin', _id: 'operatorId' }, + }; - await expect(controller.updateRole(updateDto)).rejects.toThrow( + await expect(controller.updateRole(updateDto, req)).rejects.toThrow( HttpException, ); }); diff --git a/server/src/modules/workspace/_test/workspaceMember.service.spec.ts b/server/src/modules/workspace/_test/workspaceMember.service.spec.ts index 8770bf20..aba883ed 100644 --- a/server/src/modules/workspace/_test/workspaceMember.service.spec.ts +++ b/server/src/modules/workspace/_test/workspaceMember.service.spec.ts @@ -58,23 +58,53 @@ describe('WorkspaceMemberService', () => { { userId: 'userId1', role: 'admin' }, { userId: 'userId2', role: 'user' }, ]; - const dataToInsert = members.map((item) => ({ ...item, workspaceId })); + const creator = 'creatorName'; + const creatorId = 'creatorId'; + const now = new Date(); + const dataToInsert = members.map((item) => ({ + ...item, + workspaceId, + createdAt: now, + updatedAt: now, + creator, + creatorId, + })); - jest - .spyOn(repository, 'insertMany') - .mockResolvedValueOnce({ insertedCount: members.length } as any); + jest.spyOn(repository, 'insertMany').mockResolvedValueOnce({ + insertedCount: members.length, + } as any); - const result = await service.batchCreate({ workspaceId, members }); + const result = await service.batchCreate({ + workspaceId, + members, + creator, + creatorId, + }); expect(result).toEqual({ insertedCount: members.length }); - expect(repository.insertMany).toHaveBeenCalledWith(dataToInsert); + expect(repository.insertMany).toHaveBeenCalledWith( + dataToInsert.map((item) => { + return { + ...item, + createdAt: expect.any(Date), + updatedAt: expect.any(Date), + }; + }), + ); }); it('should return insertedCount 0 if no members to insert', async () => { const workspaceId = new ObjectId().toString(); const members = []; + const creator = 'creatorName'; + const creatorId = 'creatorId'; - const result = await service.batchCreate({ workspaceId, members }); + const result = await service.batchCreate({ + workspaceId, + members, + creator, + creatorId, + }); expect(result).toEqual({ insertedCount: 0 }); }); @@ -84,12 +114,19 @@ describe('WorkspaceMemberService', () => { it('should batch update workspace members roles', async () => { const idList = [new ObjectId().toString(), new ObjectId().toString()]; const role = 'user'; + const operator = 'operatorName'; + const operatorId = 'operatorId'; jest .spyOn(repository, 'updateMany') .mockResolvedValue({ modifiedCount: idList.length } as any); - const result = await service.batchUpdate({ idList, role }); + const result = await service.batchUpdate({ + idList, + role, + operator, + operatorId, + }); expect(result).toEqual({ modifiedCount: idList.length }); }); @@ -97,8 +134,15 @@ describe('WorkspaceMemberService', () => { it('should return modifiedCount 0 if no ids to update', async () => { const idList = []; const role = 'user'; + const operator = 'operatorName'; + const operatorId = 'operatorId'; - const result = await service.batchUpdate({ idList, role }); + const result = await service.batchUpdate({ + idList, + role, + operator, + operatorId, + }); expect(result).toEqual({ modifiedCount: 0 }); }); @@ -160,17 +204,25 @@ describe('WorkspaceMemberService', () => { const workspaceId = 'workspaceId'; const userId = 'userId'; const role = 'admin'; + const operator = 'operatorName'; + const operatorId = 'operatorId'; jest .spyOn(repository, 'updateOne') .mockResolvedValue({ modifiedCount: 1 } as any); - const result = await service.updateRole({ workspaceId, userId, role }); + const result = await service.updateRole({ + workspaceId, + userId, + role, + operator, + operatorId, + }); expect(result).toEqual({ modifiedCount: 1 }); expect(repository.updateOne).toHaveBeenCalledWith( { workspaceId, userId }, - { $set: { role } }, + { $set: { role, operator, operatorId, updatedAt: expect.any(Date) } }, ); }); }); diff --git a/server/src/modules/workspace/controllers/workspace.controller.ts b/server/src/modules/workspace/controllers/workspace.controller.ts index 7279c13f..276577f5 100644 --- a/server/src/modules/workspace/controllers/workspace.controller.ts +++ b/server/src/modules/workspace/controllers/workspace.controller.ts @@ -100,10 +100,12 @@ export class WorkspaceController { } } const userId = req.user._id.toString(); + const username = req.user.username; // 插入空间表 const retWorkspace = await this.workspaceService.create({ name: value.name, description: value.description, + owner: username, ownerId: userId, }); const workspaceId = retWorkspace._id.toString(); @@ -117,6 +119,8 @@ export class WorkspaceController { await this.workspaceMemberService.batchCreate({ workspaceId, members: value.members, + creator: username, + creatorId: userId, }); } return { @@ -206,7 +210,7 @@ export class WorkspaceController { const ownerInfo = userInfoMap?.[item.ownerId] || {}; return { ...item, - createDate: moment(item.createDate).format('YYYY-MM-DD HH:mm:ss'), + createdAt: moment(item.createdAt).format('YYYY-MM-DD HH:mm:ss'), owner: ownerInfo.username, currentUserId: curWorkspaceInfo.userId, currentUserRole: curWorkspaceInfo.role, @@ -268,13 +272,24 @@ export class WorkspaceController { @UseGuards(WorkspaceGuard) @SetMetadata('workspacePermissions', [WORKSPACE_PERMISSION.WRITE_WORKSPACE]) @SetMetadata('workspaceId', 'params.id') - async update(@Param('id') id: string, @Body() workspace: CreateWorkspaceDto) { + async update( + @Param('id') id: string, + @Body() workspace: CreateWorkspaceDto, + @Request() req, + ) { const members = workspace.members; if (!Array.isArray(members) || members.length === 0) { throw new HttpException('成员不能为空', EXCEPTION_CODE.PARAMETER_ERROR); } delete workspace.members; - const updateRes = await this.workspaceService.update(id, workspace); + const operator = req.user.username, + operatorId = req.user._id.toString(); + const updateRes = await this.workspaceService.update({ + id, + workspace, + operator, + operatorId, + }); this.logger.info(`updateRes: ${JSON.stringify(updateRes)}`); const { newMembers, adminMembers, userMembers } = splitMembers(members); if ( @@ -320,14 +335,20 @@ export class WorkspaceController { this.workspaceMemberService.batchCreate({ workspaceId: id, members: newMembers, + creator: operator, + creatorId: operatorId, }), this.workspaceMemberService.batchUpdate({ idList: adminMembers, role: WORKSPACE_ROLE.ADMIN, + operator, + operatorId, }), this.workspaceMemberService.batchUpdate({ idList: userMembers, role: WORKSPACE_ROLE.USER, + operator, + operatorId, }), ]); this.logger.info(`updateRes: ${JSON.stringify(res)}`); @@ -341,8 +362,13 @@ export class WorkspaceController { @UseGuards(WorkspaceGuard) @SetMetadata('workspacePermissions', [WORKSPACE_PERMISSION.WRITE_WORKSPACE]) @SetMetadata('workspaceId', 'params.id') - async delete(@Param('id') id: string) { - const res = await this.workspaceService.delete(id); + async delete(@Param('id') id: string, @Request() req) { + const operator = req.user.username, + operatorId = req.user._id.toString(); + const res = await this.workspaceService.delete(id, { + operator, + operatorId, + }); this.logger.info(`res: ${JSON.stringify(res)}`); return { code: 200, diff --git a/server/src/modules/workspace/controllers/workspaceMember.controller.ts b/server/src/modules/workspace/controllers/workspaceMember.controller.ts index 5dab6caa..6eac9668 100644 --- a/server/src/modules/workspace/controllers/workspaceMember.controller.ts +++ b/server/src/modules/workspace/controllers/workspaceMember.controller.ts @@ -77,7 +77,10 @@ export class WorkspaceMemberController { @Post('updateRole') @SetMetadata('workspacePermissions', [WORKSPACE_PERMISSION.WRITE_MEMBER]) @SetMetadata('workspaceId', 'body.workspaceId') - async updateRole(@Body() updateDto: UpdateWorkspaceMemberDto) { + async updateRole( + @Body() updateDto: UpdateWorkspaceMemberDto, + @Request() req, + ) { const { error, value } = UpdateWorkspaceMemberDto.validate(updateDto); if (error) { throw new HttpException( @@ -85,10 +88,14 @@ export class WorkspaceMemberController { EXCEPTION_CODE.PARAMETER_ERROR, ); } + const operator = req.user.username, + operatorId = req.user._id.toString(); const updateRes = await this.workspaceMemberService.updateRole({ role: value.role, workspaceId: value.workspaceId, userId: value.userId, + operator, + operatorId, }); return { code: 200, diff --git a/server/src/modules/workspace/services/workspace.service.ts b/server/src/modules/workspace/services/workspace.service.ts index fb097a7a..b5444540 100644 --- a/server/src/modules/workspace/services/workspace.service.ts +++ b/server/src/modules/workspace/services/workspace.service.ts @@ -6,7 +6,6 @@ import { Workspace } from 'src/models/workspace.entity'; import { SurveyMeta } from 'src/models/surveyMeta.entity'; import { ObjectId } from 'mongodb'; -import { RECORD_STATUS } from 'src/enums'; interface FindAllByIdWithPaginationParams { workspaceIdList: string[]; @@ -31,10 +30,13 @@ export class WorkspaceService { async create(workspace: { name: string; description: string; + owner: string; ownerId: string; }): Promise { const newWorkspace = this.workspaceRepository.create({ ...workspace, + creatorId: workspace.ownerId, + creator: workspace.owner, }); return this.workspaceRepository.save(newWorkspace); } @@ -56,8 +58,8 @@ export class WorkspaceService { _id: { $in: workspaceIdList.map((item) => new ObjectId(item)), }, - 'curStatus.status': { - $ne: RECORD_STATUS.REMOVED, + isDeleted: { + $ne: true, }, }; @@ -68,11 +70,11 @@ export class WorkspaceService { }, select: [ '_id', - 'curStatus', 'name', 'description', 'ownerId', - 'createDate', + 'creatorId', + 'createdAt', ], }); } @@ -91,8 +93,8 @@ export class WorkspaceService { _id: { $in: workspaceIdList.map((m) => new ObjectId(m)), }, - 'curStatus.status': { - $ne: RECORD_STATUS.REMOVED, + isDeleted: { + $ne: true, }, }; if (name) { @@ -103,31 +105,40 @@ export class WorkspaceService { skip, take: limit, order: { - createDate: -1, + createdAt: -1, }, }); return { list: data, count }; } - update(id: string, workspace: Partial) { + update({ + id, + workspace, + operator, + operatorId, + }: { + id: string; + workspace: Partial; + operator: string; + operatorId: string; + }) { + workspace.updatedAt = new Date(); + workspace.operator = operator; + workspace.operatorId = operatorId; return this.workspaceRepository.update(id, workspace); } - async delete(id: string) { - const newStatus = { - status: RECORD_STATUS.REMOVED, - date: Date.now(), - }; + async delete(id: string, { operator, operatorId }) { const workspaceRes = await this.workspaceRepository.updateOne( { _id: new ObjectId(id), }, { $set: { - curStatus: newStatus, - }, - $push: { - statusList: newStatus as never, + isDeleted: true, + deletedAt: new Date(), + operator, + operatorId, }, }, ); @@ -137,10 +148,10 @@ export class WorkspaceService { }, { $set: { - curStatus: newStatus, - }, - $push: { - statusList: newStatus as never, + isDeleted: true, + deletedAt: new Date(), + operator, + operatorId, }, }, ); @@ -155,8 +166,8 @@ export class WorkspaceService { return await this.workspaceRepository.find({ where: { ownerId: userId, - 'curStatus.status': { - $ne: RECORD_STATUS.REMOVED, + isDeleted: { + $ne: true, }, }, order: { @@ -168,7 +179,7 @@ export class WorkspaceService { 'name', 'description', 'ownerId', - 'createDate', + 'createdAt', ], }); } diff --git a/server/src/modules/workspace/services/workspaceMember.service.ts b/server/src/modules/workspace/services/workspaceMember.service.ts index 2f711963..45c41dfe 100644 --- a/server/src/modules/workspace/services/workspaceMember.service.ts +++ b/server/src/modules/workspace/services/workspaceMember.service.ts @@ -3,7 +3,6 @@ import { InjectRepository } from '@nestjs/typeorm'; import { MongoRepository } from 'typeorm'; import { WorkspaceMember } from 'src/models/workspaceMember.entity'; import { ObjectId } from 'mongodb'; -import { RECORD_STATUS } from 'src/enums'; @Injectable() export class WorkspaceMemberService { @@ -24,25 +23,44 @@ export class WorkspaceMemberService { async batchCreate({ workspaceId, members, + creator, + creatorId, }: { workspaceId: string; members: Array<{ userId: string; role: string }>; + creator: string; + creatorId: string; }) { if (members.length === 0) { return { insertedCount: 0, }; } + const now = new Date(); const dataToInsert = members.map((item) => { return { ...item, workspaceId, + createdAt: now, + updatedAt: now, + creator, + creatorId, }; }); return this.workspaceMemberRepository.insertMany(dataToInsert); } - async batchUpdate({ idList, role }: { idList: Array; role: string }) { + async batchUpdate({ + idList, + role, + operator, + operatorId, + }: { + idList: Array; + role: string; + operator: string; + operatorId: string; + }) { if (idList.length === 0) { return { modifiedCount: 0, @@ -57,6 +75,9 @@ export class WorkspaceMemberService { { $set: { role, + operator, + operatorId, + updatedAt: new Date(), }, }, ); @@ -94,11 +115,8 @@ export class WorkspaceMemberService { return this.workspaceMemberRepository.find({ where: { workspaceId, - 'curStatus.status': { - $ne: RECORD_STATUS.REMOVED, - }, }, - select: ['_id', 'createDate', 'curStatus', 'role', 'userId'], + select: ['_id', 'createdAt', 'curStatus', 'role', 'userId'], }); } @@ -111,7 +129,7 @@ export class WorkspaceMemberService { }); } - async updateRole({ workspaceId, userId, role }) { + async updateRole({ workspaceId, userId, role, operator, operatorId }) { return this.workspaceMemberRepository.updateOne( { workspaceId, @@ -120,6 +138,9 @@ export class WorkspaceMemberService { { $set: { role, + operator, + operatorId, + updatedAt: new Date(), }, }, ); @@ -135,9 +156,6 @@ export class WorkspaceMemberService { async countByWorkspaceId({ workspaceId }) { return this.workspaceMemberRepository.count({ workspaceId, - 'curStatus.status': { - $ne: RECORD_STATUS.REMOVED, - }, }); } diff --git a/server/src/utils/messagePushing.spec.ts b/server/src/utils/__test/messagePushing.spec.ts similarity index 98% rename from server/src/utils/messagePushing.spec.ts rename to server/src/utils/__test/messagePushing.spec.ts index 9788c814..cd1ba44e 100644 --- a/server/src/utils/messagePushing.spec.ts +++ b/server/src/utils/__test/messagePushing.spec.ts @@ -1,5 +1,5 @@ import { ObjectId } from 'mongodb'; -import { getPushingData } from './messagePushing'; +import { getPushingData } from '../messagePushing'; import { RECORD_STATUS } from 'src/enums'; describe('getPushingData', () => { diff --git a/server/src/utils/surveyUtil.ts b/server/src/utils/surveyUtil.ts index a67cf157..3056555f 100644 --- a/server/src/utils/surveyUtil.ts +++ b/server/src/utils/surveyUtil.ts @@ -20,6 +20,7 @@ export function getFilter(filterList: Array) { 'remark', 'surveyType', 'curStatus.status', + 'subStatus.status', ]; return filterList.reduce( (preItem, curItem) => { @@ -61,7 +62,7 @@ export function getFilter(filterList: Array) { } export function getOrder(order: Array) { - const allowOrderFields = ['createDate', 'updateDate', 'curStatus.date']; + const allowOrderFields = ['createdAt', 'updatedAt', 'curStatus.date']; const orderList = order.filter((orderItem) => allowOrderFields.includes(orderItem.field), diff --git a/web/package.json b/web/package.json index 883a8bed..f9060096 100644 --- a/web/package.json +++ b/web/package.json @@ -1,7 +1,7 @@ { - "name": "web", - "version": "0.1.0", - "private": true, + "name": "xiaoju-survey-web", + "version": "1.3.0", + "description": "XIAOJUSURVEY的web端，包含B端和C端应用", "type": "module", "scripts": { "serve": "npm run dev", @@ -41,6 +41,7 @@ "@iconify-json/ep": "^1.1.15", "@rushstack/eslint-patch": "^1.10.2", "@tsconfig/node20": "^20.1.2", + "@types/fs-extra": "^11.0.4", "@types/lodash-es": "^4.17.12", "@types/node": "^20.11.19", "@types/qrcode": "^1.5.5", @@ -52,6 +53,7 @@ "@vue/tsconfig": "^0.5.1", "eslint": "^8.49.0", "eslint-plugin-vue": "^9.17.0", + "fs-extra": "^11.2.0", "husky": "^9.0.11", "npm-run-all2": "^6.1.1", "prettier": "^3.0.3", diff --git a/web/report.ts b/web/report.ts new file mode 100644 index 00000000..edb43840 --- /dev/null +++ b/web/report.ts @@ -0,0 +1,47 @@ +import fs from 'fs-extra' + +const fsa = fs.promises + +process.env.XIAOJU_SURVEY_REPORT = 'true' + +const readData = async (pkg: string) => { + const id = new Date().getTime().toString() + try { + if (!fs.existsSync(pkg)) { + return { + type: 'web', + name: '', + version: '', + description: '', + id, + msg: '文件不存在' + } + } + const data = await fsa.readFile(pkg, 'utf8').catch((e) => e) + const { name, version, description } = JSON.parse(data) + return { type: 'web', name, version, description, id } + } catch (error) { + return error + } +} + +const report = async () => { + if (!process.env.XIAOJU_SURVEY_REPORT) { + return + } + + const res = await readData('./package.json') + + // 上报 + fetch && + fetch('https://xiaojusurveysrc.didi.cn/reportSourceData', { + method: 'POST', + headers: { + Accept: 'application/json, */*', + 'Content-Type': 'application/json' + }, + body: JSON.stringify(res) + }).catch(() => {}) +} + +report() diff --git a/web/src/management/api/analysis.js b/web/src/management/api/analysis.js index 5f211572..a5930322 100644 --- a/web/src/management/api/analysis.js +++ b/web/src/management/api/analysis.js @@ -16,3 +16,4 @@ export const getStatisticList = (data) => { } }) } + diff --git a/web/src/management/api/survey.js b/web/src/management/api/survey.js index 1203b0d7..1666320a 100644 --- a/web/src/management/api/survey.js +++ b/web/src/management/api/survey.js @@ -35,7 +35,7 @@ export const createSurvey = (data) => { } export const getSurveyHistory = ({ surveyId, historyType }) => { - return axios.get('/surveyHisotry/getList', { + return axios.get('/surveyHistory/getList', { params: { surveyId, historyType @@ -53,6 +53,16 @@ export const updateSurvey = (data) => { return axios.post('/survey/updateMeta', data) } +export const pausingSurvey= (surveyId) => { + return axios.post('/survey/pausingSurvey', { + surveyId + }) +} + +export const upgradeSubStatus = () => { + return axios.get('/upgrade/subStatus') +} + export const getSessionId = ({ surveyId }) => { return axios.post('/session/create', { surveyId }) } diff --git a/web/src/management/config/listConfig.js b/web/src/management/config/listConfig.js index ca9578c1..890fb2c8 100644 --- a/web/src/management/config/listConfig.js +++ b/web/src/management/config/listConfig.js @@ -27,9 +27,9 @@ export const spaceListConfig = { key: 'owner', width: 150 }, - createDate: { + createdAt: { title: '创建时间', - key: 'createDate', + key: 'createdAt', minWidth: 200 } } @@ -64,14 +64,14 @@ export const fieldConfig = { key: 'owner', width: 140 }, - updateDate: { + updatedAt: { title: '更新时间', - key: 'curStatus.date', + key: 'updatedAt', minWidth: 200 }, - createDate: { + createdAt: { title: '创建时间', - key: 'createDate', + key: 'createdAt', minWidth: 200 } } @@ -103,14 +103,37 @@ export const noDownloadTaskConfig = { img: '/imgs/icons/list-empty.webp' } -export const statusMaps = { - new: '未发布', - editing: '修改中', - published: '已发布', - removed: '已删除', - pausing: '' +export const curStatus = { + new: { + value: 'new', + label: '未发布' + }, + published: { + value: 'published', + label: '已发布' + }, + editing: { + label: '修改中', + value: 'editing' + }, } +// 子状态 +export const subStatus = { + pausing: { + label: '暂停中', + value: 'pausing' + } +} + +export const statusMaps = { + ...Object.fromEntries(Object.keys(curStatus).map(key => ([key, curStatus[key].label]))), + ...Object.fromEntries(Object.keys(subStatus).map(key => ([key, subStatus[key].label]))) +} + +export const curStatusKey = 'curStatus.status'; +export const subStatusKey = 'subStatus.status'; + // 问卷类型 export const surveyTypeSelect = { label: '问卷类型', @@ -151,29 +174,21 @@ export const curStatusSelect = { value: '', label: '全部状态' }, - { - value: 'new', - label: '未发布' - }, - { - value: 'published', - label: '已发布' - }, - { - value: 'editing', - label: '修改中' - } + curStatus.new, + curStatus.published, + curStatus.editing, + subStatus.pausing ], default: '' } export const selectOptionsDict = Object.freeze({ surveyType: surveyTypeSelect, - 'curStatus.status': curStatusSelect + status: curStatusSelect, }) export const buttonOptionsDict = Object.freeze({ - 'curStatus.date': { + 'updatedAt': { label: '更新时间', icons: [ { @@ -194,7 +209,7 @@ export const buttonOptionsDict = Object.freeze({ } ] }, - createDate: { + createdAt: { label: '创建时间', icons: [ { diff --git a/web/src/management/pages/analysis/components/DataTable.vue b/web/src/management/pages/analysis/components/DataTable.vue index a1a71f06..437315a9 100644 --- a/web/src/management/pages/analysis/components/DataTable.vue +++ b/web/src/management/pages/analysis/components/DataTable.vue @@ -80,7 +80,7 @@ const popoverContent = ref('') const getContent = (content) => { if (Array.isArray(content)) { - return content.map((item) => getContent(item)).join(',') + return content.map(item => getContent(item)).join(','); } if (content === null || content === undefined) { return '' diff --git a/web/src/management/pages/analysis/pages/DataTablePage.vue b/web/src/management/pages/analysis/pages/DataTablePage.vue index 4d438988..750cee34 100644 --- a/web/src/management/pages/analysis/pages/DataTablePage.vue +++ b/web/src/management/pages/analysis/pages/DataTablePage.vue @@ -194,7 +194,7 @@ const checkIsTaskFinished = (taskId) => { const run = () => { getDownloadTask(taskId).then((res) => { if (res.code === 200 && res.data) { - const status = res.data.curStatus.status + const status = res.data.status if (status === 'new' || status === 'computing') { setTimeout(() => { run() diff --git a/web/src/management/pages/download/components/TaskList.vue b/web/src/management/pages/download/components/TaskList.vue index b0a9eebc..32ee9e01 100644 --- a/web/src/management/pages/download/components/TaskList.vue +++ b/web/src/management/pages/download/components/TaskList.vue @@ -26,7 +26,7 @@