@things-factory/sales-base 7.0.0-alpha.1 → 7.0.0-alpha.13

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/sales-base",
-  "version": "7.0.0-alpha.1",
+  "version": "7.0.0-alpha.13",
   "main": "dist-server/index.js",
   "browser": "client/index.js",
   "things-factory": true,
@@ -24,17 +24,17 @@
     "migration:create": "node ../../node_modules/typeorm/cli.js migration:create -d ./server/migrations"
   },
   "dependencies": {
-    "@things-factory/attachment-base": "^7.0.0-alpha.1",
-    "@things-factory/auth-base": "^7.0.0-alpha.1",
-    "@things-factory/biz-base": "^7.0.0-alpha.1",
-    "@things-factory/code-base": "^7.0.0-alpha.1",
-    "@things-factory/integration-sftp": "^7.0.0-alpha.1",
-    "@things-factory/notification": "^7.0.0-alpha.1",
-    "@things-factory/product-base": "^7.0.0-alpha.1",
-    "@things-factory/setting-base": "^7.0.0-alpha.1",
-    "@things-factory/shell": "^7.0.0-alpha.1",
-    "@things-factory/transport-base": "^7.0.0-alpha.1",
-    "@things-factory/warehouse-base": "^7.0.0-alpha.1"
+    "@things-factory/attachment-base": "^7.0.0-alpha.9",
+    "@things-factory/auth-base": "^7.0.0-alpha.9",
+    "@things-factory/biz-base": "^7.0.0-alpha.9",
+    "@things-factory/code-base": "^7.0.0-alpha.9",
+    "@things-factory/integration-sftp": "^7.0.0-alpha.13",
+    "@things-factory/notification": "^7.0.0-alpha.9",
+    "@things-factory/product-base": "^7.0.0-alpha.9",
+    "@things-factory/setting-base": "^7.0.0-alpha.9",
+    "@things-factory/shell": "^7.0.0-alpha.9",
+    "@things-factory/transport-base": "^7.0.0-alpha.9",
+    "@things-factory/warehouse-base": "^7.0.0-alpha.13"
   },
-  "gitHead": "778315d165d7f15e147583a45d5079c3d7cbce38"
+  "gitHead": "f4b4bd491776f0a7137bb81862cd6825336716be"
 }

package/server/service/arrival-notice/arrival-notice-mutation.ts

@@ -5,27 +5,13 @@ import { EntityManager, getConnection, In, Repository } from 'typeorm'
 
 import { Attachment, createAttachments } from '@things-factory/attachment-base'
 import { Role, User } from '@things-factory/auth-base'
-import {
-  Bizplace,
-  ContactPoint,
-  getDomainUsers,
-  getMyBizplace,
-  getOutletBizplace,
-  getPermittedBizplaces
-} from '@things-factory/biz-base'
+import { Bizplace, ContactPoint, getDomainUsers, getMyBizplace, getOutletBizplace, getPermittedBizplaces } from '@things-factory/biz-base'
 import { generateId } from '@things-factory/id-rule-base'
 import { Product } from '@things-factory/product-base'
 import { PartnerSetting, Setting } from '@things-factory/setting-base'
 import { Domain, getRepository } from '@things-factory/shell'
 
-import {
-  ORDER_NUMBER_RULE_TYPE,
-  ORDER_NUMBER_SETTING_KEY,
-  ORDER_PRODUCT_STATUS,
-  ORDER_STATUS,
-  ORDER_TYPES,
-  ORDER_VAS_STATUS
-} from '../../constants'
+import { ORDER_NUMBER_RULE_TYPE, ORDER_NUMBER_SETTING_KEY, ORDER_PRODUCT_STATUS, ORDER_STATUS, ORDER_TYPES, ORDER_VAS_STATUS } from '../../constants'
 import { ATTACHMENT_TYPE } from '../../constants/attachment-type'
 import { ValidationError } from '../../errors'
 import { OrderNoGenerator } from '../../utils/order-no-generator'
