@things-factory/product-base 6.2.138 → 6.2.142

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/product-base",
-  "version": "6.2.138",
+  "version": "6.2.142",
   "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 -d ./server/migrations"
   },
   "dependencies": {
-    "@things-factory/biz-base": "^6.2.138",
-    "@things-factory/env": "^6.2.122",
-    "@things-factory/routing-base": "^6.2.138"
+    "@things-factory/biz-base": "^6.2.139",
+    "@things-factory/env": "^6.2.139",
+    "@things-factory/routing-base": "^6.2.139"
   },
-  "gitHead": "b3a06b97cb5c24cc44ea35f0dd3dde4971fa1a5a"
+  "gitHead": "78bb2ad1a9d851be0c6ea0e176ccbab61c3b6cc8"
 }

package/server/service/product/product.ts

@@ -5,7 +5,7 @@ import { User } from '@things-factory/auth-base'
 import { Bizplace } from '@things-factory/biz-base'
 import { config } from '@things-factory/env'
 import { Routing } from '@things-factory/routing-base'
-import { Domain } from '@things-factory/shell'
+import { Domain, roundTransformer } from '@things-factory/shell'
 
 import { ProductDetail } from '../product-detail/product-detail'
 import { ProductSet } from '../product-set/product-set'
@@ -22,11 +22,7 @@ export enum pickStrategy {
 }
 
 @Entity()
