fix(Attribute): add entity ref value

wmakeev · Jul 29, 2022 · 1c870e0 · 1c870e0
1 parent 2c0b047
commit 1c870e0
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 6 deletions.
diff --git a/src/model/Attribute.ts b/src/model/Attribute.ts
@@ -3,6 +3,9 @@ import type { Entity } from './Entity'
 import type { EntityPatchRef, EntityRef } from './EntityRef'
 import type { MediaType } from './MediaType'
 
+// TODO Надо отказываться от Enum (нельзя использовать просто строки там где
+// в типе указан Enum) #djbqpgnsda
+
 export enum AttributeType {
   // Base type
   String = 'string',
@@ -98,9 +101,9 @@ export type AttributePatch<T extends AttributeType = AttributeType> =
       } | null
     }
 
-  : T extends AttributeType.CustomEntity
+  : T extends EntityRefAttributeType
     ? EntityPatchRef<'attributemetadata'> & {
-      value: EntityRef<'customentity'>
+      value: EntityRef<T>
     }
 
   : EntityPatchRef<'attributemetadata'> & NullablePartial<Pick<Attribute<T>, 'value'>>
diff --git a/test/model/attributes.test-d.ts b/test/model/attributes.test-d.ts
@@ -33,3 +33,16 @@ if ('file' in t11_1) {
 
   expectType<null>({} as any as Extract<typeof t11_1['file'], null>)
 }
+
+const t12_1: AttributePatch = {
+  meta: {
+    type: 'attributemetadata',
+    href: ''
+  },
+  value: {
+    meta: {
+      type: AttributeType.Store, // TODO Отказаться от Enum (нельзя указать просто "store") #djbqpgnsda
+      href: ''
+    }
+  }
+}
diff --git a/test/model/common.test.ts b/test/model/common.test.ts
@@ -1,4 +1,9 @@
-import type { EntityRef, Patch, PrefilledDocument } from '../../src'
+import type {
+  AttributeType,
+  EntityRef,
+  Patch,
+  PrefilledDocument
+} from '../../src'
 import { testTypeEqual } from '../tools'
 
 const customerorder: Patch<'customerorder'> = {}
@@ -14,7 +19,7 @@ invoiceOut.paymentPlannedMoment
 
 //#region
 const t10_1 = {} as EntityRef<'attributemetadata'> & {
-  value: EntityRef<'customentity'>
+  value: EntityRef<AttributeType.CustomEntity>
 }
 
 const t10_2: Patch<'customerorder'> = {

diff --git a/test/model/utils/Patch.test.ts b/test/model/utils/Patch.test.ts
@@ -1,4 +1,4 @@
-import type {
+import {
   Attribute,
   AttributeType,
   CustomerOrder,
@@ -135,7 +135,12 @@ t1.attributes = [
       href: ''
     },
     // foo: '', // #dhg06qfl
-    value: { meta: { type: 'customentity', href: '' } }
+    value: {
+      meta: {
+        type: AttributeType.CustomEntity,
+        href: ''
+      }
+    }
   }
 ]
 //#endregion