akhilmeka/permit-api
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

expose cleanStatus field

Browse Source
This commit is contained in:
Akhil Meka
2025-05-02 12:52:57 +05:30
parent 81ae4e9875
commit 4153bd2412
3 changed files with 99 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files

110
src/permit/permit.service.ts
View File

@@ -1,16 +1,16 @@
import { orgModel } from "../organization/organization.schema"; import { orgModel } from '../organization/organization.schema';
import { getFilterObject, getSortObject, PageQueryParams } from "../pagination"; import { getFilterObject, getSortObject, PageQueryParams } from '../pagination';
import { userModel } from "../user/user.schema"; import { userModel } from '../user/user.schema';
import { generateId } from "../utils/id"; import { generateId } from '../utils/id';
import { import {
CreatePermitInput, CreatePermitInput,
permitFields, permitFields,
permitModel, permitModel,
UpdatePermitInput, UpdatePermitInput,
} from "./permit.schema"; } from './permit.schema';
import { ChangeEvent, dbEvents } from "../realtime"; import { ChangeEvent, dbEvents } from '../realtime';
import { permitPipeline } from "../utils/pipeline"; import { permitPipeline } from '../utils/pipeline';
import { AuthenticatedUser } from "../auth"; import { AuthenticatedUser } from '../auth';
export async function createPermit( export async function createPermit(
input: CreatePermitInput, input: CreatePermitInput,
@@ -32,13 +32,13 @@ export async function createPermit(
}); });
dbEvents.emit( dbEvents.emit(
"change", 'change',
{ {
type: "insert", type: 'insert',
collection: "permits", collection: 'permits',
document: permit, document: permit,
} as ChangeEvent, } as ChangeEvent,
["permit:read"] ['permit:read']
); );
return permit; return permit;
@@ -51,8 +51,8 @@ export async function getPermit(permitId: string, tenantId: string) {
}) })
//.populate({ path: "county", select: "pid name avatar" }) //.populate({ path: "county", select: "pid name avatar" })
//.populate({ path: "client", select: "pid name avatar" }) //.populate({ path: "client", select: "pid name avatar" })
.populate({ path: "assignedTo", select: "pid name avatar" }) .populate({ path: 'assignedTo', select: 'pid name avatar' })
.populate({ path: "createdBy", select: "pid name avatar" }); .populate({ path: 'createdBy', select: 'pid name avatar' });
} }
export async function listPermits(params: PageQueryParams, tenantId: string) { export async function listPermits(params: PageQueryParams, tenantId: string) {
@@ -67,10 +67,10 @@ export async function listPermits(params: PageQueryParams, tenantId: string) {
}, },
{ {
$lookup: { $lookup: {
from: "users", from: 'users',
localField: "assignedTo", localField: 'assignedTo',
foreignField: "_id", foreignField: '_id',
as: "assignedRec", as: 'assignedRec',
}, },
}, },
{ {
@@ -82,6 +82,7 @@ export async function listPermits(params: PageQueryParams, tenantId: string) {
stage: 1, stage: 1,
status: 1, status: 1,
manualStatus: 1, manualStatus: 1,
cleanStatus: 1,
utility: 1, utility: 1,
link: 1, link: 1,
address: 1, address: 1,
@@ -111,12 +112,12 @@ export async function listPermits(params: PageQueryParams, tenantId: string) {
statusUpdated: 1, statusUpdated: 1,
assignedTo: { assignedTo: {
$let: { $let: {
vars: { assigned: { $arrayElemAt: ["$assignedRec", 0] } }, vars: { assigned: { $arrayElemAt: ['$assignedRec', 0] } },
in: { in: {
_id: "$$assigned._id", _id: '$$assigned._id',
pid: "$$assigned.pid", pid: '$$assigned.pid',
name: "$$assigned.name", name: '$$assigned.name',
avatar: "$$assigned.avatar", avatar: '$$assigned.avatar',
}, },
}, },
}, },
@@ -124,7 +125,7 @@ export async function listPermits(params: PageQueryParams, tenantId: string) {
}, },
{ {
$facet: { $facet: {
metadata: [{ $count: "count" }], metadata: [{ $count: 'count' }],
data: [ data: [
{ $sort: sortObj }, { $sort: sortObj },
{ $skip: (page - 1) * pageSize }, { $skip: (page - 1) * pageSize },
@@ -160,20 +161,20 @@ export async function updatePermit(
{ ...input, lastUpdateDate: new Date() }, { ...input, lastUpdateDate: new Date() },
{ new: true } { new: true }
) )
.populate({ path: "county", select: "pid name avatar" }) .populate({ path: 'county', select: 'pid name avatar' })
.populate({ path: "client", select: "pid name avatar" }) .populate({ path: 'client', select: 'pid name avatar' })
.populate({ path: "assignedTo", select: "pid name avatar" }) .populate({ path: 'assignedTo', select: 'pid name avatar' })
.populate({ path: "createdBy", select: "pid name avatar" }); .populate({ path: 'createdBy', select: 'pid name avatar' });
if (updatePermitResult) { if (updatePermitResult) {
dbEvents.emit( dbEvents.emit(
"change", 'change',
{ {
type: "update", type: 'update',
collection: "permits", collection: 'permits',
document: updatePermitResult, document: updatePermitResult,
} as ChangeEvent, } as ChangeEvent,
["permit:read"] ['permit:read']
); );
} }
@@ -186,15 +187,15 @@ export async function deletePermit(permitId: string, tenantId: string) {
}); });
dbEvents.emit( dbEvents.emit(
"change", 'change',
{ {
type: "delete", type: 'delete',
collection: "permits", collection: 'permits',
document: { document: {
pid: permitId, pid: permitId,
}, },
} as ChangeEvent, } as ChangeEvent,
["permit:read"] ['permit:read']
); );
return res; return res;
@@ -209,7 +210,7 @@ export async function searchPermit(params: PageQueryParams, tenantId: string) {
if (!params.searchToken) if (!params.searchToken)
return { permits: [], metadata: { count: 0, page, pageSize } }; return { permits: [], metadata: { count: 0, page, pageSize } };
const regex = new RegExp(params.searchToken, "i"); const regex = new RegExp(params.searchToken, 'i');
const permitsList = await permitModel.aggregate([ const permitsList = await permitModel.aggregate([
{ {
@@ -220,16 +221,16 @@ export async function searchPermit(params: PageQueryParams, tenantId: string) {
$or: [ $or: [
{ permitNumber: { $regex: regex } }, { permitNumber: { $regex: regex } },
{ link: { $regex: regex } }, { link: { $regex: regex } },
{ "address.full_address": { $regex: regex } }, { 'address.full_address': { $regex: regex } },
], ],
}, },
}, },
{ {
$lookup: { $lookup: {
from: "users", from: 'users',
localField: "assignedTo", localField: 'assignedTo',
foreignField: "_id", foreignField: '_id',
as: "assignedRec", as: 'assignedRec',
}, },
}, },
{ {
@@ -241,6 +242,7 @@ export async function searchPermit(params: PageQueryParams, tenantId: string) {
stage: 1, stage: 1,
status: 1, status: 1,
manualStatus: 1, manualStatus: 1,
cleanStatus: 1,
utility: 1, utility: 1,
link: 1, link: 1,
address: 1, address: 1,
@@ -270,12 +272,12 @@ export async function searchPermit(params: PageQueryParams, tenantId: string) {
statusUpdated: 1, statusUpdated: 1,
assignedTo: { assignedTo: {
$let: { $let: {
vars: { assigned: { $arrayElemAt: ["$assignedRec", 0] } }, vars: { assigned: { $arrayElemAt: ['$assignedRec', 0] } },
in: { in: {
_id: "$$assigned._id", _id: '$$assigned._id',
pid: "$$assigned.pid", pid: '$$assigned.pid',
name: "$$assigned.name", name: '$$assigned.name',
avatar: "$$assigned.avatar", avatar: '$$assigned.avatar',
}, },
}, },
}, },
@@ -283,7 +285,7 @@ export async function searchPermit(params: PageQueryParams, tenantId: string) {
}, },
{ {
$facet: { $facet: {
metadata: [{ $count: "count" }], metadata: [{ $count: 'count' }],
data: [ data: [
{ $sort: sortObj }, { $sort: sortObj },
{ $skip: (page - 1) * pageSize }, { $skip: (page - 1) * pageSize },
@@ -310,12 +312,12 @@ export async function getUniqueValuesPermit(field: string, tenenatId: string) {
let values = await permitModel.distinct(field, { tenantId: tenenatId }); let values = await permitModel.distinct(field, { tenantId: tenenatId });
let matchedValues = []; let matchedValues = [];
if (field === "county.name") { if (field === 'county.name') {
matchedValues = await orgModel.find().where("name").in(values).exec(); matchedValues = await orgModel.find().where('name').in(values).exec();
} else if (field === "client") { } else if (field === 'client') {
matchedValues = await orgModel.find().where("_id").in(values).exec(); matchedValues = await orgModel.find().where('_id').in(values).exec();
} else if (field === "assignedTo") { } else if (field === 'assignedTo') {
matchedValues = await userModel.find().where("name").in(values).exec(); matchedValues = await userModel.find().where('name').in(values).exec();
} }
if (matchedValues.length > 0) { if (matchedValues.length > 0) {

27
src/processed/processed.schema.ts
View File

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

57
src/processed/processed.service.ts
View File

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