invoice list apis

package.json

@@ -8,6 +8,7 @@
     "aws-sdk": "^2.1659.0",
     "axios": "^1.7.2",
     "babel-register": "^6.26.0",
+    "cors": "^2.8.5",
     "bcryptjs": "^2.4.3",
     "dotenv": "^16.4.5",
     "express": "^4.19.2",
@@ -20,6 +21,7 @@
     "sequelize-typescript": "^2.1.6"
   },
   "devDependencies": {
+    "@types/cors": "^2",
     "@types/bcryptjs": "^2",
     "@types/dotenv": "^8.2.0",
     "@types/express": "^4.17.21",

src/app.ts

@@ -1,18 +1,25 @@
 import express from 'express';
+import cors from 'cors';
 
-import router from './routes';
+import invoiceRouter from './routes/invoice.routes';
+import pwRouter from './routes/propertyware.routes';
 import userRouter from './routes/users';
 
 const app = express();
+
 const port = 3000;
 app.use(express.json()); 
 
-app.get('/', (req, res) => {
+app.use(cors());
+
+app.get('/', (_, res) => {
   res.send('Service is healthy!');
 });
 
+
+app.use("/api/pw", pwRouter);
+app.use('/api/invoices', invoiceRouter);
 app.use('/api/users/', userRouter)
-app.use("/api/", router);
 
 try {
   app.listen(port, () => {

src/controllers/invoice/invoice.controller.ts

@@ -1,58 +1,138 @@
-import { Request, Response } from 'express';
+import { Request, Response } from "express";
 
 // import Invoice from '../../models/invoice';
-import { uploadInvoice } from '../../shared/services/invoice.service';
-import { parseInvoice } from '../../shared/services/ai.service'
-import FormData from 'form-data';
-import Invoice from '../../models/invoice';
+import { uploadInvoice } from "../../shared/services/invoice.service";
+import { parseInvoice } from "../../shared/services/ai.service";
+import FormData from "form-data";
+import Invoice from "../../models/invoice";
+import InvoiceDetail from "../../models/invoicedetail";
+import User from "../../models/users";
 
 export const createInvoice = async (req: Request, res: Response) => {
-    const files = req.files as Express.Multer.File[];
-    const uploadPromises = uploadInvoice(files);
-    const uploadResults = await Promise.all(uploadPromises);
-
-    console.log(uploadResults);
-    if (files?.length) {
-
-        files.forEach(async (file, index) => {
-            const formData = new FormData();
-            formData.append('file', files[0].buffer, files[0].originalname);
-            // Send the file URLs to the AI service API for parsing
-            const aiServiceResponse = await parseInvoice(formData);
-            const aiServiceData = aiServiceResponse;
-            console.log(aiServiceData);
-
-            try {
-                let invoiceRecord = {
-                    reference_number: aiServiceData.refNo,
-                    vendor_name: aiServiceData.vendor,
-                    invoice_date: aiServiceData.billDate,
-                    due_date: aiServiceData.dueDate,
-                    total: aiServiceData.total,
-                    description: aiServiceData.description,                    
-                    status: 'Pending',
-                    amount_paid:0,
-                    pdf_url:uploadResults[index].Location,
-                    uploaded_by:1 // TODO : replace with logged in user when user module is implemented
-                };
-                
-                // const invoiceRecords = uploadResults.map(result => ({
-                //     fileName: result.Key,
-                //     // s3Key: result.Key,
-                // }));
-
-                await Invoice.create(invoiceRecord);
-
-                res.status(200).json({
-                    message: 'Invoices uploaded successfully',
-                    invoices: invoiceRecord
-                });
-            } catch (error) {
-                console.error(error);
-                res.status(500).json({ message: 'Error uploading invoices', error });
-            }
-        });
+  const files = req.files as Express.Multer.File[];
+
+  if (files?.length) {
+    try {
+      const uploadPromises = uploadInvoice(files);
+      const uploadResults = await Promise.all(uploadPromises);
+
+      const createInvoicePromises = files.map(async (file, index) => {
+        const formData = new FormData();
+        formData.append("file", file.buffer, file.originalname);
+
+        // Send the file URLs to the AI service API for parsing
+        const aiServiceResponse = await parseInvoice(formData);
+        const aiServiceData = aiServiceResponse[0];
+
+        const totalAmount = aiServiceData.billSplits.reduce(
+          (total: number, split: { amount: number }) => total + split.amount,
+          0
+        );
+        const invoiceDate = new Date(aiServiceData.billDate);
+        const dueDate = new Date(aiServiceData.dueDate);
+        let invoiceRecord = {
+          reference_number: aiServiceData.refNo,
+          vendor_name: aiServiceData.vendor,
+          pw_vendor_id: aiServiceData.vendor,
+          invoice_date: invoiceDate,
+          due_date: dueDate,
+          total: totalAmount,
+          description: aiServiceData.description,
+          status: "Pending",
+          amount_paid: 0,
+          filename: file.originalname,
+          pdf_url: uploadResults[index].Location,
+          uploaded_by: 1, // TODO : replace with logged in user when user module is implemented
+        };
+
+        const result = await Invoice.create(invoiceRecord);
+
+        // Create Invoice Details
+        const invoiceDetails = aiServiceData.billSplits.map(
+          (details: {
+            portfolio: any;
+            building: any;
+            unit: any;
+            glAccount: any;
+            amount: any;
+            description: any;
+          }) => ({
+            invoice_id: result.id,
+            pw_portfolio_id: details.portfolio,
+            pw_building_id: details.building,
+            pw_unit_id: details.unit,
+            pw_gl_account_id: details.glAccount,
+            amount: details.amount,
+            description: details.description,
+          })
+        );
+
+        await InvoiceDetail.bulkCreate(invoiceDetails);
+      });
+
+      await Promise.all(createInvoicePromises);
+
+      res.status(201).json({ message: "Invoices created successfully" });
+    } catch (error) {
+      console.error(error);
+      res.status(500).json({ message: "Error creating invoices", error });
     }
-}
+  } else {
+    res.status(400).json({ message: "No files uploaded" });
+  }
+};
+
+// Get All Invoices
+export const getAllInvoices = async (req: Request, res: Response): Promise<Response> => {
+  try {
+    const invoices = await Invoice.findAll({
+        include: [
+          { model: User, as: 'uploadedBy' }
+        ]
+      });
+
+    if (invoices.length === 0) {
+      return res.status(404).json({ error: "No invoices found" });
+    }
+
+    return res.status(200).json(invoices);
+  } catch (error) {
+    console.error("Error fetching invoices:", error);
+    return res.status(500).json({ error: "Error fetching invoices" });
+  }
+};
+
+export const getInvoiceById = async (req: Request, res: Response): Promise<Response> => {
+  try {
+    const { id } = req.params;
+    const invoice = await Invoice.findByPk(id);
+
+    if (!invoice) {
+      return res.status(404).json({ error: "Invoice not found" });
+    }
+
+    return res.status(200).json(invoice);
+  } catch (error) {
+    console.error("Error fetching invoice:", error);
+    return res.status(500).json({ error: "Error fetching invoice details" });
+  }
+};
+
+// Delete an invoice
+export const deleteInvoice = async (req: Request, res: Response): Promise<Response> => {
+  try {
+    const { id } = req.params;
+    const invoice = await Invoice.findByPk(id);
+
+    if (!invoice) {
+      return res.status(404).json({ error: "Invoice not found" });
+    }
+
+    await invoice.destroy();
 
-export { uploadInvoice };
+    return res.status(204).send();
+  } catch (error) {
+    console.error("Error deleting invoice:", error);
+    return res.status(500).json({ error: "Internal server error" });
+  }
+};

src/db/migrations/20240711110620-create-invoice-table.js

@@ -10,20 +10,16 @@ module.exports = {
         type: Sequelize.INTEGER
       },
       reference_number: {
-        allowNull: false,
         type: Sequelize.STRING(100), 
         unique: true 
       },
       vendor_name: {
-        allowNull: false,
         type: Sequelize.STRING(255) 
       },
       invoice_date: {
-        allowNull: false,
         type: Sequelize.DATE
       },
       total: {
-        allowNull: false,
         type: Sequelize.DECIMAL(10, 2) 
       },
       amount_paid: { 
@@ -45,10 +41,14 @@ module.exports = {
         defaultValue: 'pending' 
       },
       pw_work_order_id: { 
-        type: Sequelize.INTEGER
+        type: Sequelize.BIGINT
       },
       pw_vendor_id: {
-        type: Sequelize.INTEGER
+        type: Sequelize.BIGINT
+      },
+      filename:{
+        type: Sequelize.STRING(255),
+        allowNull: false,
       },
       pdf_url: {
         type: Sequelize.STRING(255) 
@@ -73,4 +73,4 @@ module.exports = {
   async down(queryInterface, Sequelize) {
     await queryInterface.dropTable('invoices');
   }
-};
+};

src/db/migrations/20240715065820-create-invoice-detail.js

@@ -28,7 +28,7 @@ module.exports = {
         type: Sequelize.BIGINT,
       },
       pw_gl_account_id: {
-        type: Sequelize.INTEGER,
+        type: Sequelize.BIGINT,
         defaultValue: null,
       },
       amount: {
@@ -49,4 +49,4 @@ module.exports = {
   async down(queryInterface, Sequelize) {
     await queryInterface.dropTable('invoice_details');
   }
-};
+};

src/models/invoice.ts

@@ -7,8 +7,9 @@ import {
 } from 'sequelize';
 import { sequelize } from './index';
 import { InvoiceInterface } from '../shared/interfaces/invoice.interface';
+import User from './users';
 
-class Invoice extends Model<InferAttributes<Invoice>, InferCreationAttributes<Invoice>> implements InvoiceInterface {
+class Invoice extends Model<InvoiceInterface> implements InvoiceInterface {
   declare id?: CreationOptional<number>;
   declare reference_number: string;
   declare vendor_name: string;
@@ -21,6 +22,7 @@ class Invoice extends Model<InferAttributes<Invoice>, InferCreationAttributes<In
   declare payment_status?: string;
   declare pw_work_order_id?: number; 
   declare pw_vendor_id?: number;
+  declare filename?: string;
   declare pdf_url?: string;
   declare status: string;
   declare uploaded_by: number;
@@ -35,24 +37,19 @@ Invoice.init(
     },
     reference_number: {
       type: DataTypes.STRING(100),
-      allowNull: false,
       unique: true,
     },
     vendor_name: {
       type: DataTypes.STRING(255),
-      allowNull: false,
     },
     invoice_date: {
       type: DataTypes.DATE,
-      allowNull: false,
     },
     total: {
       type: DataTypes.DECIMAL(10, 2),
-      allowNull: false,
     },
     amount_paid: { 
       type: DataTypes.DECIMAL(10, 2),
-      allowNull: false,
     },
     due_date: {
       type: DataTypes.DATE,
@@ -78,6 +75,10 @@ Invoice.init(
       type: DataTypes.INTEGER,
       allowNull: true,
     },
+    filename:{
+      type: DataTypes.STRING(255),
+      allowNull: false,
+    },
     pdf_url: {
       type: DataTypes.STRING(255),
       allowNull: true,
@@ -102,5 +103,6 @@ Invoice.init(
   }
 );
 
+Invoice.belongsTo(User, { foreignKey: 'uploaded_by',  as: 'uploadedBy'  });
 
-export default Invoice;
+export default Invoice;

src/routes/invoice.routes.ts

@@ -0,0 +1,18 @@
+import express from 'express';
+import { multipleUpload } from '../middlewares/multer';
+
+import {
+  createInvoice,
+  getAllInvoices,
+  getInvoiceById,
+  deleteInvoice,
+} from '../controllers/invoice/invoice.controller';
+
+const invoiceRouter = express.Router();
+
+invoiceRouter.post("/", multipleUpload, createInvoice);
+invoiceRouter.get('/', getAllInvoices);
+invoiceRouter.get('/:id', getInvoiceById);
+invoiceRouter.delete('/:id', deleteInvoice);
+
+export default invoiceRouter;

src/routes/{index.ts → propertyware.routes.ts}

@@ -1,22 +1,17 @@
 import express from "express";
-import { multipleUpload } from '../middlewares/multer';
 
-import { fetchVendorsData } from "../controllers/propertyware/vendors.controller";
+import { syncBuildingsData } from "../controllers/propertyware/buildings.controller";
 import { fetchGLAccountsData } from "../controllers/propertyware/glAccounts.controller";
 import { syncPortfolioData } from "../controllers/propertyware/portfolio.controller";
-import { syncBuildingsData } from "../controllers/propertyware/buildings.controller";
 import { syncUnitsData } from "../controllers/propertyware/units.controller";
-import { createInvoice } from "../controllers/invoice/invoice.controller";
-
-const router = express.Router();
-
-router.get("/pw/glAccounts", fetchGLAccountsData);
-router.get("/pw/vendors", fetchVendorsData);
-router.get("/pw/syncPortfolio", syncPortfolioData);
-router.get("/pw/syncBuildings", syncBuildingsData);
-router.get("/pw/syncUnits", syncUnitsData);
+import { fetchVendorsData } from "../controllers/propertyware/vendors.controller";
 
-router.post("/invoice", multipleUpload, createInvoice);
+const pwRouter = express.Router();
 
+pwRouter.get("/glAccounts", fetchGLAccountsData);
+pwRouter.get("/vendors", fetchVendorsData);
+pwRouter.get("/syncPortfolio", syncPortfolioData);
+pwRouter.get("/syncBuildings", syncBuildingsData);
+pwRouter.get("/syncUnits", syncUnitsData);
 
-export default router;
+export default pwRouter;

src/shared/interfaces/invoice.interface.ts

@@ -1,9 +1,9 @@
 export interface InvoiceInterface {
   id?: number;
-  reference_number: string;
-  vendor_name: string;
-  invoice_date: Date;
-  total: number; 
+  reference_number?: string;
+  vendor_name?: string;
+  invoice_date?: Date;
+  total?: number; 
   amount_paid: number;
   due_date?: Date; 
   term?: string; 
@@ -11,6 +11,7 @@ export interface InvoiceInterface {
   payment_status?: string;
   pw_work_order_id?: number;
   pw_vendor_id?: number;
+  filename?: string;
   pdf_url?: string;
   status: string;
   uploaded_by: number; 

src/shared/services/invoice.service.ts

@@ -1,8 +1,6 @@
 import { s3 } from '../../middlewares/multer';
 
 export const uploadInvoice = (files: Express.Multer.File[]) => {
-    console.log(files);
-
     const uploadPromises = files.map(file => {
         const params = {
             Bucket: process.env.AWS_S3_BUCKET_NAME || '',

yarn.lock

@@ -1546,6 +1546,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@types/cors@npm:^2":
+  version: 2.8.17
+  resolution: "@types/cors@npm:2.8.17"
+  dependencies:
+    "@types/node": "npm:*"
+  checksum: 10c0/457364c28c89f3d9ed34800e1de5c6eaaf344d1bb39af122f013322a50bc606eb2aa6f63de4e41a7a08ba7ef454473926c94a830636723da45bf786df032696d
+  languageName: node
+  linkType: hard
+
 "@types/debug@npm:^4.1.8":
   version: 4.1.12
   resolution: "@types/debug@npm:4.1.12"
@@ -2534,6 +2543,16 @@ __metadata:
   languageName: node
   linkType: hard
 
+"cors@npm:^2.8.5":
+  version: 2.8.5
+  resolution: "cors@npm:2.8.5"
+  dependencies:
+    object-assign: "npm:^4"
+    vary: "npm:^1"
+  checksum: 10c0/373702b7999409922da80de4a61938aabba6929aea5b6fd9096fefb9e8342f626c0ebd7507b0e8b0b311380744cc985f27edebc0a26e0ddb784b54e1085de761
+  languageName: node
+  linkType: hard
+
 "create-require@npm:^1.1.0":
   version: 1.1.1
   resolution: "create-require@npm:1.1.1"
@@ -3138,7 +3157,7 @@ __metadata:
   resolution: "fb-api@workspace:."
   dependencies:
     "@aws-sdk/client-s3": "npm:^3.614.0"
-    "@types/bcryptjs": "npm:^2"
+    "@types/cors": "npm:^2"
     "@types/dotenv": "npm:^8.2.0"
     "@types/express": "npm:^4.17.21"
     "@types/multer": "npm:^1"
@@ -3149,7 +3168,7 @@ __metadata:
     aws-sdk: "npm:^2.1659.0"
     axios: "npm:^1.7.2"
     babel-register: "npm:^6.26.0"
-    bcryptjs: "npm:^2.4.3"
+    cors: "npm:^2.8.5"
     dotenv: "npm:^16.4.5"
     eslint: "npm:^9.7.0"
     eslint-config-prettier: "npm:^9.1.0"
@@ -4473,7 +4492,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"object-assign@npm:^4.1.1":
+"object-assign@npm:^4, object-assign@npm:^4.1.1":
   version: 4.1.1
   resolution: "object-assign@npm:4.1.1"
   checksum: 10c0/1f4df9945120325d041ccf7b86f31e8bcc14e73d29171e37a7903050e96b81323784ec59f93f102ec635bcf6fa8034ba3ea0a8c7e69fa202b87ae3b6cec5a414
@@ -5675,7 +5694,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"vary@npm:~1.1.2":
+"vary@npm:^1, vary@npm:~1.1.2":
   version: 1.1.2
   resolution: "vary@npm:1.1.2"
   checksum: 10c0/f15d588d79f3675135ba783c91a4083dcd290a2a5be9fcb6514220a1634e23df116847b1cc51f66bfb0644cf9353b2abb7815ae499bab06e46dd33c1a6bf1f4f