delete completely user home page and subpages

apps/app/src/server/routes/apiv3/users.js

@@ -757,7 +757,7 @@ module.exports = (crowi) => {
    *        tags: [Users]
    *        operationId: removeUser
    *        summary: /users/{id}/remove
-   *        description: Delete user and if isUsersHomePageDeletionEnabled delete user home page and sub pages
+   *        description: Delete user and if isUsersHomePageDeletionEnabled delete user home page and subpages
    *        parameters:
    *          - name: id
    *            in: path
@@ -767,7 +767,7 @@ module.exports = (crowi) => {
    *              type: string
    *        responses:
    *          200:
-   *            description: Deleting user success and if isUsersHomePageDeletionEnabled delete user home page and sub pages success
+   *            description: Deleting user success and if isUsersHomePageDeletionEnabled delete user home page and subpages success
    *            content:
    *              application/json:
    *                schema:
@@ -801,14 +801,7 @@ module.exports = (crowi) => {
       activityEvent.emit('update', res.locals.activity._id, { action: SupportedAction.ACTION_ADMIN_USERS_REMOVE });
 
       if (isUsersHomePageDeletionEnabled) {
-        crowi.pageService.deleteUserHomePageAndSubPages(
-          userHomePagePath,
-          req.user,
-          {
-            ip: req.ip,
-            endpoint: req.originalUrl,
-          },
-        );
+        crowi.pageService.deleteCompletelyUserHomePageAndSubpages(req.user, userHomePagePath);
       }
 
       return res.apiv3({

apps/app/src/server/service/page.ts

@@ -1962,16 +1962,50 @@ class PageService {
     }
   }
 
-  async deleteUserHomePageAndSubPages(userHomePagePath, user, activityParameters): Promise<void> {
+  async deleteCompletelyUserHomePageAndSubpages(user, userHomePagePath, options = {}): Promise<void> {
     const Page = this.crowi.model('Page');
     const userHomePage = await Page.findByPath(userHomePagePath, user);
 
     if (userHomePage == null) {
       logger.error('user home page is not found.');
-      throw new Error('user collection deleted but user home page is not found');
+      return;
     }
 
-    this.deleteCompletely(userHomePage, user, {}, true, false, activityParameters);
+    const ids = [userHomePage._id];
+    const paths = [userHomePage.path];
+
+    let pageOp;
+    try {
+      // 1. update descendantCount
+      const inc = userHomePage.isEmpty ? -userHomePage.descendantCount : -(userHomePage.descendantCount + 1);
+      await this.updateDescendantCountOfAncestors(userHomePage.parent, inc, true);
+      // 2. delete target completely
+      await this.deleteCompletelyOperation(ids, paths);
+      // 3. delete leaf empty pages
+      await Page.removeLeafEmptyPagesRecursively(userHomePage.parent);
+
+      if (!userHomePage.isEmpty) {
+        this.pageEvent.emit('deleteCompletely', userHomePage, user);
+      }
+
+      pageOp = await PageOperation.create({
+        actionType: PageActionType.DeleteCompletely,
+        actionStage: PageActionStage.Main,
+        page: userHomePage,
+        user,
+        fromPath: userHomePage.path,
+        options,
+      });
+
+      await this.deleteCompletelyRecursivelyMainOperation(userHomePage, user, options, pageOp._id);
+    }
+    catch (err) {
+      logger.error('Error occurred while deleting user home page and subpages.', err);
+      if (pageOp != null) {
+        await PageOperation.deleteOne({ _id: pageOp._id });
+      }
+      throw err;
+    }
   }
 
   // use the same process in both v4 and v5