@things-factory/worksheet-base 5.0.12 → 6.0.0-alpha.0

package/server/graphql/resolvers/worksheet/putaway/complete-putaway.ts

@@ -11,12 +11,12 @@ import { EcommerceController, SellercraftController } from '../../../../controll
 import { Worksheet } from '../../../../entities'
 
 export const completePutawayResolver = {
-  async completePutaway(_: any, { arrivalNoticeNo }, context: any) {
-    const { tx, user, domain }: { tx: EntityManager; user: User; domain: Domain } = context.state
+  async completePutaway(_: any, { arrivalNoticeNo }, context: ResolverContext) {
+    const { tx, user, domain } = context.state
     await completePutaway(tx, domain, user, arrivalNoticeNo)
 
     const arrivalNotice: ArrivalNotice = await tx.getRepository(ArrivalNotice).findOne({
-      where: { domain, name: arrivalNoticeNo },
+      where: { domain: { id: domain.id }, name: arrivalNoticeNo },
       relations: [
         'purchaseOrder',
         'bizplace',
@@ -40,7 +40,7 @@ export const completePutawayResolver = {
 
     const sellercraft: Sellercraft = await tx
       .getRepository(Sellercraft)
-      .findOne({ domain: customerDomain, status: SellercraftStatus.ACTIVE })
+      .findOneBy({ domain: customerDomain, status: SellercraftStatus.ACTIVE })
 
     if (sellercraft) {
       const sellercraftCtrl: SellercraftController = new SellercraftController(tx, domain, user)
@@ -67,7 +67,8 @@ export async function completePutaway(
    * 4. Generate the Goods Received Note straight away
    */
   if (!worksheet.arrivalNotice?.name || !worksheet.bizplace?.id) {
-    worksheet = await tx.getRepository(Worksheet).findOne(worksheet.id, {
+    worksheet = await tx.getRepository(Worksheet).findOne({
+      where: { id: worksheet.id },
       relations: ['bizplace', 'arrivalNotice']
     })
   }

package/server/graphql/resolvers/worksheet/putaway/putaway.ts

@@ -1,11 +1,13 @@
+import { EntityManager } from 'typeorm'
+
 import { User } from '@things-factory/auth-base'
 import { Domain } from '@things-factory/shell'
-import { EntityManager } from 'typeorm'
+
 import { PutawayWorksheetController } from '../../../../controllers'
 
 export const putawayResolver = {
-  async putaway(_: any, { worksheetDetailName, palletId, cartonId, toLocation }, context: any) {
-    const { tx, domain, user }: { tx: EntityManager; domain: Domain; user: User } = context.state
+  async putaway(_: any, { worksheetDetailName, palletId, cartonId, toLocation }, context: ResolverContext) {
+    const { tx, domain, user } = context.state
     await putaway(tx, domain, user, worksheetDetailName, palletId, cartonId, toLocation)
   }
 }

package/server/graphql/resolvers/worksheet/putaway/undo-putaway.ts

@@ -1,11 +1,13 @@
+import { EntityManager } from 'typeorm'
+
 import { User } from '@things-factory/auth-base'
 import { Domain } from '@things-factory/shell'
-import { EntityManager } from 'typeorm'
+
 import { PutawayWorksheetController } from '../../../../controllers'
 
 export const undoPutawayResolver = {
-  async undoPutaway(_: any, { worksheetDetailName, palletId, cartonId }, context: any) {
-    const { tx, domain, user }: { tx: EntityManager; domain: Domain; user: User } = context.state
+  async undoPutaway(_: any, { worksheetDetailName, palletId, cartonId }, context: ResolverContext) {
+    const { tx, domain, user } = context.state
     await undoPutaway(tx, domain, user, worksheetDetailName, palletId, cartonId)
   }
 }

package/server/graphql/resolvers/worksheet/putaway-return/activate-putaway-return.ts

@@ -1,13 +1,15 @@
+import { EntityManager, Equal, Not } from 'typeorm'
+
 import { User } from '@things-factory/auth-base'
 import { Domain } from '@things-factory/shell'
-import { EntityManager, Equal, Not } from 'typeorm'
+
 import { WORKSHEET_STATUS, WORKSHEET_TYPE } from '../../../../constants'
 import { PutawayReturningWorksheetController } from '../../../../controllers'
 import { Worksheet, WorksheetDetail } from '../../../../entities'
 
 export const activatePutawayReturnResolver = {
-  async activatePutawayReturn(_: any, { worksheetNo, putawayWorksheetDetails }, context: any) {
-    const { tx, domain, user }: { tx: EntityManager; domain: Domain; user: User } = context.state
+  async activatePutawayReturn(_: any, { worksheetNo, putawayWorksheetDetails }, context: ResolverContext) {
+    const { tx, domain, user } = context.state
     const foundWorksheet: Worksheet = await tx.getRepository(Worksheet).findOne({
       where: {
         domain: domain,

package/server/graphql/resolvers/worksheet/putaway-return/complete-putaway-return.ts

@@ -1,13 +1,15 @@
+import { EntityManager } from 'typeorm'
+
 import { User } from '@things-factory/auth-base'
 import { Domain } from '@things-factory/shell'
-import { EntityManager } from 'typeorm'
+
 import { PutawayReturningWorksheetController } from '../../../../controllers'
 import { Worksheet } from '../../../../entities'
 
 export const completePutawayReturnResolver = {
-  async completePutawayReturn(_: any, { returnOrderNo }, context: any) {
-      const { tx, domain, user }: { tx: EntityManager; domain: Domain; user: User } = context.state
-      await completePutawayReturn(tx, domain, user, returnOrderNo)
+  async completePutawayReturn(_: any, { returnOrderNo }, context: ResolverContext) {
+    const { tx, domain, user } = context.state
+    await completePutawayReturn(tx, domain, user, returnOrderNo)
   }
 }
 
@@ -17,14 +19,19 @@ export async function completePutawayReturn(
   user: User,
   returnOrderNo: string
 ): Promise<void> {
-  const worksheetController: PutawayReturningWorksheetController = new PutawayReturningWorksheetController(tx, domain, user)
+  const worksheetController: PutawayReturningWorksheetController = new PutawayReturningWorksheetController(
+    tx,
+    domain,
+    user
+  )
   let worksheet: Worksheet = await worksheetController.completePutawayReturn(returnOrderNo)
 
   /**
    * 4. Generate the Goods Received Note straight away
    */
   if (!worksheet.returnOrder?.name || !worksheet.bizplace?.id) {
-    worksheet = await tx.getRepository(Worksheet).findOne(worksheet.id, {
+    worksheet = await tx.getRepository(Worksheet).findOne({
+      where: { id: worksheet.id },
       relations: ['bizplace', 'returnOrder']
     })
   }

package/server/graphql/resolvers/worksheet/putaway-return/putaway-return.ts

@@ -1,11 +1,13 @@
+import { EntityManager } from 'typeorm'
+
 import { User } from '@things-factory/auth-base'
 import { Domain } from '@things-factory/shell'
-import { EntityManager } from 'typeorm'
+
 import { PutawayReturningWorksheetController } from '../../../../controllers'
 
 export const putawayReturnResolver = {
-  async putawayReturn(_: any, { worksheetDetailName, palletId, cartonId, toLocation }, context: any) {
-    const { tx, domain, user }: { tx: EntityManager; domain: Domain; user: User } = context.state
+  async putawayReturn(_: any, { worksheetDetailName, palletId, cartonId, toLocation }, context: ResolverContext) {
+    const { tx, domain, user } = context.state
     await putawayReturn(tx, domain, user, worksheetDetailName, palletId, cartonId, toLocation)
   }
 }

package/server/graphql/resolvers/worksheet/putaway-return/undo-putaway-return.ts

@@ -1,11 +1,13 @@
+import { EntityManager } from 'typeorm'
+
 import { User } from '@things-factory/auth-base'
 import { Domain } from '@things-factory/shell'
-import { EntityManager } from 'typeorm'
+
 import { PutawayReturningWorksheetController } from '../../../../controllers'
 
 export const undoPutawayReturnResolver = {
-  async undoPutawayReturn(_: any, { worksheetDetailName, palletId, cartonId }, context: any) {
-    const { tx, domain, user }: { tx: EntityManager; domain: Domain; user: User } = context.state
+  async undoPutawayReturn(_: any, { worksheetDetailName, palletId, cartonId }, context: ResolverContext) {
+    const { tx, domain, user } = context.state
     await undoPutawayReturn(tx, domain, user, worksheetDetailName, palletId, cartonId)
   }
 }

package/server/graphql/resolvers/worksheet/putaway-returning-worksheet.ts

@@ -1,8 +1,6 @@
-import { getRepository } from 'typeorm'
-
 import { Bizplace } from '@things-factory/biz-base'
 import { OrderInventory, ReturnOrder } from '@things-factory/sales-base'
-import { Domain } from '@things-factory/shell'
+import { Domain, getRepository } from '@things-factory/shell'
 import { Inventory } from '@things-factory/warehouse-base'
 
 import { WORKSHEET_TYPE } from '../../../constants'
@@ -10,14 +8,14 @@ import { Worksheet, WorksheetDetail } from '../../../entities'
 import { fetchExecutingWorksheet } from '../../../utils'
 
 export const putawayReturningWorksheetResolver = {
-  async putawayReturningWorksheet(_: any, { returnOrderNo }, context: any) {
-    const { domain }: { domain: Domain } = context.state
+  async putawayReturningWorksheet(_: any, { returnOrderNo }, context: ResolverContext) {
+    const { domain } = context.state
     const returnOrder: ReturnOrder = await getRepository(ReturnOrder).findOne({
       // Because of partial unloading current status of returnOrder can be PUTTING_AWAY or PROCESSING
       // PUTTING_AWAY means unloading is completely finished.
       // PROCESSING means some products are still being unloaded.
       where: {
-        domain,
+        domain: { id: domain.id },
         name: returnOrderNo
         /*status: In([ORDER_STATUS.PUTTING_AWAY, ORDER_STATUS.PROCESSING])*/
       },

package/server/graphql/resolvers/worksheet/putaway-worksheet.ts

@@ -1,8 +1,6 @@
-import { getRepository } from 'typeorm'
-
 import { Bizplace } from '@things-factory/biz-base'
 import { ArrivalNotice, OrderInventory } from '@things-factory/sales-base'
-import { Domain } from '@things-factory/shell'
+import { Domain, getRepository } from '@things-factory/shell'
 import { Inventory } from '@things-factory/warehouse-base'
 
 import { WORKSHEET_TYPE } from '../../../constants'
@@ -10,14 +8,14 @@ import { Worksheet, WorksheetDetail } from '../../../entities'
 import { fetchExecutingWorksheet } from '../../../utils'
 
 export const putawayWorksheetResolver = {
-  async putawayWorksheet(_: any, { arrivalNoticeNo }, context: any) {
-    const { domain }: { domain: Domain } = context.state
+  async putawayWorksheet(_: any, { arrivalNoticeNo }, context: ResolverContext) {
+    const { domain } = context.state
     const arrivalNotice: ArrivalNotice = await getRepository(ArrivalNotice).findOne({
       // Because of partial unloading current status of arrivalNotice can be PUTTING_AWAY or PROCESSING
       // PUTTING_AWAY means unloading is completely finished.
       // PROCESSING means some products are still being unloaded.
       where: {
-        domain,
+        domain: { id: domain.id },
         name: arrivalNoticeNo
         /*status: In([ORDER_STATUS.PUTTING_AWAY, ORDER_STATUS.PROCESSING])*/
       },

package/server/graphql/resolvers/worksheet/recommend-putway-location.ts

@@ -1,8 +1,8 @@
-import { getRepository, In } from 'typeorm'
+import { In } from 'typeorm'
 
 import { ArrivalNotice, ReturnOrder } from '@things-factory/sales-base'
 import { Setting } from '@things-factory/setting-base'
-import { Domain } from '@things-factory/shell'
+import { Domain, getRepository } from '@things-factory/shell'
 import { Inventory, Location, LOCATION_STATUS, LOCATION_TYPE, Warehouse } from '@things-factory/warehouse-base'
 
 import { WORKSHEET_STATUS, WORKSHEET_TYPE } from '../../../constants'
@@ -17,18 +17,19 @@ export const recommendPutawayLocationResolver = {
   ): Promise<Location[]> {
     const domain: Domain = context.state.domain
 
-    const worksheetDetail: WorksheetDetail = await getRepository(WorksheetDetail).findOne(
-      { domain, name: worksheetDetailName },
-      {
-        relations: [
-          'worksheet',
-          'worksheet.arrivalNotice',
-          'worksheet.returnOrder',
-          'targetInventory',
-          'targetInventory.inventory'
-        ]
-      }
-    )
+    const worksheetDetail: WorksheetDetail = await getRepository(WorksheetDetail).findOne({
+      where: {
+        domain: { id: domain.id },
+        name: worksheetDetailName
+      },
+      relations: [
+        'worksheet',
+        'worksheet.arrivalNotice',
+        'worksheet.returnOrder',
+        'targetInventory',
+        'targetInventory.inventory'
+      ]
+    })
 
     const inventory: Inventory = worksheetDetail.targetInventory.inventory
     if (worksheetDetail.status !== WORKSHEET_STATUS.EXECUTING) throw new Error('Current target is not processing')
@@ -39,19 +40,19 @@ export const recommendPutawayLocationResolver = {
     let unloadingWS: Worksheet
     if (arrivalNotice) {
       unloadingWS = await getRepository(Worksheet).findOne({
-        where: { domain, arrivalNotice, type: WORKSHEET_TYPE.UNLOADING },
+        where: { domain: { id: domain.id }, arrivalNotice, type: WORKSHEET_TYPE.UNLOADING },
         relations: ['bufferLocation', 'bufferLocation.warehouse']
       })
     } else if (returnOrder) {
       unloadingWS = await getRepository(Worksheet).findOne({
-        where: { domain, returnOrder, type: WORKSHEET_TYPE.UNLOADING_RETURN },
+        where: { domain: { id: domain.id }, returnOrder, type: WORKSHEET_TYPE.UNLOADING_RETURN },
         relations: ['bufferLocation', 'bufferLocation.warehouse']
       })
     }
 
     const targetWarehouse: Warehouse = unloadingWS.bufferLocation.warehouse
     const sortingLevelSetting: Setting = await getRepository(Setting).findOne({
-      where: { domain, name: 'location-recommendation-level' }
+      where: { domain: { id: domain.id }, name: 'location-recommendation-level' }
     })
     const sortingLevel = sortingLevelSetting?.value
 
@@ -109,14 +110,14 @@ export async function getEmptyLocations(
   allowedTypes: LOCATION_TYPE[]
 ): Promise<Location[]> {
   const orderSetting: Setting = await getRepository(Setting).findOne({
-    where: { domain, name: 'rule-for-storing-product' }
+    where: { domain: { id: domain.id }, name: 'rule-for-storing-product' }
   })
   let order = {}
   if (orderSetting?.value) order = JSON.parse(orderSetting.value)
 
   return await getRepository(Location).find({
     where: {
-      domain,
+      domain: { id: domain.id },
       warehouse,
       status: LOCATION_STATUS.EMPTY,
       type: In(allowedTypes)