Added bills upload & list

bills/billRequestValidator.ts

@@ -0,0 +1,26 @@
+import { Request, Response, NextFunction } from "express";
+
+export default function BillRequestValidator(
+  req: Request,
+  res: Response,
+  next: NextFunction
+) {
+  const vendor: string = (req.body.vendor || "").trim();
+  const invoice_number: string = (req.body.invoice_number || "").trim();
+  const ro_number: string = (req.body.ro_number || "").trim();
+
+  // if (vendor === "") {
+  //   res.status(400).json({ error: "No vendor name has been specified." });
+  //   return;
+  // }
+  // if (invoice_number === "") {
+  //   res.status(400).json({ error: "No invoice number has been specified." });
+  //   return;
+  // }
+  if (ro_number === "") {
+    res.status(400).json({ error: "No RO Number has been specified." });
+    return;
+  } else {
+    next();
+  }
+}

bills/billsListMedia.ts

@@ -0,0 +1,50 @@
+import { Request, Response } from "express";
+import fs from "fs-extra";
+import path from "path";
+import GenerateThumbnail from "../util/generateThumbnail";
+import MediaFile from "../util/interfaces/MediaFile";
+import GenerateUrl from "../util/MediaUrlGen";
+import { PathToRoBillsFolder, PathToRoFolder } from "../util/pathGenerators";
+import { FolderPaths } from "../util/serverInit";
+
+/** @description Bills will use the hierarchy of PDFs stored under the Job first, and then the Bills folder. */
+export async function BillsListMedia(req: Request, res: Response) {
+  const ro_number: string = (req.body.ro_number || "").trim();
+  const vendor: string = (req.body.vendor || "").trim();
+  const invoice_number: string = (req.body.invoice_number || "").trim();
+
+  //Ensure all directories exist.
+  await fs.ensureDir(PathToRoBillsFolder(ro_number));
+
+  const filesList: fs.Dirent[] = (
+    await fs.readdir(PathToRoBillsFolder(ro_number), {
+      withFileTypes: true,
+    })
+  ).filter((f) => f.isFile() && !/(^|\/)\.[^\/\.]/g.test(f.name));
+
+  const ret: MediaFile[] = await Promise.all(
+    filesList.map(async (file) => {
+      const relativeThumbPath: string = await GenerateThumbnail(
+        path.join(PathToRoBillsFolder(ro_number), file.name)
+      );
+      return {
+        src: GenerateUrl([
+          FolderPaths.StaticPath,
+          FolderPaths.JobsFolder,
+          ro_number,
+          FolderPaths.BillsSubDir,
+          file.name,
+        ]),
+        thumb: GenerateUrl([
+          FolderPaths.StaticPath,
+          FolderPaths.JobsFolder,
+          ro_number,
+          FolderPaths.BillsSubDir,
+          relativeThumbPath,
+        ]),
+      };
+    })
+  );
+
+  res.json(ret);
+}

bills/billsUploadMedia.ts

@@ -0,0 +1,78 @@
+import dotenv from "dotenv";
+import { Request, Response } from "express";
+import fs from "fs-extra";
+import multer from "multer";
+import path, { resolve } from "path";
+import { logger } from "../server";
+import GenerateThumbnail from "../util/generateThumbnail";
+import generateUniqueFilename from "../util/generateUniqueFilename";
+import {
+  PathToRoBillsFolder,
+  PathToVendorBillsFile,
+} from "../util/pathGenerators";
+import { BillsListMedia } from "./billsListMedia";
+
+dotenv.config({
+  path: resolve(process.cwd(), `.env.${process.env.NODE_ENV || "development"}`),
+});
+
+export const BillsMediaUploadMulter = multer({
+  storage: multer.diskStorage({
+    destination: function (req, file, cb) {
+      const ro_number: string = (req.body.ro_number || "").trim();
+      const DestinationFolder: string = PathToRoBillsFolder(ro_number);
+      fs.ensureDirSync(DestinationFolder);
+      cb(null, DestinationFolder);
+    },
+    filename: function (req, file, cb) {
+      logger.info("Uploading file: ", path.basename(file.originalname));
+      cb(null, generateUniqueFilename(file));
+    },
+  }),
+});
+
+export async function BillsUploadMedia(req: Request, res: Response) {
+  try {
+    if (!req.files) {
+      res.send({
+        status: false,
+        message: "No file uploaded",
+      });
+    } else {
+      const thumbnailGenerationQueue: Promise<string>[] = [];
+
+      //for each file.path, generate the thumbnail.
+      (req.files as Express.Multer.File[]).forEach((file) => {
+        thumbnailGenerationQueue.push(GenerateThumbnail(file.path));
+      });
+      await Promise.all(thumbnailGenerationQueue);
+      //Check to see if it should be duplicated to the vendor.
+      if (process.env.DUPLICATE_BILL_TO_VENDOR) {
+        const copyQueue: Promise<void>[] = [];
+
+        //for each file.path, generate the thumbnail.
+        (req.files as Express.Multer.File[]).forEach((file) => {
+          const vendor: string = (req.body.vendor || "").trim();
+          const invoice_number: string = (req.body.invoice_number || "").trim();
+
+          copyQueue.push(
+            (async () => {
+              const target: string = path.join(
+                PathToVendorBillsFile(vendor),
+                invoice_number + path.extname(file.filename)
+              );
+
+              await fs.ensureDir(path.dirname(target));
+              await fs.copyFile(file.path, target);
+            })()
+          );
+
+          //Copy Queue is not awaited - we don't care if it finishes before we serve up the thumbnails.
+        });
+      }
+      BillsListMedia(req, res);
+    }
+  } catch (err) {
+    res.status(500).send(err);
+  }
+}

