invoice approval

src/controllers/invoice/invoice.controller.ts

@@ -16,6 +16,8 @@ import { fetchWorkorderById } from "../../shared/services/propertyware.service";
 import { logInvoiceAction } from "../invoiceActivityLogs.controller";
 import InvoiceApproval from "../../models/invoiceApproval";
 import Role from "../../models/roles";
+import { AuthenticatedRequest } from "shared/interfaces/user.interface";
+import { ApprovalData } from "shared/interfaces/invoice.interface";
 
 export const createInvoice = async (req: Request, res: Response) => {
   const files = req.files as Express.Multer.File[];
@@ -445,9 +447,9 @@ export const updateInvoice = async (req: Request, res: Response): Promise<Respon
       uploaded_by: invoice.uploaded_by,
     };
 
-    const invoiceUpdate = await updateInvoiceData(existingInvoice.id as number, updatedInvoiceData, userId);
+    await updateInvoiceData(existingInvoice.id as number, updatedInvoiceData, userId);
 
-    const invoiceDetails = await updateInvoiceDetails(existingInvoice.id as number, billSplit, userId);
+    await updateInvoiceDetails(existingInvoice.id as number, billSplit, userId);
 
     const updatedInvoice = await Invoice.findByPk(id, {
       include: [{ model: InvoiceDetail }],
@@ -479,23 +481,18 @@ export const deleteInvoice = async (req: Request, res: Response): Promise<Respon
   }
 };
 
-// Interface for approval data
-interface ApprovalData {
-  invoiceId: number;
-  userId: number;
-  comment?: string;
-}
-
 // Function to approve invoice
