Revert "adjust indent"

This reverts commit 2db83b095d85b9107b2239d8fe6f563a6d5acda5.

lib/service/rest-qiita-API.js

@@ -34,14 +34,14 @@ class RestQiitaAPIService {
    */
   async restAPI(path) {
     return this.axios.get(path)
-      .then(function (res) {
+      .then(function(res) {
         const data = res.data;
         const total = res.headers['total-count'];
-        return {
-          data,
-          total
-        };
+        return {data, total};
       })
+      .catch(function(err) {
+        return err;
+      });
   };
 
   /**
@@ -49,11 +49,18 @@ class RestQiitaAPIService {
    * @memberof RestQiitaAPI
    */
   async getQiitaUser() {
-    const res = await this.restAPI('/users');
-    const user = res.data;
-    return user;
+    try {
+      const res = await this.restAPI('/users');
+      const user = res.data;
+      if(user.length > 0) {
+        return user;
+      }
+    } catch (err) {
+      throw err;
+    }
   };
 
+
   /**
    * get Qiita pages
    * @memberof RestQiitaAPI
@@ -61,8 +68,16 @@ class RestQiitaAPIService {
    * @param {string} per_page
    */
   async getQiitaPages(pageNum, per_page) {
-    const res = await this.restAPI(`/items?page=${pageNum}&per_page=${per_page}`);
-    return res;
+    try {
+      const res = await this.restAPI(`/items?page=${pageNum}&per_page=${per_page}`);
+      const pages = res.data;
+      const total = res.total;
+      if(pages.length > 0) {
+        return {pages, total};
+      }
+    } catch (err) {
+      throw err;
+    }
   };
 }
 

lib/util/importer.js

@@ -17,7 +17,7 @@ module.exports = crowi => {
    */
   importer.initialize = () => {
     esaClient = esa({
-      team: config.crowi['importer:esa:team_name'],
+      team:        config.crowi['importer:esa:team_name'],
       accessToken: config.crowi['importer:esa:access_token'],
     });
     logger.info('initialize esa importer');
@@ -41,10 +41,7 @@ module.exports = crowi => {
    */
   const importPostsFromEsa = (pageNum, user, errors) => {
     return new Promise((resolve, reject) => {
-      esaClient.api.posts({
-        page: pageNum,
-        per_page: 100
-      }, async (err, res) => {
+      esaClient.api.posts({page: pageNum, per_page: 100}, async(err, res) => {
         const nextPage = res.body.next_page;
         const postsReceived = res.body.posts;
 
@@ -67,10 +64,10 @@ module.exports = crowi => {
   /**
    * Import page data from qiita to GROWI
    */
-  importer.importDataFromQiita = async (user) => {
-    const firstPage = 1;
-    const errors = await importPostsFromQiita(firstPage, user, []);
-    return errors;
+  importer.importDataFromQiita = async(user) => {
+      const firstPage = 1;
+      const errors = await importPostsFromQiita(firstPage, user, []);
+      return errors;
   };
 
   /**
@@ -78,25 +75,28 @@ module.exports = crowi => {
    * @param {string} pageNum default value is '1'
    */
   const importPostsFromQiita = (pageNum, user, errors) => {
-    const per_page = '100';
-    return restQiitaAPIService.getQiitaPages(pageNum, per_page)
-      .then(function (res) {
+    return new Promise((resolve, reject) => {
+      const per_page = '100';
+      restQiitaAPIService.getQiitaPages(pageNum, per_page)
+      .then(function(res) {
         const next = pageNum * per_page + 1;
-        const postsReceived = res.data;
+        const postsReceived = res.pages;
         const pageTotal = res.total;
         const data = convertQiitaDataForGrowi(postsReceived, user);
 
         createGrowiPages(data)
-          .then(function (newErrors) {
-            if (next <= pageTotal) {
-              return importPostsFromQiita(next, user, errors.concat(newErrors));
-            }
-            return errors.concat(newErrors);
-          });
+        .then(function(newErrors) {
+          if (next <= pageTotal) {
+            return resolve(importPostsFromQiita(next, user, errors.concat(newErrors)));
+          }
+
+          resolve(errors.concat(newErrors));
+        });
       })
-      .catch(function (err) {
-        throw new Error(err);
+      .catch(function(err) {
+        reject(err);
       });
+    });
   };
 
   /**
@@ -112,9 +112,11 @@ module.exports = crowi => {
 
       if (category && name) {
         path = `${category}/${name}`;
-      } else if (category) {
+      }
+      else if (category) {
         path = category;
-      } else if (name) {
+      }
+      else if (name) {
         path = name;
       }
 
@@ -150,19 +152,23 @@ module.exports = crowi => {
   /**
    * Import page data from esa to GROWI
    */
-  importer.testConnectionToEsa = async () => {
-    try {
-      await getTeamNameFromEsa();
-    } catch (err) {
-      throw err;
-    }
+  importer.testConnectionToEsa = async() => {
+      try {
+        await getTeamNameFromEsa();
+      } catch (err) {
+        throw err;
+      }
   };
 
-  /**
+    /**
    * Import page data from qiita to GROWI
    */
-  importer.testConnectionToQiita = async () => {
-    await restQiitaAPIService.getQiitaUser();
+  importer.testConnectionToQiita = async() => {
+    try {
+      await restQiitaAPIService.getQiitaUser();
+    } catch (err) {
+      throw err;
+    };
   };
 
   /**