diff --git a/server/ftp-integration/taggedXML.js b/server/ftp-integration/taggedXML.js index 47e3f94cee5fa89dfaebbc7acb7dcf3a3f25f715..ecf847c0c83aa6b765a7bde947a44a426a647516 100644 --- a/server/ftp-integration/taggedXML.js +++ b/server/ftp-integration/taggedXML.js @@ -89,20 +89,21 @@ async function processFile(path) { // delete current existing 'tagging' files await db.deleteTaggingFiles(manuscriptId, user) - const uuid = uuidv4() - // upload to minio for (let i = 0; i < filesArr.length; i += 1) { + const uuid = uuidv4() + const minioFileName = `${uuid}${filesArr[i].extension}` files.uploadFileToMinio( - `${uuid}${filesArr[i].extension}`, + minioFileName, filesArr[i].filename, filesArr[i].url, filesArr[i].mimeType, ) + filesArr[i].filename = minioFileName } const dbFilesArr = filesArr.map(obj => { - obj.url = `/download/${uuid}${obj.extension}` + obj.url = `/download/${obj.filename}` delete obj.extension return obj }) diff --git a/server/pdf-conversion/api.js b/server/pdf-conversion/api.js index 30baa91c8f442b744745d791242e08f404e73d8b..9d98b0d18cc2d6041b7dc0f6a84a3f71f82d1f45 100644 --- a/server/pdf-conversion/api.js +++ b/server/pdf-conversion/api.js @@ -182,7 +182,7 @@ async function processDeposit(manuscript, deposit) { await new Manuscript(manuscript).save() logger.error(error) }) - } else if (deposit.state === 'NO_RESULT') { + } else if (deposit.state === 'NO_RESULT' || deposit.state === 'EXPIRED') { manuscript.pdfDepositState = deposit.state manuscript.formState = deposit.details if (manuscript.status === 'tagging') { diff --git a/server/xpub-model/entities/file/data-access.js b/server/xpub-model/entities/file/data-access.js index ef8b7505549f08a3179a96c12d91be7e41a34924..884622172f29f4eaac06089e7b173eb26c12a809 100644 --- a/server/xpub-model/entities/file/data-access.js +++ b/server/xpub-model/entities/file/data-access.js @@ -30,6 +30,7 @@ class File extends EpmcBaseModel { url: { type: 'string' }, label: { type: ['string', 'null'] }, deleted: { type: 'timestamp' }, + updated: { type: 'timestamp' }, updatedBy: { type: 'uuid' }, }, }