@things-factory/work-shift 10.1.34 → 10.1.35

package/dist-server/service/work-shift/work-shift-mutation.js

@@ -3,37 +3,13 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.WorkShiftMutation = void 0;
 const tslib_1 = require("tslib");
 const type_graphql_1 = require("type-graphql");
-const typeorm_1 = require("typeorm");
+const shell_1 = require("@things-factory/shell");
+const work_shift_lifecycle_1 = require("./work-shift-lifecycle");
 const work_shift_1 = require("./work-shift");
 const work_shift_type_1 = require("./work-shift-type");
-const work_shift_revision_service_1 = require("./work-shift-revision-service");
-const work_shift_revision_1 = require("./work-shift-revision");
 let WorkShiftMutation = class WorkShiftMutation {
     async updateMultipleWorkShift(patches, context) {
-        const { domain, user, tx } = context.state;
-        let results = [];
-        const workShiftRepo = tx.getRepository(work_shift_1.WorkShift);
-        /*
-         * 지우기 **전에** 지금 편성을 남긴다.
-         *
-         * 이 저장은 그 도메인의 교대를 전부 지우고 다시 넣는다. 그래서 오탈자 하나를 고쳐도 이전 편성이
-         * 데이터베이스에서 없어졌고, 「6월의 주간은 몇 시부터였나」에 답할 방법이 없었다.
-         *
-         * 지운 뒤에 남기려 하면 남길 것이 없다. 순서가 이 한 줄의 전부다.
-         */
-        await (0, work_shift_revision_service_1.recordRevision)(tx, domain, (0, work_shift_revision_service_1.shiftSetOf)(patches), user);
-        await workShiftRepo.delete({ domain: { id: domain.id } });
-        for (let i = 0; i < patches.length; i++) {
-            const patch = patches[i];
-            const result = await workShiftRepo.save({
-                ...patch,
-                domain,
-                creator: user,
-                updater: user
-            });
-            results.push({ ...result, cuFlag: '+' });
-        }
-        return results;
+        throw new work_shift_lifecycle_1.WorkShiftRefusal('REVISION_REQUIRED');
     }
     /**
      * 앞으로 쓸 편성을 미리 적어 둔다 — 「다음 달 1일부터 3교대」.
@@ -42,24 +18,14 @@ let WorkShiftMutation = class WorkShiftMutation {
      * 편성은 제 시각에 바뀐다.
      */
     async announceWorkShift(effectiveFrom, patches, context) {
-        const { domain, user, tx } = context.state;
-        return await (0, work_shift_revision_service_1.announceShiftSet)(tx, domain, effectiveFrom, (0, work_shift_revision_service_1.shiftSetOf)(patches), user);
+        throw new work_shift_lifecycle_1.WorkShiftRefusal('REVISION_REQUIRED');
     }
     /** 예고를 물린다. 아직 시작하지 않은 것만 물릴 수 있다. */
     async cancelWorkShiftAnnouncement(id, context) {
-        const { domain, tx } = context.state;
-        return await (0, work_shift_revision_service_1.cancelAnnouncement)(tx, domain, id);
+        throw new work_shift_lifecycle_1.WorkShiftRefusal('REVISION_REQUIRED');
     }
     async deleteWorkShifts(ids, context) {
-        const { domain, tx, user } = context.state;
-        /* 지우는 것도 편성이 바뀌는 것이다. 이 길로 지우면 이력이 안 남던 구멍이 있었다. */
-        const remaining = (await tx.getRepository(work_shift_1.WorkShift).find({ where: { domain: { id: domain.id } } })).filter(shift => !ids.includes(shift.id));
-        await (0, work_shift_revision_service_1.recordRevision)(tx, domain, (0, work_shift_revision_service_1.shiftSetOf)(remaining), user);
-        await tx.getRepository(work_shift_1.WorkShift).delete({
-            domain: { id: domain.id },
-            id: (0, typeorm_1.In)(ids)
-        });
-        return true;
+        throw new work_shift_lifecycle_1.WorkShiftRefusal('REVISION_REQUIRED');
     }
 };
 exports.WorkShiftMutation = WorkShiftMutation;
