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

package/server/service/inventory-change/inventory-change-query.ts

@@ -1,9 +1,9 @@
 import { Arg, Args, Ctx, FieldResolver, Query, Resolver, Root } from 'type-graphql'
-import { Brackets, getRepository, SelectQueryBuilder } from 'typeorm'
+import { Brackets, SelectQueryBuilder } 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 { InventoryChange } from './inventory-change'
 import { InventoryChangeList } from './inventory-change-types'
@@ -11,8 +11,8 @@ import { InventoryChangeList } from './inventory-change-types'
 @Resolver(InventoryChange)
 export class InventoryChangeQuery {
   @Query(returns => InventoryChange)
-  async inventoryChange(@Arg('name') name: string, @Ctx() context: any): Promise<InventoryChange> {
-    const { domain }: { domain: Domain } = context.state
+  async inventoryChange(@Arg('name') name: string, @Ctx() context: ResolverContext): Promise<InventoryChange> {
+    const { domain } = context.state
 
     return await getRepository(InventoryChange).findOne({
       where: { domain: domain, name },
@@ -21,8 +21,8 @@ export class InventoryChangeQuery {
   }
 
   @Query(returns => InventoryChangeList)
-  async inventoryChanges(@Args() params: ListParam, @Ctx() context: any): Promise<InventoryChangeList> {
-    const { domain, user }: { domain: Domain; user: User } = context.state
+  async inventoryChanges(@Args() params: ListParam, @Ctx() context: ResolverContext): Promise<InventoryChangeList> {
+    const { domain, user } = context.state
 
     let bizplaces: any[]
     if (!params.filters.find(filter => filter.name === 'bizplace')) {
@@ -71,16 +71,16 @@ export class InventoryChangeQuery {
 
   @FieldResolver(type => InventoryChange)
   async domain(@Root() inventoryChange: InventoryChange) {
-    return await getRepository(Domain).findOne(inventoryChange.domainId)
+    return await getRepository(Domain).findOneBy({ id: inventoryChange.domainId })
   }
 
   @FieldResolver(type => InventoryChange)
   async updater(@Root() inventoryChange: InventoryChange) {
-    return await getRepository(User).findOne(inventoryChange.updaterId)
+    return await getRepository(User).findOneBy({ id: inventoryChange.updaterId })
   }
 
   @FieldResolver(type => InventoryChange)
   async creator(@Root() inventoryChange: InventoryChange) {
-    return await getRepository(User).findOne(inventoryChange.creatorId)
+    return await getRepository(User).findOneBy({ id: inventoryChange.creatorId })
   }
 }

package/server/service/inventory-history/inventory-history-mutation.ts

@@ -1,8 +1,5 @@
 import { Arg, Ctx, Directive, Mutation, Resolver } from 'type-graphql'
-import { EntityManager, In } from 'typeorm'
-
-import { User } from '@things-factory/auth-base'
-import { Domain } from '@things-factory/shell'
+import { In } from 'typeorm'
 
 import { InventoryHistory } from './inventory-history'
 import { InventoryHistoryPatch, NewInventoryHistory } from './inventory-history-types'
@@ -13,9 +10,9 @@ export class InventoryHistoryMutation {
   @Mutation(returns => InventoryHistory)
   async createInventoryHistory(
     @Arg('inventoryHistory') inventoryHistory: NewInventoryHistory,
-    @Ctx() context: any
+    @Ctx() context: ResolverContext
   ): Promise<InventoryHistory> {
-    const { domain, user, tx }: { domain: Domain; user: User; tx: EntityManager } = context.state
+    const { domain, user, tx } = context.state
 
     return await tx.getRepository(InventoryHistory).save({
       ...inventoryHistory,
@@ -30,9 +27,9 @@ export class InventoryHistoryMutation {
   async updateInventoryHistory(
     @Arg('name') name: string,
     @Arg('patch') patch: InventoryHistoryPatch,
-    @Ctx() context: any
+    @Ctx() context: ResolverContext
   ): Promise<InventoryHistory> {
-    const { domain, user, tx }: { domain: Domain; user: User; tx: EntityManager } = context.state
+    const { domain, user, tx } = context.state
 
     const repository = tx.getRepository(InventoryHistory)
     const inventoryHistory = await repository.findOne({
@@ -50,9 +47,9 @@ export class InventoryHistoryMutation {
   @Mutation(returns => [InventoryHistory])
   async updateMultipleInventoryHistory(
     @Arg('patches', type => [InventoryHistoryPatch]) patches: InventoryHistoryPatch[],
-    @Ctx() context: any
+    @Ctx() context: ResolverContext
   ): Promise<InventoryHistory[]> {
-    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() === '+')
@@ -78,7 +75,7 @@ export class InventoryHistoryMutation {
     if (_updateRecords.length > 0) {
       for (let i = 0; i < _updateRecords.length; i++) {
         const newRecord = _updateRecords[i]
-        const inventoryHistory = await inventoryHistoryRepo.findOne(newRecord.id)
+        const inventoryHistory = await inventoryHistoryRepo.findOneBy({ id: newRecord.id })
 
         const result = await inventoryHistoryRepo.save({
           ...inventoryHistory,
@@ -95,8 +92,8 @@ export class InventoryHistoryMutation {
 
   @Directive('@transaction')
   @Mutation(returns => Boolean)
-  async deleteInventoryHistory(@Arg('name') name: string, @Ctx() context: any): Promise<Boolean> {
-    const { domain, tx }: { domain: Domain; tx: EntityManager } = context.state
+  async deleteInventoryHistory(@Arg('name') name: string, @Ctx() context: ResolverContext): Promise<Boolean> {
+    const { domain, tx } = context.state
 
     await tx.getRepository(InventoryHistory).delete({ domain: domain, name })
     return true
@@ -106,9 +103,9 @@ export class InventoryHistoryMutation {
   @Mutation(returns => Boolean)
   async deleteInventoryHistories(
     @Arg('names', type => [String]) names: string[],
-    @Ctx() context: any
+    @Ctx() context: ResolverContext
   ): Promise<Boolean> {
-    const { domain, tx }: { domain: Domain; tx: EntityManager } = context.state
+    const { domain, tx } = context.state
 
     await tx.getRepository(InventoryHistory).delete({
       domain: domain,