@things-factory/worklist 6.1.23 → 6.1.24

package/dist-client/types/activity-thread.d.ts

@@ -31,7 +31,4 @@ export declare class ActivityThread {
     creator?: User;
     updater?: User;
     terminator?: User;
-    isPendingStarted(): boolean;
-    isPendingEnded(): boolean;
-    isValid(): boolean;
 }

package/dist-client/types/activity-thread.js

@@ -13,39 +13,39 @@ export class ActivityThread {
     constructor() {
         this.version = 1;
         this.round = 1;
-    }
-    isPendingStarted() {
-        switch (this.state) {
-            case ActivityThreadStatus.Assigned:
-                return true;
-            default:
-                return false;
-        }
-    }
-    isPendingEnded() {
-        switch (this.state) {
-            case ActivityThreadStatus.Started:
-            case ActivityThreadStatus.Rejected:
-            case ActivityThreadStatus.Submitted:
-                return true;
-            default:
-                return false;
-        }
-    }
-    isValid() {
-        switch (this.state) {
-            case ActivityThreadStatus.Assigned:
-            case ActivityThreadStatus.Started:
-            case ActivityThreadStatus.Ended:
-            case ActivityThreadStatus.Rejected:
-            case ActivityThreadStatus.Escalated:
-            case ActivityThreadStatus.Aborted:
-            case ActivityThreadStatus.Submitted:
-                return true;
-            case ActivityThreadStatus.Delegated:
-            default:
-                return false;
-        }
+        // isPendingStarted(): boolean {
+        //   switch (this.state) {
+        //     case ActivityThreadStatus.Assigned:
+        //       return true
+        //     default:
+        //       return false
+        //   }
+        // }
+        // isPendingEnded(): boolean {
+        //   switch (this.state) {
+        //     case ActivityThreadStatus.Started:
+        //     case ActivityThreadStatus.Rejected:
+        //     case ActivityThreadStatus.Submitted:
+        //     case ActivityThreadStatus.Escalated:
+        //       return true
+        //     default:
+        //       return false
+        //   }
+        // }
+        // isValid(): boolean {
+        //   switch (this.state) {
+        //     case ActivityThreadStatus.Assigned:
+        //     case ActivityThreadStatus.Started:
+        //     case ActivityThreadStatus.Ended:
+        //     case ActivityThreadStatus.Rejected:
+        //     case ActivityThreadStatus.Escalated:
+        //     case ActivityThreadStatus.Aborted:
+        //     case ActivityThreadStatus.Submitted:
+        //       return true
+        //     default:
+        //       return false
+        //   }
+        // }
     }
 }
 //# sourceMappingURL=activity-thread.js.map

package/dist-client/types/activity-thread.js.map

@@ -1 +1 @@
-{"version":3,"file":"activity-thread.js","sourceRoot":"","sources":["../../client/types/activity-thread.ts"],"names":[],"mappings":"AAIA,MAAM,CAAN,IAAY,oBASX;AATD,WAAY,oBAAoB;IAC9B,6CAAqB,CAAA;IACrB,2CAAmB,CAAA;IACnB,+CAAuB,CAAA;IACvB,+CAAuB,CAAA;IACvB,+CAAuB,CAAA;IACvB,6CAAqB,CAAA;IACrB,uCAAe,CAAA;IACf,2CAAmB,CAAA;AACrB,CAAC,EATW,oBAAoB,KAApB,oBAAoB,QAS/B;AAED,MAAM,OAAO,cAAc;IAA3B;QAKE,YAAO,GAAY,CAAC,CAAA;QAUpB,UAAK,GAAY,CAAC,CAAA;IAyDpB,CAAC;IAnCC,gBAAgB;QACd,QAAQ,IAAI,CAAC,KAAK,EAAE;YAClB,KAAK,oBAAoB,CAAC,QAAQ;gBAChC,OAAO,IAAI,CAAA;YACb;gBACE,OAAO,KAAK,CAAA;SACf;IACH,CAAC;IAED,cAAc;QACZ,QAAQ,IAAI,CAAC,KAAK,EAAE;YAClB,KAAK,oBAAoB,CAAC,OAAO,CAAC;YAClC,KAAK,oBAAoB,CAAC,QAAQ,CAAC;YACnC,KAAK,oBAAoB,CAAC,SAAS;gBACjC,OAAO,IAAI,CAAA;YACb;gBACE,OAAO,KAAK,CAAA;SACf;IACH,CAAC;IAED,OAAO;QACL,QAAQ,IAAI,CAAC,KAAK,EAAE;YAClB,KAAK,oBAAoB,CAAC,QAAQ,CAAC;YACnC,KAAK,oBAAoB,CAAC,OAAO,CAAC;YAClC,KAAK,oBAAoB,CAAC,KAAK,CAAC;YAChC,KAAK,oBAAoB,CAAC,QAAQ,CAAC;YACnC,KAAK,oBAAoB,CAAC,SAAS,CAAC;YACpC,KAAK,oBAAoB,CAAC,OAAO,CAAC;YAClC,KAAK,oBAAoB,CAAC,SAAS;gBACjC,OAAO,IAAI,CAAA;YACb,KAAK,oBAAoB,CAAC,SAAS,CAAC;YACpC;gBACE,OAAO,KAAK,CAAA;SACf;IACH,CAAC;CACF","sourcesContent":["import { Domain, User } from '@operato/shell'\n\nimport { ActivityInstance } from './activity-instance'\n\nexport enum ActivityThreadStatus {\n  Assigned = 'assigned',\n  Started = 'started',\n  Delegated = 'delegated',\n  Submitted = 'submitted',\n  Escalated = 'escalated',\n  Rejected = 'rejected',\n  Ended = 'ended',\n  Aborted = 'aborted'\n}\n\nexport class ActivityThread {\n  id?: string\n\n  domain?: Domain\n\n  version?: number = 1\n\n  activityInstance?: ActivityInstance\n\n  state?: ActivityThreadStatus\n\n  output?: { [key: string]: any }\n\n  assignee?: User\n\n  round?: number = 1\n\n  transaction?: string\n\n  dueAt?: Date\n\n  assignedAt?: Date\n\n  startedAt?: Date\n\n  terminatedAt?: Date\n\n  createdAt?: Date\n\n  updatedAt?: Date\n\n  creator?: User\n\n  updater?: User\n\n  terminator?: User\n\n  isPendingStarted(): boolean {\n    switch (this.state) {\n      case ActivityThreadStatus.Assigned:\n        return true\n      default:\n        return false\n    }\n  }\n\n  isPendingEnded(): boolean {\n    switch (this.state) {\n      case ActivityThreadStatus.Started:\n      case ActivityThreadStatus.Rejected:\n      case ActivityThreadStatus.Submitted:\n        return true\n      default:\n        return false\n    }\n  }\n\n  isValid(): boolean {\n    switch (this.state) {\n      case ActivityThreadStatus.Assigned:\n      case ActivityThreadStatus.Started:\n      case ActivityThreadStatus.Ended:\n      case ActivityThreadStatus.Rejected:\n      case ActivityThreadStatus.Escalated:\n      case ActivityThreadStatus.Aborted:\n      case ActivityThreadStatus.Submitted:\n        return true\n      case ActivityThreadStatus.Delegated:\n      default:\n        return false\n    }\n  }\n}\n"]}
+{"version":3,"file":"activity-thread.js","sourceRoot":"","sources":["../../client/types/activity-thread.ts"],"names":[],"mappings":"AAIA,MAAM,CAAN,IAAY,oBASX;AATD,WAAY,oBAAoB;IAC9B,6CAAqB,CAAA;IACrB,2CAAmB,CAAA;IACnB,+CAAuB,CAAA;IACvB,+CAAuB,CAAA;IACvB,+CAAuB,CAAA;IACvB,6CAAqB,CAAA;IACrB,uCAAe,CAAA;IACf,2CAAmB,CAAA;AACrB,CAAC,EATW,oBAAoB,KAApB,oBAAoB,QAS/B;AAED,MAAM,OAAO,cAAc;IAA3B;QAKE,YAAO,GAAY,CAAC,CAAA;QAUpB,UAAK,GAAY,CAAC,CAAA;QAsBlB,gCAAgC;QAChC,0BAA0B;QAC1B,0CAA0C;QAC1C,oBAAoB;QACpB,eAAe;QACf,qBAAqB;QACrB,MAAM;QACN,IAAI;QAEJ,8BAA8B;QAC9B,0BAA0B;QAC1B,yCAAyC;QACzC,0CAA0C;QAC1C,2CAA2C;QAC3C,2CAA2C;QAC3C,oBAAoB;QACpB,eAAe;QACf,qBAAqB;QACrB,MAAM;QACN,IAAI;QAEJ,uBAAuB;QACvB,0BAA0B;QAC1B,0CAA0C;QAC1C,yCAAyC;QACzC,uCAAuC;QACvC,0CAA0C;QAC1C,2CAA2C;QAC3C,yCAAyC;QACzC,2CAA2C;QAC3C,oBAAoB;QACpB,eAAe;QACf,qBAAqB;QACrB,MAAM;QACN,IAAI;IACN,CAAC;CAAA","sourcesContent":["import { Domain, User } from '@operato/shell'\n\nimport { ActivityInstance } from './activity-instance'\n\nexport enum ActivityThreadStatus {\n  Assigned = 'assigned',\n  Started = 'started',\n  Delegated = 'delegated',\n  Submitted = 'submitted',\n  Escalated = 'escalated',\n  Rejected = 'rejected',\n  Ended = 'ended',\n  Aborted = 'aborted'\n}\n\nexport class ActivityThread {\n  id?: string\n\n  domain?: Domain\n\n  version?: number = 1\n\n  activityInstance?: ActivityInstance\n\n  state?: ActivityThreadStatus\n\n  output?: { [key: string]: any }\n\n  assignee?: User\n\n  round?: number = 1\n\n  transaction?: string\n\n  dueAt?: Date\n\n  assignedAt?: Date\n\n  startedAt?: Date\n\n  terminatedAt?: Date\n\n  createdAt?: Date\n\n  updatedAt?: Date\n\n  creator?: User\n\n  updater?: User\n\n  terminator?: User\n\n  // isPendingStarted(): boolean {\n  //   switch (this.state) {\n  //     case ActivityThreadStatus.Assigned:\n  //       return true\n  //     default:\n  //       return false\n  //   }\n  // }\n\n  // isPendingEnded(): boolean {\n  //   switch (this.state) {\n  //     case ActivityThreadStatus.Started:\n  //     case ActivityThreadStatus.Rejected:\n  //     case ActivityThreadStatus.Submitted:\n  //     case ActivityThreadStatus.Escalated:\n  //       return true\n  //     default:\n  //       return false\n  //   }\n  // }\n\n  // isValid(): boolean {\n  //   switch (this.state) {\n  //     case ActivityThreadStatus.Assigned:\n  //     case ActivityThreadStatus.Started:\n  //     case ActivityThreadStatus.Ended:\n  //     case ActivityThreadStatus.Rejected:\n  //     case ActivityThreadStatus.Escalated:\n  //     case ActivityThreadStatus.Aborted:\n  //     case ActivityThreadStatus.Submitted:\n  //       return true\n  //     default:\n  //       return false\n  //   }\n  // }\n}\n"]}

package/dist-server/controllers/activity-approval/abort.js

@@ -27,7 +27,7 @@ async function abort({ id, comment }, context) {
         }));
     }
     var result = await (0, _abort_1._abort)({ activityApproval, comment }, context);
-    await (0, common_1.updateActivityInstanceState)(activityApproval.activityThread.activityInstanceId, context);
+    await (0, common_1.updateActivityInstanceState)(activityApproval.activityThread.activityInstanceId, { causedBy: [activityApproval.activityThread] }, context);
     return result;
 }
 exports.abort = abort;

package/dist-server/controllers/activity-approval/abort.js.map

@@ -1 +1 @@
-{"version":3,"file":"abort.js","sourceRoot":"","sources":["../../../server/controllers/activity-approval/abort.ts"],"names":[],"mappings":";;;AAAA,yFAA8G;AAC9G,sCAAuD;AACvD,qCAAiC;AAE1B,KAAK,UAAU,KAAK,CACzB,EAAE,EAAE,EAAE,OAAO,EAAmC,EAChD,OAAwB;IAExB,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,EAAE,EAAE,GAAG,OAAO,CAAC,KAAK,CAAA;IAE1C,IAAI,UAAU,GAAG,EAAE,CAAC,aAAa,CAAC,oCAAgB,CAAC,CAAA;IAEnD,IAAI,gBAAgB,GAAG,MAAM,UAAU,CAAC,OAAO,CAAC;QAC9C,KAAK,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE,EAAE,MAAM,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE;QACxC,SAAS,EAAE,CAAC,gBAAgB,CAAC;KAC9B,CAAC,CAAA;IAEF,IAAI,CAAC,gBAAgB,EAAE;QACrB,MAAM,IAAI,KAAK,CACb,OAAO,CAAC,CAAC,CAAC,mCAAmC,EAAE;YAC7C,gBAAgB,EAAE,EAAE;SACrB,CAAC,CACH,CAAA;KACF;IAED;;;MAGE;IACF,IAAI,gBAAgB,CAAC,QAAQ,KAAK,4CAAwB,CAAC,OAAO,EAAE;QAClE,MAAM,IAAI,KAAK,CACb,OAAO,CAAC,CAAC,CAAC,+CAA+C,EAAE;YACzD,gBAAgB,EAAE,EAAE;YACpB,MAAM,EAAE,gBAAgB,CAAC,QAAQ;SAClC,CAAC,CACH,CAAA;KACF;IAED,IAAI,MAAM,GAAG,MAAM,IAAA,eAAM,EAAC,EAAE,gBAAgB,EAAE,OAAO,EAAE,EAAE,OAAO,CAAC,CAAA;IAEjE,MAAM,IAAA,oCAA2B,EAAC,gBAAgB,CAAC,cAAc,CAAC,kBAAkB,EAAE,OAAO,CAAC,CAAA;IAE9F,OAAO,MAAM,CAAA;AACf,CAAC;AAvCD,sBAuCC","sourcesContent":["import { ActivityApproval, ActivityApprovalJudgment } from '../../service/activity-approval/activity-approval'\nimport { updateActivityInstanceState } from '../common'\nimport { _abort } from './_abort'\n\nexport async function abort(\n  { id, comment }: { id: string; comment: string },\n  context: ResolverContext\n): Promise<ActivityApproval> {\n  const { domain, user, tx } = context.state\n\n  var repository = tx.getRepository(ActivityApproval)\n\n  var activityApproval = await repository.findOne({\n    where: { domain: { id: domain.id }, id },\n    relations: ['activityThread']\n  })\n\n  if (!activityApproval) {\n    throw new Error(\n      context.t('error.activity-approval not found', {\n        activityApproval: id\n      })\n    )\n  }\n\n  /* \n    Prerequisite of Abortion\n    - Previous judgement should be 'pending'\n  */\n  if (activityApproval.judgment !== ActivityApprovalJudgment.Pending) {\n    throw new Error(\n      context.t(`error.activity-approval is already terminated`, {\n        activityInstance: id,\n        actual: activityApproval.judgment\n      })\n    )\n  }\n\n  var result = await _abort({ activityApproval, comment }, context)\n\n  await updateActivityInstanceState(activityApproval.activityThread.activityInstanceId, context)\n\n  return result\n}\n"]}
+{"version":3,"file":"abort.js","sourceRoot":"","sources":["../../../server/controllers/activity-approval/abort.ts"],"names":[],"mappings":";;;AAAA,yFAA8G;AAC9G,sCAAuD;AACvD,qCAAiC;AAE1B,KAAK,UAAU,KAAK,CACzB,EAAE,EAAE,EAAE,OAAO,EAAmC,EAChD,OAAwB;IAExB,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,EAAE,EAAE,GAAG,OAAO,CAAC,KAAK,CAAA;IAE1C,IAAI,UAAU,GAAG,EAAE,CAAC,aAAa,CAAC,oCAAgB,CAAC,CAAA;IAEnD,IAAI,gBAAgB,GAAG,MAAM,UAAU,CAAC,OAAO,CAAC;QAC9C,KAAK,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE,EAAE,MAAM,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE;QACxC,SAAS,EAAE,CAAC,gBAAgB,CAAC;KAC9B,CAAC,CAAA;IAEF,IAAI,CAAC,gBAAgB,EAAE;QACrB,MAAM,IAAI,KAAK,CACb,OAAO,CAAC,CAAC,CAAC,mCAAmC,EAAE;YAC7C,gBAAgB,EAAE,EAAE;SACrB,CAAC,CACH,CAAA;KACF;IAED;;;MAGE;IACF,IAAI,gBAAgB,CAAC,QAAQ,KAAK,4CAAwB,CAAC,OAAO,EAAE;QAClE,MAAM,IAAI,KAAK,CACb,OAAO,CAAC,CAAC,CAAC,+CAA+C,EAAE;YACzD,gBAAgB,EAAE,EAAE;YACpB,MAAM,EAAE,gBAAgB,CAAC,QAAQ;SAClC,CAAC,CACH,CAAA;KACF;IAED,IAAI,MAAM,GAAG,MAAM,IAAA,eAAM,EAAC,EAAE,gBAAgB,EAAE,OAAO,EAAE,EAAE,OAAO,CAAC,CAAA;IAEjE,MAAM,IAAA,oCAA2B,EAC/B,gBAAgB,CAAC,cAAc,CAAC,kBAAkB,EAClD,EAAE,QAAQ,EAAE,CAAC,gBAAgB,CAAC,cAAc,CAAC,EAAE,EAC/C,OAAO,CACR,CAAA;IAED,OAAO,MAAM,CAAA;AACf,CAAC;AA3CD,sBA2CC","sourcesContent":["import { ActivityApproval, ActivityApprovalJudgment } from '../../service/activity-approval/activity-approval'\nimport { updateActivityInstanceState } from '../common'\nimport { _abort } from './_abort'\n\nexport async function abort(\n  { id, comment }: { id: string; comment: string },\n  context: ResolverContext\n): Promise<ActivityApproval> {\n  const { domain, user, tx } = context.state\n\n  var repository = tx.getRepository(ActivityApproval)\n\n  var activityApproval = await repository.findOne({\n    where: { domain: { id: domain.id }, id },\n    relations: ['activityThread']\n  })\n\n  if (!activityApproval) {\n    throw new Error(\n      context.t('error.activity-approval not found', {\n        activityApproval: id\n      })\n    )\n  }\n\n  /* \n    Prerequisite of Abortion\n    - Previous judgement should be 'pending'\n  */\n  if (activityApproval.judgment !== ActivityApprovalJudgment.Pending) {\n    throw new Error(\n      context.t(`error.activity-approval is already terminated`, {\n        activityInstance: id,\n        actual: activityApproval.judgment\n      })\n    )\n  }\n\n  var result = await _abort({ activityApproval, comment }, context)\n\n  await updateActivityInstanceState(\n    activityApproval.activityThread.activityInstanceId,\n    { causedBy: [activityApproval.activityThread] },\n    context\n  )\n\n  return result\n}\n"]}

