Send back only new files on upload.
This commit is contained in:
@@ -35,13 +35,15 @@ export async function BillsListMedia(req: Request, res: Response) {
|
||||
FolderPaths.BillsSubDir,
|
||||
file.name,
|
||||
]),
|
||||
thumb: GenerateUrl([
|
||||
thumbnail: GenerateUrl([
|
||||
FolderPaths.StaticPath,
|
||||
FolderPaths.JobsFolder,
|
||||
ro_number,
|
||||
FolderPaths.BillsSubDir,
|
||||
relativeThumbPath,
|
||||
]),
|
||||
thumbnailHeight: 250,
|
||||
thumbnailWidth: 250,
|
||||
};
|
||||
})
|
||||
);
|
||||
|
||||
@@ -5,7 +5,9 @@ import multer from "multer";
|
||||
import path, { resolve } from "path";
|
||||
import { logger } from "../server";
|
||||
import GenerateThumbnail from "../util/generateThumbnail";
|
||||
import generateUniqueFilename from "../util/generateUniqueFilename";
|
||||
import generateUniqueFilename, {
|
||||
generateUniqueBillFilename,
|
||||
} from "../util/generateUniqueFilename";
|
||||
import {
|
||||
PathToRoBillsFolder,
|
||||
PathToVendorBillsFile,
|
||||
@@ -26,7 +28,9 @@ export const BillsMediaUploadMulter = multer({
|
||||
},
|
||||
filename: function (req, file, cb) {
|
||||
logger.info("Uploading file: ", path.basename(file.originalname));
|
||||
cb(null, generateUniqueFilename(file));
|
||||
const invoice_number: string = (req.body.invoice_number || "").trim();
|
||||
|
||||
cb(null, generateUniqueBillFilename(file, invoice_number));
|
||||
},
|
||||
}),
|
||||
});
|
||||
@@ -59,18 +63,18 @@ export async function BillsUploadMedia(req: Request, res: Response) {
|
||||
(async () => {
|
||||
const target: string = path.join(
|
||||
PathToVendorBillsFile(vendor),
|
||||
invoice_number + path.extname(file.filename)
|
||||
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.
|
||||
//Copy Queue is not awaited - we don't care if it finishes before we serve up the thumbnails from the jobs directory.
|
||||
});
|
||||
}
|
||||
BillsListMedia(req, res);
|
||||
res.sendStatus(200);
|
||||
|
||||
// BillsListMedia(req, res);
|
||||
}
|
||||
} catch (err) {
|
||||
res.status(500).send(err);
|
||||
|
||||
Reference in New Issue
Block a user