@things-factory/sales-base 5.0.13 → 6.0.0-alpha.1

package/server/service/others/other-query.ts

@@ -24,10 +24,10 @@ export class OtherQuery {
   @Directive('@transaction')
   @Query(returns => InventoryProductGroupList)
   async allBizplaceProductInventory(
-    @Ctx() context: any,
+    @Ctx() context: ResolverContext,
     @Args() params: ListParam
   ): Promise<InventoryProductGroupList> {
-    const { domain, user, tx, bizplace }: { domain: Domain; user: User; tx: EntityManager; bizplace: Bizplace } =
+    const { domain, user, tx, bizplace }: { domain: Domain; user: User; tx: EntityManager; bizplace?: Bizplace } =
       context.state
 
     let permittedBizplaces: Bizplace[] = await getPermittedBizplaces(domain, user)
@@ -41,7 +41,8 @@ export class OtherQuery {
 
       if (foundPermittedBizplace) {
         if (!foundPermittedBizplace.company?.id) {
-          foundPermittedBizplace = await tx.getRepository(Bizplace).findOne(foundPermittedBizplace.id, {
+          foundPermittedBizplace = await tx.getRepository(Bizplace).findOne({
+            where: { id: foundPermittedBizplace.id },
             relations: ['company', 'company.domain']
           })
         }
@@ -61,8 +62,11 @@ export class OtherQuery {
   @Directive('@privilege(category: "inventory", privilege: "query")')
   @Directive('@transaction')
   @Query(returns => InventoryProductGroupList)
-  async inventoryProductGroup(@Ctx() context: any, @Args() params: ListParam): Promise<InventoryProductGroupList> {
-    const { domain, user, tx, bizplace }: { domain: Domain; user: User; tx: EntityManager; bizplace: Bizplace } =
+  async inventoryProductGroup(
+    @Ctx() context: ResolverContext,
+    @Args() params: ListParam
+  ): Promise<InventoryProductGroupList> {
+    const { domain, user, tx, bizplace }: { domain: Domain; user: User; tx: EntityManager; bizplace?: Bizplace } =
       context.state
 
     let permittedBizplaces: Bizplace[] = await getPermittedBizplaces(domain, user)
@@ -76,7 +80,8 @@ export class OtherQuery {
 
       if (foundPermittedBizplace) {
         if (!foundPermittedBizplace.company?.id) {
-          foundPermittedBizplace = await tx.getRepository(Bizplace).findOne(foundPermittedBizplace.id, {
+          foundPermittedBizplace = await tx.getRepository(Bizplace).findOne({
+            where: { id: foundPermittedBizplace.id },
             relations: ['company', 'company.domain']
           })
         }
@@ -96,10 +101,10 @@ export class OtherQuery {
   @Directive('@transaction')
   @Query(returns => InventoryProductGroupList)
   async inventoryProductGroupOpenAPI(
-    @Ctx() context: any,
+    @Ctx() context: ResolverContext,
     @Args() params: ListParam
   ): Promise<InventoryProductGroupList> {
-    const { domain, user, tx, bizplace }: { domain: Domain; user: User; tx: EntityManager; bizplace: Bizplace } =
+    const { domain, user, tx, bizplace }: { domain: Domain; user: User; tx: EntityManager; bizplace?: Bizplace } =
       context.state
 
     let permittedBizplaces: Bizplace[] = await getPermittedBizplaces(domain, user)
@@ -113,7 +118,8 @@ export class OtherQuery {
 
       if (foundPermittedBizplace) {
         if (!foundPermittedBizplace.company?.id) {
-          foundPermittedBizplace = await tx.getRepository(Bizplace).findOne(foundPermittedBizplace.id, {
+          foundPermittedBizplace = await tx.getRepository(Bizplace).findOne({
+            where: { id: foundPermittedBizplace.id },
             relations: ['company', 'company.domain']
           })
         }
@@ -134,11 +140,12 @@ export class OtherQuery {
   @Directive('@transaction')
   @Query(returns => [OrderInventory])
   async bulkUploadValidateWarehousePartnersProductsQuantity(
-    @Ctx() context: any,
+    @Ctx() context: ResolverContext,
     @Arg('partnerBizplaceId') partnerBizplaceId: string,
     @Arg('orderInventories', type => [NewOrderInventory], { nullable: true }) orderInventories?: NewOrderInventory[]
   ): Promise<OrderInventory[]> {
-    const { domain, user, tx, bizplace } = context.state
+    const { domain, user, tx, bizplace }: { domain: Domain; user: User; tx: EntityManager; bizplace?: Bizplace } =
+      context.state
 
     let permittedBizplaces: Bizplace[] = await getPermittedBizplaces(domain, user)
     let foundPermittedBizplace: Bizplace
@@ -156,7 +163,8 @@ export class OtherQuery {
 
       if (foundPermittedBizplace) {
         if (!foundPermittedBizplace.company?.id) {
-          foundPermittedBizplace = await tx.getRepository(Bizplace).findOne(foundPermittedBizplace.id, {
+          foundPermittedBizplace = await tx.getRepository(Bizplace).findOne({
+            where: { id: foundPermittedBizplace.id },
             relations: ['company', 'company.domain']
           })
         }
@@ -195,47 +203,59 @@ export class OtherQuery {
 
       const { items, total } = await InventoryUtil.bizplaceInventoryProductGroup(bizplaces, params, context, tx)
 
-      let packageUomValue = total > 0 ? items[0].remainUomValue / items[0].remainQty : null
+      // Filter to find for item with enough remain qty
+      const availableItems = items.filter(item => item.remainQty >= orderInventory.releaseQty)
+      let availableItem
 
+      if (availableItems.length > 0) {
+        availableItem = availableItems[0]
+      }
+
+      let packageUomValue = availableItem ? availableItem.remainUomValue / availableItem.remainQty : null
       const newOrderInventory: any = {
-        product:
-          total > 0 ? { id: items[0].productId, sku: items[0].productSKU, name: items[0].productName } : { id: null },
-        inventory:
-          total > 0
-            ? {
-                ...items[0],
-                remainQty: total > 0 ? items[0].remainQty : null,
-                remainUomValue: total > 0 ? items[0].remainUomValue : null,
-                remainUomValueWithUom: total > 0 ? items[0].remainUomValueWithUom : ''
-              }
-            : null,
-        productId: total > 0 ? items[0].productId : null,
-        productSKU: total > 0 ? items[0].productSKU : orderInventory.productSKU,
-        productName: total > 0 ? items[0].productName : null,
-        uom: total > 0 ? items[0].uom : null,
-        remainQty: total > 0 ? items[0].remainQty : null,
-        remainUomValue: total > 0 ? items[0].remainUomValue : null,
-        remainUomValueWithUom: total > 0 ? items[0].remainUomValueWithUom : '',
-        batchId: total > 0 ? items[0].batchId : null,
-        batchIdRef: total > 0 ? items[0].batchIdRef : null,
-        packingType: total > 0 ? items[0].packingType : orderInventory.packingType,
-        packingSize: total > 0 ? items[0].packingSize : 1,
+        product: availableItem
+          ? {
+              id: availableItem.productId,
+              sku: availableItem.productSKU,
+              name: availableItem.productName
+            }
+          : { id: null },
+        inventory: availableItem
+          ? {
+              ...availableItem,
+              remainQty: availableItem ? availableItem.remainQty : null,
+              remainUomValue: availableItem ? availableItem.remainUomValue : null,
+              remainUomValueWithUom: availableItem ? availableItem.remainUomValueWithUom : ''
+            }
+          : null,
+        productId: availableItem ? availableItem.productId : null,
+        productSKU: availableItem ? availableItem.productSKU : orderInventory.productSKU,
+        productName: availableItem ? availableItem.productName : null,
+        uom: availableItem ? availableItem.uom : null,
+        remainQty: availableItem ? availableItem.remainQty : null,
+        remainUomValue: availableItem ? availableItem.remainUomValue : null,
+        remainUomValueWithUom: availableItem ? availableItem.remainUomValueWithUom : '',
+        batchId: availableItem ? availableItem.batchId : null,
+        batchIdRef: availableItem ? availableItem.batchIdRef : null,
+        packingType: availableItem ? availableItem.packingType : orderInventory.packingType,
+        packingSize: availableItem ? availableItem.packingSize : 1,
         releaseQty: orderInventory.releaseQty
           ? Number.isInteger(orderInventory.releaseQty)
             ? orderInventory.releaseQty
             : null
           : null,
-        releaseUomValue:
-          total > 0
-            ? Number.isInteger(orderInventory.releaseQty)
-              ? parseFloat((orderInventory.releaseQty * packageUomValue).toFixed(2))
-              : null
-            : null,
-        groupType: total > 0 ? items[0].groupType : null,
-        isError: total <= 0 ? true : false
+        releaseUomValue: availableItem
+          ? Number.isInteger(orderInventory.releaseQty)
+            ? parseFloat((orderInventory.releaseQty * packageUomValue).toFixed(2))
+            : null
+          : null,
+        groupType: availableItem ? availableItem.groupType : null,
+        isError: !availableItem ? true : false
       }
 
       newOrderInventories.push(newOrderInventory)
+
+      // end loop
     }
 
     try {
@@ -280,11 +300,11 @@ export class OtherQuery {
   @Directive('@transaction')
   @Query(returns => [InventoryProductGroup])
   async bulkUploadValidateOrderProducts(
-    @Ctx() context: any,
+    @Ctx() context: ResolverContext,
     @Arg('partnerBizplaceId') partnerBizplaceId: string,
     @Arg('orderProducts', type => [NewOrderProduct], { nullable: true }) orderProducts: NewOrderProduct[]
   ): Promise<OrderProduct[]> {
-    const { domain, user, tx, bizplace }: { domain: Domain; user: User; tx: EntityManager; bizplace: Bizplace } =
+    const { domain, user, tx, bizplace }: { domain: Domain; user: User; tx: EntityManager; bizplace?: Bizplace } =
       context.state
 
     const productDetailRepo = tx.getRepository(ProductDetail)
@@ -298,7 +318,8 @@ export class OtherQuery {
 
       if (foundPermittedBizplace) {
         if (!foundPermittedBizplace.company?.id) {
-          foundPermittedBizplace = await tx.getRepository(Bizplace).findOne(foundPermittedBizplace.id, {
+          foundPermittedBizplace = await tx.getRepository(Bizplace).findOne({
+            where: { id: foundPermittedBizplace.id },
             relations: ['domain', 'company', 'company.domain']
           })
         }
@@ -313,7 +334,7 @@ export class OtherQuery {
     let strictProduct: boolean = false
 
     const strictProductSelectionSetting: Setting = await tx.getRepository(Setting).findOne({
-      where: { domain, category: 'id-rule', name: 'strict-product-selection' }
+      where: { domain: { id: domain.id }, category: 'id-rule', name: 'strict-product-selection' }
     })
 
     if (strictProductSelectionSetting) strictProduct = strictProductSelectionSetting.value
@@ -410,11 +431,11 @@ export class OtherQuery {
   @Directive('@transaction')
   @Query(returns => [InventoryProductGroup])
   async bulkUploadValidatePoOrderProducts(
-    @Ctx() context: any,
+    @Ctx() context: ResolverContext,
     @Arg('partnerBizplaceId') partnerBizplaceId: string,
     @Arg('orderProducts', type => [NewOrderProduct], { nullable: true }) orderProducts: NewOrderProduct[]
   ): Promise<OrderProduct[]> {
-    const { domain, user, tx, bizplace }: { domain: Domain; user: User; tx: EntityManager; bizplace: Bizplace } =
+    const { domain, user, tx, bizplace }: { domain: Domain; user: User; tx: EntityManager; bizplace?: Bizplace } =
       context.state
 
     const productDetailRepo = tx.getRepository(ProductDetail)
@@ -428,7 +449,8 @@ export class OtherQuery {
 
       if (foundPermittedBizplace) {
         if (!foundPermittedBizplace.company?.id) {
-          foundPermittedBizplace = await tx.getRepository(Bizplace).findOne(foundPermittedBizplace.id, {
+          foundPermittedBizplace = await tx.getRepository(Bizplace).findOne({
+            where: { id: foundPermittedBizplace.id },
             relations: ['domain', 'company', 'company.domain']
           })
         }
@@ -443,7 +465,7 @@ export class OtherQuery {
     let strictProduct: boolean = false
 
     const strictProductSelectionSetting: Setting = await tx.getRepository(Setting).findOne({
-      where: { domain, category: 'id-rule', name: 'strict-product-selection' }
+      where: { domain: { id: domain.id }, category: 'id-rule', name: 'strict-product-selection' }
     })
 
     if (strictProductSelectionSetting) strictProduct = strictProductSelectionSetting.value
@@ -472,7 +494,7 @@ export class OtherQuery {
         let productDetail: ProductDetail
         const hasConditions: boolean = Boolean(
           (orderProduct?.packingType && orderProduct?.packingType.trim() != '') ||
-          (orderProduct?.uom && orderProduct?.uom.trim() != '')
+            (orderProduct?.uom && orderProduct?.uom.trim() != '')
         )
         let productDetailCondition: any = { product: foundProduct }
 
@@ -495,8 +517,8 @@ export class OtherQuery {
               ? productDetail.uomValue
               : null
             : orderProduct?.uomValue
-              ? orderProduct.uomValue
-              : productDetail.uomValue
+            ? orderProduct.uomValue
+            : productDetail.uomValue
 
         newOrderProduct = {
           ...orderProduct,

package/server/service/purchase-order/purchase-order-mutation.ts

@@ -1,15 +1,15 @@
 import type { FileUpload } from 'graphql-upload/GraphQLUpload.js'
 import GraphQLUpload from 'graphql-upload/GraphQLUpload.js'
 import { Arg, Ctx, Directive, Mutation, Resolver } from 'type-graphql'
-import { EntityManager, getRepository, Repository } from 'typeorm'
+import { EntityManager, Repository } from 'typeorm'
 
 import { Attachment, createAttachments, deleteAttachmentsByRef } from '@things-factory/attachment-base'
 import { User } from '@things-factory/auth-base'
 import { Bizplace, ContactPoint, getPermittedBizplaces } from '@things-factory/biz-base'
 import { generateId } from '@things-factory/id-rule-base'
-import { Product } from '@things-factory/product-base'
+import { Product, ProductDetail } from '@things-factory/product-base'
 import { Setting } from '@things-factory/setting-base'
-import { Domain } from '@things-factory/shell'
+import { Domain, getRepository } from '@things-factory/shell'
 import { Location } from '@things-factory/warehouse-base'
 
 import {
@@ -24,15 +24,11 @@ import {
   ATTACHMENT_TYPE,
   ORDER_NUMBER_RULE_TYPE,
   ORDER_NUMBER_SETTING_KEY,
+  ORDER_STATUS,
   PURCHASE_ORDER_STATUS
 } from '../../constants'
 import { OrderNoGenerator } from '../../utils'
-import {
-  checkArrivedNoticeFunction,
-  confirmArrivalNoticeFunction,
-  generateArrivalNoticeFunction,
-  receiveArrivalNoticeFunction
-} from '../arrival-notice/arrival-notice-mutation'
+import { checkArrivedNoticeFunction, generateArrivalNoticeFunction } from '../arrival-notice/arrival-notice-mutation'
 import { getPurchaseOrderFunction } from './purchase-order-query'
 
 @Resolver(PurchaseOrder)
@@ -41,12 +37,12 @@ export class PurchaseOrderMutation {
   @Directive('@transaction')
   @Mutation(returns => PurchaseOrder)
   async upsertPurchaseOrder(
-    @Ctx() context: any,
+    @Ctx() context: ResolverContext,
     @Arg('purchaseOrder', type => PurchaseOrderPatch) purchaseOrder: PurchaseOrderPatch,
     @Arg('files', type => [GraphQLUpload], { nullable: true }) files?: FileUpload
   ): Promise<PurchaseOrder> {
     try {
-      const { tx }: { tx: EntityManager } = context.state
+      const { tx } = context.state
       const createdPurchaseOrder: PurchaseOrder = await upsertPurchaseOrderFunction(
         null,
         purchaseOrder,
@@ -64,16 +60,16 @@ export class PurchaseOrderMutation {
   @Directive('@privilege(category: "order_customer", privilege: "mutation")')
   @Directive('@transaction')
   @Mutation(returns => PurchaseOrder)
-  async approvePurchaseOrder(@Arg('id') id: string, @Ctx() context: any): Promise<PurchaseOrder> {
-    const { tx, domain, user }: { tx: EntityManager; domain: Domain; user: User } = context.state
+  async approvePurchaseOrder(@Arg('id') id: string, @Ctx() context: ResolverContext): Promise<PurchaseOrder> {
+    const { tx, domain, user } = context.state
 
     const findPurchaseOrder: PurchaseOrder = await getRepository(PurchaseOrder).findOne({
-      where: { domain, id },
+      where: { domain: { id: domain.id }, id },
       relations: ['orderProducts', 'orderProducts.product', 'bufferLocation', 'bizplace', 'domain']
     })
 
-    // const findPurchaseOrder: PurchaseOrder = await tx.getRepository(PurchaseOrder).findOne({id}, { relations:['bizplace']})
-    // const findOrderProducts: OrderProduct[] = await tx.getRepository(OrderProduct).find({purchaseOrder: findPurchaseOrder})
+    // const findPurchaseOrder: PurchaseOrder = await tx.getRepository(PurchaseOrder).findOne({where: {id}, relations:['bizplace']})
+    // const findOrderProducts: OrderProduct[] = await tx.getRepository(OrderProduct).findBy({purchaseOrder: findPurchaseOrder})
 
     // // 1. Approve purchase order
     const approvePurchaseOrder: PurchaseOrder = await tx.getRepository(PurchaseOrder).save({
@@ -110,12 +106,14 @@ export class PurchaseOrderMutation {
     }
 
     delete newGANOrder.id
+    //change gan status to intransit and call check arrived notice function right
+    newGANOrder.status = ORDER_STATUS.INTRANSIT
 
-    const createdGAN: ArrivalNotice = await generateArrivalNoticeFunction(null, newGANOrder, [], context, tx)
+    const createdGAN: ArrivalNotice = await generateArrivalNoticeFunction(null, newGANOrder, true, [], context, tx)
 
-    await confirmArrivalNoticeFunction(createdGAN.name, context, tx)
+    // await confirmArrivalNoticeFunction(createdGAN.name, context, tx)
 
-    await receiveArrivalNoticeFunction(null, createdGAN.name, context)
+    // await receiveArrivalNoticeFunction(null, createdGAN.name, context)
 
     await checkArrivedNoticeFunction(createdGAN.name, context, tx)
 
@@ -125,11 +123,11 @@ export class PurchaseOrderMutation {
   @Directive('@privilege(category: "order_customer", privilege: "mutation")')
   @Directive('@transaction')
   @Mutation(returns => PurchaseOrder)
-  async rejectPurchaseOrder(@Arg('id') id: string, @Ctx() context: any): Promise<PurchaseOrder> {
-    const { tx, domain, user }: { tx: EntityManager; domain: Domain; user: User } = context.state
+  async rejectPurchaseOrder(@Arg('id') id: string, @Ctx() context: ResolverContext): Promise<PurchaseOrder> {
+    const { tx, domain, user } = context.state
 
     const findPurchaseOrder: PurchaseOrder = await getRepository(PurchaseOrder).findOne({
-      where: { domain, id },
+      where: { domain: { id: domain.id }, id },
       relations: ['orderProducts']
     })
     // // 1. Reject purchase order
@@ -155,9 +153,9 @@ export class PurchaseOrderMutation {
   @Mutation(returns => PurchaseOrder)
   async createPurchaseOrder(
     @Arg('purchaseOrder', type => NewPurchaseOrder) purchaseOrder: NewPurchaseOrder,
-    @Ctx() context: any
+    @Ctx() context: ResolverContext
   ): Promise<PurchaseOrder> {
-    const { tx, domain, user }: { tx: EntityManager; domain: Domain; user: User } = context.state
+    const { tx, domain, user } = context.state
 
     return await tx.getRepository(PurchaseOrder).save({
       ...purchaseOrder,
@@ -172,13 +170,13 @@ export class PurchaseOrderMutation {
   async updatePurchaseOrder(
     @Arg('name') name: string,
     @Arg('patch', type => PurchaseOrderPatch) patch: PurchaseOrderPatch,
-    @Ctx() context: any
+    @Ctx() context: ResolverContext
   ): Promise<PurchaseOrder> {
-    const { tx, domain, user }: { tx: EntityManager; domain: Domain; user: User } = context.state
+    const { tx, domain, user } = context.state
 
     const repository = tx.getRepository(PurchaseOrder)
     const purchaseOrder = await repository.findOne({
-      where: { domain, name }
+      where: { domain: { id: domain.id }, name }
     })
 
     return await repository.save({
@@ -190,8 +188,8 @@ export class PurchaseOrderMutation {
 
   @Directive('@transaction')
   @Mutation(returns => Boolean)
-  async deletePurchaseOrder(@Arg('name') name: string, @Ctx() context: any): Promise<boolean> {
-    const { tx, domain }: { tx: EntityManager; domain: Domain } = context.state
+  async deletePurchaseOrder(@Arg('name') name: string, @Ctx() context: ResolverContext): Promise<boolean> {
+    const { tx, domain } = context.state
     await tx.getRepository(PurchaseOrder).delete({ domain, name })
     return true
   }
@@ -220,7 +218,7 @@ export async function createPurchaseOrderFunction(
   context: any,
   tx?: EntityManager
 ): Promise<PurchaseOrder> {
-  const { domain, user }: { domain: Domain; user: User } = context.state
+  const { domain, user } = context.state
   let orderProducts: OrderProduct[] = purchaseOrder.orderProducts
   let otherCharges: PurchaseOrderOtherCharge[] = purchaseOrder.otherCharges
 
@@ -242,13 +240,13 @@ export async function createPurchaseOrderFunction(
   }
 
   if (purchaseOrder?.supplier?.id) {
-    purchaseOrder.supplier = await getRepository(ContactPoint).findOne({ id: purchaseOrder.supplier.id })
+    purchaseOrder.supplier = await getRepository(ContactPoint).findOneBy({ id: purchaseOrder.supplier.id })
   } else {
     arrError.push(`No supplier was selected`)
   }
 
   if (purchaseOrder?.bufferLocation?.id) {
-    purchaseOrder.bufferLocation = await getRepository(Location).findOne({ id: purchaseOrder.bufferLocation.id })
+    purchaseOrder.bufferLocation = await getRepository(Location).findOneBy({ id: purchaseOrder.bufferLocation.id })
   } else {
     arrError.push(`No buffer location was selected`)
   }
@@ -260,16 +258,14 @@ export async function createPurchaseOrderFunction(
   // // find PO number rule setting
   const poNoSetting: Setting = await settingRepo.findOne({
     where: {
-      domain,
+      domain: { id: domain.id },
       name: ORDER_NUMBER_SETTING_KEY.PO_NUMBER_RULE
     }
   })
 
-  if (poNoSetting) {
-    orderNo = await generateId({ domain, type: ORDER_NUMBER_RULE_TYPE.PO_NUMBER, seed: {} })
-  } else {
-    orderNo = OrderNoGenerator.purchaseOrder()
-  }
+  orderNo = poNoSetting
+    ? await generateId({ domain, type: ORDER_NUMBER_RULE_TYPE.PO_NUMBER, seed: {} })
+    : OrderNoGenerator.purchaseOrder()
 
   // // 1. Create purchase order
   const createdPurchaseOrder: PurchaseOrder = await tx.getRepository(PurchaseOrder).save({
@@ -319,7 +315,7 @@ export async function updatePurchaseOrderFunction(
   context: any,
   tx?: EntityManager
 ): Promise<PurchaseOrder> {
-  const { domain, user }: { domain: Domain; user: User } = context.state
+  const { domain, user } = context.state
 
   let existingPurchaseOrder: any = await getPurchaseOrderFunction(_, purchaseOrder.name, context, tx)
 
@@ -336,11 +332,11 @@ export async function updatePurchaseOrderFunction(
   }
 
   if (purchaseOrder?.supplier?.id) {
-    purchaseOrder.supplier = await getRepository(ContactPoint).findOne({ id: purchaseOrder.supplier.id })
+    purchaseOrder.supplier = await getRepository(ContactPoint).findOneBy({ id: purchaseOrder.supplier.id })
   }
 
   if (purchaseOrder?.bufferLocation?.id) {
-    purchaseOrder.bufferLocation = await getRepository(Location).findOne({ id: purchaseOrder.bufferLocation.id })
+    purchaseOrder.bufferLocation = await getRepository(Location).findOneBy({ id: purchaseOrder.bufferLocation.id })
   }
 
   // // 1. Update purchase order
@@ -380,7 +376,7 @@ export async function updatePurchaseOrderFunction(
   // // 5. Remove Purchase Order Products
   const foundAttachments: Attachment[] = await getRepository(Attachment).find({
     where: {
-      domain,
+      domain: { id: domain.id },
       refBy: purchaseOrder.id,
       category: ATTACHMENT_TYPE.PO
     }
@@ -426,22 +422,26 @@ export async function upsertPurchaseOrderProducts(
       existingOP => (orderProducts.filter(inOP => inOP.id == existingOP.id).length = 0)
     )
     removeOP.forEach(async op => {
-      await orderProductRepo.delete(op)
+      await orderProductRepo.delete(op.id)
     })
 
-    purchaseOrder = await purchaseOrderRepo.findOne(purchaseOrder.id)
+    purchaseOrder = await purchaseOrderRepo.findOneBy({ id: purchaseOrder.id })
 
-    bizplace = await bizplaceRepo.findOne(bizplace.id)
+    bizplace = await bizplaceRepo.findOneBy({ id: bizplace.id })
 
     orderProducts = await Promise.all(
       orderProducts.map(async (op: OrderProduct) => {
         if (!op?.id) delete op.id
+        let foundProductDetail: ProductDetail = await tx
+          .getRepository(ProductDetail)
+          .findOne({ where: { product: op.product.id, packingType: op.packingType } })
         return {
           ...op,
           domain,
           bizplace: bizplace,
           name: op?.id ? op.name : OrderNoGenerator.orderProduct(),
-          product: await productRepo.findOne(op.product.id),
+          product: await productRepo.findOneBy({ id: op.product.id }),
+          packingSize: foundProductDetail?.packingSize || 1,
           purchaseOrder: purchaseOrder,
           status: purchaseOrder.status,
           creator: op?.id ? op.creator : user,

package/server/service/purchase-order/purchase-order-query.ts

@@ -1,9 +1,11 @@
+import { Arg, Ctx, FieldResolver, Query, Resolver, Root } from 'type-graphql'
+import { EntityManager, In } from 'typeorm'
+
 import { Attachment } from '@things-factory/attachment-base'
 import { User } from '@things-factory/auth-base'
 import { Bizplace, getPermittedBizplaceIds } from '@things-factory/biz-base'
-import { buildQuery, Domain, Filter, Pagination, Sorting } from '@things-factory/shell'
-import { Arg, Ctx, FieldResolver, Query, Resolver, Root } from 'type-graphql'
-import { EntityManager, getRepository, In } from 'typeorm'
+import { buildQuery, Domain, Filter, getRepository, Pagination, Sorting } from '@things-factory/shell'
+
 import { PurchaseOrderList } from '../'
 import { ATTACHMENT_TYPE } from '../../constants'
 import { PurchaseOrder } from './purchase-order'
@@ -12,7 +14,7 @@ import { PurchaseOrder } from './purchase-order'
 export class PurchaseOrderQuery {
   @Query(returns => PurchaseOrderList)
   async purchaseOrders(
-    @Ctx() context: any,
+    @Ctx() context: ResolverContext,
     @Arg('filters', type => [Filter], { nullable: true }) filters?: Filter[],
     @Arg('pagination', type => Pagination, { nullable: true }) pagination?: Pagination,
     @Arg('sortings', type => [Sorting], { nullable: true }) sortings?: Sorting[]
@@ -31,24 +33,24 @@ export class PurchaseOrderQuery {
   }
 
   @Query(returns => PurchaseOrder)
-  async purchaseOrder(@Arg('name') name: string, @Ctx() context: any): Promise<PurchaseOrder> {
-    const { tx }: { tx: EntityManager } = context.state
+  async purchaseOrder(@Arg('name') name: string, @Ctx() context: ResolverContext): Promise<PurchaseOrder> {
+    const { tx } = context.state
     return getPurchaseOrderFunction(null, name, context, tx)
   }
 
   @FieldResolver(type => Domain)
   async domain(@Root() purchaseOrder: PurchaseOrder): Promise<Domain> {
-    return await getRepository(Domain).findOne(purchaseOrder.domainId)
+    return await getRepository(Domain).findOneBy({ id: purchaseOrder.domainId })
   }
 
   @FieldResolver(type => User)
   async creator(@Root() purchaseOrder: PurchaseOrder): Promise<User> {
-    return await getRepository(User).findOne(purchaseOrder.creatorId)
+    return await getRepository(User).findOneBy({ id: purchaseOrder.creatorId })
   }
 
   @FieldResolver(type => User)
   async updater(@Root() purchaseOrder: PurchaseOrder): Promise<User> {
-    return await getRepository(User).findOne(purchaseOrder.updaterId)
+    return await getRepository(User).findOneBy({ id: purchaseOrder.updaterId })
   }
 }
 
@@ -56,7 +58,7 @@ export async function getPurchaseOrderFunction(_: any, name: any, context: any,
   const { domain, user, bizplace }: { domain: Domain; user: User; bizplace: Bizplace } = context.state
 
   let result = await getRepository(PurchaseOrder).findOne({
-    where: { domain, name, bizplace: In(await getPermittedBizplaceIds(domain, user)) },
+    where: { domain: { id: domain.id }, name, bizplace: In(await getPermittedBizplaceIds(domain, user)) },
     relations: [
       'arrivalNotice',
       'supplier',
@@ -75,7 +77,7 @@ export async function getPurchaseOrderFunction(_: any, name: any, context: any,
 
   const foundAttachments: Attachment[] = await getRepository(Attachment).find({
     where: {
-      domain,
+      domain: { id: domain.id },
       refBy: result.id,
       category: ATTACHMENT_TYPE.PO
     }

package/server/service/purchase-order-other-charge/purchase-order-other-charge-mutation.ts

@@ -1,14 +1,14 @@
-import { Domain } from '@things-factory/shell'
 import { Arg, Ctx, Directive, Mutation, Resolver } from 'type-graphql'
-import { EntityManager, In } from 'typeorm'
+import { In } from 'typeorm'
+
 import { PurchaseOrderOtherCharge } from './purchase-order-other-charge'
 
 @Resolver(PurchaseOrderOtherCharge)
 export class PurchaseOrderOtherChargeMutation {
   @Directive('@transaction')
   @Mutation(returns => Boolean)
-  async deletePurchaseOrderOtherCharge(@Arg('name') name: string, @Ctx() context: any): Promise<boolean> {
-    const { tx, domain }: { tx: EntityManager; domain: Domain } = context.state
+  async deletePurchaseOrderOtherCharge(@Arg('name') name: string, @Ctx() context: ResolverContext): Promise<boolean> {
+    const { tx, domain } = context.state
 
     await tx.getRepository(PurchaseOrderOtherCharge).delete({ domain, name })
     return true
@@ -18,12 +18,12 @@ export class PurchaseOrderOtherChargeMutation {
   @Mutation(returns => Boolean)
   async deletePurchaseOrderOtherCharges(
     @Arg('names', type => [String]) names: string[],
-    @Ctx() context: any
+    @Ctx() context: ResolverContext
   ): Promise<boolean> {
-    const { tx, domain }: { tx: EntityManager; domain: Domain } = context.state
+    const { tx, domain } = context.state
 
     await tx.getRepository(PurchaseOrderOtherCharge).delete({
-      domain,
+      domain: { id: domain.id },
       name: In(names)
     })
     return true