package/dist-server/controllers/activity-approval/approve.js

@@ -26,7 +26,7 @@ async function approve({ id, comment }, context) {
             actual: activityApproval.judgment
         }));
     }
-    const activityThread = await tx.getRepository(activity_thread_1.ActivityThread).findOne({
+    var activityThread = await tx.getRepository(activity_thread_1.ActivityThread).findOne({
         where: { domain: { id: domain.id }, id: activityApproval.activityThreadId },
         relations: ['activityInstance']
     });
@@ -49,12 +49,12 @@ async function approve({ id, comment }, context) {
             creator: user,
             updater: user
         });
-        await tx.getRepository(activity_thread_1.ActivityThread).save(Object.assign(Object.assign({}, activityThread), { transaction: 'escalate', state: activity_thread_1.ActivityThreadStatus.Escalated, updater: user }));
+        activityThread = await tx.getRepository(activity_thread_1.ActivityThread).save(Object.assign(Object.assign({}, activityThread), { transaction: 'escalate', state: activity_thread_1.ActivityThreadStatus.Escalated, updater: user }));
     }
     else {
-        await tx.getRepository(activity_thread_1.ActivityThread).save(Object.assign(Object.assign({}, activityThread), { transaction: 'approve', state: activity_thread_1.ActivityThreadStatus.Ended, terminatedAt: new Date(), terminator: user, updater: user }));
+        activityThread = await tx.getRepository(activity_thread_1.ActivityThread).save(Object.assign(Object.assign({}, activityThread), { transaction: 'approve', state: activity_thread_1.ActivityThreadStatus.Ended, terminatedAt: new Date(), terminator: user, updater: user }));
     }
-    await (0, common_2.updateActivityInstanceState)(activityThread.activityInstanceId, context);
+    await (0, common_2.updateActivityInstanceState)(activityThread.activityInstanceId, { causedBy: [activityThread] }, context);
     return result;
 }
 exports.approve = approve;

package/dist-server/controllers/activity-approval/approve.js.map

@@ -1 +1 @@
-{"version":3,"file":"approve.js","sourceRoot":"","sources":["../../../server/controllers/activity-approval/approve.ts"],"names":[],"mappings":"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","sourcesContent":["import { getSystemUserFromOrgMemberItem } from '../../controllers/common'\nimport { ActivityThread, ActivityThreadStatus } from '../../service/activity-thread/activity-thread'\nimport { ActivityApproval, ActivityApprovalJudgment } from '../../service/activity-approval/activity-approval'\nimport { ApprovalLineItem } from '@things-factory/organization'\nimport { updateActivityInstanceState } from '../common'\n\nexport async function approve(\n  { id, comment }: { id: string; comment: string },\n  context: ResolverContext\n): Promise<ActivityApproval> {\n  const { domain, user, tx } = context.state\n\n  var repository = tx.getRepository(ActivityApproval)\n\n  var activityApproval = await repository.findOne({\n    where: { domain: { id: domain.id }, id }\n  })\n\n  if (!activityApproval) {\n    throw new Error(\n      context.t('error.activity-approval not found', {\n        activityApproval: id\n      })\n    )\n  }\n\n  /* \n    Prerequisite of Approval\n    - Previous judgement should be 'pending'\n  */\n  if (activityApproval.judgment !== ActivityApprovalJudgment.Pending) {\n    throw new Error(\n      context.t(`error.activity-approval is already terminated`, {\n        activityInstance: id,\n        actual: activityApproval.judgment\n      })\n    )\n  }\n\n  const activityThread = await tx.getRepository(ActivityThread).findOne({\n    where: { domain: { id: domain.id }, id: activityApproval.activityThreadId },\n    relations: ['activityInstance']\n  })\n\n  const approvalLine: ApprovalLineItem[] = activityThread.activityInstance.approvalLine\n  const order = activityApproval.order\n\n  const result = await tx.getRepository(ActivityApproval).save({\n    ...activityApproval,\n    judgment: approvalLine[order] ? ActivityApprovalJudgment.Escalated : ActivityApprovalJudgment.Approved,\n    comment,\n    transaction: approvalLine[order] ? 'escalate' : 'approve',\n    updater: user,\n    terminatedAt: new Date(),\n    terminator: user\n  })\n\n  if (approvalLine && approvalLine.length > order) {\n    // approvalLine에서 후속 승인자에게 escalating.\n    var approverUser = await getSystemUserFromOrgMemberItem(approvalLine[order], context)\n\n    if (!approverUser) {\n      throw 'Cannot specify the approval user for this approval line'\n    }\n\n    await tx.getRepository(ActivityApproval).save({\n      domain,\n      activityThread,\n      order: order + 1,\n      judgment: ActivityApprovalJudgment.Pending,\n      transaction: 'escalate',\n      approver: approverUser,\n      creator: user,\n      updater: user\n    })\n\n    await tx.getRepository(ActivityThread).save({\n      ...activityThread,\n      transaction: 'escalate',\n      state: ActivityThreadStatus.Escalated,\n      updater: user\n    })\n  } else {\n    await tx.getRepository(ActivityThread).save({\n      ...activityThread,\n      transaction: 'approve',\n      state: ActivityThreadStatus.Ended,\n      terminatedAt: new Date(),\n      terminator: user,\n      updater: user\n    })\n  }\n\n  await updateActivityInstanceState(activityThread.activityInstanceId, context)\n\n  return result\n}\n"]}
+{"version":3,"file":"approve.js","sourceRoot":"","sources":["../../../server/controllers/activity-approval/approve.ts"],"names":[],"mappings":"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","sourcesContent":["import { getSystemUserFromOrgMemberItem } from '../../controllers/common'\nimport { ActivityThread, ActivityThreadStatus } from '../../service/activity-thread/activity-thread'\nimport { ActivityApproval, ActivityApprovalJudgment } from '../../service/activity-approval/activity-approval'\nimport { ApprovalLineItem } from '@things-factory/organization'\nimport { updateActivityInstanceState } from '../common'\n\nexport async function approve(\n  { id, comment }: { id: string; comment: string },\n  context: ResolverContext\n): Promise<ActivityApproval> {\n  const { domain, user, tx } = context.state\n\n  var repository = tx.getRepository(ActivityApproval)\n\n  var activityApproval = await repository.findOne({\n    where: { domain: { id: domain.id }, id }\n  })\n\n  if (!activityApproval) {\n    throw new Error(\n      context.t('error.activity-approval not found', {\n        activityApproval: id\n      })\n    )\n  }\n\n  /* \n    Prerequisite of Approval\n    - Previous judgement should be 'pending'\n  */\n  if (activityApproval.judgment !== ActivityApprovalJudgment.Pending) {\n    throw new Error(\n      context.t(`error.activity-approval is already terminated`, {\n        activityInstance: id,\n        actual: activityApproval.judgment\n      })\n    )\n  }\n\n  var activityThread = await tx.getRepository(ActivityThread).findOne({\n    where: { domain: { id: domain.id }, id: activityApproval.activityThreadId },\n    relations: ['activityInstance']\n  })\n\n  const approvalLine: ApprovalLineItem[] = activityThread.activityInstance.approvalLine\n  const order = activityApproval.order\n\n  const result = await tx.getRepository(ActivityApproval).save({\n    ...activityApproval,\n    judgment: approvalLine[order] ? ActivityApprovalJudgment.Escalated : ActivityApprovalJudgment.Approved,\n    comment,\n    transaction: approvalLine[order] ? 'escalate' : 'approve',\n    updater: user,\n    terminatedAt: new Date(),\n    terminator: user\n  })\n\n  if (approvalLine && approvalLine.length > order) {\n    // approvalLine에서 후속 승인자에게 escalating.\n    var approverUser = await getSystemUserFromOrgMemberItem(approvalLine[order], context)\n\n    if (!approverUser) {\n      throw 'Cannot specify the approval user for this approval line'\n    }\n\n    await tx.getRepository(ActivityApproval).save({\n      domain,\n      activityThread,\n      order: order + 1,\n      judgment: ActivityApprovalJudgment.Pending,\n      transaction: 'escalate',\n      approver: approverUser,\n      creator: user,\n      updater: user\n    })\n\n    activityThread = await tx.getRepository(ActivityThread).save({\n      ...activityThread,\n      transaction: 'escalate',\n      state: ActivityThreadStatus.Escalated,\n      updater: user\n    })\n  } else {\n    activityThread = await tx.getRepository(ActivityThread).save({\n      ...activityThread,\n      transaction: 'approve',\n      state: ActivityThreadStatus.Ended,\n      terminatedAt: new Date(),\n      terminator: user,\n      updater: user\n    })\n  }\n\n  await updateActivityInstanceState(activityThread.activityInstanceId, { causedBy: [activityThread] }, context)\n\n  return result\n}\n"]}

package/dist-server/controllers/activity-approval/delegate.js

@@ -7,7 +7,8 @@ async function delegate({ id, to, comment }, context) {
     const { domain, user, tx } = context.state;
     var repository = tx.getRepository(activity_approval_1.ActivityApproval);
     var activityApproval = await repository.findOne({
-        where: { domain: { id: domain.id }, id }
+        where: { domain: { id: domain.id }, id },
+        relations: ['domain', 'activityThread']
     });
     if (!activityApproval) {
         throw new Error(context.t('error.activity-approval not found', {

package/dist-server/controllers/activity-approval/delegate.js.map

@@ -1 +1 @@
-{"version":3,"file":"delegate.js","sourceRoot":"","sources":["../../../server/controllers/activity-approval/delegate.ts"],"names":[],"mappings":";;;AAAA,yDAAgD;AAEhD,yFAA8G;AAEvG,KAAK,UAAU,QAAQ,CAC5B,EAAE,EAAE,EAAE,EAAE,EAAE,OAAO,EAAkD,EACnE,OAAwB;IAExB,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,EAAE,EAAE,GAAG,OAAO,CAAC,KAAK,CAAA;IAE1C,IAAI,UAAU,GAAG,EAAE,CAAC,aAAa,CAAC,oCAAgB,CAAC,CAAA;IAEnD,IAAI,gBAAgB,GAAG,MAAM,UAAU,CAAC,OAAO,CAAC;QAC9C,KAAK,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE,EAAE,MAAM,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE;KACzC,CAAC,CAAA;IAEF,IAAI,CAAC,gBAAgB,EAAE;QACrB,MAAM,IAAI,KAAK,CACb,OAAO,CAAC,CAAC,CAAC,mCAAmC,EAAE;YAC7C,gBAAgB,EAAE,EAAE;SACrB,CAAC,CACH,CAAA;KACF;IAED;;;MAGE;IACF,IAAI,gBAAgB,CAAC,QAAQ,KAAK,4CAAwB,CAAC,OAAO,EAAE;QAClE,MAAM,IAAI,KAAK,CACb,OAAO,CAAC,CAAC,CAAC,+CAA+C,EAAE;YACzD,gBAAgB,EAAE,EAAE;YACpB,MAAM,EAAE,gBAAgB,CAAC,QAAQ;SAClC,CAAC,CACH,CAAA;KACF;IAED,6BAA6B;IAC7B,MAAM,QAAQ,GAAG,MAAM,EAAE,CAAC,aAAa,CAAC,gBAAI,CAAC,CAAC,SAAS,CAAC,EAAE,EAAE,EAAE,EAAE,CAAC,EAAE,EAAE,CAAC,CAAA;IAEtE,mCAAmC;IACnC,MAAM,UAAU,CAAC,IAAI,iCAChB,gBAAgB,KACnB,gBAAgB,EAAE,gBAAgB,EAClC,OAAO;QACP,QAAQ,EACR,OAAO,EAAE,IAAI,EACb,OAAO,EAAE,IAAI,IACb,CAAA;IAEF,+BAA+B;IAC/B,OAAO,MAAM,UAAU,CAAC,IAAI,iCACvB,gBAAgB,KACnB,QAAQ,EAAE,4CAAwB,CAAC,SAAS,EAC5C,OAAO,EACP,WAAW,EAAE,UAAU,EACvB,OAAO,EAAE,IAAI,EACb,UAAU,EAAE,IAAI,EAChB,YAAY,EAAE,IAAI,IAAI,EAAE,IACxB,CAAA;AACJ,CAAC;AAxDD,4BAwDC","sourcesContent":["import { User } from '@things-factory/auth-base'\nimport { ObjectRef } from '@things-factory/shell'\nimport { ActivityApproval, ActivityApprovalJudgment } from '../../service/activity-approval/activity-approval'\n\nexport async function delegate(\n  { id, to, comment }: { id: string; to: ObjectRef; comment: string },\n  context: ResolverContext\n): Promise<ActivityApproval> {\n  const { domain, user, tx } = context.state\n\n  var repository = tx.getRepository(ActivityApproval)\n\n  var activityApproval = await repository.findOne({\n    where: { domain: { id: domain.id }, id }\n  })\n\n  if (!activityApproval) {\n    throw new Error(\n      context.t('error.activity-approval not found', {\n        activityApproval: id\n      })\n    )\n  }\n\n  /* \n    Prerequisite of Delegation\n    - Previous judgement should be 'pending'\n  */\n  if (activityApproval.judgment !== ActivityApprovalJudgment.Pending) {\n    throw new Error(\n      context.t(`error.activity-approval is already terminated`, {\n        activityInstance: id,\n        actual: activityApproval.judgment\n      })\n    )\n  }\n\n  /* TODO user validation .. */\n  const approver = await tx.getRepository(User).findOneBy({ id: to.id })\n\n  /* create new delegated approval */\n  await repository.save({\n    ...activityApproval,\n    originalApproval: activityApproval,\n    comment,\n    approver,\n    creator: user,\n    updater: user\n  })\n\n  /* terminate origin approval */\n  return await repository.save({\n    ...activityApproval,\n    judgment: ActivityApprovalJudgment.Delegated,\n    comment,\n    transaction: 'delegate',\n    updater: user,\n    terminator: user,\n    terminatedAt: new Date()\n  })\n}\n"]}
+{"version":3,"file":"delegate.js","sourceRoot":"","sources":["../../../server/controllers/activity-approval/delegate.ts"],"names":[],"mappings":";;;AAAA,yDAAgD;AAEhD,yFAA8G;AAEvG,KAAK,UAAU,QAAQ,CAC5B,EAAE,EAAE,EAAE,EAAE,EAAE,OAAO,EAAkD,EACnE,OAAwB;IAExB,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,EAAE,EAAE,GAAG,OAAO,CAAC,KAAK,CAAA;IAE1C,IAAI,UAAU,GAAG,EAAE,CAAC,aAAa,CAAC,oCAAgB,CAAC,CAAA;IAEnD,IAAI,gBAAgB,GAAG,MAAM,UAAU,CAAC,OAAO,CAAC;QAC9C,KAAK,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE,EAAE,MAAM,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE;QACxC,SAAS,EAAE,CAAC,QAAQ,EAAE,gBAAgB,CAAC;KACxC,CAAC,CAAA;IAEF,IAAI,CAAC,gBAAgB,EAAE;QACrB,MAAM,IAAI,KAAK,CACb,OAAO,CAAC,CAAC,CAAC,mCAAmC,EAAE;YAC7C,gBAAgB,EAAE,EAAE;SACrB,CAAC,CACH,CAAA;KACF;IAED;;;MAGE;IACF,IAAI,gBAAgB,CAAC,QAAQ,KAAK,4CAAwB,CAAC,OAAO,EAAE;QAClE,MAAM,IAAI,KAAK,CACb,OAAO,CAAC,CAAC,CAAC,+CAA+C,EAAE;YACzD,gBAAgB,EAAE,EAAE;YACpB,MAAM,EAAE,gBAAgB,CAAC,QAAQ;SAClC,CAAC,CACH,CAAA;KACF;IAED,6BAA6B;IAC7B,MAAM,QAAQ,GAAG,MAAM,EAAE,CAAC,aAAa,CAAC,gBAAI,CAAC,CAAC,SAAS,CAAC,EAAE,EAAE,EAAE,EAAE,CAAC,EAAE,EAAE,CAAC,CAAA;IAEtE,mCAAmC;IACnC,MAAM,UAAU,CAAC,IAAI,iCAChB,gBAAgB,KACnB,gBAAgB,EAAE,gBAAgB,EAClC,OAAO;QACP,QAAQ,EACR,OAAO,EAAE,IAAI,EACb,OAAO,EAAE,IAAI,IACb,CAAA;IAEF,+BAA+B;IAC/B,OAAO,MAAM,UAAU,CAAC,IAAI,iCACvB,gBAAgB,KACnB,QAAQ,EAAE,4CAAwB,CAAC,SAAS,EAC5C,OAAO,EACP,WAAW,EAAE,UAAU,EACvB,OAAO,EAAE,IAAI,EACb,UAAU,EAAE,IAAI,EAChB,YAAY,EAAE,IAAI,IAAI,EAAE,IACxB,CAAA;AACJ,CAAC;AAzDD,4BAyDC","sourcesContent":["import { User } from '@things-factory/auth-base'\nimport { ObjectRef } from '@things-factory/shell'\nimport { ActivityApproval, ActivityApprovalJudgment } from '../../service/activity-approval/activity-approval'\n\nexport async function delegate(\n  { id, to, comment }: { id: string; to: ObjectRef; comment: string },\n  context: ResolverContext\n): Promise<ActivityApproval> {\n  const { domain, user, tx } = context.state\n\n  var repository = tx.getRepository(ActivityApproval)\n\n  var activityApproval = await repository.findOne({\n    where: { domain: { id: domain.id }, id },\n    relations: ['domain', 'activityThread']\n  })\n\n  if (!activityApproval) {\n    throw new Error(\n      context.t('error.activity-approval not found', {\n        activityApproval: id\n      })\n    )\n  }\n\n  /* \n    Prerequisite of Delegation\n    - Previous judgement should be 'pending'\n  */\n  if (activityApproval.judgment !== ActivityApprovalJudgment.Pending) {\n    throw new Error(\n      context.t(`error.activity-approval is already terminated`, {\n        activityInstance: id,\n        actual: activityApproval.judgment\n      })\n    )\n  }\n\n  /* TODO user validation .. */\n  const approver = await tx.getRepository(User).findOneBy({ id: to.id })\n\n  /* create new delegated approval */\n  await repository.save({\n    ...activityApproval,\n    originalApproval: activityApproval,\n    comment,\n    approver,\n    creator: user,\n    updater: user\n  })\n\n  /* terminate origin approval */\n  return await repository.save({\n    ...activityApproval,\n    judgment: ActivityApprovalJudgment.Delegated,\n    comment,\n    transaction: 'delegate',\n    updater: user,\n    terminator: user,\n    terminatedAt: new Date()\n  })\n}\n"]}

package/dist-server/controllers/activity-approval/reject.js

@@ -27,8 +27,8 @@ async function reject({ id, comment }, context) {
         }));
     }
     var result = await repository.save(Object.assign(Object.assign({}, activityApproval), { judgment: activity_approval_1.ActivityApprovalJudgment.Rejected, comment, transaction: 'reject', updater: user, terminatedAt: new Date(), terminator: user }));
-    await tx.getRepository(activity_thread_1.ActivityThread).save(Object.assign(Object.assign({}, activityApproval.activityThread), { transaction: 'reject', state: activity_thread_1.ActivityThreadStatus.Rejected, updater: user }));
-    await (0, common_1.updateActivityInstanceState)(activityApproval.activityThread.activityInstanceId, context);
+    var activityThread = await tx.getRepository(activity_thread_1.ActivityThread).save(Object.assign(Object.assign({}, activityApproval.activityThread), { transaction: 'reject', state: activity_thread_1.ActivityThreadStatus.Rejected, updater: user }));
+    await (0, common_1.updateActivityInstanceState)(activityApproval.activityThread.activityInstanceId, { causedBy: [activityThread] }, context);
     return result;
 }
 exports.reject = reject;

package/dist-server/controllers/activity-approval/reject.js.map

@@ -1 +1 @@
-{"version":3,"file":"reject.js","sourceRoot":"","sources":["../../../server/controllers/activity-approval/reject.ts"],"names":[],"mappings":";;;AAAA,mFAAoG;AACpG,yFAA8G;AAC9G,sCAAuD;AAEhD,KAAK,UAAU,MAAM,CAC1B,EAAE,EAAE,EAAE,OAAO,EAAmC,EAChD,OAAwB;IAExB,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,EAAE,EAAE,GAAG,OAAO,CAAC,KAAK,CAAA;IAE1C,IAAI,UAAU,GAAG,EAAE,CAAC,aAAa,CAAC,oCAAgB,CAAC,CAAA;IAEnD,IAAI,gBAAgB,GAAG,MAAM,UAAU,CAAC,OAAO,CAAC;QAC9C,KAAK,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE,EAAE,MAAM,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE;QACxC,SAAS,EAAE,CAAC,gBAAgB,CAAC;KAC9B,CAAC,CAAA;IAEF,IAAI,CAAC,gBAAgB,EAAE;QACrB,MAAM,IAAI,KAAK,CACb,OAAO,CAAC,CAAC,CAAC,mCAAmC,EAAE;YAC7C,gBAAgB,EAAE,EAAE;SACrB,CAAC,CACH,CAAA;KACF;IAED;;;MAGE;IACF,IAAI,gBAAgB,CAAC,QAAQ,KAAK,4CAAwB,CAAC,OAAO,EAAE;QAClE,MAAM,IAAI,KAAK,CACb,OAAO,CAAC,CAAC,CAAC,+CAA+C,EAAE;YACzD,gBAAgB,EAAE,EAAE;YACpB,MAAM,EAAE,gBAAgB,CAAC,QAAQ;SAClC,CAAC,CACH,CAAA;KACF;IAED,IAAI,MAAM,GAAG,MAAM,UAAU,CAAC,IAAI,iCAC7B,gBAAgB,KACnB,QAAQ,EAAE,4CAAwB,CAAC,QAAQ,EAC3C,OAAO,EACP,WAAW,EAAE,QAAQ,EACrB,OAAO,EAAE,IAAI,EACb,YAAY,EAAE,IAAI,IAAI,EAAE,EACxB,UAAU,EAAE,IAAI,IAChB,CAAA;IAEF,MAAM,EAAE,CAAC,aAAa,CAAC,gCAAc,CAAC,CAAC,IAAI,iCACtC,gBAAgB,CAAC,cAAc,KAClC,WAAW,EAAE,QAAQ,EACrB,KAAK,EAAE,sCAAoB,CAAC,QAAQ,EACpC,OAAO,EAAE,IAAI,IACb,CAAA;IAEF,MAAM,IAAA,oCAA2B,EAAC,gBAAgB,CAAC,cAAc,CAAC,kBAAkB,EAAE,OAAO,CAAC,CAAA;IAE9F,OAAO,MAAM,CAAA;AACf,CAAC;AAtDD,wBAsDC","sourcesContent":["import { ActivityThread, ActivityThreadStatus } from '../../service/activity-thread/activity-thread'\nimport { ActivityApproval, ActivityApprovalJudgment } from '../../service/activity-approval/activity-approval'\nimport { updateActivityInstanceState } from '../common'\n\nexport async function reject(\n  { id, comment }: { id: string; comment: string },\n  context: ResolverContext\n): Promise<ActivityApproval> {\n  const { domain, user, tx } = context.state\n\n  var repository = tx.getRepository(ActivityApproval)\n\n  var activityApproval = await repository.findOne({\n    where: { domain: { id: domain.id }, id },\n    relations: ['activityThread']\n  })\n\n  if (!activityApproval) {\n    throw new Error(\n      context.t('error.activity-approval not found', {\n        activityApproval: id\n      })\n    )\n  }\n\n  /* \n    Prerequisite of Rejection\n    - Previous judgement should be 'pending'\n  */\n  if (activityApproval.judgment !== ActivityApprovalJudgment.Pending) {\n    throw new Error(\n      context.t(`error.activity-approval is already terminated`, {\n        activityInstance: id,\n        actual: activityApproval.judgment\n      })\n    )\n  }\n\n  var result = await repository.save({\n    ...activityApproval,\n    judgment: ActivityApprovalJudgment.Rejected,\n    comment,\n    transaction: 'reject',\n    updater: user,\n    terminatedAt: new Date(),\n    terminator: user\n  })\n\n  await tx.getRepository(ActivityThread).save({\n    ...activityApproval.activityThread,\n    transaction: 'reject',\n    state: ActivityThreadStatus.Rejected,\n    updater: user\n  })\n\n  await updateActivityInstanceState(activityApproval.activityThread.activityInstanceId, context)\n\n  return result\n}\n"]}
+{"version":3,"file":"reject.js","sourceRoot":"","sources":["../../../server/controllers/activity-approval/reject.ts"],"names":[],"mappings":";;;AAAA,mFAAoG;AACpG,yFAA8G;AAC9G,sCAAuD;AAEhD,KAAK,UAAU,MAAM,CAC1B,EAAE,EAAE,EAAE,OAAO,EAAmC,EAChD,OAAwB;IAExB,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,EAAE,EAAE,GAAG,OAAO,CAAC,KAAK,CAAA;IAE1C,IAAI,UAAU,GAAG,EAAE,CAAC,aAAa,CAAC,oCAAgB,CAAC,CAAA;IAEnD,IAAI,gBAAgB,GAAG,MAAM,UAAU,CAAC,OAAO,CAAC;QAC9C,KAAK,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE,EAAE,MAAM,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE;QACxC,SAAS,EAAE,CAAC,gBAAgB,CAAC;KAC9B,CAAC,CAAA;IAEF,IAAI,CAAC,gBAAgB,EAAE;QACrB,MAAM,IAAI,KAAK,CACb,OAAO,CAAC,CAAC,CAAC,mCAAmC,EAAE;YAC7C,gBAAgB,EAAE,EAAE;SACrB,CAAC,CACH,CAAA;KACF;IAED;;;MAGE;IACF,IAAI,gBAAgB,CAAC,QAAQ,KAAK,4CAAwB,CAAC,OAAO,EAAE;QAClE,MAAM,IAAI,KAAK,CACb,OAAO,CAAC,CAAC,CAAC,+CAA+C,EAAE;YACzD,gBAAgB,EAAE,EAAE;YACpB,MAAM,EAAE,gBAAgB,CAAC,QAAQ;SAClC,CAAC,CACH,CAAA;KACF;IAED,IAAI,MAAM,GAAG,MAAM,UAAU,CAAC,IAAI,iCAC7B,gBAAgB,KACnB,QAAQ,EAAE,4CAAwB,CAAC,QAAQ,EAC3C,OAAO,EACP,WAAW,EAAE,QAAQ,EACrB,OAAO,EAAE,IAAI,EACb,YAAY,EAAE,IAAI,IAAI,EAAE,EACxB,UAAU,EAAE,IAAI,IAChB,CAAA;IAEF,IAAI,cAAc,GAAG,MAAM,EAAE,CAAC,aAAa,CAAC,gCAAc,CAAC,CAAC,IAAI,iCAC3D,gBAAgB,CAAC,cAAc,KAClC,WAAW,EAAE,QAAQ,EACrB,KAAK,EAAE,sCAAoB,CAAC,QAAQ,EACpC,OAAO,EAAE,IAAI,IACb,CAAA;IAEF,MAAM,IAAA,oCAA2B,EAC/B,gBAAgB,CAAC,cAAc,CAAC,kBAAkB,EAClD,EAAE,QAAQ,EAAE,CAAC,cAAc,CAAC,EAAE,EAC9B,OAAO,CACR,CAAA;IAED,OAAO,MAAM,CAAA;AACf,CAAC;AA1DD,wBA0DC","sourcesContent":["import { ActivityThread, ActivityThreadStatus } from '../../service/activity-thread/activity-thread'\nimport { ActivityApproval, ActivityApprovalJudgment } from '../../service/activity-approval/activity-approval'\nimport { updateActivityInstanceState } from '../common'\n\nexport async function reject(\n  { id, comment }: { id: string; comment: string },\n  context: ResolverContext\n): Promise<ActivityApproval> {\n  const { domain, user, tx } = context.state\n\n  var repository = tx.getRepository(ActivityApproval)\n\n  var activityApproval = await repository.findOne({\n    where: { domain: { id: domain.id }, id },\n    relations: ['activityThread']\n  })\n\n  if (!activityApproval) {\n    throw new Error(\n      context.t('error.activity-approval not found', {\n        activityApproval: id\n      })\n    )\n  }\n\n  /* \n    Prerequisite of Rejection\n    - Previous judgement should be 'pending'\n  */\n  if (activityApproval.judgment !== ActivityApprovalJudgment.Pending) {\n    throw new Error(\n      context.t(`error.activity-approval is already terminated`, {\n        activityInstance: id,\n        actual: activityApproval.judgment\n      })\n    )\n  }\n\n  var result = await repository.save({\n    ...activityApproval,\n    judgment: ActivityApprovalJudgment.Rejected,\n    comment,\n    transaction: 'reject',\n    updater: user,\n    terminatedAt: new Date(),\n    terminator: user\n  })\n\n  var activityThread = await tx.getRepository(ActivityThread).save({\n    ...activityApproval.activityThread,\n    transaction: 'reject',\n    state: ActivityThreadStatus.Rejected,\n    updater: user\n  })\n\n  await updateActivityInstanceState(\n    activityApproval.activityThread.activityInstanceId,\n    { causedBy: [activityThread] },\n    context\n  )\n\n  return result\n}\n"]}

package/dist-server/controllers/activity-installation/activity-installation-controller.js

@@ -11,13 +11,21 @@ class ActivityInstallations {
     static list() {
         return Object.values(ActivityInstallations.templates);
     }
-    static async callback(name, activityInstance, context) {
+    /**
+     * 액티비티인스턴스의 변화가 발생했을 때, 호출되는 콜백함수
+     * @param name 액티비티인스턴스가 속한 액티비티명
+     * @param activityInstance 해당 액티비티인스턴스
+     * @param activityThreads 액티비티인스턴스의 변화를 일으킨 원인이 되는 액티비티쓰레드들
+     * @param context 서비스 컨텍스트 : domain, user, translation, ..
+     * @returns
+     */
+    static async callback(name, activityInstance, activityThreads, context) {
         const installableActivity = ActivityInstallations.templates[name];
         if (!installableActivity) {
             return;
         }
         const { callback } = installableActivity;
-        callback && (await callback(activityInstance, context));
+        callback && (await callback(activityInstance, { causedBy: activityThreads }, context));
     }
 }
 exports.ActivityInstallations = ActivityInstallations;

package/dist-server/controllers/activity-installation/activity-installation-controller.js.map

@@ -1 +1 @@
-{"version":3,"file":"activity-installation-controller.js","sourceRoot":"","sources":["../../../server/controllers/activity-installation/activity-installation-controller.ts"],"names":[],"mappings":";;;AAEA,MAAa,qBAAqB;IAGhC,MAAM,CAAC,uBAAuB,CAAC,QAA6B;QAC1D,qBAAqB,CAAC,SAAS,CAAC,QAAQ,CAAC,IAAI,CAAC,GAAG,QAAQ,CAAA;IAC3D,CAAC;IAED,MAAM,CAAC,GAAG,CAAC,IAAY;QACrB,OAAO,qBAAqB,CAAC,SAAS,CAAC,IAAI,CAAC,CAAA;IAC9C,CAAC;IAED,MAAM,CAAC,IAAI;QACT,OAAO,MAAM,CAAC,MAAM,CAAC,qBAAqB,CAAC,SAAS,CAAC,CAAA;IACvD,CAAC;IAED,MAAM,CAAC,KAAK,CAAC,QAAQ,CAAC,IAAY,EAAE,gBAAqB,EAAE,OAAwB;QACjF,MAAM,mBAAmB,GAAG,qBAAqB,CAAC,SAAS,CAAC,IAAI,CAAC,CAAA;QACjE,IAAI,CAAC,mBAAmB,EAAE;YACxB,OAAM;SACP;QAED,MAAM,EAAE,QAAQ,EAAE,GAAG,mBAAmB,CAAA;QAExC,QAAQ,IAAI,CAAC,MAAM,QAAQ,CAAC,gBAAgB,EAAE,OAAO,CAAC,CAAC,CAAA;IACzD,CAAC;;AAxBH,sDAyBC;AAxBQ,+BAAS,GAA4C,EAAE,CAAA","sourcesContent":["import { InstallableActivity } from '../../service/installable-activity/installable-activity'\n\nexport class ActivityInstallations {\n  static templates: { [name: string]: InstallableActivity } = {}\n\n  static installActivityTemplate(template: InstallableActivity) {\n    ActivityInstallations.templates[template.name] = template\n  }\n\n  static get(name: string): InstallableActivity {\n    return ActivityInstallations.templates[name]\n  }\n\n  static list(): InstallableActivity[] {\n    return Object.values(ActivityInstallations.templates)\n  }\n\n  static async callback(name: string, activityInstance: any, context: ResolverContext) {\n    const installableActivity = ActivityInstallations.templates[name]\n    if (!installableActivity) {\n      return\n    }\n\n    const { callback } = installableActivity\n\n    callback && (await callback(activityInstance, context))\n  }\n}\n"]}
+{"version":3,"file":"activity-installation-controller.js","sourceRoot":"","sources":["../../../server/controllers/activity-installation/activity-installation-controller.ts"],"names":[],"mappings":";;;AAEA,MAAa,qBAAqB;IAGhC,MAAM,CAAC,uBAAuB,CAAC,QAA6B;QAC1D,qBAAqB,CAAC,SAAS,CAAC,QAAQ,CAAC,IAAI,CAAC,GAAG,QAAQ,CAAA;IAC3D,CAAC;IAED,MAAM,CAAC,GAAG,CAAC,IAAY;QACrB,OAAO,qBAAqB,CAAC,SAAS,CAAC,IAAI,CAAC,CAAA;IAC9C,CAAC;IAED,MAAM,CAAC,IAAI;QACT,OAAO,MAAM,CAAC,MAAM,CAAC,qBAAqB,CAAC,SAAS,CAAC,CAAA;IACvD,CAAC;IAED;;;;;;;OAOG;IACH,MAAM,CAAC,KAAK,CAAC,QAAQ,CAAC,IAAY,EAAE,gBAAqB,EAAE,eAAsB,EAAE,OAAwB;QACzG,MAAM,mBAAmB,GAAG,qBAAqB,CAAC,SAAS,CAAC,IAAI,CAAC,CAAA;QACjE,IAAI,CAAC,mBAAmB,EAAE;YACxB,OAAM;SACP;QAED,MAAM,EAAE,QAAQ,EAAE,GAAG,mBAAmB,CAAA;QAExC,QAAQ,IAAI,CAAC,MAAM,QAAQ,CAAC,gBAAgB,EAAE,EAAE,QAAQ,EAAE,eAAe,EAAE,EAAE,OAAO,CAAC,CAAC,CAAA;IACxF,CAAC;;AAhCH,sDAiCC;AAhCQ,+BAAS,GAA4C,EAAE,CAAA","sourcesContent":["import { InstallableActivity } from '../../service/installable-activity/installable-activity'\n\nexport class ActivityInstallations {\n  static templates: { [name: string]: InstallableActivity } = {}\n\n  static installActivityTemplate(template: InstallableActivity) {\n    ActivityInstallations.templates[template.name] = template\n  }\n\n  static get(name: string): InstallableActivity {\n    return ActivityInstallations.templates[name]\n  }\n\n  static list(): InstallableActivity[] {\n    return Object.values(ActivityInstallations.templates)\n  }\n\n  /**\n   * 액티비티인스턴스의 변화가 발생했을 때, 호출되는 콜백함수\n   * @param name 액티비티인스턴스가 속한 액티비티명\n   * @param activityInstance 해당 액티비티인스턴스\n   * @param activityThreads 액티비티인스턴스의 변화를 일으킨 원인이 되는 액티비티쓰레드들\n   * @param context 서비스 컨텍스트 : domain, user, translation, ..\n   * @returns\n   */\n  static async callback(name: string, activityInstance: any, activityThreads: any[], context: ResolverContext) {\n    const installableActivity = ActivityInstallations.templates[name]\n    if (!installableActivity) {\n      return\n    }\n\n    const { callback } = installableActivity\n\n    callback && (await callback(activityInstance, { causedBy: activityThreads }, context))\n  }\n}\n"]}

package/dist-server/controllers/activity-instance/abort.js

@@ -42,7 +42,7 @@ async function abort({ id, reason }, context) {
       Actions to be processed when a task is aborted
       - All related activity threads must be aborted.
     */
-    const TERMINATED = [activity_thread_1.ActivityThreadStatus.Aborted, activity_thread_1.ActivityThreadStatus.Delegated, activity_thread_1.ActivityThreadStatus.Ended];
+    const TERMINATED = [activity_thread_1.ActivityThreadStatus.Aborted, activity_thread_1.ActivityThreadStatus.Ended];
     for (let activityThread of activityInstance.activityThreads) {
         if (TERMINATED.includes(activityThread.state)) {
             continue;

package/dist-server/controllers/activity-instance/abort.js.map

@@ -1 +1 @@
-{"version":3,"file":"abort.js","sourceRoot":"","sources":["../../../server/controllers/activity-instance/abort.ts"],"names":[],"mappings":";;;AAAA,mFAAoF;AACpF,yFAA4G;AAC5G,sCAAqD;AAErD,sDAAyE;AAElE,KAAK,UAAU,KAAK,CACzB,EAAE,EAAE,EAAE,MAAM,EAAkC,EAC9C,OAAwB;IAExB,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,EAAE,EAAE,GAAG,OAAO,CAAC,KAAK,CAAA;IAE1C,IAAI,UAAU,GAAG,EAAE,CAAC,aAAa,CAAC,oCAAgB,CAAC,CAAA;IAEnD,IAAI,gBAAgB,GAAG,MAAM,UAAU,CAAC,OAAO,CAAC;QAC9C,KAAK,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE,EAAE,MAAM,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE;QACxC,SAAS,EAAE;YACT,QAAQ;YACR,UAAU;YACV,iBAAiB;YACjB,cAAc;YACd,iBAAiB;YACjB,SAAS;YACT,SAAS;YACT,SAAS;YACT,YAAY;SACb;KACF,CAAC,CAAA;IAEF,IAAI,CAAC,gBAAgB,EAAE;QACrB,MAAM,IAAI,KAAK,CACb,OAAO,CAAC,CAAC,CAAC,mCAAmC,EAAE;YAC7C,gBAAgB,EAAE,EAAE;SACrB,CAAC,CACH,CAAA;KACF;IAED;;;MAGE;IACF,IACE,gBAAgB,CAAC,KAAK,IAAI,0CAAsB,CAAC,OAAO;QACxD,gBAAgB,CAAC,KAAK,IAAI,0CAAsB,CAAC,KAAK,EACtD;QACA,MAAM,IAAI,KAAK,CACb,OAAO,CAAC,CAAC,CAAC,+CAA+C,EAAE;YACzD,EAAE;YACF,KAAK,EAAE,gBAAgB,CAAC,KAAK;SAC9B,CAAC,CACH,CAAA;KACF;IAED;;;MAGE;IAEF,MAAM,UAAU,GAAG,CAAC,sCAAoB,CAAC,OAAO,EAAE,sCAAoB,CAAC,SAAS,EAAE,sCAAoB,CAAC,KAAK,CAAC,CAAA;IAE7G,KAAK,IAAI,cAAc,IAAI,gBAAgB,CAAC,eAAe,EAAE;QAC3D,IAAI,UAAU,CAAC,QAAQ,CAAC,cAAc,CAAC,KAAK,CAAC,EAAE;YAC7C,SAAQ;SACT;QAED,MAAM,IAAA,eAAmB,EAAC,EAAE,cAAc,EAAE,MAAM,EAAE,EAAE,OAAO,CAAC,CAAA;KAC/D;IAED,OAAO,MAAM,UAAU,CAAC,IAAI,6DACvB,gBAAgB,KACnB,MAAM,KACH,CAAC,MAAM,IAAA,kCAAyB,EAAC,EAAE,EAAE,OAAO,CAAC,CAAC,KACjD,WAAW,EAAE,OAAO,EACpB,OAAO,EAAE,IAAI,EACb,YAAY,EAAE,IAAI,IAAI,EAAE,EACxB,UAAU,EAAE,IAAI,IAChB,CAAA;AACJ,CAAC;AAvED,sBAuEC","sourcesContent":["import { ActivityThreadStatus } from '../../service/activity-thread/activity-thread'\nimport { ActivityInstance, ActivityInstanceStatus } from '../../service/activity-instance/activity-instance'\nimport { evalActivityInstanceState } from '../common'\n\nimport { _abort as abortActivityThread } from '../activity-thread/_abort'\n\nexport async function abort(\n  { id, reason }: { id: string; reason: string },\n  context: ResolverContext\n): Promise<ActivityInstance> {\n  const { domain, user, tx } = context.state\n\n  var repository = tx.getRepository(ActivityInstance)\n\n  var activityInstance = await repository.findOne({\n    where: { domain: { id: domain.id }, id },\n    relations: [\n      'domain',\n      'activity',\n      'activityThreads',\n      'assigneeRole',\n      'supervisoryRole',\n      'updater',\n      'creator',\n      'starter',\n      'terminator'\n    ]\n  })\n\n  if (!activityInstance) {\n    throw new Error(\n      context.t('error.activity-instance not found', {\n        activityInstance: id\n      })\n    )\n  }\n\n  /* \n    Prerequisites for a Task to Be Aborted.\n    - The previous state of the task must not be End or Aborted.\n  */\n  if (\n    activityInstance.state == ActivityInstanceStatus.Aborted ||\n    activityInstance.state == ActivityInstanceStatus.Ended\n  ) {\n    throw new Error(\n      context.t(`error.activity-instance is already terminated`, {\n        id,\n        state: activityInstance.state\n      })\n    )\n  }\n\n  /* \n    Actions to be processed when a task is aborted\n    - All related activity threads must be aborted.\n  */\n\n  const TERMINATED = [ActivityThreadStatus.Aborted, ActivityThreadStatus.Delegated, ActivityThreadStatus.Ended]\n\n  for (let activityThread of activityInstance.activityThreads) {\n    if (TERMINATED.includes(activityThread.state)) {\n      continue\n    }\n\n    await abortActivityThread({ activityThread, reason }, context)\n  }\n\n  return await repository.save({\n    ...activityInstance,\n    reason,\n    ...(await evalActivityInstanceState(id, context)),\n    transaction: 'abort',\n    updater: user,\n    terminatedAt: new Date(),\n    terminator: user\n  })\n}\n"]}
+{"version":3,"file":"abort.js","sourceRoot":"","sources":["../../../server/controllers/activity-instance/abort.ts"],"names":[],"mappings":";;;AAAA,mFAAoF;AACpF,yFAA4G;AAC5G,sCAAqD;AAErD,sDAAyE;AAElE,KAAK,UAAU,KAAK,CACzB,EAAE,EAAE,EAAE,MAAM,EAAkC,EAC9C,OAAwB;IAExB,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,EAAE,EAAE,GAAG,OAAO,CAAC,KAAK,CAAA;IAE1C,IAAI,UAAU,GAAG,EAAE,CAAC,aAAa,CAAC,oCAAgB,CAAC,CAAA;IAEnD,IAAI,gBAAgB,GAAG,MAAM,UAAU,CAAC,OAAO,CAAC;QAC9C,KAAK,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE,EAAE,MAAM,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE;QACxC,SAAS,EAAE;YACT,QAAQ;YACR,UAAU;YACV,iBAAiB;YACjB,cAAc;YACd,iBAAiB;YACjB,SAAS;YACT,SAAS;YACT,SAAS;YACT,YAAY;SACb;KACF,CAAC,CAAA;IAEF,IAAI,CAAC,gBAAgB,EAAE;QACrB,MAAM,IAAI,KAAK,CACb,OAAO,CAAC,CAAC,CAAC,mCAAmC,EAAE;YAC7C,gBAAgB,EAAE,EAAE;SACrB,CAAC,CACH,CAAA;KACF;IAED;;;MAGE;IACF,IACE,gBAAgB,CAAC,KAAK,IAAI,0CAAsB,CAAC,OAAO;QACxD,gBAAgB,CAAC,KAAK,IAAI,0CAAsB,CAAC,KAAK,EACtD;QACA,MAAM,IAAI,KAAK,CACb,OAAO,CAAC,CAAC,CAAC,+CAA+C,EAAE;YACzD,EAAE;YACF,KAAK,EAAE,gBAAgB,CAAC,KAAK;SAC9B,CAAC,CACH,CAAA;KACF;IAED;;;MAGE;IAEF,MAAM,UAAU,GAAG,CAAC,sCAAoB,CAAC,OAAO,EAAE,sCAAoB,CAAC,KAAK,CAAC,CAAA;IAE7E,KAAK,IAAI,cAAc,IAAI,gBAAgB,CAAC,eAAe,EAAE;QAC3D,IAAI,UAAU,CAAC,QAAQ,CAAC,cAAc,CAAC,KAAK,CAAC,EAAE;YAC7C,SAAQ;SACT;QAED,MAAM,IAAA,eAAmB,EAAC,EAAE,cAAc,EAAE,MAAM,EAAE,EAAE,OAAO,CAAC,CAAA;KAC/D;IAED,OAAO,MAAM,UAAU,CAAC,IAAI,6DACvB,gBAAgB,KACnB,MAAM,KACH,CAAC,MAAM,IAAA,kCAAyB,EAAC,EAAE,EAAE,OAAO,CAAC,CAAC,KACjD,WAAW,EAAE,OAAO,EACpB,OAAO,EAAE,IAAI,EACb,YAAY,EAAE,IAAI,IAAI,EAAE,EACxB,UAAU,EAAE,IAAI,IAChB,CAAA;AACJ,CAAC;AAvED,sBAuEC","sourcesContent":["import { ActivityThreadStatus } from '../../service/activity-thread/activity-thread'\nimport { ActivityInstance, ActivityInstanceStatus } from '../../service/activity-instance/activity-instance'\nimport { evalActivityInstanceState } from '../common'\n\nimport { _abort as abortActivityThread } from '../activity-thread/_abort'\n\nexport async function abort(\n  { id, reason }: { id: string; reason: string },\n  context: ResolverContext\n): Promise<ActivityInstance> {\n  const { domain, user, tx } = context.state\n\n  var repository = tx.getRepository(ActivityInstance)\n\n  var activityInstance = await repository.findOne({\n    where: { domain: { id: domain.id }, id },\n    relations: [\n      'domain',\n      'activity',\n      'activityThreads',\n      'assigneeRole',\n      'supervisoryRole',\n      'updater',\n      'creator',\n      'starter',\n      'terminator'\n    ]\n  })\n\n  if (!activityInstance) {\n    throw new Error(\n      context.t('error.activity-instance not found', {\n        activityInstance: id\n      })\n    )\n  }\n\n  /* \n    Prerequisites for a Task to Be Aborted.\n    - The previous state of the task must not be End or Aborted.\n  */\n  if (\n    activityInstance.state == ActivityInstanceStatus.Aborted ||\n    activityInstance.state == ActivityInstanceStatus.Ended\n  ) {\n    throw new Error(\n      context.t(`error.activity-instance is already terminated`, {\n        id,\n        state: activityInstance.state\n      })\n    )\n  }\n\n  /* \n    Actions to be processed when a task is aborted\n    - All related activity threads must be aborted.\n  */\n\n  const TERMINATED = [ActivityThreadStatus.Aborted, ActivityThreadStatus.Ended]\n\n  for (let activityThread of activityInstance.activityThreads) {\n    if (TERMINATED.includes(activityThread.state)) {\n      continue\n    }\n\n    await abortActivityThread({ activityThread, reason }, context)\n  }\n\n  return await repository.save({\n    ...activityInstance,\n    reason,\n    ...(await evalActivityInstanceState(id, context)),\n    transaction: 'abort',\n    updater: user,\n    terminatedAt: new Date(),\n    terminator: user\n  })\n}\n"]}

package/dist-server/controllers/activity-instance/end.js

@@ -38,7 +38,7 @@ async function end({ id, output, reason }, context) {
             state: activityInstance.state
         }));
     }
-    const TERMINATED = [activity_thread_1.ActivityThreadStatus.Aborted, activity_thread_1.ActivityThreadStatus.Delegated, activity_thread_1.ActivityThreadStatus.Ended];
+    const TERMINATED = [activity_thread_1.ActivityThreadStatus.Aborted, activity_thread_1.ActivityThreadStatus.Ended];
     for (let activityThread of activityInstance.activityThreads) {
         if (TERMINATED.includes(activityThread.state)) {
             continue;

package/dist-server/controllers/activity-instance/end.js.map

@@ -1 +1 @@
-{"version":3,"file":"end.js","sourceRoot":"","sources":["../../../server/controllers/activity-instance/end.ts"],"names":[],"mappings":";;;AAAA,yFAA4G;AAC5G,mFAAoF;AACpF,sCAAqD;AAE9C,KAAK,UAAU,GAAG,CACvB,EAAE,EAAE,EAAE,MAAM,EAAE,MAAM,EAAoD,EACxE,OAAwB;IAExB,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,EAAE,EAAE,GAAG,OAAO,CAAC,KAAK,CAAA;IAC1C,MAAM,UAAU,GAAG,EAAE,CAAC,aAAa,CAAC,oCAAgB,CAAC,CAAA;IAErD,IAAI,gBAAgB,GAAG,MAAM,UAAU,CAAC,OAAO,CAAC;QAC9C,KAAK,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE,EAAE,MAAM,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE;QACxC,SAAS,EAAE;YACT,QAAQ;YACR,UAAU;YACV,iBAAiB;YACjB,cAAc;YACd,iBAAiB;YACjB,SAAS;YACT,SAAS;YACT,SAAS;YACT,YAAY;SACb;KACF,CAAC,CAAA;IAEF,IAAI,CAAC,gBAAgB,EAAE;QACrB,MAAM,IAAI,KAAK,CACb,OAAO,CAAC,CAAC,CAAC,mCAAmC,EAAE;YAC7C,gBAAgB,EAAE,EAAE;SACrB,CAAC,CACH,CAAA;KACF;IAED;;;;MAIE;IACF,IACE,gBAAgB,CAAC,KAAK,IAAI,0CAAsB,CAAC,OAAO;QACxD,gBAAgB,CAAC,KAAK,IAAI,0CAAsB,CAAC,KAAK,EACtD;QACA,MAAM,IAAI,KAAK,CACb,OAAO,CAAC,CAAC,CAAC,+CAA+C,EAAE;YACzD,EAAE;YACF,KAAK,EAAE,gBAAgB,CAAC,KAAK;SAC9B,CAAC,CACH,CAAA;KACF;IAED,MAAM,UAAU,GAAG,CAAC,sCAAoB,CAAC,OAAO,EAAE,sCAAoB,CAAC,SAAS,EAAE,sCAAoB,CAAC,KAAK,CAAC,CAAA;IAE7G,KAAK,IAAI,cAAc,IAAI,gBAAgB,CAAC,eAAe,EAAE;QAC3D,IAAI,UAAU,CAAC,QAAQ,CAAC,cAAc,CAAC,KAAK,CAAC,EAAE;YAC7C,SAAQ;SACT;QAED,MAAM,IAAI,KAAK,CACb,OAAO,CAAC,CAAC,CAAC,iDAAiD,EAAE;YAC3D,cAAc,EAAE,cAAc,CAAC,EAAE;YACjC,KAAK,EAAE,gBAAgB,CAAC,KAAK;SAC9B,CAAC,CACH,CAAA;KACF;IAED,IAAI,CAAC,gBAAgB,CAAC,SAAS,EAAE;QAC/B,gBAAgB,CAAC,SAAS,GAAG,IAAI,IAAI,EAAE,CAAA;KACxC;IAED,OAAO,MAAM,UAAU,CAAC,IAAI,CAAC,gCACxB,gBAAgB,KACnB,MAAM;QACN,MAAM,EACN,WAAW,EAAE,KAAK,EAClB,KAAK,EAAE,MAAM,IAAA,kCAAyB,EAAC,EAAE,EAAE,OAAO,CAAC,EACnD,OAAO,EAAE,IAAI,EACb,YAAY,EAAE,IAAI,IAAI,EAAE,EACxB,UAAU,EAAE,IAAI,GACV,CAAC,CAAA;AACX,CAAC;AA5ED,kBA4EC","sourcesContent":["import { ActivityInstance, ActivityInstanceStatus } from '../../service/activity-instance/activity-instance'\nimport { ActivityThreadStatus } from '../../service/activity-thread/activity-thread'\nimport { evalActivityInstanceState } from '../common'\n\nexport async function end(\n  { id, output, reason }: { id: string; output?: object; reason?: string },\n  context: ResolverContext\n): Promise<ActivityInstance> {\n  const { domain, user, tx } = context.state\n  const repository = tx.getRepository(ActivityInstance)\n\n  var activityInstance = await repository.findOne({\n    where: { domain: { id: domain.id }, id },\n    relations: [\n      'domain',\n      'activity',\n      'activityThreads',\n      'assigneeRole',\n      'supervisoryRole',\n      'updater',\n      'creator',\n      'starter',\n      'terminator'\n    ]\n  })\n\n  if (!activityInstance) {\n    throw new Error(\n      context.t('error.activity-instance not found', {\n        activityInstance: id\n      })\n    )\n  }\n\n  /* \n    Prerequisites for a Task to Be End.\n    - The previous state of the task must not be End or Aborted.\n    - There should be no unfinished activity threads.\n  */\n  if (\n    activityInstance.state == ActivityInstanceStatus.Aborted ||\n    activityInstance.state == ActivityInstanceStatus.Ended\n  ) {\n    throw new Error(\n      context.t(`error.activity-instance is already terminated`, {\n        id,\n        state: activityInstance.state\n      })\n    )\n  }\n\n  const TERMINATED = [ActivityThreadStatus.Aborted, ActivityThreadStatus.Delegated, ActivityThreadStatus.Ended]\n\n  for (let activityThread of activityInstance.activityThreads) {\n    if (TERMINATED.includes(activityThread.state)) {\n      continue\n    }\n\n    throw new Error(\n      context.t(`error.all activity threads should be terminated`, {\n        activityThread: activityThread.id,\n        state: activityInstance.state\n      })\n    )\n  }\n\n  if (!activityInstance.startedAt) {\n    activityInstance.startedAt = new Date()\n  }\n\n  return await repository.save({\n    ...activityInstance,\n    reason,\n    output,\n    transaction: 'end',\n    state: await evalActivityInstanceState(id, context),\n    updater: user,\n    terminatedAt: new Date(),\n    terminator: user\n  } as any)\n}\n"]}
+{"version":3,"file":"end.js","sourceRoot":"","sources":["../../../server/controllers/activity-instance/end.ts"],"names":[],"mappings":";;;AAAA,yFAA4G;AAC5G,mFAAoF;AACpF,sCAAqD;AAE9C,KAAK,UAAU,GAAG,CACvB,EAAE,EAAE,EAAE,MAAM,EAAE,MAAM,EAAoD,EACxE,OAAwB;IAExB,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,EAAE,EAAE,GAAG,OAAO,CAAC,KAAK,CAAA;IAC1C,MAAM,UAAU,GAAG,EAAE,CAAC,aAAa,CAAC,oCAAgB,CAAC,CAAA;IAErD,IAAI,gBAAgB,GAAG,MAAM,UAAU,CAAC,OAAO,CAAC;QAC9C,KAAK,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE,EAAE,MAAM,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE;QACxC,SAAS,EAAE;YACT,QAAQ;YACR,UAAU;YACV,iBAAiB;YACjB,cAAc;YACd,iBAAiB;YACjB,SAAS;YACT,SAAS;YACT,SAAS;YACT,YAAY;SACb;KACF,CAAC,CAAA;IAEF,IAAI,CAAC,gBAAgB,EAAE;QACrB,MAAM,IAAI,KAAK,CACb,OAAO,CAAC,CAAC,CAAC,mCAAmC,EAAE;YAC7C,gBAAgB,EAAE,EAAE;SACrB,CAAC,CACH,CAAA;KACF;IAED;;;;MAIE;IACF,IACE,gBAAgB,CAAC,KAAK,IAAI,0CAAsB,CAAC,OAAO;QACxD,gBAAgB,CAAC,KAAK,IAAI,0CAAsB,CAAC,KAAK,EACtD;QACA,MAAM,IAAI,KAAK,CACb,OAAO,CAAC,CAAC,CAAC,+CAA+C,EAAE;YACzD,EAAE;YACF,KAAK,EAAE,gBAAgB,CAAC,KAAK;SAC9B,CAAC,CACH,CAAA;KACF;IAED,MAAM,UAAU,GAAG,CAAC,sCAAoB,CAAC,OAAO,EAAE,sCAAoB,CAAC,KAAK,CAAC,CAAA;IAE7E,KAAK,IAAI,cAAc,IAAI,gBAAgB,CAAC,eAAe,EAAE;QAC3D,IAAI,UAAU,CAAC,QAAQ,CAAC,cAAc,CAAC,KAAK,CAAC,EAAE;YAC7C,SAAQ;SACT;QAED,MAAM,IAAI,KAAK,CACb,OAAO,CAAC,CAAC,CAAC,iDAAiD,EAAE;YAC3D,cAAc,EAAE,cAAc,CAAC,EAAE;YACjC,KAAK,EAAE,gBAAgB,CAAC,KAAK;SAC9B,CAAC,CACH,CAAA;KACF;IAED,IAAI,CAAC,gBAAgB,CAAC,SAAS,EAAE;QAC/B,gBAAgB,CAAC,SAAS,GAAG,IAAI,IAAI,EAAE,CAAA;KACxC;IAED,OAAO,MAAM,UAAU,CAAC,IAAI,CAAC,gCACxB,gBAAgB,KACnB,MAAM;QACN,MAAM,EACN,WAAW,EAAE,KAAK,EAClB,KAAK,EAAE,MAAM,IAAA,kCAAyB,EAAC,EAAE,EAAE,OAAO,CAAC,EACnD,OAAO,EAAE,IAAI,EACb,YAAY,EAAE,IAAI,IAAI,EAAE,EACxB,UAAU,EAAE,IAAI,GACV,CAAC,CAAA;AACX,CAAC;AA5ED,kBA4EC","sourcesContent":["import { ActivityInstance, ActivityInstanceStatus } from '../../service/activity-instance/activity-instance'\nimport { ActivityThreadStatus } from '../../service/activity-thread/activity-thread'\nimport { evalActivityInstanceState } from '../common'\n\nexport async function end(\n  { id, output, reason }: { id: string; output?: object; reason?: string },\n  context: ResolverContext\n): Promise<ActivityInstance> {\n  const { domain, user, tx } = context.state\n  const repository = tx.getRepository(ActivityInstance)\n\n  var activityInstance = await repository.findOne({\n    where: { domain: { id: domain.id }, id },\n    relations: [\n      'domain',\n      'activity',\n      'activityThreads',\n      'assigneeRole',\n      'supervisoryRole',\n      'updater',\n      'creator',\n      'starter',\n      'terminator'\n    ]\n  })\n\n  if (!activityInstance) {\n    throw new Error(\n      context.t('error.activity-instance not found', {\n        activityInstance: id\n      })\n    )\n  }\n\n  /* \n    Prerequisites for a Task to Be End.\n    - The previous state of the task must not be End or Aborted.\n    - There should be no unfinished activity threads.\n  */\n  if (\n    activityInstance.state == ActivityInstanceStatus.Aborted ||\n    activityInstance.state == ActivityInstanceStatus.Ended\n  ) {\n    throw new Error(\n      context.t(`error.activity-instance is already terminated`, {\n        id,\n        state: activityInstance.state\n      })\n    )\n  }\n\n  const TERMINATED = [ActivityThreadStatus.Aborted, ActivityThreadStatus.Ended]\n\n  for (let activityThread of activityInstance.activityThreads) {\n    if (TERMINATED.includes(activityThread.state)) {\n      continue\n    }\n\n    throw new Error(\n      context.t(`error.all activity threads should be terminated`, {\n        activityThread: activityThread.id,\n        state: activityInstance.state\n      })\n    )\n  }\n\n  if (!activityInstance.startedAt) {\n    activityInstance.startedAt = new Date()\n  }\n\n  return await repository.save({\n    ...activityInstance,\n    reason,\n    output,\n    transaction: 'end',\n    state: await evalActivityInstanceState(id, context),\n    updater: user,\n    terminatedAt: new Date(),\n    terminator: user\n  } as any)\n}\n"]}

package/dist-server/controllers/activity-thread/abort.js

@@ -20,9 +20,7 @@ async function abort({ id, reason }, context) {
       Prerequisites for a activity thread to Be Aborted.
       - The previous state of the activity thread must not be End or Aborted.
     */
-    if (activityThread.state == activity_thread_1.ActivityThreadStatus.Aborted ||
-        activityThread.state == activity_thread_1.ActivityThreadStatus.Ended ||
-        activityThread.state == activity_thread_1.ActivityThreadStatus.Delegated) {
+    if (activityThread.state == activity_thread_1.ActivityThreadStatus.Aborted || activityThread.state == activity_thread_1.ActivityThreadStatus.Ended) {
         throw new Error(context.t(`error.activity-thread is already terminated`, {
             id,
             state: activityThread.state
@@ -32,7 +30,7 @@ async function abort({ id, reason }, context) {
         activityThread.startedAt = new Date();
     }
     const result = await (0, _abort_1._abort)({ activityThread, reason }, context);
-    await (0, common_1.updateActivityInstanceState)(activityThread.activityInstanceId, context);
+    await (0, common_1.updateActivityInstanceState)(activityThread.activityInstanceId, { causedBy: [result] }, context);
     return result;
 }
 exports.abort = abort;

package/dist-server/controllers/activity-thread/abort.js.map

@@ -1 +1 @@
-{"version":3,"file":"abort.js","sourceRoot":"","sources":["../../../server/controllers/activity-thread/abort.ts"],"names":[],"mappings":";;;AAAA,mFAAoG;AACpG,sCAAuD;AACvD,qCAAiC;AAE1B,KAAK,UAAU,KAAK,CACzB,EAAE,EAAE,EAAE,MAAM,EAAkC,EAC9C,OAAwB;IAExB,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,EAAE,EAAE,GAAG,OAAO,CAAC,KAAK,CAAA;IAE1C,IAAI,UAAU,GAAG,EAAE,CAAC,aAAa,CAAC,gCAAc,CAAC,CAAA;IAEjD,IAAI,cAAc,GAAG,MAAM,UAAU,CAAC,OAAO,CAAC;QAC5C,KAAK,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE,EAAE,MAAM,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE;QACxC,SAAS,EAAE,CAAC,QAAQ,EAAE,kBAAkB,EAAE,UAAU,EAAE,SAAS,EAAE,SAAS,CAAC;KAC5E,CAAC,CAAA;IAEF,IAAI,CAAC,cAAc,EAAE;QACnB,MAAM,IAAI,KAAK,CACb,OAAO,CAAC,CAAC,CAAC,iCAAiC,EAAE;YAC3C,cAAc,EAAE,EAAE;SACnB,CAAC,CACH,CAAA;KACF;IAED;;;MAGE;IACF,IACE,cAAc,CAAC,KAAK,IAAI,sCAAoB,CAAC,OAAO;QACpD,cAAc,CAAC,KAAK,IAAI,sCAAoB,CAAC,KAAK;QAClD,cAAc,CAAC,KAAK,IAAI,sCAAoB,CAAC,SAAS,EACtD;QACA,MAAM,IAAI,KAAK,CACb,OAAO,CAAC,CAAC,CAAC,6CAA6C,EAAE;YACvD,EAAE;YACF,KAAK,EAAE,cAAc,CAAC,KAAK;SAC5B,CAAC,CACH,CAAA;KACF;IAED,IAAI,CAAC,cAAc,CAAC,SAAS,EAAE;QAC7B,cAAc,CAAC,SAAS,GAAG,IAAI,IAAI,EAAE,CAAA;KACtC;IAED,MAAM,MAAM,GAAG,MAAM,IAAA,eAAM,EAAC,EAAE,cAAc,EAAE,MAAM,EAAE,EAAE,OAAO,CAAC,CAAA;IAEhE,MAAM,IAAA,oCAA2B,EAAC,cAAc,CAAC,kBAAkB,EAAE,OAAO,CAAC,CAAA;IAE7E,OAAO,MAAM,CAAA;AACf,CAAC;AA/CD,sBA+CC","sourcesContent":["import { ActivityThread, ActivityThreadStatus } from '../../service/activity-thread/activity-thread'\nimport { updateActivityInstanceState } from '../common'\nimport { _abort } from './_abort'\n\nexport async function abort(\n  { id, reason }: { id: string; reason: string },\n  context: ResolverContext\n): Promise<ActivityThread> {\n  const { domain, user, tx } = context.state\n\n  var repository = tx.getRepository(ActivityThread)\n\n  var activityThread = await repository.findOne({\n    where: { domain: { id: domain.id }, id },\n    relations: ['domain', 'activityInstance', 'assignee', 'creator', 'updater']\n  })\n\n  if (!activityThread) {\n    throw new Error(\n      context.t('error.activity-thread not found', {\n        activityThread: id\n      })\n    )\n  }\n\n  /* \n    Prerequisites for a activity thread to Be Aborted.\n    - The previous state of the activity thread must not be End or Aborted.\n  */\n  if (\n    activityThread.state == ActivityThreadStatus.Aborted ||\n    activityThread.state == ActivityThreadStatus.Ended ||\n    activityThread.state == ActivityThreadStatus.Delegated\n  ) {\n    throw new Error(\n      context.t(`error.activity-thread is already terminated`, {\n        id,\n        state: activityThread.state\n      })\n    )\n  }\n\n  if (!activityThread.startedAt) {\n    activityThread.startedAt = new Date()\n  }\n\n  const result = await _abort({ activityThread, reason }, context)\n\n  await updateActivityInstanceState(activityThread.activityInstanceId, context)\n\n  return result\n}\n"]}
+{"version":3,"file":"abort.js","sourceRoot":"","sources":["../../../server/controllers/activity-thread/abort.ts"],"names":[],"mappings":";;;AAAA,mFAAoG;AACpG,sCAAuD;AACvD,qCAAiC;AAE1B,KAAK,UAAU,KAAK,CACzB,EAAE,EAAE,EAAE,MAAM,EAAkC,EAC9C,OAAwB;IAExB,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,EAAE,EAAE,GAAG,OAAO,CAAC,KAAK,CAAA;IAE1C,IAAI,UAAU,GAAG,EAAE,CAAC,aAAa,CAAC,gCAAc,CAAC,CAAA;IAEjD,IAAI,cAAc,GAAG,MAAM,UAAU,CAAC,OAAO,CAAC;QAC5C,KAAK,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE,EAAE,MAAM,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE;QACxC,SAAS,EAAE,CAAC,QAAQ,EAAE,kBAAkB,EAAE,UAAU,EAAE,SAAS,EAAE,SAAS,CAAC;KAC5E,CAAC,CAAA;IAEF,IAAI,CAAC,cAAc,EAAE;QACnB,MAAM,IAAI,KAAK,CACb,OAAO,CAAC,CAAC,CAAC,iCAAiC,EAAE;YAC3C,cAAc,EAAE,EAAE;SACnB,CAAC,CACH,CAAA;KACF;IAED;;;MAGE;IACF,IAAI,cAAc,CAAC,KAAK,IAAI,sCAAoB,CAAC,OAAO,IAAI,cAAc,CAAC,KAAK,IAAI,sCAAoB,CAAC,KAAK,EAAE;QAC9G,MAAM,IAAI,KAAK,CACb,OAAO,CAAC,CAAC,CAAC,6CAA6C,EAAE;YACvD,EAAE;YACF,KAAK,EAAE,cAAc,CAAC,KAAK;SAC5B,CAAC,CACH,CAAA;KACF;IAED,IAAI,CAAC,cAAc,CAAC,SAAS,EAAE;QAC7B,cAAc,CAAC,SAAS,GAAG,IAAI,IAAI,EAAE,CAAA;KACtC;IAED,MAAM,MAAM,GAAG,MAAM,IAAA,eAAM,EAAC,EAAE,cAAc,EAAE,MAAM,EAAE,EAAE,OAAO,CAAC,CAAA;IAEhE,MAAM,IAAA,oCAA2B,EAAC,cAAc,CAAC,kBAAkB,EAAE,EAAE,QAAQ,EAAE,CAAC,MAAM,CAAC,EAAE,EAAE,OAAO,CAAC,CAAA;IAErG,OAAO,MAAM,CAAA;AACf,CAAC;AA3CD,sBA2CC","sourcesContent":["import { ActivityThread, ActivityThreadStatus } from '../../service/activity-thread/activity-thread'\nimport { updateActivityInstanceState } from '../common'\nimport { _abort } from './_abort'\n\nexport async function abort(\n  { id, reason }: { id: string; reason: string },\n  context: ResolverContext\n): Promise<ActivityThread> {\n  const { domain, user, tx } = context.state\n\n  var repository = tx.getRepository(ActivityThread)\n\n  var activityThread = await repository.findOne({\n    where: { domain: { id: domain.id }, id },\n    relations: ['domain', 'activityInstance', 'assignee', 'creator', 'updater']\n  })\n\n  if (!activityThread) {\n    throw new Error(\n      context.t('error.activity-thread not found', {\n        activityThread: id\n      })\n    )\n  }\n\n  /* \n    Prerequisites for a activity thread to Be Aborted.\n    - The previous state of the activity thread must not be End or Aborted.\n  */\n  if (activityThread.state == ActivityThreadStatus.Aborted || activityThread.state == ActivityThreadStatus.Ended) {\n    throw new Error(\n      context.t(`error.activity-thread is already terminated`, {\n        id,\n        state: activityThread.state\n      })\n    )\n  }\n\n  if (!activityThread.startedAt) {\n    activityThread.startedAt = new Date()\n  }\n\n  const result = await _abort({ activityThread, reason }, context)\n\n  await updateActivityInstanceState(activityThread.activityInstanceId, { causedBy: [result] }, context)\n\n  return result\n}\n"]}

package/dist-server/controllers/activity-thread/delegate.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.delegate = void 0;
 const activity_thread_1 = require("../../service/activity-thread/activity-thread");
 const common_1 = require("../common");
-async function delegate({ id, assigneeRole, dueAt, reason }, context) {
+async function delegate({ id, assignee, dueAt, reason }, context) {
     const { domain, user, tx } = context.state;
     const repository = tx.getRepository(activity_thread_1.ActivityThread);
     var activityThread = await repository.findOne({
@@ -28,8 +28,8 @@ async function delegate({ id, assigneeRole, dueAt, reason }, context) {
         activityThread.dueAt = dueAt;
     }
     const result = await repository.save(Object.assign(Object.assign({}, activityThread), { reason,
-        assigneeRole, transaction: 'delegate', state: activity_thread_1.ActivityThreadStatus.Delegated, updater: user, assignedAt: new Date() }));
-    await (0, common_1.updateActivityInstanceState)(activityThread.activityInstanceId, context);
+        assignee, transaction: 'delegate', state: activity_thread_1.ActivityThreadStatus.Assigned, updater: user, assignedAt: new Date() }));
+    await (0, common_1.updateActivityInstanceState)(activityThread.activityInstanceId, { causedBy: [result] }, context);
     return result;
 }
 exports.delegate = delegate;

package/dist-server/controllers/activity-thread/delegate.js.map

@@ -1 +1 @@
-{"version":3,"file":"delegate.js","sourceRoot":"","sources":["../../../server/controllers/activity-thread/delegate.ts"],"names":[],"mappings":";;;AAAA,mFAAoG;AACpG,sCAAuD;AAEhD,KAAK,UAAU,QAAQ,CAC5B,EACE,EAAE,EACF,YAAY,EACZ,KAAK,EACL,MAAM,EAMP,EACD,OAAwB;IAExB,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,EAAE,EAAE,GAAG,OAAO,CAAC,KAAK,CAAA;IAE1C,MAAM,UAAU,GAAG,EAAE,CAAC,aAAa,CAAC,gCAAc,CAAC,CAAA;IAEnD,IAAI,cAAc,GAAG,MAAM,UAAU,CAAC,OAAO,CAAC;QAC5C,KAAK,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE,EAAE,MAAM,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE;KACzC,CAAC,CAAA;IAEF,IAAI,CAAC,cAAc,EAAE;QACnB,MAAM,IAAI,KAAK,CACb,OAAO,CAAC,CAAC,CAAC,iCAAiC,EAAE;YAC3C,cAAc,EAAE,EAAE;SACnB,CAAC,CACH,CAAA;KACF;IAED;;;MAGE;IACF,IAAI,cAAc,CAAC,KAAK,KAAK,sCAAoB,CAAC,QAAQ,IAAI,cAAc,CAAC,KAAK,KAAK,sCAAoB,CAAC,OAAO,EAAE;QACnH,MAAM,IAAI,KAAK,CACb,OAAO,CAAC,CAAC,CAAC,6CAA6C,EAAE;YACvD,EAAE;YACF,MAAM,EAAE,cAAc,CAAC,KAAK;SAC7B,CAAC,CACH,CAAA;KACF;IAED,IAAI,KAAK,EAAE;QACT,cAAc,CAAC,KAAK,GAAG,KAAK,CAAA;KAC7B;IAED,MAAM,MAAM,GAAG,MAAM,UAAU,CAAC,IAAI,iCAC/B,cAAc,KACjB,MAAM;QACN,YAAY,EACZ,WAAW,EAAE,UAAU,EACvB,KAAK,EAAE,sCAAoB,CAAC,SAAS,EACrC,OAAO,EAAE,IAAI,EACb,UAAU,EAAE,IAAI,IAAI,EAAE,IACtB,CAAA;IAEF,MAAM,IAAA,oCAA2B,EAAC,cAAc,CAAC,kBAAkB,EAAE,OAAO,CAAC,CAAA;IAE7E,OAAO,MAAM,CAAA;AACf,CAAC;AA5DD,4BA4DC","sourcesContent":["import { ActivityThread, ActivityThreadStatus } from '../../service/activity-thread/activity-thread'\nimport { updateActivityInstanceState } from '../common'\n\nexport async function delegate(\n  {\n    id,\n    assigneeRole,\n    dueAt,\n    reason\n  }: {\n    id: string\n    assigneeRole?: object\n    dueAt?: Date\n    reason?: string\n  },\n  context: ResolverContext\n): Promise<ActivityThread> {\n  const { domain, user, tx } = context.state\n\n  const repository = tx.getRepository(ActivityThread)\n\n  var activityThread = await repository.findOne({\n    where: { domain: { id: domain.id }, id }\n  })\n\n  if (!activityThread) {\n    throw new Error(\n      context.t('error.activity-thread not found', {\n        activityThread: id\n      })\n    )\n  }\n\n  /* \n    Prerequisites for a activity thread to Be Delegated.\n    - The previous state of the activity thread should be assigned or started.\n  */\n  if (activityThread.state !== ActivityThreadStatus.Assigned && activityThread.state !== ActivityThreadStatus.Started) {\n    throw new Error(\n      context.t(`error.activity-thread is already terminated`, {\n        id,\n        actual: activityThread.state\n      })\n    )\n  }\n\n  if (dueAt) {\n    activityThread.dueAt = dueAt\n  }\n\n  const result = await repository.save({\n    ...activityThread,\n    reason,\n    assigneeRole,\n    transaction: 'delegate',\n    state: ActivityThreadStatus.Delegated,\n    updater: user,\n    assignedAt: new Date()\n  })\n\n  await updateActivityInstanceState(activityThread.activityInstanceId, context)\n\n  return result\n}\n"]}
+{"version":3,"file":"delegate.js","sourceRoot":"","sources":["../../../server/controllers/activity-thread/delegate.ts"],"names":[],"mappings":";;;AAAA,mFAAoG;AACpG,sCAAuD;AAEhD,KAAK,UAAU,QAAQ,CAC5B,EACE,EAAE,EACF,QAAQ,EACR,KAAK,EACL,MAAM,EAMP,EACD,OAAwB;IAExB,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,EAAE,EAAE,GAAG,OAAO,CAAC,KAAK,CAAA;IAE1C,MAAM,UAAU,GAAG,EAAE,CAAC,aAAa,CAAC,gCAAc,CAAC,CAAA;IAEnD,IAAI,cAAc,GAAG,MAAM,UAAU,CAAC,OAAO,CAAC;QAC5C,KAAK,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE,EAAE,MAAM,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE;KACzC,CAAC,CAAA;IAEF,IAAI,CAAC,cAAc,EAAE;QACnB,MAAM,IAAI,KAAK,CACb,OAAO,CAAC,CAAC,CAAC,iCAAiC,EAAE;YAC3C,cAAc,EAAE,EAAE;SACnB,CAAC,CACH,CAAA;KACF;IAED;;;MAGE;IACF,IAAI,cAAc,CAAC,KAAK,KAAK,sCAAoB,CAAC,QAAQ,IAAI,cAAc,CAAC,KAAK,KAAK,sCAAoB,CAAC,OAAO,EAAE;QACnH,MAAM,IAAI,KAAK,CACb,OAAO,CAAC,CAAC,CAAC,6CAA6C,EAAE;YACvD,EAAE;YACF,MAAM,EAAE,cAAc,CAAC,KAAK;SAC7B,CAAC,CACH,CAAA;KACF;IAED,IAAI,KAAK,EAAE;QACT,cAAc,CAAC,KAAK,GAAG,KAAK,CAAA;KAC7B;IAED,MAAM,MAAM,GAAG,MAAM,UAAU,CAAC,IAAI,iCAC/B,cAAc,KACjB,MAAM;QACN,QAAQ,EACR,WAAW,EAAE,UAAU,EACvB,KAAK,EAAE,sCAAoB,CAAC,QAAQ,EACpC,OAAO,EAAE,IAAI,EACb,UAAU,EAAE,IAAI,IAAI,EAAE,IACtB,CAAA;IAEF,MAAM,IAAA,oCAA2B,EAAC,cAAc,CAAC,kBAAkB,EAAE,EAAE,QAAQ,EAAE,CAAC,MAAM,CAAC,EAAE,EAAE,OAAO,CAAC,CAAA;IAErG,OAAO,MAAM,CAAA;AACf,CAAC;AA5DD,4BA4DC","sourcesContent":["import { ActivityThread, ActivityThreadStatus } from '../../service/activity-thread/activity-thread'\nimport { updateActivityInstanceState } from '../common'\n\nexport async function delegate(\n  {\n    id,\n    assignee,\n    dueAt,\n    reason\n  }: {\n    id: string\n    assignee?: object\n    dueAt?: Date\n    reason?: string\n  },\n  context: ResolverContext\n): Promise<ActivityThread> {\n  const { domain, user, tx } = context.state\n\n  const repository = tx.getRepository(ActivityThread)\n\n  var activityThread = await repository.findOne({\n    where: { domain: { id: domain.id }, id }\n  })\n\n  if (!activityThread) {\n    throw new Error(\n      context.t('error.activity-thread not found', {\n        activityThread: id\n      })\n    )\n  }\n\n  /* \n    Prerequisites for a activity thread to Be Delegated.\n    - The previous state of the activity thread should be assigned or started.\n  */\n  if (activityThread.state !== ActivityThreadStatus.Assigned && activityThread.state !== ActivityThreadStatus.Started) {\n    throw new Error(\n      context.t(`error.activity-thread is already terminated`, {\n        id,\n        actual: activityThread.state\n      })\n    )\n  }\n\n  if (dueAt) {\n    activityThread.dueAt = dueAt\n  }\n\n  const result = await repository.save({\n    ...activityThread,\n    reason,\n    assignee,\n    transaction: 'delegate',\n    state: ActivityThreadStatus.Assigned,\n    updater: user,\n    assignedAt: new Date()\n  })\n\n  await updateActivityInstanceState(activityThread.activityInstanceId, { causedBy: [result] }, context)\n\n  return result\n}\n"]}

package/dist-server/controllers/activity-thread/end.js

@@ -18,9 +18,7 @@ async function end({ id, output, reason }, context) {
       Prerequisites for a activity thread to Be End.
       - The previous state of the activity thread must not be End or End.
     */
-    if (activityThread.state == activity_thread_1.ActivityThreadStatus.Aborted ||
-        activityThread.state == activity_thread_1.ActivityThreadStatus.Ended ||
-        activityThread.state == activity_thread_1.ActivityThreadStatus.Delegated) {
+    if (activityThread.state == activity_thread_1.ActivityThreadStatus.Aborted || activityThread.state == activity_thread_1.ActivityThreadStatus.Ended) {
         throw new Error(context.t(`error.activity-thread is already terminated`, {
             id,
             actual: activityThread.state
@@ -31,7 +29,7 @@ async function end({ id, output, reason }, context) {
     }
     activityThread = await repository.save(Object.assign(Object.assign({}, activityThread), { reason,
         output, transaction: 'end', state: activity_thread_1.ActivityThreadStatus.Ended, updater: user, terminatedAt: new Date() }));
-    await (0, common_1.updateActivityInstanceState)(activityThread.activityInstanceId, context);
+    await (0, common_1.updateActivityInstanceState)(activityThread.activityInstanceId, { causedBy: [activityThread] }, context);
     return activityThread;
 }
 exports.end = end;

package/dist-server/controllers/activity-thread/end.js.map

@@ -1 +1 @@
-{"version":3,"file":"end.js","sourceRoot":"","sources":["../../../server/controllers/activity-thread/end.ts"],"names":[],"mappings":";;;AAAA,mFAAoG;AACpG,sCAAuD;AAEhD,KAAK,UAAU,GAAG,CACvB,EAAE,EAAE,EAAE,MAAM,EAAE,MAAM,EAAoD,EACxE,OAAwB;IAExB,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,EAAE,EAAE,GAAG,OAAO,CAAC,KAAK,CAAA;IAE1C,MAAM,UAAU,GAAG,EAAE,CAAC,aAAa,CAAC,gCAAc,CAAC,CAAA;IAEnD,IAAI,cAAc,GAAG,MAAM,UAAU,CAAC,OAAO,CAAC;QAC5C,KAAK,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE,EAAE,MAAM,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE;KACzC,CAAC,CAAA;IAEF,IAAI,CAAC,cAAc,EAAE;QACnB,MAAM,IAAI,KAAK,CACb,OAAO,CAAC,CAAC,CAAC,iCAAiC,EAAE;YAC3C,cAAc,EAAE,EAAE;SACnB,CAAC,CACH,CAAA;KACF;IAED;;;MAGE;IACF,IACE,cAAc,CAAC,KAAK,IAAI,sCAAoB,CAAC,OAAO;QACpD,cAAc,CAAC,KAAK,IAAI,sCAAoB,CAAC,KAAK;QAClD,cAAc,CAAC,KAAK,IAAI,sCAAoB,CAAC,SAAS,EACtD;QACA,MAAM,IAAI,KAAK,CACb,OAAO,CAAC,CAAC,CAAC,6CAA6C,EAAE;YACvD,EAAE;YACF,MAAM,EAAE,cAAc,CAAC,KAAK;SAC7B,CAAC,CACH,CAAA;KACF;IAED,IAAI,CAAC,cAAc,CAAC,SAAS,EAAE;QAC7B,cAAc,CAAC,SAAS,GAAG,IAAI,IAAI,EAAE,CAAA;KACtC;IAED,cAAc,GAAG,MAAM,UAAU,CAAC,IAAI,iCACjC,cAAc,KACjB,MAAM;QACN,MAAM,EACN,WAAW,EAAE,KAAK,EAClB,KAAK,EAAE,sCAAoB,CAAC,KAAK,EACjC,OAAO,EAAE,IAAI,EACb,YAAY,EAAE,IAAI,IAAI,EAAE,IACxB,CAAA;IAEF,MAAM,IAAA,oCAA2B,EAAC,cAAc,CAAC,kBAAkB,EAAE,OAAO,CAAC,CAAA;IAE7E,OAAO,cAAc,CAAA;AACvB,CAAC;AAtDD,kBAsDC","sourcesContent":["import { ActivityThread, ActivityThreadStatus } from '../../service/activity-thread/activity-thread'\nimport { updateActivityInstanceState } from '../common'\n\nexport async function end(\n  { id, output, reason }: { id: string; output?: object; reason?: string },\n  context: ResolverContext\n): Promise<ActivityThread> {\n  const { domain, user, tx } = context.state\n\n  const repository = tx.getRepository(ActivityThread)\n\n  var activityThread = await repository.findOne({\n    where: { domain: { id: domain.id }, id }\n  })\n\n  if (!activityThread) {\n    throw new Error(\n      context.t('error.activity-thread not found', {\n        activityThread: id\n      })\n    )\n  }\n\n  /* \n    Prerequisites for a activity thread to Be End.\n    - The previous state of the activity thread must not be End or End.\n  */\n  if (\n    activityThread.state == ActivityThreadStatus.Aborted ||\n    activityThread.state == ActivityThreadStatus.Ended ||\n    activityThread.state == ActivityThreadStatus.Delegated\n  ) {\n    throw new Error(\n      context.t(`error.activity-thread is already terminated`, {\n        id,\n        actual: activityThread.state\n      })\n    )\n  }\n\n  if (!activityThread.startedAt) {\n    activityThread.startedAt = new Date()\n  }\n\n  activityThread = await repository.save({\n    ...activityThread,\n    reason,\n    output,\n    transaction: 'end',\n    state: ActivityThreadStatus.Ended,\n    updater: user,\n    terminatedAt: new Date()\n  })\n\n  await updateActivityInstanceState(activityThread.activityInstanceId, context)\n\n  return activityThread\n}\n"]}
+{"version":3,"file":"end.js","sourceRoot":"","sources":["../../../server/controllers/activity-thread/end.ts"],"names":[],"mappings":";;;AAAA,mFAAoG;AACpG,sCAAuD;AAEhD,KAAK,UAAU,GAAG,CACvB,EAAE,EAAE,EAAE,MAAM,EAAE,MAAM,EAAoD,EACxE,OAAwB;IAExB,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,EAAE,EAAE,GAAG,OAAO,CAAC,KAAK,CAAA;IAE1C,MAAM,UAAU,GAAG,EAAE,CAAC,aAAa,CAAC,gCAAc,CAAC,CAAA;IAEnD,IAAI,cAAc,GAAG,MAAM,UAAU,CAAC,OAAO,CAAC;QAC5C,KAAK,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE,EAAE,MAAM,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE;KACzC,CAAC,CAAA;IAEF,IAAI,CAAC,cAAc,EAAE;QACnB,MAAM,IAAI,KAAK,CACb,OAAO,CAAC,CAAC,CAAC,iCAAiC,EAAE;YAC3C,cAAc,EAAE,EAAE;SACnB,CAAC,CACH,CAAA;KACF;IAED;;;MAGE;IACF,IAAI,cAAc,CAAC,KAAK,IAAI,sCAAoB,CAAC,OAAO,IAAI,cAAc,CAAC,KAAK,IAAI,sCAAoB,CAAC,KAAK,EAAE;QAC9G,MAAM,IAAI,KAAK,CACb,OAAO,CAAC,CAAC,CAAC,6CAA6C,EAAE;YACvD,EAAE;YACF,MAAM,EAAE,cAAc,CAAC,KAAK;SAC7B,CAAC,CACH,CAAA;KACF;IAED,IAAI,CAAC,cAAc,CAAC,SAAS,EAAE;QAC7B,cAAc,CAAC,SAAS,GAAG,IAAI,IAAI,EAAE,CAAA;KACtC;IAED,cAAc,GAAG,MAAM,UAAU,CAAC,IAAI,iCACjC,cAAc,KACjB,MAAM;QACN,MAAM,EACN,WAAW,EAAE,KAAK,EAClB,KAAK,EAAE,sCAAoB,CAAC,KAAK,EACjC,OAAO,EAAE,IAAI,EACb,YAAY,EAAE,IAAI,IAAI,EAAE,IACxB,CAAA;IAEF,MAAM,IAAA,oCAA2B,EAAC,cAAc,CAAC,kBAAkB,EAAE,EAAE,QAAQ,EAAE,CAAC,cAAc,CAAC,EAAE,EAAE,OAAO,CAAC,CAAA;IAE7G,OAAO,cAAc,CAAA;AACvB,CAAC;AAlDD,kBAkDC","sourcesContent":["import { ActivityThread, ActivityThreadStatus } from '../../service/activity-thread/activity-thread'\nimport { updateActivityInstanceState } from '../common'\n\nexport async function end(\n  { id, output, reason }: { id: string; output?: object; reason?: string },\n  context: ResolverContext\n): Promise<ActivityThread> {\n  const { domain, user, tx } = context.state\n\n  const repository = tx.getRepository(ActivityThread)\n\n  var activityThread = await repository.findOne({\n    where: { domain: { id: domain.id }, id }\n  })\n\n  if (!activityThread) {\n    throw new Error(\n      context.t('error.activity-thread not found', {\n        activityThread: id\n      })\n    )\n  }\n\n  /* \n    Prerequisites for a activity thread to Be End.\n    - The previous state of the activity thread must not be End or End.\n  */\n  if (activityThread.state == ActivityThreadStatus.Aborted || activityThread.state == ActivityThreadStatus.Ended) {\n    throw new Error(\n      context.t(`error.activity-thread is already terminated`, {\n        id,\n        actual: activityThread.state\n      })\n    )\n  }\n\n  if (!activityThread.startedAt) {\n    activityThread.startedAt = new Date()\n  }\n\n  activityThread = await repository.save({\n    ...activityThread,\n    reason,\n    output,\n    transaction: 'end',\n    state: ActivityThreadStatus.Ended,\n    updater: user,\n    terminatedAt: new Date()\n  })\n\n  await updateActivityInstanceState(activityThread.activityInstanceId, { causedBy: [activityThread] }, context)\n\n  return activityThread\n}\n"]}

package/dist-server/controllers/activity-thread/restart.js

@@ -29,7 +29,7 @@ async function restart(id, output, reason, context) {
         activityThread.output = output;
     }
     const result = await tx.getRepository(activity_thread_1.ActivityThread).save(Object.assign(Object.assign({}, activityThread), { reason, state: activity_thread_1.ActivityThreadStatus.Started, transaction: 'restart', round: activityThread.round + 1, updater: user, startedAt: new Date() }));
-    await (0, common_1.updateActivityInstanceState)(activityThread.activityInstanceId, context);
+    await (0, common_1.updateActivityInstanceState)(activityThread.activityInstanceId, { causedBy: [result] }, context);
     return result;
 }
 exports.restart = restart;

package/dist-server/controllers/activity-thread/restart.js.map

@@ -1 +1 @@
-{"version":3,"file":"restart.js","sourceRoot":"","sources":["../../../server/controllers/activity-thread/restart.ts"],"names":[],"mappings":";;;AAAA,mFAAoG;AACpG,sCAAuD;AAEhD,KAAK,UAAU,OAAO,CAC3B,EAAU,EACV,MAAc,EACd,MAAc,EACd,OAAwB;IAExB,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,EAAE,EAAE,GAAG,OAAO,CAAC,KAAK,CAAA;IAE1C,MAAM,UAAU,GAAG,EAAE,CAAC,aAAa,CAAC,gCAAc,CAAC,CAAA;IACnD,MAAM,cAAc,GAAG,MAAM,UAAU,CAAC,OAAO,CAAC;QAC9C,KAAK,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE,EAAE,MAAM,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE;KACzC,CAAC,CAAA;IAEF,IAAI,CAAC,cAAc,EAAE;QACnB,MAAM,IAAI,KAAK,CACb,OAAO,CAAC,CAAC,CAAC,iCAAiC,EAAE;YAC3C,cAAc,EAAE,EAAE;SACnB,CAAC,CACH,CAAA;KACF;IAED;;;MAGE;IACF,IAAI,cAAc,CAAC,KAAK,KAAK,sCAAoB,CAAC,QAAQ,EAAE;QAC1D,MAAM,IAAI,KAAK,CACb,OAAO,CAAC,CAAC,CAAC,2CAA2C,EAAE;YACrD,EAAE;YACF,KAAK,EAAE,sCAAoB,CAAC,QAAQ;YACpC,MAAM,EAAE,cAAc,CAAC,KAAK;SAC7B,CAAC,CACH,CAAA;KACF;IAED,IAAI,MAAM,EAAE;QACV,cAAc,CAAC,MAAM,GAAG,MAAM,CAAA;KAC/B;IAED,MAAM,MAAM,GAAG,MAAM,EAAE,CAAC,aAAa,CAAC,gCAAc,CAAC,CAAC,IAAI,iCACrD,cAAc,KACjB,MAAM,EACN,KAAK,EAAE,sCAAoB,CAAC,OAAO,EACnC,WAAW,EAAE,SAAS,EACtB,KAAK,EAAE,cAAc,CAAC,KAAK,GAAG,CAAC,EAC/B,OAAO,EAAE,IAAI,EACb,SAAS,EAAE,IAAI,IAAI,EAAE,IACrB,CAAA;IAEF,MAAM,IAAA,oCAA2B,EAAC,cAAc,CAAC,kBAAkB,EAAE,OAAO,CAAC,CAAA;IAE7E,OAAO,MAAM,CAAA;AACf,CAAC;AApDD,0BAoDC","sourcesContent":["import { ActivityThread, ActivityThreadStatus } from '../../service/activity-thread/activity-thread'\nimport { updateActivityInstanceState } from '../common'\n\nexport async function restart(\n  id: string,\n  output: object,\n  reason: string,\n  context: ResolverContext\n): Promise<ActivityThread> {\n  const { domain, user, tx } = context.state\n\n  const repository = tx.getRepository(ActivityThread)\n  const activityThread = await repository.findOne({\n    where: { domain: { id: domain.id }, id }\n  })\n\n  if (!activityThread) {\n    throw new Error(\n      context.t('error.activity-thread not found', {\n        activityThread: id\n      })\n    )\n  }\n\n  /* \n    Prerequisites for a activity thread to Be Delegated.\n    - The previous state of the activity thread should be Rejected.\n  */\n  if (activityThread.state !== ActivityThreadStatus.Rejected) {\n    throw new Error(\n      context.t(`error.activity-thread should be the state`, {\n        id,\n        state: ActivityThreadStatus.Rejected,\n        actual: activityThread.state\n      })\n    )\n  }\n\n  if (output) {\n    activityThread.output = output\n  }\n\n  const result = await tx.getRepository(ActivityThread).save({\n    ...activityThread,\n    reason,\n    state: ActivityThreadStatus.Started,\n    transaction: 'restart',\n    round: activityThread.round + 1,\n    updater: user,\n    startedAt: new Date()\n  })\n\n  await updateActivityInstanceState(activityThread.activityInstanceId, context)\n\n  return result\n}\n"]}
+{"version":3,"file":"restart.js","sourceRoot":"","sources":["../../../server/controllers/activity-thread/restart.ts"],"names":[],"mappings":";;;AAAA,mFAAoG;AACpG,sCAAuD;AAEhD,KAAK,UAAU,OAAO,CAC3B,EAAU,EACV,MAAc,EACd,MAAc,EACd,OAAwB;IAExB,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,EAAE,EAAE,GAAG,OAAO,CAAC,KAAK,CAAA;IAE1C,MAAM,UAAU,GAAG,EAAE,CAAC,aAAa,CAAC,gCAAc,CAAC,CAAA;IACnD,MAAM,cAAc,GAAG,MAAM,UAAU,CAAC,OAAO,CAAC;QAC9C,KAAK,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE,EAAE,MAAM,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE;KACzC,CAAC,CAAA;IAEF,IAAI,CAAC,cAAc,EAAE;QACnB,MAAM,IAAI,KAAK,CACb,OAAO,CAAC,CAAC,CAAC,iCAAiC,EAAE;YAC3C,cAAc,EAAE,EAAE;SACnB,CAAC,CACH,CAAA;KACF;IAED;;;MAGE;IACF,IAAI,cAAc,CAAC,KAAK,KAAK,sCAAoB,CAAC,QAAQ,EAAE;QAC1D,MAAM,IAAI,KAAK,CACb,OAAO,CAAC,CAAC,CAAC,2CAA2C,EAAE;YACrD,EAAE;YACF,KAAK,EAAE,sCAAoB,CAAC,QAAQ;YACpC,MAAM,EAAE,cAAc,CAAC,KAAK;SAC7B,CAAC,CACH,CAAA;KACF;IAED,IAAI,MAAM,EAAE;QACV,cAAc,CAAC,MAAM,GAAG,MAAM,CAAA;KAC/B;IAED,MAAM,MAAM,GAAG,MAAM,EAAE,CAAC,aAAa,CAAC,gCAAc,CAAC,CAAC,IAAI,iCACrD,cAAc,KACjB,MAAM,EACN,KAAK,EAAE,sCAAoB,CAAC,OAAO,EACnC,WAAW,EAAE,SAAS,EACtB,KAAK,EAAE,cAAc,CAAC,KAAK,GAAG,CAAC,EAC/B,OAAO,EAAE,IAAI,EACb,SAAS,EAAE,IAAI,IAAI,EAAE,IACrB,CAAA;IAEF,MAAM,IAAA,oCAA2B,EAAC,cAAc,CAAC,kBAAkB,EAAE,EAAE,QAAQ,EAAE,CAAC,MAAM,CAAC,EAAE,EAAE,OAAO,CAAC,CAAA;IAErG,OAAO,MAAM,CAAA;AACf,CAAC;AApDD,0BAoDC","sourcesContent":["import { ActivityThread, ActivityThreadStatus } from '../../service/activity-thread/activity-thread'\nimport { updateActivityInstanceState } from '../common'\n\nexport async function restart(\n  id: string,\n  output: object,\n  reason: string,\n  context: ResolverContext\n): Promise<ActivityThread> {\n  const { domain, user, tx } = context.state\n\n  const repository = tx.getRepository(ActivityThread)\n  const activityThread = await repository.findOne({\n    where: { domain: { id: domain.id }, id }\n  })\n\n  if (!activityThread) {\n    throw new Error(\n      context.t('error.activity-thread not found', {\n        activityThread: id\n      })\n    )\n  }\n\n  /* \n    Prerequisites for a activity thread to Be Delegated.\n    - The previous state of the activity thread should be Rejected.\n  */\n  if (activityThread.state !== ActivityThreadStatus.Rejected) {\n    throw new Error(\n      context.t(`error.activity-thread should be the state`, {\n        id,\n        state: ActivityThreadStatus.Rejected,\n        actual: activityThread.state\n      })\n    )\n  }\n\n  if (output) {\n    activityThread.output = output\n  }\n\n  const result = await tx.getRepository(ActivityThread).save({\n    ...activityThread,\n    reason,\n    state: ActivityThreadStatus.Started,\n    transaction: 'restart',\n    round: activityThread.round + 1,\n    updater: user,\n    startedAt: new Date()\n  })\n\n  await updateActivityInstanceState(activityThread.activityInstanceId, { causedBy: [result] }, context)\n\n  return result\n}\n"]}

package/dist-server/controllers/activity-thread/save.js

@@ -18,9 +18,7 @@ async function save(id, save, context) {
       Prerequisites for a activity thread to Be Saved.
       - The previous state of the activity thread must not be terminated.
     */
-    if (activityThread.state == activity_thread_1.ActivityThreadStatus.Aborted ||
-        activityThread.state == activity_thread_1.ActivityThreadStatus.Ended ||
-        activityThread.state == activity_thread_1.ActivityThreadStatus.Delegated) {
+    if (activityThread.state == activity_thread_1.ActivityThreadStatus.Aborted || activityThread.state == activity_thread_1.ActivityThreadStatus.Ended) {
         throw new Error(context.t(`error.activity-thread is already terminated`, {
             id,
             actual: activityThread.state
@@ -31,7 +29,7 @@ async function save(id, save, context) {
         activityThread.startedAt = new Date();
     }
     activityThread = await repository.save(Object.assign(Object.assign(Object.assign({}, activityThread), save), { state: activity_thread_1.ActivityThreadStatus.Started, transaction: 'save', updater: user }));
-    await (0, common_1.updateActivityInstanceState)(activityThread.activityInstanceId, context);
+    await (0, common_1.updateActivityInstanceState)(activityThread.activityInstanceId, { causedBy: [activityThread] }, context);
     return activityThread;
 }
 exports.save = save;

package/dist-server/controllers/activity-thread/save.js.map

@@ -1 +1 @@
-{"version":3,"file":"save.js","sourceRoot":"","sources":["../../../server/controllers/activity-thread/save.ts"],"names":[],"mappings":";;;AACA,sCAAuD;AACvD,mFAAoG;AAE7F,KAAK,UAAU,IAAI,CAAC,EAAU,EAAE,IAAwB,EAAE,OAAwB;IACvF,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,EAAE,EAAE,GAAG,OAAO,CAAC,KAAK,CAAA;IAC1C,MAAM,UAAU,GAAG,EAAE,CAAC,aAAa,CAAC,gCAAc,CAAC,CAAA;IAEnD,IAAI,cAAc,GAAG,MAAM,UAAU,CAAC,OAAO,CAAC;QAC5C,KAAK,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE,EAAE,MAAM,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE;KACzC,CAAC,CAAA;IAEF,IAAI,CAAC,cAAc,EAAE;QACnB,MAAM,IAAI,KAAK,CACb,OAAO,CAAC,CAAC,CAAC,iCAAiC,EAAE;YAC3C,cAAc,EAAE,EAAE;SACnB,CAAC,CACH,CAAA;KACF;IAED;;;MAGE;IACF,IACE,cAAc,CAAC,KAAK,IAAI,sCAAoB,CAAC,OAAO;QACpD,cAAc,CAAC,KAAK,IAAI,sCAAoB,CAAC,KAAK;QAClD,cAAc,CAAC,KAAK,IAAI,sCAAoB,CAAC,SAAS,EACtD;QACA,MAAM,IAAI,KAAK,CACb,OAAO,CAAC,CAAC,CAAC,6CAA6C,EAAE;YACvD,EAAE;YACF,MAAM,EAAE,cAAc,CAAC,KAAK;SAC7B,CAAC,CACH,CAAA;KACF;IAED,IAAI,CAAC,cAAc,CAAC,SAAS,EAAE;QAC7B,8DAA8D;QAC9D,cAAc,CAAC,SAAS,GAAG,IAAI,IAAI,EAAE,CAAA;KACtC;IAED,cAAc,GAAG,MAAM,UAAU,CAAC,IAAI,+CACjC,cAAc,GACd,IAAI,KACP,KAAK,EAAE,sCAAoB,CAAC,OAAO,EACnC,WAAW,EAAE,MAAM,EACnB,OAAO,EAAE,IAAI,IACb,CAAA;IAEF,MAAM,IAAA,oCAA2B,EAAC,cAAc,CAAC,kBAAkB,EAAE,OAAO,CAAC,CAAA;IAE7E,OAAO,cAAc,CAAA;AACvB,CAAC;AAjDD,oBAiDC","sourcesContent":["import { ActivityThreadSave } from '../../service/activity-thread/activity-thread-type'\nimport { updateActivityInstanceState } from '../common'\nimport { ActivityThread, ActivityThreadStatus } from '../../service/activity-thread/activity-thread'\n\nexport async function save(id: string, save: ActivityThreadSave, context: ResolverContext): Promise<ActivityThread> {\n  const { domain, user, tx } = context.state\n  const repository = tx.getRepository(ActivityThread)\n\n  var activityThread = await repository.findOne({\n    where: { domain: { id: domain.id }, id }\n  })\n\n  if (!activityThread) {\n    throw new Error(\n      context.t('error.activity-thread not found', {\n        activityThread: id\n      })\n    )\n  }\n\n  /* \n    Prerequisites for a activity thread to Be Saved.\n    - The previous state of the activity thread must not be terminated.\n  */\n  if (\n    activityThread.state == ActivityThreadStatus.Aborted ||\n    activityThread.state == ActivityThreadStatus.Ended ||\n    activityThread.state == ActivityThreadStatus.Delegated\n  ) {\n    throw new Error(\n      context.t(`error.activity-thread is already terminated`, {\n        id,\n        actual: activityThread.state\n      })\n    )\n  }\n\n  if (!activityThread.startedAt) {\n    /* The act of saving means automatically starting the work. */\n    activityThread.startedAt = new Date()\n  }\n\n  activityThread = await repository.save({\n    ...activityThread,\n    ...save,\n    state: ActivityThreadStatus.Started,\n    transaction: 'save',\n    updater: user\n  })\n\n  await updateActivityInstanceState(activityThread.activityInstanceId, context)\n\n  return activityThread\n}\n"]}
+{"version":3,"file":"save.js","sourceRoot":"","sources":["../../../server/controllers/activity-thread/save.ts"],"names":[],"mappings":";;;AACA,sCAAuD;AACvD,mFAAoG;AAE7F,KAAK,UAAU,IAAI,CAAC,EAAU,EAAE,IAAwB,EAAE,OAAwB;IACvF,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,EAAE,EAAE,GAAG,OAAO,CAAC,KAAK,CAAA;IAC1C,MAAM,UAAU,GAAG,EAAE,CAAC,aAAa,CAAC,gCAAc,CAAC,CAAA;IAEnD,IAAI,cAAc,GAAG,MAAM,UAAU,CAAC,OAAO,CAAC;QAC5C,KAAK,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE,EAAE,MAAM,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE;KACzC,CAAC,CAAA;IAEF,IAAI,CAAC,cAAc,EAAE;QACnB,MAAM,IAAI,KAAK,CACb,OAAO,CAAC,CAAC,CAAC,iCAAiC,EAAE;YAC3C,cAAc,EAAE,EAAE;SACnB,CAAC,CACH,CAAA;KACF;IAED;;;MAGE;IACF,IAAI,cAAc,CAAC,KAAK,IAAI,sCAAoB,CAAC,OAAO,IAAI,cAAc,CAAC,KAAK,IAAI,sCAAoB,CAAC,KAAK,EAAE;QAC9G,MAAM,IAAI,KAAK,CACb,OAAO,CAAC,CAAC,CAAC,6CAA6C,EAAE;YACvD,EAAE;YACF,MAAM,EAAE,cAAc,CAAC,KAAK;SAC7B,CAAC,CACH,CAAA;KACF;IAED,IAAI,CAAC,cAAc,CAAC,SAAS,EAAE;QAC7B,8DAA8D;QAC9D,cAAc,CAAC,SAAS,GAAG,IAAI,IAAI,EAAE,CAAA;KACtC;IAED,cAAc,GAAG,MAAM,UAAU,CAAC,IAAI,+CACjC,cAAc,GACd,IAAI,KACP,KAAK,EAAE,sCAAoB,CAAC,OAAO,EACnC,WAAW,EAAE,MAAM,EACnB,OAAO,EAAE,IAAI,IACb,CAAA;IAEF,MAAM,IAAA,oCAA2B,EAAC,cAAc,CAAC,kBAAkB,EAAE,EAAE,QAAQ,EAAE,CAAC,cAAc,CAAC,EAAE,EAAE,OAAO,CAAC,CAAA;IAE7G,OAAO,cAAc,CAAA;AACvB,CAAC;AA7CD,oBA6CC","sourcesContent":["import { ActivityThreadSave } from '../../service/activity-thread/activity-thread-type'\nimport { updateActivityInstanceState } from '../common'\nimport { ActivityThread, ActivityThreadStatus } from '../../service/activity-thread/activity-thread'\n\nexport async function save(id: string, save: ActivityThreadSave, context: ResolverContext): Promise<ActivityThread> {\n  const { domain, user, tx } = context.state\n  const repository = tx.getRepository(ActivityThread)\n\n  var activityThread = await repository.findOne({\n    where: { domain: { id: domain.id }, id }\n  })\n\n  if (!activityThread) {\n    throw new Error(\n      context.t('error.activity-thread not found', {\n        activityThread: id\n      })\n    )\n  }\n\n  /* \n    Prerequisites for a activity thread to Be Saved.\n    - The previous state of the activity thread must not be terminated.\n  */\n  if (activityThread.state == ActivityThreadStatus.Aborted || activityThread.state == ActivityThreadStatus.Ended) {\n    throw new Error(\n      context.t(`error.activity-thread is already terminated`, {\n        id,\n        actual: activityThread.state\n      })\n    )\n  }\n\n  if (!activityThread.startedAt) {\n    /* The act of saving means automatically starting the work. */\n    activityThread.startedAt = new Date()\n  }\n\n  activityThread = await repository.save({\n    ...activityThread,\n    ...save,\n    state: ActivityThreadStatus.Started,\n    transaction: 'save',\n    updater: user\n  })\n\n  await updateActivityInstanceState(activityThread.activityInstanceId, { causedBy: [activityThread] }, context)\n\n  return activityThread\n}\n"]}

package/dist-server/controllers/activity-thread/start.js

@@ -28,7 +28,7 @@ async function start(id, output, reason, context) {
         activityThread.output = output;
     }
     const result = await tx.getRepository(activity_thread_1.ActivityThread).save(Object.assign(Object.assign({}, activityThread), { reason, state: activity_thread_1.ActivityThreadStatus.Started, transaction: 'start', updater: user, startedAt: new Date() }));
-    await (0, common_1.updateActivityInstanceState)(activityThread.activityInstanceId, context);
+    await (0, common_1.updateActivityInstanceState)(activityThread.activityInstanceId, { causedBy: [result] }, context);
     return result;
 }
 exports.start = start;

package/dist-server/controllers/activity-thread/start.js.map

@@ -1 +1 @@
-{"version":3,"file":"start.js","sourceRoot":"","sources":["../../../server/controllers/activity-thread/start.ts"],"names":[],"mappings":";;;AAAA,mFAAoG;AACpG,sCAAuD;AAEhD,KAAK,UAAU,KAAK,CACzB,EAAU,EACV,MAAc,EACd,MAAc,EACd,OAAwB;IAExB,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,EAAE,EAAE,GAAG,OAAO,CAAC,KAAK,CAAA;IAE1C,MAAM,UAAU,GAAG,EAAE,CAAC,aAAa,CAAC,gCAAc,CAAC,CAAA;IACnD,MAAM,cAAc,GAAG,MAAM,UAAU,CAAC,OAAO,CAAC;QAC9C,KAAK,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE,EAAE,MAAM,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE;KACzC,CAAC,CAAA;IAEF,IAAI,CAAC,cAAc,EAAE;QACnB,MAAM,IAAI,KAAK,CACb,OAAO,CAAC,CAAC,CAAC,iCAAiC,EAAE;YAC3C,cAAc,EAAE,EAAE;SACnB,CAAC,CACH,CAAA;KACF;IAED;;;MAGE;IACF,IAAI,cAAc,CAAC,KAAK,KAAK,sCAAoB,CAAC,QAAQ,EAAE;QAC1D,MAAM,IAAI,KAAK,CACb,OAAO,CAAC,CAAC,CAAC,6CAA6C,EAAE;YACvD,EAAE;YACF,MAAM,EAAE,cAAc,CAAC,KAAK;SAC7B,CAAC,CACH,CAAA;KACF;IAED,IAAI,MAAM,EAAE;QACV,cAAc,CAAC,MAAM,GAAG,MAAM,CAAA;KAC/B;IAED,MAAM,MAAM,GAAG,MAAM,EAAE,CAAC,aAAa,CAAC,gCAAc,CAAC,CAAC,IAAI,iCACrD,cAAc,KACjB,MAAM,EACN,KAAK,EAAE,sCAAoB,CAAC,OAAO,EACnC,WAAW,EAAE,OAAO,EACpB,OAAO,EAAE,IAAI,EACb,SAAS,EAAE,IAAI,IAAI,EAAE,IACrB,CAAA;IAEF,MAAM,IAAA,oCAA2B,EAAC,cAAc,CAAC,kBAAkB,EAAE,OAAO,CAAC,CAAA;IAE7E,OAAO,MAAM,CAAA;AACf,CAAC;AAlDD,sBAkDC","sourcesContent":["import { ActivityThread, ActivityThreadStatus } from '../../service/activity-thread/activity-thread'\nimport { updateActivityInstanceState } from '../common'\n\nexport async function start(\n  id: string,\n  output: object,\n  reason: string,\n  context: ResolverContext\n): Promise<ActivityThread> {\n  const { domain, user, tx } = context.state\n\n  const repository = tx.getRepository(ActivityThread)\n  const activityThread = await repository.findOne({\n    where: { domain: { id: domain.id }, id }\n  })\n\n  if (!activityThread) {\n    throw new Error(\n      context.t('error.activity-thread not found', {\n        activityThread: id\n      })\n    )\n  }\n\n  /* \n    Prerequisites for a activity thread to Be Started.\n    - The previous state of the activity thread must not be terminated.\n  */\n  if (activityThread.state !== ActivityThreadStatus.Assigned) {\n    throw new Error(\n      context.t(`error.activity-thread should not be started`, {\n        id,\n        actual: activityThread.state\n      })\n    )\n  }\n\n  if (output) {\n    activityThread.output = output\n  }\n\n  const result = await tx.getRepository(ActivityThread).save({\n    ...activityThread,\n    reason,\n    state: ActivityThreadStatus.Started,\n    transaction: 'start',\n    updater: user,\n    startedAt: new Date()\n  })\n\n  await updateActivityInstanceState(activityThread.activityInstanceId, context)\n\n  return result\n}\n"]}
+{"version":3,"file":"start.js","sourceRoot":"","sources":["../../../server/controllers/activity-thread/start.ts"],"names":[],"mappings":";;;AAAA,mFAAoG;AACpG,sCAAuD;AAEhD,KAAK,UAAU,KAAK,CACzB,EAAU,EACV,MAAc,EACd,MAAc,EACd,OAAwB;IAExB,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,EAAE,EAAE,GAAG,OAAO,CAAC,KAAK,CAAA;IAE1C,MAAM,UAAU,GAAG,EAAE,CAAC,aAAa,CAAC,gCAAc,CAAC,CAAA;IACnD,MAAM,cAAc,GAAG,MAAM,UAAU,CAAC,OAAO,CAAC;QAC9C,KAAK,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE,EAAE,MAAM,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE;KACzC,CAAC,CAAA;IAEF,IAAI,CAAC,cAAc,EAAE;QACnB,MAAM,IAAI,KAAK,CACb,OAAO,CAAC,CAAC,CAAC,iCAAiC,EAAE;YAC3C,cAAc,EAAE,EAAE;SACnB,CAAC,CACH,CAAA;KACF;IAED;;;MAGE;IACF,IAAI,cAAc,CAAC,KAAK,KAAK,sCAAoB,CAAC,QAAQ,EAAE;QAC1D,MAAM,IAAI,KAAK,CACb,OAAO,CAAC,CAAC,CAAC,6CAA6C,EAAE;YACvD,EAAE;YACF,MAAM,EAAE,cAAc,CAAC,KAAK;SAC7B,CAAC,CACH,CAAA;KACF;IAED,IAAI,MAAM,EAAE;QACV,cAAc,CAAC,MAAM,GAAG,MAAM,CAAA;KAC/B;IAED,MAAM,MAAM,GAAG,MAAM,EAAE,CAAC,aAAa,CAAC,gCAAc,CAAC,CAAC,IAAI,iCACrD,cAAc,KACjB,MAAM,EACN,KAAK,EAAE,sCAAoB,CAAC,OAAO,EACnC,WAAW,EAAE,OAAO,EACpB,OAAO,EAAE,IAAI,EACb,SAAS,EAAE,IAAI,IAAI,EAAE,IACrB,CAAA;IAEF,MAAM,IAAA,oCAA2B,EAAC,cAAc,CAAC,kBAAkB,EAAE,EAAE,QAAQ,EAAE,CAAC,MAAM,CAAC,EAAE,EAAE,OAAO,CAAC,CAAA;IAErG,OAAO,MAAM,CAAA;AACf,CAAC;AAlDD,sBAkDC","sourcesContent":["import { ActivityThread, ActivityThreadStatus } from '../../service/activity-thread/activity-thread'\nimport { updateActivityInstanceState } from '../common'\n\nexport async function start(\n  id: string,\n  output: object,\n  reason: string,\n  context: ResolverContext\n): Promise<ActivityThread> {\n  const { domain, user, tx } = context.state\n\n  const repository = tx.getRepository(ActivityThread)\n  const activityThread = await repository.findOne({\n    where: { domain: { id: domain.id }, id }\n  })\n\n  if (!activityThread) {\n    throw new Error(\n      context.t('error.activity-thread not found', {\n        activityThread: id\n      })\n    )\n  }\n\n  /* \n    Prerequisites for a activity thread to Be Started.\n    - The previous state of the activity thread must not be terminated.\n  */\n  if (activityThread.state !== ActivityThreadStatus.Assigned) {\n    throw new Error(\n      context.t(`error.activity-thread should not be started`, {\n        id,\n        actual: activityThread.state\n      })\n    )\n  }\n\n  if (output) {\n    activityThread.output = output\n  }\n\n  const result = await tx.getRepository(ActivityThread).save({\n    ...activityThread,\n    reason,\n    state: ActivityThreadStatus.Started,\n    transaction: 'start',\n    updater: user,\n    startedAt: new Date()\n  })\n\n  await updateActivityInstanceState(activityThread.activityInstanceId, { causedBy: [result] }, context)\n\n  return result\n}\n"]}

package/dist-server/controllers/activity-thread/submit.js

@@ -53,7 +53,7 @@ async function submit({ id, output, reason }, context) {
         activityThread = await repository.save(Object.assign(Object.assign({}, activityThread), { reason,
             output, transaction: 'end', state: activity_thread_1.ActivityThreadStatus.Ended, updater: user, terminator: user, terminatedAt: new Date() }));
     }
-    await (0, common_1.updateActivityInstanceState)(activityThread.activityInstanceId, context);
+    await (0, common_1.updateActivityInstanceState)(activityThread.activityInstanceId, { causedBy: [activityThread] }, context);
     return activityThread;
 }
 exports.submit = submit;