-@Index(
-  'ix_product_0',
-  (product: Product) => [product.domain, product.bizplace, product.name, product.description, product.weight],
-  { unique: true }
-)
+@Index('ix_product_0', (product: Product) => [product.domain, product.bizplace, product.name, product.description, product.weight], { unique: true })
 @Index('ix_product_1', (product: Product) => [product.bizplace])
 @ObjectType()
 export class Product {
@@ -80,12 +76,12 @@ export class Product {
   inboundUnit?: string
 
   // 변환 kg
-  @Column('float', { nullable: true, default: 1 })
+  @Column('float', { nullable: true, default: 1, transformer: roundTransformer })
   @Field({ nullable: true })
   convertWeight?: number
 
   // 박스입수
-  @Column('float', { nullable: true, default: 0 })
+  @Column('float', { nullable: true, default: 0, transformer: roundTransformer })
   @Field({ nullable: true })
   boxInQty?: number
 
@@ -145,7 +141,7 @@ export class Product {
   childProducts: Product[]
 
   //// To be removed ////
-  @Column('float', { nullable: true })
+  @Column('float', { nullable: true, transformer: roundTransformer })
   @Field({ nullable: true })
   bundleQty: number
 
@@ -160,27 +156,27 @@ export class Product {
   weightUnit: string
 
   //// To be removed ////
-  @Column('float', { nullable: true })
+  @Column('float', { nullable: true, transformer: roundTransformer })
   @Field({ nullable: true })
   weight: number
 
   //// To be removed ////
-  @Column('float', { nullable: true })
+  @Column('float', { nullable: true, transformer: roundTransformer })
   @Field({ nullable: true })
   grossWeight: number
 
   //// To be removed ////
-  @Column('float', { nullable: true })
+  @Column('float', { nullable: true, transformer: roundTransformer })
   @Field({ nullable: true })
   caseWeight: number
 
   //// To be removed ////
-  @Column('float', { nullable: true })
+  @Column('float', { nullable: true, transformer: roundTransformer })
   @Field({ nullable: true })
   caseGrossWeight: number
 
   //// To be removed ////
-  @Column('float', { nullable: true })
+  @Column('float', { nullable: true, transformer: roundTransformer })
   @Field({ nullable: true })
   density: number
 
@@ -190,67 +186,67 @@ export class Product {
   lengthUnit: string
 
   //// To be removed ////
-  @Column('float', { nullable: true })
+  @Column('float', { nullable: true, transformer: roundTransformer })
   @Field({ nullable: true })
   costPrice: number
 
   //// To be removed ////
-  @Column('float', { nullable: true })
+  @Column('float', { nullable: true, transformer: roundTransformer })
   @Field({ nullable: true })
   mrpPrice: number
 
   //// To be removed ////
-  @Column('float', { nullable: true })
+  @Column('float', { nullable: true, transformer: roundTransformer })
   @Field({ nullable: true })
   sellPrice: number
 
   //// To be removed ////
-  @Column('float', { nullable: true })
+  @Column('float', { nullable: true, transformer: roundTransformer })
   @Field({ nullable: true })
   afterTaxCostPrice: number
 
   //// To be removed ////
-  @Column('float', { nullable: true })
+  @Column('float', { nullable: true, transformer: roundTransformer })
   @Field({ nullable: true })
   afterTaxSalesPrice: number
 
   //// To be removed ////
-  @Column('float', { nullable: true })
+  @Column('float', { nullable: true, transformer: roundTransformer })
   @Field({ nullable: true })
   width: number
 
   //// To be removed ////
-  @Column('float', { nullable: true })
+  @Column('float', { nullable: true, transformer: roundTransformer })
   @Field({ nullable: true })
   depth: number
 
   //// To be removed ////
-  @Column('float', { nullable: true })
+  @Column('float', { nullable: true, transformer: roundTransformer })
   @Field({ nullable: true })
   height: number
 
   //// To be removed ////
-  @Column('float', { nullable: true })
+  @Column('float', { nullable: true, transformer: roundTransformer })
   @Field({ nullable: true })
   volume: number
 
   //// To be removed ////
-  @Column('float', { nullable: true })
+  @Column('float', { nullable: true, transformer: roundTransformer })
   @Field({ nullable: true })
   caseWidth: number
 
   //// To be removed ////
-  @Column('float', { nullable: true })
+  @Column('float', { nullable: true, transformer: roundTransformer })
   @Field({ nullable: true })
   caseDepth: number
 
   //// To be removed ////
-  @Column('float', { nullable: true })
+  @Column('float', { nullable: true, transformer: roundTransformer })
   @Field({ nullable: true })
   caseHeight: number
 
   //// To be removed ////
-  @Column('float', { nullable: true })
+  @Column('float', { nullable: true, transformer: roundTransformer })
   @Field({ nullable: true })
   caseVolume: number
 
@@ -265,7 +261,7 @@ export class Product {
   primaryUnit: string
 
   //// To be removed ////
-  @Column('float', { nullable: true })
+  @Column('float', { nullable: true, transformer: roundTransformer })
   @Field({ nullable: true })
   primaryValue: number
 
@@ -325,7 +321,7 @@ export class Product {
   bufferQty: number
 
   //// To be removed ////
-  @Column('float', { nullable: true })
+  @Column('float', { nullable: true, transformer: roundTransformer })
   @Field({ nullable: true })
   minQty: number
 
@@ -371,12 +367,7 @@ export class Product {
 
   @Column({
     nullable: false,
-    type:
-      DATABASE_TYPE == 'postgres' || DATABASE_TYPE == 'mysql' || DATABASE_TYPE == 'mariadb'
-        ? 'enum'
-        : DATABASE_TYPE == 'oracle'
-        ? 'varchar2'
-        : 'smallint',
+    type: DATABASE_TYPE == 'postgres' || DATABASE_TYPE == 'mysql' || DATABASE_TYPE == 'mariadb' ? 'enum' : DATABASE_TYPE == 'oracle' ? 'varchar2' : 'smallint',
     enum: pickStrategy,
     default: pickStrategy.FIFO
   })

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

@@ -1,18 +1,8 @@
 import { User } from '@things-factory/auth-base'
 import { Bizplace } from '@things-factory/biz-base'
-import { Domain } from '@things-factory/shell'
+import { Domain, roundTransformer } from '@things-factory/shell'
 import { Field, ID, ObjectType } from 'type-graphql'
-import {
-  Column,
-  CreateDateColumn,
-  Entity,
-  Index,
-  ManyToOne,
-  OneToMany,
-  PrimaryGeneratedColumn,
-  RelationId,
-  UpdateDateColumn
-} from 'typeorm'
+import { Column, CreateDateColumn, Entity, Index, ManyToOne, OneToMany, PrimaryGeneratedColumn, RelationId, UpdateDateColumn } from 'typeorm'
 import { ProductBundleSetting } from '../product-bundle-setting/product-bundle-setting'
 
 @Entity()
@@ -70,7 +60,7 @@ export class ProductBundle {
   @Field()
   packingType: string
 
-  @Column({ type: 'float', default: 1 })
+  @Column({ type: 'float', default: 1, transformer: roundTransformer })
   @Field()
   packingSize: number
 

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

@@ -2,7 +2,7 @@ import { Field, Float, ID, ObjectType } from 'type-graphql'
 import { Column, CreateDateColumn, Entity, Index, ManyToOne, OneToMany, PrimaryGeneratedColumn, RelationId, UpdateDateColumn } from 'typeorm'
 
 import { User } from '@things-factory/auth-base'
-import { Domain } from '@things-factory/shell'
+import { Domain, roundTransformer } from '@things-factory/shell'
 
 import { ProductDetailBizplaceSetting } from '../product-detail-bizplace-setting/product-detail-bizplace-setting'
 import { Product } from '../product/product'
@@ -61,11 +61,7 @@ import { Product } from '../product/product'
  **/
 
 @Entity()
-@Index(
-  'ix_product_detail_0',
-  (productDetail: ProductDetail) => [productDetail.domain, productDetail.gtin, productDetail.product],
-  { unique: true }
-)
+@Index('ix_product_detail_0', (productDetail: ProductDetail) => [productDetail.domain, productDetail.gtin, productDetail.product], { unique: true })
 @Index('ix_product_detail_1', (productDetail: ProductDetail) => [productDetail.product])
 @Index('ix_product_detail_2', (productDetail: ProductDetail) => [productDetail.domain, productDetail.refCode], {
   unique: true
@@ -159,7 +155,7 @@ export class ProductDetail {
   @Field()
   packingType: string
 
-  @Column('float', { default: 1 })
+  @Column('float', { default: 1, transformer: roundTransformer })
   @Field()
   packingSize: number
 
@@ -171,7 +167,7 @@ export class ProductDetail {
   @Field()
   uom: string
 
-  @Column('float')
+  @Column('float', { transformer: roundTransformer })
   @Field()
   uomValue: number
 
@@ -183,15 +179,11 @@ export class ProductDetail {
   @Field(type => [ProductDetail], { nullable: true })
   parentProductDetails: ProductDetail[]
 
-  @OneToMany(
-    type => ProductDetailBizplaceSetting,
-    productDetailBizplaceSetting => productDetailBizplaceSetting.productDetail,
-    { nullable: true }
-  )
+  @OneToMany(type => ProductDetailBizplaceSetting, productDetailBizplaceSetting => productDetailBizplaceSetting.productDetail, { nullable: true })
   @Field(type => [ProductDetailBizplaceSetting], { nullable: true })
   productDetailBizplaceSettings: ProductDetailBizplaceSetting[]
 
-  @Column('float', { nullable: true })
+  @Column('float', { nullable: true, transformer: roundTransformer })
   @Field({ nullable: true })
   childQty: number
 
@@ -199,11 +191,11 @@ export class ProductDetail {
   @Field({ nullable: true })
   weightUnit: string
 
-  @Column('float', { nullable: true })
+  @Column('float', { nullable: true, transformer: roundTransformer })
   @Field({ nullable: true })
   nettWeight: number
 
-  @Column('float', { nullable: true })
+  @Column('float', { nullable: true, transformer: roundTransformer })
   @Field({ nullable: true })
   grossWeight: number
 
@@ -211,19 +203,19 @@ export class ProductDetail {
   @Field({ nullable: true })
   lengthUnit: string
 
-  @Column('float', { nullable: true })
+  @Column('float', { nullable: true, transformer: roundTransformer })
   @Field({ nullable: true })
   width: number
 
-  @Column('float', { nullable: true })
+  @Column('float', { nullable: true, transformer: roundTransformer })
   @Field({ nullable: true })
   depth: number
 
-  @Column('float', { nullable: true })
+  @Column('float', { nullable: true, transformer: roundTransformer })
   @Field({ nullable: true })
   height: number
 
-  @Column('float', { nullable: true })
+  @Column('float', { nullable: true, transformer: roundTransformer })
   @Field({ nullable: true })
   volume: number
 
@@ -231,7 +223,7 @@ export class ProductDetail {
   @Field()
   bufferQty: number
 
-  @Column('float', { default: 0 })
+  @Column('float', { default: 0, transformer: roundTransformer })
   @Field()
   minQty: number
 
@@ -305,27 +297,27 @@ export class ProductDetail {
   discountId: number
 
   //// For Accounting Integration ////
-  @Column('float', { nullable: true })
+  @Column('float', { nullable: true, transformer: roundTransformer })
   @Field({ nullable: true })
   costPrice: number
 
   //// For Accounting Integration ////
-  @Column('float', { nullable: true })
+  @Column('float', { nullable: true, transformer: roundTransformer })
   @Field({ nullable: true })
   mrpPrice: number
 
   //// For Accounting Integration ////
-  @Column('float', { nullable: true })
+  @Column('float', { nullable: true, transformer: roundTransformer })
   @Field({ nullable: true })
   sellPrice: number
 
   //// For Accounting Integration ////
-  @Column('float', { nullable: true })
+  @Column('float', { nullable: true, transformer: roundTransformer })
   @Field({ nullable: true })
   afterTaxCostPrice: number
 
   //// For Accounting Integration ////
-  @Column('float', { nullable: true })
+  @Column('float', { nullable: true, transformer: roundTransformer })
   @Field({ nullable: true })
   afterTaxSalesPrice: number
 

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

@@ -2,7 +2,7 @@ import { Field, ID, ObjectType } from 'type-graphql'
 import { Column, CreateDateColumn, Entity, Index, ManyToOne, PrimaryGeneratedColumn, RelationId, UpdateDateColumn } from 'typeorm'
 
 import { User } from '@things-factory/auth-base'
-import { Domain } from '@things-factory/shell'
+import { Domain, roundTransformer } from '@things-factory/shell'
 
 import { ProductDetail } from '../product-detail/product-detail'
 
@@ -24,10 +24,7 @@ import { ProductDetail } from '../product-detail/product-detail'
 @Entity()
 @Index(
   'ix_product_detail_bizplace_setting_0',
-  (productDetailBizplaceSetting: ProductDetailBizplaceSetting) => [
-    productDetailBizplaceSetting.domain,
-    productDetailBizplaceSetting.productDetail
-  ],
+  (productDetailBizplaceSetting: ProductDetailBizplaceSetting) => [productDetailBizplaceSetting.domain, productDetailBizplaceSetting.productDetail],
   { unique: true }
 )
 @ObjectType()
@@ -59,7 +56,7 @@ export class ProductDetailBizplaceSetting {
   @Field()
   bufferQty: number
 
-  @Column('float', { default: 0 })
+  @Column('float', { default: 0, transformer: roundTransformer })
   @Field()
   minQty: number