From ab0e763b98fe9c41888e2946c9f568fc63a1da91 Mon Sep 17 00:00:00 2001 From: Vyacheslav Tumanov Date: Tue, 26 Sep 2023 19:53:52 +0500 Subject: [PATCH 1/2] UBER-914: map to mixin after findAll Signed-off-by: Vyacheslav Tumanov --- server/mongo/src/storage.ts | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/server/mongo/src/storage.ts b/server/mongo/src/storage.ts index 66798092392..456ca9e4c5b 100644 --- a/server/mongo/src/storage.ts +++ b/server/mongo/src/storage.ts @@ -562,7 +562,10 @@ abstract class MongoAdapterBase implements DbAdapter { cursor.maxAwaitTimeMS(30000) const res = await cursor.toArray() - return toFindResult(res, total) + const result = res.map((v) => { + return this.hierarchy.updateLookupMixin(_class, v, options) + }) + return toFindResult(result, total) } find (domain: Domain): StorageIterator { From 360410967a2c8dac636e83e172814465caa34fd4 Mon Sep 17 00:00:00 2001 From: Vyacheslav Tumanov Date: Wed, 27 Sep 2023 12:35:57 +0500 Subject: [PATCH 2/2] UBER-914: get mixin after getting query result Signed-off-by: Vyacheslav Tumanov --- server-plugins/notification/src/index.ts | 2 +- server/mongo/src/storage.ts | 5 +---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/server-plugins/notification/src/index.ts b/server-plugins/notification/src/index.ts index b1062965ffa..221d3975444 100644 --- a/server-plugins/notification/src/index.ts +++ b/server-plugins/notification/src/index.ts @@ -76,7 +76,7 @@ export async function getEmployee (employee: Ref, control: TriggerCont { limit: 1 } ) )[0] - return account + return account !== undefined ? control.hierarchy.as(account, contact.mixin.Employee) : undefined } /** diff --git a/server/mongo/src/storage.ts b/server/mongo/src/storage.ts index 456ca9e4c5b..66798092392 100644 --- a/server/mongo/src/storage.ts +++ b/server/mongo/src/storage.ts @@ -562,10 +562,7 @@ abstract class MongoAdapterBase implements DbAdapter { cursor.maxAwaitTimeMS(30000) const res = await cursor.toArray() - const result = res.map((v) => { - return this.hierarchy.updateLookupMixin(_class, v, options) - }) - return toFindResult(result, total) + return toFindResult(res, total) } find (domain: Domain): StorageIterator {