mizozobu пре 7 година
родитељ
комит
a03bdd3937
3 измењених фајлова са 49 додато и 55 уклоњено
  1. 2 2
      lib/routes/admin.js
  2. 17 25
      lib/service/rest-qiita-API.js
  3. 30 28
      lib/util/importer.js

+ 2 - 2
lib/routes/admin.js

@@ -1112,7 +1112,7 @@ module.exports = function(crowi, app) {
     debug('form content', form);
     await saveSettingAsync(form);
     const config = await crowi.getConfig();
-    
+
 
     // reset strategy
     await crowi.passportService.resetTwitterStrategy();
@@ -1290,7 +1290,7 @@ module.exports = function(crowi, app) {
     }
   };
 
-    /**
+  /**
    * Test connection to qiita and response result with json
    *
    * @param {*} req

+ 17 - 25
lib/service/rest-qiita-API.js

@@ -10,7 +10,7 @@ function getAxios(team, token) {
     },
     responseType: 'json'
   });
-};
+}
 
 /**
  * the service class of restQiitaAPI
@@ -25,7 +25,7 @@ class RestQiitaAPIService {
     this.team = this.config.crowi['importer:qiita:team_name'];
     this.token = this.config.crowi['importer:qiita:access_token'];
     this.axios = getAxios(this.team, this.token);
-  };
+  }
 
   /**
    * get Qiita API
@@ -37,28 +37,23 @@ class RestQiitaAPIService {
       .then(function(res) {
         const data = res.data;
         const total = res.headers['total-count'];
+
         return {data, total};
-      })
-      .catch(function(err) {
-        return err;
       });
-  };
+  }
 
   /**
    * get Qiita user
    * @memberof RestQiitaAPI
    */
   async getQiitaUser() {
-    try {
-      const res = await this.restAPI('/users');
-      const user = res.data;
-      if(user.length > 0) {
-        return user;
-      }
-    } catch (err) {
-      throw err;
+    const res = await this.restAPI('/users');
+    const user = res.data;
+
+    if (user.length > 0) {
+      return user;
     }
-  };
+  }
 
 
   /**
@@ -68,17 +63,14 @@ class RestQiitaAPIService {
    * @param {string} per_page
    */
   async getQiitaPages(pageNum, per_page) {
-    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;
+    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};
     }
-  };
+  }
 }
 
 module.exports = RestQiitaAPIService;

+ 30 - 28
lib/util/importer.js

@@ -65,9 +65,9 @@ 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;
+    const firstPage = 1;
+    const errors = await importPostsFromQiita(firstPage, user, []);
+    return errors;
   };
 
   /**
@@ -78,24 +78,24 @@ module.exports = crowi => {
     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.pages;
-        const pageTotal = res.total;
-        const data = convertQiitaDataForGrowi(postsReceived, user);
-
-        createGrowiPages(data)
-        .then(function(newErrors) {
-          if (next <= pageTotal) {
-            return resolve(importPostsFromQiita(next, user, errors.concat(newErrors)));
-          }
-
-          resolve(errors.concat(newErrors));
+        .then(function(res) {
+          const next = pageNum * per_page + 1;
+          const postsReceived = res.pages;
+          const pageTotal = res.total;
+          const data = convertQiitaDataForGrowi(postsReceived, user);
+
+          createGrowiPages(data)
+            .then(function(newErrors) {
+              if (next <= pageTotal) {
+                return resolve(importPostsFromQiita(next, user, errors.concat(newErrors)));
+              }
+
+              resolve(errors.concat(newErrors));
+            });
+        })
+        .catch(function(err) {
+          reject(err);
         });
-      })
-      .catch(function(err) {
-        reject(err);
-      });
     });
   };
 
@@ -153,22 +153,24 @@ module.exports = crowi => {
    * Import page data from esa to GROWI
    */
   importer.testConnectionToEsa = async() => {
-      try {
-        await getTeamNameFromEsa();
-      } catch (err) {
-        throw err;
-      }
+    try {
+      await getTeamNameFromEsa();
+    }
+    catch (err) {
+      throw err;
+    }
   };
 
-    /**
+  /**
    * Import page data from qiita to GROWI
    */
   importer.testConnectionToQiita = async() => {
     try {
       await restQiitaAPIService.getQiitaUser();
-    } catch (err) {
+    }
+    catch (err) {
       throw err;
-    };
+    }
   };
 
   /**