@things-factory/biz-base 5.0.7 → 6.0.0-alpha.0

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

@@ -1,28 +1,29 @@
 import { Arg, Args, Ctx, Directive, Query, Resolver } from 'type-graphql'
-import { EntityManager, FindManyOptions, getRepository, In, Not, Repository } from 'typeorm'
+import { EntityManager, FindManyOptions, In, Not, Repository } from 'typeorm'
 
 import { User, UserList } from '@things-factory/auth-base'
-import { convertListParams, ListParam } from '@things-factory/shell'
+import { convertListParams, getRepository, ListParam } from '@things-factory/shell'
 
 import {
   getMyBizplace,
   getPartnerBizplaceIds,
   getPartnersBizplaces,
   getPartnersCompanyBizplaces,
-  getPermittedBizplaceIds
+  getPermittedBizplaceIds,
+  getUserBizplaces
 } from '../../utils'
 import { Bizplace } from './bizplace'
-import { BizplaceList, UserBizplace } from './bizplace-types'
+import { BizplaceList } from './bizplace-types'
 
 @Resolver(Bizplace)
 export class BizplaceQuery {
   @Directive('@privilege(category: "bizplace", privilege: "query")')
   @Query(returns => [Bizplace])
-  async customerBizplaces(@Ctx() context: any): Promise<Bizplace[]> {
+  async customerBizplaces(@Ctx() context: ResolverContext): Promise<Bizplace[]> {
     const { domain, user } = context.state
     return await getRepository(Bizplace).find({
       where: {
-        domain,
+        domain: { id: domain.id },
         id: Not(In([await getMyBizplace(domain, user)]))
       },
       relations: ['domain', 'creator', 'updater']
@@ -31,7 +32,7 @@ export class BizplaceQuery {
 
   @Directive('@privilege(category: "bizplace", privilege: "query", domainOwnerGranted: true)')
   @Query(returns => Bizplace)
-  async businessBizplace(@Ctx() context: any): Promise<Bizplace> {
+  async businessBizplace(@Ctx() context: ResolverContext): Promise<Bizplace> {
     const { domain, user } = context.state
     const myBizplace = await getMyBizplace(domain, user)
     return await getRepository(Bizplace).findOne({
@@ -40,37 +41,37 @@ export class BizplaceQuery {
     })
   }
 
+  /* TODO make it work */
   @Directive('@privilege(category: "bizplace", privilege: "query", domainOwnerGranted: true)')
-  @Query(returns => [UserBizplace])
-  async userBizplaces(@Arg('email') email: string, @Ctx() context: any): Promise<UserBizplace[]> {
-    const user: User = await getRepository(User).findOne(
-      {
-        domain: context.state.domain,
-        email: email != '' ? email : context.state.user.email
-      },
-      {
-        relations: ['bizplaces']
-      }
-    )
-    const bizplaces = await getRepository(Bizplace).find({ domain: context.state.domain })
-    const userBizplaces = user.bizplaces
-    return bizplaces.map((bizplace: Bizplace) => {
-      return {
-        id: bizplace.id,
-        name: bizplace.name,
-        description: bizplace.description,
-        userBizplaceId: userBizplaces
-          .map(userBiz => userBiz.bizplace.id)
-          .slice(0, 1)
-          .shift(),
-        assigned: userBizplaces.filter((userBizplace: Bizplace) => userBizplace.id === bizplace.id).length > 0
-      }
+  @Query(returns => [Bizplace])
+  async userBizplaces(@Arg('email') email: string, @Ctx() context: ResolverContext): Promise<Bizplace[]> {
+    const { domain } = context.state
+
+    const user: User = await getRepository(User).findOneBy({
+      email: email != '' ? email : context.state.user.email
     })
+
+    return await getUserBizplaces(user)
+
+    // const bizplaces = await getRepository(Bizplace).find({ domain })
+    // // const userBizplaces = user.bizplaces
+    // return bizplaces.map((bizplace: Bizplace) => {
+    //   return {
+    //     id: bizplace.id,
+    //     name: bizplace.name,
+    //     description: bizplace.description,
+    //     userBizplaceId: userBizplaces
+    //       .map(userBiz => userBiz.bizplace.id)
+    //       .slice(0, 1)
+    //       .shift(),
+    //     assigned: userBizplaces.filter((userBizplace: Bizplace) => userBizplace.id === bizplace.id).length > 0
+    //   }
+    // })
   }
 
   @Directive('@privilege(category: "bizplace", privilege: "query", domainOwnerGranted: true)')
   @Query(returns => BizplaceList)
-  async bizplaces(@Args() params: ListParam, @Ctx() context: any): Promise<BizplaceList> {
+  async bizplaces(@Args() params: ListParam, @Ctx() context: ResolverContext): Promise<BizplaceList> {
     let bizplace_ids = []
     let bizplaceIndex: any = params.filters.findIndex(x => x.name === 'bizplace')
     if (bizplaceIndex > -1) {
@@ -111,7 +112,7 @@ export class BizplaceQuery {
   }
 
   @Query(returns => UserList)
-  async bizplaceUsers(@Args() params: ListParam, @Ctx() context: any): Promise<UserList> {
+  async bizplaceUsers(@Args() params: ListParam, @Ctx() context: ResolverContext): Promise<UserList> {
     const { domain, user } = context.state
     const myBizplace: Bizplace = await getMyBizplace(domain, user)
     return await bizplaceUsers(myBizplace, {
@@ -121,7 +122,7 @@ export class BizplaceQuery {
   }
 
   @Query(returns => BizplaceList)
-  async partnersBizplaces(@Args() params: ListParam, @Ctx() context: any): Promise<BizplaceList> {
+  async partnersBizplaces(@Args() params: ListParam, @Ctx() context: ResolverContext): Promise<BizplaceList> {
     let partnersBizplaceIds = []
     let bizplaceIndex: any = params.filters.findIndex(x => x.name === 'bizplace')
     if (bizplaceIndex > -1) {
@@ -162,7 +163,10 @@ export class BizplaceQuery {
   }
 
   @Query(returns => BizplaceList)
-  async permittedPartnersCompanyBizplaces(@Args() params: ListParam, @Ctx() context: any): Promise<BizplaceList> {
+  async permittedPartnersCompanyBizplaces(
+    @Args() params: ListParam,
+    @Ctx() context: ResolverContext
+  ): Promise<BizplaceList> {
     let partnersBizplaceIds = []
     let bizplaceIndex: any = params.filters.findIndex(x => x.name === 'bizplace')
     if (bizplaceIndex > -1) {
@@ -206,7 +210,10 @@ export async function bizplaceUsers(
   const userRepo: Repository<User> = trxMgr?.getRepository(User) || getRepository(User)
 
   if (!bizplace?.users?.length) {
-    bizplace = await bizplaceRepo.findOne(bizplace, { relations: ['users'] })
+    bizplace = await bizplaceRepo.findOne({
+      where: { id: bizplace.id },
+      relations: ['users']
+    })
   }
   const users: User[] = bizplace.users
   const userIds: string[] = users.map((user: User) => user.id)
@@ -214,7 +221,7 @@ export async function bizplaceUsers(
   const [items, total] = await userRepo.findAndCount({
     ...params,
     where: {
-      ...params.where,
+      ...(params.where as any),
       id: In(userIds)
     }
   })

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

@@ -1,8 +1,8 @@
 import { Arg, Ctx, Directive, Mutation, Resolver } from 'type-graphql'
-import { EntityManager, getRepository, Repository } from 'typeorm'
+import { EntityManager, Repository } from 'typeorm'
 
 import { User } from '@things-factory/auth-base'
-import { Domain } from '@things-factory/shell'
+import { Domain, getRepository } from '@things-factory/shell'
 import { slugger } from '@things-factory/utils'
 
 import { Company } from './company'
@@ -12,7 +12,7 @@ import { CompanyPatch, NewCompany } from './company-types'
 export class CompanyMutation {
   @Directive('@transaction')
   @Mutation(returns => Company)
-  async createCompany(@Arg('company') company: NewCompany, @Ctx() context: any): Promise<Company> {
+  async createCompany(@Arg('company') company: NewCompany, @Ctx() context: ResolverContext): Promise<Company> {
     const { domain, user, tx } = context.state
     return await createCompany(company, domain, user, tx)
   }
@@ -23,7 +23,7 @@ export class CompanyMutation {
   async updateCompany(
     @Arg('name') name: string,
     @Arg('patch') patch: CompanyPatch,
-    @Ctx() context: any
+    @Ctx() context: ResolverContext
   ): Promise<Company> {
     const { domain, user, tx } = context.state
     return await updateCompany(name, patch, domain, user, tx)
@@ -32,7 +32,10 @@ export class CompanyMutation {
   @Directive('@privilege(category: "company", privilege: "mutation")')
   @Directive('@transaction')
   @Mutation(returns => [Company])
-  async updateMultipleCompany(@Arg('patches', type => [CompanyPatch]) patches: CompanyPatch[], @Ctx() context: any) {
+  async updateMultipleCompany(
+    @Arg('patches', type => [CompanyPatch]) patches: CompanyPatch[],
+    @Ctx() context: ResolverContext
+  ) {
     let results = []
     const _createRecords = patches.filter((patch: any) => patch.cuFlag.toUpperCase() === '+')
     const _updateRecords = patches.filter((patch: any) => patch.cuFlag.toUpperCase() === 'M')
@@ -58,7 +61,7 @@ export class CompanyMutation {
 
   @Directive('@transaction')
   @Mutation(returns => Boolean)
-  async deleteCompany(@Arg('id') id: string, context: any): Promise<Boolean> {
+  async deleteCompany(@Arg('id') id: string, @Ctx() context: ResolverContext): Promise<Boolean> {
     await deleteCompany(id, context.state.tx)
 
     return true
@@ -67,7 +70,10 @@ export class CompanyMutation {
   @Directive('@transaction')
   @Directive('@privilege(category: "company", privilege: "mutation")')
   @Mutation(returns => Boolean)
-  async deleteCompanies(@Arg('ids', type => [String]) ids: string[], @Ctx() context: any): Promise<Boolean> {
+  async deleteCompanies(
+    @Arg('ids', type => [String]) ids: string[],
+    @Ctx() context: ResolverContext
+  ): Promise<Boolean> {
     await deleteCompanies(ids, context.state.tx)
 
     return true
@@ -93,8 +99,8 @@ export async function createCompany(company: NewCompany, domain: Domain, user: U
 
 export async function updateCompany(name: string, patch: CompanyPatch, domain: Domain, user: User, tx?: EntityManager) {
   const repository: Repository<Company> = tx ? tx.getRepository(Company) : getRepository(Company)
-  const company = await repository.findOne({
-    domain,
+  const company = await repository.findOneBy({
+    domain: { id: domain.id },
     name
   })
 

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

@@ -1,25 +1,22 @@
 import { Args, Ctx, Directive, Query, Resolver } from 'type-graphql'
-import { getRepository, In } from 'typeorm'
+import { In } from 'typeorm'
 
 import { getDomainUsers, getUserDomains, User, UserList } from '@things-factory/auth-base'
-import { convertListParams, Domain, ListParam } from '@things-factory/shell'
+import { convertListParams, Domain, getRepository, ListParam } from '@things-factory/shell'
 
 import { Bizplace } from '../bizplace/bizplace'
 import { BizplaceList } from '../bizplace/bizplace-types'
 import { Company } from './company'
 import { CompanyList } from './company-types'
 
-const debug = require('debug')('things-factory:biz-base:company-resolver')
-
 @Resolver(Company)
 export class CompanyQuery {
   @Directive('@privilege(category: "company", privilege: "query", domainOwnerGranted: true)')
   @Query(returns => Company)
-  async company(@Ctx() context: any): Promise<Company> {
+  async company(@Ctx() context: ResolverContext): Promise<Company> {
     const { domain } = context.state
-    debug('company', domain?.subdomain)
 
-    const foundCompany: Company | null = await getRepository(Company).findOne({
+    const foundCompany: Company | null = await getRepository(Company).findOneBy({
       domain
     })
 
@@ -29,7 +26,7 @@ export class CompanyQuery {
 
   @Directive('@privilege(category: "company", privilege: "query")')
   @Query(returns => CompanyList)
-  async companies(@Args() params: ListParam, @Ctx() context: any): Promise<CompanyList> {
+  async companies(@Args() params: ListParam, @Ctx() context: ResolverContext): Promise<CompanyList> {
     const { domain } = context.state
     const convertedParams = convertListParams(params, { domain })
 
@@ -42,17 +39,16 @@ export class CompanyQuery {
 
   @Directive('@privilege(category: "company", privilege: "query", domainOwnerGranted: true)')
   @Query(returns => BizplaceList)
-  async companyBizplaces(@Ctx() context: any): Promise<BizplaceList> {
+  async companyBizplaces(@Ctx() context: ResolverContext): Promise<BizplaceList> {
     const { domain, user } = context.state
-    debug('companyBizplaces', domain?.subdomain)
 
     const userDomains: Domain[] = await getUserDomains(user)
-    const company: Company = await getRepository(Company).findOne({
+    const company: Company = await getRepository(Company).findOneBy({
       domain
     })
 
     const [items, total] = await getRepository(Bizplace).findAndCount({
-      where: { company, domain: In(userDomains.map(({ id }: Domain) => id)) },
+      where: { company: { id: company.id }, domain: { id: In(userDomains.map(({ id }: Domain) => id)) } },
       relations: ['domain']
     })
 
@@ -61,9 +57,8 @@ export class CompanyQuery {
 
   @Directive('@privilege(category: "company", privilege: "query", domainOwnerGranted: true)')
   @Query(returns => UserList)
-  async companyUsers(@Ctx() context: any): Promise<UserList> {
+  async companyUsers(@Ctx() context: ResolverContext): Promise<UserList> {
     const { domain } = context.state
-    debug('companyUsers', domain?.subdomain)
 
     const items: User[] = await getDomainUsers(domain)
 

package/server/service/contact-point/contact-point-mutation.ts

@@ -1,8 +1,7 @@
 import { Arg, Ctx, Directive, Mutation, Resolver } from 'type-graphql'
-import { EntityManager, getRepository, Repository } from 'typeorm'
+import { EntityManager, Repository } from 'typeorm'
 
-import { User } from '@things-factory/auth-base'
-import { Domain } from '@things-factory/shell'
+import { getRepository } from '@things-factory/shell'
 
 import { Bizplace } from '../bizplace/bizplace'
 import { ContactPoint } from './contact-point'
@@ -14,9 +13,9 @@ export class ContactPointMutation {
   @Mutation(returns => ContactPoint)
   async createContactPoint(
     @Arg('contactPoint') contactPoint: NewContactPoint,
-    @Ctx() context: any
+    @Ctx() context: ResolverContext
   ): Promise<ContactPoint> {
-    return await createContactPoint(contactPoint, context)
+    return await createContactPoint(contactPoint as any, context)
   }
 
   @Directive('@privilege(category: "contact_point", privilege: "mutation")')
@@ -24,12 +23,12 @@ export class ContactPointMutation {
   async updateContactPoint(
     @Arg('id') id: string,
     @Arg('patch') patch: ContactPointPatch,
-    @Ctx() context: any
+    @Ctx() context: ResolverContext
   ): Promise<ContactPoint> {
-    const contactPoint = await getRepository(ContactPoint).findOne(id)
+    const contactPoint = await getRepository(ContactPoint).findOneBy({ id })
 
     if (patch.bizplace && patch.bizplace.id) {
-      patch.bizplace = await getRepository(Bizplace).findOne(patch.bizplace.id)
+      patch.bizplace = await getRepository(Bizplace).findOneBy({ id: patch.bizplace.id })
     }
 
     return await getRepository(ContactPoint).save({
@@ -43,9 +42,9 @@ export class ContactPointMutation {
   @Mutation(returns => [ContactPoint])
   async updateMultipleContactPoint(
     @Arg('patches', type => [ContactPointPatch]) patches: ContactPointPatch[],
-    @Ctx() context: any
+    @Ctx() context: ResolverContext
   ): Promise<ContactPoint[]> {
-    const { tx }: { tx: EntityManager } = context.state
+    const { tx } = context.state
     let results = []
     const { createRecords, updateRecords, deleteRecords } = patches.reduce(
       (records, patch) => {
@@ -91,7 +90,7 @@ export class ContactPointMutation {
 
   @Directive('@privilege(category: "contact_point", privilege: "mutation")')
   @Mutation(returns => Boolean)
-  async deleteContactPoint(@Arg('id') id: string, @Ctx() context: any): Promise<Boolean> {
+  async deleteContactPoint(@Arg('id') id: string, @Ctx() context: ResolverContext): Promise<Boolean> {
     await deleteContactPoint(id, context.state.tx)
 
     return true
@@ -99,7 +98,10 @@ export class ContactPointMutation {
 
   @Directive('@privilege(category: "contact_point", privilege: "mutation")')
   @Mutation(returns => Boolean)
-  async deleteContactPoints(@Arg('ids', type => [String]) ids: string[], @Ctx() context: any): Promise<Boolean> {
+  async deleteContactPoints(
+    @Arg('ids', type => [String]) ids: string[],
+    @Ctx() context: ResolverContext
+  ): Promise<Boolean> {
     await getRepository(ContactPoint).delete(ids)
 
     return true
@@ -111,7 +113,7 @@ export async function createContactPoint(
   context: any,
   tx?: EntityManager
 ): Promise<ContactPoint> {
-  const { domain, user }: { domain: Domain; user: User } = context.state
+  const { domain, user } = context.state
 
   const bizplaceRepo: Repository<Bizplace> = tx?.getRepository(Bizplace) || getRepository(Bizplace)
   const contactPointRepo: Repository<ContactPoint> = tx?.getRepository(ContactPoint) || getRepository(ContactPoint)
@@ -119,7 +121,7 @@ export async function createContactPoint(
   if (!contactPoint.bizplace?.id) {
     contactPoint.bizplace = await bizplaceRepo.findOne({ where: { name: domain.name } })
   } else {
-    contactPoint.bizplace = await bizplaceRepo.findOne(contactPoint.bizplace.id)
+    contactPoint.bizplace = await bizplaceRepo.findOneBy({ id: contactPoint.bizplace.id })
   }
 
   return await contactPointRepo.save({
@@ -139,7 +141,7 @@ export async function updateContactPoint(
   const bizplaceRepo: Repository<Bizplace> = tx?.getRepository(Bizplace) || getRepository(Bizplace)
   const contactPointRepo: Repository<ContactPoint> = tx?.getRepository(ContactPoint) || getRepository(ContactPoint)
 
-  const { domain, user }: { domain: Domain; user: User } = context.state
+  const { domain, user } = context.state
   let contactPoint: ContactPoint = await contactPointRepo.findOne({ where: { id }, relations: ['bizplace'] })
 
   if (!contactPoint?.bizplace?.id) {
@@ -147,7 +149,7 @@ export async function updateContactPoint(
   }
 
   if (patch?.bizplace?.id) {
-    patch.bizplace = await bizplaceRepo.findOne(patch.bizplace.id)
+    patch.bizplace = await bizplaceRepo.findOneBy({ id: patch.bizplace.id })
   }
 
   return await contactPointRepo.save({

package/server/service/contact-point/contact-point-query.ts

@@ -1,7 +1,6 @@
 import { Arg, Args, Ctx, Directive, Query, Resolver } from 'type-graphql'
-import { getRepository } from 'typeorm'
 
-import { buildQuery, ListParam } from '@things-factory/shell'
+import { buildQuery, getRepository, ListParam } from '@things-factory/shell'
 
 import { ContactPoint } from './contact-point'
 import { ContactPointList } from './contact-point-types'
@@ -10,16 +9,16 @@ import { ContactPointList } from './contact-point-types'
 export class ContactPointQuery {
   @Directive('@privilege(category: "contact_point", privilege: "query")')
   @Query(returns => ContactPoint)
-  async contactPoint(@Arg('name') name: string, @Ctx() context: any): Promise<ContactPoint> {
+  async contactPoint(@Arg('name') name: string, @Ctx() context: ResolverContext): Promise<ContactPoint> {
     return await getRepository(ContactPoint).findOne({
-      where: { domain: context.state.domain, name },
+      where: { domain: { id: context.state.domain.id }, name },
       relations: ['domain', 'bizplace', 'creator', 'updater']
     })
   }
 
   @Directive('@privilege(category: "contact_point", privilege: "query")')
   @Query(returns => ContactPointList)
-  async contactPoints(@Args() params: ListParam, @Ctx() context: any): Promise<ContactPointList> {
+  async contactPoints(@Args() params: ListParam, @Ctx() context: ResolverContext): Promise<ContactPointList> {
     const queryBuilder = getRepository(ContactPoint).createQueryBuilder()
     buildQuery(queryBuilder, params, context, {
       searchables: ['name', 'address', 'postCode', 'phone']

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

@@ -1,7 +1,7 @@
 import { Arg, Ctx, Directive, Mutation, Resolver } from 'type-graphql'
-import { EntityManager, getRepository, In, Repository } from 'typeorm'
+import { EntityManager, In, Repository } from 'typeorm'
 
-import { Domain } from '@things-factory/shell'
+import { Domain, getRepository } from '@things-factory/shell'
 
 import { getMyBizplace } from '../../utils'
 import { Worker } from './worker'
@@ -11,7 +11,7 @@ import { NewWorker, WorkerPatch } from './worker-types'
 export class WorkerMutation {
   @Directive('@privilege(category: "worker", privilege: "mutation")')
   @Mutation(returns => Worker)
-  async createWorker(@Arg('worker') worker: NewWorker, @Ctx() context: any): Promise<Worker> {
+  async createWorker(@Arg('worker') worker: NewWorker, @Ctx() context: ResolverContext): Promise<Worker> {
     return await createWorker(worker, context.state.domain, context.state.user)
   }
 
@@ -20,7 +20,7 @@ export class WorkerMutation {
   async updateWorker(
     @Arg('id') id: string,
     @Arg('patch', type => WorkerPatch) patch: WorkerPatch,
-    @Ctx() context: any
+    @Ctx() context: ResolverContext
   ): Promise<Worker> {
     return await updateWorker(id, patch, context.state.domain, context.state.user)
   }
@@ -30,9 +30,9 @@ export class WorkerMutation {
   @Mutation(returns => [Worker])
   async updateMultipleWorker(
     @Arg('patches', type => [WorkerPatch]) patches: WorkerPatch[],
-    @Ctx() context: any
+    @Ctx() context: ResolverContext
   ): Promise<Worker[]> {
-    const { tx }: { tx: EntityManager } = context.state
+    const { tx } = context.state
 
     let results = []
     const _createRecords = patches.filter((patch: any) => patch.cuFlag.toUpperCase() === '+')
@@ -65,7 +65,7 @@ export class WorkerMutation {
 
   @Directive('@privilege(category: "worker", privilege: "mutation")')
   @Mutation(returns => Boolean)
-  async deleteWorkers(@Arg('ids', type => [String]) ids: string[], @Ctx() context: any): Promise<Boolean> {
+  async deleteWorkers(@Arg('ids', type => [String]) ids: string[], @Ctx() context: ResolverContext): Promise<Boolean> {
     return deleteWorkers({ ids }, context)
   }
 }
@@ -84,8 +84,8 @@ export async function createWorker(worker: NewWorker, domain: Domain, user: any,
 
 export async function updateWorker(id: string, patch: WorkerPatch, domain: Domain, user: any, trxMgr?: EntityManager) {
   const repository: Repository<Worker> = trxMgr ? trxMgr.getRepository(Worker) : getRepository(Worker)
-  const worker = await repository.findOne({
-    domain,
+  const worker = await repository.findOneBy({
+    domain: { id: domain.id },
     id
   })
 
@@ -104,7 +104,7 @@ export async function deleteWorker(id: string, trxMgr?: EntityManager) {
 export async function deleteWorkers({ ids }, _context: any) {
   const { domain } = _context.state
   await getRepository(Worker).delete({
-    domain,
+    domain: { id: domain.id },
     id: In(ids)
   })
   return true

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

@@ -1,7 +1,7 @@
 import { Arg, Args, Ctx, Directive, Query, Resolver } from 'type-graphql'
-import { getRepository, In } from 'typeorm'
+import { In } from 'typeorm'
 
-import { convertListParams, ListParam } from '@things-factory/shell'
+import { convertListParams, getRepository, ListParam } from '@things-factory/shell'
 
 import { getPermittedBizplaceIds } from '../../utils'
 import { Worker } from './worker'
@@ -11,7 +11,7 @@ import { WorkerList } from './worker-types'
 export class WorkerQuery {
   @Directive('@privilege(category: "worker", privilege: "query")')
   @Query(returns => Worker)
-  async worker(@Arg('name') name: string, @Ctx() context: any): Promise<Worker> {
+  async worker(@Arg('name') name: string, @Ctx() context: ResolverContext): Promise<Worker> {
     return await getRepository(Worker).findOne({
       where: {
         domain: context.state.domain,
@@ -24,7 +24,7 @@ export class WorkerQuery {
 
   @Directive('@privilege(category: "worker", privilege: "query")')
   @Query(returns => WorkerList)
-  async workers(@Args() params: ListParam, @Ctx() context: any): Promise<WorkerList> {
+  async workers(@Args() params: ListParam, @Ctx() context: ResolverContext): Promise<WorkerList> {
     const convertedParams = convertListParams(params)
     convertedParams.where.bizplace = In(await getPermittedBizplaceIds(context.state.domain, context.state.user))
     const [items, total] = await getRepository(Worker).findAndCount({

package/server/utils/get-permitted-bizplaces.ts

@@ -1,7 +1,7 @@
-import { EntityManager, getRepository, In, SelectQueryBuilder } from 'typeorm'
+import { EntityManager, In, SelectQueryBuilder } from 'typeorm'
 
 import { checkUserBelongsDomain, Partner, User } from '@things-factory/auth-base'
-import { Domain } from '@things-factory/shell'
+import { Domain, getRepository } from '@things-factory/shell'
 
 import { Bizplace } from '../service/bizplace/bizplace'
 
@@ -78,7 +78,7 @@ export async function getOutletBizplace(outletId: string, tx?: EntityManager) {
 export async function getCompanyBizplace(
   domain: Domain,
   user: User,
-  customerBizplaceId: string,
+  customerBizplaceId?: string,
   tx?: EntityManager
 ): Promise<Bizplace> {
   const bizplaceRepo = tx ? tx.getRepository(Bizplace) : getRepository(Bizplace)
@@ -88,7 +88,10 @@ export async function getCompanyBizplace(
   if (user) {
     let myBizplace: Bizplace = await getMyBizplace(domain, user, tx)
     if (!myBizplace.company?.id) {
-      myBizplace = await bizplaceRepo.findOne(myBizplace.id, { relations: ['company', 'company.domain'] })
+      myBizplace = await bizplaceRepo.findOne({
+        where: { id: myBizplace.id },
+        relations: ['company', 'company.domain']
+      })
       companyDomain = myBizplace.company.domain
     }
   }
@@ -136,16 +139,16 @@ export async function getPartnerBizplaceIds(domain: Domain, user: User, tx?: Ent
 
   let partnerBizplaces: Bizplace[] = []
 
-  const domainBizplace: Bizplace = await bizplaceRepo.findOne({ where: { domain } })
+  const domainBizplace: Bizplace = await bizplaceRepo.findOne({ where: { domain: { id: domain.id } } })
   if (!domainBizplace) {
   } else {
     const partners: Partner[] = await partnerRepo.find({
-      where: { domainBizplace },
+      where: { domain: { id: domainBizplace.id } } /* CONFIRMME regarding TYPEORM - compare original logic */,
       relations: ['partnerBizplace', 'partnerBizplace.company', 'partnerBizplace.company.domain']
     })
 
     for (let partner of partners) {
-      partnerBizplaces.push(partner.partnerBizplace)
+      partnerBizplaces.push((partner as any).partnerBizplace)
     }
   }
   return partnerBizplaces.map((bizplace: Bizplace) => bizplace.id || null)
@@ -286,7 +289,7 @@ export async function getCustomerBizplaces(domain: Domain, tx?: EntityManager):
   })
 }
 
-export async function getSubdomainBizplace(subdomain: Domain, tx?: EntityManager): Promise<Bizplace> {
+export async function getSubdomainBizplace(subdomain: string, tx?: EntityManager): Promise<Bizplace> {
   const domainRepo = tx ? tx.getRepository(Domain) : getRepository(Domain)
 
   const domain: Domain = await domainRepo.findOne({
@@ -301,7 +304,10 @@ export async function getUserBizplaces(user: User, tx?: EntityManager): Promise<
   let userBizplaces: Bizplace[] = []
 
   if (!user.domains?.length) {
-    user = await userRepo.findOne(user, { relations: ['domains'] })
+    user = await userRepo.findOne({
+      where: { id: user.id },
+      relations: ['domains']
+    })
   }
 
   const userDomains: Domain[] = user.domains