Revert "sub plan page (#885)" (#886)

This reverts commit 443ad37b6a.

packages/service/support/user/controller.ts

@@ -2,6 +2,7 @@ import { UserType } from '@fastgpt/global/support/user/type';
 import { MongoUser } from './schema';
 import { getTmbInfoByTmbId, getUserDefaultTeam } from './team/controller';
 import { ERROR_ENUM } from '@fastgpt/global/common/error/errorCode';
+import { UserErrEnum } from '@fastgpt/global/common/error/code/user';
 
 export async function authUserExist({ userId, username }: { userId?: string; username?: string }) {
   if (userId) {
@@ -46,3 +47,22 @@ export async function getUserDetail({
     team: tmb
   };
 }
+
+export async function getUserAndAuthBalance({
+  tmbId,
+  minBalance
+}: {
+  tmbId: string;
+  minBalance?: number;
+}) {
+  const user = await getUserDetail({ tmbId });
+
+  if (!user) {
+    return Promise.reject(UserErrEnum.unAuthUser);
+  }
+  if (minBalance !== undefined && user.team.balance < minBalance) {
+    return Promise.reject(UserErrEnum.balanceNotEnough);
+  }
+
+  return user;
+}

packages/service/support/user/schema.ts

@@ -1,7 +1,7 @@
 import { connectionMongo, type Model } from '../../common/mongo';
 const { Schema, model, models } = connectionMongo;
 import { hashStr } from '@fastgpt/global/common/string/tools';
-import { PRICE_SCALE } from '@fastgpt/global/support/wallet/constants';
+import { PRICE_SCALE } from '@fastgpt/global/support/wallet/bill/constants';
 import type { UserModelSchema } from '@fastgpt/global/support/user/type';
 import { UserStatusEnum, userStatusMap } from '@fastgpt/global/support/user/constant';
 
@@ -63,8 +63,6 @@ const UserSchema = new Schema({
 });
 
 try {
-  // login
-  UserSchema.index({ username: 1, password: 1 });
   UserSchema.index({ createTime: -1 });
 } catch (error) {
   console.log(error);

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

@@ -36,7 +36,7 @@ export async function getTmbInfoByTmbId({ tmbId }: { tmbId: string }) {
     return Promise.reject('tmbId or userId is required');
   }
   return getTeamMember({
-    _id: new Types.ObjectId(String(tmbId)),
+    _id: new Types.ObjectId(tmbId),
     status: notLeaveStatus
   });
 }

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

@@ -27,10 +27,7 @@ const TeamSchema = new Schema({
   },
   maxSize: {
     type: Number,
-    default: 1
-  },
-  tagsUrl: {
-    type: String
+    default: 3
   },
   limit: {
     lastExportDatasetTime: {

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

@@ -1,35 +0,0 @@
-import { connectionMongo, type Model } from '../../../common/mongo';
-const { Schema, model, models } = connectionMongo;
-import { TeamTagsSchema as TeamTagsSchemaType } from '@fastgpt/global/support/user/team/type.d';
-import {
-  TeamCollectionName,
-  TeamTagsCollectionName
-} from '@fastgpt/global/support/user/team/constant';
-
-const TeamTagsSchema = new Schema({
-  label: {
-    type: String,
-    required: true
-  },
-  teamId: {
-    type: Schema.Types.ObjectId,
-    ref: TeamCollectionName,
-    required: true
-  },
-  key: {
-    type: String
-  },
-  createTime: {
-    type: Date,
-    default: () => new Date()
-  }
-});
-
-try {
-  TeamTagsSchema.index({ teamId: 1 });
-} catch (error) {
-  console.log(error);
-}
-
-export const MongoTeamTags: Model<TeamTagsSchemaType> =
-  models[TeamTagsCollectionName] || model(TeamTagsCollectionName, TeamTagsSchema);