Преглед изворни кода

fix: message, delete: comment

zamis пре 5 година
родитељ
комит
8a896e3237
1 измењених фајлова са 4 додато и 20 уклоњено
  1. 4 20
      src/server/service/page.js

+ 4 - 20
src/server/service/page.js

@@ -87,18 +87,12 @@ class PageService {
     // find manageable descendants (this array does not include GRANT_RESTRICTED)
     // find manageable descendants (this array does not include GRANT_RESTRICTED)
     const pages = await Page.findManageableListWithDescendants(targetPage, user, findOpts);
     const pages = await Page.findManageableListWithDescendants(targetPage, user, findOpts);
 
 
-    // ここをストリーム化したい
-    // page ではなく pages として渡したい
-    // await Promise.all(pages.map((page) => {
-    //   return this.completelyDeletePage(page, user, options);
-    // }));
-    // 変数名は後で考える
-    const deleteData = await this.completelyDeletePage(pages, user, options);
+    // TODO streaming bellow action
+    const pagesData = await this.completelyDeletePage(pages, user, options);
 
 
-    return deleteData;
+    return pagesData;
   }
   }
 
 
-  // pages をうけとれるように改修したい
   async completelyDeletePage(pages, user, options = {}) {
   async completelyDeletePage(pages, user, options = {}) {
     // this.validateCrowi();
     // this.validateCrowi();
     let pageEvent;
     let pageEvent;
@@ -125,7 +119,6 @@ class PageService {
     return pages;
     return pages;
   }
   }
 
 
-  // pageIds を受け取れるように改修したい
   async deleteCompletely(pageIds, pagePaths) {
   async deleteCompletely(pageIds, pagePaths) {
     // Delete Bookmarks, Attachments, Revisions, Pages and emit delete
     // Delete Bookmarks, Attachments, Revisions, Pages and emit delete
     const Bookmark = this.crowi.model('Bookmark');
     const Bookmark = this.crowi.model('Bookmark');
@@ -145,18 +138,9 @@ class PageService {
       Page.find({ path: { $in: pagePaths } }).remove({}),
       Page.find({ path: { $in: pagePaths } }).remove({}),
     ]);
     ]);
 
 
+    // TODO fix remove action of attachments
     // const hoge = await this.removeAllAttachments(pageIds);
     // const hoge = await this.removeAllAttachments(pageIds);
     return deleteData;
     return deleteData;
-    // return Promise.all([
-    //   Bookmark.removeBookmarksByPageId(pageIds),
-    //   Comment.removeCommentsByPageId(pageIds),
-    //   PageTagRelation.remove({ relatedPage: pageIds }),
-    //   ShareLink.remove({ relatedPage: pageIds }),
-    //   Revision.removeRevisionsByPath(pagePaths),
-    //   Page.findByIdAndRemove(pageIds),
-    //   Page.removeRedirectOriginPageByPath(pagePaths),
-    //   this.removeAllAttachments(pageIds),
-    // ]);
 
 
   }
   }