@things-factory/worklist 6.0.21 → 6.0.24

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/worklist",
-  "version": "6.0.21",
+  "version": "6.0.24",
   "main": "dist-server/index.js",
   "browser": "dist-client/index.js",
   "things-factory": true,
@@ -27,11 +27,11 @@
   "dependencies": {
     "@operato/graphql": "^1.0.0",
     "@operato/grist-editor": "^1.0.0",
-    "@things-factory/attachment-base": "^6.0.21",
-    "@things-factory/auth-base": "^6.0.21",
-    "@things-factory/board-service": "^6.0.21",
-    "@things-factory/organization": "^6.0.21",
-    "@things-factory/shell": "^6.0.21"
+    "@things-factory/attachment-base": "^6.0.24",
+    "@things-factory/auth-base": "^6.0.24",
+    "@things-factory/board-service": "^6.0.24",
+    "@things-factory/organization": "^6.0.24",
+    "@things-factory/shell": "^6.0.24"
   },
-  "gitHead": "074a4f460d08fed4bc7e9882aa57f4c120cf0f11"
+  "gitHead": "27c1a4c3bcf4f293e7e676caa1f2daa3bb6ded11"
 }

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

@@ -0,0 +1,52 @@
+import { In } from 'typeorm'
+
+import { User } from '@things-factory/auth-base'
+
+import { ActivityInstance, ActivityInstanceStatus } from '../../service/activity-instance/activity-instance'
+import { ActivityInstancePost } from '../../service/activity-instance/activity-instance-type'
+import { createActivityThreadsForAllRoleUsers, createActivityThreadsForUsers } from '../common'
+
+export async function bid(activityInstance: ActivityInstancePost, context: ResolverContext): Promise<ActivityInstance> {
+  const { domain, user, tx } = context.state
+  const { id, assignees } = activityInstance
+
+  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 bid = await tx.getRepository(ActivityInstance).save({
+    ...origin,
+    ...activityInstance,
+    transaction: 'bid',
+    state: ActivityInstanceStatus.Posted,
+    domain,
+    creator: user,
+    updater: user
+  })
+
+  const assignedUsers = await tx.getRepository(User).findBy({
+    email: In(assignees || [])
+  })
+
+  if (bid.threadsMin === 0 && bid.assigneeRoleId) {
+    await createActivityThreadsForAllRoleUsers('post', bid, context)
+  }
+
+  if (assignedUsers.length > 0) {
+    await createActivityThreadsForUsers('post', bid, assignedUsers, context)
+  }
+
+  return await tx.getRepository(ActivityInstance).findOneBy({ id: bid.id })
+}

package/server/controllers/call-webhook.ts

@@ -0,0 +1,37 @@
+import { Application } from '@things-factory/auth-base'
+import { Domain, getRepository } from '@things-factory/shell'
+
+export async function callWebhook(domain: Domain, tag: string, data: any) {
+  /* 
+    TODO webhook callback의 다양한 subscription 조건을 지원한다. 
+    - activity의 client에 해당하는 application
+    - activityInstance의 starter에 해당하는 application
+    - 모든 이벤트를 받고자하는 application
+    - 특정 activity들의 이벤트를 받고자하는 application
+  */
+
+  const applications = await getRepository(Application).findBy({ domain: { id: domain.id } })
+  const options = {
+    method: 'post',
+    headers: {
+      'x-things-factory-domain': domain.name,
+      'Content-Type': 'application/json'
+    },
+    body: {
+      tag,
+      data
+    } as any
+  }
+
+  try {
+    applications
+      .filter(app => app.webhook)
+      .every(app => {
+        const webhook = app.webhook
+
+        fetch(webhook, options)
+      })
+  } catch (err) {
+    console.error(err)
+  }
+}

package/server/service/activity/activity.ts

@@ -173,6 +173,13 @@ export class Activity {
   @Field({ nullable: true })
   updatedAt?: Date
 
+  @ManyToOne(type => User, { nullable: true })
+  @Field(type => User, { nullable: true, description: 'User assigned to the client application' })
+  client?: User
+
+  @RelationId((activity: Activity) => activity.creator)
+  clientId?: string
+
   @ManyToOne(type => User, { nullable: true })
   @Field(type => User, { nullable: true })
   creator?: User

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

@@ -3,6 +3,7 @@ import { EventSubscriber, EntitySubscriberInterface, InsertEvent, UpdateEvent }
 import { pubsub } from '@things-factory/shell'
 
 import { ActivityApproval } from './activity-approval'
+import { callWebhook } from '../../controllers/call-webhook'
 
 @EventSubscriber()
 export class ActivityApprovalSubscriber implements EntitySubscriberInterface<ActivityApproval> {
@@ -16,6 +17,8 @@ export class ActivityApprovalSubscriber implements EntitySubscriberInterface<Act
     pubsub.publish('activity-approval', {
       activityApproval
     })
+
+    callWebhook(activityApproval.domain, 'activity-approval-created', activityApproval)
   }
 
   afterUpdate(event: UpdateEvent<ActivityApproval>): Promise<any> | void {
@@ -24,5 +27,7 @@ export class ActivityApprovalSubscriber implements EntitySubscriberInterface<Act
     pubsub.publish('activity-approval', {
       activityApproval
     })
+
+    callWebhook(activityApproval.domain, 'activity-approval-updated', activityApproval)
   }
 }