fix generics type error

apps/app/src/features/external-user-group/server/routes/apiv3/external-user-group.ts

@@ -4,10 +4,8 @@ import {
   body, param, query, validationResult,
 } from 'express-validator';
 
-import ExternalUserGroup, { ExternalUserGroupDocument } from '~/features/external-user-group/server/models/external-user-group';
-import ExternalUserGroupRelation, {
-  ExternalUserGroupRelationDocument,
-} from '~/features/external-user-group/server/models/external-user-group-relation';
+import ExternalUserGroup from '~/features/external-user-group/server/models/external-user-group';
+import ExternalUserGroupRelation from '~/features/external-user-group/server/models/external-user-group-relation';
 import { SupportedAction } from '~/interfaces/activity';
 import Crowi from '~/server/crowi';
 import { generateAddActivityMiddleware } from '~/server/middlewares/add-activity';
@@ -141,10 +139,7 @@ module.exports = (crowi: Crowi): Router => {
 
       try {
         const userGroups = await (crowi.userGroupService as UserGroupService)
-          .removeCompletelyByRootGroupId<
-            ExternalUserGroupDocument,
-            ExternalUserGroupRelationDocument
-          >(deleteGroupId, actionName, transferToUserGroupId, req.user, ExternalUserGroup, ExternalUserGroupRelation);
+          .removeCompletelyByRootGroupId(deleteGroupId, actionName, transferToUserGroupId, req.user, ExternalUserGroup, ExternalUserGroupRelation);
 
         const parameters = { action: SupportedAction.ACTION_ADMIN_USER_GROUP_DELETE };
         activityEvent.emit('update', res.locals.activity._id, parameters);

apps/app/src/server/service/user-group.ts

@@ -113,13 +113,10 @@ class UserGroupService {
     return userGroup.save();
   }
 
-  async removeCompletelyByRootGroupId<
-    D extends UserGroupDocument,
-    RD extends UserGroupRelationDocument,
-  >(
+  async removeCompletelyByRootGroupId(
       deleteRootGroupId, action, transferToUserGroupId, user,
-      userGroupModel: Model<D> & UserGroupModel = UserGroup,
-      userGroupRelationModel: Model<RD> & UserGroupRelationModel = UserGroupRelation,
+      userGroupModel: Model<UserGroupDocument> & UserGroupModel = UserGroup,
+      userGroupRelationModel: Model<UserGroupRelationDocument> & UserGroupRelationModel = UserGroupRelation,
   ) {
     const rootGroup = await userGroupModel.findById(deleteRootGroupId);
     if (rootGroup == null) {