Skip to content

Let's use AI to Earn!

refactor(notification): reorganize update notification enums for consistency (#319)

nevin8853c6bb41df
diff --git a/project/backend/apps/aitoearn-server/src/notification/notification.dto.ts b/project/backend/apps/aitoearn-server/src/notification/notification.dto.ts
index 3ff57aba..364bc90a 100644
--- a/project/backend/apps/aitoearn-server/src/notification/notification.dto.ts
+++ b/project/backend/apps/aitoearn-server/src/notification/notification.dto.ts
@@ -1,5 +1,5 @@
-import { createZodDto } from '@yikart/common'
-import { NotificationStatus, NotificationType } from '@yikart/mongodb'
+import { createZodDto, NotificationType } from '@yikart/common'
+import { NotificationStatus } from '@yikart/mongodb'
import { z } from 'zod'
const queryNotificationsDtoSchema = z.object({
diff --git a/project/backend/apps/aitoearn-server/src/notification/notification.service.ts b/project/backend/apps/aitoearn-server/src/notification/notification.service.ts
index 96c79438..8e2341f8 100644
--- a/project/backend/apps/aitoearn-server/src/notification/notification.service.ts
+++ b/project/backend/apps/aitoearn-server/src/notification/notification.service.ts
@@ -1,6 +1,6 @@
import { Injectable, OnModuleInit } from '@nestjs/common'
-import { AppException, ResponseCode, UserType } from '@yikart/common'
-import { NotificationRepository, NotificationStatus, NotificationType } from '@yikart/mongodb'
+import { AppException, NotificationType, ResponseCode, UserType } from '@yikart/common'
+import { NotificationRepository, NotificationStatus } from '@yikart/mongodb'
import {
BatchDeleteDto,
MarkAsReadDto,
diff --git a/project/backend/libs/aitoearn-server-client/src/interfaces/notification.interface.ts b/project/backend/libs/aitoearn-server-client/src/interfaces/notification.interface.ts
index e6df6db1..a94f981e 100644
--- a/project/backend/libs/aitoearn-server-client/src/interfaces/notification.interface.ts
+++ b/project/backend/libs/aitoearn-server-client/src/interfaces/notification.interface.ts
@@ -1,15 +1,13 @@
-// 通知状态枚举
+import { NotificationType, UserType } from '@yikart/common'
+
export enum NotificationStatus {
Unread = 'unread',
Read = 'read',
}
-// 通知类型枚举
-export enum NotificationType {
- TaskReminder = 'task_reminder', // 任务提醒
- TaskPunish = 'task_punish', // 任务处罚
-}
+
export interface NewNotification {
userId: string
+ userType: UserType
title: string
content: string
type: NotificationType
diff --git a/project/backend/libs/common/src/enums/index.ts b/project/backend/libs/common/src/enums/index.ts
index c4a93b4a..35d61b3c 100755
--- a/project/backend/libs/common/src/enums/index.ts
+++ b/project/backend/libs/common/src/enums/index.ts
@@ -2,6 +2,7 @@ export * from './account-type.enum'
export * from './currency.enum'
export * from './filter-set.enum'
export * from './mime-type.enum'
+export * from './notification.enum'
export * from './response-code.enum'
export * from './user-type.enum'
export * from './vip.enum'
diff --git a/project/backend/libs/common/src/enums/notification.enum.ts b/project/backend/libs/common/src/enums/notification.enum.ts
new file mode 100644
index 00000000..94ec6531
--- /dev/null
+++ b/project/backend/libs/common/src/enums/notification.enum.ts
@@ -0,0 +1,13 @@
+// 通知状态枚举
+export enum NotificationStatus {
+ Unread = 'unread',
+ Read = 'read',
+}
+
+// 通知类型枚举
+export enum NotificationType {
+ TaskReminder = 'task_reminder',
+ UserWithdraw = 'user_withdraw',
+ TaskPunish = 'task_punish',
+ TaskDemandAdd = 'task_demand_add',
+}
diff --git a/project/backend/libs/mongodb/src/enums/notification.enum.ts b/project/backend/libs/mongodb/src/enums/notification.enum.ts
index ca18bfcd..539a15f2 100644
--- a/project/backend/libs/mongodb/src/enums/notification.enum.ts
+++ b/project/backend/libs/mongodb/src/enums/notification.enum.ts
@@ -3,9 +3,3 @@ export enum NotificationStatus {
Unread = 'unread',
Read = 'read',
}
-
-// 通知类型枚举
-export enum NotificationType {
- TaskReminder = 'task_reminder',
- UserWithdraw = 'user_withdraw',
-}
diff --git a/project/backend/libs/mongodb/src/repositories/notification.repository.ts b/project/backend/libs/mongodb/src/repositories/notification.repository.ts
index cba595d0..fb2d7aa8 100644
--- a/project/backend/libs/mongodb/src/repositories/notification.repository.ts
+++ b/project/backend/libs/mongodb/src/repositories/notification.repository.ts
@@ -1,7 +1,7 @@
import { InjectModel } from '@nestjs/mongoose'
-import { Pagination, UserType } from '@yikart/common'
+import { NotificationType, Pagination, UserType } from '@yikart/common'
import { FilterQuery, Model, Types } from 'mongoose'
-import { NotificationStatus, NotificationType } from '../enums'
+import { NotificationStatus } from '../enums'
import { Notification } from '../schemas'
import { BaseRepository } from './base.repository'
diff --git a/project/backend/libs/mongodb/src/schemas/notification.schema.ts b/project/backend/libs/mongodb/src/schemas/notification.schema.ts
index 0dded85c..04d0caa2 100644
--- a/project/backend/libs/mongodb/src/schemas/notification.schema.ts
+++ b/project/backend/libs/mongodb/src/schemas/notification.schema.ts
@@ -1,8 +1,8 @@
import { Prop, Schema, SchemaFactory } from '@nestjs/mongoose'
-import { UserType } from '@yikart/common'
+import { NotificationType, UserType } from '@yikart/common'
import { Types } from 'mongoose'
import * as mongoose from 'mongoose'
-import { NotificationStatus, NotificationType } from '../enums'
+import { NotificationStatus } from '../enums'
import { WithTimestampSchema } from './timestamp.schema'
@Schema({