Skip to content

Let's use AI to Earn!

feat(user): add currency enum and update user schema with new income (#304)

nevined2d46de8f51
diff --git a/project/backend/libs/common/src/enums/currency.enum.ts b/project/backend/libs/common/src/enums/currency.enum.ts
new file mode 100644
index 00000000..10314745
--- /dev/null
+++ b/project/backend/libs/common/src/enums/currency.enum.ts
@@ -0,0 +1,5 @@
+export enum Currency {
+ USD = 'USD',
+ CNY = 'CNY',
+ UNK = 'UNK',
+}
diff --git a/project/backend/libs/common/src/enums/index.ts b/project/backend/libs/common/src/enums/index.ts
index 54f2fe67..c4a93b4a 100755
--- a/project/backend/libs/common/src/enums/index.ts
+++ b/project/backend/libs/common/src/enums/index.ts
@@ -1,4 +1,5 @@
export * from './account-type.enum'
+export * from './currency.enum'
export * from './filter-set.enum'
export * from './mime-type.enum'
export * from './response-code.enum'
diff --git a/project/backend/libs/mongodb/src/schemas/user.schema.ts b/project/backend/libs/mongodb/src/schemas/user.schema.ts
index c0db81ce..20f66f13 100644
--- a/project/backend/libs/mongodb/src/schemas/user.schema.ts
+++ b/project/backend/libs/mongodb/src/schemas/user.schema.ts
@@ -82,7 +82,7 @@ export class UserEarnInfo {
cycleInterval: number
}
-// 用户会员信息
+// User VIP Info
@Schema({
toJSON: { virtuals: true },
toObject: { virtuals: true },
@@ -98,7 +98,7 @@ export class UserVipInfo {
})
status: VipStatus
- // 开通时间
+ // Start Time
@Prop({ required: true })
startTime: Date
}
@@ -108,7 +108,7 @@ export class UserStorage {
required: true,
default: 500 * 1024 * 1024,
})
- total: number // 总存储(Bytes)
+ total: number // Total Storage (Bytes)
@Prop({ required: false })
expiredAt?: Date
@@ -165,7 +165,7 @@ export class User extends WithTimestampSchema {
})
status: UserStatus
- // 是否删除
+ // Is Deleted
@Prop({
required: true,
default: false,
@@ -180,13 +180,13 @@ export class User extends WithTimestampSchema {
wxUnionid?: string
@Prop({ required: false })
- popularizeCode?: string // 我的推广码
+ popularizeCode?: string // My Promotion Code
@Prop({ required: false })
- inviteUserId?: string // 邀请人用户ID
+ inviteUserId?: string // Inviter User ID
@Prop({ required: false })
- inviteCode?: string // 我填写的邀请码
+ inviteCode?: string // Invite Code Entered
@Prop({ type: Object, required: false, default: {} })
backData?: UserBackData
@@ -195,9 +195,8 @@ export class User extends WithTimestampSchema {
earnInfo?: UserEarnInfo
@Prop({ type: Object, required: false })
- googleAccount?: Record<string, unknown> // Google账号信息
+ googleAccount?: Record<string, unknown> // Google Account Info
- // 用户VIP会员信息
@Prop({ type: UserVipInfo, required: false })
vipInfo?: UserVipInfo
@@ -205,15 +204,14 @@ export class User extends WithTimestampSchema {
required: true,
default: 0,
})
- score: number // 积分
+ score: number // Score
@Prop({
required: true,
default: 0,
})
- income: number // 收入(分)
+ income: number // Income (cents)
- // 累计收入
@Prop({
required: true,
default: 0,
@@ -224,7 +222,19 @@ export class User extends WithTimestampSchema {
required: true,
default: 0,
})
- usedStorage: number // 已用存储(Bytes)
+ incomeUSD: number // Income (USD cents)
+
+ @Prop({
+ required: true,
+ default: 0,
+ })
+ totalIncomeUSD: number // Total Income (USD cents)
+
+ @Prop({
+ required: true,
+ default: 0,
+ })
+ usedStorage: number // Used Storage (Bytes)
@Prop({
type: UserStorage,
@@ -235,7 +245,6 @@ export class User extends WithTimestampSchema {
})
storage: UserStorage
- // 累计收入
@Prop({
required: false,
default: 0,