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

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

@@ -1,11 +1,20 @@
 import { Arg, Args, Ctx, FieldResolver, Query, Resolver, Root } from 'type-graphql'
-import { EntityManager, getRepository, In, Not, Repository } from 'typeorm'
+import { EntityManager, In, Not, OrderByCondition, Repository } from 'typeorm'
 
 import { Attachment } from '@things-factory/attachment-base'
 import { User } from '@things-factory/auth-base'
 import { getPermittedBizplaceIds } from '@things-factory/biz-base'
 import { Product } from '@things-factory/product-base'
-import { buildQuery, convertListParams, Domain, Filter, ListParam, Pagination, Sorting } from '@things-factory/shell'
+import {
+  buildQuery,
+  convertListParams,
+  Domain,
+  Filter,
+  getRepository,
+  ListParam,
+  Pagination,
+  Sorting
+} from '@things-factory/shell'
 import { Inventory } from '@things-factory/warehouse-base'
 
 import { ORDER_STATUS } from '../../constants'
@@ -20,9 +29,9 @@ const debug = require('debug')('things-factory:sales-base:delivery-orders')
 @Resolver(DeliveryOrder)
 export class DeliveryOrderQuery {
   @Query(returns => DeliveryOrderList)
-  async deliveryOrders(@Ctx() context: any, @Args() params: ListParam): Promise<DeliveryOrderList> {
+  async deliveryOrders(@Ctx() context: ResolverContext, @Args() params: ListParam): Promise<DeliveryOrderList> {
     try {
-      const { domain, user }: { domain: Domain; user: User } = context.state
+      const { domain, user, tx } = context.state
 
       const bizplaceFilter = params.filters.find(param => param.name === 'bizplaceId')
       if (!bizplaceFilter) {
@@ -99,21 +108,17 @@ export class DeliveryOrderQuery {
       let refNo3Filter = params.filters.find(x => x.name == 'refNo3')
       let orderProductsApiFilter = params.filters.find(x => x.name == 'orderProductsApi')
 
-      params.filters = params.filters.filter(x => x.name != 'refNo' && x.name != 'refNo2' && x.name != 'refNo3')
+      params.filters = params.filters.filter(
+        x => x.name != 'refNo' && x.name != 'refNo2' && x.name != 'refNo3' && x.name != 'orderProductsApi'
+      )
 
       const qb: any = getRepository(DeliveryOrder).createQueryBuilder('do')
       buildQuery(qb, params, context)
       qb.addSelect('COALESCE("cc".rank, 99999)', 'rank')
-      qb.leftJoinAndSelect('do.domain', 'domain')
       qb.leftJoinAndSelect('do.bizplace', 'bizplace')
       qb.leftJoinAndSelect('do.releaseGood', 'releaseGood')
-      if (orderProductsApiFilter?.value) {
-        qb.innerJoinAndSelect('releaseGood.orderProducts', 'orderProducts')
-      }
       qb.leftJoinAndSelect('do.transportDriver', 'td')
       qb.leftJoinAndSelect('do.transportVehicle', 'th')
-      qb.leftJoinAndSelect('do.creator', 'creator')
-      qb.leftJoinAndSelect('do.updater', 'updater')
       qb.leftJoin(
         subQuery => {
           return subQuery
@@ -128,6 +133,12 @@ export class DeliveryOrderQuery {
         'cc.status = do.status'
       )
 
+      // was add specifically for API usage, do we really need
+      // orderProducts over orderInventories? else we should remove this
+      if (orderProductsApiFilter?.value) {
+        qb.innerJoinAndSelect('releaseGood.orderProducts', 'orderProducts')
+      }
+
       if (refNoFilter?.value) {
         qb.andWhere('releaseGood.ref_no ilike :refNo', { refNo: refNoFilter.value })
       }
@@ -140,21 +151,43 @@ export class DeliveryOrderQuery {
 
       const arrChildSortData = ['refNo', 'refNo2', 'refNo3']
       const arrNameSortData = ['bizplace', 'releaseGood', 'updater']
-      const sort = (params.sortings || []).reduce(
+      const sort: OrderByCondition = (params.sortings || []).reduce(
         (acc, sort) => ({
           ...acc,
           [arrChildSortData.indexOf(sort.name) >= 0
             ? 'releaseGood.' + sort.name
             : arrNameSortData.indexOf(sort.name) >= 0
-            ? sort.name + '.name'
-            : 'do.' + sort.name]: sort.desc ? 'DESC' : 'ASC'
+              ? sort.name + '.name'
+              : 'do.' + sort.name]: sort.desc ? 'DESC' : 'ASC'
         }),
         params.sortings.length < 1 ? { rank: 'ASC', 'do.createdAt': 'DESC' } : {}
       )
 
       qb.orderBy(sort)
 
-      const [items, total] = await qb.getManyAndCount()
+      let [items, total] = await qb.getManyAndCount()
+      if (orderProductsApiFilter?.value) {
+        items = await Promise.all(
+          items.map(async itm => {
+            const qb: any = getRepository(OrderInventory).createQueryBuilder('OrderInventory')
+
+            let orderInventories: any[] = await qb
+              .leftJoinAndSelect('OrderInventory.product', 'Product')
+              .leftJoinAndSelect('OrderInventory.orderToteItems', 'OrderToteItems')
+              .leftJoinAndSelect('OrderToteItems.orderTote', 'OrderTote')
+              .leftJoinAndSelect('OrderTote.orderToteSeals', 'OrderToteSeals')
+              .where('OrderInventory.delivery_order_id = :deliveryOrderId', { deliveryOrderId: itm.id })
+              .andWhere('OrderInventory.domain_id = :domainId', { domainId: domain.id })
+              .getMany()
+
+            return {
+              ...itm,
+              orderInventories
+            }
+          })
+        )
+      }
+
       return { items, total }
     } catch (error) {
       debug('deliveryOrders', error.toString())
@@ -163,12 +196,12 @@ export class DeliveryOrderQuery {
   }
 
   @Query(returns => DeliveryOrder)
-  async deliveryOrder(@Arg('name') name: string, @Ctx() context: any): Promise<DeliveryOrder> {
-    const { domain }: { domain: Domain } = context.state
+  async deliveryOrder(@Arg('name') name: string, @Ctx() context: ResolverContext): Promise<DeliveryOrder> {
+    const { domain } = context.state
 
     const foundDO = await getRepository(DeliveryOrder).findOne({
       where: {
-        domain,
+        domain: { id: domain.id },
         name
       },
       relations: ['domain', 'bizplace', 'transportDriver', 'transportVehicle', 'releaseGood', 'creator', 'updater']
@@ -178,7 +211,7 @@ export class DeliveryOrderQuery {
     if (foundDO) {
       foundAttachments = await getRepository(Attachment).find({
         where: {
-          domain,
+          domain: { id: domain.id },
           refBy: foundDO.id
         }
       })
@@ -189,19 +222,20 @@ export class DeliveryOrderQuery {
 
   @Query(returns => DeliveryOrderList)
   async deliveryOrderRequests(
-    @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[]
   ): Promise<DeliveryOrderList> {
-    const { domain, user }: { domain: Domain; user: User } = context.state
+    const { domain, user } = context.state
 
     const convertedParams = convertListParams({ filters, pagination, sortings })
 
     if (!convertedParams.where || !convertedParams.where.status) {
       convertedParams.where.status = Not(In([ORDER_STATUS.PENDING, ORDER_STATUS.EDITING]))
     }
-    convertedParams.bizplace = In(await getPermittedBizplaceIds(domain, user))
+
+    ;(convertedParams as any).bizplace = In(await getPermittedBizplaceIds(domain, user))
 
     const [items, total] = await getRepository(DeliveryOrder).findAndCount({
       ...convertedParams,
@@ -214,7 +248,7 @@ export class DeliveryOrderQuery {
   @Query(returns => DeliveryOrderList)
   async deliveryOrderByReleaseGood(
     @Arg('releaseGoodNo') releaseGoodNo: string,
-    @Ctx() context: any
+    @Ctx() context: ResolverContext
   ): Promise<DeliveryOrderList> {
     const releaseGood: ReleaseGood = await getRepository(ReleaseGood).findOne({
       where: { name: releaseGoodNo }
@@ -224,14 +258,14 @@ export class DeliveryOrderQuery {
   }
 
   @Query(returns => OrderInventoryList)
-  async deliveryOrderItems(@Arg('name') name: string, @Ctx() context: any): Promise<OrderInventoryList> {
-    const { domain }: { domain: Domain } = context.state
+  async deliveryOrderItems(@Arg('name') name: string, @Ctx() context: ResolverContext): Promise<OrderInventoryList> {
+    const { domain } = context.state
     const deliveryOrder: DeliveryOrder = await getRepository(DeliveryOrder).findOne({
-      where: { domain, name }
+      where: { domain: { id: domain.id }, name }
     })
 
     let [items, total] = await getRepository(OrderInventory).findAndCount({
-      where: { domain, deliveryOrder },
+      where: { domain: { id: domain.id }, deliveryOrder: { id: deliveryOrder.id } },
       relations: ['inventory', 'inventory.product', 'inventory.reusablePallet']
     })
 
@@ -302,12 +336,12 @@ export class DeliveryOrderQuery {
         systemRemark: prod?.remark
           ? prod.remark
           : prod.crossDocking
-          ? prod.pallet === ''
-            ? `${prod.palletQty} PALLET(S) [C/D]`
-            : `${prod.palletQty} PALLET(S) (${prod.pallet}) [C/D]`
-          : prod.pallet === ''
-          ? `${prod.palletQty} PALLET(S)`
-          : `${prod.palletQty} PALLET(S) (${prod.pallet})`
+            ? prod.pallet === ''
+              ? `${prod.palletQty} PALLET(S) [C/D]`
+              : `${prod.palletQty} PALLET(S) (${prod.pallet}) [C/D]`
+            : prod.pallet === ''
+              ? `${prod.palletQty} PALLET(S)`
+              : `${prod.palletQty} PALLET(S) (${prod.pallet})`
       }
     })
 
@@ -315,14 +349,17 @@ export class DeliveryOrderQuery {
   }
 
   @Query(returns => OrderInventoryList)
-  async manualDeliveryOrderItems(@Arg('name') name: string, @Ctx() context: any): Promise<OrderInventoryList> {
-    const { domain }: { domain: Domain } = context.state
+  async manualDeliveryOrderItems(
+    @Arg('name') name: string,
+    @Ctx() context: ResolverContext
+  ): Promise<OrderInventoryList> {
+    const { domain } = context.state
     const deliveryOrder: DeliveryOrder = await getRepository(DeliveryOrder).findOne({
-      where: { domain, name }
+      where: { domain: { id: domain.id }, name }
     })
 
     let [items, total] = await getRepository(OrderInventory).findAndCount({
-      where: { domain, deliveryOrder },
+      where: { domain: { id: domain.id }, deliveryOrder: { id: deliveryOrder.id } },
       relations: ['product']
     })
 
@@ -394,12 +431,12 @@ export class DeliveryOrderQuery {
         systemRemark: prod?.remark
           ? prod.remark
           : prod.crossDocking
-          ? prod.pallet === ''
-            ? `${prod.palletQty} PALLET(S) [C/D]`
-            : `${prod.palletQty} PALLET(S) (${prod.pallet}) [C/D]`
-          : prod.pallet === ''
-          ? `${prod.palletQty} PALLET(S)`
-          : `${prod.palletQty} PALLET(S) (${prod.pallet})`
+            ? prod.pallet === ''
+              ? `${prod.palletQty} PALLET(S) [C/D]`
+              : `${prod.palletQty} PALLET(S) (${prod.pallet}) [C/D]`
+            : prod.pallet === ''
+              ? `${prod.palletQty} PALLET(S)`
+              : `${prod.palletQty} PALLET(S) (${prod.pallet})`
       }
     })
 
@@ -407,9 +444,9 @@ export class DeliveryOrderQuery {
   }
 
   @Query(returns => DeliveryOrderList)
-  async deliveryOrderReport(@Ctx() context: any, @Args() params: ListParam): Promise<DeliveryOrderList> {
+  async deliveryOrderReport(@Ctx() context: ResolverContext, @Args() params: ListParam): Promise<DeliveryOrderList> {
     try {
-      const { domain, user }: { domain: Domain; user: User } = context.state
+      const { domain, user } = context.state
 
       const bizplaceFilter = params.filters.find(param => param.name === 'bizplaceId')
       if (!bizplaceFilter) {
@@ -521,14 +558,14 @@ export class DeliveryOrderQuery {
 
       const arrChildSortData = ['refNo', 'refNo2', 'refNo3']
       const arrNameSortData = ['bizplace', 'releaseGood', 'updater']
-      const sort = (params.sortings || []).reduce(
+      const sort: OrderByCondition = (params.sortings || []).reduce(
         (acc, sort) => ({
           ...acc,
           [arrChildSortData.indexOf(sort.name) >= 0
             ? 'releaseGood.' + sort.name
             : arrNameSortData.indexOf(sort.name) >= 0
-            ? sort.name + '.name'
-            : 'do.' + sort.name]: sort.desc ? 'DESC' : 'ASC'
+              ? sort.name + '.name'
+              : 'do.' + sort.name]: sort.desc ? 'DESC' : 'ASC'
         }),
         params.sortings.length < 1 ? { rank: 'ASC', 'do.createdAt': 'DESC' } : {}
       )
@@ -545,17 +582,17 @@ export class DeliveryOrderQuery {
 
   @FieldResolver(type => Domain)
   async domain(@Root() deliveryOrder: DeliveryOrder): Promise<Domain> {
-    return await getRepository(Domain).findOne(deliveryOrder.domainId)
+    return await getRepository(Domain).findOneBy({ id: deliveryOrder.domainId })
   }
 
   @FieldResolver(type => User)
   async creator(@Root() deliveryOrder: DeliveryOrder): Promise<User> {
-    return await getRepository(User).findOne(deliveryOrder.creatorId)
+    return await getRepository(User).findOneBy({ id: deliveryOrder.creatorId })
   }
 
   @FieldResolver(type => User)
   async updater(@Root() deliveryOrder: DeliveryOrder): Promise<User> {
-    return await getRepository(User).findOne(deliveryOrder.updaterId)
+    return await getRepository(User).findOneBy({ id: deliveryOrder.updaterId })
   }
 }
 
@@ -564,7 +601,7 @@ export async function deliveryOrderByReleaseGood(releaseGood: ReleaseGood, trxMg
   const oiRepo: Repository<OrderInventory> = trxMgr?.getRepository(OrderInventory) || getRepository(OrderInventory)
 
   let [items, total] = await doRepo.findAndCount({
-    where: { releaseGood },
+    where: { releaseGood: { id: releaseGood.id } },
     relations: ['domain', 'bizplace', 'releaseGood', 'transportDriver', 'transportVehicle', 'creator', 'updater']
   })
 
@@ -574,7 +611,7 @@ export async function deliveryOrderByReleaseGood(releaseGood: ReleaseGood, trxMg
         ...deliveryOrder,
         truck: deliveryOrder?.truckNo || deliveryOrder.transportVehicle?.name || null,
         targetInventories: await oiRepo.find({
-          where: { deliveryOrder },
+          where: { deliveryOrder: { id: deliveryOrder.id } },
           relations: ['domain', 'bizplace', 'releaseGood', 'inventory']
         })
       }

package/server/service/delivery-order/delivery-order-types.ts

@@ -250,4 +250,19 @@ export class DeliveryOrderPatch {
 
   @Field({ nullable: true })
   description: string
+
+  @Field({ nullable: true })
+  releaseGoodNo: string
+
+  @Field( {nullable: true})
+  transportType: string
+
+  @Field( {nullable: true})
+  coNo: string
+
+  @Field( {nullable:true})
+  totalPalletQty: string
+
+  @Field( {nullable:true})
+  exportOption: Boolean
 }

package/server/service/delivery-order/delivery-order.ts

@@ -169,6 +169,74 @@ export class DeliveryOrder {
   @Field({ nullable: true })
   description: string
 
+  @Column({ nullable: true })
+  @Field({ nullable: true })
+  attentionTo: string
+
+  @Column({ nullable: true })
+  @Field({ nullable: true })
+  attentionCompany: string
+
+  @Column({ nullable: true })
+  @Field({ nullable: true })
+  city: string
+
+  @Column({ nullable: true })
+  @Field({ nullable: true })
+  state: string
+
+  @Column({ nullable: true })
+  @Field({ nullable: true })
+  postalCode: string
+
+  @Column({ nullable: true })
+  @Field({ nullable: true })
+  country: string
+
+  @Column({ nullable: true })
+  @Field({ nullable: true })
+  phone1: string
+
+  @Column({ nullable: true })
+  @Field({ nullable: true })
+  deliveryAddress1: string
+
+  @Column({ nullable: true })
+  @Field({ nullable: true })
+  deliveryAddress2: string
+
+  @Column({ nullable: true })
+  @Field({ nullable: true })
+  deliveryAddress3: string
+
+  @Column({ nullable: true })
+  @Field({ nullable: true })
+  deliveryAddress4: string
+
+  @Column({ nullable: true })
+  @Field({ nullable: true })
+  deliveryAddress5: string
+
+  @Column({ nullable: true })
+  @Field({ nullable: true })
+  billingAddress: string
+
+  @Column({ nullable: true })
+  @Field({ nullable: true })
+  billingCountry: string
+
+  @Column({ nullable: true })
+  @Field({ nullable: true })
+  billingPostalCode: string
+
+  @Column({ nullable: true })
+  @Field({ nullable: true })
+  billingState: string
+
+  @Column({ nullable: true })
+  @Field({ nullable: true })
+  billingCity: string
+
   @CreateDateColumn()
   @Field()
   createdAt: Date