@things-factory/lite-menu 5.0.7 → 6.0.0-alpha.0

package/server/service/lite-menu/lite-menu-query.ts

@@ -1,9 +1,8 @@
 import { Arg, Args, Ctx, FieldResolver, Query, Resolver, Root } from 'type-graphql'
-import { getRepository } from 'typeorm'
 
 import { User } from '@things-factory/auth-base'
 import { Board } from '@things-factory/board-service'
-import { Domain, getQueryBuilderFromListParams, ListParam } from '@things-factory/shell'
+import { Domain, getQueryBuilderFromListParams, getRepository, ListParam } from '@things-factory/shell'
 
 import { LiteMenu } from './lite-menu'
 import { LiteMenuList } from './lite-menu-type'
@@ -11,19 +10,20 @@ import { LiteMenuList } from './lite-menu-type'
 @Resolver(LiteMenu)
 export class LiteMenuQuery {
   @Query(returns => LiteMenu, { description: 'To fetch a LiteMenu' })
-  async liteMenu(@Arg('id') id: string, @Ctx() context: any): Promise<LiteMenu> {
+  async liteMenu(@Arg('id') id: string, @Ctx() context: ResolverContext): Promise<LiteMenu> {
     const { domain } = context.state
     const repository = getRepository(LiteMenu)
 
     var liteMenu: any = repository.findOne({
-      where: { domain, id, relations: ['domain', 'creator', 'updater'] }
+      where: { domain: { id: domain.id }, id },
+      relations: ['domain', 'creator', 'updater']
     })
 
     return liteMenu
   }
 
   @Query(returns => LiteMenuList, { description: 'To fetch multiple LiteMenus' })
-  async liteMenus(@Args() params: ListParam, @Ctx() context: any): Promise<LiteMenuList> {
+  async liteMenus(@Args() params: ListParam, @Ctx() context: ResolverContext): Promise<LiteMenuList> {
     const { domain } = context.state
 
     const queryBuilder = getQueryBuilderFromListParams({
@@ -40,22 +40,22 @@ export class LiteMenuQuery {
   @FieldResolver(type => Board)
   async board(@Root() liteMenu: LiteMenu) {
     if ((liteMenu.type === 'board' || liteMenu.type === 'interactive-board') && liteMenu.value) {
-      return await getRepository(Board).findOne({ id: liteMenu.value })
+      return await getRepository(Board).findOneBy({ id: liteMenu.value })
     }
   }
 
   @FieldResolver(type => Domain)
   async domain(@Root() liteMenu: LiteMenu) {
-    return await getRepository(Domain).findOne(liteMenu.domainId)
+    return await getRepository(Domain).findOneBy({ id: liteMenu.domainId })
   }
 
   @FieldResolver(type => User)
   async updater(@Root() liteMenu: LiteMenu): Promise<User> {
-    return await getRepository(User).findOne(liteMenu.updaterId)
+    return await getRepository(User).findOneBy({ id: liteMenu.updaterId })
   }
 
   @FieldResolver(type => User)
   async creator(@Root() liteMenu: LiteMenu): Promise<User> {
-    return await getRepository(User).findOne(liteMenu.creatorId)
+    return await getRepository(User).findOneBy({ id: liteMenu.creatorId })
   }
 }