From 414f152fefe649f6ef50d95ac249dbc03061c41a Mon Sep 17 00:00:00 2001
From: Sergei Samokhvalov <samokhvalovse@yandex-team.ru>
Date: Tue, 23 Jul 2024 23:34:33 +0700
Subject: [PATCH] Add check is private route (#161)

---
 src/services/new/workbook/get-workbook-content.ts | 8 ++++++--
 src/services/new/workbook/get-workbook.ts         | 2 +-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/services/new/workbook/get-workbook-content.ts b/src/services/new/workbook/get-workbook-content.ts
index 0ca9d69b..33ed0d7e 100644
--- a/src/services/new/workbook/get-workbook-content.ts
+++ b/src/services/new/workbook/get-workbook-content.ts
@@ -109,7 +109,7 @@ export const getWorkbookContent = async (
 
     const targetTrx = getReplica(trx);
 
-    const {user, tenantId} = ctx.get('info');
+    const {user, tenantId, isPrivateRoute} = ctx.get('info');
 
     const workbook = await getWorkbook(
         {ctx, trx, skipValidation: true, skipCheckPermissions},
@@ -122,7 +122,11 @@ export const getWorkbookContent = async (
     const entriesPage = await JoinedEntryRevisionFavorite.findPage({
         where: (builder) => {
             builder.where({
-                'entries.tenantId': tenantId,
+                ...(isPrivateRoute
+                    ? {}
+                    : {
+                          'entries.tenantId': tenantId,
+                      }),
                 workbookId: workbookId,
                 isDeleted: false,
             });
diff --git a/src/services/new/workbook/get-workbook.ts b/src/services/new/workbook/get-workbook.ts
index bd0846bd..4e140359 100644
--- a/src/services/new/workbook/get-workbook.ts
+++ b/src/services/new/workbook/get-workbook.ts
@@ -106,7 +106,7 @@ export const getWorkbook = async <T extends WorkbookInstance = WorkbookInstance>
     }
 
     logInfo(ctx, 'GET_WORKBOOK_FINISH', {
-        workbookId: Utils.encodeId(workbook.model.collectionId),
+        workbookId: Utils.encodeId(workbook.model.workbookId),
     });
 
     return workbook as T;