location api for AI service - #8264, fix #8263, remove debug console

src/controllers/invoice/invoice.controller.ts

@@ -44,17 +44,17 @@ export const createInvoice = async (req: AuthenticatedRequest, res: Response) =>
 
         // validate if parsed workorderID exists in propertyware workorders
         let portfolioId: number | null = null;
-        let buildingId: number | null  = null;
-        let unitId: number | null  = null;
-        
+        let buildingId: number | null = null;
+        let unitId: number | null = null;
+
         if (aiServiceData.workOrderID) {
           try {
             const PWWorkorderDetails = await fetchWorkorderById(aiServiceData.workOrderID);
-            portfolioId= PWWorkorderDetails.portfolioID;
-            buildingId= PWWorkorderDetails.buildingID;
-            unitId= PWWorkorderDetails.unitID;
+            portfolioId = PWWorkorderDetails.portfolioID;
+            buildingId = PWWorkorderDetails.buildingID;
+            unitId = PWWorkorderDetails.unitID;
           } catch (error) {
-            console.log("workorder errors  = ",error);
+            console.log("workorder errors  = ", error);
             aiServiceData.workOrderID = null;
           }
         }
@@ -67,7 +67,14 @@ export const createInvoice = async (req: AuthenticatedRequest, res: Response) =>
         const dueDate = new Date(aiServiceData.dueDate);
 
         // check if vendor has default bill split ID defined in Propertyware
-        const isDefaultBillsplitAccountSet  = await isVendorHasDefaultBillsplitAccount(aiServiceData.vendor_id);
+        let isDefaultBillsplitAccountSet = false;
+        if (aiServiceData.vendor_id) {
+          try {
+            isDefaultBillsplitAccountSet = await isVendorHasDefaultBillsplitAccount(aiServiceData.vendor_id);
+          } catch (error) {
+            console.log(error);
+          }
+        }
 
         let invoiceRecord = {
           reference_number: aiServiceData.refNo,
@@ -102,7 +109,7 @@ export const createInvoice = async (req: AuthenticatedRequest, res: Response) =>
             }
           }
 
