expose cleanStatus field

This commit is contained in:
2025-05-02 12:52:57 +05:30
parent 81ae4e9875
commit 4153bd2412
3 changed files with 99 additions and 95 deletions

View File

@@ -1,12 +1,12 @@
import { AuthenticatedUser } from "../auth";
import { orgModel } from "../organization/organization.schema";
import { getFilterObject, getSortObject, PageQueryParams } from "../pagination";
import { userModel } from "../user/user.schema";
import { AuthenticatedUser } from '../auth';
import { orgModel } from '../organization/organization.schema';
import { getFilterObject, getSortObject, PageQueryParams } from '../pagination';
import { userModel } from '../user/user.schema';
import {
processedFields,
processedModel,
UpdateProcessedInput,
} from "./processed.schema";
} from './processed.schema';
export async function getProcessedPermit(permitId: String, tenantId: String) {
return await processedModel.findOne({
@@ -27,10 +27,10 @@ export async function updateProcessed(
{ ...input, lastUpdateDate: new Date() },
{ new: true }
)
.populate({ path: "county", select: "pid name avatar" })
.populate({ path: "client", select: "pid name avatar" })
.populate({ path: "assignedTo", select: "pid name avatar" })
.populate({ path: "createdBy", select: "pid name avatar" });
.populate({ path: 'county', select: 'pid name avatar' })
.populate({ path: 'client', select: 'pid name avatar' })
.populate({ path: 'assignedTo', select: 'pid name avatar' })
.populate({ path: 'createdBy', select: 'pid name avatar' });
}
export async function listProcessedPermits(
@@ -48,14 +48,14 @@ export async function listProcessedPermits(
},
];
if (params.searchToken && params.searchToken != "") {
const regex = new RegExp(params.searchToken, "i");
if (params.searchToken && params.searchToken != '') {
const regex = new RegExp(params.searchToken, 'i');
pipeline.push({
$match: {
$or: [
{ permitNumber: { $regex: regex } },
{ link: { $regex: regex } },
{ "address.full_address": { $regex: regex } },
{ 'address.full_address': { $regex: regex } },
],
},
});
@@ -65,10 +65,10 @@ export async function listProcessedPermits(
...[
{
$lookup: {
from: "users",
localField: "assignedTo",
foreignField: "_id",
as: "assignedRec",
from: 'users',
localField: 'assignedTo',
foreignField: '_id',
as: 'assignedRec',
},
},
{
@@ -80,6 +80,7 @@ export async function listProcessedPermits(
stage: 1,
status: 1,
manualStatus: 1,
cleanStatus: 1,
utility: 1,
link: 1,
address: 1,
@@ -110,12 +111,12 @@ export async function listProcessedPermits(
transferDate: 1,
assignedTo: {
$let: {
vars: { assigned: { $arrayElemAt: ["$assignedRec", 0] } },
vars: { assigned: { $arrayElemAt: ['$assignedRec', 0] } },
in: {
_id: "$$assigned._id",
pid: "$$assigned.pid",
name: "$$assigned.name",
avatar: "$$assigned.avatar",
_id: '$$assigned._id',
pid: '$$assigned.pid',
name: '$$assigned.name',
avatar: '$$assigned.avatar',
},
},
},
@@ -123,7 +124,7 @@ export async function listProcessedPermits(
},
{
$facet: {
metadata: [{ $count: "count" }],
metadata: [{ $count: 'count' }],
data: [
{ $sort: sortObj },
{ $skip: (page - 1) * pageSize },
@@ -156,12 +157,12 @@ export async function getUniqueValuesProcessed(
let values = await processedModel.distinct(field, { tenantId: tenenatId });
let matchedValues = [];
if (field === "county.name") {
matchedValues = await orgModel.find().where("name").in(values).exec();
} else if (field === "client") {
matchedValues = await orgModel.find().where("_id").in(values).exec();
} else if (field === "assignedTo") {
matchedValues = await userModel.find().where("name").in(values).exec();
if (field === 'county.name') {
matchedValues = await orgModel.find().where('name').in(values).exec();
} else if (field === 'client') {
matchedValues = await orgModel.find().where('_id').in(values).exec();
} else if (field === 'assignedTo') {
matchedValues = await userModel.find().where('name').in(values).exec();
}
if (matchedValues.length > 0) {