@things-factory/sales-base 5.0.13 → 6.0.0-alpha.1

package/server/service/purchase-order-other-charge/purchase-order-other-charge-query.ts

@@ -1,7 +1,8 @@
-import { User } from '@things-factory/auth-base'
-import { convertListParams, Domain, Filter, Pagination, Sorting } from '@things-factory/shell'
 import { Arg, Ctx, FieldResolver, Query, Resolver, Root } from 'type-graphql'
-import { getRepository } from 'typeorm'
+
+import { User } from '@things-factory/auth-base'
+import { convertListParams, Domain, Filter, getRepository, Pagination, Sorting } from '@things-factory/shell'
+
 import { PurchaseOrderOtherChargeList } from '../'
 import { PurchaseOrderOtherCharge } from './purchase-order-other-charge'
 
@@ -22,26 +23,30 @@ export class PurchaseOrderOtherChargeQuery {
   }
 
   @Query(returns => PurchaseOrderOtherCharge)
-  async purchaseOrderOtherCharge(@Ctx() context: any, @Arg('name') name: string): Promise<PurchaseOrderOtherCharge> {
-    const { domain }: { domain: Domain } = context.state
+  async purchaseOrderOtherCharge(
+    @Ctx() context: ResolverContext,
+    @Arg('name') name: string
+  ): Promise<PurchaseOrderOtherCharge> {
+    const { domain } = context.state
 
     return await getRepository(PurchaseOrderOtherCharge).findOne({
-      where: { domain, name, relations: ['domain', 'creator', 'updater'] }
+      where: { domain: { id: domain.id }, name },
+      relations: ['domain', 'creator', 'updater']
     })
   }
 
   @FieldResolver(type => Domain)
   async domain(@Root() purchaseOrderOtherCharge: PurchaseOrderOtherCharge): Promise<Domain> {
-    return await getRepository(Domain).findOne(purchaseOrderOtherCharge.domainId)
+    return await getRepository(Domain).findOneBy({ id: purchaseOrderOtherCharge.domainId })
   }
 
   @FieldResolver(type => User)
   async creator(@Root() purchaseOrderOtherCharge: PurchaseOrderOtherCharge): Promise<User> {
-    return await getRepository(User).findOne(purchaseOrderOtherCharge.creatorId)
+    return await getRepository(User).findOneBy({ id: purchaseOrderOtherCharge.creatorId })
   }
 
   @FieldResolver(type => User)
   async updater(@Root() purchaseOrderOtherCharge: PurchaseOrderOtherCharge): Promise<User> {
-    return await getRepository(User).findOne(purchaseOrderOtherCharge.updaterId)
+    return await getRepository(User).findOneBy({ id: purchaseOrderOtherCharge.updaterId })
   }
 }