expose cleanStatus field

src/processed/processed.schema.ts

@@ -1,7 +1,7 @@
-import z from "zod";
-import mongoose from "mongoose";
-import { pageQueryParams } from "../pagination";
-import { buildJsonSchemas } from "fastify-zod";
+import z from 'zod';
+import mongoose from 'mongoose';
+import { pageQueryParams } from '../pagination';
+import { buildJsonSchemas } from 'fastify-zod';
 
 const processedSchema = new mongoose.Schema({
   tenantId: {
@@ -16,7 +16,7 @@ const processedSchema = new mongoose.Schema({
   county: Object,
   client: {
     type: mongoose.Types.ObjectId,
-    ref: "organization",
+    ref: 'organization',
   },
   clientData: Object,
   permitDate: Date,
@@ -29,10 +29,11 @@ const processedSchema = new mongoose.Schema({
   ),
   status: String,
   manualStatus: String,
+  cleanStatus: String,
   utility: String,
   assignedTo: {
     type: mongoose.Types.ObjectId,
-    ref: "user",
+    ref: 'user',
   },
   link: String,
   address: Object,
@@ -50,7 +51,7 @@ const processedSchema = new mongoose.Schema({
   createdAt: Date,
   createdBy: {
     type: mongoose.Types.ObjectId,
-    ref: "user",
+    ref: 'user',
   },
   newProcessingStatus: Array,
   newPayment: Array,
@@ -66,22 +67,22 @@ const processedSchema = new mongoose.Schema({
 }).index({ tenantId: 1, permitNumber: 1 }, { unique: true });
 
 export const processedFields = Object.keys(processedSchema.paths).filter(
-  (path) => path !== "__v"
+  (path) => path !== '__v'
 );
 
 export const processedModel = mongoose.model(
-  "processed",
+  'processed',
   processedSchema,
-  "processed"
+  'processed'
 );
 
 const updateProcessedInput = z.object({
   manualStatus: z
-    .enum(["Ready To Issue", "Issued", "Invoiced", "Paid", "Closed"])
+    .enum(['Ready To Issue', 'Issued', 'Invoiced', 'Paid', 'Closed'])
     .nullable()
     .optional(),
   utility: z
-    .enum(["Submitted", "Pending", "Applied", "Rejected", "Paid"])
+    .enum(['Submitted', 'Pending', 'Applied', 'Rejected', 'Paid'])
     .nullable()
     .optional(),
 });
@@ -93,5 +94,5 @@ export const { schemas: processedSchemas, $ref: $processed } = buildJsonSchemas(
     pageQueryParams,
     updateProcessedInput,
   },
-  { $id: "processed" }
+  { $id: 'processed' }
 );

src/processed/processed.service.ts

@@ -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) {