4.8.6 fix (#1963)

* feat: log store

* fix: full text search match query

* perf: mongo schema import, Avoid duplicate import

packages/service/support/activity/promotion/schema.ts

@@ -1,4 +1,4 @@
-import { connectionMongo, type Model } from '../../../common/mongo';
+import { connectionMongo, getMongoModel, type Model } from '../../../common/mongo';
 const { Schema, model, models } = connectionMongo;
 import { PromotionRecordSchema as PromotionRecordType } from '@fastgpt/global/support/activity/type.d';
 
@@ -29,6 +29,7 @@ const PromotionRecordSchema = new Schema({
   }
 });
 
-export const MongoPromotionRecord: Model<PromotionRecordType> =
-  models['promotionRecord'] || model('promotionRecord', PromotionRecordSchema);
-MongoPromotionRecord.syncIndexes();
+export const MongoPromotionRecord = getMongoModel<PromotionRecordType>(
+  'promotionRecord',
+  PromotionRecordSchema
+);

packages/service/support/openapi/schema.ts

@@ -1,4 +1,4 @@
-import { connectionMongo, type Model } from '../../common/mongo';
+import { connectionMongo, getMongoModel, type Model } from '../../common/mongo';
 const { Schema, model, models } = connectionMongo;
 import type { OpenApiSchema } from '@fastgpt/global/support/openapi/type';
 import {
@@ -64,6 +64,4 @@ try {
   console.log(error);
 }
 
-export const MongoOpenApi: Model<OpenApiSchema> =
-  models['openapi'] || model('openapi', OpenApiSchema);
-MongoOpenApi.syncIndexes();
+export const MongoOpenApi = getMongoModel<OpenApiSchema>('openapi', OpenApiSchema);

packages/service/support/outLink/schema.ts

@@ -1,4 +1,4 @@
-import { connectionMongo, type Model } from '../../common/mongo';
+import { connectionMongo, getMongoModel, type Model } from '../../common/mongo';
 const { Schema, model, models } = connectionMongo;
 import { OutLinkSchema as SchemaType } from '@fastgpt/global/support/outLink/type';
 import {
@@ -90,7 +90,4 @@ try {
   console.log(error);
 }
 
-export const MongoOutLink: Model<SchemaType> =
-  models['outlinks'] || model('outlinks', OutLinkSchema);
-
-MongoOutLink.syncIndexes();
+export const MongoOutLink = getMongoModel<SchemaType>('outlinks', OutLinkSchema);

packages/service/support/permission/schema.ts

@@ -2,7 +2,7 @@ import {
   TeamCollectionName,
   TeamMemberCollectionName
 } from '@fastgpt/global/support/user/team/constant';
-import { Model, connectionMongo } from '../../common/mongo';
+import { Model, connectionMongo, getMongoModel } from '../../common/mongo';
 import type { ResourcePermissionType } from '@fastgpt/global/support/permission/type';
 import { PerResourceTypeEnum } from '@fastgpt/global/support/permission/constant';
 const { Schema, model, models } = connectionMongo;
@@ -54,8 +54,7 @@ try {
   console.log(error);
 }
 
-export const MongoResourcePermission: Model<ResourcePermissionType> =
-  models[ResourcePermissionCollectionName] ||
-  model(ResourcePermissionCollectionName, ResourcePermissionSchema);
-
-MongoResourcePermission.syncIndexes();
+export const MongoResourcePermission = getMongoModel<ResourcePermissionType>(
+  ResourcePermissionCollectionName,
+  ResourcePermissionSchema
+);

packages/service/support/user/schema.ts

@@ -1,4 +1,4 @@
-import { connectionMongo, type Model } from '../../common/mongo';
+import { connectionMongo, getMongoModel, type Model } from '../../common/mongo';
 const { Schema, model, models } = connectionMongo;
 import { hashStr } from '@fastgpt/global/common/string/tools';
 import type { UserModelSchema } from '@fastgpt/global/support/user/type';
@@ -74,6 +74,4 @@ try {
   console.log(error);
 }
 
-export const MongoUser: Model<UserModelSchema> =
-  models[userCollectionName] || model(userCollectionName, UserSchema);
-MongoUser.syncIndexes();
+export const MongoUser = getMongoModel<UserModelSchema>(userCollectionName, UserSchema);

packages/service/support/user/team/teamMemberSchema.ts

@@ -1,4 +1,4 @@
-import { connectionMongo, type Model } from '../../../common/mongo';
+import { connectionMongo, getMongoModel, type Model } from '../../../common/mongo';
 const { Schema, model, models } = connectionMongo;
 import { TeamMemberSchema as TeamMemberType } from '@fastgpt/global/support/user/team/type.d';
 import { userCollectionName } from '../../user/schema';
@@ -49,5 +49,7 @@ try {
   console.log(error);
 }
 
-export const MongoTeamMember: Model<TeamMemberType> =
-  models[TeamMemberCollectionName] || model(TeamMemberCollectionName, TeamMemberSchema);
+export const MongoTeamMember = getMongoModel<TeamMemberType>(
+  TeamMemberCollectionName,
+  TeamMemberSchema
+);

packages/service/support/user/team/teamSchema.ts

@@ -1,4 +1,4 @@
-import { connectionMongo, type Model } from '../../../common/mongo';
+import { connectionMongo, getMongoModel, type Model } from '../../../common/mongo';
 const { Schema, model, models } = connectionMongo;
 import { TeamSchema as TeamType } from '@fastgpt/global/support/user/team/type.d';
 import { userCollectionName } from '../../user/schema';
@@ -61,5 +61,4 @@ try {
   console.log(error);
 }
 
-export const MongoTeam: Model<TeamType> =
-  models[TeamCollectionName] || model(TeamCollectionName, TeamSchema);
+export const MongoTeam = getMongoModel<TeamType>(TeamCollectionName, TeamSchema);

packages/service/support/user/team/teamTagsSchema.ts

@@ -1,4 +1,4 @@
-import { connectionMongo, type Model } from '../../../common/mongo';
+import { connectionMongo, getMongoModel, type Model } from '../../../common/mongo';
 const { Schema, model, models } = connectionMongo;
 import { TeamTagSchema as TeamTagsSchemaType } from '@fastgpt/global/support/user/team/type.d';
 import {
@@ -32,5 +32,7 @@ try {
   console.log(error);
 }
 
-export const MongoTeamTags: Model<TeamTagsSchemaType> =
-  models[TeamTagsCollectionName] || model(TeamTagsCollectionName, TeamTagSchema);
+export const MongoTeamTags = getMongoModel<TeamTagsSchemaType>(
+  TeamTagsCollectionName,
+  TeamTagSchema
+);

packages/service/support/wallet/sub/schema.ts

@@ -3,7 +3,7 @@
   1. type=standard: There will only be 1, and each team will have one
   2. type=extraDatasetSize/extraPoints: Can buy multiple
 */
-import { connectionMongo, type Model } from '../../../common/mongo';
+import { connectionMongo, getMongoModel, type Model } from '../../../common/mongo';
 const { Schema, model, models } = connectionMongo;
 import { TeamCollectionName } from '@fastgpt/global/support/user/team/constant';
 import {
@@ -93,5 +93,4 @@ try {
   console.log(error);
 }
 
-export const MongoTeamSub: Model<TeamSubSchema> =
-  models[subCollectionName] || model(subCollectionName, SubSchema);
+export const MongoTeamSub = getMongoModel<TeamSubSchema>(subCollectionName, SubSchema);

packages/service/support/wallet/usage/schema.ts

@@ -1,4 +1,4 @@
-import { connectionMongo, type Model } from '../../../common/mongo';
+import { connectionMongo, getMongoModel, type Model } from '../../../common/mongo';
 const { Schema, model, models } = connectionMongo;
 import { UsageSchemaType } from '@fastgpt/global/support/wallet/usage/type';
 import { UsageSourceMap } from '@fastgpt/global/support/wallet/usage/constants';
@@ -70,6 +70,4 @@ try {
   console.log(error);
 }
 
-export const MongoUsage: Model<UsageSchemaType> =
-  models[UsageCollectionName] || model(UsageCollectionName, UsageSchema);
-MongoUsage.syncIndexes();
+export const MongoUsage = getMongoModel<UsageSchemaType>(UsageCollectionName, UsageSchema);