ryoji-s 2 лет назад
Родитель
Сommit
44e6c894e1
2 измененных файлов с 1 добавлено и 16 удалено
  1. 1 1
      apps/app/src/server/models/page-operation.ts
  2. 0 15
      apps/app/src/server/service/page.ts

+ 1 - 1
apps/app/src/server/models/page-operation.ts

@@ -96,7 +96,7 @@ const schema = new Schema<PageOperationDocument, PageOperationModel>({
   toPath: { type: String, index: true },
   toPath: { type: String, index: true },
   page: { type: pageSchemaForResuming, required: true },
   page: { type: pageSchemaForResuming, required: true },
   exPage: { type: pageSchemaForResuming, required: false },
   exPage: { type: pageSchemaForResuming, required: false },
-  user: { type: userSchemaForResuming },
+  user: { type: userSchemaForResuming, required: true },
   options: { type: optionsSchemaForResuming },
   options: { type: optionsSchemaForResuming },
   incForUpdatingDescendantCount: { type: Number },
   incForUpdatingDescendantCount: { type: Number },
   unprocessableExpiryDate: { type: Date, default: () => addSeconds(new Date(), 10) },
   unprocessableExpiryDate: { type: Date, default: () => addSeconds(new Date(), 10) },

+ 0 - 15
apps/app/src/server/service/page.ts

@@ -1984,7 +1984,6 @@ class PageService {
     const ids = [userHomepage._id];
     const ids = [userHomepage._id];
     const paths = [userHomepage.path];
     const paths = [userHomepage.path];
 
 
-    let pageOp;
     try {
     try {
       if (!shouldUseV4Process) {
       if (!shouldUseV4Process) {
         // Ensure consistency of ancestors
         // Ensure consistency of ancestors
@@ -2005,14 +2004,6 @@ class PageService {
         this.pageEvent.emit('deleteCompletely', userHomepage);
         this.pageEvent.emit('deleteCompletely', userHomepage);
       }
       }
 
 
-      // Create a PageOperation model
-      pageOp = await PageOperation.create({
-        actionType: PageActionType.DeleteCompletely,
-        actionStage: PageActionStage.Main,
-        page: userHomepage,
-        fromPath: userHomepage.path,
-      });
-
       const { PageQueryBuilder } = Page;
       const { PageQueryBuilder } = Page;
 
 
       // Find descendant pages with system deletion condition
       // Find descendant pages with system deletion condition
@@ -2056,15 +2047,9 @@ class PageService {
 
 
       await streamToPromise(writeStream);
       await streamToPromise(writeStream);
       // ────────┤ end │─────────
       // ────────┤ end │─────────
-
-      // Clean up PageOperation
-      await PageOperation.deleteOne({ _id: pageOp._id });
     }
     }
     catch (err) {
     catch (err) {
       logger.error('Error occurred while deleting user homepage and subpages.', err);
       logger.error('Error occurred while deleting user homepage and subpages.', err);
-      if (pageOp != null) {
-        await PageOperation.deleteOne({ _id: pageOp._id });
-      }
       throw err;
       throw err;
     }
     }
   }
   }