From b5f03d8087af7b7440fd455c8af7b866d7625d32 Mon Sep 17 00:00:00 2001
From: Nikos Marinos <nmarinos@ebi.ac.uk>
Date: Tue, 19 Mar 2019 11:58:00 +0000
Subject: [PATCH] bug fixes on tagger import
---
server/ftp-integration/taggedXML.js | 9 +++++----
server/pdf-conversion/api.js | 2 +-
server/xpub-model/entities/file/data-access.js | 1 +
3 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/server/ftp-integration/taggedXML.js b/server/ftp-integration/taggedXML.js
index 47e3f94ce..ecf847c0c 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 30baa91c8..9d98b0d18 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 ef8b75055..884622172 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' },
},
}
--
GitLab