@things-factory/worklist 5.0.11 → 5.0.13

package/server/controllers/common.ts

@@ -1,21 +1,33 @@
-import { EntityManager } from 'typeorm'
-
 import { Role, User } from '@things-factory/auth-base'
-import { Domain } from '@things-factory/shell'
 
 import { ActivityInstance, ActivityInstanceStatus } from '../service/activity-instance/activity-instance'
 import { ActivityThread, ActivityThreadStatus } from '../service/activity-thread/activity-thread'
 
-export type ContextStatus = { domain?: Domain; user?: User; tx?: EntityManager; t?: (...args: any[]) => string }
+export async function updateActivityInstanceState(id: string, context: any) {
+  const { tx } = context.state
 
-export async function updateActivityInstanceState(id: string, { tx }: ContextStatus) {
   await tx.getRepository(ActivityInstance).save({
-    ...(await tx.getRepository(ActivityInstance).findOne(id)),
-    state: await evalActivityInstanceState(id, { tx })
+    ...(await tx.getRepository(ActivityInstance).findOne({
+      where: { id },
+      relations: [
+        'domain',
+        'activity',
+        'assigneeRole',
+        'supervisoryRole',
+        'updater',
+        'creator',
+        'starter',
+        'terminator'
+      ]
+    })),
+    transaction: 'thread' /* change by transaction of activity thread */,
+    state: await evalActivityInstanceState(id, context)
   })
 }
 
-export async function evalActivityInstanceState(id: string, { tx }: ContextStatus): Promise<ActivityInstanceStatus> {
+export async function evalActivityInstanceState(id: string, context: any): Promise<ActivityInstanceStatus> {
+  const { tx } = context.state
+
   const activityInstance = await tx.getRepository(ActivityInstance).findOne(id, { relations: ['activityThreads'] })
   const { threadsMin, threadsMax, activityThreads, state, dueAt } = activityInstance
 
@@ -42,10 +54,13 @@ export async function evalActivityInstanceState(id: string, { tx }: ContextStatu
 }
 
 export async function createActivityThreadsForUsers(
-  activityInstance,
-  assignees,
-  { domain, user, tx, t }: ContextStatus
+  transaction: string,
+  activityInstance: ActivityInstance,
+  assignees: User[],
+  context: any
 ): Promise<[ActivityThread]> {
+  const { domain, user, tx } = context.state
+
   const threadRepo = tx.getRepository(ActivityThread)
   const now = new Date()
 
@@ -56,6 +71,7 @@ export async function createActivityThreadsForUsers(
         state: ActivityThreadStatus.Assigned,
         activityInstance,
         domain,
+        transaction,
         creator: user,
         updater: user,
         dueAt: activityInstance.dueAt,
@@ -66,9 +82,12 @@ export async function createActivityThreadsForUsers(
 }
 
 export async function createActivityThreadsForAllRoleUsers(
-  activityInstance,
-  { domain, user, tx, t }: ContextStatus
+  transaction: string,
+  activityInstance: ActivityInstance,
+  context: any
 ): Promise<[ActivityThread]> {
+  const { tx } = context.state
+
   // find how many users are having given role
   const assigneeRole = (await tx
     .getRepository(Role)
@@ -80,5 +99,5 @@ export async function createActivityThreadsForAllRoleUsers(
   }
 
   // create activity-thread for all of users having given role
-  return await createActivityThreadsForUsers(activityInstance, assignees, { domain, user, tx, t })
+  return await createActivityThreadsForUsers(transaction, activityInstance, assignees, context)
 }

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

@@ -15,7 +15,7 @@ export class ActivityInstanceMutation {
     @Arg('activityInstance') activityInstance: NewActivityInstance,
     @Ctx() context: any
   ): Promise<ActivityInstance> {
-    return await draft(activityInstance, context.state)
+    return await draft(activityInstance, context)
   }
 
   @Directive('@transaction')
@@ -24,7 +24,7 @@ export class ActivityInstanceMutation {
     @Arg('activityInstance') activityInstance: ActivityInstancePost,
     @Ctx() context: any
   ): Promise<ActivityInstance> {
-    return await post(activityInstance, context.state)
+    return await post(activityInstance, context)
   }
 
   @Directive('@transaction')
@@ -34,15 +34,14 @@ export class ActivityInstanceMutation {
       'To pick an activity ActivityInstance voluntarily. [cautions] This resolver will return a assigned ActivityThread.'
   })
   async pickActivityInstance(@Arg('id') id: string, @Ctx() context: any): Promise<ActivityThread> {
-    return await pick(id, context.state)
+    return await pick(id, context)
   }
 
   @Directive('@transaction')
   @Mutation(returns => ActivityInstance, { description: 'To assign a ActivityInstance' })
   async assignActivityInstance(
     @Arg('id') id: string,
-    @Arg('assigneeRole', { nullable: true }) assigneeRole: string,
-    @Arg('supervisoryRole', { nullable: true }) supervisoryRole: string,
+    @Arg('assignees', type => [String], { nullable: true, description: 'Email of assignee users' }) assignees: string[],
     @Arg('reason', { nullable: true }) reason: string,
     @Arg('dueAt', { nullable: true }) dueAt: Date,
     @Ctx() context: any
@@ -50,12 +49,11 @@ export class ActivityInstanceMutation {
     return await assign(
       {
         id,
-        assigneeRole,
-        supervisoryRole,
+        assignees,
         reason,
         dueAt
       },
-      context.state
+      context
     )
   }
 
@@ -66,7 +64,7 @@ export class ActivityInstanceMutation {
     @Arg('patch') patch: ActivityInstancePatch,
     @Ctx() context: any
   ): Promise<ActivityInstance> {
-    return await adjust(id, patch, context.state)
+    return await adjust(id, patch, context)
   }
 
   @Directive('@transaction')
@@ -78,7 +76,7 @@ export class ActivityInstanceMutation {
     @Arg('reason', { nullable: true }) reason: string,
     @Ctx() context: any
   ): Promise<ActivityInstance> {
-    return await delegate({ id, assigneeRole, dueAt, reason }, context.state)
+    return await delegate({ id, assigneeRole, dueAt, reason }, context)
   }
 
   @Directive('@transaction')
@@ -89,7 +87,7 @@ export class ActivityInstanceMutation {
     @Arg('reason', { nullable: true }) reason: string,
     @Ctx() context: any
   ): Promise<ActivityInstance> {
-    return await end({ id, output, reason }, context.state)
+    return await end({ id, output, reason }, context)
   }
 
   @Directive('@transaction')
@@ -99,6 +97,6 @@ export class ActivityInstanceMutation {
     @Arg('reason', { nullable: true }) reason: string,
     @Ctx() context: any
   ): Promise<ActivityInstance> {
-    return await abort({ id, reason }, context.state)
+    return await abort({ id, reason }, context)
   }
 }

package/server/service/activity-instance/activity-instance-type.ts

@@ -1,6 +1,6 @@
 import { Field, ID, InputType, Int, ObjectType } from 'type-graphql'
 
-import { Role, User } from '@things-factory/auth-base'
+import { Role } from '@things-factory/auth-base'
 import { ObjectRef, ScalarDate, ScalarObject } from '@things-factory/shell'
 
 import { ActivityType, ActivityUIType } from '../activity/activity'
@@ -12,7 +12,7 @@ export class NewActivityInstance {
   name: string
 
   @Field({ nullable: true })
-  activityId?: string
+  activityId: string
 
   @Field({ nullable: true })
   description?: string
@@ -110,8 +110,8 @@ export class ActivityInstancePost {
   @Field(type => ObjectRef, { nullable: true })
   assigneeRole?: Role
 
-  @Field(type => [ObjectRef], { nullable: true })
-  assignees?: User[]
+  @Field(type => [String], { nullable: true, description: 'Email of assignee users' })
+  assignees?: string[]
 }
 
 @InputType()
@@ -137,6 +137,12 @@ export class ActivityInstancePatch {
   @Field({ nullable: true })
   state?: ActivityInstanceStatus
 
+  @Field(type => Int, { nullable: true })
+  threadsMin?: number
+
+  @Field(type => Int, { nullable: true })
+  threadsMax?: number
+
   @Field(type => ScalarDate, { nullable: true })
   dueAt?: Date
 

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

@@ -5,6 +5,7 @@ import { Attachment } from '@things-factory/attachment-base'
 import { User } from '@things-factory/auth-base'
 import { Domain, getQueryBuilderFromListParams, ListParam } from '@things-factory/shell'
 
+import { ActivityModelItem } from '../activity/activity-model-type'
 import { ActivityTemplate } from './activity-template'
 import { ActivityTemplateList } from './activity-template-type'
 
@@ -35,6 +36,15 @@ export class ActivityTemplateQuery {
     return { items, total }
   }
 
+  @FieldResolver(type => [ActivityModelItem])
+  async model(@Root() activityTemplate: ActivityTemplate): Promise<ActivityModelItem[]> {
+    if (activityTemplate.model instanceof Array) {
+      return activityTemplate.model.filter(model => model.name)
+    }
+
+    return []
+  }
+
   @FieldResolver(type => String)
   async thumbnail(@Root() activityTemplate: ActivityTemplate): Promise<string | undefined> {
     const attachment: Attachment = await getRepository(Attachment).findOne({

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

@@ -143,7 +143,7 @@ export class ActivityThreadMutation {
     @Arg('reason', { nullable: true }) reason: string,
     @Ctx() context: any
   ): Promise<ActivityThread> {
-    return await start(id, output, reason, context.state)
+    return await start(id, output, reason, context)
   }
 
   @Directive('@transaction')
@@ -155,7 +155,7 @@ export class ActivityThreadMutation {
     @Arg('reason', { nullable: true }) reason: string,
     @Ctx() context: any
   ): Promise<ActivityThread> {
-    return await delegate({ id, assigneeRole, dueAt, reason }, context.state)
+    return await delegate({ id, assigneeRole, dueAt, reason }, context)
   }
 
   @Directive('@transaction')
@@ -165,7 +165,7 @@ export class ActivityThreadMutation {
     @Arg('save') save: ActivityThreadSave,
     @Ctx() context: any
   ): Promise<ActivityThread> {
-    return await saveActivityThread(id, save, context.state)
+    return await saveActivityThread(id, save, context)
   }
 
   @Directive('@transaction')
@@ -176,7 +176,7 @@ export class ActivityThreadMutation {
     @Arg('reason', { nullable: true }) reason: string,
     @Ctx() context: any
   ): Promise<ActivityThread> {
-    return await end({ id, output, reason }, context.state)
+    return await end({ id, output, reason }, context)
   }
 
   @Directive('@transaction')
@@ -186,6 +186,6 @@ export class ActivityThreadMutation {
     @Arg('reason', { nullable: true }) reason: string,
     @Ctx() context: any
   ): Promise<ActivityThread> {
-    return await abort({ id, reason }, context.state)
+    return await abort({ id, reason }, context)
   }
 }

package/server/service/activity-thread/event-subscriber.ts

@@ -15,7 +15,7 @@ export class ActivityThreadSubscriber implements EntitySubscriberInterface<Activ
   async afterInsert(event: InsertEvent<ActivityThread>): Promise<any> {
     const activityThread = event.entity
 
-    await updateActivityInstanceState(activityThread.activityInstanceId, { tx: event.manager })
+    await updateActivityInstanceState(activityThread.activityInstanceId, { state: { tx: event.manager } })
 
     pubsub.publish('activity-thread', {
       activityThread
@@ -27,7 +27,7 @@ export class ActivityThreadSubscriber implements EntitySubscriberInterface<Activ
   async afterUpdate(event: UpdateEvent<ActivityThread>): Promise<any> {
     const activityThread = event.entity
 
-    await updateActivityInstanceState(activityThread.activityInstanceId, { tx: event.manager })
+    await updateActivityInstanceState(activityThread.activityInstanceId, { state: { tx: event.manager } })
 
     pubsub.publish('activity-thread', {
       activityThread
@@ -38,6 +38,6 @@ export class ActivityThreadSubscriber implements EntitySubscriberInterface<Activ
   async afterRemove(event: RemoveEvent<ActivityThread>): Promise<any> {
     const activityThread = event.entity
 
-    await updateActivityInstanceState(activityThread.activityInstanceId, { tx: event.manager })
+    await updateActivityInstanceState(activityThread.activityInstanceId, { state: { tx: event.manager } })
   }
 }