Start of ESM update

This commit is contained in:
Allan Carr
2024-07-24 08:54:29 -07:00
parent 58055fd1b3
commit e793402a79
14 changed files with 107 additions and 171 deletions

View File

@@ -1,18 +1,7 @@
import { Request, Response, NextFunction } from "express";
import { NextFunction, Request, Response } from "express";
export default function BillRequestValidator(req: Request, res: Response, next: NextFunction) {
const vendorid: string = (req.body.vendorid || "").trim();
const invoice_number: string = (req.body.invoice_number || "").trim();
const jobid: string = (req.body.jobid || "").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 (jobid === "") {
res.status(400).json({ error: "No RO Number has been specified." });
return;

View File

@@ -1,8 +1,8 @@
import { Request, Response } from "express";
import ft from "file-type";
import core from "file-type/core";
import { fileTypeFromFile } from "file-type";
import { FileTypeResult } from "file-type/core";
import fs from "fs-extra";
import path, { relative } from "path";
import path from "path";
import GenerateUrl from "../util/MediaUrlGen";
import GenerateThumbnail from "../util/generateThumbnail";
import MediaFile from "../util/interfaces/MediaFile";
@@ -25,7 +25,7 @@ export async function BillsListMedia(req: Request, res: Response) {
const relativeFilePath: string = path.join(PathToRoBillsFolder(jobid), file.filename);
const relativeThumbPath: string = await GenerateThumbnail(relativeFilePath);
const type: core.FileTypeResult | undefined = await ft.fileTypeFromFile(relativeFilePath);
const type: FileTypeResult | undefined = await fileTypeFromFile(relativeFilePath);
return {
type,
size: file.size,
@@ -68,7 +68,7 @@ export async function BillsListMedia(req: Request, res: Response) {
const relativeFilePath: string = path.join(PathToRoBillsFolder(jobid), file.name);
const relativeThumbPath: string = await GenerateThumbnail(relativeFilePath);
const type: core.FileTypeResult | undefined = await ft.fileTypeFromFile(relativeFilePath);
const type: FileTypeResult | undefined = await fileTypeFromFile(relativeFilePath);
const fileSize = await fs.stat(relativeFilePath);
return {
type,

View File

@@ -5,7 +5,7 @@ import multer from "multer";
import path, { resolve } from "path";
import { logger } from "../server";
import GenerateThumbnail from "../util/generateThumbnail";
import generateUniqueFilename, { generateUniqueBillFilename } from "../util/generateUniqueFilename";
import { generateUniqueBillFilename } from "../util/generateUniqueFilename";
import { ConvertHeicFiles } from "../util/heicConverter";
import { PathToRoBillsFolder, PathToVendorBillsFile } from "../util/pathGenerators";
import { BillsListMedia } from "./billsListMedia";