From 0f4e1e657edd5865fba4abc9e8eaae96ab71957d Mon Sep 17 00:00:00 2001
From: Zofia Szczudlik <zofia.szczudlik@gmail.com>
Date: Thu, 22 Mar 2018 23:24:37 +0100
Subject: [PATCH] feat: refactoring

---
 .gitignore        |  1 +
 src/server.js     | 19 ++++++-------------
 src/translator.js | 33 ++++++++-------------------------
 3 files changed, 15 insertions(+), 38 deletions(-)

diff --git a/.gitignore b/.gitignore
index 00cbbdf..d093557 100644
--- a/.gitignore
+++ b/.gitignore
@@ -57,3 +57,4 @@ typings/
 # dotenv environment variables file
 .env
 
+.DS_Store
diff --git a/src/server.js b/src/server.js
index f674093..94137b2 100644
--- a/src/server.js
+++ b/src/server.js
@@ -1,16 +1,9 @@
-var translate = require('./translator')
+const translate = require('./translator')
 
-var text = "quiero trabajar con los mejores"
-var targetLang = 'en'
+const text = "quiero trabajar con los mejores"
 
-console.log(translate);
+const targetLang = 'en'
 
-translate.translateText(text, targetLang, function (err, result) {
-
-  if (err) {
-    next(err);
-    return;
-  }
-  console.log(result);
-
-});
\ No newline at end of file
+translate.translateText(text, targetLang)
+  .then(result => console.log(result))
+  .catch(err => console.log(err));
diff --git a/src/translator.js b/src/translator.js
index d4dd359..663f55a 100644
--- a/src/translator.js
+++ b/src/translator.js
@@ -1,33 +1,16 @@
 "use strict";
 
-var Translate = require('@google-cloud/translate');
-var async = require('async');
+const Translate = require('@google-cloud/translate');
 
-var TranslateService = {};
-var translate = new Translate({
+const TranslateService = {};
+const translate = new Translate({
   keyFilename: './src/translator.conf.json',
 });
 
-TranslateService.translateText = function (content, targetLang, next) {
-
-  var calls = [];
-
-  calls.push(function (callback) {
-
-    translate
-      .translate( content, targetLang )
-      .then(results => {
-        return callback(null, results[0]);
-      })
-      .catch(err => {
-        console.error('ERROR:', err);
-      });
-  });
-
-  async.waterfall(calls, function (err, response) {
-    if (next) next(err, response);
-  });
-};
-
+TranslateService.translateText = (content, targetLang) => {
+  return translate
+    .translate(content, targetLang)
+    .then(result => result[0])
+}
 
 module.exports = TranslateService;