@@ -76,7 +42,7 @@ tslib_1.__decorate([
 tslib_1.__decorate([
     (0, type_graphql_1.Directive)('@privilege(category: "work-shift", privilege: "mutation", domainOwnerGranted: true)'),
     (0, type_graphql_1.Directive)('@transaction'),
-    (0, type_graphql_1.Mutation)(returns => work_shift_revision_1.WorkShiftRevision, { description: 'To announce a work shift arrangement that starts later' }),
+    (0, type_graphql_1.Mutation)(returns => shell_1.ScalarObject, { description: 'To announce a work shift arrangement that starts later' }),
     tslib_1.__param(0, (0, type_graphql_1.Arg)('effectiveFrom')),
     tslib_1.__param(1, (0, type_graphql_1.Arg)('patches', type => [work_shift_type_1.WorkShiftPatch])),
     tslib_1.__param(2, (0, type_graphql_1.Ctx)()),
@@ -105,6 +71,7 @@ tslib_1.__decorate([
     tslib_1.__metadata("design:returntype", Promise)
 ], WorkShiftMutation.prototype, "deleteWorkShifts", null);
 exports.WorkShiftMutation = WorkShiftMutation = tslib_1.__decorate([
-    (0, type_graphql_1.Resolver)(work_shift_1.WorkShift)
+    (0, type_graphql_1.Resolver)(work_shift_1.WorkShift),
+    (0, type_graphql_1.UseMiddleware)(shell_1.SpeakRefusals)
 ], WorkShiftMutation);
 //# sourceMappingURL=work-shift-mutation.js.map

package/dist-server/service/work-shift/work-shift-mutation.js.map

@@ -1 +1 @@
-{"version":3,"file":"work-shift-mutation.js","sourceRoot":"","sources":["../../../server/service/work-shift/work-shift-mutation.ts"],"names":[],"mappings":"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","sourcesContent":["import { Arg, Ctx, Directive, Mutation, Resolver } from 'type-graphql'\nimport { In } from 'typeorm'\n\nimport { WorkShift } from './work-shift'\nimport { WorkShiftPatch } from './work-shift-type'\nimport {\n  announceShiftSet,\n  cancelAnnouncement,\n  recordRevision,\n  shiftSetOf\n} from './work-shift-revision-service'\nimport { WorkShiftRevision } from './work-shift-revision'\n\n@Resolver(WorkShift)\nexport class WorkShiftMutation {\n  @Directive('@privilege(category: \"work-shift\", privilege: \"mutation\", domainOwnerGranted: true)')\n  @Directive('@transaction')\n  @Mutation(returns => [WorkShift], { description: \"To modify multiple WorkShifts' information\" })\n  async updateMultipleWorkShift(\n    @Arg('patches', type => [WorkShiftPatch]) patches: WorkShiftPatch[],\n    @Ctx() context: ResolverContext\n  ): Promise<WorkShift[]> {\n    const { domain, user, tx } = context.state\n\n    let results = []\n    const workShiftRepo = tx.getRepository(WorkShift)\n\n    /*\n     * 지우기 **전에** 지금 편성을 남긴다.\n     *\n     * 이 저장은 그 도메인의 교대를 전부 지우고 다시 넣는다. 그래서 오탈자 하나를 고쳐도 이전 편성이\n     * 데이터베이스에서 없어졌고, 「6월의 주간은 몇 시부터였나」에 답할 방법이 없었다.\n     *\n     * 지운 뒤에 남기려 하면 남길 것이 없다. 순서가 이 한 줄의 전부다.\n     */\n    await recordRevision(tx, domain, shiftSetOf(patches as unknown as WorkShift[]), user)\n\n    await workShiftRepo.delete({ domain: { id: domain.id } })\n\n    for (let i = 0; i < patches.length; i++) {\n      const patch = patches[i]\n\n      const result = await workShiftRepo.save({\n        ...patch,\n        domain,\n        creator: user,\n        updater: user\n      })\n\n      results.push({ ...result, cuFlag: '+' })\n    }\n\n    return results\n  }\n\n  /**\n   * 앞으로 쓸 편성을 미리 적어 둔다 — 「다음 달 1일부터 3교대」.\n   *\n   * 그날이 오면 **저절로** 그 편성이 답이 된다. 옮기는 일감이 없으므로 그날 서버가 내려가 있어도\n   * 편성은 제 시각에 바뀐다.\n   */\n  @Directive('@privilege(category: \"work-shift\", privilege: \"mutation\", domainOwnerGranted: true)')\n  @Directive('@transaction')\n  @Mutation(returns => WorkShiftRevision, { description: 'To announce a work shift arrangement that starts later' })\n  async announceWorkShift(\n    @Arg('effectiveFrom') effectiveFrom: Date,\n    @Arg('patches', type => [WorkShiftPatch]) patches: WorkShiftPatch[],\n    @Ctx() context: ResolverContext\n  ): Promise<WorkShiftRevision> {\n    const { domain, user, tx } = context.state\n\n    return await announceShiftSet(tx, domain, effectiveFrom, shiftSetOf(patches as unknown as WorkShift[]), user)\n  }\n\n  /** 예고를 물린다. 아직 시작하지 않은 것만 물릴 수 있다. */\n  @Directive('@privilege(category: \"work-shift\", privilege: \"mutation\", domainOwnerGranted: true)')\n  @Directive('@transaction')\n  @Mutation(returns => Boolean, { description: 'To cancel an announced work shift arrangement' })\n  async cancelWorkShiftAnnouncement(\n    @Arg('id') id: string,\n    @Ctx() context: ResolverContext\n  ): Promise<boolean> {\n    const { domain, tx } = context.state\n\n    return await cancelAnnouncement(tx, domain, id)\n  }\n\n  @Directive('@privilege(category: \"work-shift\", privilege: \"mutation\", domainOwnerGranted: true)')\n  @Directive('@transaction')\n  @Mutation(returns => Boolean, { description: 'To delete multiple workShifts' })\n  async deleteWorkShifts(\n    @Arg('ids', type => [String]) ids: string[],\n    @Ctx() context: ResolverContext\n  ): Promise<boolean> {\n    const { domain, tx, user } = context.state\n\n    /* 지우는 것도 편성이 바뀌는 것이다. 이 길로 지우면 이력이 안 남던 구멍이 있었다. */\n    const remaining = (await tx.getRepository(WorkShift).find({ where: { domain: { id: domain.id } } })).filter(\n      shift => !ids.includes(shift.id)\n    )\n\n    await recordRevision(tx, domain, shiftSetOf(remaining), user)\n\n    await tx.getRepository(WorkShift).delete({\n      domain: { id: domain.id },\n      id: In(ids)\n    })\n\n    return true\n  }\n}\n"]}
+{"version":3,"file":"work-shift-mutation.js","sourceRoot":"","sources":["../../../server/service/work-shift/work-shift-mutation.ts"],"names":[],"mappings":";;;;AAAA,+CAAqF;AACrF,iDAAmE;AACnE,iEAAyD;AAEzD,6CAAwC;AACxC,uDAAkD;AAW3C,IAAM,iBAAiB,GAAvB,MAAM,iBAAiB;IAItB,AAAN,KAAK,CAAC,uBAAuB,CACe,OAAyB,EAC5D,OAAwB;QAE/B,MAAM,IAAI,uCAAgB,CAAC,mBAAmB,CAAC,CAAA;IACjD,CAAC;IAED;;;;;OAKG;IAIG,AAAN,KAAK,CAAC,iBAAiB,CACC,aAAmB,EACC,OAAyB,EAC5D,OAAwB;QAE/B,MAAM,IAAI,uCAAgB,CAAC,mBAAmB,CAAC,CAAA;IACjD,CAAC;IAED,sCAAsC;IAIhC,AAAN,KAAK,CAAC,2BAA2B,CACpB,EAAU,EACd,OAAwB;QAE/B,MAAM,IAAI,uCAAgB,CAAC,mBAAmB,CAAC,CAAA;IACjD,CAAC;IAKK,AAAN,KAAK,CAAC,gBAAgB,CACU,GAAa,EACpC,OAAwB;QAE/B,MAAM,IAAI,uCAAgB,CAAC,mBAAmB,CAAC,CAAA;IACjD,CAAC;CACF,CAAA;AAhDY,8CAAiB;AAItB;IAHL,IAAA,wBAAS,EAAC,qFAAqF,CAAC;IAChG,IAAA,wBAAS,EAAC,cAAc,CAAC;IACzB,IAAA,uBAAQ,EAAC,OAAO,CAAC,EAAE,CAAC,CAAC,sBAAS,CAAC,EAAE,EAAE,WAAW,EAAE,4CAA4C,EAAE,CAAC;IAE7F,mBAAA,IAAA,kBAAG,EAAC,SAAS,EAAE,IAAI,CAAC,EAAE,CAAC,CAAC,gCAAc,CAAC,CAAC,CAAA;IACxC,mBAAA,IAAA,kBAAG,GAAE,CAAA;;;;gEAGP;AAWK;IAHL,IAAA,wBAAS,EAAC,qFAAqF,CAAC;IAChG,IAAA,wBAAS,EAAC,cAAc,CAAC;IACzB,IAAA,uBAAQ,EAAC,OAAO,CAAC,EAAE,CAAC,oBAAY,EAAE,EAAE,WAAW,EAAE,wDAAwD,EAAE,CAAC;IAE1G,mBAAA,IAAA,kBAAG,EAAC,eAAe,CAAC,CAAA;IACpB,mBAAA,IAAA,kBAAG,EAAC,SAAS,EAAE,IAAI,CAAC,EAAE,CAAC,CAAC,gCAAc,CAAC,CAAC,CAAA;IACxC,mBAAA,IAAA,kBAAG,GAAE,CAAA;;6CAF+B,IAAI;;0DAK1C;AAMK;IAHL,IAAA,wBAAS,EAAC,qFAAqF,CAAC;IAChG,IAAA,wBAAS,EAAC,cAAc,CAAC;IACzB,IAAA,uBAAQ,EAAC,OAAO,CAAC,EAAE,CAAC,OAAO,EAAE,EAAE,WAAW,EAAE,+CAA+C,EAAE,CAAC;IAE5F,mBAAA,IAAA,kBAAG,EAAC,IAAI,CAAC,CAAA;IACT,mBAAA,IAAA,kBAAG,GAAE,CAAA;;;;oEAGP;AAKK;IAHL,IAAA,wBAAS,EAAC,qFAAqF,CAAC;IAChG,IAAA,wBAAS,EAAC,cAAc,CAAC;IACzB,IAAA,uBAAQ,EAAC,OAAO,CAAC,EAAE,CAAC,OAAO,EAAE,EAAE,WAAW,EAAE,+BAA+B,EAAE,CAAC;IAE5E,mBAAA,IAAA,kBAAG,EAAC,KAAK,EAAE,IAAI,CAAC,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,CAAA;IAC5B,mBAAA,IAAA,kBAAG,GAAE,CAAA;;;;yDAGP;4BA/CU,iBAAiB;IAF7B,IAAA,uBAAQ,EAAC,sBAAS,CAAC;IACnB,IAAA,4BAAa,EAAC,qBAAa,CAAC;GAChB,iBAAiB,CAgD7B","sourcesContent":["import { Arg, Ctx, Directive, Mutation, Resolver, UseMiddleware } from 'type-graphql'\nimport { ScalarObject, SpeakRefusals } from '@things-factory/shell'\nimport { WorkShiftRefusal } from './work-shift-lifecycle'\n\nimport { WorkShift } from './work-shift'\nimport { WorkShiftPatch } from './work-shift-type'\nimport {\n  announceShiftSet,\n  cancelAnnouncement,\n  recordRevision,\n  shiftSetOf\n} from './work-shift-revision-service'\nimport { WorkShiftRevision } from './work-shift-revision'\n\n@Resolver(WorkShift)\n@UseMiddleware(SpeakRefusals)\nexport class WorkShiftMutation {\n  @Directive('@privilege(category: \"work-shift\", privilege: \"mutation\", domainOwnerGranted: true)')\n  @Directive('@transaction')\n  @Mutation(returns => [WorkShift], { description: \"To modify multiple WorkShifts' information\" })\n  async updateMultipleWorkShift(\n    @Arg('patches', type => [WorkShiftPatch]) patches: WorkShiftPatch[],\n    @Ctx() context: ResolverContext\n  ): Promise<WorkShift[]> {\n    throw new WorkShiftRefusal('REVISION_REQUIRED')\n  }\n\n  /**\n   * 앞으로 쓸 편성을 미리 적어 둔다 — 「다음 달 1일부터 3교대」.\n   *\n   * 그날이 오면 **저절로** 그 편성이 답이 된다. 옮기는 일감이 없으므로 그날 서버가 내려가 있어도\n   * 편성은 제 시각에 바뀐다.\n   */\n  @Directive('@privilege(category: \"work-shift\", privilege: \"mutation\", domainOwnerGranted: true)')\n  @Directive('@transaction')\n  @Mutation(returns => ScalarObject, { description: 'To announce a work shift arrangement that starts later' })\n  async announceWorkShift(\n    @Arg('effectiveFrom') effectiveFrom: Date,\n    @Arg('patches', type => [WorkShiftPatch]) patches: WorkShiftPatch[],\n    @Ctx() context: ResolverContext\n  ): Promise<WorkShiftRevision> {\n    throw new WorkShiftRefusal('REVISION_REQUIRED')\n  }\n\n  /** 예고를 물린다. 아직 시작하지 않은 것만 물릴 수 있다. */\n  @Directive('@privilege(category: \"work-shift\", privilege: \"mutation\", domainOwnerGranted: true)')\n  @Directive('@transaction')\n  @Mutation(returns => Boolean, { description: 'To cancel an announced work shift arrangement' })\n  async cancelWorkShiftAnnouncement(\n    @Arg('id') id: string,\n    @Ctx() context: ResolverContext\n  ): Promise<boolean> {\n    throw new WorkShiftRefusal('REVISION_REQUIRED')\n  }\n\n  @Directive('@privilege(category: \"work-shift\", privilege: \"mutation\", domainOwnerGranted: true)')\n  @Directive('@transaction')\n  @Mutation(returns => Boolean, { description: 'To delete multiple workShifts' })\n  async deleteWorkShifts(\n    @Arg('ids', type => [String]) ids: string[],\n    @Ctx() context: ResolverContext\n  ): Promise<boolean> {\n    throw new WorkShiftRefusal('REVISION_REQUIRED')\n  }\n}\n"]}

package/dist-server/service/work-shift/work-shift-query.js

@@ -7,6 +7,7 @@ const auth_base_1 = require("@things-factory/auth-base");
 const shell_1 = require("@things-factory/shell");
 const index_1 = require("../../controllers/index");
 const work_shift_1 = require("./work-shift");
+const work_shift_revision_service_1 = require("./work-shift-revision-service");
 const work_shift_type_1 = require("./work-shift-type");
 let DomainWorkShiftQuery = class DomainWorkShiftQuery {
     async getWorkDateAndShift(dateTime, context) {
@@ -14,15 +15,7 @@ let DomainWorkShiftQuery = class DomainWorkShiftQuery {
         return await (0, index_1.getWorkDateAndShift)(domain, dateTime);
     }
     async workShifts(domain) {
-        return await (0, shell_1.getRepository)(work_shift_1.WorkShift).find({
-            where: {
-                domain: { id: domain.id }
-            },
-            order: {
-                fromDate: 'ASC',
-                fromTime: 'ASC'
-            }
-        });
+        return (0, work_shift_revision_service_1.effectiveWorkShifts)((0, shell_1.getRepository)(work_shift_1.WorkShift).manager, domain);
     }
 };
 exports.DomainWorkShiftQuery = DomainWorkShiftQuery;
@@ -47,13 +40,35 @@ exports.DomainWorkShiftQuery = DomainWorkShiftQuery = tslib_1.__decorate([
 let WorkShiftQuery = class WorkShiftQuery {
     async workShifts(params, context) {
         const { domain } = context.state;
-        const queryBuilder = (0, shell_1.getQueryBuilderFromListParams)({
-            repository: (0, shell_1.getRepository)(work_shift_1.WorkShift),
-            params,
-            domain
+        let rows = await (0, work_shift_revision_service_1.effectiveWorkShifts)((0, shell_1.getRepository)(work_shift_1.WorkShift).manager, domain);
+        if (params.pagination?.after)
+            throw new Error('Work shift projection uses page pagination');
+        if (params.search) {
+            const search = params.search.toLocaleLowerCase();
+            rows = rows.filter(row => [row.name, row.description].some(value => value?.toLocaleLowerCase().includes(search)));
+        }
+        for (const filter of params.filters ?? []) {
+            if (filter.name !== 'name' || !['eq', 'like'].includes(filter.operator))
+                throw new Error('Unsupported work shift filter');
+            rows = rows.filter(row => filter.operator === 'eq' ? row.name === filter.value : row.name.includes(String(filter.value)));
+        }
+        const sortings = params.sortings ?? [];
+        for (const sorting of sortings) {
+            if (!['name', 'description', 'fromDate', 'fromTime', 'toDate', 'toTime'].includes(sorting.name))
+                throw new Error('Unsupported work shift sorting');
+        }
+        rows.sort((a, b) => {
+            for (const sorting of sortings) {
+                const left = a[sorting.name], right = b[sorting.name];
+                const difference = typeof left === 'number' ? left - right : String(left ?? '').localeCompare(String(right ?? ''));
+                if (difference)
+                    return sorting.desc ? -difference : difference;
+            }
+            return 0;
         });
-        const [items, total] = await queryBuilder.getManyAndCount();
-        return { items, total };
+        const total = rows.length, limit = Math.max(1, Math.min(params.pagination?.limit ?? 64, 64));
+        const offset = Math.max(0, ((params.pagination?.page ?? 1) - 1) * limit);
+        return { items: rows.slice(offset, offset + limit), total };
     }
     async domain(workShift) {
         return await (0, shell_1.getRepository)(shell_1.Domain).findOneBy({ id: workShift.domainId });

package/dist-server/service/work-shift/work-shift-query.js.map

@@ -1 +1 @@
-{"version":3,"file":"work-shift-query.js","sourceRoot":"","sources":["../../../server/service/work-shift/work-shift-query.ts"],"names":[],"mappings":"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","sourcesContent":["import { Arg, Args, Ctx, FieldResolver, Query, Resolver, Root } from 'type-graphql'\n\nimport { User } from '@things-factory/auth-base'\nimport { Domain, getQueryBuilderFromListParams, getRepository, ListParam } from '@things-factory/shell'\n\nimport { getWorkDateAndShift } from '../../controllers/index'\nimport { WorkShift } from './work-shift'\nimport { WorkShiftInfo, WorkShiftList } from './work-shift-type'\n\n@Resolver(Domain)\nexport class DomainWorkShiftQuery {\n  @Query(returns => WorkShiftInfo, { description: 'To fetch a work date and work shift for given datetime' })\n  async getWorkDateAndShift(@Arg('dateTime') dateTime: Date, @Ctx() context: ResolverContext): Promise<WorkShiftInfo> {\n    const { domain } = context.state\n\n    return await getWorkDateAndShift(domain, dateTime)\n  }\n\n  @FieldResolver(type => [WorkShift])\n  async workShifts(@Root() domain: Domain): Promise<WorkShift[]> {\n    return await getRepository(WorkShift).find({\n      where: {\n        domain: { id: domain.id }\n      },\n      order: {\n        fromDate: 'ASC',\n        fromTime: 'ASC'\n      }\n    })\n  }\n}\n\n@Resolver(WorkShift)\nexport class WorkShiftQuery {\n  @Query(returns => WorkShiftList, { description: 'To fetch multiple WorkShifts' })\n  async workShifts(\n    @Args(type => ListParam) params: ListParam,\n    @Ctx() context: ResolverContext\n  ): Promise<WorkShiftList> {\n    const { domain } = context.state\n\n    const queryBuilder = getQueryBuilderFromListParams({\n      repository: getRepository(WorkShift),\n      params,\n      domain\n    })\n\n    const [items, total] = await queryBuilder.getManyAndCount()\n\n    return { items, total }\n  }\n\n  @FieldResolver(type => Domain)\n  async domain(@Root() workShift: WorkShift): Promise<Domain> {\n    return await getRepository(Domain).findOneBy({ id: workShift.domainId })\n  }\n\n  @FieldResolver(type => User)\n  async updater(@Root() workShift: WorkShift): Promise<User> {\n    return await getRepository(User).findOneBy({ id: workShift.updaterId })\n  }\n\n  @FieldResolver(type => User)\n  async creator(@Root() workShift: WorkShift): Promise<User> {\n    return await getRepository(User).findOneBy({ id: workShift.creatorId })\n  }\n}\n"]}
+{"version":3,"file":"work-shift-query.js","sourceRoot":"","sources":["../../../server/service/work-shift/work-shift-query.ts"],"names":[],"mappings":"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","sourcesContent":["import { Arg, Args, Ctx, FieldResolver, Query, Resolver, Root } from 'type-graphql'\n\nimport { User } from '@things-factory/auth-base'\nimport { Domain, getRepository, ListParam } from '@things-factory/shell'\n\nimport { getWorkDateAndShift } from '../../controllers/index'\nimport { WorkShift } from './work-shift'\nimport { effectiveWorkShifts } from './work-shift-revision-service'\nimport { WorkShiftInfo, WorkShiftList } from './work-shift-type'\n\n@Resolver(Domain)\nexport class DomainWorkShiftQuery {\n  @Query(returns => WorkShiftInfo, { description: 'To fetch a work date and work shift for given datetime' })\n  async getWorkDateAndShift(@Arg('dateTime') dateTime: Date, @Ctx() context: ResolverContext): Promise<WorkShiftInfo> {\n    const { domain } = context.state\n\n    return await getWorkDateAndShift(domain, dateTime)\n  }\n\n  @FieldResolver(type => [WorkShift])\n  async workShifts(@Root() domain: Domain): Promise<WorkShift[]> {\n    return effectiveWorkShifts(getRepository(WorkShift).manager, domain)\n  }\n}\n\n@Resolver(WorkShift)\nexport class WorkShiftQuery {\n  @Query(returns => WorkShiftList, { description: 'To fetch multiple WorkShifts' })\n  async workShifts(\n    @Args(type => ListParam) params: ListParam,\n    @Ctx() context: ResolverContext\n  ): Promise<WorkShiftList> {\n    const { domain } = context.state\n\n    let rows = await effectiveWorkShifts(getRepository(WorkShift).manager, domain)\n    if (params.pagination?.after) throw new Error('Work shift projection uses page pagination')\n    if (params.search) {\n      const search = params.search.toLocaleLowerCase()\n      rows = rows.filter(row => [row.name, row.description].some(value => value?.toLocaleLowerCase().includes(search)))\n    }\n    for (const filter of params.filters ?? []) {\n      if (filter.name !== 'name' || !['eq','like'].includes(filter.operator)) throw new Error('Unsupported work shift filter')\n      rows = rows.filter(row => filter.operator === 'eq' ? row.name === filter.value : row.name.includes(String(filter.value)))\n    }\n    const sortings = params.sortings ?? []\n    for (const sorting of sortings) {\n      if (!['name', 'description', 'fromDate', 'fromTime', 'toDate', 'toTime'].includes(sorting.name)) throw new Error('Unsupported work shift sorting')\n    }\n    rows.sort((a, b) => {\n      for (const sorting of sortings) {\n        const left = a[sorting.name], right = b[sorting.name]\n        const difference = typeof left === 'number' ? left - right : String(left ?? '').localeCompare(String(right ?? ''))\n        if (difference) return sorting.desc ? -difference : difference\n      }\n      return 0\n    })\n    const total = rows.length, limit = Math.max(1, Math.min(params.pagination?.limit ?? 64, 64))\n    const offset = Math.max(0, ((params.pagination?.page ?? 1) - 1) * limit)\n    return { items: rows.slice(offset, offset + limit), total }\n  }\n\n  @FieldResolver(type => Domain)\n  async domain(@Root() workShift: WorkShift): Promise<Domain> {\n    return await getRepository(Domain).findOneBy({ id: workShift.domainId })\n  }\n\n  @FieldResolver(type => User)\n  async updater(@Root() workShift: WorkShift): Promise<User> {\n    return await getRepository(User).findOneBy({ id: workShift.updaterId })\n  }\n\n  @FieldResolver(type => User)\n  async creator(@Root() workShift: WorkShift): Promise<User> {\n    return await getRepository(User).findOneBy({ id: workShift.creatorId })\n  }\n}\n"]}

package/dist-server/service/work-shift/work-shift-revision-service.d.ts

@@ -1,69 +1,33 @@
 import { EntityManager } from 'typeorm';
 import { Domain } from '@things-factory/shell';
-import { User } from '@things-factory/auth-base';
 import { WorkShift } from './work-shift';
-import { WorkShiftRevision } from './work-shift-revision';
-import { SetOrigin } from './work-shift-selection';
-/**
- * 편성이 바뀔 때 지나간 것을 남기고, 지난 시각의 편성을 되찾는다.
- */
-/** 편성 한 벌에서 남길 것만 뽑는다. id·감사 칸은 지워진 행의 것이라 되살려도 쓸 데가 없다. */
-export declare function shiftSetOf(shifts: WorkShift[]): Record<string, unknown>[];
-/** 두 편성이 같은가. 같으면 남기지 않는다 — 바뀌지 않은 저장으로 이력이 늘면 읽을 수 없게 된다. */
-export declare function sameShiftSet(before: Record<string, unknown>[], after: Record<string, unknown>[]): boolean;
-/**
- * 지금 편성이 **언제부터**인가.
- *
- * 저장이 전량 삭제 후 재삽입이라, 지금 행들 중 가장 이른 `createdAt` 이 곧 설치 시각이다. 행이 없으면
- * 편성이 없는 것이므로 없다고 답한다 — 지어내면 그 시각 이전의 사실이 지금 편성으로 읽힌다.
- */
-export declare function inForceSince(shifts: WorkShift[]): Date | undefined;
-/**
- * 바꾸기 **전에** 지금 쓰던 편성을 남긴다.
- *
- * ── 순서가 이 함수의 전부다 ────────────────────────────────────────────────
- * 저장은 그 도메인의 교대를 전부 지우고 다시 넣는다. 지운 뒤에 남기려 하면 남길 것이 없다.
- *
- * ── 지금 쓰던 것이 편집기의 내용이 아닐 수 있다 ────────────────────────────
- * 예고한 시각이 지났으면 **예고분이 적용 중**이고, 편집기(`WorkShift`)의 내용은 그때 이미 답이 아니다.
- * 그 상태에서 편집기 내용만 이력에 남기면 실제로 쓰이던 편성이 기록에서 빠진다.
- *
- * 그리고 그 열린 벌을 닫지 않으면 **저장한 것이 적용되지 않는다** — 시각으로 고를 때 열린 벌이 계속
- * 이기기 때문이다. 사람은 저장했는데 아무것도 안 바뀌는 것을 보게 된다.
- *
- * 적용 중이던 예고분은 닫는 것만으로 이력이 된다. 따로 한 줄 더 남기면 같은 편성이 두 번 적힌다.
- */
-export declare function recordRevision(manager: EntityManager, domain: Domain, next: Record<string, unknown>[], user?: User, now?: Date): Promise<WorkShiftRevision | undefined>;
-/**
- * 그 시각에 쓰던 편성 — **지금 편성이 아닐 수 있다.**
- *
- * 지나간 시각이면 이력에서, 예고한 시각이 지났으면 예고분에서 고른다. 고르는 규칙은
- * `work-shift-selection.ts` 에 순수하게 있다.
- *
- * **이력보다 앞선 시각은 없다고 답한다.** 그때 무엇을 쓰고 있었는지 이 시스템은 모른다.
- */
+import { WorkShiftSegment } from './work-shift-revision';
+/** Every field affecting execution belongs to the signed arrangement. */
+export declare function shiftSetOf(shifts: Partial<WorkShift>[]): Record<string, unknown>[];
+export declare function sameShiftSet(a: Record<string, unknown>[], b: Record<string, unknown>[]): boolean;
 export declare function shiftsInForceAt(manager: EntityManager, domain: Domain, at: Date): Promise<{
-    shifts: Record<string, unknown>[];
-    origin: SetOrigin;
-    from?: Date;
-} | undefined>;
-/**
- * 앞으로 쓸 편성을 미리 적어 둔다.
- *
- * ── 지난 시각으로는 예고하지 않는다 ────────────────────────────────────────
- * 지난 시각으로 넣으면 이미 적힌 사실들의 교대 이름이 통째로 바뀐다. 그것은 예고가 아니라 **기록을
- * 고치는 것**이고, 이 문으로 할 일이 아니다.
- *
- * ── 앞의 열린 벌을 닫는다 ──────────────────────────────────────────────────
- * 끝이 없는 벌이 둘이면 어느 것이 답인지 갈린다. 새 예고의 시작이 앞엣것의 끝이 된다.
- */
-export declare function announceShiftSet(manager: EntityManager, domain: Domain, effectiveFrom: Date, shifts: Record<string, unknown>[], user?: User, now?: Date): Promise<WorkShiftRevision>;
-/**
- * 예고를 물린다.
- *
- * **아직 시작하지 않은 것만** 물릴 수 있다. 이미 적용 중인 벌을 지우면 그 사이에 적힌 사실들이 가리키던
- * 편성이 사라진다 — 그때는 지우는 것이 아니라 새로 예고하거나 지금 편성을 저장한다.
- */
-export declare function cancelAnnouncement(manager: EntityManager, domain: Domain, id: string, now?: Date): Promise<boolean>;
-/** 아직 시작하지 않은 벌들 — 화면이 「예고된 편성」으로 보여 줄 것. */
-export declare function announcementsOf(manager: EntityManager, domain: Domain, now?: Date): Promise<WorkShiftRevision[]>;
+    shifts: import("./work-shift-content").ShiftDefinition[];
+    timezone: string;
+    origin: "revision";
+    from: Date;
+    to: Date;
+    revisionId: string;
+    revisionNumber: number;
+    creatorId: string;
+    createdAt: Date;
+}>;
+export declare function effectiveWorkShifts(manager: EntityManager, domain: Domain, at?: Date): Promise<WorkShift[]>;
+/** Bounded expansion for OEE/planning windows; absolute intervals preserve zone/DST and revision boundaries. */
+export declare function shiftArrangementsDuring(manager: EntityManager, domain: Domain, from: Date, to: Date): Promise<{
+    revision: import("./work-shift-revision").WorkShiftRevision;
+    segment: WorkShiftSegment;
+    occurrences: {
+        name: string;
+        from: Date;
+        to: Date;
+    }[];
+}[]>;
+/** Old mutation/service entry points must never rewrite a signed schedule. */
+export declare function recordRevision(..._args: any[]): Promise<never>;
+export declare function announceShiftSet(..._args: any[]): Promise<never>;
+export declare function cancelAnnouncement(..._args: any[]): Promise<never>;

package/dist-server/service/work-shift/work-shift-revision-service.js

@@ -2,185 +2,85 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.shiftSetOf = shiftSetOf;
 exports.sameShiftSet = sameShiftSet;
-exports.inForceSince = inForceSince;
-exports.recordRevision = recordRevision;
 exports.shiftsInForceAt = shiftsInForceAt;
+exports.effectiveWorkShifts = effectiveWorkShifts;
+exports.shiftArrangementsDuring = shiftArrangementsDuring;
+exports.recordRevision = recordRevision;
 exports.announceShiftSet = announceShiftSet;
 exports.cancelAnnouncement = cancelAnnouncement;
-exports.announcementsOf = announcementsOf;
-const typeorm_1 = require("typeorm");
+const tslib_1 = require("tslib");
 const work_shift_1 = require("./work-shift");
+const work_shift_arrangement_1 = require("./work-shift-arrangement");
 const work_shift_revision_1 = require("./work-shift-revision");
-const work_shift_selection_1 = require("./work-shift-selection");
-/**
- * 편성이 바뀔 때 지나간 것을 남기고, 지난 시각의 편성을 되찾는다.
- */
-/** 편성 한 벌에서 남길 것만 뽑는다. id·감사 칸은 지워진 행의 것이라 되살려도 쓸 데가 없다. */
+const work_shift_lifecycle_1 = require("./work-shift-lifecycle");
+const shift_occurrence_1 = require("./shift-occurrence");
+const moment_timezone_1 = tslib_1.__importDefault(require("moment-timezone"));
+/** Every field affecting execution belongs to the signed arrangement. */
 function shiftSetOf(shifts) {
-    return shifts
-        .map(shift => ({
-        name: shift.name,
-        fromDate: shift.fromDate,
-        fromTime: shift.fromTime,
-        toDate: shift.toDate,
-        toTime: shift.toTime
-    }))
-        .sort((a, b) => a.fromDate - b.fromDate || String(a.fromTime).localeCompare(String(b.fromTime)));
-}
-/** 두 편성이 같은가. 같으면 남기지 않는다 — 바뀌지 않은 저장으로 이력이 늘면 읽을 수 없게 된다. */
-function sameShiftSet(before, after) {
-    return JSON.stringify(before) === JSON.stringify(after);
-}
-/**
- * 지금 편성이 **언제부터**인가.
- *
- * 저장이 전량 삭제 후 재삽입이라, 지금 행들 중 가장 이른 `createdAt` 이 곧 설치 시각이다. 행이 없으면
- * 편성이 없는 것이므로 없다고 답한다 — 지어내면 그 시각 이전의 사실이 지금 편성으로 읽힌다.
- */
-function inForceSince(shifts) {
-    const times = shifts.map(shift => shift.createdAt?.getTime()).filter((time) => Boolean(time));
-    return times.length ? new Date(Math.min(...times)) : undefined;
+    return shifts.map(s => ({ name: s.name, description: s.description ?? '', fromDate: s.fromDate,
+        fromTime: s.fromTime, toDate: s.toDate, toTime: s.toTime, daysOfWeek: s.daysOfWeek ?? '' }))
+        .sort((a, b) => a.fromDate - b.fromDate || a.fromTime.localeCompare(b.fromTime));
 }
-/**
- * 바꾸기 **전에** 지금 쓰던 편성을 남긴다.
- *
- * ── 순서가 이 함수의 전부다 ────────────────────────────────────────────────
- * 저장은 그 도메인의 교대를 전부 지우고 다시 넣는다. 지운 뒤에 남기려 하면 남길 것이 없다.
- *
- * ── 지금 쓰던 것이 편집기의 내용이 아닐 수 있다 ────────────────────────────
- * 예고한 시각이 지났으면 **예고분이 적용 중**이고, 편집기(`WorkShift`)의 내용은 그때 이미 답이 아니다.
- * 그 상태에서 편집기 내용만 이력에 남기면 실제로 쓰이던 편성이 기록에서 빠진다.
- *
- * 그리고 그 열린 벌을 닫지 않으면 **저장한 것이 적용되지 않는다** — 시각으로 고를 때 열린 벌이 계속
- * 이기기 때문이다. 사람은 저장했는데 아무것도 안 바뀌는 것을 보게 된다.
- *
- * 적용 중이던 예고분은 닫는 것만으로 이력이 된다. 따로 한 줄 더 남기면 같은 편성이 두 번 적힌다.
- */
-async function recordRevision(manager, domain, next, user, now = new Date()) {
-    /* 지금 실제로 적용 중인 벌 — 편집기의 것일 수도, 시작된 예고분일 수도 있다. */
-    const started = await manager.findOne(work_shift_revision_1.WorkShiftRevision, {
-        where: { domain: { id: domain.id }, effectiveTo: (0, typeorm_1.IsNull)() },
-        order: { effectiveFrom: 'DESC' }
-    });
-    if (started && started.effectiveFrom <= now) {
-        if (sameShiftSet(started.shifts, next)) {
-            /* 적용 중인 예고분과 같은 내용이다. 닫으면 뒤가 빈 구간이 되므로 그대로 둔다. */
-            return undefined;
-        }
-        /* 닫는 것만으로 이력이 된다. 그리고 닫아야 이번 저장이 적용된다. */
-        await manager.update(work_shift_revision_1.WorkShiftRevision, { id: started.id }, { effectiveTo: now });
-        return { ...started, effectiveTo: now };
-    }
-    const current = await manager.find(work_shift_1.WorkShift, { where: { domain: { id: domain.id } } });
-    if (!current.length) {
-        /* 첫 설치다. 지나간 편성이 없다. */
+function sameShiftSet(a, b) { return JSON.stringify(a) === JSON.stringify(b); }
+async function shiftsInForceAt(manager, domain, at) {
+    const root = await manager.findOneBy(work_shift_arrangement_1.WorkShiftArrangement, { domain: { id: domain.id } });
+    if (!root || !root.planGeneration)
         return undefined;
+    try {
+        const selected = await (0, work_shift_lifecycle_1.resolveWorkShift)(manager, domain.id, root.id, at);
+        return { shifts: selected.revision.shifts, timezone: selected.revision.timezone,
+            origin: 'revision', from: selected.segment.validFrom, to: selected.segment.validTo,
+            revisionId: selected.revision.id, revisionNumber: selected.revision.revisionNumber,
+            creatorId: selected.revision.creatorId, createdAt: selected.revision.createdAt };
     }
-    const before = shiftSetOf(current);
-    if (sameShiftSet(before, next)) {
-        /* 내용이 그대로다. 남기면 이력이 「바뀌지 않음」으로 채워져 읽을 수 없게 된다. */
-        return undefined;
+    catch (error) {
+        if (error instanceof work_shift_lifecycle_1.WorkShiftRefusal && error.code === 'NO_EFFECTIVE_REVISION')
+            return undefined;
+        throw error;
     }
-    return await manager.save(work_shift_revision_1.WorkShiftRevision, {
-        domain,
-        /* 언제부터 쓰던 것인가 — 모르면 그만둔 시각으로 둔다(길이 0인 구간). 지어내지 않는다. */
-        effectiveFrom: inForceSince(current) ?? now,
-        effectiveTo: now,
-        shifts: before,
-        creator: user
-    });
 }
-/** 이 도메인의 지나간 벌과 예고된 벌 전부. 고르는 일은 순수 함수가 한다. */
-async function revisionsOf(manager, domain) {
-    return await manager.find(work_shift_revision_1.WorkShiftRevision, {
-        where: { domain: { id: domain.id } },
-        order: { effectiveFrom: 'ASC' }
-    });
+async function effectiveWorkShifts(manager, domain, at = new Date()) {
+    const selected = await shiftsInForceAt(manager, domain, at);
+    return (selected?.shifts ?? []).map(shift => Object.assign(new work_shift_1.WorkShift(), shift, {
+        id: selected.revisionId + '/' + shift.name, domain, domainId: domain.id,
+        creatorId: selected.creatorId, updaterId: selected.creatorId,
+        createdAt: selected.createdAt, updatedAt: selected.createdAt
+    }));
 }
-/**
- * 그 시각에 쓰던 편성 — **지금 편성이 아닐 수 있다.**
- *
- * 지나간 시각이면 이력에서, 예고한 시각이 지났으면 예고분에서 고른다. 고르는 규칙은
- * `work-shift-selection.ts` 에 순수하게 있다.
- *
- * **이력보다 앞선 시각은 없다고 답한다.** 그때 무엇을 쓰고 있었는지 이 시스템은 모른다.
- */
-async function shiftsInForceAt(manager, domain, at) {
-    const current = await manager.find(work_shift_1.WorkShift, {
-        where: { domain: { id: domain.id } },
-        order: { fromDate: 'ASC', fromTime: 'ASC' }
+/** Bounded expansion for OEE/planning windows; absolute intervals preserve zone/DST and revision boundaries. */
+async function shiftArrangementsDuring(manager, domain, from, to) {
+    if (!(to > from) || to.getTime() - from.getTime() > 366 * 86400000)
+        throw new work_shift_lifecycle_1.WorkShiftRefusal('INVALID_INSTANT', 'Choose a window of at most 366 days.');
+    const root = await manager.findOneBy(work_shift_arrangement_1.WorkShiftArrangement, { domain: { id: domain.id } });
+    if (!root?.planGeneration)
+        return [];
+    const plan = await manager.findOneByOrFail(work_shift_revision_1.WorkShiftPlan, { domain: { id: domain.id }, arrangement: { id: root.id }, generation: root.planGeneration });
+    const segments = await manager.createQueryBuilder(work_shift_revision_1.WorkShiftSegment, 's').innerJoinAndSelect('s.revision', 'r')
+        .where('s.plan_id = :id AND s.domain_id = :domainId', { id: plan.id, domainId: domain.id })
+        .andWhere('s.validFrom < :to AND (s.validTo IS NULL OR s.validTo > :from)', { from, to }).getMany();
+    return segments.map(segment => {
+        const revision = segment.revision;
+        if (!revision.frozenAt || revision.contentHash !== (0, work_shift_lifecycle_1.workShiftSubmissionHash)(revision))
+            throw new work_shift_lifecycle_1.WorkShiftRefusal('REVISION_INTEGRITY_FAILURE');
+        const begin = new Date(Math.max(from.getTime(), segment.validFrom.getTime()));
+        const end = new Date(Math.min(to.getTime(), segment.validTo?.getTime() ?? Infinity));
+        const cursor = (0, moment_timezone_1.default)(begin).tz(revision.timezone).startOf('day').subtract(1, 'day');
+        const last = (0, moment_timezone_1.default)(end).tz(revision.timezone).startOf('day').add(1, 'day');
+        const occurrences = [];
+        for (; cursor <= last; cursor.add(1, 'day'))
+            for (const shift of revision.shifts) {
+                const w = (0, shift_occurrence_1.shiftOccurrence)(shift, cursor.format('YYYY-MM-DD'), revision.timezone);
+                if (!w)
+                    continue;
+                const left = new Date(Math.max(begin.getTime(), w.from.getTime())), right = new Date(Math.min(end.getTime(), w.to.getTime()));
+                if (right > left)
+                    occurrences.push({ name: w.name, from: left, to: right });
+            }
+        return { revision, segment, occurrences };
     });
-    const revisions = await revisionsOf(manager, domain);
-    const selected = (0, work_shift_selection_1.selectSetAt)(at, current.length ? shiftSetOf(current) : undefined, inForceSince(current), revisions.map(revision => ({
-        effectiveFrom: revision.effectiveFrom,
-        effectiveTo: revision.effectiveTo,
-        shifts: revision.shifts
-    })));
-    return selected.shifts ? { shifts: selected.shifts, origin: selected.origin, from: selected.from } : undefined;
-}
-/**
- * 앞으로 쓸 편성을 미리 적어 둔다.
- *
- * ── 지난 시각으로는 예고하지 않는다 ────────────────────────────────────────
- * 지난 시각으로 넣으면 이미 적힌 사실들의 교대 이름이 통째로 바뀐다. 그것은 예고가 아니라 **기록을
- * 고치는 것**이고, 이 문으로 할 일이 아니다.
- *
- * ── 앞의 열린 벌을 닫는다 ──────────────────────────────────────────────────
- * 끝이 없는 벌이 둘이면 어느 것이 답인지 갈린다. 새 예고의 시작이 앞엣것의 끝이 된다.
- */
-async function announceShiftSet(manager, domain, effectiveFrom, shifts, user, now = new Date()) {
-    if (effectiveFrom <= now) {
-        throw new Error('announceShiftSet: 예고는 앞으로의 시각으로만 한다 — 지난 시각으로 넣으면 이미 적힌 사실의 교대가 바뀐다');
-    }
-    if (!shifts.length) {
-        throw new Error('announceShiftSet: 빈 편성은 예고할 수 없다 — 그 시각부터 교대가 없다는 뜻이 되어 버린다');
-    }
-    const open = await manager.findOne(work_shift_revision_1.WorkShiftRevision, {
-        where: { domain: { id: domain.id }, effectiveTo: (0, typeorm_1.IsNull)() },
-        order: { effectiveFrom: 'DESC' }
-    });
-    if (open) {
-        if (open.effectiveFrom >= effectiveFrom) {
-            throw new Error('announceShiftSet: 이미 더 늦은 예고가 있다 — 그것을 먼저 물리고 다시 예고한다');
-        }
-        /* 앞의 열린 벌은 새 예고가 시작하는 시각에 끝난다. */
-        await manager.update(work_shift_revision_1.WorkShiftRevision, { id: open.id }, { effectiveTo: effectiveFrom });
-    }
-    return await manager.save(work_shift_revision_1.WorkShiftRevision, {
-        domain,
-        effectiveFrom,
-        effectiveTo: null,
-        shifts,
-        creator: user
-    });
-}
-/**
- * 예고를 물린다.
- *
- * **아직 시작하지 않은 것만** 물릴 수 있다. 이미 적용 중인 벌을 지우면 그 사이에 적힌 사실들이 가리키던
- * 편성이 사라진다 — 그때는 지우는 것이 아니라 새로 예고하거나 지금 편성을 저장한다.
- */
-async function cancelAnnouncement(manager, domain, id, now = new Date()) {
-    const found = await manager.findOne(work_shift_revision_1.WorkShiftRevision, { where: { id, domain: { id: domain.id } } });
-    if (!found) {
-        return false;
-    }
-    if (found.effectiveFrom <= now) {
-        throw new Error('cancelAnnouncement: 이미 적용된 편성은 물릴 수 없다 — 그 사이에 적힌 사실이 이것을 가리킨다');
-    }
-    await manager.delete(work_shift_revision_1.WorkShiftRevision, { id: found.id });
-    /* 앞의 벌이 이 예고 때문에 닫혀 있었다면 다시 열어 준다 — 아니면 그 뒤가 빈 구간이 된다. */
-    const previous = await manager.findOne(work_shift_revision_1.WorkShiftRevision, {
-        where: { domain: { id: domain.id }, effectiveTo: found.effectiveFrom },
-        order: { effectiveFrom: 'DESC' }
-    });
-    if (previous) {
-        await manager.update(work_shift_revision_1.WorkShiftRevision, { id: previous.id }, { effectiveTo: null });
-    }
-    return true;
-}
-/** 아직 시작하지 않은 벌들 — 화면이 「예고된 편성」으로 보여 줄 것. */
-async function announcementsOf(manager, domain, now = new Date()) {
-    return (0, work_shift_selection_1.announcedSets)(now, await revisionsOf(manager, domain));
 }
+/** Old mutation/service entry points must never rewrite a signed schedule. */
+async function recordRevision(..._args) { throw new work_shift_lifecycle_1.WorkShiftRefusal('REVISION_REQUIRED'); }
+async function announceShiftSet(..._args) { throw new work_shift_lifecycle_1.WorkShiftRefusal('REVISION_REQUIRED'); }
+async function cancelAnnouncement(..._args) { throw new work_shift_lifecycle_1.WorkShiftRefusal('REVISION_REQUIRED'); }
 //# sourceMappingURL=work-shift-revision-service.js.map