Improvements/code review for XML validation

server/ftp-integration/taggedXML.js

@@ -74,7 +74,7 @@ async function processFile(path) {
   try {
     logger.info(`Processing tagged XML packages: ${path}`)
 
-    const user = await getUser.getFTPUser()
+    const user = await getUser.getTaggerUser()
     const userId = user.id
     const tmpPath = await tar.createTempDir()
     const extractedFilePath = await tar.untar(path, tmpPath)

server/utils/user.js

@@ -2,7 +2,7 @@ const rfr = require('rfr')
 
 const User = rfr('server/xpub-model/entities/user/data-access')
 
-module.exports.getFTPUser = function getFTPUser() {
+module.exports.getTaggerUser = function getTaggerUser() {
   return new Promise((resolve, reject) => {
     User.findByEmail('taggers@internal.ebi.ac.uk')
       .then(user => {

server/xml-validation/index.js

@@ -5,7 +5,6 @@ const xslt4node = require('xslt4node')
 const fs = require('fs')
 const uuidv4 = require('uuid/v4')
 const tar = require('../utils/unTar.js')
-const getUser = require('../utils/user.js')
 const files = require('../utils/files.js')
 const db = require('../utils/db.js')
 const logger = require('@pubsweet/logger')
@@ -20,10 +19,7 @@ xslt4node.addOptions('-Xmx1g')
 
 // pushXML(`/download/67551d6c-6ef0-446d-a04b-1d98dbc05915.xml`, 'EMS90000')
 
-module.exports.pushXML = async function pushXML(fileUrl, manuscriptId) {
-  const user = await getUser.getAdminUser()
-  const userId = user.id
-
+module.exports.pushXML = async function pushXML(fileUrl, manuscriptId, userId) {
   try {
     const downloadUrl = url + fileUrl.replace(/^\/+/g, '') // remove leading slash
     const xml = await files.fetchFile(downloadUrl)
@@ -123,10 +119,18 @@ module.exports.pushXML = async function pushXML(fileUrl, manuscriptId) {
           fs.writeFileSync(`${tmpPath}/${manuscriptId}.nxml`, nxml)
 
           filesArr.push(
-            getFileInfo(`${tmpPath}/${manuscriptId}.html`, manuscriptId, user),
+            getFileInfo(
+              `${tmpPath}/${manuscriptId}.html`,
+              manuscriptId,
+              userId,
+            ),
           )
           filesArr.push(
-            getFileInfo(`${tmpPath}/${manuscriptId}.nxml`, manuscriptId, user),
+            getFileInfo(
+              `${tmpPath}/${manuscriptId}.nxml`,
+              manuscriptId,
+              userId,
+            ),
           )
           const uuid = uuidv4()
 
@@ -185,7 +189,7 @@ module.exports.pushXML = async function pushXML(fileUrl, manuscriptId) {
   }
 }
 
-function getFileInfo(filepath, manuscriptId, user) {
+function getFileInfo(filepath, manuscriptId, userId) {
   const filename = filepath.substring(filepath.lastIndexOf('/') + 1)
   const fileExt = path.extname(filepath)
   const fileSize = fs.statSync(filepath).size
@@ -204,7 +208,7 @@ function getFileInfo(filepath, manuscriptId, user) {
     extension: fileExt,
     mimeType: `${mime.contentType(fileExt)}`,
     manuscriptId,
-    updatedBy: user.id,
+    updatedBy: userId,
   }
   return fileInfo
 }

server/xpub-server/entities/file/resolvers.js

@@ -42,7 +42,7 @@ const resolvers = {
     async convertXML(_, { id }, { user }) {
       try {
         const xmlFile = await FileManager.find(id)
-        await pushXML(xmlFile.url, xmlFile.manuscriptId)
+        await pushXML(xmlFile.url, xmlFile.manuscriptId, user)
       } catch (error) {
         logger.error(error)
         return false