@things-factory/warehouse-base 5.0.14 → 6.0.0-alpha.3

package/server/service/location/location-query.ts

@@ -1,9 +1,8 @@
 import { Arg, Args, Ctx, Directive, FieldResolver, Query, Resolver, Root } from 'type-graphql'
-import { getRepository } from 'typeorm'
 
 import { User } from '@things-factory/auth-base'
 import { getPermittedBizplaceIds } from '@things-factory/biz-base'
-import { buildQuery, Domain, ListParam } from '@things-factory/shell'
+import { buildQuery, Domain, getRepository, ListParam } from '@things-factory/shell'
 
 import { INVENTORY_STATUS } from '../../constants/inventory'
 import { Warehouse } from '../warehouse/warehouse'
@@ -14,7 +13,7 @@ import { LocationInventories, LocationList, LocationOccupancy } from './location
 export class LocationQuery {
   @Directive('@privilege(category: "warehouse", privilege: "query")')
   @Query(returns => LocationList)
-  async locations(@Args() params: ListParam, @Ctx() context: any): Promise<LocationList> {
+  async locations(@Args() params: ListParam, @Ctx() context: ResolverContext): Promise<LocationList> {
     const queryBuilder = getRepository(Location).createQueryBuilder()
     buildQuery(queryBuilder, params, context)
     const [items, total] = await queryBuilder.getManyAndCount()
@@ -30,8 +29,8 @@ export class LocationQuery {
    * */
   @Directive('@privilege(category: "warehouse", privilege: "query")')
   @Query(returns => LocationList)
-  async pureLocations(@Args() params: ListParam, @Ctx() context: any): Promise<LocationList> {
-    const queryBuilder = getRepository(Location).createQueryBuilder()
+  async pureLocations(@Args() params: ListParam, @Ctx() context: ResolverContext): Promise<LocationList> {
+    const queryBuilder = getRepository(Location).createQueryBuilder('location')
     buildQuery(queryBuilder, params, context)
     const items = await queryBuilder.getRawMany()
     const total = await queryBuilder.getCount()
@@ -44,13 +43,13 @@ export class LocationQuery {
   async locationOccupancies(
     @Arg('warehouse') warehouse: string,
     @Arg('types', type => [String], { nullable: true }) types: string[],
-    @Ctx() context: any
+    @Ctx() context: ResolverContext
   ): Promise<LocationOccupancy> {
-    const { domain }: { domain: Domain } = context.state
+    const { domain } = context.state
 
     const foundWarehouse: Warehouse = await getRepository(Warehouse).findOne({
       where: {
-        domain,
+        domain: { id: domain.id },
         name: warehouse
       },
       relations: ['locations']
@@ -73,7 +72,7 @@ export class LocationQuery {
 
   @Directive('@privilege(category: "warehouse", privilege: "query")')
   @Query(returns => Location)
-  async location(@Arg('name') name: string, @Ctx() context: any): Promise<Location> {
+  async location(@Arg('name') name: string, @Ctx() context: ResolverContext): Promise<Location> {
     const foundLocation: Location | null = await getRepository(Location).findOne({
       where: { name },
       relations: ['domain', 'warehouse', 'creator', 'updater']
@@ -85,8 +84,8 @@ export class LocationQuery {
 
   @Directive('@privilege(category: "warehouse", privilege: "query")')
   @Query(returns => Location)
-  async locationByName(@Arg('name') name: string, @Ctx() context: any): Promise<Location> {
-    const { domain }: { domain: Domain } = context.state
+  async locationByName(@Arg('name') name: string, @Ctx() context: ResolverContext): Promise<Location> {
+    const { domain } = context.state
 
     return await getRepository(Location).findOne({
       where: {
@@ -99,8 +98,8 @@ export class LocationQuery {
 
   @Directive('@privilege(category: "warehouse", privilege: "query")')
   @Query(returns => LocationList)
-  async locationsByGroup(@Args() params: ListParam, @Ctx() context: any): Promise<LocationList> {
-    const { domain }: { domain: Domain } = context.state
+  async locationsByGroup(@Args() params: ListParam, @Ctx() context: ResolverContext): Promise<LocationList> {
+    const { domain } = context.state
     const warehouseIdParam = params.filters.find(param => (param.name = 'warehouse_id'))
 
     if (!warehouseIdParam.value) throw new Error(`invalid warehouse ID`)
@@ -125,16 +124,21 @@ export class LocationQuery {
 
   @Directive('@privilege(category: "warehouse", privilege: "query")')
   @Query(returns => LocationInventories)
-  async locationWithInventories(@Args() params: ListParam, @Ctx() context: any): Promise<LocationInventories> {
-    const { domain, user }: { domain: Domain; user: User } = context.state
+  async locationWithInventories(
+    @Args() params: ListParam,
+    @Ctx() context: ResolverContext
+  ): Promise<LocationInventories> {
+    const { domain, user } = context.state
     const bizplaceIds = await getPermittedBizplaceIds(domain, user)
     const queryBuilder = getRepository(Location).createQueryBuilder()
 
-    const warehouseNames = params.filters.find(x => x.name === 'warehouseNames' && x.operator.toLowerCase() === 'in')
-      ?.value
+    const warehouseNames = params.filters.find(
+      x => x.name === 'warehouseNames' && x.operator.toLowerCase() === 'in'
+    )?.value
 
-    const locationTypes = params.filters.find(x => x.name === 'locationTypes' && x.operator.toLowerCase() === 'in')
-      ?.value
+    const locationTypes = params.filters.find(
+      x => x.name === 'locationTypes' && x.operator.toLowerCase() === 'in'
+    )?.value
 
     params.filters = []
     buildQuery(queryBuilder, params, context)
@@ -209,21 +213,21 @@ export class LocationQuery {
 
   @FieldResolver(type => Domain)
   async domain(@Root() location: Location) {
-    return await getRepository(Domain).findOne(location.domain?.id)
+    return await getRepository(Domain).findOneBy({ id: location.domain?.id })
   }
 
   @FieldResolver(type => User)
   async updater(@Root() location: Location) {
-    return await getRepository(User).findOne(location.updaterId)
+    return await getRepository(User).findOneBy({ id: location.updaterId })
   }
 
   @FieldResolver(type => User)
   async creator(@Root() location: Location) {
-    return await getRepository(User).findOne(location.creatorId)
+    return await getRepository(User).findOneBy({ id: location.creatorId })
   }
 
   @FieldResolver(type => Warehouse)
   async warehouse(@Root() location: Location): Promise<Warehouse> {
-    return await getRepository(Warehouse).findOne(location.warehouse?.id)
+    return await getRepository(Warehouse).findOneBy({ id: location.warehouse?.id })
   }
 }

package/server/service/location/location.ts

@@ -19,6 +19,7 @@ import { Warehouse } from '../warehouse/warehouse'
 @Index('ix_location_0', (location: Location) => [location.domain, location.name], { unique: true })
 @Index('ix_location_1', (location: Location) => [location.id], { unique: true })
 @Index('ix_location_2', (location: Location) => [location.domain])
+@Index('ix_location_3', (location: Location) => [location.domain, location.name, location.type])
 @ObjectType()
 export class Location {
   @PrimaryGeneratedColumn('uuid')
@@ -105,16 +106,16 @@ export class Location {
 
   constructor(obj?) {
     if (obj) {
-      this.id = obj.Location_id
-      this.name = obj.Location_name
-      this.description = obj.Location_description
-      this.type = obj.Location_type
-      this.zone = obj.Location_zone
-      this.row = obj.Location_row
-      this.column = obj.Location_column
-      this.shelf = obj.Location_shelf
-      this.status = obj.Location_status
-      this.updatedAt = obj.Location_updated_at
+      this.id = obj.location_id
+      this.name = obj.location_name
+      this.description = obj.location_description
+      this.type = obj.location_type
+      this.zone = obj.location_zone
+      this.row = obj.location_row
+      this.column = obj.location_column
+      this.shelf = obj.location_shelf
+      this.status = obj.location_status
+      this.updatedAt = obj.location_updated_at
     }
   }
 }

package/server/service/movement/movement-mutation.ts

@@ -1,9 +1,8 @@
 import { Arg, Ctx, Directive, Mutation, Resolver } from 'type-graphql'
-import { getRepository, In } from 'typeorm'
+import { In } from 'typeorm'
 
-import { User } from '@things-factory/auth-base'
 import { getPermittedBizplaceIds } from '@things-factory/biz-base'
-import { Domain } from '@things-factory/shell'
+import { getRepository } from '@things-factory/shell'
 
 import { Inventory } from '../inventory/inventory'
 import { Movement } from './movement'
@@ -14,8 +13,8 @@ export class MovementMutation {
   @Directive('@privilege(category: "movement", privilege: "mutation")')
   @Directive('@transaction')
   @Mutation(returns => Movement)
-  async createMovement(@Arg('movement') movement: NewMovement, @Ctx() context: any): Promise<Movement> {
-    const { domain, user }: { domain: Domain; user: User } = context.state
+  async createMovement(@Arg('movement') movement: NewMovement, @Ctx() context: ResolverContext): Promise<Movement> {
+    const { domain, user } = context.state
     return await getRepository(Movement).save({
       ...movement,
       domain,
@@ -30,7 +29,7 @@ export class MovementMutation {
   async updateMovement(
     @Arg('id') id: string,
     @Arg('patch') patch: MovementPatch,
-    @Ctx() context: any
+    @Ctx() context: ResolverContext
   ): Promise<Movement> {
     const movement = await getRepository(Movement).findOne({
       where: {
@@ -41,7 +40,7 @@ export class MovementMutation {
     })
 
     if (patch.inventory && patch.inventory.id) {
-      patch.inventory = await getRepository(Inventory).findOne(patch.inventory.id)
+      patch.inventory = await getRepository(Inventory).findOneBy({ id: patch.inventory.id })
     }
 
     return await getRepository(Movement).save({
@@ -54,7 +53,7 @@ export class MovementMutation {
   @Directive('@privilege(category: "movement", privilege: "mutation")')
   @Directive('@transaction')
   @Mutation(returns => Boolean)
-  async deleteMovement(@Arg('name') name: string, @Ctx() context: any): Promise<Boolean> {
+  async deleteMovement(@Arg('name') name: string, @Ctx() context: ResolverContext): Promise<Boolean> {
     await getRepository(Movement).delete(name)
     return true
   }

package/server/service/movement/movement-query.ts

@@ -1,9 +1,9 @@
 import { Arg, Args, Ctx, Directive, FieldResolver, Query, Resolver, Root } from 'type-graphql'
-import { getRepository, In } from 'typeorm'
+import { In } from 'typeorm'
 
 import { User } from '@things-factory/auth-base'
 import { getPermittedBizplaceIds } from '@things-factory/biz-base'
-import { convertListParams, Domain, ListParam } from '@things-factory/shell'
+import { convertListParams, Domain, getRepository, ListParam } from '@things-factory/shell'
 
 import { InventoryHistory } from '../inventory-history/inventory-history'
 import { Movement } from './movement'
@@ -13,7 +13,7 @@ import { MovementCount, MovementList } from './movement-types'
 export class MovementQuery {
   @Directive('@privilege(category: "movement", privilege: "query")')
   @Query(returns => MovementList)
-  async movements(@Args() params: ListParam, @Ctx() context: any): Promise<MovementList> {
+  async movements(@Args() params: ListParam, @Ctx() context: ResolverContext): Promise<MovementList> {
     const convertedParams = convertListParams(params)
     convertedParams.where.bizplace = In(await getPermittedBizplaceIds(context.state.domain, context.state.user))
 
@@ -26,20 +26,22 @@ export class MovementQuery {
 
   @Directive('@privilege(category: "movement", privilege: "query")')
   @Query(returns => Movement)
-  async movement(@Arg('name') name: string, @Ctx() context: any): Promise<Movement> {
+  async movement(@Arg('name') name: string, @Ctx() context: ResolverContext): Promise<Movement> {
+    const { domain, user } = context.state
+
     return await getRepository(Movement).findOne({
       where: {
-        domain: context.state.domain,
-        name,
-        bizplace: In(await getPermittedBizplaceIds(context.state.domain, context.state.user))
+        domain: { id: domain.id },
+        /* name,*/
+        bizplace: In(await getPermittedBizplaceIds(domain, user))
       },
       relations: ['domain', 'bizplace', 'inventory', 'creator', 'updater']
     })
   }
 
   @Query(returns => [MovementCount])
-  async inboundMovementsCounter(@Args() params: ListParam, @Ctx() context: any): Promise<MovementCount[]> {
-    const { domain, user }: { domain: Domain; user: User } = context.state
+  async inboundMovementsCounter(@Args() params: ListParam, @Ctx() context: ResolverContext): Promise<MovementCount[]> {
+    const { domain, user } = context.state
 
     let bizplaces = (await getPermittedBizplaceIds(domain, user))
       .map(bizplace => {
@@ -98,8 +100,8 @@ export class MovementQuery {
   }
 
   @Query(returns => [MovementCount])
-  async outboundMovementsCounter(@Args() params: ListParam, @Ctx() context: any): Promise<MovementCount[]> {
-    const { domain, user }: { domain: Domain; user: User } = context.state
+  async outboundMovementsCounter(@Args() params: ListParam, @Ctx() context: ResolverContext): Promise<MovementCount[]> {
+    const { domain, user } = context.state
 
     let bizplaces = (await getPermittedBizplaceIds(domain, user))
       .map(bizplace => {
@@ -163,9 +165,9 @@ export class MovementQuery {
   async weeklyMovementsCounter(
     @Arg('month') month: number,
     @Arg('year') year: number,
-    @Ctx() context: any
+    @Ctx() context: ResolverContext
   ): Promise<MovementCount[]> {
-    const { domain, user }: { domain: Domain; user: User } = context.state
+    const { domain, user } = context.state
 
     let bizplaces = (await getPermittedBizplaceIds(domain, user))
       .map(bizplace => {
@@ -226,17 +228,17 @@ export class MovementQuery {
 
   @FieldResolver(type => Domain)
   async domain(@Root() movement: Movement) {
-    return await getRepository(Domain).findOne(movement.domainId)
+    return await getRepository(Domain).findOneBy({ id: movement.domainId })
   }
 
   @FieldResolver(type => User)
   async updater(@Root() movement: Movement) {
-    return await getRepository(User).findOne(movement.updaterId)
+    return await getRepository(User).findOneBy({ id: movement.updaterId })
   }
 
   @FieldResolver(type => User)
   async creator(@Root() movement: Movement) {
-    return await getRepository(User).findOne(movement.creatorId)
+    return await getRepository(User).findOneBy({ id: movement.creatorId })
   }
 }
 

package/server/service/pallet/pallet-mutation.ts

@@ -1,9 +1,7 @@
 import { Arg, Ctx, Directive, Mutation, Resolver } from 'type-graphql'
-import { EntityManager, In } from 'typeorm'
+import { In } from 'typeorm'
 
-import { User } from '@things-factory/auth-base'
 import { Bizplace } from '@things-factory/biz-base'
-import { Domain } from '@things-factory/shell'
 
 import { PalletHistory } from '../pallet-history/pallet-history'
 import { Pallet } from './pallet'
@@ -13,8 +11,8 @@ import { NewPallet, PalletPatch } from './pallet-types'
 export class PalletMutation {
   @Directive('@transaction')
   @Mutation(returns => Pallet)
-  async createPallet(@Arg('pallet') pallet: NewPallet, @Ctx() context: any): Promise<Pallet> {
-    const { domain, user, tx }: { domain: Domain; user: User; tx: EntityManager } = context.state
+  async createPallet(@Arg('pallet') pallet: NewPallet, @Ctx() context: ResolverContext): Promise<Pallet> {
+    const { domain, user, tx } = context.state
 
     return await tx.getRepository(Pallet).save({
       ...pallet,
@@ -29,9 +27,9 @@ export class PalletMutation {
   async updatePallet(
     @Arg('name') name: string,
     @Arg('patch') patch: PalletPatch,
-    @Ctx() context: any
+    @Ctx() context: ResolverContext
   ): Promise<Pallet> {
-    const { domain, user, tx }: { domain: Domain; user: User; tx: EntityManager } = context.state
+    const { domain, user, tx } = context.state
 
     const repository = tx.getRepository(Pallet)
     const pallet = await repository.findOne({
@@ -49,9 +47,9 @@ export class PalletMutation {
   @Mutation(returns => [Pallet])
   async updateMultiplePallet(
     @Arg('patches', type => [PalletPatch]) patches: PalletPatch[],
-    @Ctx() context: any
+    @Ctx() context: ResolverContext
   ): Promise<Pallet[]> {
-    const { domain, user, tx }: { domain: Domain; user: User; tx: EntityManager } = context.state
+    const { domain, user, tx } = context.state
 
     let results = []
     const _createRecords = patches.filter((patch: any) => patch.cuFlag.toUpperCase() === '+')
@@ -62,11 +60,11 @@ export class PalletMutation {
         const newRecord = _createRecords[i]
 
         if (newRecord.owner && newRecord.owner.id) {
-          newRecord.owner = await tx.getRepository(Bizplace).findOne(newRecord.owner.id)
+          newRecord.owner = (await tx.getRepository(Bizplace).findOneBy({ id: newRecord.owner.id })) as any
         }
 
         if (newRecord.holder && newRecord.holder.id) {
-          newRecord.holder = await tx.getRepository(Bizplace).findOne(newRecord.holder.id)
+          newRecord.holder = (await tx.getRepository(Bizplace).findOneBy({ id: newRecord.holder.id })) as any
         }
 
         const result: Pallet = await tx.getRepository(Pallet).save({
@@ -99,11 +97,11 @@ export class PalletMutation {
         const seq = pallet.seq + 1
 
         if (newRecord.owner && newRecord.owner.id) {
-          newRecord.owner = await tx.getRepository(Bizplace).findOne(newRecord.owner.id)
+          newRecord.owner = (await tx.getRepository(Bizplace).findOneBy({ id: newRecord.owner.id })) as any
         }
 
         if (newRecord.holder && newRecord.holder.id) {
-          newRecord.holder = await tx.getRepository(Bizplace).findOne(newRecord.holder.id)
+          newRecord.holder = (await tx.getRepository(Bizplace).findOneBy({ id: newRecord.holder.id })) as any
         }
 
         const result = await tx.getRepository(Pallet).save({
@@ -140,8 +138,8 @@ export class PalletMutation {
 
   @Directive('@transaction')
   @Mutation(returns => Boolean)
-  async deletePallet(@Arg('name') name: string, @Ctx() context: any): Promise<Boolean> {
-    const { domain, tx }: { domain: Domain; tx: EntityManager } = context.state
+  async deletePallet(@Arg('name') name: string, @Ctx() context: ResolverContext): Promise<Boolean> {
+    const { domain, tx } = context.state
 
     await tx.getRepository(Pallet).delete({ domain: domain, name })
     return true
@@ -149,8 +147,8 @@ export class PalletMutation {
 
   @Directive('@transaction')
   @Mutation(returns => Boolean)
-  async deletePallets(@Arg('ids', type => [String]) ids: string[], @Ctx() context: any): Promise<Boolean> {
-    const { domain, user, tx }: { domain: Domain; user: User; tx: EntityManager } = context.state
+  async deletePallets(@Arg('ids', type => [String]) ids: string[], @Ctx() context: ResolverContext): Promise<Boolean> {
+    const { domain, user, tx } = context.state
 
     const pallets = await tx.getRepository(Pallet).find({
       where: {
@@ -191,9 +189,9 @@ export class PalletMutation {
   @Mutation(returns => [Pallet])
   async palletReturn(
     @Arg('patches', type => [PalletPatch]) patches: PalletPatch[],
-    @Ctx() context: any
+    @Ctx() context: ResolverContext
   ): Promise<Pallet[]> {
-    const { domain, user, tx }: { domain: Domain; user: User; tx: EntityManager } = context.state
+    const { domain, user, tx } = context.state
 
     let results = []
     const _updateRecords = patches
@@ -207,7 +205,7 @@ export class PalletMutation {
         })
         const seq = pallet.seq + 1
 
-        newRecord.owner = await tx.getRepository(Bizplace).findOne(newRecord.owner.id)
+        newRecord.owner = (await tx.getRepository(Bizplace).findOneBy({ id: newRecord.owner.id })) as any
         newRecord.holder = newRecord.owner
 
         const result = await tx.getRepository(Pallet).save({

package/server/service/pallet/pallet-query.ts

@@ -1,8 +1,7 @@
 import { Arg, Args, Ctx, FieldResolver, Query, Resolver, Root } from 'type-graphql'
-import { getRepository } from 'typeorm'
 
 import { User } from '@things-factory/auth-base'
-import { convertListParams, Domain, ListParam } from '@things-factory/shell'
+import { convertListParams, Domain, getRepository, ListParam } from '@things-factory/shell'
 
 import { Pallet } from './pallet'
 import { PalletList, PalletValidate } from './pallet-types'
@@ -10,7 +9,7 @@ import { PalletList, PalletValidate } from './pallet-types'
 @Resolver(Pallet)
 export class PalletQuery {
   @Query(returns => PalletList)
-  async pallets(@Args() params: ListParam, @Ctx() context: any): Promise<PalletList> {
+  async pallets(@Args() params: ListParam, @Ctx() context: ResolverContext): Promise<PalletList> {
     const { domain } = context.state
 
     if (!params.filters.find((filter: any) => filter.name === 'status')) {
@@ -30,8 +29,8 @@ export class PalletQuery {
   }
 
   @Query(returns => Pallet)
-  async pallet(@Arg('name') name: string, @Ctx() context: any): Promise<Pallet> {
-    const { domain }: { domain: Domain } = context.state
+  async pallet(@Arg('name') name: string, @Ctx() context: ResolverContext): Promise<Pallet> {
+    const { domain } = context.state
 
     let records = await getRepository(Pallet).findOne({
       where: { domain: domain, name },
@@ -41,9 +40,9 @@ export class PalletQuery {
   }
 
   @Query(returns => PalletValidate)
-  async palletInboundValidate(@Arg('name') name: string, @Ctx() context: any): Promise<PalletValidate> {
+  async palletInboundValidate(@Arg('name') name: string, @Ctx() context: ResolverContext): Promise<PalletValidate> {
     try {
-      const { domain }: { domain: Domain } = context.state
+      const { domain } = context.state
 
       let item = await getRepository(Pallet).findOne({
         where: { domain: domain, name },
@@ -58,9 +57,9 @@ export class PalletQuery {
   }
 
   @Query(returns => PalletValidate)
-  async palletOutboundValidate(@Arg('name') name: string, @Ctx() context: any): Promise<PalletValidate> {
+  async palletOutboundValidate(@Arg('name') name: string, @Ctx() context: ResolverContext): Promise<PalletValidate> {
     try {
-      const { domain }: { domain: Domain } = context.state
+      const { domain } = context.state
 
       let item = await getRepository(Pallet).findOne({
         where: { domain: domain, name },
@@ -78,9 +77,9 @@ export class PalletQuery {
   async palletByStatus(
     @Arg('name') name: string,
     @Arg('status') status: string,
-    @Ctx() context: any
+    @Ctx() context: ResolverContext
   ): Promise<Pallet | boolean> {
-    const { domain }: { domain: Domain } = context.state
+    const { domain } = context.state
 
     let records = await getRepository(Pallet).findOne({
       where: { domain: domain, name, status },
@@ -92,16 +91,16 @@ export class PalletQuery {
 
   @FieldResolver(type => Domain)
   async domain(@Root() pallet: Pallet) {
-    return await getRepository(Domain).findOne(pallet.domainId)
+    return await getRepository(Domain).findOneBy({ id: pallet.domainId })
   }
 
   @FieldResolver(type => User)
   async updater(@Root() pallet: Pallet) {
-    return await getRepository(User).findOne(pallet.updaterId)
+    return await getRepository(User).findOneBy({ id: pallet.updaterId })
   }
 
   @FieldResolver(type => User)
   async creator(@Root() pallet: Pallet) {
-    return await getRepository(User).findOne(pallet.creatorId)
+    return await getRepository(User).findOneBy({ id: pallet.creatorId })
   }
 }

package/server/service/pallet-count/pallet-count-mutation.ts

@@ -1,10 +1,7 @@
 import { Arg, Ctx, Directive, Mutation, Resolver } from 'type-graphql'
-import { EntityManager, In, MoreThan } from 'typeorm'
+import { In, MoreThan } from 'typeorm'
 import { v4 as uuidv4 } from 'uuid'
 
-import { User } from '@things-factory/auth-base'
-import { Domain } from '@things-factory/shell'
-
 import { PalletCount } from './pallet-count'
 import { NewPalletCount, PalletCountPatch } from './pallet-count-types'
 
@@ -12,8 +9,11 @@ import { NewPalletCount, PalletCountPatch } from './pallet-count-types'
 export class PalletCountMutation {
   @Directive('@transaction')
   @Mutation(returns => PalletCount)
-  async createPalletCount(@Arg('palletCount') palletCount: NewPalletCount, @Ctx() context: any): Promise<PalletCount> {
-    const { domain, user, tx }: { domain: Domain; user: User; tx: EntityManager } = context.state
+  async createPalletCount(
+    @Arg('palletCount') palletCount: NewPalletCount,
+    @Ctx() context: ResolverContext
+  ): Promise<PalletCount> {
+    const { domain, user, tx } = context.state
 
     return await tx.getRepository(PalletCount).save({
       ...palletCount,
@@ -28,9 +28,9 @@ export class PalletCountMutation {
   async updatePalletCount(
     @Arg('name') name: string,
     @Arg('patch') patch: PalletCountPatch,
-    @Ctx() context: any
+    @Ctx() context: ResolverContext
   ): Promise<PalletCount> {
-    const { domain, user, tx }: { domain: Domain; user: User; tx: EntityManager } = context.state
+    const { domain, user, tx } = context.state
 
     const repository = tx.getRepository(PalletCount)
     const palletCount = await repository.findOne({
@@ -48,9 +48,9 @@ export class PalletCountMutation {
   @Mutation(returns => [PalletCount])
   async updateMultiplePalletCount(
     @Arg('patches', type => [PalletCountPatch]) patches: PalletCountPatch[],
-    @Ctx() context: any
+    @Ctx() context: ResolverContext
   ): Promise<PalletCount[]> {
-    const { domain, user, tx }: { domain: Domain; user: User; tx: EntityManager } = context.state
+    const { domain, user, tx } = context.state
 
     let results = []
     const _createRecords = patches.filter((patch: any) => patch.cuFlag.toUpperCase() === '+')
@@ -75,7 +75,7 @@ export class PalletCountMutation {
     if (_updateRecords.length > 0) {
       for (let i = 0; i < _updateRecords.length; i++) {
         const newRecord = _updateRecords[i]
-        const palletCount = await palletCountRepo.findOne(newRecord.id)
+        const palletCount = await palletCountRepo.findOneBy({ id: newRecord.id })
 
         const result = await palletCountRepo.save({
           ...palletCount,
@@ -92,8 +92,8 @@ export class PalletCountMutation {
 
   @Directive('@transaction')
   @Mutation(returns => Boolean)
-  async deletePalletCount(@Arg('name') name: string, @Ctx() context: any): Promise<Boolean> {
-    const { domain, tx }: { domain: Domain; tx: EntityManager } = context.state
+  async deletePalletCount(@Arg('name') name: string, @Ctx() context: ResolverContext): Promise<Boolean> {
+    const { domain, tx } = context.state
 
     await tx.getRepository(PalletCount).delete({ domain: domain, name })
     return true
@@ -101,8 +101,11 @@ export class PalletCountMutation {
 
   @Directive('@transaction')
   @Mutation(returns => Boolean)
-  async deletePalletCounts(@Arg('names', type => [String]) names: string[], @Ctx() context: any): Promise<Boolean> {
-    const { domain, tx }: { domain: Domain; tx: EntityManager } = context.state
+  async deletePalletCounts(
+    @Arg('names', type => [String]) names: string[],
+    @Ctx() context: ResolverContext
+  ): Promise<Boolean> {
+    const { domain, tx } = context.state
 
     await tx.getRepository(PalletCount).delete({
       domain: domain,
@@ -113,8 +116,8 @@ export class PalletCountMutation {
 
   @Directive('@transaction')
   @Mutation(returns => PalletCount)
-  async updatePalletCountSeq(@Arg('printQty') printQty: number, @Ctx() context: any): Promise<PalletCount> {
-    const { domain, user, tx }: { domain: Domain; user: User; tx: EntityManager } = context.state
+  async updatePalletCountSeq(@Arg('printQty') printQty: number, @Ctx() context: ResolverContext): Promise<PalletCount> {
+    const { domain, user, tx } = context.state
 
     const repository = tx.getRepository(PalletCount)
     const todayDate = new Date()

package/server/service/pallet-count/pallet-count-query.ts

@@ -1,8 +1,7 @@
 import { Arg, Args, Ctx, FieldResolver, Query, Resolver, Root } from 'type-graphql'
-import { getRepository } from 'typeorm'
 
 import { User } from '@things-factory/auth-base'
-import { convertListParams, Domain, ListParam } from '@things-factory/shell'
+import { convertListParams, Domain, getRepository, ListParam } from '@things-factory/shell'
 
 import { PalletCount } from './pallet-count'
 import { PalletCountList } from './pallet-count-types'
@@ -20,8 +19,8 @@ export class PalletCountQuery {
   }
 
   @Query(returns => PalletCount)
-  async palletCount(@Arg('name') name: string, @Ctx() context: any): Promise<PalletCount> {
-    const { domain }: { domain: Domain } = context.state
+  async palletCount(@Arg('name') name: string, @Ctx() context: ResolverContext): Promise<PalletCount> {
+    const { domain } = context.state
 
     return await getRepository(PalletCount).findOne({
       where: { domain: domain, name },
@@ -31,16 +30,16 @@ export class PalletCountQuery {
 
   @FieldResolver(type => Domain)
   async domain(@Root() palletCount: PalletCount) {
-    return await getRepository(Domain).findOne(palletCount.domainId)
+    return await getRepository(Domain).findOneBy({ id: palletCount.domainId })
   }
 
   @FieldResolver(type => User)
   async updater(@Root() palletCount: PalletCount) {
-    return await getRepository(User).findOne(palletCount.updaterId)
+    return await getRepository(User).findOneBy({ id: palletCount.updaterId })
   }
 
   @FieldResolver(type => User)
   async creator(@Root() palletCount: PalletCount) {
-    return await getRepository(User).findOne(palletCount.creatorId)
+    return await getRepository(User).findOneBy({ id: palletCount.creatorId })
   }
 }