improve typings

apps/app/src/features/questionnaire/interfaces/growi-app-additional-info.ts

@@ -1,9 +0,0 @@
-import type { IGrowiAdditionalInfo } from '@growi/core/dist/interfaces';
-
-import type { AttachmentMethodType } from '~/interfaces/attachment';
-import type { IExternalAuthProviderType } from '~/interfaces/external-auth-provider';
-
-export type IGrowiAppAdditionalInfo = IGrowiAdditionalInfo & {
-  attachmentType: AttachmentMethodType
-  activeExternalAccountTypes?: IExternalAuthProviderType[]
-}

apps/app/src/features/questionnaire/interfaces/growi-app-info.ts

@@ -0,0 +1,14 @@
+import type { IGrowiAdditionalInfo, IGrowiInfo } from '@growi/core/dist/interfaces';
+
+import type { AttachmentMethodType } from '~/interfaces/attachment';
+import type { IExternalAuthProviderType } from '~/interfaces/external-auth-provider';
+
+
+export type IGrowiAppAdditionalInfo = IGrowiAdditionalInfo & {
+  attachmentType: AttachmentMethodType
+  activeExternalAccountTypes?: IExternalAuthProviderType[]
+}
+
+// legacy properties (extracted from additionalInfo for growi-questionnaire)
+// see: https://gitlab.weseek.co.jp/tech/growi/growi-questionnaire
+export type IGrowiAppInfoLegacy = Omit<IGrowiInfo<IGrowiAppAdditionalInfo>, 'additionalInfo'> & IGrowiAppAdditionalInfo;

apps/app/src/features/questionnaire/interfaces/proactive-questionnaire-answer.ts

@@ -1,6 +1,6 @@
 import type { IGrowiInfo } from '@growi/core/dist/interfaces';
 
-import type { IGrowiAppAdditionalInfo } from './growi-app-additional-info';
+import type { IGrowiAppAdditionalInfo } from './growi-app-info';
 import type { IUserInfo } from './user-info';
 
 

apps/app/src/features/questionnaire/interfaces/questionnaire-answer.ts

@@ -1,7 +1,7 @@
 import type { IGrowiInfo } from '@growi/core/dist/interfaces';
 
 import type { IAnswer } from './answer';
-import type { IGrowiAppAdditionalInfo } from './growi-app-additional-info';
+import type { IGrowiAppAdditionalInfo } from './growi-app-info';
 import type { IUserInfo } from './user-info';
 
 export interface IQuestionnaireAnswer<ID = string> {

apps/app/src/features/questionnaire/server/models/schema/growi-info.ts

@@ -3,14 +3,10 @@ import type { IGrowiInfo } from '@growi/core/dist/interfaces';
 import { GrowiWikiType } from '@growi/core/dist/interfaces';
 import { Schema } from 'mongoose';
 
-import type { IGrowiAppAdditionalInfo } from '~/features/questionnaire/interfaces/growi-app-additional-info';
+import type { IGrowiAppAdditionalInfo } from '~/features/questionnaire/interfaces/growi-app-info';
 import { AttachmentMethodType } from '~/interfaces/attachment';
 import { IExternalAuthProviderType } from '~/interfaces/external-auth-provider';
 
-// legacy properties (extracted from additionalInfo for growi-questionnaire)
-// see: https://gitlab.weseek.co.jp/tech/growi/growi-questionnaire
-export type IGrowiInfoLegacy = Omit<IGrowiInfo<IGrowiAppAdditionalInfo>, 'additionalInfo'> & IGrowiAppAdditionalInfo;
-
 const growiAdditionalInfoSchema = new Schema<IGrowiAppAdditionalInfo>({
   installedAt: { type: Date, required: true },
   installedAtByOldestUser: { type: Date, required: true },

apps/app/src/features/questionnaire/server/service/questionnaire.ts

@@ -16,7 +16,7 @@ import { aclService } from '~/server/service/acl';
 import { configManager } from '~/server/service/config-manager';
 import loggerFactory from '~/utils/logger';
 
-import type { IGrowiAppAdditionalInfo } from '../../interfaces/growi-app-additional-info';
+import type { IGrowiAppAdditionalInfo } from '../../interfaces/growi-app-info';
 import { StatusType } from '../../interfaces/questionnaire-answer-status';
 import { type IUserInfo, UserType } from '../../interfaces/user-info';
 import QuestionnaireAnswerStatus from '../models/questionnaire-answer-status';

apps/app/src/features/questionnaire/server/util/condition.ts

@@ -1,7 +1,7 @@
 import type { IGrowiInfo } from '@growi/core/dist/interfaces';
 
 import type { ICondition } from '../../interfaces/condition';
-import type { IGrowiAppAdditionalInfo } from '../../interfaces/growi-app-additional-info';
+import type { IGrowiAppAdditionalInfo } from '../../interfaces/growi-app-info';
 import type { IQuestionnaireOrder } from '../../interfaces/questionnaire-order';
 import type { IUserInfo } from '../../interfaces/user-info';
 import { UserType } from '../../interfaces/user-info';