diff --git a/src/view/view.service.ts b/src/view/view.service.ts index d08e45f..61d42c3 100644 --- a/src/view/view.service.ts +++ b/src/view/view.service.ts @@ -63,7 +63,23 @@ export async function getDefaultViews(user: AuthenticatedUser) { const recInDb = await defaultViewModel.findOne({ userId: user.userId }); if (!recInDb) return {}; - return recInDb.defaultViews; + const viewIds = Object.values(recInDb.defaultViews); + const views = await viewModel.find().where("pid").in(viewIds).exec(); + + const defaultViews = {}; + console.log(viewIds); + console.log(views); + + for (const viewId of viewIds) { + const viewObj = views.find((item) => item.pid === viewId); + + if (!viewObj) continue; + if (viewObj.createdBy.toString() !== user.userId.toString()) continue; + + defaultViews[viewObj.collection] = viewObj; + } + + return defaultViews; } export async function updateDefaultView( @@ -80,7 +96,7 @@ export async function updateDefaultView( return await defaultViewModel.findOneAndUpdate( { userId: user.userId }, - { ...input }, + { defaultViews: input }, { new: true } ); }