@things-factory/sales-base 4.3.238 → 4.3.241

package/server/service/release-good/release-good-query.ts

@@ -1,60 +1,19 @@
-import {
-  Arg,
-  Args,
-  Ctx,
-  Directive,
-  FieldResolver,
-  Query,
-  Resolver,
-  Root
-} from 'type-graphql'
-import {
-  EntityManager,
-  getRepository,
-  In,
-  Repository,
-  SelectQueryBuilder
-} from 'typeorm'
+import { Arg, Args, Ctx, Directive, FieldResolver, Query, Resolver, Root } from 'type-graphql'
+import { EntityManager, getRepository, In, Repository, SelectQueryBuilder } from 'typeorm'
 
 import { Attachment } from '@things-factory/attachment-base'
-import {
-  checkUserBelongsDomain,
-  User
-} from '@things-factory/auth-base'
-import {
-  Bizplace,
-  getCompanyBizplace,
-  getMyBizplace,
-  getPermittedBizplaceIds
-} from '@things-factory/biz-base'
+import { checkUserBelongsDomain, User } from '@things-factory/auth-base'
+import { Bizplace, getCompanyBizplace, getMyBizplace, getPermittedBizplaceIds } from '@things-factory/biz-base'
 import { logger } from '@things-factory/env'
-import {
-  buildQuery,
-  Domain,
-  Filter,
-  ListParam,
-  Pagination,
-  Sorting
-} from '@things-factory/shell'
-import {
-  Inventory,
-  LOCATION_TYPE
-} from '@things-factory/warehouse-base'
-
-import {
-  ATTACHMENT_TYPE,
-  ORDER_INVENTORY_STATUS,
-  ORDER_STATUS
-} from '../../constants'
+import { buildQuery, Domain, Filter, ListParam, Pagination, Sorting } from '@things-factory/shell'
+import { Inventory, LOCATION_TYPE } from '@things-factory/warehouse-base'
+
+import { ATTACHMENT_TYPE, ORDER_INVENTORY_STATUS, ORDER_STATUS } from '../../constants'
 import { OrderInventory } from '../order-inventory/order-inventory'
 import { OrderPackage } from '../order-package/order-package'
 import { ShippingOrder } from '../shipping-order/shipping-order'
 import { ReleaseGood } from './release-good'
