w.i.p.- invoice approval

src/controllers/invoice/invoice.controller.ts

@@ -14,6 +14,8 @@ import { logger } from '../../utils/logger';
 import ErrorLog from "../../models/errorLog";
 import { fetchWorkorderById } from "../../shared/services/propertyware.service";
 import { logInvoiceAction } from "../invoiceActivityLogs.controller";
+import InvoiceApproval from "../../models/invoiceApproval";
+import Role from "../../models/roles";
 
 export const createInvoice = async (req: Request, res: Response) => {
   const files = req.files as Express.Multer.File[];
@@ -476,3 +478,103 @@ export const deleteInvoice = async (req: Request, res: Response): Promise<Respon
     return res.status(500).json({ error: "Internal server error" });
   }
 };
+
+// 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;
+
+  try {
+    const invoice = await Invoice.findOne({
+      where: { id: invoiceId },
+      include: [{ model: InvoiceDetail }]
+    });
+    
+    if (!invoice) {
+      res.status(404).json({ error: 'Invoice not found' });
+      return;
+    }
+
+    const missingPwPortfolioId = invoice.InvoiceDetails.some(
+      (detail: InvoiceDetail) => !detail.pw_portfolio_id
+    );
+
+    if (missingPwPortfolioId) {
+      res.status(400).json({ error: 'Invoice cannot be approved without property address' });
+      return;
+    }
+
+    const user = await User.findByPk(1, {
+      include: [{ model: Role }],
+    });
+    if (!user) {
+      res.status(400).json({ error: 'Invalid User' });
+      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 (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 = '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' });
+      
+      } else {
+        res.status(403).json({ error: 'Invoice needs to be approved by Property Manager first' });
+      }
+    }
+  } catch (error) {
+    res.status(500).json({ error: error });
+  }
+};
+
+const approveAndCreateRecord = async (
+  invoiceId: number,
+  userId: number,
+  approvalRoleId: number,
+  comment: string
+): Promise<void> => {
+  await InvoiceApproval.create({
+    invoiceId: invoiceId,
+    approvedBy: userId,
+    approvalRoleId: approvalRoleId,
+    comment,
+    createdAt: new Date()
+  });
+};
+
+

src/db/migrations/20240808130755-create-invoice-approval.js

@@ -0,0 +1,56 @@
+'use strict';
+
+/** @type {import('sequelize-cli').Migration} */
+module.exports = {
+  async up (queryInterface, Sequelize) {
+    await queryInterface.createTable('invoice_approval', {
+      id: {
+        type: Sequelize.INTEGER,
+        allowNull: false,
+        autoIncrement: true,
+        primaryKey: true,
+      },
+      invoice_id: {
+        type: Sequelize.INTEGER,
+        allowNull: false,
+        references: {
+          model: 'invoices',
+          key: 'id',
+        },
+        onUpdate: 'CASCADE',
+        onDelete: 'CASCADE',
+      },
+      approved_by: {
+        type: Sequelize.INTEGER,
+        allowNull: false,
+        references: {
+          model: 'users',
+          key: 'id',
+        },
+        onDelete: 'CASCADE',
+      },
+      approval_role_id: {
+        type: Sequelize.INTEGER,
+        allowNull: false,
+        references: {
+          model: 'roles',
+          key: 'id',
+        },
+        onDelete: 'CASCADE',
+      },
+      comment: {
+        type: Sequelize.TEXT,
+        allowNull: true,
+      },
+      created_at: {
+        type: Sequelize.DATE,
+        allowNull: false,
+        defaultValue: Sequelize.literal('CURRENT_TIMESTAMP'),
+      },
+    });
+  },
+
+  async down (queryInterface, Sequelize) {
+    await queryInterface.dropTable('invoice_approval');
+  }
+};

src/models/invoice.ts

@@ -9,7 +9,7 @@ import User from './users';
 import InvoiceDetail from './invoicedetail';
 
 class Invoice extends Model<InvoiceInterface> implements InvoiceInterface {
-  declare id?: CreationOptional<number>;
+  declare id?: number;
   declare reference_number: string;
   declare invoice_number: string;
   declare vendor_name: string;

src/models/invoiceApproval.ts

@@ -0,0 +1,59 @@
+import { Model, DataTypes } from 'sequelize';
+import { InvoiceApprovalAttributes } from 'shared/interfaces/invoiceApproval.interface';
+import { sequelize } from './index';
+
+
+class InvoiceApproval extends Model<InvoiceApprovalAttributes>
+  implements InvoiceApprovalAttributes {
+  public id?: number;
+  public invoiceId!: number;
+  public approvedBy!: number;
+  public approvalRoleId!: number;
+  public comment?: string;
+  public createdAt?: Date;
+
+}
+
+InvoiceApproval.init(
+  {
+    id: {
+      type: DataTypes.INTEGER,
+      autoIncrement: true,
+      primaryKey: true,
+    },
+    invoiceId: {
+      type: DataTypes.INTEGER,
+      allowNull: false,
+      references: {
+        model: 'invoices',
+        key: 'id',
+      },
+      onUpdate: 'CASCADE',
+      onDelete: 'CASCADE',
+    },
+    approvedBy: {
+      type: DataTypes.INTEGER,
+      allowNull: false,
+    },
+    approvalRoleId: {
+      type: DataTypes.INTEGER,
+      allowNull: false,
+    },
+    comment: {
+      type: DataTypes.TEXT,
+      allowNull: true,
+    },
+    createdAt: {
+      type: DataTypes.DATE,
+      defaultValue: DataTypes.NOW,
+    },
+  },
+  {
+    sequelize,
+    modelName: 'InvoiceApproval',
+    tableName: 'invoice_approval',
+    timestamps: false,
+  }
+);
+
+export default InvoiceApproval;

src/models/roles.ts

@@ -28,7 +28,6 @@ Role.init(
       allowNull: false,
     }
   },
-  
   {
     sequelize,
     tableName: 'roles', 

src/routes/errorLog.routes.ts

@@ -137,4 +137,4 @@ errorLogRouter.get("/", getErrorLogs);
  */
 errorLogRouter.get("/:id", getErrorLogById);
 
-export default errorLogRouter;
+export default errorLogRouter;

src/routes/invoice.routes.ts

@@ -8,9 +8,34 @@ import {
   getInvoiceById,
   deleteInvoice,
   updateInvoice,
+  approveInvoice,
 } 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);
 
 /**

src/shared/interfaces/invoiceApproval.interface.ts

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