|
|
@@ -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;
|
|
|
- };
|
|
|
+ }
|
|
|
};
|
|
|
|
|
|
/**
|