fix colection create api (#766)

Co-authored-by: heheer <71265218+newfish-cmyk@users.noreply.github.com>
This commit is contained in:
Archer
2024-01-23 09:01:24 +08:00
committed by GitHub
parent aab6ee51eb
commit 379673cae1
143 changed files with 40737 additions and 274 deletions

View File

@@ -1,10 +1,15 @@
import { connectionMongo, type Model } from '../../../common/mongo';
const { Schema, model, models } = connectionMongo;
import { TeamCollectionName } from '@fastgpt/global/support/user/team/constant';
import { subModeMap, subStatusMap, subTypeMap } from '@fastgpt/global/support/wallet/sub/constants';
import {
standardSubLevelMap,
subModeMap,
subStatusMap,
subTypeMap
} from '@fastgpt/global/support/wallet/sub/constants';
import type { TeamSubSchema } from '@fastgpt/global/support/wallet/sub/type';
export const subCollectionName = 'team.subscription';
export const subCollectionName = 'team.subscriptions';
const SubSchema = new Schema({
teamId: {
@@ -17,29 +22,107 @@ const SubSchema = new Schema({
enum: Object.keys(subTypeMap),
required: true
},
status: {
// active: continue sub; canceled: canceled sub;
type: String,
enum: Object.keys(subStatusMap),
required: true
},
mode: {
type: String,
enum: Object.keys(subModeMap),
required: true
},
status: {
type: String,
enum: Object.keys(subStatusMap),
required: true
},
renew: {
type: Boolean,
default: true
},
startTime: {
type: Date
type: Date,
default: () => new Date()
},
expiredTime: {
type: Date
type: Date,
required: true
},
datasetStoreAmount: {
price: {
// last sub pay price(total price)
type: Number,
required: true
},
// sub content
currentSubLevel: {
type: String,
enum: Object.keys(standardSubLevelMap)
},
nextSubLevel: {
type: String,
enum: Object.keys(standardSubLevelMap)
},
currentExtraDatasetSize: {
type: Number
}
},
nextExtraDatasetSize: {
type: Number
},
currentExtraPoints: {
type: Number
},
nextExtraPoints: {
type: Number
},
// standard sub limit
maxTeamMember: {
type: Number
},
maxAppAmount: {
type: Number
},
maxDatasetAmount: {
type: Number
},
chatHistoryStoreDuration: {
// n day
type: Number
},
maxDatasetSize: {
type: Number
},
trainingWeight: {
// 0 1 2 3
type: Number
},
customApiKey: {
type: Boolean
},
customCopyright: {
type: Boolean
},
exportDatasetInterval: {
// hours
type: Number
},
websiteSyncInterval: {
// hours
type: Number
},
reRankWeight: {
// 0 1 2 3
type: Number
},
totalPoints: {
// record standard sub points
type: Number
},
surplusPoints: {
// standard sub / extra points sub
type: Number
},
// abandon
renew: Boolean, //决定是否续费
datasetStoreAmount: Number
});
try {

View File

@@ -1,4 +1,4 @@
import { SubStatusEnum } from '@fastgpt/global/support/wallet/sub/constants';
import { SubTypeEnum } from '@fastgpt/global/support/wallet/sub/constants';
import { MongoTeamSub } from './schema';
/* get team dataset size */
@@ -11,17 +11,14 @@ export const getTeamDatasetValidSub = async ({
}) => {
const sub = await MongoTeamSub.findOne({
teamId,
status: SubStatusEnum.active
})
.sort({
expiredTime: -1
})
.lean();
type: SubTypeEnum.extraDatasetSize,
expiredTime: { $gte: new Date() }
}).lean();
const maxSize = (() => {
if (!sub || !sub.datasetStoreAmount) return freeSize;
if (!sub || !sub.currentExtraDatasetSize) return freeSize;
return sub.datasetStoreAmount + freeSize;
return sub.currentExtraDatasetSize + freeSize;
})();
return {