docker/docker-compose.yml

@@ -8,4 +8,5 @@ services:
       - "/Users/pfic/Desktop/ISM:/media"
     environment:
       - MEDIA_PATH=/media
+      - DUPLICATE_BILL_TO_VENDOR=false
     image: imexonline/media-server

jobs/jobsListMedia.ts

@@ -2,21 +2,23 @@ import { Request, Response } from "express";
 import fs from "fs-extra";
 import path from "path";
 import GenerateThumbnail from "../util/generateThumbnail";
+import MediaFile from "../util/interfaces/MediaFile";
 import GenerateUrl from "../util/MediaUrlGen";
+import { PathToRoFolder } from "../util/pathGenerators";
 import { FolderPaths } from "../util/serverInit";
 
 export async function JobsListMedia(req: Request, res: Response) {
   const ro_number: string = (req.body.ro_number || "").trim();
-  await fs.ensureDir(path.join(FolderPaths.Jobs, ro_number));
+  await fs.ensureDir(PathToRoFolder(ro_number));
   const filesList: fs.Dirent[] = (
-    await fs.readdir(path.join(FolderPaths.Jobs, ro_number), {
+    await fs.readdir(PathToRoFolder(ro_number), {
       withFileTypes: true,
     })
   ).filter((f) => f.isFile() && !/(^|\/)\.[^\/\.]/g.test(f.name));
 
   const ret: MediaFile[] = await Promise.all(
     filesList.map(async (file) => {
-      const thumbPath: string = await GenerateThumbnail(
+      const relativeThumbPath: string = await GenerateThumbnail(
         path.join(FolderPaths.Jobs, ro_number, file.name)
       );
       return {
@@ -30,7 +32,7 @@ export async function JobsListMedia(req: Request, res: Response) {
           FolderPaths.StaticPath,
           FolderPaths.JobsFolder,
           ro_number,
-          thumbPath,
+          relativeThumbPath,
         ]),
       };
     })
@@ -38,8 +40,3 @@ export async function JobsListMedia(req: Request, res: Response) {
 
   res.json(ret);
 }
-
-interface MediaFile {
-  src: string;
-  thumb: string;
-}

jobs/jobsMoveMedia.ts

@@ -6,6 +6,7 @@ import GenerateUrl from "../util/MediaUrlGen";
 import { FolderPaths } from "../util/serverInit";
 import multer from "multer";
 import { JobsListMedia } from "./jobsListMedia";
+import { PathToRoFolder } from "../util/pathGenerators";
 
 export async function JobsMoveMedia(req: Request, res: Response) {
   const ro_number: string = (req.body.ro_number || "").trim();
@@ -23,7 +24,7 @@ export async function JobsMoveMedia(req: Request, res: Response) {
     return;
   }
   //Make sure the destination RO directory exists.
-  await fs.ensureDir(path.join(FolderPaths.Jobs, ro_number));
+  await fs.ensureDir(PathToRoFolder(ro_number));
 
   const movingQueue: Promise<void>[] = [];
 

jobs/jobsUploadMedia.ts

@@ -3,24 +3,22 @@ import multer from "multer";
 import path from "path";
 import { logger } from "../server";
 import GenerateThumbnail from "../util/generateThumbnail";
-import { FolderPaths } from "../util/serverInit";
+import generateUniqueFilename from "../util/generateUniqueFilename";
+import { PathToRoFolder } from "../util/pathGenerators";
 import { JobsListMedia } from "./jobsListMedia";
+import fs from "fs-extra";
 
 export const JobMediaUploadMulter = multer({
   storage: multer.diskStorage({
     destination: function (req, file, cb) {
       const ro_number: string = (req.body.ro_number || "").trim();
-      const DestinationFolder: string = path.join(FolderPaths.Jobs, ro_number);
+      const DestinationFolder: string = PathToRoFolder(ro_number);
+      fs.ensureDirSync(DestinationFolder);
       cb(null, DestinationFolder);
     },
     filename: function (req, file, cb) {
       logger.info("Uploading file: ", path.basename(file.originalname));
-      cb(
+      cb(null, generateUniqueFilename(file));
-        null,
-        `${file.originalname}-${Math.floor(Date.now() / 1000)}.${path.extname(
-          file.originalname
-        )}`
-      );
     },
   }),
 });

readme.md

@@ -0,0 +1,14 @@
+# Env. Vars
+
+DUPLICATE_BILL_TO_VENDOR => If set to true, a copy of the bill will be sent to Vendors/{Vendor Name}/{Invoice Number}/{filename.extension}. Default to false.
+MEDIA_PATH => Must match the mount directory of the volume. e.g.
+volumes: - ~:/root - "/Users/pfic/Desktop/ISM:/media"
+environment: - MEDIA_PATH=/media
+
+# Operations
+
+## Bills
+
+By default, it will query from the job files. Anything duplicated to the vendor files is purely for reference.
+
+## Jobs

server.ts

@@ -10,6 +10,12 @@ import { JobMediaUploadMulter, jobsUploadMedia } from "./jobs/jobsUploadMedia";
 import InitServer, { FolderPaths } from "./util/serverInit";
 import DailyRotateFile from "winston-daily-rotate-file";
 import morgan from "morgan";
+import { BillsListMedia } from "./bills/billsListMedia";
+import BillRequestValidator from "./bills/billRequestValidator";
+import {
+  BillsMediaUploadMulter,
+  BillsUploadMedia,
+} from "./bills/billsUploadMedia";
 
 dotenv.config({
   path: resolve(process.cwd(), `.env.${process.env.NODE_ENV || "development"}`),
@@ -94,11 +100,10 @@ const morganMiddleware = morgan(
 app.use(morganMiddleware);
 
 app.get("/jobs/list", JobRequestValidator, JobsListMedia);
-//Chaining together the upload. When upload is succesful, everything for the RO is returned.
-
 app.post(
-  "/jobs/upload", //JobRequestValidator,
+  "/jobs/upload",
   JobMediaUploadMulter.array("file"),
+  JobRequestValidator,
   jobsUploadMedia
 );
 app.post(
@@ -106,6 +111,14 @@ app.post(
   JobsMoveMedia
 );
 
+app.get("/bills/list", BillRequestValidator, BillsListMedia);
+app.post(
+  "/bills/upload",
+  BillsMediaUploadMulter.array("file"),
+  BillRequestValidator,
+  BillsUploadMedia
+);
+
 InitServer();
 
 app.listen(port, () => {

util/generateUniqueFilename.ts

@@ -0,0 +1,7 @@
+import path from "path";
+
+export default function (file: Express.Multer.File) {
+  return `${file.originalname}-${Math.floor(Date.now() / 1000)}${path.extname(
+    file.originalname
+  )}`;
+}

util/interfaces/MediaFile.ts

@@ -0,0 +1,6 @@
+interface MediaFile {
+  src: string;
+  thumb: string;
+}
+
+export default MediaFile;

util/pathGenerators.ts

@@ -0,0 +1,13 @@
+import path from "path";
+import { FolderPaths } from "./serverInit";
+
+export function PathToRoFolder(ro_number: string) {
+  return path.join(FolderPaths.Jobs, ro_number);
+}
+
+export function PathToRoBillsFolder(ro_number: string) {
+  return path.join(FolderPaths.Jobs, ro_number, FolderPaths.BillsSubDir);
+}
+export function PathToVendorBillsFile(vendor: string) {
+  return path.join(FolderPaths.Vendors, vendor);
+}

util/serverInit.ts

@@ -16,6 +16,7 @@ export const FolderPaths = {
   Jobs: path.join(RootDirectory, JobsFolder),
   Vendors: path.join(RootDirectory, VendorsFolder),
   ThumbsSubDir: "/thumbs",
+  BillsSubDir: "/bills",
   StaticPath: "/static",
   JobsFolder,
   VendorsFolder,