Let's use AI to Earn!
TypeScript auto-publishdouyindouyin-apielectron-appelectron-reactkuaishoukwaipublishedshipinhaotoolxiaohongshu
feat(notification): add userType to notification schema (#281)
nevin0949ed474d3f
diff --git a/project/backend/libs/mongodb/src/repositories/notification.repository.ts b/project/backend/libs/mongodb/src/repositories/notification.repository.tsindex e6f7e71d..cba595d0 100644--- a/project/backend/libs/mongodb/src/repositories/notification.repository.ts+++ b/project/backend/libs/mongodb/src/repositories/notification.repository.ts@@ -1,5 +1,5 @@import { InjectModel } from '@nestjs/mongoose'-import { Pagination } from '@yikart/common'+import { Pagination, UserType } from '@yikart/common'import { FilterQuery, Model, Types } from 'mongoose'import { NotificationStatus, NotificationType } from '../enums'import { Notification } from '../schemas'@@ -7,6 +7,7 @@ import { BaseRepository } from './base.repository'export interface ListNotificationParams extends Pagination {userId?: string+ userType?: UserTypetype?: NotificationTypestatus?: NotificationStatusrelatedId?: string@@ -22,33 +23,22 @@ export class NotificationRepository extends BaseRepository<Notification> {}async listWithPagination(params: ListNotificationParams) {- const { page, pageSize, userId, type, status, relatedId, createdAt, keyword } = params+ const { page, pageSize, userId, userType, type, status, relatedId, createdAt, keyword } = params- const filter: FilterQuery<Notification> = {}- if (userId)- filter.userId = new Types.ObjectId(userId)- if (type)- filter.type = type- if (status)- filter.status = status- if (relatedId)- filter.relatedId = relatedId- if (createdAt) {- filter.createdAt = {- $gte: createdAt[0],- $lte: createdAt[1],- }- }- if (keyword) {- filter.$or = [+ const filter: FilterQuery<Notification> = {+ deletedAt: { $exists: false },+ ...(userType && { userType }),+ ...(userId && { userId: new Types.ObjectId(userId) }),+ ...(type && { type }),+ ...(status && { status }),+ ...(relatedId && { relatedId }),+ ...(createdAt && { createdAt: { $gte: createdAt[0], $lte: createdAt[1] } }),+ ...(keyword && { $or: [{ title: { $regex: keyword, $options: 'i' } },{ content: { $regex: keyword, $options: 'i' } },- ]+ ] }),}- // 排除已删除的通知- filter.deletedAt = { $exists: false }-return await this.findWithPagination({page,pageSize,@@ -145,6 +135,15 @@ export class NotificationRepository extends BaseRepository<Notification> {return { count }}+ async countByUserTypeUnreadAdmin() {+ const count = await this.model.countDocuments({+ userType: UserType.Admin,+ status: NotificationStatus.Unread,+ deletedAt: { $exists: false },+ })+ return { count }+ }+async listByUserId(userId: string, status?: NotificationStatus) {const filter: FilterQuery<Notification> = {userId: new Types.ObjectId(userId),diff --git a/project/backend/libs/mongodb/src/schemas/notification.schema.ts b/project/backend/libs/mongodb/src/schemas/notification.schema.tsindex 02222d9d..bacd756d 100644--- a/project/backend/libs/mongodb/src/schemas/notification.schema.ts+++ b/project/backend/libs/mongodb/src/schemas/notification.schema.ts@@ -1,4 +1,5 @@import { Prop, Schema, SchemaFactory } from '@nestjs/mongoose'+import { UserType } from '@yikart/common'import { Types } from 'mongoose'import * as mongoose from 'mongoose'import { NotificationStatus, NotificationType } from '../enums'@@ -21,6 +22,14 @@ export class Notification extends WithTimestampSchema {})userId: string+ @Prop({+ enum: UserType,+ index: true,+ required: false,+ default: UserType.User,+ })+ userType?: UserType+@Prop({type: String,required: true,