@@ -64,14 +50,7 @@ export class ArrivalNoticeMutation {
     @Arg('files', type => [GraphQLUpload], { nullable: true }) files?: FileUpload[]
   ): Promise<ArrivalNotice> {
     const { tx } = context.state
-    const createdArrivalNotice: ArrivalNotice = await generateArrivalNoticeFunction(
-      null,
-      arrivalNotice,
-      false,
-      files,
-      context,
-      tx
-    )
+    const createdArrivalNotice: ArrivalNotice = await generateArrivalNoticeFunction(null, arrivalNotice, false, files, context, tx)
 
     return createdArrivalNotice
   }
@@ -223,9 +202,7 @@ export class ArrivalNoticeMutation {
     @Arg('arrivalNotice', type => ArrivalNoticePatch) arrivalNotice: ArrivalNoticePatch
   ): Promise<ArrivalNotice> {
     const { domain, tx } = context.state
-    let existingArrivalNotice = await tx
-      .getRepository(ArrivalNotice)
-      .findOne({ where: { name: arrivalNotice.name, domain: { id: domain.id } } })
+    let existingArrivalNotice = await tx.getRepository(ArrivalNotice).findOne({ where: { name: arrivalNotice.name, domain: { id: domain.id } } })
 
     if (!existingArrivalNotice) {
       throw new Error('Existing Arrival Notice not found.')
@@ -252,18 +229,12 @@ export class ArrivalNoticeMutation {
     let opStatus = ORDER_PRODUCT_STATUS.PENDING_RECEIVE
     let anStatus = ORDER_STATUS.PENDING_RECEIVE
 
-    const foundBizplace: Bizplace = await tx
-      .getRepository(Bizplace)
-      .findOne({ where: { id: bizplaceId }, relations: ['domain'] })
+    const foundBizplace: Bizplace = await tx.getRepository(Bizplace).findOne({ where: { id: bizplaceId }, relations: ['domain'] })
 
     if (!foundBizplace) throw new Error('company not found')
 
     // to check whether the raw data are valid
-    const validatedArrivalNotices: RawArrivalNotice[] = await validateBulkArrivalNoticesFunction(
-      rawArrivalNotices,
-      bizplaceId,
-      tx
-    )
+    const validatedArrivalNotices: RawArrivalNotice[] = await validateBulkArrivalNoticesFunction(rawArrivalNotices, bizplaceId, tx)
 
     // check for custom GAN order no setting
     const ganNoSetting: Setting = await tx.getRepository(Setting).findOne({
@@ -287,9 +258,7 @@ export class ArrivalNoticeMutation {
 
     // If status of GAN is PENDING_RECEIVE then directly to assign warehouse
     if (ganProcessingSetting) {
-      let setting = !isNaN(partnerGanProcessingSetting?.value)
-        ? partnerGanProcessingSetting?.value
-        : ganProcessingSetting.value
+      let setting = !isNaN(partnerGanProcessingSetting?.value) ? partnerGanProcessingSetting?.value : ganProcessingSetting.value
 
       // CONFIRM to assign if setting value is 1
       if (setting == 1) {
@@ -326,9 +295,7 @@ export class ArrivalNoticeMutation {
           // save new arrival notice
           const createdArrivalNotice: ArrivalNotice = await childTx.getRepository(ArrivalNotice).save({
             ...arrivalNotices[i],
-            name: ganNoSetting
-              ? await generateId({ domain, type: ORDER_NUMBER_RULE_TYPE.GAN_NUMBER, seed: {} })
-              : OrderNoGenerator.arrivalNotice(),
+            name: ganNoSetting ? await generateId({ domain, type: ORDER_NUMBER_RULE_TYPE.GAN_NUMBER, seed: {} }) : OrderNoGenerator.arrivalNotice(),
             domain,
             bizplace: foundBizplace,
             status: ORDER_STATUS.PENDING,
@@ -370,14 +337,10 @@ export class ArrivalNoticeMutation {
     if (createdArrivalNoticeIds.length && createdOrderProductIds.length) {
       await getConnection().transaction(async childTx => {
         // update arrivalNotices status to PENDING_RECEIVE
-        await childTx
-          .getRepository(ArrivalNotice)
-          .update({ id: In(createdArrivalNoticeIds) }, { status: anStatus, updater: user })
+        await childTx.getRepository(ArrivalNotice).update({ id: In(createdArrivalNoticeIds) }, { status: anStatus, updater: user })
 
         // update orderProducts status to PENDING_RECEIVE
-        await childTx
-          .getRepository(OrderProduct)
-          .update({ id: In(createdOrderProductIds) }, { status: opStatus, updater: user })
+        await childTx.getRepository(OrderProduct).update({ id: In(createdOrderProductIds) }, { status: opStatus, updater: user })
 
         finalArrivalNoticeList = await childTx.getRepository(ArrivalNotice).find({
           where: { id: In(createdArrivalNoticeIds) },
@@ -399,12 +362,7 @@ export class ArrivalNoticeMutation {
   }
 }
 
-export async function deleteArrivalNotice(
-  tx: EntityManager,
-  name: string,
-  user: User,
-  domain: Domain
-): Promise<boolean> {
+export async function deleteArrivalNotice(tx: EntityManager, name: string, user: User, domain: Domain): Promise<boolean> {
   let foundArrivalNotice: ArrivalNotice = await tx.getRepository(ArrivalNotice).findOne({
     where: { domain: { id: domain.id }, name },
     relations: ['bizplace', 'releaseGood', 'orderProducts', 'orderVass', 'collectionOrders', 'creator', 'updater']
@@ -492,7 +450,7 @@ export async function generateArrivalNoticeFunction(
 
   if (arrivalNotice.supplier) {
     const supplier: ContactPoint = await tx.getRepository(ContactPoint).findOne({
-      where: { bizplace: { id: arrivalNotice.supplier.id }, domain: { id: domain.id } },
+      where: { id: arrivalNotice.supplier, domain: { id: domain.id } },
       relations: ['bizplace']
     })
 
@@ -579,26 +537,12 @@ export async function generateArrivalNoticeFunction(
   return createdArrivalNotice
 }
 
-export async function confirmArrivalNoticeFunction(
-  name: string,
-  context: any,
-  tx?: EntityManager
-): Promise<ArrivalNotice> {
+export async function confirmArrivalNoticeFunction(name: string, context: any, tx?: EntityManager): Promise<ArrivalNotice> {
   const { user, domain } = context.state
 
   const foundArrivalNotice: ArrivalNotice = await tx.getRepository(ArrivalNotice).findOne({
     where: { domain: { id: domain.id }, name, status: ORDER_STATUS.PENDING },
-    relations: [
-      'bizplace',
-      'bizplace.domain',
-      'releaseGood',
-      'orderProducts',
-      'orderProducts.product',
-      'orderVass',
-      'orderVass.vas',
-      'creator',
-      'updater'
-    ]
+    relations: ['bizplace', 'bizplace.domain', 'releaseGood', 'orderProducts', 'orderProducts.product', 'orderVass', 'orderVass.vas', 'creator', 'updater']
   })
 
   let foundOPs: OrderProduct[] = foundArrivalNotice.orderProducts
@@ -624,9 +568,7 @@ export async function confirmArrivalNoticeFunction(
       }
     })
 
-    let setting = !isNaN(partnerGanProcessingSetting?.value)
-      ? partnerGanProcessingSetting?.value
-      : ganProcessingSetting.value
+    let setting = !isNaN(partnerGanProcessingSetting?.value) ? partnerGanProcessingSetting?.value : ganProcessingSetting.value
 
     // CONFIRM to assign if setting value is 1
     if (setting == 1) {
@@ -706,11 +648,7 @@ export async function confirmArrivalNoticeFunction(
   return arrivalNotice
 }
 
-export async function receiveArrivalNoticeFunction(
-  _: any,
-  name: string,
-  context: ResolverContext
-): Promise<ArrivalNotice> {
+export async function receiveArrivalNoticeFunction(_: any, name: string, context: ResolverContext): Promise<ArrivalNotice> {
   const { user, domain, tx } = context.state
   try {
     const foundArrivalNotice: ArrivalNotice = await tx.getRepository(ArrivalNotice).findOne({
@@ -743,9 +681,7 @@ export async function receiveArrivalNoticeFunction(
         }
       })
 
-      let setting = !isNaN(partnerGanProcessingSetting?.value)
-        ? partnerGanProcessingSetting?.value
-        : ganProcessingSetting.value
+      let setting = !isNaN(partnerGanProcessingSetting?.value) ? partnerGanProcessingSetting?.value : ganProcessingSetting.value
 
       // RECEIVE to assign if setting value is 2
       if (setting == 2) {
@@ -829,11 +765,7 @@ export async function receiveArrivalNoticeFunction(
   }
 }
 
-export async function checkArrivedNoticeFunction(
-  name: string,
-  context: any,
-  tx?: EntityManager
-): Promise<ArrivalNotice> {
+export async function checkArrivedNoticeFunction(name: string, context: any, tx?: EntityManager): Promise<ArrivalNotice> {
   const { user, domain } = context.state
   try {
     const foundArrivalNotice: ArrivalNotice = await tx.getRepository(ArrivalNotice).findOne({
@@ -915,12 +847,7 @@ export async function checkArrivedNoticeFunction(
   }
 }
 
-export async function rejectArrivalNotice(
-  tx: EntityManager,
-  name: string,
-  remark: string,
-  context: any
-): Promise<ArrivalNotice> {
+export async function rejectArrivalNotice(tx: EntityManager, name: string, remark: string, context: any): Promise<ArrivalNotice> {
   const { user, domain } = context.state
 
   const foundArrivalNotice: ArrivalNotice = await tx.getRepository(ArrivalNotice).findOne({
@@ -994,13 +921,7 @@ export async function rejectArrivalNotice(
   return foundArrivalNotice
 }
 
-export async function addArrivalNoticeProducts(
-  domain: Domain,
-  arrivalNotice: ArrivalNotice,
-  newOrderProducts: any[],
-  user: User,
-  tx?: EntityManager
-): Promise<void> {
+export async function addArrivalNoticeProducts(domain: Domain, arrivalNotice: ArrivalNotice, newOrderProducts: any[], user: User, tx?: EntityManager): Promise<void> {
   const productRepo: Repository<Product> = tx?.getRepository(Product) || getRepository(Product)
   const orderProductRepo: Repository<OrderProduct> = tx?.getRepository(OrderProduct) || getRepository(OrderProduct)
 
@@ -1029,11 +950,7 @@ export async function addArrivalNoticeProducts(
   await orderProductRepo.save(createdOrderProducts)
 }
 
-export async function editArrivalNoticeProducts(
-  existingOrderProducts: (OrderProduct | OrderProductPatch)[],
-  user: User,
-  tx?: EntityManager
-): Promise<void> {
+export async function editArrivalNoticeProducts(existingOrderProducts: (OrderProduct | OrderProductPatch)[], user: User, tx?: EntityManager): Promise<void> {
   const orderProductRepo: Repository<OrderProduct> = tx?.getRepository(OrderProduct) || getRepository(OrderProduct)
 
   const updatedOrderProducts: OrderProduct[] = await Promise.all(
@@ -1057,17 +974,7 @@ function extractArrivalNotices(rawArrivalNotices): Partial<ArrivalNotice[]> {
 
     const idx: number = arrivalNotices.findIndex(an => {
       // consider these attributes if they are exist in "item"
-      const comparison = [
-        'refNo2',
-        'refNo3',
-        'truckNo',
-        'ownTransport',
-        'container',
-        'containerNo',
-        'containerSize',
-        'looseItem',
-        'importCargo'
-      ]
+      const comparison = ['refNo2', 'refNo3', 'truckNo', 'ownTransport', 'container', 'containerNo', 'containerSize', 'looseItem', 'importCargo']
 
       let a: any = {},
         b: any = {}
@@ -1103,11 +1010,7 @@ function extractArrivalNotices(rawArrivalNotices): Partial<ArrivalNotice[]> {
 
     if (idx >= 0) {
       const duplicateSkuIdx: number = arrivalNotices[idx].orderProducts.findIndex(
-        op =>
-          op.sku === raw.sku &&
-          op.packingType === raw.packingType &&
-          op.packingSize === raw.packingSize &&
-          op.batchId === raw.batchId
+        op => op.sku === raw.sku && op.packingType === raw.packingType && op.packingSize === raw.packingSize && op.batchId === raw.batchId
       )
 
       if (duplicateSkuIdx >= 0) arrivalNotices[idx].orderProducts[duplicateSkuIdx].packQty += raw.packQty