Taichi Masuyama 4 tahun lalu
induk
melakukan
359a4a313c

+ 1 - 4
packages/app/src/server/models/page.js

@@ -43,7 +43,7 @@ const pageSchema = new mongoose.Schema({
   },
   },
   isEmpty: { type: Boolean, default: false },
   isEmpty: { type: Boolean, default: false },
   path: {
   path: {
-    type: String, required: true,
+    type: String, required: true, index: true,
   },
   },
   revision: { type: ObjectId, ref: 'Revision' },
   revision: { type: ObjectId, ref: 'Revision' },
   redirectTo: { type: String, index: true },
   redirectTo: { type: String, index: true },
@@ -72,9 +72,6 @@ const pageSchema = new mongoose.Schema({
 pageSchema.plugin(mongoosePaginate);
 pageSchema.plugin(mongoosePaginate);
 pageSchema.plugin(uniqueValidator);
 pageSchema.plugin(uniqueValidator);
 
 
-// TODO: test this after modifying Page.create
-// ensure v4 compatibility using partial index
-pageSchema.index({ path: 1 }, { unique: true, partialFilterExpression: { parent: null } });
 
 
 /**
 /**
  * return an array of ancestors paths that is extracted from specified pagePath
  * return an array of ancestors paths that is extracted from specified pagePath

+ 1 - 1
packages/app/src/server/routes/installer.js

@@ -36,7 +36,7 @@ module.exports = function(crowi) {
     const promises = [];
     const promises = [];
 
 
     // create portal page for '/'
     // create portal page for '/'
-    promises.push(createPage(path.join(crowi.localeDir, lang, 'welcome.md'), '/', owner, lang));
+    await createPage(path.join(crowi.localeDir, lang, 'welcome.md'), '/', owner, lang);
 
 
     // create /Sandbox/*
     // create /Sandbox/*
     promises.push(createPage(path.join(crowi.localeDir, lang, 'sandbox.md'), '/Sandbox', owner, lang));
     promises.push(createPage(path.join(crowi.localeDir, lang, 'sandbox.md'), '/Sandbox', owner, lang));

+ 2 - 2
packages/app/src/server/service/page.js

@@ -6,8 +6,8 @@ const escapeStringRegexp = require('escape-string-regexp');
 const streamToPromise = require('stream-to-promise');
 const streamToPromise = require('stream-to-promise');
 const pathlib = require('path');
 const pathlib = require('path');
 
 
-const logger = loggerFactory('growi:models:page');
-const debug = require('debug')('growi:models:page');
+const logger = loggerFactory('growi:services:page');
+const debug = require('debug')('growi:services:page');
 const { Writable } = require('stream');
 const { Writable } = require('stream');
 const { createBatchStream } = require('~/server/util/batch-stream');
 const { createBatchStream } = require('~/server/util/batch-stream');