@things-factory/product-base 3.7.13 → 3.8.3

package/server/{entities → service/product}/product.ts

@@ -1,3 +1,4 @@
+import { Field, Float, ID, ObjectType } from 'type-graphql'
 import {
   Column,
   CreateDateColumn,
@@ -6,6 +7,7 @@ import {
   ManyToOne,
   OneToMany,
   PrimaryGeneratedColumn,
+  RelationId,
   UpdateDateColumn
 } from 'typeorm'
 
@@ -13,7 +15,8 @@ import { User } from '@things-factory/auth-base'
 import { Bizplace } from '@things-factory/biz-base'
 import { Domain } from '@things-factory/shell'
 
-import { ProductDetail, ProductSet } from './'
+import { ProductDetail } from '../product-detail/product-detail'
+import { ProductSet } from '../product-set/product-set'
 
 @Entity()
 @Index(
@@ -22,248 +25,348 @@ import { ProductDetail, ProductSet } from './'
   { unique: true }
 )
 @Index('ix_product_1', (product: Product) => [product.bizplace])
+@ObjectType()
 export class Product {
   @PrimaryGeneratedColumn('uuid')
+  @Field(type => ID, { nullable: true })
   id: string
 
   @ManyToOne(type => Domain)
+  @Field()
   domain: Domain
 
+  @RelationId((product: Product) => product.domain)
+  domainId: string
+
   @ManyToOne(type => Bizplace)
+  @Field()
   bizplace: Bizplace
 
   @Column({ default: false })
+  @Field()
   isCompany: boolean
 
   @Column()
+  @Field({ nullable: true })
   sku: string
 
   @Column({ nullable: true })
+  @Field({ nullable: true })
   brandSku: string
 
   @Column({ nullable: true })
+  @Field({ nullable: true })
   brand: string
 
   @Column({ nullable: true })
+  @Field({ nullable: true })
   subBrand: string
 
   //// To be removed ////
   @Column({ nullable: true })
+  @Field({ nullable: true })
   gtin: string
 
   //// To be removed ////
   @Column({ nullable: true })
+  @Field({ nullable: true })
   caseGtin: string
 
-  @Column()
+  @Column({ nullable: true })
+  @Field({ nullable: true })
   name: string
 
   @Column()
+  @Field()
   type: string
 
   //// To be removed ////
   @Column({ nullable: true })
+  @Field({ nullable: true })
   packingType: string
 
   @Column({ nullable: true })
+  @Field({ nullable: true })
   description: string
 
   @OneToMany(type => ProductDetail, productDetails => productDetails.product, { nullable: true })
+  @Field(type => [ProductDetail], { nullable: true })
   productDetails: ProductDetail[]
 
   @ManyToOne(type => Product, { nullable: true })
+  @Field({ nullable: true })
   productRef: Product
 
   //// To be removed ////
   @ManyToOne(type => Product, { nullable: true })
+  @Field({ nullable: true })
   parentProductRef: Product
 
   //// To be removed ////
   @OneToMany(type => Product, product => product.parentProductRef, { nullable: true })
+  @Field(type => [Product], { nullable: true })
   childProducts: Product[]
 
   //// To be removed ////
   @Column('float', { nullable: true })
+  @Field({ nullable: true })
   bundleQty: number
 
   //// To be removed ////
   @Column({ nullable: true })
+  @Field({ nullable: true })
   expirationPeriod: number
 
   //// To be removed ////
   @Column({ nullable: true })
+  @Field({ nullable: true })
   weightUnit: string
 
   //// To be removed ////
   @Column('float', { nullable: true })
+  @Field({ nullable: true })
   weight: number
 
   //// To be removed ////
   @Column('float', { nullable: true })
+  @Field({ nullable: true })
   grossWeight: number
 
   //// To be removed ////
   @Column('float', { nullable: true })
+  @Field({ nullable: true })
   caseWeight: number
 
   //// To be removed ////
   @Column('float', { nullable: true })
+  @Field({ nullable: true })
   caseGrossWeight: number
 
   //// To be removed ////
   @Column('float', { nullable: true })
+  @Field({ nullable: true })
   density: number
 
   //// To be removed ////
   @Column({ nullable: true })
+  @Field({ nullable: true })
   lengthUnit: string
 
   //// To be removed ////
   @Column('float', { nullable: true })
+  @Field({ nullable: true })
   costPrice: number
 
   //// To be removed ////
   @Column('float', { nullable: true })
+  @Field({ nullable: true })
   mrpPrice: number
 
   //// To be removed ////
   @Column('float', { nullable: true })
+  @Field({ nullable: true })
   sellPrice: number
 
   //// To be removed ////
   @Column('float', { nullable: true })
+  @Field({ nullable: true })
   afterTaxCostPrice: number
 
   //// To be removed ////
   @Column('float', { nullable: true })
+  @Field({ nullable: true })
   afterTaxSalesPrice: number
 
   //// To be removed ////
   @Column('float', { nullable: true })
+  @Field({ nullable: true })
   width: number
 
   //// To be removed ////
   @Column('float', { nullable: true })
+  @Field({ nullable: true })
   depth: number
 
   //// To be removed ////
   @Column('float', { nullable: true })
+  @Field({ nullable: true })
   height: number
 
   //// To be removed ////
   @Column('float', { nullable: true })
+  @Field({ nullable: true })
   volume: number
 
   //// To be removed ////
   @Column('float', { nullable: true })
+  @Field({ nullable: true })
   caseWidth: number
 
   //// To be removed ////
   @Column('float', { nullable: true })
+  @Field({ nullable: true })
   caseDepth: number
 
   //// To be removed ////
   @Column('float', { nullable: true })
+  @Field({ nullable: true })
   caseHeight: number
 
   //// To be removed ////
   @Column('float', { nullable: true })
+  @Field({ nullable: true })
   caseVolume: number
 
   //// To be removed ////
   @Column({ nullable: true })
+  @Field({ nullable: true })
   volumeSize: string
 
   //// To be removed ////
   @Column({ nullable: true })
+  @Field({ nullable: true })
   primaryUnit: string
 
   //// To be removed ////
   @Column('float', { nullable: true })
+  @Field({ nullable: true })
   primaryValue: number
 
   //// To be removed ////
   @Column({ nullable: true })
+  @Field({ nullable: true })
   auxUnit1: string
 
   //// To be removed ////
   @Column({ nullable: true })
+  @Field({ nullable: true })
   auxValue1: string
 
   //// To be removed ////
   @Column({ nullable: true })
+  @Field({ nullable: true })
   auxUnit2: string
 
   //// To be removed ////
   @Column({ nullable: true })
+  @Field({ nullable: true })
   auxValue2: string
 
   //// To be removed ////
   @Column({ nullable: true })
+  @Field({ nullable: true })
   auxUnit3: string
 
   //// To be removed ////
   @Column({ nullable: true })
+  @Field({ nullable: true })
   auxValue3: string
 
   //// To be removed ////
   @Column({ nullable: true })
+  @Field({ nullable: true })
   inventoryAccountCode: string
 
   //// To be removed ////
   @Column({ nullable: true })
+  @Field({ nullable: true })
   cogsAccountCode: string
 
   //// To be removed ////
   @ManyToOne(type => ProductSet, productSet => productSet.product, { nullable: true })
+  @Field({ nullable: true })
   productSet: ProductSet
 
   //// To be removed ////
   @Column({ nullable: true })
+  @Field({ nullable: true })
   movement: string
 
   //// To be removed ////
   @Column({ nullable: true })
+  @Field({ nullable: true })
   bufferQty: number
 
   //// To be removed ////
   @Column({ nullable: true })
+  @Field({ nullable: true })
   minQty: number
 
   //// To be removed ////
   @Column({ nullable: true })
+  @Field({ nullable: true })
   maxQty: number
 
   //// To be removed ////
   @Column({ nullable: true })
+  @Field({ nullable: true })
   discountId: number
 
   //// To be removed ////
   @Column({ nullable: true })
+  @Field({ nullable: true })
   status: string
 
   //// To be removed ////
   @Column({ nullable: true })
+  @Field({ nullable: true })
   isTrackedAsInventory: boolean
 
   @Column({ default: false })
+  @Field({ nullable: true })
   isRequiredCheckExpiry: boolean
 
   @Column({ default: false })
+  @Field({ nullable: true })
   isRequireSerialNumberScanning: boolean
 
   @Column({ nullable: true })
+  @Field({ nullable: true })
   deletedAt: Date
 
+  @Field({ nullable: true })
+  refCode: string
+
+  @Field(type => Float, { nullable: true })
+  nettWeight: number
+
+  @Field({ nullable: true })
+  uom: string
+
+  @Field(type => Float, { nullable: true })
+  uomValue: number
+
+  @Field({ nullable: true })
+  auxUnit4: string
+
+  @Field({ nullable: true })
+  auxValue4: string
+
+  @Field({ nullable: true })
+  auxUnit5: string
+
+  @Field({ nullable: true })
+  auxValue5: string
+
   @ManyToOne(type => User, { nullable: true })
+  @Field({ nullable: true })
   creator: User
 
+  @RelationId((product: Product) => product.creator)
+  creatorId: string
+
   @ManyToOne(type => User, { nullable: true })
+  @Field({ nullable: true })
   updater: User
 
+  @RelationId((product: Product) => product.updater)
+  updaterId: string
+
   @CreateDateColumn()
+  @Field({ nullable: true })
   createdAt: Date
 
   @UpdateDateColumn()
+  @Field({ nullable: true })
   updatedAt: Date
 }

package/server/{graphql/resolvers → service}/product/validate-product.ts

@@ -4,7 +4,7 @@ import { EntityManager, IsNull, Not } from 'typeorm'
 import { User } from '@things-factory/auth-base'
 import { Domain } from '@things-factory/shell'
 
-import { Product } from '../../../entities'
+import { Product } from './product'
 
 export async function validateProduct(product: Product, context: any) {
   const { tx }: { domain: Domain; user: User; tx: EntityManager } = context.state

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

@@ -0,0 +1,6 @@
+import { ProductBundle } from './product-bundle'
+import { ProductBundleMutation } from './product-bundle-mutation'
+import { ProductBundleQuery } from './product-bundle-query'
+
+export const entities = [ProductBundle]
+export const resolvers = [ProductBundleQuery, ProductBundleMutation]

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

@@ -0,0 +1,137 @@
+import { Arg, Ctx, Mutation, Resolver } from 'type-graphql'
+import { EntityManager, getRepository, In, Repository } from 'typeorm'
+
+import { User } from '@things-factory/auth-base'
+import { Bizplace } from '@things-factory/biz-base'
+
+import { PRODUCT_BUNDLE_STATUS } from '../../constants'
+import { ProductBundle } from './product-bundle'
+import { NewProductBundle, ProductBundlePatch } from './product-bundle-types'
+
+@Resolver(ProductBundle)
+export class ProductBundleMutation {
+  @Mutation(returns => ProductBundle)
+  async createProductBundle(
+    @Arg('productBundle') productBundle: NewProductBundle,
+    @Ctx() context: any
+  ): Promise<ProductBundle> {
+    const { domain, user } = context.state
+
+    return await getRepository(ProductBundle).save({
+      ...productBundle,
+      domain,
+      creator: user,
+      updater: user
+    })
+  }
+
+  @Mutation(returns => ProductBundle)
+  async updateProductBundle(
+    @Arg('name') name: string,
+    @Arg('patch') patch: ProductBundlePatch,
+    @Ctx() context: any
+  ): Promise<ProductBundle> {
+    const { domain, user } = context.state
+
+    const repository = getRepository(ProductBundle)
+    const productBundle = await repository.findOne({
+      where: { domain, name }
+    })
+
+    return await repository.save({
+      ...productBundle,
+      ...patch,
+      updater: user
+    })
+  }
+
+  @Mutation(returns => [ProductBundle])
+  async updateMultipleProductBundle(
+    @Arg('patches', type => [ProductBundlePatch]) patches: ProductBundlePatch[],
+    @Ctx() context: any
+  ): Promise<ProductBundle[]> {
+    const { domain, user } = context.state
+
+    let results = []
+    const _createRecords = patches.filter((patch: any) => patch.cuFlag.toUpperCase() === '+')
+    const _updateRecords = patches.filter((patch: any) => patch.cuFlag.toUpperCase() === 'M')
+    const productBundleRepo = getRepository(ProductBundle)
+    const bizplaceRepo = getRepository(Bizplace)
+
+    let bizplace: Bizplace
+
+    if (_createRecords.length > 0) {
+      for (let i = 0; i < _createRecords.length; i++) {
+        let newRecord = _createRecords[i]
+        let status = newRecord.status || ''
+
+        bizplace = await bizplaceRepo.findOne({ where: { name: domain.name } })
+
+        if (!newRecord.status || newRecord.status === '') {
+          newRecord.status = PRODUCT_BUNDLE_STATUS.INACTIVE
+        }
+
+        const result = await productBundleRepo.save({
+          ...newRecord,
+          domain,
+          bizplace,
+          status: newRecord.status.toUpperCase(),
+          creator: user,
+          updater: user
+        })
+
+        results.push({ ...result, cuFlag: '+' })
+      }
+    }
+
+    if (_updateRecords.length > 0) {
+      for (let i = 0; i < _updateRecords.length; i++) {
+        const newRecord = _updateRecords[i]
+        const productBundle = await productBundleRepo.findOne({ domain, id: newRecord.id })
+
+        if (newRecord.status) {
+          newRecord.status = newRecord.status.toUpperCase()
+        }
+
+        const result = await productBundleRepo.save({
+          ...productBundle,
+          ...newRecord,
+          updater: user
+        })
+
+        results.push({ ...result, cuFlag: 'M' })
+      }
+    }
+
+    return results
+  }
+
+  @Mutation(returns => Boolean)
+  async deleteProductBundle(@Arg('name') name: string, @Ctx() context: any): Promise<Boolean> {
+    const { domain, user } = context.state
+
+    await getRepository(ProductBundle).delete({ domain, name })
+
+    return true
+  }
+
+  @Mutation(returns => Boolean)
+  async deleteProductBundles(@Arg('ids', type => [String]) ids: string[], @Ctx() context: any): Promise<Boolean> {
+    const { tx, user }: { tx: EntityManager; user: User } = context.state
+    const productBundleRepo: Repository<ProductBundle> = getRepository(ProductBundle) || tx.getRepository(ProductBundle)
+
+    let productBundles = await productBundleRepo.find({ where: { id: In(ids) } })
+
+    for (let i = 0; i < productBundles.length; i++) {
+      const product = productBundles[i]
+
+      const result = await productBundleRepo.save({
+        ...product,
+        status: PRODUCT_BUNDLE_STATUS.DELETED,
+        updater: user
+      })
+    }
+
+    return true
+  }
+}

package/server/{graphql/resolvers/product-bundle/my-bizplace-product-bundles.ts → service/product-bundle/product-bundle-query.ts}

@@ -1,15 +1,19 @@
+import { Arg, Args, Ctx, FieldResolver, Query, Resolver, Root } from 'type-graphql'
 import { Brackets, getRepository, SelectQueryBuilder } from 'typeorm'
 
 import { User } from '@things-factory/auth-base'
-import { Bizplace, getCompanyBizplace } from '@things-factory/biz-base'
-import { buildCondition, buildQuery, Domain, ListParam } from '@things-factory/shell'
+import { Bizplace } from '@things-factory/biz-base'
+import { buildCondition, buildQuery, convertListParams, Domain, ListParam } from '@things-factory/shell'
 
-import { PRODUCT_BUNDLE_STATUS } from '../../../constants'
-import { ProductBundle } from '../../../entities'
+import { PRODUCT_BUNDLE_STATUS } from '../../constants'
+import { ProductBundle } from './product-bundle'
+import { ProductBundleList } from './product-bundle-types'
 
-export const myBizplaceProductBundles = {
-  async myBizplaceProductBundles(_: any, params: ListParam, context: any) {
-    const { domain, user }: { domain: Domain; user: User } = context.state
+@Resolver(ProductBundle)
+export class ProductBundleQuery {
+  @Query(returns => ProductBundleList)
+  async myBizplaceProductBundles(@Args() params: ListParam, @Ctx() context: any): Promise<ProductBundleList> {
+    const { domain }: { domain: Domain } = context.state
 
     const qb: SelectQueryBuilder<ProductBundle> = getRepository(ProductBundle).createQueryBuilder()
 
@@ -21,7 +25,6 @@ export const myBizplaceProductBundles = {
     filters = [...filters, { name: 'status', operator: 'noteq', value: PRODUCT_BUNDLE_STATUS.DELETED }]
 
     if (!params.filters.find(filter => filter.name === 'bizplace_id')) {
-      const companyBizplace: Bizplace = await getCompanyBizplace(domain, user)
       let bizplace: Bizplace = await getRepository(Bizplace).findOne({ where: { domain } })
       params.filters = [...filters, { name: 'bizplace_id', operator: 'in', value: [bizplace.id] }]
     }
@@ -57,4 +60,39 @@ export const myBizplaceProductBundles = {
 
     return { items, total }
   }
+
+  @Query(returns => ProductBundleList)
+  async productBundles(@Args() params: ListParam, @Ctx() context: any): Promise<ProductBundleList> {
+    const convertedParams = convertListParams(params)
+    const [items, total] = await getRepository(ProductBundle).findAndCount({
+      ...convertedParams
+    })
+
+    return { items, total }
+  }
+
+  @Query(returns => ProductBundle)
+  async productBundle(@Arg('name') name: string, @Ctx() context: any): Promise<ProductBundle> {
+    const { domain, user } = context.state
+    const repository = getRepository(ProductBundle)
+
+    return await repository.findOne({
+      where: { domain, name }
+    })
+  }
+
+  @FieldResolver(type => Domain)
+  async domain(@Root() productBundle: ProductBundle): Promise<Domain> {
+    return await getRepository(Domain).findOne(productBundle.domainId)
+  }
+
+  @FieldResolver(type => User)
+  async creator(@Root() productBundle: ProductBundle): Promise<User> {
+    return await getRepository(User).findOne(productBundle.creatorId)
+  }
+
+  @FieldResolver(type => User)
+  async updater(@Root() productBundle: ProductBundle): Promise<User> {
+    return await getRepository(User).findOne(productBundle.updaterId)
+  }
 }

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

@@ -0,0 +1,51 @@
+import { Field, InputType, Int, ObjectType } from 'type-graphql'
+
+import { ProductBundle } from './product-bundle'
+
+@InputType()
+export class NewProductBundle {
+  @Field()
+  name: string
+
+  @Field({ nullable: true })
+  description?: string
+}
+
+@ObjectType()
+export class ProductBundleList {
+  @Field(type => [ProductBundle], { nullable: true })
+  items?: ProductBundle[]
+
+  @Field(type => Int, { nullable: true })
+  total?: number
+}
+
+@InputType()
+export class ProductBundlePatch {
+  @Field({ nullable: true })
+  id?: string
+
+  @Field({ nullable: true })
+  sku?: string
+
+  @Field({ nullable: true })
+  name?: string
+
+  @Field({ nullable: true })
+  description?: string
+
+  @Field({ nullable: true })
+  refCode?: string
+
+  @Field({ nullable: true })
+  type?: string
+
+  @Field({ nullable: true })
+  status?: string
+
+  @Field({ nullable: true })
+  packingType?: string
+
+  @Field({ nullable: true })
+  cuFlag?: string
+}