services/user.js

@@ -3,8 +3,7 @@ const jalali = require("jalali-moment");
 const persianjs = require('persianjs')
 const docxTemp = require('../tools/docxtemp')
 const imageResizer = require('../tools/imageResizer')
-const addImageToWord = require('../tools/addImageToWord');
+const addImageToWord = require('../tools/addImageToWord')
-const { result } = require('lodash');
 
 
 let methods = {}
@@ -44,7 +43,7 @@ methods.addUser = (userInfo,imgOriginalName) => {
        imageResizer(imgOriginalName)
        .then(()=>{
 
-        return models.User.create(userInfo)
+        models.User.create(userInfo)
        }).then((user) => {
             
             resolve(user)
@@ -61,11 +60,10 @@ methods.addUser = (userInfo,imgOriginalName) => {
 
 methods.completeForm =(userId)=>{
     return new Promise((resolve, reject) => {
-        let userInfo;
         privates.findUser(userId)
         .then(user=>{
 
-             userInfo = user
+            let userInfo = user
             
             userInfo.fullName = user.firstName + ' ' + user.lastName
             
@@ -90,9 +88,7 @@ methods.completeForm =(userId)=>{
             return docxTemp(userInfo, userInfo.fileName)
         }).then(docxFileName=>{
 
-           return  addImageToWord(docxFileName, userInfo.imageFileName + '.png')
+            addImageToWord(docxFileName, userInfo.fileName + '.png')
-        }).then(result=>{
-            resolve(`localhost:3000/users/download/${result}`)
 
         }).catch(err => {
             if (err.eText) {

tools/addImageToWord.js

@@ -1,47 +1,16 @@
 const exec = require('child-process-promise').exec;
-const fsPromises = require('fs').promises;
-const path = require('path')
 
-module.exports = function (docxFile, image) {
+module.exports = function (docxFile, image){
-    return new Promise((resolve, reject) => {
+    return new Promise ((resolve, reject)=>{
-        let zipName = docxFile.slice(0, -5) + '.zip'
+        exec('mkdir word/media')
-        let filePath = path.join(__dirname + '/../public/files')
+    .then(function (result) {
-        exec('mkdir -p word/media')
+        var stdout = result.stdout;
-            .then(function (result) {
+        var stderr = result.stderr;
-
+        console.log('stdout: ', stdout);
-                return Promise.all([
+        console.log('stderr: ', stderr);
-                    fsPromises.copyFile(path.join(__dirname + '/../public/images/resized/' + image),
-                        path.join(__dirname + '/../public/files/word/media/image2.png')),
-
-                    fsPromises.rename(path.join(__dirname + '/../public/files/' + docxFile),
-                        path.join(__dirname + '/../public/files/' + zipName))
-
-                ])
-
-            }).then((result) => {
-
-                return exec(`zip -d ${zipName} ./word/media/image2.png`, {
-                    cwd: filePath
-                })
-            }).then((result) => {
-                return exec(`zip -u ${zipName} ./word/media/image2.png`, {
-                    cwd: filePath
-                })
-            }).then((result) => {
-
-                return fsPromises.rename(path.join(__dirname + '/../public/files/' + zipName),
-                    path.join(__dirname + '/../public/files/' + docxFile))
-            }).then(() => {
-                resolve(docxFile)
-            })
-
-            .catch(function (err) {
-              
-                reject({
-                    eCode: 500,
-                    eText: err
-                })
-                
-            });
     })
-}
+    .catch(function (err) {
+        console.error('ERROR: ', err);
+    });
+    }
+    )}