From 78b1d38340fcb5dd69a36f10c9a0a0c5af746764 Mon Sep 17 00:00:00 2001
From: Denis Bykhov <80476319+BykhovDenis@users.noreply.github.com>
Date: Mon, 28 Mar 2022 14:04:22 +0600
Subject: [PATCH] 1105 fix (#1207)

Signed-off-by: Denis Bykhov <80476319+BykhovDenis@users.noreply.github.com>
---
 packages/core/src/tx.ts                    | 6 +++---
 packages/query/src/__tests__/query.test.ts | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/packages/core/src/tx.ts b/packages/core/src/tx.ts
index 0aef96dabc..2f87726fb1 100644
--- a/packages/core/src/tx.ts
+++ b/packages/core/src/tx.ts
@@ -229,12 +229,12 @@ export abstract class TxProcessor implements WithTx {
   static createDoc2Doc<T extends Doc>(tx: TxCreateDoc<T>): T {
     // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
     return {
+      ...tx.attributes,
       _id: tx.objectId,
       _class: tx.objectClass,
       space: tx.objectSpace,
       modifiedBy: tx.modifiedBy,
-      modifiedOn: tx.modifiedOn,
-      ...tx.attributes
+      modifiedOn: tx.modifiedOn
     } as T
   }
 
@@ -415,7 +415,7 @@ export class TxFactory {
       objectClass,
       objectSpace,
       mixin,
-      attributes: attributes
+      attributes
     }
   }
 
diff --git a/packages/query/src/__tests__/query.test.ts b/packages/query/src/__tests__/query.test.ts
index 7a48a2d239..33a42bc9ab 100644
--- a/packages/query/src/__tests__/query.test.ts
+++ b/packages/query/src/__tests__/query.test.ts
@@ -386,7 +386,7 @@ describe('query', () => {
           const comment = result[0]
           if (comment !== undefined) {
             if (attempt > 0) {
-              expect((comment as WithLookup<AttachedComment>).$lookup?.space).toEqual(futureSpace)
+              expect((comment as WithLookup<AttachedComment>).$lookup?.space?._id).toEqual(futureSpace._id)
               resolve(null)
             } else {
               expect((comment as WithLookup<AttachedComment>).$lookup?.space).toBeUndefined()
@@ -433,7 +433,7 @@ describe('query', () => {
           const comment = result[0]
           if (comment !== undefined) {
             if (attempt > 0) {
-              expect(((comment as WithLookup<AttachedComment>).$lookup?.attachedTo as WithLookup<AttachedComment>)?.$lookup?.space).toEqual(futureSpace)
+              expect(((comment as WithLookup<AttachedComment>).$lookup?.attachedTo as WithLookup<AttachedComment>)?.$lookup?.space?._id).toEqual(futureSpace._id)
               resolve(null)
             } else {
               expect(((comment as WithLookup<AttachedComment>).$lookup?.attachedTo as WithLookup<AttachedComment>)?.$lookup?.space).toBeUndefined()