-export const approveInvoice = async (req: Request, res: Response): Promise<void> => {
-  const { invoiceId, userId = 1, comment = '' }: ApprovalData = req.body;
+export const approveInvoice = async (req: AuthenticatedRequest, res: Response): Promise<void> => {
+  const { id } = req.params;
+  const user = req.user;
+  const { comment } = req.body;
 
   try {
     const invoice = await Invoice.findOne({
-      where: { id: invoiceId },
+      where: { id: id },
       include: [{ model: InvoiceDetail }]
     });
-    
+
     if (!invoice) {
       res.status(404).json({ error: 'Invoice not found' });
       return;
@@ -509,55 +506,61 @@ export const approveInvoice = async (req: Request, res: Response): Promise<void>
       res.status(400).json({ error: 'Invoice cannot be approved without property address' });
       return;
     }
+    let roleData;
+    if (user && typeof user !== 'string') {
+
+      const userData = await User.findByPk(user?.id, {
+        include: [{ model: Role, as: 'role' }],
+      });
+      if (!userData) {
+        res.status(400).json({ error: 'Invalid User' });
+        return;
+      }
 
-    const user = await User.findByPk(1, {
-      include: [{ model: Role }],
-    });
-    if (!user) {
-      res.status(400).json({ error: 'Invalid User' });
-      return;
-    }
+      roleData = await Role.findByPk(userData.role_id);
+      if (!roleData) {
+        res.status(400).json({ error: 'Invalid approval role ID' });
+        return;
+      }
 
-    const role = await Role.findByPk(user.id);
-    if (!role) {
-      res.status(400).json({ error: 'Invalid approval role ID' });
-      return;
-    }
-    const approvalRoleId = role.id; 
+      if (invoice.total < 1500) {
+        if (roleData.name === 'Property Manager' || roleData.name === 'Accounting Supervisor') {
+          await approveAndCreateRecord(invoice.id as number, userData.id, roleData.id, comment);
 
-    if (invoice.total < 1500) {
-      if (role.name === 'PM' || role.name === 'Accounting Supervisor') {
-        await approveAndCreateRecord(invoice.id as number, userId, approvalRoleId, comment);
-        
-        invoice.status = 'Approved';
-        await invoice.save();
-        
-        res.status(200).json({ message: 'Invoice approved' });
-      } else {
-        res.status(403).json({ error: 'Only Property Manager or Accounting Supervisor can approve this invoice' });
-      }
-    } else {
-      if (role.name === 'PM') {
-        await approveAndCreateRecord(invoice.id as number, userId, approvalRoleId, comment);
+          invoice.status = 'Approved';
+          await invoice.save();
 
-        invoice.status = 'PM Approved';
-        await invoice.save();
-        
-        res.status(200).json({ message: 'Invoice approved by PM' });
-      
-      } else if (role.name === 'Accounting Supervisor' && invoice.status === 'PM Approved') {
-        await approveAndCreateRecord(invoice.id as number, userId, approvalRoleId, comment);
-      
-        invoice.status = 'Approved';
-        await invoice.save();
-        
-        res.status(200).json({ message: 'Invoice approved by Accounting Supervisor' });
-      
+          res.status(200).json({ message: 'Invoice approved' });
+        } else {
+          res.status(403).json({ error: 'Only Property Manager or Accounting Supervisor can approve this invoice' });
+        }
       } else {
-        res.status(403).json({ error: 'Invoice needs to be approved by Property Manager first' });
+        if (roleData.name === 'Property Manager') {
+          await approveAndCreateRecord(invoice.id as number, userData.id, roleData.id, comment);
+
+          invoice.status = 'PM Approved';
+          await invoice.save();
+
+          res.status(200).json({ message: 'Invoice approved by PM' });
+
+        } else if (roleData.name === 'Accounting Supervisor' && invoice.status === 'PM Approved') {
+          await approveAndCreateRecord(invoice.id as number, userData.id, roleData.id, comment);
+
+          invoice.status = 'Approved';
+          await invoice.save();
+
+          res.status(200).json({ message: 'Invoice approved by Accounting Supervisor' });
+
+        } else {
+          res.status(403).json({ error: 'Invoice needs to be approved by Property Manager first' });
+        }
       }
+    } else {
+      res.status(400).json({ error: 'Invalid User' });
+      return;
     }
   } catch (error) {
+    console.log(error);
     res.status(500).json({ error: error });
   }
 };
@@ -569,11 +572,11 @@ const approveAndCreateRecord = async (
   comment: string
 ): Promise<void> => {
   await InvoiceApproval.create({
-    invoiceId: invoiceId,
-    approvedBy: userId,
-    approvalRoleId: approvalRoleId,
+    invoice_id: invoiceId,
+    approved_by: userId,
+    approval_role_id: approvalRoleId,
     comment,
-    createdAt: new Date()
+    created_at: new Date()
   });
 };
 

src/middlewares/authMiddleware.ts

@@ -1,13 +1,17 @@
-import { Request, Response, NextFunction } from 'express';
+import { Response, NextFunction } from 'express';
 import { verifyToken } from '../utils/jwtUtils';
-const jwtMiddleware = (req: Request, res: Response, next: NextFunction) => {
+import { AuthenticatedRequest } from '../shared/interfaces/user.interface';
+
+const jwtMiddleware = (req: AuthenticatedRequest, res: Response, next: NextFunction) => {
     const token = req.header('authorization')?.split(' ')[1];
     if (!token) {
         return res.status(401).json({ error: 'Unauthorized' });
     }
 
     try {
-        const decoded = verifyToken(token);
+        const user = verifyToken(token);
+        console.log("Loagged in User  ", user);
+        req.user = user;
         next();
     } catch (error) {
         return res.status(401).json({ error: 'Unauthorized' });
@@ -15,4 +19,4 @@ const jwtMiddleware = (req: Request, res: Response, next: NextFunction) => {
     
 }
 
-export {jwtMiddleware}
+export {jwtMiddleware}

src/models/invoiceApproval.ts

@@ -6,11 +6,11 @@ import { sequelize } from './index';
 class InvoiceApproval extends Model<InvoiceApprovalAttributes>
   implements InvoiceApprovalAttributes {
   public id?: number;
-  public invoiceId!: number;
-  public approvedBy!: number;
-  public approvalRoleId!: number;
+  public invoice_id!: number;
+  public approved_by!: number;
+  public approval_role_id!: number;
   public comment?: string;
-  public createdAt?: Date;
+  public created_at?: Date;
 
 }
 
@@ -21,7 +21,7 @@ InvoiceApproval.init(
       autoIncrement: true,
       primaryKey: true,
     },
-    invoiceId: {
+    invoice_id: {
       type: DataTypes.INTEGER,
       allowNull: false,
       references: {
@@ -31,11 +31,11 @@ InvoiceApproval.init(
       onUpdate: 'CASCADE',
       onDelete: 'CASCADE',
     },
-    approvedBy: {
+    approved_by: {
       type: DataTypes.INTEGER,
       allowNull: false,
     },
-    approvalRoleId: {
+    approval_role_id: {
       type: DataTypes.INTEGER,
       allowNull: false,
     },
@@ -43,7 +43,7 @@ InvoiceApproval.init(
       type: DataTypes.TEXT,
       allowNull: true,
     },
-    createdAt: {
+    created_at: {
       type: DataTypes.DATE,
       defaultValue: DataTypes.NOW,
     },

src/routes/invoice.routes.ts

@@ -12,30 +12,6 @@ import {
 } from '../controllers/invoice/invoice.controller';
 
 const invoiceRouter = express.Router();
-
-/**
- * @swagger
- * /api/invoices/{id}/approve:
- *   post:
- *     summary: Approve Invoice
- *     tags: [Invoices]
- *     parameters:
- *       - in: path
- *         name: id
- *         schema:
- *           type: integer
- *         required: true
- *         description: Invoice ID
- *     responses:
- *       200:
- *         description: Invoices approved successfully
- *       400:
- *         description: Bad Request
- *       500:
- *         description: Error approving invoices
- */
-invoiceRouter.post("/:id/approve", [], approveInvoice);
-
 invoiceRouter.use(jwtMiddleware);
 
 /**
@@ -366,4 +342,28 @@ invoiceRouter.put('/:id', updateInvoice);
  */
 invoiceRouter.delete('/:id', deleteInvoice);
 
+
+/**
+ * @swagger
+ * /api/invoices/{id}/approve:
+ *   post:
+ *     summary: Approve Invoice
+ *     tags: [Invoices]
+ *     parameters:
+ *       - in: path
+ *         name: id
+ *         schema:
+ *           type: integer
+ *         required: true
+ *         description: Invoice ID
+ *     responses:
+ *       200:
+ *         description: Invoices approved successfully
+ *       400:
+ *         description: Bad Request
+ *       500:
+ *         description: Error approving invoices
+ */
+invoiceRouter.post("/:id/approve", [], approveInvoice);
+
 export default invoiceRouter;

src/shared/interfaces/invoice.interface.ts

@@ -17,3 +17,9 @@ export interface InvoiceInterface {
   status: string;
   uploaded_by: number; 
 }
+
+export interface ApprovalData {
+  invoiceId: string;
+  userId: number;
+  comment?: string;
+}

src/shared/interfaces/invoiceApproval.interface.ts

@@ -1,8 +1,8 @@
 export interface InvoiceApprovalAttributes {
     id?: number;
-    invoiceId: number;
-    approvedBy: number;
-    approvalRoleId: number;
+    invoice_id: number;
+    approved_by: number;
+    approval_role_id: number;
     comment?: string;
-    createdAt?: Date;
+    created_at?: Date;
   }

src/shared/interfaces/user.interface.ts

@@ -1,3 +1,5 @@
+import { JwtPayload } from 'jsonwebtoken';
+import { Request } from 'express';
 export interface UserInterface {
     id?: number;
     name: string;
@@ -6,3 +8,7 @@ export interface UserInterface {
     status: string;
     password: string;
   }
+
+export interface AuthenticatedRequest extends Request {
+  user?: string | JwtPayload;
+}