diff --git a/index.js b/index.js index c96ed26..cd07e75 100644 --- a/index.js +++ b/index.js @@ -59,54 +59,57 @@ app.post('/upload/task', upload.single('file'), (req, res) => { console.log(req.body) console.log(req.file) - let uid = req.body.uid; - let job_uid = req.body.job_uid; - console.log(" req.body.uid -> ", uid) - console.log(" req.body.job_uid -> ", job_uid) - console.log(" process.env.COMMON_TASKF_PATH-> ", process.env.COMMON_TASKF_PATH) + let uid = req.body.uid; + let job_uid = req.body.job_uid; + console.log(" req.body.uid -> ", uid) + console.log(" req.body.job_uid -> ", job_uid) + console.log(" process.env.COMMON_TASKF_PATH-> ", process.env.COMMON_TASKF_PATH) - let destinationDir = process.env.COMMON_TASKF_PATH !== undefined ? process.env.COMMON_TASKF_PATH : '/opt/wrenchboard/TEST/TASKFILE'; + let destinationDir = process.env.COMMON_TASKF_PATH !== undefined ? process.env.COMMON_TASKF_PATH : '/opt/wrenchboard/TEST/TASKFILE'; - const fs = require('fs'); - const dir = destinationDir + "/" + job_uid; - if (!fs.existsSync(dir)){ - fs.mkdirSync(dir); - } + const fs = require('fs'); + const dir = destinationDir + "/" + job_uid; + if (!fs.existsSync(dir)) { + fs.mkdirSync(dir); + } - const oldPath = req.file.path; - const newPath = dir + "/" + req.file.filename; + const oldPath = req.file.path; + const newPath = dir + "/" + req.file.filename; - fs.rename(oldPath, newPath, function (err) { - if (err) throw err - console.log('Successfully renamed - AKA moved!'); - console.log('Start::Database Registration!'); -/* - var data = { - "member_uid": req.body.uid, - "job_uid": req.body.job_uid, - "filename": req.file.filename, - "originalname": req.file.originalname, - "mimetype": req.file.mimetype, - "size": req.file.size, - "encoding": req.file.encoding - }; - - console.log("DATA - > ", data); - - var queryText = 'INSERT INTO members_jobs_files( request ) VALUES($1) RETURNING id'; - db.query(queryText, [data], function(dbErr, result) { - if (dbErr) { + fs.rename(oldPath, newPath, function (err) { + if (err) throw err + console.log('Successfully renamed - AKA moved!'); + console.log('Start::Database Registration!'); - }else{ + var data = { + "member_uid": req.body.uid, + "job_uid": req.body.job_uid, + "filename": req.file.filename, + "originalname": req.file.originalname, + "mimetype": req.file.mimetype, + "size": req.file.size, + "encoding": req.file.encoding + }; + + console.log("DATA - > ", data); + + var queryText = 'INSERT INTO members_jobs_files( request ) VALUES($1) RETURNING id'; + db.query(queryText, [data], function(dbErr, result) { + if (dbErr) { - } - console.log('End::Database Registration!'); - }) - return res.status(200).send('Completed') + }else{ + + + } + console.log('End::Database Registration!'); + }) + + return res.status(200).send('Completed') + }) }) -*/ +