diff --git a/src/rts/rts.schema.ts b/src/rts/rts.schema.ts index 9404a9d..2c0e9c1 100644 --- a/src/rts/rts.schema.ts +++ b/src/rts/rts.schema.ts @@ -45,6 +45,10 @@ const rtsSchema = new mongoose.Schema({ type: mongoose.Types.ObjectId, ref: "user", }, + assignedTo: { + type: mongoose.Types.ObjectId, + ref: "user", + }, }); export const rtsFields = Object.keys(rtsSchema.paths).filter( @@ -70,6 +74,7 @@ const rtsCreateInput = z.object({ currentStage: z.number(), }) .optional(), + assignedTo: z.string().optional(), }); const rtsUpdateInput = z.object({ @@ -88,6 +93,7 @@ const rtsUpdateInput = z.object({ currentStage: z.number(), }) .optional(), + assignedTo: z.string().optional(), }); const rtsNewUpload = z.object({ diff --git a/src/rts/rts.service.ts b/src/rts/rts.service.ts index 0c052cf..6abc1c3 100644 --- a/src/rts/rts.service.ts +++ b/src/rts/rts.service.ts @@ -55,7 +55,8 @@ export async function getRts(id: string, tenantId: string) { .findOne({ pid: id, tenantId: tenantId }) .populate({ path: "county", select: "pid name avatar" }) .populate({ path: "client", select: "pid name avatar" }) - .populate({ path: "createdBy", select: "pid name avatar" }); + .populate({ path: "createdBy", select: "pid name avatar" }) + .populate({ path: "assignedTo", select: "pid name avatar" }); } export async function listRts(params: PageQueryParams, tenantId: string) { @@ -92,6 +93,14 @@ export async function listRts(params: PageQueryParams, tenantId: string) { as: "createdRec", }, }, + { + $lookup: { + from: "users", + localField: "assignedTo", + foreignField: "_id", + as: "assignedTo", + }, + }, { $project: { _id: 1, @@ -134,6 +143,17 @@ export async function listRts(params: PageQueryParams, tenantId: string) { }, }, }, + assignedTo: { + $let: { + vars: { created: { $arrayElemAt: ["$assignedTo", 0] } }, + in: { + _id: "$$assignedTo._id", + pid: "$$assignedTo.pid", + name: "$$assignedTo.name", + avatar: "$$assignedTo.avatar", + }, + }, + }, }, }, {