@things-factory/product-base 4.3.131 → 4.3.142

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

@@ -13,6 +13,7 @@ import {
   UpdateDateColumn
 } from 'typeorm'
 import { ProductDetailBizplaceSetting } from '../product-detail-bizplace-setting/product-detail-bizplace-setting'
+import { ProductBarcode } from '../product-barcode/product-barcode'
 import { Product } from '../product/product'
 
 /**
@@ -147,8 +148,8 @@ export class ProductDetail {
   @Field()
   name: string
 
-  @Column()
-  @Field()
+  @Column({ nullable: true })
+  @Field({ nullable: true })
   gtin: string
 
   @Column({ nullable: true })
@@ -199,6 +200,10 @@ export class ProductDetail {
   @Field(type => [ProductDetailBizplaceSetting], { nullable: true })
   productDetailBizplaceSettings: ProductDetailBizplaceSetting[]
 
+  @OneToMany(type => ProductBarcode, productBarcodes => productBarcodes.productDetail, { nullable: true })
+  @Field(type => [ProductBarcode], { nullable: true })
+  productBarcodes: ProductBarcode[]
+
   @Column('float', { nullable: true })
   @Field({ nullable: true })
   childQty: number

package/server/service/product-detail-bizplace-setting/product-detail-bizplace-setting-mutation.ts

@@ -47,12 +47,14 @@ export class ProductDetailBizplaceSettingMutation {
         const newRecord = _createRecords[i]
         delete newRecord.id
 
-        const productDetail = await tx.getRepository(ProductDetail).findOne(newRecord.productDetail.id)
+        const productDetail = await tx
+          .getRepository(ProductDetail)
+          .findOne({ where: { id: newRecord.productDetail.id }, relations: ['productBarcodes'] })
 
         if (productDetail) {
           const result = await productDetailBizplaceSettingRepo.save({
             ...newRecord,
-            name: productDetail.gtin,
+            name: productDetail.productBarcodes[0].gtin,
             productDetail,
             domain: domain,
             creator: user,
@@ -70,12 +72,14 @@ export class ProductDetailBizplaceSettingMutation {
           domain,
           id: newRecord.id
         })
-        const productDetail = await tx.getRepository(ProductDetail).findOne(newRecord.productDetail.id)
+        const productDetail = await tx
+          .getRepository(ProductDetail)
+          .findOne({ where: { id: newRecord.productDetail.id }, relations: ['productBarcodes'] })
 
         const result = await productDetailBizplaceSettingRepo.save({
           ...productDetailBizplaceSetting,
           ...newRecord,
-          name: productDetail.gtin,
+          name: productDetail.productBarocdes[0].gtin,
           productDetail,
           updater: user
         })