System inform (#2263)

* feat: Bind Notification Pipe (#2229)

* chore: account page add bind notification modal

* feat: timerlock schema and type

* feat(fe): bind notification method modal

* chore: fe adjust

* feat: clean useless code

* fix: cron lock

* chore: adjust the code

* chore: rename api

* chore: remove unused code

* chore: fe adjust

* perf: bind inform ux

* fix: time ts

* chore: notification (#2251)

* perf: send message code

* perf: sub schema index

* fix: timezone plugin

* fix: format

---------

Co-authored-by: Finley Ge <32237950+FinleyGe@users.noreply.github.com>

packages/service/common/system/timerLock/constants.ts

@@ -4,14 +4,21 @@ export enum TimerIdEnum {
   checkInvalidVector = 'checkInvalidVector',
   clearExpiredSubPlan = 'clearExpiredSubPlan',
   updateStandardPlan = 'updateStandardPlan',
-  scheduleTriggerApp = 'scheduleTriggerApp'
+  scheduleTriggerApp = 'scheduleTriggerApp',
+  notification = 'notification'
 }
 
-export const timerIdMap = {
-  [TimerIdEnum.checkInValidDatasetFiles]: 'checkInValidDatasetFiles',
-  [TimerIdEnum.checkInvalidDatasetData]: 'checkInvalidDatasetData',
-  [TimerIdEnum.checkInvalidVector]: 'checkInvalidVector',
-  [TimerIdEnum.clearExpiredSubPlan]: 'clearExpiredSubPlan',
-  [TimerIdEnum.updateStandardPlan]: 'updateStandardPlan',
-  [TimerIdEnum.scheduleTriggerApp]: 'scheduleTriggerApp'
-};
+export enum LockNotificationEnum {
+  NotificationExpire = 'notification_expire',
+  NotificationFreeClean = 'notification_free_clean',
+  NotificationLackOfPoints = 'notification_lack_of_points'
+}
+
+export type LockType = `${LockNotificationEnum}`;
+
+// add a new type enum example:
+// export enum ExampleLockEnum {
+//    ExampleLockType1 = 'example_lock_type1'
+// }
+//
+// export type LockType = `${NotificationLockEnum}` | `${ExampleLockEnum}`

packages/service/common/system/timerLock/schema.ts

@@ -1,6 +1,5 @@
-import { connectionMongo, getMongoModel, type Model } from '../../mongo';
-import { timerIdMap } from './constants';
-const { Schema, model, models } = connectionMongo;
+import { connectionMongo, getMongoModel } from '../../mongo';
+const { Schema } = connectionMongo;
 import { TimerLockSchemaType } from './type.d';
 
 export const collectionName = 'systemtimerlocks';
@@ -9,8 +8,7 @@ const TimerLockSchema = new Schema({
   timerId: {
     type: String,
     required: true,
-    unique: true,
-    enum: Object.keys(timerIdMap)
+    unique: true
   },
   expiredTime: {
     type: Date,

packages/service/common/system/timerLock/utils.ts

@@ -1,4 +1,3 @@
-import { TimerIdEnum } from './constants';
 import { MongoTimerLock } from './schema';
 import { addMinutes } from 'date-fns';
 
@@ -9,7 +8,7 @@ export const checkTimerLock = async ({
   timerId,
   lockMinuted
 }: {
-  timerId: TimerIdEnum;
+  timerId: string;
   lockMinuted: number;
 }) => {
   try {

packages/service/support/user/controller.ts

@@ -45,6 +45,8 @@ export async function getUserDetail({
     timezone: user.timezone,
     promotionRate: user.promotionRate,
     openaiAccount: user.openaiAccount,
-    team: tmb
+    team: tmb,
+    notificationAccount: tmb.notificationAccount,
+    permission: tmb.permission
   };
 }

packages/service/support/user/schema.ts

@@ -1,5 +1,5 @@
-import { connectionMongo, getMongoModel, type Model } from '../../common/mongo';
-const { Schema, model, models } = connectionMongo;
+import { connectionMongo, getMongoModel } from '../../common/mongo';
+const { Schema } = connectionMongo;
 import { hashStr } from '@fastgpt/global/common/string/tools';
 import type { UserModelSchema } from '@fastgpt/global/support/user/type';
 import { UserStatusEnum, userStatusMap } from '@fastgpt/global/support/user/constant';
@@ -18,15 +18,9 @@ const UserSchema = new Schema({
     required: true,
     unique: true // 唯一
   },
-  email: {
-    type: String
-  },
   phonePrefix: {
     type: Number
   },
-  phone: {
-    type: String
-  },
   password: {
     type: String,
     required: true,

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

@@ -40,7 +40,8 @@ async function getTeamMember(match: Record<string, any>): Promise<TeamTmbItemTyp
     permission: new TeamPermission({
       per: tmbPer?.permission ?? tmb.teamId.defaultPermission,
       isOwner: tmb.role === TeamMemberRoleEnum.owner
-    })
+    }),
+    notificationAccount: tmb.teamId.notificationAccount
   };
 }
 

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

@@ -1,5 +1,5 @@
-import { connectionMongo, getMongoModel, type Model } from '../../../common/mongo';
-const { Schema, model, models } = connectionMongo;
+import { connectionMongo, getMongoModel } from '../../../common/mongo';
+const { Schema } = connectionMongo;
 import { TeamSchema as TeamType } from '@fastgpt/global/support/user/team/type.d';
 import { userCollectionName } from '../../user/schema';
 import { TeamCollectionName } from '@fastgpt/global/support/user/team/constant';
@@ -51,6 +51,10 @@ const TeamSchema = new Schema({
     pat: {
       type: String
     }
+  },
+  notificationAccount: {
+    type: String,
+    required: false
   }
 });
 

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

@@ -3,8 +3,8 @@
   1. type=standard: There will only be 1, and each team will have one
   2. type=extraDatasetSize/extraPoints: Can buy multiple
 */
-import { connectionMongo, getMongoModel, type Model } from '../../../common/mongo';
-const { Schema, model, models } = connectionMongo;
+import { connectionMongo, getMongoModel } from '../../../common/mongo';
+const { Schema } = connectionMongo;
 import { TeamCollectionName } from '@fastgpt/global/support/user/team/constant';
 import {
   standardSubLevelMap,
@@ -84,11 +84,13 @@ const SubSchema = new Schema({
 });
 
 try {
-  // get team plan
-  SubSchema.index({ teamId: 1, type: 1, expiredTime: -1 });
+  // Get plan by expiredTime
+  SubSchema.index({ expiredTime: -1, currentSubLevel: 1 });
 
-  // timer task. check expired plan; update standard plan;
-  SubSchema.index({ type: 1, currentSubLevel: 1, expiredTime: -1 });
+  // Get team plan
+  SubSchema.index({ teamId: 1, type: 1, expiredTime: -1 });
+  // timer task. Get standard plan;Get free plan;Clear expired extract plan
+  SubSchema.index({ type: 1, expiredTime: -1, currentSubLevel: 1 });
 } catch (error) {
   console.log(error);
 }

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

@@ -63,7 +63,7 @@ const UsageSchema = new Schema({
 try {
   UsageSchema.index({ teamId: 1, tmbId: 1, source: 1, time: -1 }, { background: true });
   // timer task. clear dead team
-  UsageSchema.index({ teamId: 1, time: -1 }, { background: true });
+  // UsageSchema.index({ teamId: 1, time: -1 }, { background: true });
 
   UsageSchema.index({ time: 1 }, { expireAfterSeconds: 180 * 24 * 60 * 60 });
 } catch (error) {