Просмотр исходного кода

Merge branch 'feat/page-bulk-export' into feat/135772-pdf-page-bulk-export

Futa Arai 1 год назад
Родитель
Сommit
a4127452e2

+ 1 - 0
apps/app/src/features/page-bulk-export/server/service/page-bulk-export-job-clean-up-cron.integ.ts

@@ -32,6 +32,7 @@ describe('PageBulkExportJobCleanUpCronService', () => {
   let user;
 
   beforeAll(async() => {
+    await configManager.loadConfigs();
     user = await User.create({
       name: 'Example for PageBulkExportJobCleanUpCronService Test',
       username: 'page bulk export job cleanup cron test user',

+ 6 - 5
apps/app/src/features/questionnaire/server/service/questionnaire-cron.integ.ts

@@ -4,16 +4,17 @@ import axios from 'axios';
 import mongoose from 'mongoose';
 
 import { configManager } from '~/server/service/config-manager';
+
+import { AttachmentMethodType } from '../../../../interfaces/attachment';
 import type {
   IProactiveQuestionnaireAnswer, IProactiveQuestionnaireAnswerLegacy,
 } from '../../interfaces/proactive-questionnaire-answer';
 import type { IQuestionnaireAnswer, IQuestionnaireAnswerLegacy } from '../../interfaces/questionnaire-answer';
 import { StatusType } from '../../interfaces/questionnaire-answer-status';
-import ProactiveQuestionnaireAnswer from '../../server/models/proactive-questionnaire-answer';
-import QuestionnaireAnswer from '../../server/models/questionnaire-answer';
-import QuestionnaireAnswerStatus from '../../server/models/questionnaire-answer-status';
-import QuestionnaireOrder from '../../server/models/questionnaire-order';
-import { AttachmentMethodType } from '../../../../../src/interfaces/attachment';
+import ProactiveQuestionnaireAnswer from '../models/proactive-questionnaire-answer';
+import QuestionnaireAnswer from '../models/questionnaire-answer';
+import QuestionnaireAnswerStatus from '../models/questionnaire-answer-status';
+import QuestionnaireOrder from '../models/questionnaire-order';
 
 import questionnaireCronService from './questionnaire-cron';
 

+ 3 - 1
apps/app/src/server/service/file-uploader/aws/index.ts

@@ -16,7 +16,9 @@ import { getSignedUrl } from '@aws-sdk/s3-request-presigner';
 import urljoin from 'url-join';
 
 import type Crowi from '~/server/crowi';
-import { AttachmentType, FilePathOnStoragePrefix, ResponseMode, type RespondOptions } from '~/server/interfaces/attachment';
+import {
+  AttachmentType, FilePathOnStoragePrefix, ResponseMode, type RespondOptions,
+} from '~/server/interfaces/attachment';
 import type { IAttachmentDocument } from '~/server/models/attachment';
 import loggerFactory from '~/utils/logger';
 

+ 0 - 1
package.json

@@ -73,7 +73,6 @@
     "eslint-plugin-regex": "^1.8.0",
     "eslint-plugin-rulesdir": "^0.2.2",
     "eslint-plugin-vitest": "^0.2.3",
-    "eslint-plugin-regex": "^1.8.0",
     "glob": "^8.1.0",
     "mock-require": "^3.0.3",
     "nodemon": "^3.1.3",