@things-factory/worklist 5.0.13 → 6.0.0-alpha.3

package/package.json

@@ -1,11 +1,11 @@
 {
   "name": "@things-factory/worklist",
-  "version": "5.0.13",
+  "version": "6.0.0-alpha.3",
   "main": "dist-server/index.js",
   "browser": "dist-client/index.js",
   "things-factory": true,
   "license": "MIT",
-  "author": "heartyoh",
+  "author": "heartyoh <heartyoh@hatiolab.com>",
   "description": "Module to manage the todo list of business participants",
   "publishConfig": {
     "access": "public",
@@ -28,10 +28,10 @@
   "dependencies": {
     "@operato/graphql": "^1.0.0",
     "@operato/grist-editor": "^1.0.0",
-    "@things-factory/attachment-base": "^5.0.11",
-    "@things-factory/auth-base": "^5.0.11",
-    "@things-factory/board-service": "^5.0.11",
-    "@things-factory/shell": "^5.0.11"
+    "@things-factory/attachment-base": "^6.0.0-alpha.3",
+    "@things-factory/auth-base": "^6.0.0-alpha.3",
+    "@things-factory/board-service": "^6.0.0-alpha.3",
+    "@things-factory/shell": "^6.0.0-alpha.3"
   },
-  "gitHead": "72dfd33e398eab9872600e91d1b13fef0595c174"
+  "gitHead": "1e273b6485662da938cae8fdca035d994ef4a95d"
 }

package/server/controllers/activity-instance/abort.ts

@@ -1,15 +1,19 @@
-import { getRepository } from 'typeorm'
+import { getRepository } from '@things-factory/shell'
 
 import { ActivityInstance } from '../../service/activity-instance/activity-instance'
 import { evalActivityInstanceState } from '../common'
 
-export async function abort({ id, reason }: { id: string; reason: string }, context: any): Promise<ActivityInstance> {
+export async function abort(
+  { id, reason }: { id: string; reason: string },
+  context: ResolverContext
+): Promise<ActivityInstance> {
   const { domain, user, tx } = context.state
 
   var repository = getRepository(ActivityInstance)
 
   var activityInstance = await repository.findOne({
-    where: { domain, id }
+    where: { domain: { id: domain.id }, id },
+    relations: ['domain', 'activity', 'assigneeRole', 'supervisoryRole', 'updater', 'creator', 'starter', 'terminator']
   })
 
   if (!activityInstance) {

package/server/controllers/activity-instance/adjust.ts

@@ -2,12 +2,17 @@ import { ActivityInstance } from '../../service/activity-instance/activity-insta
 import { ActivityInstancePatch } from '../../service/activity-instance/activity-instance-type'
 import { evalActivityInstanceState } from '../common'
 
-export async function adjust(id: string, patch: ActivityInstancePatch, context: any): Promise<ActivityInstance> {
+export async function adjust(
+  id: string,
+  patch: ActivityInstancePatch,
+  context: ResolverContext
+): Promise<ActivityInstance> {
   const { domain, user, tx } = context.state
 
   const repository = tx.getRepository(ActivityInstance)
   const activityInstance = await repository.findOne({
-    where: { domain, id }
+    where: { domain: { id: domain.id }, id },
+    relations: ['domain', 'activity', 'assigneeRole', 'supervisoryRole', 'updater', 'creator', 'starter', 'terminator']
   })
 
   return await repository.save({

package/server/controllers/activity-instance/assign.ts

@@ -14,8 +14,8 @@ export async function assign(
   const repository = tx.getRepository(ActivityInstance)
 
   var activityInstance = await repository.findOne({
-    where: { domain, id },
-    relations: ['assigneeRole', 'supervisoryRole']
+    where: { domain: { id: domain.id }, id },
+    relations: ['domain', 'activity', 'assigneeRole', 'supervisoryRole', 'updater', 'creator', 'starter', 'terminator']
   })
 
   if (!activityInstance) {
@@ -36,5 +36,5 @@ export async function assign(
 
   await createActivityThreadsForUsers('assign', activityInstance, assignedUsers, context)
 
-  return await tx.getRepository(ActivityInstance).findOne(activityInstance.id)
+  return await tx.getRepository(ActivityInstance).findOneBy({ id: activityInstance.id })
 }

package/server/controllers/activity-instance/delegate.ts

@@ -1,4 +1,4 @@
-import { getRepository } from 'typeorm'
+import { getRepository } from '@things-factory/shell'
 
 import { ActivityInstance } from '../../service/activity-instance/activity-instance'
 import { evalActivityInstanceState } from '../common'
@@ -22,7 +22,8 @@ export async function delegate(
   const repository = getRepository(ActivityInstance)
 
   var activityInstance = await repository.findOne({
-    where: { domain, id }
+    where: { domain: { id: domain.id }, id },
+    relations: ['domain', 'activity', 'assigneeRole', 'supervisoryRole', 'updater', 'creator', 'starter', 'terminator']
   })
 
   if (!activityInstance) {

package/server/controllers/activity-instance/draft.ts

@@ -1,10 +1,13 @@
-import { getRepository } from 'typeorm'
+import { getRepository } from '@things-factory/shell'
 
 import { ActivityInstance, ActivityInstanceStatus } from '../../service/activity-instance/activity-instance'
 import { NewActivityInstance } from '../../service/activity-instance/activity-instance-type'
 import { Activity } from '../../service/activity/activity'
 
-export async function draft(activityInstance: NewActivityInstance, context: any): Promise<ActivityInstance> {
+export async function draft(
+  activityInstance: NewActivityInstance,
+  context: ResolverContext
+): Promise<ActivityInstance> {
   const { domain, user, tx } = context.state
   const { activityId, input, dueAt } = activityInstance
 
@@ -13,7 +16,7 @@ export async function draft(activityInstance: NewActivityInstance, context: any)
 
   if (activityId) {
     activity = await repository.findOne({
-      where: { domain, id: activityId },
+      where: { domain: { id: domain.id }, id: activityId },
       relations: ['assigneeRole', 'supervisoryRole']
     })
 

package/server/controllers/activity-instance/end.ts

@@ -1,4 +1,4 @@
-import { getRepository } from 'typeorm'
+import { getRepository } from '@things-factory/shell'
 
 import { ActivityInstance } from '../../service/activity-instance/activity-instance'
 import { evalActivityInstanceState } from '../common'
@@ -11,7 +11,8 @@ export async function end(
   const repository = getRepository(ActivityInstance)
 
   var activityInstance = await repository.findOne({
-    where: { domain, id }
+    where: { domain: { id: domain.id }, id },
+    relations: ['domain', 'activity', 'assigneeRole', 'supervisoryRole', 'updater', 'creator', 'starter', 'terminator']
   })
 
   if (!activityInstance) {

package/server/controllers/activity-instance/pick.ts

@@ -1,15 +1,16 @@
-import { getRepository } from 'typeorm'
+import { getRepository } from '@things-factory/shell'
 
 import { ActivityInstance } from '../../service/activity-instance/activity-instance'
 import { ActivityThread } from '../../service/activity-thread/activity-thread'
 import { createActivityThreadsForUsers } from '../common'
 
-export async function pick(id: string, context: any): Promise<ActivityThread> {
+export async function pick(id: string, context: ResolverContext): Promise<ActivityThread> {
   const { domain, user, tx } = context.state
   const repository = getRepository(ActivityInstance)
 
   var activityInstance = await repository.findOne({
-    where: { domain, id }
+    where: { domain: { id: domain.id }, id },
+    relations: ['domain', 'activity', 'assigneeRole', 'supervisoryRole', 'updater', 'creator', 'starter', 'terminator']
   })
 
   if (!activityInstance) {

package/server/controllers/activity-instance/post.ts

@@ -6,11 +6,28 @@ import { ActivityInstance, ActivityInstanceStatus } from '../../service/activity
 import { ActivityInstancePost } from '../../service/activity-instance/activity-instance-type'
 import { createActivityThreadsForAllRoleUsers, createActivityThreadsForUsers } from '../common'
 
-export async function post(activityInstance: ActivityInstancePost, context: any): Promise<ActivityInstance> {
+export async function post(
+  activityInstance: ActivityInstancePost,
+  context: ResolverContext
+): Promise<ActivityInstance> {
   const { domain, user, tx } = context.state
   const { id, assignees } = activityInstance
 
-  var origin = id ? await tx.getRepository(ActivityInstance).findOne(id) : null
+  var origin = id
+    ? await tx.getRepository(ActivityInstance).findOne({
+        where: { domain: { id: domain.id }, id },
+        relations: [
+          'domain',
+          'activity',
+          'assigneeRole',
+          'supervisoryRole',
+          'updater',
+          'creator',
+          'starter',
+          'terminator'
+        ]
+      })
+    : null
 
   const posted = await tx.getRepository(ActivityInstance).save({
     ...origin,
@@ -22,7 +39,7 @@ export async function post(activityInstance: ActivityInstancePost, context: any)
     updater: user
   })
 
-  const assignedUsers = await tx.getRepository(User).find({
+  const assignedUsers = await tx.getRepository(User).findBy({
     email: In(assignees || [])
   })
 
@@ -34,5 +51,5 @@ export async function post(activityInstance: ActivityInstancePost, context: any)
     await createActivityThreadsForUsers('post', posted, assignedUsers, context)
   }
 
-  return await tx.getRepository(ActivityInstance).findOne(posted.id)
+  return await tx.getRepository(ActivityInstance).findOneBy({ id: posted.id })
 }

package/server/controllers/activity-instance/start.ts

@@ -1,12 +1,13 @@
 import { ActivityInstance } from '../../service/activity-instance/activity-instance'
 import { evalActivityInstanceState } from '../common'
 
-export async function start(id: string, context: any): Promise<ActivityInstance> {
+export async function start(id: string, context: ResolverContext): Promise<ActivityInstance> {
   const { domain, user, tx } = context.state
 
   const repository = tx.getRepository(ActivityInstance)
   const activityInstance = await repository.findOne({
-    where: { domain, id }
+    where: { domain: { id: domain.id }, id },
+    relations: ['domain', 'activity', 'assigneeRole', 'supervisoryRole', 'updater', 'creator', 'starter', 'terminator']
   })
 
   return await repository.save({

package/server/controllers/activity-instance/terminate.ts

@@ -1,4 +1,4 @@
-import { getRepository } from 'typeorm'
+import { getRepository } from '@things-factory/shell'
 
 import { ActivityInstance } from '../../service/activity-instance/activity-instance'
 import { evalActivityInstanceState } from '../common'
@@ -12,7 +12,8 @@ export async function terminate(
   const repository = getRepository(ActivityInstance)
 
   var activityInstance = await repository.findOne({
-    where: { domain, id }
+    where: { domain: { id: domain.id }, id },
+    relations: ['domain', 'activity', 'assigneeRole', 'supervisoryRole', 'updater', 'creator', 'starter', 'terminator']
   })
 
   if (!activityInstance) {

package/server/controllers/activity-thread/abort.ts

@@ -1,14 +1,18 @@
-import { getRepository } from 'typeorm'
+import { getRepository } from '@things-factory/shell'
 
 import { ActivityThread, ActivityThreadStatus } from '../../service/activity-thread/activity-thread'
 
-export async function abort({ id, reason }: { id: string; reason: string }, context: any): Promise<ActivityThread> {
+export async function abort(
+  { id, reason }: { id: string; reason: string },
+  context: ResolverContext
+): Promise<ActivityThread> {
   const { domain, user, tx } = context.state
 
   var repository = getRepository(ActivityThread)
 
   var activityThread = await repository.findOne({
-    where: { domain, id }
+    where: { domain: { id: domain.id }, id },
+    relations: ['domain', 'activityInstance', 'assignee', 'creator', 'updater']
   })
 
   if (!activityThread) {

package/server/controllers/activity-thread/adjust.ts

@@ -1,12 +1,17 @@
 import { ActivityThread } from '../../service/activity-thread/activity-thread'
 import { ActivityThreadPatch } from '../../service/activity-thread/activity-thread-type'
 
-export async function adjust(id: string, patch: ActivityThreadPatch, context: any): Promise<ActivityThread> {
+export async function adjust(
+  id: string,
+  patch: ActivityThreadPatch,
+  context: ResolverContext
+): Promise<ActivityThread> {
   const { domain, user, tx } = context.state
   const repository = tx.getRepository(ActivityThread)
 
   const activityThread = await repository.findOne({
-    where: { domain, id }
+    where: { domain: { id: domain.id }, id },
+    relations: ['domain', 'activityInstance', 'assignee', 'creator', 'updater']
   })
 
   return await repository.save({

package/server/controllers/activity-thread/delegate.ts

@@ -1,4 +1,4 @@
-import { getRepository } from 'typeorm'
+import { getRepository } from '@things-factory/shell'
 
 import { ActivityThread, ActivityThreadStatus } from '../../service/activity-thread/activity-thread'
 
@@ -21,7 +21,8 @@ export async function delegate(
   const repository = getRepository(ActivityThread)
 
   var activityThread = await repository.findOne({
-    where: { domain, id }
+    where: { domain: { id: domain.id }, id },
+    relations: ['domain', 'activityInstance', 'assignee', 'creator', 'updater']
   })
 
   if (!activityThread) {

package/server/controllers/activity-thread/end.ts

@@ -1,4 +1,4 @@
-import { getRepository } from 'typeorm'
+import { getRepository } from '@things-factory/shell'
 
 import { ActivityThread, ActivityThreadStatus } from '../../service/activity-thread/activity-thread'
 
@@ -11,7 +11,8 @@ export async function end(
   const repository = getRepository(ActivityThread)
 
   var activityThread = await repository.findOne({
-    where: { domain, id }
+    where: { domain: { id: domain.id }, id },
+    relations: ['domain', 'activityInstance', 'assignee', 'creator', 'updater']
   })
 
   if (!activityThread) {

package/server/controllers/activity-thread/save.ts

@@ -1,12 +1,13 @@
 import { ActivityThread } from '../../service/activity-thread/activity-thread'
 import { ActivityThreadSave } from '../../service/activity-thread/activity-thread-type'
 
-export async function save(id: string, save: ActivityThreadSave, context: any): Promise<ActivityThread> {
+export async function save(id: string, save: ActivityThreadSave, context: ResolverContext): Promise<ActivityThread> {
   const { domain, user, tx } = context.state
   const repository = tx.getRepository(ActivityThread)
 
   const activityThread = await repository.findOne({
-    where: { domain, id }
+    where: { domain: { id: domain.id }, id },
+    relations: ['domain', 'activityInstance', 'assignee', 'creator', 'updater']
   })
 
   return await repository.save({

package/server/controllers/activity-thread/start.ts

@@ -1,11 +1,17 @@
 import { ActivityThread, ActivityThreadStatus } from '../../service/activity-thread/activity-thread'
 
-export async function start(id: string, output: object, reason: string, context: any): Promise<ActivityThread> {
+export async function start(
+  id: string,
+  output: object,
+  reason: string,
+  context: ResolverContext
+): Promise<ActivityThread> {
   const { domain, user, tx } = context.state
 
   const repository = tx.getRepository(ActivityThread)
   const activityThread = await repository.findOne({
-    where: { domain, id }
+    where: { domain: { id: domain.id }, id },
+    relations: ['domain', 'activityInstance', 'assignee', 'creator', 'updater']
   })
 
   if (!activityThread) {

package/server/controllers/activity-thread/terminate.ts

@@ -1,4 +1,4 @@
-import { getRepository } from 'typeorm'
+import { getRepository } from '@things-factory/shell'
 
 import { ActivityThread, ActivityThreadStatus } from '../../service/activity-thread/activity-thread'
 
@@ -10,7 +10,8 @@ export async function terminate(
   var repository = getRepository(ActivityThread)
 
   var activityThread = await repository.findOne({
-    where: { domain, id }
+    where: { domain: { id: domain.id }, id },
+    relations: ['domain', 'activityInstance', 'assignee', 'creator', 'updater']
   })
 
   if (!activityThread) {

package/server/controllers/common.ts

@@ -3,7 +3,7 @@ import { Role, User } from '@things-factory/auth-base'
 import { ActivityInstance, ActivityInstanceStatus } from '../service/activity-instance/activity-instance'
 import { ActivityThread, ActivityThreadStatus } from '../service/activity-thread/activity-thread'
 
-export async function updateActivityInstanceState(id: string, context: any) {
+export async function updateActivityInstanceState(id: string, context: ResolverContext) {
   const { tx } = context.state
 
   await tx.getRepository(ActivityInstance).save({
@@ -25,10 +25,13 @@ export async function updateActivityInstanceState(id: string, context: any) {
   })
 }
 
-export async function evalActivityInstanceState(id: string, context: any): Promise<ActivityInstanceStatus> {
+export async function evalActivityInstanceState(id: string, context: ResolverContext): Promise<ActivityInstanceStatus> {
   const { tx } = context.state
 
-  const activityInstance = await tx.getRepository(ActivityInstance).findOne(id, { relations: ['activityThreads'] })
+  const activityInstance = await tx.getRepository(ActivityInstance).findOne({
+    where: { id },
+    relations: ['activityThreads']
+  })
   const { threadsMin, threadsMax, activityThreads, state, dueAt } = activityInstance
 
   const validThreads = activityThreads.filter(thread => thread.isValid())
@@ -57,8 +60,8 @@ export async function createActivityThreadsForUsers(
   transaction: string,
   activityInstance: ActivityInstance,
   assignees: User[],
-  context: any
-): Promise<[ActivityThread]> {
+  context: ResolverContext
+): Promise<ActivityThread[]> {
   const { domain, user, tx } = context.state
 
   const threadRepo = tx.getRepository(ActivityThread)
@@ -76,7 +79,7 @@ export async function createActivityThreadsForUsers(
         updater: user,
         dueAt: activityInstance.dueAt,
         assignedAt: now
-      }
+      } as any
     })
   )
 }
@@ -84,14 +87,15 @@ export async function createActivityThreadsForUsers(
 export async function createActivityThreadsForAllRoleUsers(
   transaction: string,
   activityInstance: ActivityInstance,
-  context: any
-): Promise<[ActivityThread]> {
+  context: ResolverContext
+): Promise<ActivityThread[]> {
   const { tx } = context.state
 
   // find how many users are having given role
-  const assigneeRole = (await tx
-    .getRepository(Role)
-    .findOne({ id: activityInstance.assigneeRoleId }, { relations: ['users'] })) as Role
+  const assigneeRole = (await tx.getRepository(Role).findOne({
+    where: { id: activityInstance.assigneeRoleId },
+    relations: ['users']
+  })) as Role
   const assignees = assigneeRole?.users || []
 
   if (assignees.length === 0) {

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

@@ -10,7 +10,7 @@ import { ActivityPatch, NewActivity } from './activity-type'
 export class ActivityMutation {
   @Directive('@transaction')
   @Mutation(returns => Activity, { description: 'To create new Activity' })
-  async createActivity(@Arg('activity') activity: NewActivity, @Ctx() context: any): Promise<Activity> {
+  async createActivity(@Arg('activity') activity: NewActivity, @Ctx() context: ResolverContext): Promise<Activity> {
     const { domain, user, tx } = context.state
 
     const result = await tx.getRepository(Activity).save({
@@ -42,13 +42,15 @@ export class ActivityMutation {
   async updateActivity(
     @Arg('id') id: string,
     @Arg('patch') patch: ActivityPatch,
-    @Ctx() context: any
+    @Ctx() context: ResolverContext
   ): Promise<Activity> {
     const { domain, user, tx } = context.state
 
     const repository = tx.getRepository(Activity)
     const activity = await repository.findOne({
-      where: { domain, id }
+      where: { domain: { id: domain.id }, id },
+      /* history에 항상 반영될 수 있도록 relations가 있어야 함. */
+      relations: ['domain', 'issuerRole', 'assigneeRole', 'supervisoryRole', 'creator', 'updater']
     })
 
     const result = await repository.save({
@@ -79,7 +81,7 @@ export class ActivityMutation {
   @Mutation(returns => [Activity], { description: "To modify multiple Activities' information" })
   async updateMultipleActivity(
     @Arg('patches', type => [ActivityPatch]) patches: ActivityPatch[],
-    @Ctx() context: any
+    @Ctx() context: ResolverContext
   ): Promise<Activity[]> {
     const { domain, user, tx } = context.state
 
@@ -120,7 +122,11 @@ export class ActivityMutation {
     if (_updateRecords.length > 0) {
       for (let i = 0; i < _updateRecords.length; i++) {
         const updateRecord = _updateRecords[i]
-        const activity = await activityRepo.findOne(updateRecord.id)
+        const activity = await activityRepo.findOne({
+          where: { id: updateRecord.id },
+          /* history에 항상 반영될 수 있도록 relations가 있어야 함. */
+          relations: ['domain', 'issuerRole', 'assigneeRole', 'supervisoryRole', 'creator', 'updater']
+        })
 
         const result = await activityRepo.save({
           ...activity,
@@ -152,10 +158,10 @@ export class ActivityMutation {
 
   @Directive('@transaction')
   @Mutation(returns => Boolean, { description: 'To delete Activity' })
-  async deleteActivity(@Arg('id') id: string, @Ctx() context: any): Promise<boolean> {
+  async deleteActivity(@Arg('id') id: string, @Ctx() context: ResolverContext): Promise<boolean> {
     const { domain, tx } = context.state
 
-    await tx.getRepository(Activity).delete({ domain, id })
+    await tx.getRepository(Activity).delete({ domain: { id: domain.id }, id })
     await deleteAttachmentsByRef(null, { refBys: [id] }, context)
 
     return true
@@ -163,11 +169,14 @@ export class ActivityMutation {
 
   @Directive('@transaction')
   @Mutation(returns => Boolean, { description: 'To delete multiple Activities' })
-  async deleteActivities(@Arg('ids', type => [String]) ids: string[], @Ctx() context: any): Promise<boolean> {
+  async deleteActivities(
+    @Arg('ids', type => [String]) ids: string[],
+    @Ctx() context: ResolverContext
+  ): Promise<boolean> {
     const { domain, tx } = context.state
 
     await tx.getRepository(Activity).delete({
-      domain,
+      domain: { id: domain.id },
       id: In(ids)
     })
 
@@ -180,7 +189,7 @@ export class ActivityMutation {
   @Mutation(returns => Boolean, { description: 'To import multiple Activities' })
   async importActivities(
     @Arg('activities', type => [ActivityPatch]) activities: ActivityPatch[],
-    @Ctx() context: any
+    @Ctx() context: ResolverContext
   ): Promise<boolean> {
     const { domain, tx } = context.state
 

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

@@ -1,9 +1,9 @@
 import { Arg, Args, Ctx, FieldResolver, Query, Resolver, Root } from 'type-graphql'
-import { Brackets, getRepository } from 'typeorm'
+import { Brackets } from 'typeorm'
 
 import { Attachment } from '@things-factory/attachment-base'
 import { Role, User } from '@things-factory/auth-base'
-import { Domain, getQueryBuilderFromListParams, ListParam } from '@things-factory/shell'
+import { Domain, getQueryBuilderFromListParams, getRepository, ListParam } from '@things-factory/shell'
 
 import { Activity } from './activity'
 import { ActivityList } from './activity-type'
@@ -11,16 +11,16 @@ import { ActivityList } from './activity-type'
 @Resolver(Activity)
 export class ActivityQuery {
   @Query(returns => Activity!, { nullable: true, description: 'To fetch a Activity' })
-  async activity(@Arg('id') id: string, @Ctx() context: any): Promise<Activity> {
+  async activity(@Arg('id') id: string, @Ctx() context: ResolverContext): Promise<Activity> {
     const { domain } = context.state
 
     return await getRepository(Activity).findOne({
-      where: { domain, id }
+      where: { domain: { id: domain.id }, id }
     })
   }
 
   @Query(returns => ActivityList, { description: 'To fetch multiple Activities' })
-  async activities(@Args() params: ListParam, @Ctx() context: any): Promise<ActivityList> {
+  async activities(@Args() params: ListParam, @Ctx() context: ResolverContext): Promise<ActivityList> {
     const { domain } = context.state
 
     const queryBuilder = getQueryBuilderFromListParams({
@@ -37,7 +37,7 @@ export class ActivityQuery {
   }
 
   @Query(returns => ActivityList, { description: 'To fetch the list of activities I can start' })
-  async startableActivities(@Args() params: ListParam, @Ctx() context: any): Promise<ActivityList> {
+  async startableActivities(@Args() params: ListParam, @Ctx() context: ResolverContext): Promise<ActivityList> {
     var { domain, user } = context.state
 
     /* 조회한 사용자가 assigner 역할을 가진 activity-instance 리스트만 반환 */
@@ -69,7 +69,7 @@ export class ActivityQuery {
   }
 
   @Query(returns => ActivityList, { description: 'To fetch the list of activities that I can report on' })
-  async supervisableActivities(@Args() params: ListParam, @Ctx() context: any): Promise<ActivityList> {
+  async supervisableActivities(@Args() params: ListParam, @Ctx() context: ResolverContext): Promise<ActivityList> {
     var { domain, user } = context.state
 
     /* 조회한 사용자가 assigner 역할을 가진 activity-instance 리스트만 반환 */
@@ -100,7 +100,7 @@ export class ActivityQuery {
   async issuerRole(@Root() activity: Activity): Promise<Role> {
     return (
       activity.issuerRole ||
-      (await getRepository(Role).findOne({
+      (await getRepository(Role).findOneBy({
         id: activity.issuerRoleId
       }))
     )
@@ -110,7 +110,7 @@ export class ActivityQuery {
   async assigneeRole(@Root() activity: Activity): Promise<Role> {
     return (
       activity.assigneeRole ||
-      (await getRepository(Role).findOne({
+      (await getRepository(Role).findOneBy({
         id: activity.assigneeRoleId
       }))
     )
@@ -120,7 +120,7 @@ export class ActivityQuery {
   async supervisoryRole(@Root() activity: Activity): Promise<Role> {
     return (
       activity.supervisoryRole ||
-      (await getRepository(Role).findOne({
+      (await getRepository(Role).findOneBy({
         id: activity.supervisoryRoleId
       }))
     )
@@ -130,7 +130,7 @@ export class ActivityQuery {
   async thumbnail(@Root() activity: Activity): Promise<string | undefined> {
     const attachment: Attachment = await getRepository(Attachment).findOne({
       where: {
-        domain: activity.domainId,
+        domain: { id: activity.domainId },
         refType: Activity.name,
         refBy: activity.id
       }
@@ -141,16 +141,16 @@ export class ActivityQuery {
 
   @FieldResolver(type => Domain)
   async domain(@Root() activity: Activity): Promise<Domain> {
-    return await getRepository(Domain).findOne(activity.domainId)
+    return await getRepository(Domain).findOneBy({ id: activity.domainId })
   }
 
   @FieldResolver(type => User)
   async updater(@Root() activity: Activity): Promise<User> {
-    return await getRepository(User).findOne(activity.updaterId)
+    return await getRepository(User).findOneBy({ id: activity.updaterId })
   }
 
   @FieldResolver(type => User)
   async creator(@Root() activity: Activity): Promise<User> {
-    return await getRepository(User).findOne(activity.creatorId)
+    return await getRepository(User).findOneBy({ id: activity.creatorId })
   }
 }