Modify schema of BookmarkFolder

https://youtrack.weseek.co.jp/issue/GW-7910
- Update type of bookmarks in BookmarkFolderItems interface
- Set bookmarks as optional parameter
- Update bookmarks type in bookmarkFolderSchema
- Update population of bookamrks and page for bookmark folder listing
- update return value of bookmark folder list route

packages/app/src/interfaces/bookmark-info.ts

@@ -29,5 +29,5 @@ export interface BookmarkFolderItems {
   name: string
   parent: string
   children: this[]
-  bookmarks: [Ref<BookmarkedPage>]
+  bookmarks: [BookmarkedPage]
 }

packages/app/src/server/models/bookmark-folder.ts

@@ -22,7 +22,7 @@ export interface BookmarkFolderDocument extends Document {
   name: string
   owner: Types.ObjectId
   parent?: [this]
-  bookmarks: [Types.ObjectId]
+  bookmarks?: [Types.ObjectId]
 }
 
 export interface BookmarkFolderModel extends Model<BookmarkFolderDocument>{
@@ -38,9 +38,13 @@ const bookmarkFolderSchema = new Schema<BookmarkFolderDocument, BookmarkFolderMo
   name: { type: String },
   owner: { type: Schema.Types.ObjectId, ref: 'User', index: true },
   parent: { type: Schema.Types.ObjectId, ref: 'BookmarkFolder', required: false },
-  bookmarks: [{
-    type: Schema.Types.ObjectId, ref: 'Bookmark', default: [], required: false,
-  }],
+  bookmarks: {
+    type: [{
+      type: Schema.Types.ObjectId, ref: 'Bookmark', required: false,
+    }],
+    required: false,
+    default: [],
+  },
 }, {
   toObject: { virtuals: true },
 });
@@ -82,7 +86,16 @@ bookmarkFolderSchema.statics.findFolderAndChildren = async function(
 
   const parentFolder = await this.findById(parentId) as unknown as BookmarkFolderDocument;
   const bookmarkFolders = await this.find({ owner: userId, parent: parentFolder })
-    .populate({ path: 'children' }).populate({ path: 'bookmarks' }).exec() as unknown as BookmarkFolderItems[];
+    .populate({ path: 'children' })
+    .populate({
+      path: 'bookmarks',
+      model: 'Bookmark',
+      populate: {
+        path: 'page',
+        model: 'Page',
+      },
+    }).exec() as unknown as BookmarkFolderItems[];
+  console.log(bookmarkFolders);
   return bookmarkFolders;
 };
 

packages/app/src/server/routes/apiv3/bookmark-folder.ts

@@ -38,6 +38,7 @@ module.exports = (crowi) => {
 
     try {
       const bookmarkFolder = await BookmarkFolder.createByParameters(params);
+      console.log(bookmarkFolder);
       logger.debug('bookmark folder created', bookmarkFolder);
       return res.apiv3({ bookmarkFolder });
     }
@@ -55,13 +56,12 @@ module.exports = (crowi) => {
     const _parentId = parentId ?? null;
     try {
       const bookmarkFolders = await BookmarkFolder.findFolderAndChildren(req.user?._id, _parentId);
-      console.log(bookmarkFolders);
       const bookmarkFolderItems = bookmarkFolders.map(bookmarkFolder => ({
         _id: bookmarkFolder._id,
         name: bookmarkFolder.name,
         parent: bookmarkFolder.parent,
         children: bookmarkFolder.children,
-        bookmarkedPages: bookmarkFolder.bookmarks,
+        bookmarks: bookmarkFolder.bookmarks,
       }));
       return res.apiv3({ bookmarkFolderItems });
     }