@things-factory/product-base 8.0.2 → 8.0.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/product-base",
-  "version": "8.0.2",
+  "version": "8.0.6",
   "main": "dist-server/index.js",
   "browser": "client/index.js",
   "things-factory": true,
@@ -24,9 +24,9 @@
     "migration:create": "node ../../node_modules/typeorm/cli.js migration:create ./server/migrations/migration"
   },
   "dependencies": {
-    "@things-factory/biz-base": "^8.0.2",
+    "@things-factory/biz-base": "^8.0.6",
     "@things-factory/env": "^8.0.2",
-    "@things-factory/routing-base": "^8.0.2"
+    "@things-factory/routing-base": "^8.0.5"
   },
-  "gitHead": "39d60f56e142561233ddf6d47b539c637971357c"
+  "gitHead": "89abb01bba2376bc5f074e0bc0088e32188d0396"
 }

package/server/service/product/product-query.ts

@@ -119,6 +119,8 @@ export class ProductQuery {
       let [items, total] = await qb
         .leftJoinAndSelect('Product.productDetails', 'ProductDetails')
         .leftJoinAndSelect('Product.routing', 'Routing')
+        .leftJoinAndSelect('Product.deliverTo', 'deliverTo')
+        .leftJoinAndSelect('Product.manufacturedBy', 'manufacturedBy')
         .getManyAndCount()
 
       items = items.map(itm => {

package/server/service/product/product-types.ts

@@ -220,6 +220,12 @@ export class NewProduct {
   // 바코드
   @Field({ nullable: true })
   barcode?: string
+
+  @Field(type => ObjectRef, { nullable: true })
+  deliverTo?: ObjectRef
+
+  @Field(type => ObjectRef, { nullable: true })
+  manufacturedBy?: ObjectRef
 }
 
 @ObjectType()
@@ -453,6 +459,12 @@ export class ProductPatch {
   @Field({ nullable: true })
   barcode?: string
 
+  @Field(type => ObjectRef, { nullable: true })
+  deliverTo?: ObjectRef
+
+  @Field(type => ObjectRef, { nullable: true })
+  manufacturedBy?: ObjectRef
+
   @Field({ nullable: true })
   cuFlag?: string
 }

package/server/service/product/product.ts

@@ -12,7 +12,7 @@ import {
 } from 'typeorm'
 
 import { User } from '@things-factory/auth-base'
-import { Bizplace } from '@things-factory/biz-base'
+import { Bizplace, ContactPoint } from '@things-factory/biz-base'
 import { config } from '@things-factory/env'
 import { Routing } from '@things-factory/routing-base'
 import { Domain, roundTransformer } from '@things-factory/shell'
@@ -159,6 +159,20 @@ export class Product {
   @Field(type => [Product], { nullable: true })
   childProducts: Product[]
 
+  @ManyToOne(type => ContactPoint, { nullable: true })
+  @Field({ nullable: true })
+  deliverTo: ContactPoint
+
+  @RelationId((product: Product) => product.deliverTo)
+  deliverToId: string
+
+  @ManyToOne(type => ContactPoint, { nullable: true })
+  @Field({ nullable: true })
+  manufacturedBy: ContactPoint
+
+  @RelationId((product: Product) => product.manufacturedBy)
+  manufacturedById: string
+
   //// To be removed ////
   @Column('float', { nullable: true, transformer: roundTransformer })
   @Field({ nullable: true })