-import {
-  NewReleaseGood,
-  ReleasableInventoryList,
-  ReleaseGoodList
-} from './release-good-types'
+import { NewReleaseGood, ReleasableInventoryList, ReleaseGoodList } from './release-good-types'
 
 @Resolver(ReleaseGood)
 export class ReleaseGoodQuery {
@@ -227,8 +186,13 @@ export class ReleaseGoodQuery {
           'orderPackages',
           'orderVass',
           'orderVass.vas',
-          'orderVass.targetProduct',
+          'orderVass.newProduct',
+          'orderVass.newProductDetail',
+          'orderVass.product',
+          'orderVass.productDetail',
           'orderVass.inventory',
+          'orderVass.orderVasItems',
+          'orderVass.orderVasItems.vas',
           'creator',
           'updater'
         ]
@@ -475,10 +439,12 @@ export class ReleaseGoodQuery {
       )
 
       if (transporterFilter) {
-        qb.andWhere(`exists (select id from order_packages op where
+        qb.andWhere(
+          `exists (select id from order_packages op where
         op.release_good_id = rg.id 
-        and op.transporter ilike :transporter)`, { transporter: transporterFilter.value })
-
+        and op.transporter ilike :transporter)`,
+          { transporter: transporterFilter.value }
+        )
       }
 
       if (skuFilter) {
@@ -558,12 +524,12 @@ export class ReleaseGoodQuery {
               ...item,
               transporter: orderPackages?.length
                 ? [
-                  ...new Set(
-                    orderPackages.map(op => {
-                      return op.transporter
-                    })
-                  )
-                ].join(', ')
+                    ...new Set(
+                      orderPackages.map(op => {
+                        return op.transporter
+                      })
+                    )
+                  ].join(', ')
                 : null,
               orderRemark: item?.remark ? true : false
             }
@@ -629,24 +595,27 @@ export class ReleaseGoodQuery {
         ${batchId ? `AND LOWER(${INV_ALIAS}.batch_id) LIKE '%${batchId.toLowerCase()}%'` : ''}
         ${packingType ? `AND LOWER(${INV_ALIAS}.packing_type) LIKE '%${packingType.toLowerCase()}%'` : ''}
         ${containerNo ? `AND LOWER(${GAN_ALIAS}.container_no) LIKE '%${containerNo.toLowerCase()}%'` : ''}
-        ${product?.length > 0 && product[0]
-        ? `AND ${PROD_ALIAS}.id IN (${product.map((id: string) => `'${id}'`).join(', ')})`
-        : product[0] === null
-          ? `AND ${PROD_ALIAS}.id isnull`
-          : ''
-      }
-        ${inventory?.length > 0
-        ? `
-              AND (${INV_ALIAS}.batch_id, ${PROD_ALIAS}.id) ${filters.find((filter: { name: string; operator: string; value: any }) => filter.name === 'inventory')
-          .operator
-        } (
+        ${
+          product?.length > 0 && product[0]
+            ? `AND ${PROD_ALIAS}.id IN (${product.map((id: string) => `'${id}'`).join(', ')})`
+            : product[0] === null
+            ? `AND ${PROD_ALIAS}.id isnull`
+            : ''
+        }
+        ${
+          inventory?.length > 0
+            ? `
+              AND (${INV_ALIAS}.batch_id, ${PROD_ALIAS}.id) ${
+                filters.find((filter: { name: string; operator: string; value: any }) => filter.name === 'inventory')
+                  .operator
+              } (
                 ${inventory
-          .map((inv: { batchId: string; productId: string }) => `('${inv.batchId}', '${inv.productId}')`)
-          .join(', ')}
+                  .map((inv: { batchId: string; productId: string }) => `('${inv.batchId}', '${inv.productId}')`)
+                  .join(', ')}
               )
             `
-        : ''
-      }
+            : ''
+        }
     `
 
     // ${product?.length > 0 ? `AND ${PROD_ALIAS}.id IN (${product.map((id: string) => id ? `'${id}'` : null).join(', ')})` : ''}
@@ -1004,18 +973,18 @@ function _extractData(rawData, validatedData) {
         !raw.productId || !raw.productDetailId
           ? 'inventory or product not found'
           : raw.releaseQty <= 0 || raw.releaseQty % 1 != 0
-            ? 'invalid release qty'
-            : raw.assignedQty < raw.releaseQty
-              ? 'insufficient stock'
-              : raw.releaseDate == ''
-                ? 'release date is empty'
-                : releaseDate < _getStdDateStr(new Date())
-                  ? 'backdate is not allowed'
-                  : !raw.refNo
-                    ? 'ref no is empty'
-                    : !Number.isInteger(raw.packingSize)
-                      ? 'packing size must be an integer'
-                      : ''
+          ? 'invalid release qty'
+          : raw.assignedQty < raw.releaseQty
+          ? 'insufficient stock'
+          : raw.releaseDate == ''
+          ? 'release date is empty'
+          : releaseDate < _getStdDateStr(new Date())
+          ? 'backdate is not allowed'
+          : !raw.refNo
+          ? 'ref no is empty'
+          : !Number.isInteger(raw.packingSize)
+          ? 'packing size must be an integer'
+          : ''
     }
   })
 }

package/server/service/vas/vas.ts

@@ -13,7 +13,8 @@ import {
 } from 'typeorm'
 
 @Entity('vass')
-@Index('ix_vas_0', (vas: Vas) => [vas.domain, vas.name], { unique: true })
+// name can be the same , thus, removing the validation here
+// @Index('ix_vas_0', (vas: Vas) => [vas.domain, vas.name], { unique: true })
 @ObjectType()
 export class Vas {
   @PrimaryGeneratedColumn('uuid')
@@ -35,10 +36,12 @@ export class Vas {
   @Field({ nullable: true })
   description: string
 
-  @Column()
-  @Field()
+  //can be removed
+  @Column({ nullable: true })
+  @Field({ nullable: true })
   currency: string
 
+  //can be removed
   @Column({ nullable: true })
   @Field({ nullable: true })
   uom: string
@@ -47,14 +50,17 @@ export class Vas {
   @Field({ nullable: true })
   type: string
 
-  @Column('float')
-  @Field()
+  //can be removed
+  @Column('float', { nullable: true })
+  @Field({ nullable: true })
   defaultPrice: number
 
+  //can be removed
   @Column({ nullable: true })
   @Field({ nullable: true })
   operationGuideType: string
 
+  //can be removed
   @Column({ nullable: true })
   @Field({ nullable: true })
   operationGuide: string

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

@@ -81,8 +81,8 @@ export class VasOrderMutation {
     // 2. Create VasOrder vas
     orderVass = await Promise.all(
       orderVass.map(async (ov: OrderVas) => {
-        if (ov?.targetProduct?.id) {
-          ov.targetProduct = await tx.getRepository(Product).findOne(ov.targetProduct.id)
+        if (ov?.product?.id) {
+          ov.product = await tx.getRepository(Product).findOne(ov.product.id)
         }
         return {
           ...ov,