-          if (details.building && !buildingId ) {
+          if (details.building && !buildingId) {
             const buildingData = await PwBuilding.findOne({
               where: {
                 name: details.building,
@@ -129,7 +136,7 @@ export const createInvoice = async (req: AuthenticatedRequest, res: Response) =>
             pw_portfolio_id: portfolioId,
             pw_building_id: buildingId,
             pw_unit_id: unitId,
-            pw_gl_account_id: isDefaultBillsplitAccountSet? isDefaultBillsplitAccountSet : (details.glAccount ? details.glAccount : null),
+            pw_gl_account_id: isDefaultBillsplitAccountSet ? isDefaultBillsplitAccountSet : (details.glAccount ? details.glAccount : null),
             amount: details.amount,
             description: details.description,
           };
@@ -193,32 +200,32 @@ const buildInvoiceWhereClause = (filter: Record<string, any>): any => {
   if (filter) {
 
     if (filter.date) {
-      const date = new Date(filter.date); 
+      const date = new Date(filter.date);
       if (!isNaN(date.getTime())) {
-          const startOfDay = new Date(date);
-          startOfDay.setHours(0, 0, 0, 0);
+        const startOfDay = new Date(date);
+        startOfDay.setHours(0, 0, 0, 0);
 
-          const endOfDay = new Date(date);
-          endOfDay.setHours(23, 59, 59, 999);
+        const endOfDay = new Date(date);
+        endOfDay.setHours(23, 59, 59, 999);
 
-          whereClause.created_at = { 
-              [Op.gte]: startOfDay, 
-              [Op.lte]: endOfDay 
-          };
+        whereClause.created_at = {
+          [Op.gte]: startOfDay,
+          [Op.lte]: endOfDay
+        };
       }
-  }
+    }
 
-  if (filter.id){
-    whereClause.id = { [Op.eq]: filter.id };
-  }
+    if (filter.id) {
+      whereClause.id = { [Op.eq]: filter.id };
+    }
 
-  if (filter.filename){
-    whereClause.filename = { [Op.like]: `%${filter.filename}%` };
-  }
+    if (filter.filename) {
+      whereClause.filename = { [Op.like]: `%${filter.filename}%` };
+    }
 
-  if (filter.id){
-    whereClause.id = { [Op.eq]: filter.id };
-  }
+    if (filter.id) {
+      whereClause.id = { [Op.eq]: filter.id };
+    }
 
     if (filter.vendor_name) {
       whereClause.vendor_name = { [Op.like]: `%${filter.vendor_name}%` };
@@ -272,7 +279,7 @@ const buildInvoiceWhereClause = (filter: Record<string, any>): any => {
       }
     }
 
-    if (filter.total){
+    if (filter.total) {
       whereClause.total = { [Op.eq]: filter.total };
     }
   }
@@ -319,7 +326,7 @@ export const getAllInvoices = async (req: AuthenticatedRequest, res: Response):
       options.order = [['id', 'DESC']];
     }
 
-    let invoices:any = await Invoice.findAll({
+    let invoices: any = await Invoice.findAll({
       ...options,
       include: [
         {
@@ -419,19 +426,19 @@ export const getInvoiceById = async (req: AuthenticatedRequest, res: Response):
       const user = req.user;
       const roleData = await Role.findByPk(user?.role_id);
       if (roleData) {
-        if (roleData.name === 'Property Manager') {  
+        if (roleData.name === 'Property Manager') {
           if (invoice.status === 'PM Approved') {
             showApprove = false;
-          }          
+          }
         }
-        if (roleData.name === "Accountant"){
+        if (roleData.name === "Accountant") {
           showApprove = false;
         }
       }
     }
-      
-      
-    return res.status(200).json({ invoice: invoice.dataValues, billSplit: billSplit, showApprove: showApprove});
+
+
+    return res.status(200).json({ invoice: invoice.dataValues, billSplit: billSplit, showApprove: showApprove });
   } catch (error) {
     logger.error("Error fetching invoice:", error);
     return res.status(500).json({ error: "Error fetching invoice details" });
@@ -462,15 +469,15 @@ const updateInvoiceDetails = async (invoiceId: number, billSplit: any[], userId:
 
     if (!existingDetail.id) {
       const newPortfolioName = newDetail.pw_portfolio_id
-          ? (await fetchPortfolioById(newDetail.pw_portfolio_id))?.name || ''
+        ? (await fetchPortfolioById(newDetail.pw_portfolio_id))?.name || ''
         : 'null';
       const newBuildingName = newDetail.pw_building_id
-          ? (await fetchBuildingsById(newDetail.pw_building_id))?.name || ''
+        ? (await fetchBuildingsById(newDetail.pw_building_id))?.name || ''
         : 'null';
       const newUnitName = newDetail.pw_unit_id
-          ? (await fetchUnitsById(newDetail.pw_unit_id))?.name || ''
+        ? (await fetchUnitsById(newDetail.pw_unit_id))?.name || ''
         : 'null';
-      
+
       const newValue = `${newPortfolioName}, ${newBuildingName}, ${newUnitName}`;
       await logInvoiceAction({
         invoice_id: invoiceId,
@@ -481,8 +488,7 @@ const updateInvoiceDetails = async (invoiceId: number, billSplit: any[], userId:
         new_value: newValue,
       });
     } else {
-      if (existingDetail.pw_portfolio_id !== newDetail.pw_portfolio_id)
-      {
+      if (existingDetail.pw_portfolio_id !== newDetail.pw_portfolio_id) {
         const oldPortfolioName = existingDetail.pw_portfolio_id
           ? (await fetchPortfolioById(existingDetail.pw_portfolio_id))?.name || 'Unknown Portfolio'
           : 'null';
@@ -518,7 +524,7 @@ const updateInvoiceDetails = async (invoiceId: number, billSplit: any[], userId:
           });
         }
       }
-      if (existingDetail.pw_unit_id !== newDetail.pw_unit_id) { 
+      if (existingDetail.pw_unit_id !== newDetail.pw_unit_id) {
 
         const oldUnitName = existingDetail.pw_unit_id
           ? (await fetchUnitsById(existingDetail.pw_unit_id))?.name || 'Unknown Unit'
@@ -526,7 +532,7 @@ const updateInvoiceDetails = async (invoiceId: number, billSplit: any[], userId:
         const newUnitName = newDetail.pw_unit_id
           ? (await fetchUnitsById(newDetail.pw_unit_id))?.name || ''
           : 'null';
-        
+
         if (oldUnitName !== newUnitName) {
           await logInvoiceAction({
             invoice_id: invoiceId,
@@ -538,8 +544,7 @@ const updateInvoiceDetails = async (invoiceId: number, billSplit: any[], userId:
           });
         }
       }
-      if (existingDetail.pw_gl_account_id !== newDetail.pw_gl_account_id)
-      {
+      if (existingDetail.pw_gl_account_id !== newDetail.pw_gl_account_id) {
         const oldGhlAccountName = existingDetail.pw_gl_account_id
           ? (await fetchGLAccountById(existingDetail.pw_gl_account_id))?.name || 'Unknown GHL Account'
           : 'null';
@@ -712,13 +717,13 @@ export const approveInvoice = async (req: AuthenticatedRequest, res: Response):
         return;
       }
       if (roleData.name === "Admin") {
-          await approveAndCreateRecord(invoice.id as number, userData.id, roleData.id, comment);
+        await approveAndCreateRecord(invoice.id as number, userData.id, roleData.id, comment);
 
-          invoice.status = 'Approved';
-          await invoice.save();
+        invoice.status = 'Approved';
+        await invoice.save();
 
         res.status(200).json({ message: 'Invoice approved' });
-        
+
       } else if (invoice.total < 1500) {
         if (roleData.name === 'Property Manager' || roleData.name === 'Accounting Supervisor') {
           await approveAndCreateRecord(invoice.id as number, userData.id, roleData.id, comment);

src/controllers/propertyware/bills.controller.ts

@@ -70,7 +70,6 @@ export const syncInvoices = async (req: Request, res: Response): Promise<void> =
                         const formData = new FormData();
                         formData.append('file', invoice.pdf_url as string);
                         const PWBillUploadResult = await uploadBill(response.id, formData);
-                        console.log(PWBillUploadResult);
                     }
                     
                 } catch (error) {
@@ -82,7 +81,6 @@ export const syncInvoices = async (req: Request, res: Response): Promise<void> =
                 logger.info(`Bill for invoice ${bill.refNo} synced successfully`);
             } catch (error) {
                 let errorMessage = `Error syncing bill for invoice ${bill.refNo}.`;
-                console.log(error);
                 const errorobj = (error as ErrorResponse);
 
                 const errordata = errorobj.response.data;

src/controllers/propertyware/vendors.controller.ts

@@ -21,11 +21,14 @@ export const fetchVendorsData = async (req: Request, res: Response) => {
 };
 
 export const isVendorHasDefaultBillsplitAccount = async (vendorId: number) => {
-    const vendor = await fetchVendorById(vendorId);
-    console.log("vendor : " + vendor);
-    if (vendor && vendor.defaultBillSplitAccountId){
-        return vendor.defaultBillSplitAccountId;
+    try {
+        const vendor = await fetchVendorById(vendorId);
+        if (vendor && vendor.defaultBillSplitAccountId){
+            return vendor.defaultBillSplitAccountId;
+        }
+    } catch (error){
+        logger.error(error);
+        return false;
     }
 
-    return false;
 };

src/controllers/propertyware/workorders.controller.ts

@@ -7,7 +7,6 @@ export const fetchWorkorders = async (req: Request, res: Response) => {
     try {
 
         const workorders = await fetchAllWorkorders();
-        console.log(workorders);
 
         const workordersResponseData = workorders.map((workorder: {
             unitID: any;

src/middlewares/authMiddleware.ts

@@ -10,7 +10,6 @@ const jwtMiddleware = (req: AuthenticatedRequest, res: Response, next: NextFunct
 
     try {
         const user = verifyToken(token);
-        console.log("Loagged in User  ", user);
         req.user = user as UserInterface;
         next();
     } catch (error) {

src/routes/propertyware.routes.ts

@@ -192,8 +192,6 @@ pwRouter.get("/glAccountsDetails", fetchGLAccountsWithDetails);
 */
 pwRouter.get("/vendors", fetchVendorsData);
 
-pwRouter.use(jwtMiddleware);
-
 /**
  * @swagger
  * /api/pw/locationLookup:
@@ -208,6 +206,8 @@ pwRouter.use(jwtMiddleware);
 */
 pwRouter.get('/locationLookup', LocationLookup);
 
+pwRouter.use(jwtMiddleware);
+
 /**
  * @swagger
  * /api/pw/workorders: