@things-factory/worklist 10.0.19 → 10.1.1

package/dist-server/controllers/activity-installation/activity-installation-controller.d.ts

@@ -1,4 +1,30 @@
+import { EntityManager } from 'typeorm';
+import { Domain } from '@things-factory/shell';
+import { Activity } from '../../service/activity/activity.js';
 import { InstallableActivity } from '../../service/installable-activity/installable-activity.js';
+/**
+ * 등록된 양식을 **도메인에 실제로 세운다.**
+ *
+ * ── 왜 함수로 내놓나 ───────────────────────────────────────────────────────
+ * 앞서는 이 일이 화면 뮤테이션 안에만 있었다. 그래서 양식을 세우는 길이 **사람이 화면에서 누르는 것
+ * 하나뿐**이었고, 새로 배포하거나 도메인을 하나 더 만들 때마다 그 클릭을 기억해야 했다. 기억하지
+ * 못하면 그 기능이 오류 보고 없이 없다.
+ *
+ * 앱이 「내 기능이 서려면 이 양식이 있어야 한다」를 아는 경우가 있다. 그런 앱은 기동할 때 스스로
+ * 세울 수 있어야 한다. 언제 세울지는 앱이 정하고, 세우는 방법은 여기가 한 벌만 갖는다.
+ *
+ * ── 있는 것을 덮되 결재선은 건드리지 않는다 ────────────────────────────────
+ * 이미 있으면 양식의 선언(모델 · 보는 화면 · 시작 방식)으로 덮는다. 판이 오르면 그 값이 따라와야
+ * 하기 때문이다.
+ *
+ * 그런데 **결재선은 양식의 것이 아니라 그 현장의 것**이다. 누가 결재하는지는 공장이 정한다. 그래서
+ * 양식에 결재선 선언이 없으면 이미 있는 결재선이 그대로 남는다 — 판을 올릴 때마다 결재자가 지워지면
+ * 그 뒤로 상신이 곧 완료가 된다.
+ */
+export declare function installActivity(name: string, domain: Domain, options?: {
+    manager?: EntityManager;
+    user?: any;
+}): Promise<Activity>;
 export declare class ActivityInstallations {
     static templates: {
         [name: string]: InstallableActivity;

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

@@ -1,6 +1,51 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ActivityInstallations = void 0;
+exports.installActivity = installActivity;
+const shell_1 = require("@things-factory/shell");
+const activity_js_1 = require("../../service/activity/activity.js");
+/**
+ * 등록된 양식을 **도메인에 실제로 세운다.**
+ *
+ * ── 왜 함수로 내놓나 ───────────────────────────────────────────────────────
+ * 앞서는 이 일이 화면 뮤테이션 안에만 있었다. 그래서 양식을 세우는 길이 **사람이 화면에서 누르는 것
+ * 하나뿐**이었고, 새로 배포하거나 도메인을 하나 더 만들 때마다 그 클릭을 기억해야 했다. 기억하지
+ * 못하면 그 기능이 오류 보고 없이 없다.
+ *
+ * 앱이 「내 기능이 서려면 이 양식이 있어야 한다」를 아는 경우가 있다. 그런 앱은 기동할 때 스스로
+ * 세울 수 있어야 한다. 언제 세울지는 앱이 정하고, 세우는 방법은 여기가 한 벌만 갖는다.
+ *
+ * ── 있는 것을 덮되 결재선은 건드리지 않는다 ────────────────────────────────
+ * 이미 있으면 양식의 선언(모델 · 보는 화면 · 시작 방식)으로 덮는다. 판이 오르면 그 값이 따라와야
+ * 하기 때문이다.
+ *
+ * 그런데 **결재선은 양식의 것이 아니라 그 현장의 것**이다. 누가 결재하는지는 공장이 정한다. 그래서
+ * 양식에 결재선 선언이 없으면 이미 있는 결재선이 그대로 남는다 — 판을 올릴 때마다 결재자가 지워지면
+ * 그 뒤로 상신이 곧 완료가 된다.
+ */
+async function installActivity(name, domain, options = {}) {
+    const template = ActivityInstallations.get(name);
+    if (!template) {
+        /*
+         * 없는 이름을 세울 수는 없다. 조용히 넘기면 부르는 쪽은 세운 줄 알고, 그 기능은 없는 채로 선다.
+         */
+        throw new Error(`installActivity: there is no installable activity named "${name}". ` +
+            `known: ${ActivityInstallations.list()
+                .map(one => one.name)
+                .join(', ')}`);
+    }
+    const { manager, user } = options;
+    const repository = (0, shell_1.getRepository)(activity_js_1.Activity, manager);
+    const existing = await repository.findOneBy({ domain: { id: domain.id }, name });
+    return await repository.save({
+        ...(existing ?? {}),
+        ...template,
+        state: activity_js_1.ActivityStatus.Released,
+        domain,
+        creator: existing ? existing.creator : user,
+        updater: user
+    });
+}
 class ActivityInstallations {
     static { this.templates = {}; }
     static installActivityTemplate(template) {

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;aACzB,cAAS,GAA4C,EAAE,CAAA;IAE9D,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,CAAC;YACzB,OAAM;QACR,CAAC;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","sourcesContent":["import { InstallableActivity } from '../../service/installable-activity/installable-activity.js'\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"]}
+{"version":3,"file":"activity-installation-controller.js","sourceRoot":"","sources":["../../../server/controllers/activity-installation/activity-installation-controller.ts"],"names":[],"mappings":";;;AA0BA,0CAgCC;AAxDD,iDAA6D;AAE7D,oEAA6E;AAG7E;;;;;;;;;;;;;;;;;;GAkBG;AACI,KAAK,UAAU,eAAe,CACnC,IAAY,EACZ,MAAc,EACd,UAAmD,EAAE;IAErD,MAAM,QAAQ,GAAG,qBAAqB,CAAC,GAAG,CAAC,IAAI,CAAC,CAAA;IAEhD,IAAI,CAAC,QAAQ,EAAE,CAAC;QACd;;WAEG;QACH,MAAM,IAAI,KAAK,CACb,4DAA4D,IAAI,KAAK;YACnE,UAAU,qBAAqB,CAAC,IAAI,EAAE;iBACnC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,IAAI,CAAC;iBACpB,IAAI,CAAC,IAAI,CAAC,EAAE,CAClB,CAAA;IACH,CAAC;IAED,MAAM,EAAE,OAAO,EAAE,IAAI,EAAE,GAAG,OAAO,CAAA;IACjC,MAAM,UAAU,GAAG,IAAA,qBAAa,EAAC,sBAAQ,EAAE,OAAO,CAAC,CAAA;IAEnD,MAAM,QAAQ,GAAG,MAAM,UAAU,CAAC,SAAS,CAAC,EAAE,MAAM,EAAE,EAAE,EAAE,EAAE,MAAM,CAAC,EAAE,EAAE,EAAE,IAAI,EAAE,CAAC,CAAA;IAEhF,OAAO,MAAM,UAAU,CAAC,IAAI,CAAC;QAC3B,GAAG,CAAC,QAAQ,IAAI,EAAE,CAAC;QACnB,GAAI,QAAgB;QACpB,KAAK,EAAE,4BAAc,CAAC,QAAQ;QAC9B,MAAM;QACN,OAAO,EAAE,QAAQ,CAAC,CAAC,CAAE,QAAgB,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI;QACpD,OAAO,EAAE,IAAI;KACP,CAAC,CAAA;AACX,CAAC;AAED,MAAa,qBAAqB;aACzB,cAAS,GAA4C,EAAE,CAAA;IAE9D,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,CAAC;YACzB,OAAM;QACR,CAAC;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","sourcesContent":["import { EntityManager } from 'typeorm'\n\nimport { Domain, getRepository } from '@things-factory/shell'\n\nimport { Activity, ActivityStatus } from '../../service/activity/activity.js'\nimport { InstallableActivity } from '../../service/installable-activity/installable-activity.js'\n\n/**\n * 등록된 양식을 **도메인에 실제로 세운다.**\n *\n * ── 왜 함수로 내놓나 ───────────────────────────────────────────────────────\n * 앞서는 이 일이 화면 뮤테이션 안에만 있었다. 그래서 양식을 세우는 길이 **사람이 화면에서 누르는 것\n * 하나뿐**이었고, 새로 배포하거나 도메인을 하나 더 만들 때마다 그 클릭을 기억해야 했다. 기억하지\n * 못하면 그 기능이 오류 보고 없이 없다.\n *\n * 앱이 「내 기능이 서려면 이 양식이 있어야 한다」를 아는 경우가 있다. 그런 앱은 기동할 때 스스로\n * 세울 수 있어야 한다. 언제 세울지는 앱이 정하고, 세우는 방법은 여기가 한 벌만 갖는다.\n *\n * ── 있는 것을 덮되 결재선은 건드리지 않는다 ────────────────────────────────\n * 이미 있으면 양식의 선언(모델 · 보는 화면 · 시작 방식)으로 덮는다. 판이 오르면 그 값이 따라와야\n * 하기 때문이다.\n *\n * 그런데 **결재선은 양식의 것이 아니라 그 현장의 것**이다. 누가 결재하는지는 공장이 정한다. 그래서\n * 양식에 결재선 선언이 없으면 이미 있는 결재선이 그대로 남는다 — 판을 올릴 때마다 결재자가 지워지면\n * 그 뒤로 상신이 곧 완료가 된다.\n */\nexport async function installActivity(\n  name: string,\n  domain: Domain,\n  options: { manager?: EntityManager; user?: any } = {}\n): Promise<Activity> {\n  const template = ActivityInstallations.get(name)\n\n  if (!template) {\n    /*\n     * 없는 이름을 세울 수는 없다. 조용히 넘기면 부르는 쪽은 세운 줄 알고, 그 기능은 없는 채로 선다.\n     */\n    throw new Error(\n      `installActivity: there is no installable activity named \"${name}\". ` +\n        `known: ${ActivityInstallations.list()\n          .map(one => one.name)\n          .join(', ')}`\n    )\n  }\n\n  const { manager, user } = options\n  const repository = getRepository(Activity, manager)\n\n  const existing = await repository.findOneBy({ domain: { id: domain.id }, name })\n\n  return await repository.save({\n    ...(existing ?? {}),\n    ...(template as any),\n    state: ActivityStatus.Released,\n    domain,\n    creator: existing ? (existing as any).creator : user,\n    updater: user\n  } as any)\n}\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/approval-expectation.d.ts

@@ -0,0 +1,34 @@
+/**
+ * 「결재를 받겠다」는 기대를 지킬 수 있나 — **순수 판단.**
+ *
+ * ── 왜 이 자리가 필요한가 ──────────────────────────────────────────────────
+ * `startingType: 'post'` 는 낸 사람에게 스레드를 하나 만들고 곧바로 제출까지 간다. 결재선이 있으면
+ * 거기서 상신되고, **없으면 그대로 끝난다.** 끝나면 완료 콜백이 돌아 업무가 확정된다.
+ *
+ * 그 거동 자체는 틀리지 않았다 — 결재 없이 내면 끝나는 일이 있다(작업 일지 같은 것). 문제는 **내는
+ * 쪽이 「이건 결재를 받는다」고 믿고 냈는데 결재선이 비어 조용히 확정되는 경우**다. 오류도 없고
+ * 흔적도 없어서, 승인 게이트가 있는 척만 하게 된다.
+ *
+ * 그래서 기대를 낸 쪽이 말하고 여기서 지킨다. **말하지 않은 건은 지나간다** — 기존에 돌던 것이
+ * 하나도 달라지지 않아야 한다.
+ *
+ * ── 왜 내는 쪽에서 미리 보는 것으로는 부족한가 ────────────────────────────
+ * 미리 봐도 되지만 그것만으로는 부족하다. 보고 나서 내기까지 사이에 누가 결재선을 비울 수 있다.
+ * 내는 것과 같은 트랜잭션 안에서 보는 자리는 하나뿐이다.
+ */
+export type ApprovalExpectation = {
+    ok: true;
+} | {
+    ok: false;
+    because: 'approval-line-empty';
+    activityName: string;
+};
+export declare function judgeApprovalExpectation(input: {
+    requireApproval?: boolean;
+    /** 액티비티의 것을 물려받고, 초안을 다시 내는 경우 원본의 것까지 합친 **최종** 결재선. */
+    approvalLine?: unknown[] | null;
+    activityName: string;
+}): ApprovalExpectation;
+export declare function expectationBroken(verdict: ApprovalExpectation): verdict is Extract<ApprovalExpectation, {
+    ok: false;
+}>;

package/dist-server/controllers/activity-instance/approval-expectation.js

@@ -0,0 +1,18 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.judgeApprovalExpectation = judgeApprovalExpectation;
+exports.expectationBroken = expectationBroken;
+function judgeApprovalExpectation(input) {
+    if (!input.requireApproval) {
+        /* 기대를 말하지 않았다. 결재 없이 내면 끝나는 일이 정상인 앱이 있다. */
+        return { ok: true };
+    }
+    if (input.approvalLine?.length) {
+        return { ok: true };
+    }
+    return { ok: false, because: 'approval-line-empty', activityName: input.activityName };
+}
+function expectationBroken(verdict) {
+    return !verdict.ok;
+}
+//# sourceMappingURL=approval-expectation.js.map

package/dist-server/controllers/activity-instance/approval-expectation.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"approval-expectation.js","sourceRoot":"","sources":["../../../server/controllers/activity-instance/approval-expectation.ts"],"names":[],"mappings":";;AAsBA,4DAgBC;AAED,8CAIC;AAtBD,SAAgB,wBAAwB,CAAC,KAKxC;IACC,IAAI,CAAC,KAAK,CAAC,eAAe,EAAE,CAAC;QAC3B,6CAA6C;QAC7C,OAAO,EAAE,EAAE,EAAE,IAAI,EAAE,CAAA;IACrB,CAAC;IAED,IAAI,KAAK,CAAC,YAAY,EAAE,MAAM,EAAE,CAAC;QAC/B,OAAO,EAAE,EAAE,EAAE,IAAI,EAAE,CAAA;IACrB,CAAC;IAED,OAAO,EAAE,EAAE,EAAE,KAAK,EAAE,OAAO,EAAE,qBAAqB,EAAE,YAAY,EAAE,KAAK,CAAC,YAAY,EAAE,CAAA;AACxF,CAAC;AAED,SAAgB,iBAAiB,CAC/B,OAA4B;IAE5B,OAAO,CAAC,OAAO,CAAC,EAAE,CAAA;AACpB,CAAC","sourcesContent":["/**\n * 「결재를 받겠다」는 기대를 지킬 수 있나 — **순수 판단.**\n *\n * ── 왜 이 자리가 필요한가 ──────────────────────────────────────────────────\n * `startingType: 'post'` 는 낸 사람에게 스레드를 하나 만들고 곧바로 제출까지 간다. 결재선이 있으면\n * 거기서 상신되고, **없으면 그대로 끝난다.** 끝나면 완료 콜백이 돌아 업무가 확정된다.\n *\n * 그 거동 자체는 틀리지 않았다 — 결재 없이 내면 끝나는 일이 있다(작업 일지 같은 것). 문제는 **내는\n * 쪽이 「이건 결재를 받는다」고 믿고 냈는데 결재선이 비어 조용히 확정되는 경우**다. 오류도 없고\n * 흔적도 없어서, 승인 게이트가 있는 척만 하게 된다.\n *\n * 그래서 기대를 낸 쪽이 말하고 여기서 지킨다. **말하지 않은 건은 지나간다** — 기존에 돌던 것이\n * 하나도 달라지지 않아야 한다.\n *\n * ── 왜 내는 쪽에서 미리 보는 것으로는 부족한가 ────────────────────────────\n * 미리 봐도 되지만 그것만으로는 부족하다. 보고 나서 내기까지 사이에 누가 결재선을 비울 수 있다.\n * 내는 것과 같은 트랜잭션 안에서 보는 자리는 하나뿐이다.\n */\nexport type ApprovalExpectation =\n  | { ok: true }\n  | { ok: false; because: 'approval-line-empty'; activityName: string }\n\nexport function judgeApprovalExpectation(input: {\n  requireApproval?: boolean\n  /** 액티비티의 것을 물려받고, 초안을 다시 내는 경우 원본의 것까지 합친 **최종** 결재선. */\n  approvalLine?: unknown[] | null\n  activityName: string\n}): ApprovalExpectation {\n  if (!input.requireApproval) {\n    /* 기대를 말하지 않았다. 결재 없이 내면 끝나는 일이 정상인 앱이 있다. */\n    return { ok: true }\n  }\n\n  if (input.approvalLine?.length) {\n    return { ok: true }\n  }\n\n  return { ok: false, because: 'approval-line-empty', activityName: input.activityName }\n}\n\nexport function expectationBroken(\n  verdict: ApprovalExpectation\n): verdict is Extract<ApprovalExpectation, { ok: false }> {\n  return !verdict.ok\n}\n"]}

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

@@ -6,6 +6,7 @@ const activity_js_1 = require("../../service/activity/activity.js");
 const activity_instance_js_1 = require("../../service/activity-instance/activity-instance.js");
 const common_js_1 = require("../common.js");
 const submit_js_1 = require("../activity-thread/submit.js");
+const approval_expectation_js_1 = require("./approval-expectation.js");
 async function issue(activityInstance, context) {
     const { domain, user, tx } = context.state;
     const issuedAt = new Date();
@@ -59,6 +60,15 @@ async function issue(activityInstance, context) {
         activityInstance.priority = priority ?? activity.priority;
         activityInstance.adhocType = 'standard';
         activityInstance.refBy = activityId;
+        /*
+         * 낸 쪽이 직접 주지 않았으면 액티비티의 선언을 따른다.
+         *
+         * 위의 `if (!assignees || !approvalLine)` 안에 두지 않는다 — 둘 다 준 건에서는 그 블록에 안 들어가고,
+         * 그러면 이 축만 조용히 빠진다.
+         */
+        if (activityInstance.rejectionIsFinal === undefined || activityInstance.rejectionIsFinal === null) {
+            activityInstance.rejectionIsFinal = activity.rejectionIsFinal ?? false;
+        }
         if (!assignees || !approvalLine) {
             if (!assignees) {
                 assignees = activityInstance.assignees = activity.assignees;
@@ -71,6 +81,28 @@ async function issue(activityInstance, context) {
             }
         }
     }
+    /*
+     * **결재를 받겠다고 낸 건은 결재선이 있어야 한다.**
+     *
+     * 액티비티의 결재선을 물려받은 뒤에 본다 — 낸 쪽이 직접 주지 않아도 액티비티가 들고 있으면 그것이
+     * 이 건의 결재선이다. 물려받기 전에 보면 멀쩡한 건을 막는다.
+     *
+     * 초안을 다시 내는 경우 결재선은 원본이 들고 있으므로 그것까지 함께 본다.
+     *
+     * 판단은 `approval-expectation.ts` 가 든다 — 여기서 조건을 적으면 시험할 수 없다.
+     */
+    const expectation = (0, approval_expectation_js_1.judgeApprovalExpectation)({
+        requireApproval: activityInstance.requireApproval,
+        approvalLine: activityInstance.approvalLine ?? origin?.approvalLine,
+        activityName: activity.name
+    });
+    if ((0, approval_expectation_js_1.expectationBroken)(expectation)) {
+        throw new Error(context.t('error.approval line is empty but approval was required', {
+            activity: expectation.activityName,
+            defaultValue: `"${expectation.activityName}" 에 결재선이 없습니다. 이 건은 결재를 받기로 하고 낸 것이라 올리지 않습니다 — ` +
+                '그대로 두면 결재 없이 확정됩니다.'
+        }));
+    }
     const activitySearchKeys = (0, common_js_1.fillActivitySearchKeys)(activity?.searchKeys, input);
     if (activity.startingType == 'post') {
         /*

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

@@ -1 +1 @@
-{"version":3,"file":"issue.js","sourceRoot":"","sources":["../../../server/controllers/activity-instance/issue.ts"],"names":[],"mappings":"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","sourcesContent":["import { In } from 'typeorm'\nimport { Activity } from '../../service/activity/activity.js'\nimport { ActivityInstance, ActivityInstanceStatus } from '../../service/activity-instance/activity-instance.js'\nimport { ActivityInstanceIssue } from '../../service/activity-instance/activity-instance-type.js'\nimport {\n  createActivityThreadWithUnassigned,\n  createActivityThreadsForAllRoleUsers,\n  createActivityThreadsForUsers,\n  getSystemUserFromOrgMemberItem,\n  createActivityThreadForUser,\n  fillActivitySearchKeys\n} from '../common.js'\nimport { submit } from '../activity-thread/submit.js'\n\nexport async function issue(\n  activityInstance: ActivityInstanceIssue,\n  context: ResolverContext\n): Promise<ActivityInstance> {\n  const { domain, user, tx } = context.state\n  const issuedAt = new Date()\n  var {\n    id,\n    name,\n    description,\n    assignees,\n    uiType,\n    uiSource,\n    viewType,\n    viewSource,\n    dueAt,\n    priority,\n    approvalLine,\n    activityId,\n    activityType,\n    assigneeRole,\n    supervisoryRole,\n    input\n  } = activityInstance\n\n  var origin = id\n    ? await tx.getRepository(ActivityInstance).findOne({\n        where: { domain: { id: domain.id }, id },\n        relations: [\n          'domain',\n          'activity',\n          'assigneeRole',\n          'supervisoryRole',\n          'updater',\n          'creator',\n          'starter',\n          'terminator'\n        ]\n      })\n    : null\n\n  /* \n    Prerequisites for a Task to Be Issued.\n    - The previous state of the task should be Draft.\n  */\n  if (origin && origin.state !== ActivityInstanceStatus.Draft) {\n    throw new Error(\n      context.t(`error.activity-instance is already issued`, {\n        id: id,\n        state: origin.state\n      })\n    )\n  }\n\n  var repository = tx.getRepository(Activity)\n  var activity =\n    origin?.activity ||\n    (await repository.findOne({\n      where: { domain: domain.parentId ? { id: In([domain.id, domain.parentId]) } : { id: domain.id }, id: activityId },\n      relations: ['assigneeRole', 'supervisoryRole']\n    }))\n\n  if (!activity) {\n    throw new Error(\n      context.t('error.activity not found', {\n        activity: activityId\n      })\n    )\n  }\n\n  if (!origin) {\n    activityInstance.name = name || activity.name\n    activityInstance.description = description || activity.description\n    activityInstance.activityType = activityType || activity.activityType\n    activityInstance.uiType = uiType || activity.uiType\n    activityInstance.uiSource = uiSource || activity.uiSource\n    activityInstance.viewType = viewType || activity.viewType\n    activityInstance.viewSource = viewSource || activity.viewSource\n    activityInstance.assigneeRole = assigneeRole || activity.assigneeRole\n    activityInstance.supervisoryRole = supervisoryRole || activity.supervisoryRole\n    activityInstance.priority = priority ?? activity.priority\n\n    activityInstance.adhocType = 'standard'\n    activityInstance.refBy = activityId\n\n    if (!assignees || !approvalLine) {\n      if (!assignees) {\n        assignees = activityInstance.assignees = activity.assignees\n      }\n\n      if (!approvalLine) {\n        approvalLine = activityInstance.approvalLine = activity.approvalLine\n      }\n\n      if (!dueAt && activity.standardTime) {\n        activityInstance.dueAt = new Date(issuedAt.getTime() + activity.standardTime * 1000)\n      }\n    }\n  }\n\n  const activitySearchKeys = fillActivitySearchKeys(activity?.searchKeys, input)\n\n  if (activity.startingType == 'post') {\n    /* \n      startingType이 'post'이면, \n      activityInstance 이슈와 동시에 issuer에게 할당된 activityThread가 생성되고 submit까지 모두 완료되게 된다.\n      만일, 결재선이 있다면, 상신되게 된다.\n    */\n    const posted = await tx.getRepository(ActivityInstance).save({\n      version: 1,\n      creator: user,\n      ...origin,\n      ...activityInstance,\n      transaction: 'post',\n      activity,\n      ...activitySearchKeys,\n      state: ActivityInstanceStatus.Started,\n      domain,\n      issuer: user,\n      updater: user,\n      issuedAt,\n      startedAt: issuedAt\n    })\n\n    const thread = await createActivityThreadForUser('post', posted, user, context)\n\n    /* post 방식은 thread가 하나이므로, instance의 output을 그대로 thread의 output이라고 판단할 수 있다. 따라서, 아래 로직은 제거한다. */\n    // const data = { ...activityInstance.input, ...activityInstance.output }\n    // const output = (activity.model || [])\n    //   .filter(item => item.inout === 'inout' || item.inout === 'out')\n    //   .reduce((inout, item) => {\n    //     inout[item.tag] = data[item.tag]\n    //     return inout\n    //   }, {})\n\n    await submit({ id: thread.id, output: activityInstance.output }, context)\n\n    return await tx.getRepository(ActivityInstance).findOneBy({ id: posted.id })\n  } else {\n    const issued = await tx.getRepository(ActivityInstance).save({\n      version: 1,\n      creator: user,\n      ...origin,\n      ...activityInstance,\n      transaction: 'issue',\n      activity,\n      ...activitySearchKeys,\n      state: ActivityInstanceStatus.Issued,\n      domain,\n      issuer: user,\n      updater: user,\n      issuedAt\n    })\n\n    /*\n    1. 하나의 thread가 필요한 경우 (대부분)\n       조건 : activityInstance의 threadsMin이 1 이어야 한다.\n       로직 1 : getSystemUserFromOrgMemberItem 의 결과가 한명이라면 그대로 activityThread.assignee로 직접 할당한다.\n       로직 2 : getSystemUserFromOrgMemberItem 의 결과가 한명이 아니라면, assignee타입이 assigneeRole 인 경우에만 처리가 가능하다.\n               이 경우에는 assignee를 비운다. - createActivityThreadWithUnassigned\n    2. 할당되지 않은 복수개의 thread가 필요한 경우\n       조건 : threadsMin이 1 이상이어야 한다.\n       로직 1 : getSystemUserFromOrgMemberItem 의 결과와 threadsMin 값이 같다면, 그대로 activityThread.assignee로 직접 할당한다. createActivityThreadsForAllRoleUsers\n       로직 2 : createActivityThreadWithUnassigned\n    3. 모든 assignee가 처리를 해야하는 경우\n       조건 : threadsMin이 0 이어야 한다.\n       로직 : getSystemUserFromOrgMemberItem 의 결과로 createActivityThreadsForUsers\n    */\n\n    // assignees가 복수인 것은 아무 의미가 없다.\n    const assignedUsers = await Promise.all(\n      (assignees || []).map(assignee => getSystemUserFromOrgMemberItem(assignee, context))\n    )\n\n    if (assignedUsers.length == 0) {\n      if (issued.assigneeRoleId) {\n        if (issued.threadsMin === 0) {\n          /* assigneeRoleId에 해당하는 모든 assignee 에게 태스크를 할당하는 경우 */\n          await createActivityThreadsForAllRoleUsers('issue', issued, context)\n        } else {\n          /* minimum threads 설정에 따른 pending assignment 상태로 activityThread를 만드는 경우 */\n          await createActivityThreadWithUnassigned('issue', issued, context)\n        }\n      }\n    } else {\n      await createActivityThreadsForUsers('issue', issued, assignedUsers, context)\n    }\n\n    return await tx.getRepository(ActivityInstance).findOneBy({ id: issued.id })\n  }\n}\n"]}
+{"version":3,"file":"issue.js","sourceRoot":"","sources":["../../../server/controllers/activity-instance/issue.ts"],"names":[],"mappings":"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","sourcesContent":["import { In } from 'typeorm'\nimport { Activity } from '../../service/activity/activity.js'\nimport { ActivityInstance, ActivityInstanceStatus } from '../../service/activity-instance/activity-instance.js'\nimport { ActivityInstanceIssue } from '../../service/activity-instance/activity-instance-type.js'\nimport {\n  createActivityThreadWithUnassigned,\n  createActivityThreadsForAllRoleUsers,\n  createActivityThreadsForUsers,\n  getSystemUserFromOrgMemberItem,\n  createActivityThreadForUser,\n  fillActivitySearchKeys\n} from '../common.js'\nimport { submit } from '../activity-thread/submit.js'\nimport { expectationBroken, judgeApprovalExpectation } from './approval-expectation.js'\n\nexport async function issue(\n  activityInstance: ActivityInstanceIssue,\n  context: ResolverContext\n): Promise<ActivityInstance> {\n  const { domain, user, tx } = context.state\n  const issuedAt = new Date()\n  var {\n    id,\n    name,\n    description,\n    assignees,\n    uiType,\n    uiSource,\n    viewType,\n    viewSource,\n    dueAt,\n    priority,\n    approvalLine,\n    activityId,\n    activityType,\n    assigneeRole,\n    supervisoryRole,\n    input\n  } = activityInstance\n\n  var origin = id\n    ? await tx.getRepository(ActivityInstance).findOne({\n        where: { domain: { id: domain.id }, id },\n        relations: [\n          'domain',\n          'activity',\n          'assigneeRole',\n          'supervisoryRole',\n          'updater',\n          'creator',\n          'starter',\n          'terminator'\n        ]\n      })\n    : null\n\n  /* \n    Prerequisites for a Task to Be Issued.\n    - The previous state of the task should be Draft.\n  */\n  if (origin && origin.state !== ActivityInstanceStatus.Draft) {\n    throw new Error(\n      context.t(`error.activity-instance is already issued`, {\n        id: id,\n        state: origin.state\n      })\n    )\n  }\n\n  var repository = tx.getRepository(Activity)\n  var activity =\n    origin?.activity ||\n    (await repository.findOne({\n      where: { domain: domain.parentId ? { id: In([domain.id, domain.parentId]) } : { id: domain.id }, id: activityId },\n      relations: ['assigneeRole', 'supervisoryRole']\n    }))\n\n  if (!activity) {\n    throw new Error(\n      context.t('error.activity not found', {\n        activity: activityId\n      })\n    )\n  }\n\n  if (!origin) {\n    activityInstance.name = name || activity.name\n    activityInstance.description = description || activity.description\n    activityInstance.activityType = activityType || activity.activityType\n    activityInstance.uiType = uiType || activity.uiType\n    activityInstance.uiSource = uiSource || activity.uiSource\n    activityInstance.viewType = viewType || activity.viewType\n    activityInstance.viewSource = viewSource || activity.viewSource\n    activityInstance.assigneeRole = assigneeRole || activity.assigneeRole\n    activityInstance.supervisoryRole = supervisoryRole || activity.supervisoryRole\n    activityInstance.priority = priority ?? activity.priority\n\n    activityInstance.adhocType = 'standard'\n    activityInstance.refBy = activityId\n\n    /*\n     * 낸 쪽이 직접 주지 않았으면 액티비티의 선언을 따른다.\n     *\n     * 위의 `if (!assignees || !approvalLine)` 안에 두지 않는다 — 둘 다 준 건에서는 그 블록에 안 들어가고,\n     * 그러면 이 축만 조용히 빠진다.\n     */\n    if (activityInstance.rejectionIsFinal === undefined || activityInstance.rejectionIsFinal === null) {\n      activityInstance.rejectionIsFinal = activity.rejectionIsFinal ?? false\n    }\n\n    if (!assignees || !approvalLine) {\n      if (!assignees) {\n        assignees = activityInstance.assignees = activity.assignees\n      }\n\n      if (!approvalLine) {\n        approvalLine = activityInstance.approvalLine = activity.approvalLine\n      }\n\n      if (!dueAt && activity.standardTime) {\n        activityInstance.dueAt = new Date(issuedAt.getTime() + activity.standardTime * 1000)\n      }\n    }\n  }\n\n  /*\n   * **결재를 받겠다고 낸 건은 결재선이 있어야 한다.**\n   *\n   * 액티비티의 결재선을 물려받은 뒤에 본다 — 낸 쪽이 직접 주지 않아도 액티비티가 들고 있으면 그것이\n   * 이 건의 결재선이다. 물려받기 전에 보면 멀쩡한 건을 막는다.\n   *\n   * 초안을 다시 내는 경우 결재선은 원본이 들고 있으므로 그것까지 함께 본다.\n   *\n   * 판단은 `approval-expectation.ts` 가 든다 — 여기서 조건을 적으면 시험할 수 없다.\n   */\n  const expectation = judgeApprovalExpectation({\n    requireApproval: activityInstance.requireApproval,\n    approvalLine: activityInstance.approvalLine ?? origin?.approvalLine,\n    activityName: activity.name\n  })\n\n  if (expectationBroken(expectation)) {\n    throw new Error(\n      context.t('error.approval line is empty but approval was required', {\n        activity: expectation.activityName,\n        defaultValue:\n          `\"${expectation.activityName}\" 에 결재선이 없습니다. 이 건은 결재를 받기로 하고 낸 것이라 올리지 않습니다 — ` +\n          '그대로 두면 결재 없이 확정됩니다.'\n      })\n    )\n  }\n\n  const activitySearchKeys = fillActivitySearchKeys(activity?.searchKeys, input)\n\n  if (activity.startingType == 'post') {\n    /* \n      startingType이 'post'이면, \n      activityInstance 이슈와 동시에 issuer에게 할당된 activityThread가 생성되고 submit까지 모두 완료되게 된다.\n      만일, 결재선이 있다면, 상신되게 된다.\n    */\n    const posted = await tx.getRepository(ActivityInstance).save({\n      version: 1,\n      creator: user,\n      ...origin,\n      ...activityInstance,\n      transaction: 'post',\n      activity,\n      ...activitySearchKeys,\n      state: ActivityInstanceStatus.Started,\n      domain,\n      issuer: user,\n      updater: user,\n      issuedAt,\n      startedAt: issuedAt\n    })\n\n    const thread = await createActivityThreadForUser('post', posted, user, context)\n\n    /* post 방식은 thread가 하나이므로, instance의 output을 그대로 thread의 output이라고 판단할 수 있다. 따라서, 아래 로직은 제거한다. */\n    // const data = { ...activityInstance.input, ...activityInstance.output }\n    // const output = (activity.model || [])\n    //   .filter(item => item.inout === 'inout' || item.inout === 'out')\n    //   .reduce((inout, item) => {\n    //     inout[item.tag] = data[item.tag]\n    //     return inout\n    //   }, {})\n\n    await submit({ id: thread.id, output: activityInstance.output }, context)\n\n    return await tx.getRepository(ActivityInstance).findOneBy({ id: posted.id })\n  } else {\n    const issued = await tx.getRepository(ActivityInstance).save({\n      version: 1,\n      creator: user,\n      ...origin,\n      ...activityInstance,\n      transaction: 'issue',\n      activity,\n      ...activitySearchKeys,\n      state: ActivityInstanceStatus.Issued,\n      domain,\n      issuer: user,\n      updater: user,\n      issuedAt\n    })\n\n    /*\n    1. 하나의 thread가 필요한 경우 (대부분)\n       조건 : activityInstance의 threadsMin이 1 이어야 한다.\n       로직 1 : getSystemUserFromOrgMemberItem 의 결과가 한명이라면 그대로 activityThread.assignee로 직접 할당한다.\n       로직 2 : getSystemUserFromOrgMemberItem 의 결과가 한명이 아니라면, assignee타입이 assigneeRole 인 경우에만 처리가 가능하다.\n               이 경우에는 assignee를 비운다. - createActivityThreadWithUnassigned\n    2. 할당되지 않은 복수개의 thread가 필요한 경우\n       조건 : threadsMin이 1 이상이어야 한다.\n       로직 1 : getSystemUserFromOrgMemberItem 의 결과와 threadsMin 값이 같다면, 그대로 activityThread.assignee로 직접 할당한다. createActivityThreadsForAllRoleUsers\n       로직 2 : createActivityThreadWithUnassigned\n    3. 모든 assignee가 처리를 해야하는 경우\n       조건 : threadsMin이 0 이어야 한다.\n       로직 : getSystemUserFromOrgMemberItem 의 결과로 createActivityThreadsForUsers\n    */\n\n    // assignees가 복수인 것은 아무 의미가 없다.\n    const assignedUsers = await Promise.all(\n      (assignees || []).map(assignee => getSystemUserFromOrgMemberItem(assignee, context))\n    )\n\n    if (assignedUsers.length == 0) {\n      if (issued.assigneeRoleId) {\n        if (issued.threadsMin === 0) {\n          /* assigneeRoleId에 해당하는 모든 assignee 에게 태스크를 할당하는 경우 */\n          await createActivityThreadsForAllRoleUsers('issue', issued, context)\n        } else {\n          /* minimum threads 설정에 따른 pending assignment 상태로 activityThread를 만드는 경우 */\n          await createActivityThreadWithUnassigned('issue', issued, context)\n        }\n      }\n    } else {\n      await createActivityThreadsForUsers('issue', issued, assignedUsers, context)\n    }\n\n    return await tx.getRepository(ActivityInstance).findOneBy({ id: issued.id })\n  }\n}\n"]}

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

@@ -8,7 +8,8 @@ async function restart(id, output, reason, context) {
     const { domain, user, tx } = context.state;
     const repository = tx.getRepository(activity_thread_js_1.ActivityThread);
     const activityThread = await repository.findOne({
-        where: { domain: { id: domain.id }, id }
+        where: { domain: { id: domain.id }, id },
+        relations: ['activityInstance']
     });
     if (!activityThread) {
         throw new Error(context.t('error.activity-thread not found', {
@@ -27,6 +28,21 @@ async function restart(id, output, reason, context) {
             actual: activityThread.state
         }));
     }
+    /*
+     * **되돌릴 수 없는 판정은 되살리지 않는다.**
+     *
+     * 반려되는 순간 대상이 닫히는 업무가 있다 — 부적합 처분, 트윈 조치. 그런 건을 되살리면 다음 차수의
+     * 결재가 새로 서는데, 대상은 이미 닫혀 있어 **승인해도 아무 일이 일어나지 않는다.** 사람은 승인할
+     * 것이 있다고 보고, 오류도 안 난다.
+     *
+     * 다시 하려면 새로 낸다.
+     */
+    if (activityThread.activityInstance?.rejectionIsFinal) {
+        throw new Error(context.t('error.activity-thread rejection is final', {
+            id,
+            activityInstance: activityThread.activityInstanceId
+        }));
+    }
     if (output) {
         activityThread.output = output;
     }

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":";;AAIA,0BAsDC;AA1DD,yFAAuG;AACvG,4CAA0D;AAC1D,6DAAqD;AAE9C,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,mCAAc,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,CAAC;QACpB,MAAM,IAAI,KAAK,CACb,OAAO,CAAC,CAAC,CAAC,iCAAiC,EAAE;YAC3C,cAAc,EAAE,EAAE;SACnB,CAAC,CACH,CAAA;IACH,CAAC;IAED,MAAM,IAAA,mCAAc,EAAC,cAAc,EAAE,OAAO,CAAC,CAAA;IAE7C;;;MAGE;IACF,IAAI,cAAc,CAAC,KAAK,KAAK,yCAAoB,CAAC,QAAQ,EAAE,CAAC;QAC3D,MAAM,IAAI,KAAK,CACb,OAAO,CAAC,CAAC,CAAC,2CAA2C,EAAE;YACrD,EAAE;YACF,KAAK,EAAE,yCAAoB,CAAC,QAAQ;YACpC,MAAM,EAAE,cAAc,CAAC,KAAK;SAC7B,CAAC,CACH,CAAA;IACH,CAAC;IAED,IAAI,MAAM,EAAE,CAAC;QACX,cAAc,CAAC,MAAM,GAAG,MAAM,CAAA;IAChC,CAAC;IAED,MAAM,MAAM,GAAG,MAAM,EAAE,CAAC,aAAa,CAAC,mCAAc,CAAC,CAAC,IAAI,CAAC;QACzD,GAAG,cAAc;QACjB,MAAM;QACN,KAAK,EAAE,yCAAoB,CAAC,OAAO;QACnC,WAAW,EAAE,SAAS;QACtB,KAAK,EAAE,cAAc,CAAC,KAAK,GAAG,CAAC;QAC/B,OAAO,EAAE,IAAI;QACb,SAAS,EAAE,IAAI,IAAI,EAAE;KACtB,CAAC,CAAA;IAEF,MAAM,IAAA,uCAA2B,EAAC,cAAc,CAAC,kBAAkB,EAAE,EAAE,QAAQ,EAAE,CAAC,MAAM,CAAC,EAAE,EAAE,OAAO,CAAC,CAAA;IAErG,OAAO,MAAM,CAAA;AACf,CAAC","sourcesContent":["import { ActivityThread, ActivityThreadStatus } from '../../service/activity-thread/activity-thread.js'\nimport { updateActivityInstanceState } from '../common.js'\nimport { checkAuthority } from './check-authority.js'\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  await checkAuthority(activityThread, context)\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"]}
+{"version":3,"file":"restart.js","sourceRoot":"","sources":["../../../server/controllers/activity-thread/restart.ts"],"names":[],"mappings":";;AAIA,0BAyEC;AA7ED,yFAAuG;AACvG,4CAA0D;AAC1D,6DAAqD;AAE9C,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,mCAAc,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;QACxC,SAAS,EAAE,CAAC,kBAAkB,CAAC;KAChC,CAAC,CAAA;IAEF,IAAI,CAAC,cAAc,EAAE,CAAC;QACpB,MAAM,IAAI,KAAK,CACb,OAAO,CAAC,CAAC,CAAC,iCAAiC,EAAE;YAC3C,cAAc,EAAE,EAAE;SACnB,CAAC,CACH,CAAA;IACH,CAAC;IAED,MAAM,IAAA,mCAAc,EAAC,cAAc,EAAE,OAAO,CAAC,CAAA;IAE7C;;;MAGE;IACF,IAAI,cAAc,CAAC,KAAK,KAAK,yCAAoB,CAAC,QAAQ,EAAE,CAAC;QAC3D,MAAM,IAAI,KAAK,CACb,OAAO,CAAC,CAAC,CAAC,2CAA2C,EAAE;YACrD,EAAE;YACF,KAAK,EAAE,yCAAoB,CAAC,QAAQ;YACpC,MAAM,EAAE,cAAc,CAAC,KAAK;SAC7B,CAAC,CACH,CAAA;IACH,CAAC;IAED;;;;;;;;OAQG;IACH,IAAI,cAAc,CAAC,gBAAgB,EAAE,gBAAgB,EAAE,CAAC;QACtD,MAAM,IAAI,KAAK,CACb,OAAO,CAAC,CAAC,CAAC,0CAA0C,EAAE;YACpD,EAAE;YACF,gBAAgB,EAAE,cAAc,CAAC,kBAAkB;SACpD,CAAC,CACH,CAAA;IACH,CAAC;IAED,IAAI,MAAM,EAAE,CAAC;QACX,cAAc,CAAC,MAAM,GAAG,MAAM,CAAA;IAChC,CAAC;IAED,MAAM,MAAM,GAAG,MAAM,EAAE,CAAC,aAAa,CAAC,mCAAc,CAAC,CAAC,IAAI,CAAC;QACzD,GAAG,cAAc;QACjB,MAAM;QACN,KAAK,EAAE,yCAAoB,CAAC,OAAO;QACnC,WAAW,EAAE,SAAS;QACtB,KAAK,EAAE,cAAc,CAAC,KAAK,GAAG,CAAC;QAC/B,OAAO,EAAE,IAAI;QACb,SAAS,EAAE,IAAI,IAAI,EAAE;KACtB,CAAC,CAAA;IAEF,MAAM,IAAA,uCAA2B,EAAC,cAAc,CAAC,kBAAkB,EAAE,EAAE,QAAQ,EAAE,CAAC,MAAM,CAAC,EAAE,EAAE,OAAO,CAAC,CAAA;IAErG,OAAO,MAAM,CAAA;AACf,CAAC","sourcesContent":["import { ActivityThread, ActivityThreadStatus } from '../../service/activity-thread/activity-thread.js'\nimport { updateActivityInstanceState } from '../common.js'\nimport { checkAuthority } from './check-authority.js'\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    relations: ['activityInstance']\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  await checkAuthority(activityThread, context)\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  /*\n   * **되돌릴 수 없는 판정은 되살리지 않는다.**\n   *\n   * 반려되는 순간 대상이 닫히는 업무가 있다 — 부적합 처분, 트윈 조치. 그런 건을 되살리면 다음 차수의\n   * 결재가 새로 서는데, 대상은 이미 닫혀 있어 **승인해도 아무 일이 일어나지 않는다.** 사람은 승인할\n   * 것이 있다고 보고, 오류도 안 난다.\n   *\n   * 다시 하려면 새로 낸다.\n   */\n  if (activityThread.activityInstance?.rejectionIsFinal) {\n    throw new Error(\n      context.t('error.activity-thread rejection is final', {\n        id,\n        activityInstance: activityThread.activityInstanceId\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/submit.js

@@ -1,12 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.submit = submit;
-const organization_1 = require("@things-factory/organization");
-const auth_base_1 = require("@things-factory/auth-base");
 const activity_thread_js_1 = require("../../service/activity-thread/activity-thread.js");
-const activity_approval_js_1 = require("../../service/activity-approval/activity-approval.js");
 const common_js_1 = require("../common.js");
 const check_authority_js_1 = require("./check-authority.js");
+const approval_line_js_1 = require("../activity-approval/approval-line.js");
+const create_approval_js_1 = require("../activity-approval/create-approval.js");
 async function submit({ id, output, reason }, context) {
     const { domain, user, tx } = context.state;
     // TODO - output값 체크해서 필수필드, validation 을 만족하지 못하면, Error를 던진다.
@@ -37,47 +36,28 @@ async function submit({ id, output, reason }, context) {
     if (!activityThread.startedAt) {
         activityThread.startedAt = new Date();
     }
+    if (!activityThread.activityInstance) {
+        /* 없는 채로 아래를 읽으면 `TypeError` 가 나고, 그 오류로는 무엇이 없는지 알 수 없다. */
+        throw new Error(context.t('error.activity-instance not found', { activityThread: activityThread.id }));
+    }
     const approvalLine = activityThread.activityInstance.approvalLine;
-    if (approvalLine && approvalLine.length > 0) {
-        if (approvalLine[0].type == organization_1.OrgMemberTargetType.Role) {
-            const approverRoleId = approvalLine[0].value || approvalLine[0].approver?.id;
-            if (!approverRoleId) {
-                throw 'Cannot specify the approver role for this approval line';
-            }
-            const approverRole = await tx.getRepository(auth_base_1.Role).findOneBy({
-                id: approverRoleId
-            });
-            if (!approverRole) {
-                throw 'Cannot find the approver role for this approval line';
-            }
-            await tx.getRepository(activity_approval_js_1.ActivityApproval).save({
-                domain,
-                activityThread,
-                round: activityThread.round,
-                order: 1,
-                judgment: activity_approval_js_1.ActivityApprovalJudgment.Pending,
-                transaction: 'submit',
-                approverRole: approverRole,
-                creator: user,
-                updater: user
-            });
-        }
-        else {
-            var approverUser = await (0, common_js_1.getSystemUserFromOrgMemberItem)(approvalLine[0], context);
-            if (!approverUser) {
-                throw 'Cannot specify the approval user for this approval line';
-            }
-            await tx.getRepository(activity_approval_js_1.ActivityApproval).save({
-                domain,
-                activityThread,
-                round: activityThread.round,
-                order: 1,
-                judgment: activity_approval_js_1.ActivityApprovalJudgment.Pending,
-                transaction: 'submit',
-                approver: approverUser,
-                creator: user,
-                updater: user
-            });
+    /*
+     * 첫 **결재자**가 어느 줄인지는 한 자리가 정한다(§`approval-line.ts`). 앞에 참조가 있으면 건너뛴다 —
+     * 참조는 결재 차례를 소비하지 않는다.
+     */
+    const firstOrder = (0, approval_line_js_1.firstApprovalOrder)(approvalLine);
+    const first = firstOrder === undefined ? undefined : (0, approval_line_js_1.lineItemFor)(approvalLine, firstOrder);
+    if (first) {
+        await (0, create_approval_js_1.createApproval)({ item: first, order: firstOrder, participation: 'approval', activityThread, transaction: 'submit' }, context);
+        /*
+         * **상신 즉시 알릴 참조들.** `notifyAfter` 를 안 적은 참조가 여기 온다 — 가장 일찍 알리는 것이
+         * 안 정한 사람에게 안전하다(의견을 낼 기회가 가장 많다).
+         *
+         * 못 만든 참조가 있어도 상신을 물리지 않는다 — 참조는 막지 않는 자격이다.
+         */
+        const refs = await (0, create_approval_js_1.createReferences)({ references: (0, approval_line_js_1.referencesToNotify)(approvalLine, 0), activityThread }, context);
+        for (const f of refs.failed) {
+            console.warn(`[worklist] 참조자를 세우지 못했다 (결재선 ${f.order}번째) — ${f.reason}`);
         }
         activityThread = await repository.save({
             ...activityThread,

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

@@ -1 +1 @@
-{"version":3,"file":"submit.js","sourceRoot":"","sources":["../../../server/controllers/activity-thread/submit.ts"],"names":[],"mappings":"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","sourcesContent":["import { ApprovalLineItem, OrgMemberTargetType } from '@things-factory/organization'\nimport { Role } from '@things-factory/auth-base'\nimport { ActivityThread, ActivityThreadStatus } from '../../service/activity-thread/activity-thread.js'\nimport { ActivityApproval, ActivityApprovalJudgment } from '../../service/activity-approval/activity-approval.js'\nimport { getSystemUserFromOrgMemberItem, updateActivityInstanceState } from '../common.js'\nimport { checkAuthority } from './check-authority.js'\n\nexport async function submit(\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  // TODO - output값 체크해서 필수필드, validation 을 만족하지 못하면, Error를 던진다.\n  // 필수 필드가 빈 값인 경우나, validation 이 있는 경우에 체크하여 false가 되는 경우.\n\n  const repository = tx.getRepository(ActivityThread)\n\n  var activityThread = await repository.findOne({\n    where: { domain: { id: domain.id }, id },\n    relations: ['activityInstance']\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  await checkAuthority(activityThread, context)\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 && activityThread.state !== ActivityThreadStatus.Started) {\n    throw new Error(\n      context.t(`error.activity-thread should not be submitted`, {\n        id,\n        actual: activityThread.state\n      })\n    )\n  }\n\n  // TODO 만약 activityInstance의 threadsMin 갯수를 아직 채우지 못했다면, 새로운 activityThread를 만들어서 처리하도록 한다.\n  // (다른 사용자들이 threadsMin 개수만큼의 activityThread를 채울 수 있는 기회를 제공하기 위해서)\n\n  if (!activityThread.startedAt) {\n    activityThread.startedAt = new Date()\n  }\n\n  const approvalLine: ApprovalLineItem[] = activityThread.activityInstance.approvalLine\n\n  if (approvalLine && approvalLine.length > 0) {\n    if (approvalLine[0].type == OrgMemberTargetType.Role) {\n      const approverRoleId = approvalLine[0].value || approvalLine[0].approver?.id\n\n      if (!approverRoleId) {\n        throw 'Cannot specify the approver role for this approval line'\n      }\n\n      const approverRole = await tx.getRepository(Role).findOneBy({\n        id: approverRoleId\n      })\n\n      if (!approverRole) {\n        throw 'Cannot find the approver role for this approval line'\n      }\n\n      await tx.getRepository(ActivityApproval).save({\n        domain,\n        activityThread,\n        round: activityThread.round,\n        order: 1,\n        judgment: ActivityApprovalJudgment.Pending,\n        transaction: 'submit',\n        approverRole: approverRole,\n        creator: user,\n        updater: user\n      })\n    } else {\n      var approverUser = await getSystemUserFromOrgMemberItem(approvalLine[0], 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        round: activityThread.round,\n        order: 1,\n        judgment: ActivityApprovalJudgment.Pending,\n        transaction: 'submit',\n        approver: approverUser,\n        creator: user,\n        updater: user\n      })\n    }\n\n    activityThread = await repository.save({\n      ...activityThread,\n      reason,\n      output,\n      transaction: 'submit',\n      state: ActivityThreadStatus.Submitted,\n      updater: user\n    })\n  } else {\n    activityThread = await repository.save({\n      ...activityThread,\n      reason,\n      output,\n      transaction: 'end',\n      state: ActivityThreadStatus.Ended,\n      updater: user,\n      terminator: user,\n      terminatedAt: new Date()\n    })\n  }\n\n  await updateActivityInstanceState(activityThread.activityInstanceId, { causedBy: [activityThread] }, context)\n\n  return activityThread\n}\n"]}
+{"version":3,"file":"submit.js","sourceRoot":"","sources":["../../../server/controllers/activity-thread/submit.ts"],"names":[],"mappings":"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","sourcesContent":["import { ApprovalLineItem } from '@things-factory/organization'\nimport { ActivityThread, ActivityThreadStatus } from '../../service/activity-thread/activity-thread.js'\nimport { updateActivityInstanceState } from '../common.js'\nimport { checkAuthority } from './check-authority.js'\nimport { firstApprovalOrder, lineItemFor, referencesToNotify } from '../activity-approval/approval-line.js'\nimport { createApproval, createReferences } from '../activity-approval/create-approval.js'\n\nexport async function submit(\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  // TODO - output값 체크해서 필수필드, validation 을 만족하지 못하면, Error를 던진다.\n  // 필수 필드가 빈 값인 경우나, validation 이 있는 경우에 체크하여 false가 되는 경우.\n\n  const repository = tx.getRepository(ActivityThread)\n\n  var activityThread = await repository.findOne({\n    where: { domain: { id: domain.id }, id },\n    relations: ['activityInstance']\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  await checkAuthority(activityThread, context)\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 && activityThread.state !== ActivityThreadStatus.Started) {\n    throw new Error(\n      context.t(`error.activity-thread should not be submitted`, {\n        id,\n        actual: activityThread.state\n      })\n    )\n  }\n\n  // TODO 만약 activityInstance의 threadsMin 갯수를 아직 채우지 못했다면, 새로운 activityThread를 만들어서 처리하도록 한다.\n  // (다른 사용자들이 threadsMin 개수만큼의 activityThread를 채울 수 있는 기회를 제공하기 위해서)\n\n  if (!activityThread.startedAt) {\n    activityThread.startedAt = new Date()\n  }\n\n  if (!activityThread.activityInstance) {\n    /* 없는 채로 아래를 읽으면 `TypeError` 가 나고, 그 오류로는 무엇이 없는지 알 수 없다. */\n    throw new Error(context.t('error.activity-instance not found', { activityThread: activityThread.id }))\n  }\n\n  const approvalLine: ApprovalLineItem[] = activityThread.activityInstance.approvalLine\n\n  /*\n   * 첫 **결재자**가 어느 줄인지는 한 자리가 정한다(§`approval-line.ts`). 앞에 참조가 있으면 건너뛴다 —\n   * 참조는 결재 차례를 소비하지 않는다.\n   */\n  const firstOrder = firstApprovalOrder(approvalLine)\n  const first = firstOrder === undefined ? undefined : lineItemFor(approvalLine, firstOrder)\n\n  if (first) {\n    await createApproval(\n      { item: first, order: firstOrder!, participation: 'approval', activityThread, transaction: 'submit' },\n      context\n    )\n\n    /*\n     * **상신 즉시 알릴 참조들.** `notifyAfter` 를 안 적은 참조가 여기 온다 — 가장 일찍 알리는 것이\n     * 안 정한 사람에게 안전하다(의견을 낼 기회가 가장 많다).\n     *\n     * 못 만든 참조가 있어도 상신을 물리지 않는다 — 참조는 막지 않는 자격이다.\n     */\n    const refs = await createReferences(\n      { references: referencesToNotify(approvalLine, 0), activityThread },\n      context\n    )\n    for (const f of refs.failed) {\n      console.warn(`[worklist] 참조자를 세우지 못했다 (결재선 ${f.order}번째) — ${f.reason}`)\n    }\n\n    activityThread = await repository.save({\n      ...activityThread,\n      reason,\n      output,\n      transaction: 'submit',\n      state: ActivityThreadStatus.Submitted,\n      updater: user\n    })\n  } else {\n    activityThread = await repository.save({\n      ...activityThread,\n      reason,\n      output,\n      transaction: 'end',\n      state: ActivityThreadStatus.Ended,\n      updater: user,\n      terminator: user,\n      terminatedAt: new Date()\n    })\n  }\n\n  await updateActivityInstanceState(activityThread.activityInstanceId, { causedBy: [activityThread] }, context)\n\n  return activityThread\n}\n"]}

package/dist-server/controllers/common.js

@@ -15,6 +15,7 @@ const organization_1 = require("@things-factory/organization");
 const activity_js_1 = require("../service/activity/activity.js");
 const activity_instance_js_1 = require("../service/activity-instance/activity-instance.js");
 const activity_thread_js_1 = require("../service/activity-thread/activity-thread.js");
+const activity_approval_js_1 = require("../service/activity-approval/activity-approval.js");
 const activity_installation_controller_js_1 = require("./activity-installation/activity-installation-controller.js");
 async function updateActivityInstanceState(id, { causedBy }, context) {
     const { tx } = context.state;
@@ -34,10 +35,55 @@ async function updateActivityInstanceState(id, { causedBy }, context) {
     });
     activityInstance.transaction = 'thread'; /* activity thread에 의해서 변경된 것임을 의미 */
     Object.assign(activityInstance, await evalActivityInstanceState(id, context));
+    /*
+     * **건이 끝나면 참조도 닫는다.**
+     *
+     * 참조는 결재하지 않으므로 승인·반려로 끝나지 않는다. 닫아 주지 않으면 그 행이 `Pending` 으로 남아
+     * 참조 목록에 영원히 나온다 — 오늘 결재자 쪽에서 고친 것과 같은 부류를, 참조를 넣으면서 새로 만들 뻔했다.
+     *
+     * 중단은 이미 닫힌다(§`activity-thread/_abort.ts` 가 대기 행을 `aborted` 로 닫는다). 여기서 닫는 것은
+     * **정상 종료**다.
+     */
+    if (activityInstance.state === activity_instance_js_1.ActivityInstanceStatus.Ended) {
+        await closePendingReferences(id, context);
+    }
     /* callback에서 업무적인 처리도 하고, activityInstance를 일부(주로 input) 수정할 수 있는 기회도 제공. */
     await activity_installation_controller_js_1.ActivityInstallations.callback(activityInstance.activity.name, activityInstance, causedBy, context);
     await tx.getRepository(activity_instance_js_1.ActivityInstance).save(activityInstance);
 }
+/**
+ * 이 건의 아직 안 닫힌 참조들을 닫는다 — **판정한 것이 아니라 건이 끝난 것이다.**
+ *
+ * 의견을 냈는지는 `comment` 가 말한다. 비어 있으면 「통지받았고 말하지 않았다」이고, **그것은 동의가
+ * 아니다** — 나중에 결재 이력을 읽는 사람이 침묵을 동의로 읽으면 안 된다.
+ *
+ * `terminator` 를 적지 않는다. 그 사람이 끝낸 것이 아니라 건이 끝난 것이다.
+ */
+async function closePendingReferences(instanceId, context) {
+    const { tx } = context.state;
+    const threads = await tx.getRepository(activity_thread_js_1.ActivityThread).find({
+        where: { activityInstance: { id: instanceId } }
+    });
+    if (!threads.length)
+        return;
+    const repo = tx.getRepository(activity_approval_js_1.ActivityApproval);
+    const open = await repo.find({
+        where: threads.map(t => ({
+            activityThread: { id: t.id },
+            participation: 'reference',
+            judgment: activity_approval_js_1.ActivityApprovalJudgment.Pending
+        }))
+    });
+    if (!open.length)
+        return;
+    const at = new Date();
+    await repo.save(open.map(row => ({
+        ...row,
+        judgment: activity_approval_js_1.ActivityApprovalJudgment.Closed,
+        transaction: 'close',
+        terminatedAt: at
+    })));
+}
 async function evalActivityInstanceState(id, context) {
     const { tx, user } = context.state;
     const activityInstance = await tx.getRepository(activity_instance_js_1.ActivityInstance).findOne({