@chevre/domain 22.13.0-alpha.6 → 22.13.0-alpha.7

package/lib/chevre/repo/event.d.ts

@@ -56,7 +56,9 @@ type IKeyOfProjection4minimizedEvent<T extends AvailableEventType> = T extends f
 type IUnset<T extends AvailableEventType> = {
     [key in keyof factory.event.IEvent<T>]?: 1;
 };
-export type ICreatingEvent4ttts = Pick<factory.event.IAttributes<factory.eventType.ScreeningEvent>, 'additionalProperty' | 'doorTime' | 'endDate' | 'eventStatus' | 'location' | 'name' | 'offers' | 'organizer' | 'project' | 'startDate' | 'superEvent' | 'typeOf'>;
+export type ICreatingEvent4ttts = Pick<factory.event.IAttributes<factory.eventType.ScreeningEvent>, 'additionalProperty' | 'doorTime' | 'endDate' | 'eventStatus' | 'location' | 'name' | 'offers' | 'organizer' | 'project' | 'startDate' | 'superEvent' | 'typeOf' | 'identifier'> & {
+    identifier: string;
+};
 /**
  * イベントリポジトリ
  */
@@ -160,7 +162,6 @@ export declare class EventRepo {
      * tttsイベントを識別子によって冪等作成する
      */
     saveEventByIdentifier4ttts(params: {
-        oldEventId: string;
         attributes: ICreatingEvent4ttts;
     }): Promise<{
         id: string;

package/lib/chevre/repo/event.js

@@ -659,9 +659,12 @@ class EventRepo {
      */
     saveEventByIdentifier4ttts(params) {
         return __awaiter(this, void 0, void 0, function* () {
-            const { oldEventId } = params;
-            const _a = params.attributes, { project, typeOf, eventStatus } = _a, updateFields = __rest(_a, ["project", "typeOf", "eventStatus"]);
-            const identifier = oldEventId;
+            // const { oldEventId } = params;
+            const _a = params.attributes, { project, typeOf, eventStatus, identifier, organizer } = _a, updateFields = __rest(_a, ["project", "typeOf", "eventStatus", "identifier", "organizer"]);
+            // const identifier = oldEventId;
+            if (typeof identifier !== 'string' || identifier.length === 0) {
+                throw new factory.errors.ArgumentNull('identifier');
+            }
             const uniqid = yield Promise.resolve().then(() => require('uniqid'));
             const id = uniqid();
             const doc = yield this.eventModel.findOneAndUpdate({
@@ -670,7 +673,7 @@ class EventRepo {
                 // 追加特性をキーに更新
                 additionalProperty: {
                     $exists: true,
-                    $all: [{ name: 'oldEventId', value: oldEventId }]
+                    $all: [{ name: 'oldEventId', value: identifier }]
                 }
             }, 
             // upsertの場合、createがありうるので属性を除外しない
@@ -680,6 +683,7 @@ class EventRepo {
                     typeOf,
                     project,
                     eventStatus,
+                    organizer,
                     identifier // イベントコードを必ず追加(2025-09-03~)
                     // ...(typeof identifier === 'string' && identifier !== '') ? { identifier } : undefined
                 },

package/lib/chevre/service/event.d.ts

@@ -5,14 +5,11 @@ import type * as COA from '@motionpicture/coa-service';
 import type { ActionRepo } from '../repo/action';
 import type { CategoryCodeRepo } from '../repo/categoryCode';
 import type { CreativeWorkRepo } from '../repo/creativeWork';
-import type { EventRepo, ICreatingEvent4ttts } from '../repo/event';
+import type { EventRepo } from '../repo/event';
 import type { EventSeriesRepo } from '../repo/eventSeries';
 import type { MovieTheaterRepo } from '../repo/place/movieTheater';
 import type { ScreeningRoomRepo } from '../repo/place/screeningRoom';
-import type { ProjectRepo } from '../repo/project';
 import type { SellerRepo } from '../repo/seller';
-import type { SettingRepo } from '../repo/setting';
-import type { TaskRepo } from '../repo/task';
 import * as factory from '../factory';
 interface IImportFromCOAParams {
     project: {
@@ -38,7 +35,7 @@ interface IImportFromCOAParams {
 /**
  * イベントをインポートする
  */
-export declare function importFromCOA(params: IImportFromCOAParams): (repos: {
+declare function importFromCOA(params: IImportFromCOAParams): (repos: {
     action: ActionRepo;
     categoryCode: CategoryCodeRepo;
     creativeWork: CreativeWorkRepo;
@@ -49,13 +46,10 @@ export declare function importFromCOA(params: IImportFromCOAParams): (repos: {
     seller: SellerRepo;
     masterService: COA.service.Master;
 }) => Promise<void>;
-export declare function minimizeSuperEvent(params: {
-    superEvent: factory.event.screeningEventSeries.IEvent;
-}): factory.event.screeningEvent.ISuperEvent;
 /**
  * COA情報からイベントIDを作成する
  */
-export declare function createScreeningEventIdFromCOA(params: {
+declare function createScreeningEventIdFromCOA(params: {
     theaterCode: string;
     titleCode: string;
     titleBranchNum: string;
@@ -63,27 +57,4 @@ export declare function createScreeningEventIdFromCOA(params: {
     screenCode: string;
     timeBegin: string;
 }): string;
-/**
- * イベントコード指定でtttsイベントを冪等更新する
- */
-export declare function updateEvent4ttts(params: {
-    /**
-     * 旧イベントID
-     */
-    oldEventId: string;
-    /**
-     * イベント属性
-     */
-    attributes: ICreatingEvent4ttts;
-    project: {
-        id: string;
-    };
-}): (repos: {
-    action: ActionRepo;
-    event: EventRepo;
-    eventSeries: EventSeriesRepo;
-    project: ProjectRepo;
-    setting: SettingRepo;
-    task: TaskRepo;
-}) => Promise<void>;
-export { ICreatingEvent4ttts };
+export { importFromCOA, createScreeningEventIdFromCOA };

package/lib/chevre/service/event.js

@@ -10,17 +10,13 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.importFromCOA = importFromCOA;
-exports.minimizeSuperEvent = minimizeSuperEvent;
 exports.createScreeningEventIdFromCOA = createScreeningEventIdFromCOA;
-exports.updateEvent4ttts = updateEvent4ttts;
 const createDebug = require("debug");
 // @ts-ignore
 const difference = require("lodash.difference");
 // import { google } from 'googleapis';
 const moment = require("moment-timezone");
 const factory = require("../factory");
-// import { Settings } from '../settings';
-const onEventChanged_1 = require("./offer/onEventChanged");
 const debug = createDebug('chevre-domain:service:event');
 /**
  * イベントをインポートする
@@ -858,54 +854,3 @@ function createScreeningRoomFromCOA(project, seller, screenFromCOA) {
         parentOrganization: { id: seller.id, typeOf: factory.organizationType.Corporation }
     };
 }
-/**
- * イベントコード指定でtttsイベントを冪等更新する
- */
-function updateEvent4ttts(params) {
-    return (repos) => __awaiter(this, void 0, void 0, function* () {
-        const updateObject = {
-            id: params.oldEventId,
-            identifier: params.oldEventId, // support identifier(2025-09-03~)
-            typeOf: factory.eventType.ScreeningEvent
-        };
-        const actionAttributes = {
-            project: { typeOf: factory.organizationType.Project, id: params.project.id },
-            typeOf: factory.actionType.UpdateAction,
-            agent: { typeOf: factory.organizationType.Project, id: params.project.id },
-            object: updateObject,
-            // replacee: reservation,
-            // replacer: params.attributes, // $unsetもありうるのでいったん保留
-            targetCollection: {
-                id: params.oldEventId,
-                typeOf: factory.eventType.ScreeningEvent
-            }
-        };
-        const action = yield repos.action.start(actionAttributes);
-        let savedEvent;
-        try {
-            savedEvent = yield repos.event.saveEventByIdentifier4ttts({
-                oldEventId: params.oldEventId,
-                attributes: params.attributes
-            });
-        }
-        catch (error) {
-            try {
-                yield repos.action.giveUp({ typeOf: action.typeOf, id: action.id, error });
-            }
-            catch (__) {
-                // 失敗したら仕方ない
-            }
-            throw error;
-        }
-        yield repos.action.completeWithVoid({ typeOf: action.typeOf, id: action.id, result: { id: savedEvent.id } });
-        yield (0, onEventChanged_1.onEventChanged)({
-            id: [savedEvent.id],
-            project: { id: params.project.id },
-            typeOf: factory.eventType.ScreeningEvent,
-            isNew: false,
-            useInform: true
-        })(repos
-        // スケジュールによるイベント作成ではendDateに変更がないのでpendingReservationsへの同期はひとまず必要なし
-        );
-    });
-}

package/lib/chevre/service/task/createEvent/createEventBySchedule/schedule2events.d.ts

@@ -0,0 +1,15 @@
+import type { ICreatingEvent4ttts } from '../../../../repo/event';
+import type { EventSeriesRepo } from '../../../../repo/eventSeries';
+import type { MemberRepo } from '../../../../repo/member';
+import type { MovieTheaterRepo } from '../../../../repo/place/movieTheater';
+import type { ScreeningRoomRepo } from '../../../../repo/place/screeningRoom';
+import type { ProductRepo } from '../../../../repo/product';
+import * as factory from '../../../../factory';
+declare function schedule2events(schedule: factory.schedule.IEventWithSchedule, createDate: Date): (repos: {
+    eventSeries: EventSeriesRepo;
+    member: MemberRepo;
+    movieTheater: MovieTheaterRepo;
+    screeningRoom: ScreeningRoomRepo;
+    product: ProductRepo;
+}) => Promise<ICreatingEvent4ttts[]>;
+export { schedule2events };

package/lib/chevre/service/task/createEvent/createEventBySchedule/schedule2events.js

@@ -0,0 +1,386 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.schedule2events = schedule2events;
+const createDebug = require("debug");
+const moment = require("moment-timezone");
+const factory = require("../../../../factory");
+// import { Settings } from '../../../settings';
+const debug = createDebug('chevre-domain:service:task');
+// tslint:disable-next-line:max-func-body-length
+// function schedule2createEventParams(
+//     schedule: factory.schedule.IEventWithSchedule,
+//     createDate: Date
+// ): factory.event.screeningEvent.ICreateParams[] {
+//     const eventServiceId = schedule.offers?.itemOffered?.id;
+//     const makesOffer = schedule.offers?.seller?.makesOffer;
+//     const applicationIds: string[] = (Array.isArray(makesOffer))
+//         ? makesOffer.map(({ availableAtOrFrom }) => availableAtOrFrom.id)
+//         : [];
+//     const eventSeriesId = schedule.superEvent?.id;
+//     if (typeof eventServiceId !== 'string' || eventServiceId === '') {
+//         throw new factory.errors.NotFound('schedule.offers.itemOffered.id');
+//     }
+//     if (typeof eventSeriesId !== 'string' || eventSeriesId === '') {
+//         throw new factory.errors.NotFound('schedule.superEvent.id');
+//     }
+//     // 引数情報取得
+//     if (schedule.eventSchedule === undefined) {
+//         throw new factory.errors.NotFound('eventSchedule');
+//     }
+//     const targetInfo = getTargetInfoByEventWithSchedule(schedule, createDate);
+//     debug(targetInfo.length, 'targetInfos ->', targetInfo);
+//     const createParams: factory.event.screeningEvent.ICreateParams[] = [];
+//     for (const performanceInfo of targetInfo) {
+//         const oldEventId = [
+//             // tslint:disable-next-line:no-magic-numbers
+//             performanceInfo.day.slice(-6),
+//             workPerformedIdentifier,
+//             movieTheater.branchCode,
+//             screeningRoom.branchCode,
+//             performanceInfo.start_time
+//         ].join('');
+//         const maxValue = movieTheater.offers?.eligibleQuantity?.maxValue;
+//         const availabilityEnds: Date = moment(performanceInfo.end_date)
+//             .tz('Asia/Tokyo')
+//             .endOf('date')
+//             .toDate();
+//         const availabilityStarts: Date = moment(performanceInfo.start_date)
+//             .tz('Asia/Tokyo')
+//             .startOf('date')
+//             // tslint:disable-next-line:no-magic-numbers
+//             .add(-3, 'months')
+//             .toDate();
+//         const validThrough: Date = moment(performanceInfo.end_date)
+//             .tz('Asia/Tokyo')
+//             .endOf('date')
+//             .toDate();
+//         const validFrom: Date = moment(performanceInfo.start_date)
+//             .tz('Asia/Tokyo')
+//             .startOf('date')
+//             // tslint:disable-next-line:no-magic-numbers
+//             .add(-3, 'months')
+//             .toDate();
+//         // イベント作成
+//         createParams.push({
+//             eventStatus: factory.eventStatusType.EventScheduled,
+//             doorTime: performanceInfo.door_time,
+//             startDate: performanceInfo.start_date,
+//             endDate: performanceInfo.end_date,
+//             offers: {
+//                 eligibleQuantity: {
+//                     ...(typeof maxValue === 'number') ? { maxValue } : undefined // ひとまず全座席予約可能なように
+//                 },
+//                 itemOffered: {
+//                     // 興行ID追加(2022-09-01~)
+//                     id: eventServiceId,
+//                     serviceOutput: {
+//                         typeOf: factory.reservationType.EventReservation,
+//                         reservedTicket: {
+//                             typeOf: 'Ticket',
+//                             ticketedSeat: { typeOf: factory.placeType.Seat }
+//                         }
+//                     },
+//                 },
+//                 seller: {
+//                     // event.offersにseller.makesOfferを追加(2022-11-18~)
+//                     makesOffer: applicationIds.map((applicationId) => {
+//                         return {
+//                             typeOf: factory.offerType.Offer,
+//                             availableAtOrFrom: { id: applicationId }, // support no-array(2024-10-13~),
+//                             availabilityEnds,
+//                             availabilityStarts,
+//                             validFrom,
+//                             validThrough
+//                         };
+//                     })
+//                 }
+//             },
+//             // 旧フォーマットIDを追加特性に追加(2022-09-08~)
+//             additionalProperty: [
+//                 { name: 'tourNumber', value: String(performanceInfo.tour_number) },
+//                 { name: 'oldEventId', value: oldEventId }
+//             ],
+//             identifier: oldEventId
+//         });
+//     }
+//     return createParams;
+// }
+function schedule2events(schedule, createDate) {
+    // tslint:disable-next-line:cyclomatic-complexity max-func-body-length
+    return (repos) => __awaiter(this, void 0, void 0, function* () {
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j;
+        debug('schedule2events processing...', JSON.stringify(schedule), createDate);
+        const eventServiceId = (_b = (_a = schedule.offers) === null || _a === void 0 ? void 0 : _a.itemOffered) === null || _b === void 0 ? void 0 : _b.id;
+        const makesOffer = (_d = (_c = schedule.offers) === null || _c === void 0 ? void 0 : _c.seller) === null || _d === void 0 ? void 0 : _d.makesOffer;
+        const applicationIds = (Array.isArray(makesOffer))
+            ? makesOffer.map(({ availableAtOrFrom }) => availableAtOrFrom.id)
+            : [];
+        const eventSeriesId = (_e = schedule.superEvent) === null || _e === void 0 ? void 0 : _e.id;
+        const maxValue = (_g = (_f = schedule.offers) === null || _f === void 0 ? void 0 : _f.eligibleQuantity) === null || _g === void 0 ? void 0 : _g.maxValue;
+        const locationBranchCode = (_h = schedule.location) === null || _h === void 0 ? void 0 : _h.branchCode;
+        if (typeof eventServiceId !== 'string' || eventServiceId === '') {
+            throw new factory.errors.NotFound('schedule.offers.itemOffered.id required');
+        }
+        if (typeof eventSeriesId !== 'string' || eventSeriesId === '') {
+            throw new factory.errors.NotFound('schedule.superEvent.id required');
+        }
+        if (typeof maxValue !== 'number') {
+            throw new factory.errors.NotFound('schedule.offers.eligibleQuantity.maxValue required');
+        }
+        if (typeof locationBranchCode !== 'string' || locationBranchCode === '') {
+            throw new factory.errors.NotFound('location.branchCode required');
+        }
+        const project = schedule.project;
+        // 引数情報取得
+        if (schedule.eventSchedule === undefined) {
+            throw new factory.errors.NotFound('schedule.eventSchedule required');
+        }
+        const targetInfo = getTargetInfoByEventWithSchedule(schedule, createDate);
+        debug(targetInfo.length, 'targetInfos ->', targetInfo);
+        // fs.writeFileSync(
+        //     `${__dirname}/../../../../../targetInfo_${schedule.eventSchedule?.typeOf}.json`,
+        //     JSON.stringify(targetInfo, null, '    ')
+        // );
+        // return;
+        // 施設コンテンツ検索
+        const screeningEventSeries = (yield repos.eventSeries.projectEventSeriesFields({
+            project: { id: { $eq: project.id } },
+            id: { $eq: eventSeriesId }
+        }, [
+            'location', 'additionalProperty', 'description', 'endDate', 'headline', 'kanaName', 'name',
+            'soundFormat', 'startDate', 'typeOf', 'videoFormat', 'workPerformed'
+        ])).shift();
+        if (screeningEventSeries === undefined) {
+            throw new factory.errors.NotFound(factory.eventType.ScreeningEventSeries);
+        }
+        const workPerformedIdentifier = screeningEventSeries.workPerformed.identifier;
+        // 劇場検索
+        const movieTheater = (yield repos.movieTheater.projectFields({
+            limit: 1,
+            page: 1,
+            project: { id: { $eq: project.id } },
+            branchCode: { $eq: screeningEventSeries.location.branchCode }
+        }, ['id', 'branchCode', 'parentOrganization'])).shift();
+        if (movieTheater === undefined) {
+            throw new factory.errors.NotFound(factory.placeType.MovieTheater);
+        }
+        const seller = movieTheater.parentOrganization;
+        const screeningRoom = (yield repos.screeningRoom.searchScreeningRooms({
+            limit: 1,
+            page: 1,
+            project: { id: { $eq: project.id } },
+            containedInPlace: { id: { $eq: movieTheater.id } },
+            branchCode: { $eq: locationBranchCode }
+        })).shift();
+        if (screeningRoom === undefined) {
+            throw new factory.errors.NotFound(factory.placeType.ScreeningRoom, `${factory.placeType.ScreeningRoom} ${locationBranchCode} not found`);
+        }
+        // 興行検索
+        const eventService = (yield repos.product.projectFields({
+            limit: 1,
+            page: 1,
+            project: { id: { $eq: project.id } },
+            id: { $eq: eventServiceId }
+            // productID: { $eq: eventServiceProductID }
+        }, ['name'])).shift();
+        if (typeof (eventService === null || eventService === void 0 ? void 0 : eventService.id) !== 'string') {
+            throw new Error(`EventService ${eventServiceId} not found`);
+        }
+        let existingApplicationMembers = [];
+        if (applicationIds.length > 0) {
+            existingApplicationMembers = yield repos.member.searchCustomerMembers({
+                limit: 100,
+                page: 1,
+                project: { id: project.id },
+                member: {
+                    // typeOf: {
+                    //     $eq: factory.creativeWorkType.WebApplication
+                    // },
+                    id: { $in: applicationIds }
+                }
+            });
+        }
+        // ロールで絞る(customer or pos)
+        // existingApplicationMembers = existingApplicationMembers
+        //     .filter((m) => {
+        //         return Array.isArray(m.member.hasRole) && m.member.hasRole.some((r) => AVAILABLE_ROLE_NAMES.includes(r.roleName));
+        //     });
+        const creatingEvents = [];
+        for (const performanceInfo of targetInfo) {
+            const oldEventId = [
+                // tslint:disable-next-line:no-magic-numbers
+                performanceInfo.day.slice(-6),
+                workPerformedIdentifier,
+                movieTheater.branchCode,
+                screeningRoom.branchCode,
+                performanceInfo.start_time
+            ].join('');
+            // const maxValue = movieTheater.offers?.eligibleQuantity?.maxValue;
+            const availabilityEnds = moment(performanceInfo.end_date)
+                .tz('Asia/Tokyo')
+                .endOf('date')
+                .toDate();
+            const availabilityStarts = moment(performanceInfo.start_date)
+                .tz('Asia/Tokyo')
+                .startOf('date')
+                // tslint:disable-next-line:no-magic-numbers
+                .add(-3, 'months')
+                .toDate();
+            const validThrough = moment(performanceInfo.end_date)
+                .tz('Asia/Tokyo')
+                .endOf('date')
+                .toDate();
+            const validFrom = moment(performanceInfo.start_date)
+                .tz('Asia/Tokyo')
+                .startOf('date')
+                // tslint:disable-next-line:no-magic-numbers
+                .add(-3, 'months')
+                .toDate();
+            const offersSeller = {
+                typeOf: factory.organizationType.Corporation,
+                id: String(seller === null || seller === void 0 ? void 0 : seller.id),
+                // event.offersにseller.makesOfferを追加(2022-11-18~)
+                makesOffer: existingApplicationMembers.map((a) => {
+                    return {
+                        typeOf: factory.offerType.Offer,
+                        availableAtOrFrom: { id: a.member.id }, // support no-array(2024-10-13~),
+                        availabilityEnds,
+                        availabilityStarts,
+                        validFrom,
+                        validThrough
+                    };
+                })
+            };
+            const offers = {
+                typeOf: factory.offerType.Offer,
+                eligibleQuantity: {
+                    typeOf: 'QuantitativeValue',
+                    unitCode: factory.unitCode.C62,
+                    maxValue
+                },
+                itemOffered: Object.assign({ 
+                    // 興行ID追加(2022-09-01~)
+                    id: eventService.id, serviceOutput: {
+                        typeOf: factory.reservationType.EventReservation,
+                        reservedTicket: {
+                            typeOf: 'Ticket',
+                            ticketedSeat: { typeOf: factory.placeType.Seat }
+                        }
+                    }, typeOf: factory.product.ProductType.EventService, availableChannel: {
+                        typeOf: 'ServiceChannel',
+                        serviceLocation: {
+                            typeOf: screeningRoom.typeOf,
+                            branchCode: screeningRoom.branchCode,
+                            name: screeningRoom.name,
+                            containedInPlace: Object.assign({ typeOf: screeningEventSeries.location.typeOf, id: screeningEventSeries.location.id, branchCode: screeningEventSeries.location.branchCode }, (screeningEventSeries.location.name !== undefined)
+                                ? { name: screeningEventSeries.location.name }
+                                : undefined)
+                        }
+                    } }, { name: { ja: (typeof eventService.name === 'string') ? eventService.name : String((_j = eventService.name) === null || _j === void 0 ? void 0 : _j.ja) } }),
+                seller: offersSeller
+            };
+            const screeningEventSuperEvent = Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({ typeOf: screeningEventSeries.typeOf, id: screeningEventSeries.id, videoFormat: screeningEventSeries.videoFormat, soundFormat: screeningEventSeries.soundFormat, workPerformed: screeningEventSeries.workPerformed, location: screeningEventSeries.location, kanaName: screeningEventSeries.kanaName, name: screeningEventSeries.name }, (Array.isArray(screeningEventSeries.additionalProperty))
+                ? { additionalProperty: screeningEventSeries.additionalProperty }
+                : undefined), (screeningEventSeries.startDate !== undefined)
+                ? { startDate: screeningEventSeries.startDate }
+                : undefined), (screeningEventSeries.endDate !== undefined)
+                ? { endDate: screeningEventSeries.endDate }
+                : undefined), (screeningEventSeries.description !== undefined)
+                ? { description: screeningEventSeries.description }
+                : undefined), (screeningEventSeries.headline !== undefined)
+                ? { headline: screeningEventSeries.headline }
+                : undefined);
+            // イベント作成
+            creatingEvents.push({
+                project: { id: project.id, typeOf: factory.organizationType.Project },
+                typeOf: factory.eventType.ScreeningEvent,
+                eventStatus: factory.eventStatusType.EventScheduled,
+                name: screeningEventSeries.name,
+                doorTime: performanceInfo.door_time,
+                startDate: performanceInfo.start_date,
+                endDate: performanceInfo.end_date,
+                superEvent: screeningEventSuperEvent,
+                location: Object.assign({ typeOf: screeningRoom.typeOf, branchCode: screeningRoom.branchCode, name: screeningRoom.name }, (screeningRoom.address !== undefined) ? { address: screeningRoom.address } : undefined),
+                offers: offers,
+                // 旧フォーマットIDを追加特性に追加(2022-09-08~)
+                additionalProperty: [
+                    { name: 'tourNumber', value: String(performanceInfo.tour_number) },
+                    { name: 'oldEventId', value: oldEventId }
+                ],
+                // organizer追加(2023-07-12~)
+                organizer: { id: seller.id },
+                identifier: oldEventId
+            });
+        }
+        return creatingEvents;
+    });
+}
+function getTargetInfoByEventWithSchedule(settings, createDate) {
+    const performanceInfos = [];
+    const { eventSchedule } = settings;
+    // 作成対象時間: 9,10,11など
+    // const hours: string[] = ['9', '10', '11', '12', '13', '14', '15', '16', '17', '18', '19', '20', '21', '22'];
+    // const minutes = ['00', '15', '30', '45'];
+    // const tours = ['1', '2', '3', '4'];
+    // 1日分作成する
+    const now = (createDate instanceof Date)
+        ? moment(createDate)
+        : moment();
+    let startDate = moment.tz(`${now.tz(eventSchedule.scheduleTimezone)
+        .format('YYYYMMDD')} ${eventSchedule.startTime}`, 'YYYYMMDD HH:mm:ss', eventSchedule.scheduleTimezone);
+    const startDateShouldBeLte = moment.tz(`${now.tz(eventSchedule.scheduleTimezone)
+        .format('YYYYMMDD')} ${eventSchedule.endTime}`, 'YYYYMMDD HH:mm:ss', eventSchedule.scheduleTimezone);
+    const frequencyInMinutes = moment.duration(eventSchedule.repeatFrequency)
+        .asMinutes();
+    // tslint:disable-next-line:no-magic-numbers
+    const repeatCountInHour = Math.floor(60 / frequencyInMinutes);
+    let i = 0;
+    while (startDate < startDateShouldBeLte) {
+        i += 1;
+        if (i > 1) {
+            startDate = moment(startDate)
+                .add(moment.duration(eventSchedule.repeatFrequency));
+        }
+        const hour = `0${moment(startDate)
+            .format('HH')}`
+            // 2桁でない時は'0'詰め
+            // tslint:disable-next-line:no-magic-numbers
+            .slice(-2);
+        let tourIndex = i % repeatCountInHour;
+        if (tourIndex === 0) {
+            tourIndex = repeatCountInHour;
+        }
+        const tourNumber = `${hour}${tourIndex}`;
+        const endDate = moment(startDate)
+            .add(moment.duration(eventSchedule.duration));
+        const day = moment(startDate)
+            .tz(eventSchedule.scheduleTimezone)
+            .format('YYYYMMDD');
+        const startTime = moment(startDate)
+            .tz(eventSchedule.scheduleTimezone)
+            .format('HHmm');
+        const endTime = moment(endDate)
+            .tz(eventSchedule.scheduleTimezone)
+            .format('HHmm');
+        performanceInfos.push({
+            day: day,
+            start_time: startTime,
+            end_time: endTime,
+            door_time: startDate.toDate(),
+            start_date: startDate.toDate(),
+            end_date: endDate.toDate(),
+            tour_number: tourNumber,
+            duration: eventSchedule.duration
+        });
+    }
+    return performanceInfos;
+}

package/lib/chevre/service/task/createEvent/createEventBySchedule.js

@@ -11,349 +11,85 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createEventBySchedule = createEventBySchedule;
 const createDebug = require("debug");
-// import * as fs from 'fs';
-const moment = require("moment-timezone");
 const factory = require("../../../factory");
+const onEventChanged_1 = require("../../offer/onEventChanged");
 // import { Settings } from '../../../settings';
-const event_1 = require("../../event");
-const debug = createDebug('chevre-domain:service:task');
+const schedule2events_1 = require("./createEventBySchedule/schedule2events");
+const debug = createDebug('chevre-domain:service:task:createEvent');
+/**
+ * イベントコード指定でtttsイベントを冪等更新する
+ */
+function updateEvent4ttts(params) {
+    return (repos) => __awaiter(this, void 0, void 0, function* () {
+        const updateObject = {
+            id: params.attributes.identifier,
+            identifier: params.attributes.identifier, // support identifier(2025-09-03~)
+            typeOf: factory.eventType.ScreeningEvent
+        };
+        const actionAttributes = {
+            project: { typeOf: factory.organizationType.Project, id: params.project.id },
+            typeOf: factory.actionType.UpdateAction,
+            agent: { typeOf: factory.organizationType.Project, id: params.project.id },
+            object: updateObject,
+            // replacee: reservation,
+            // replacer: params.attributes, // $unsetもありうるのでいったん保留
+            targetCollection: {
+                id: params.attributes.identifier,
+                typeOf: factory.eventType.ScreeningEvent
+            }
+        };
+        const action = yield repos.action.start(actionAttributes);
+        let savedEvent;
+        try {
+            savedEvent = yield repos.event.saveEventByIdentifier4ttts({
+                // oldEventId: params.oldEventId,
+                attributes: params.attributes
+            });
+        }
+        catch (error) {
+            try {
+                yield repos.action.giveUp({ typeOf: action.typeOf, id: action.id, error });
+            }
+            catch (__) {
+                // 失敗したら仕方ない
+            }
+            throw error;
+        }
+        yield repos.action.completeWithVoid({ typeOf: action.typeOf, id: action.id, result: { id: savedEvent.id } });
+        yield (0, onEventChanged_1.onEventChanged)({
+            id: [savedEvent.id],
+            project: { id: params.project.id },
+            typeOf: factory.eventType.ScreeningEvent,
+            isNew: false,
+            useInform: true
+        })(repos
+        // スケジュールによるイベント作成ではendDateに変更がないのでpendingReservationsへの同期はひとまず必要なし
+        );
+    });
+}
 function createEvents(
 // schedule: factory.schedule.ISchedule4ttts | factory.schedule.IEventWithSchedule,
 schedule, createDate) {
-    // tslint:disable-next-line:cyclomatic-complexity max-func-body-length
     return (repos
     // settings: Settings
     ) => __awaiter(this, void 0, void 0, function* () {
-        var _a, _b, _c, _d, _e, _f, _g, _h;
-        // console.log(moment.duration(15, 'minute').toISOString());
-        // return;
-        const eventServiceId = (_b = (_a = schedule.offers) === null || _a === void 0 ? void 0 : _a.itemOffered) === null || _b === void 0 ? void 0 : _b.id;
-        const makesOffer = (_d = (_c = schedule.offers) === null || _c === void 0 ? void 0 : _c.seller) === null || _d === void 0 ? void 0 : _d.makesOffer;
-        const applicationIds = (Array.isArray(makesOffer))
-            ? makesOffer.map(({ availableAtOrFrom }) => availableAtOrFrom.id)
-            : [];
-        const eventSeriesId = (_e = schedule.superEvent) === null || _e === void 0 ? void 0 : _e.id;
-        if (typeof eventServiceId !== 'string' || eventServiceId === '') {
-            throw new factory.errors.NotFound('schedule.offers.itemOffered.id');
-        }
-        if (typeof eventSeriesId !== 'string' || eventSeriesId === '') {
-            throw new factory.errors.NotFound('schedule.superEvent.id');
-        }
-        const project = schedule.project;
-        // 引数情報取得
-        if (schedule.eventSchedule === undefined) {
-            throw new factory.errors.NotFound('eventSchedule');
-        }
-        const targetInfo = getTargetInfoByEventWithSchedule(schedule, createDate);
-        debug(targetInfo.length, 'targetInfos ->', targetInfo);
-        // fs.writeFileSync(
-        //     `${__dirname}/../../../../../targetInfo_${schedule.eventSchedule?.typeOf}.json`,
-        //     JSON.stringify(targetInfo, null, '    ')
-        // );
-        // return;
-        // 施設コンテンツ検索
-        const screeningEventSeries = (yield repos.eventSeries.projectEventSeriesFields({
-            project: { id: { $eq: project.id } },
-            id: { $eq: eventSeriesId }
-        }, [
-            'location', 'additionalProperty', 'description', 'endDate', 'headline', 'kanaName', 'name',
-            'soundFormat', 'startDate', 'typeOf', 'videoFormat', 'workPerformed'
-        ])).shift();
-        if (screeningEventSeries === undefined) {
-            throw new factory.errors.NotFound(factory.eventType.ScreeningEventSeries);
-        }
-        const workPerformedIdentifier = screeningEventSeries.workPerformed.identifier;
-        // 劇場検索
-        const movieTheaters = yield repos.movieTheater.projectFields({
-            limit: 1,
-            page: 1,
-            project: { id: { $eq: project.id } },
-            branchCode: { $eq: screeningEventSeries.location.branchCode }
-        }, ['id', 'branchCode', 'offers', 'parentOrganization']);
-        const movieTheater = movieTheaters.shift();
-        if (movieTheater === undefined) {
-            throw new factory.errors.NotFound(factory.placeType.MovieTheater);
-        }
-        const seller = movieTheater.parentOrganization;
-        const screeningRooms = yield repos.screeningRoom.searchScreeningRooms({
-            limit: 1,
-            page: 1,
-            project: { id: { $eq: project.id } },
-            containedInPlace: { id: { $eq: movieTheater.id } }
-        });
-        const screeningRoom = screeningRooms.shift();
-        if (screeningRoom === undefined) {
-            throw new factory.errors.NotFound(factory.placeType.ScreeningRoom);
-        }
-        // 興行検索
-        // const eventServiceProductID = schedule.eventServiceProductID; // 興行設定に変更(2023-09-24~)
-        const searchEventServicesResult = yield repos.product.projectFields({
-            limit: 1,
-            page: 1,
-            project: { id: { $eq: project.id } },
-            id: { $eq: eventServiceId }
-            // productID: { $eq: eventServiceProductID }
-        }, ['name']);
-        const eventService = searchEventServicesResult.shift();
-        if (typeof (eventService === null || eventService === void 0 ? void 0 : eventService.id) !== 'string') {
-            throw new Error(`EventService ${eventServiceId} not found`);
-        }
-        let existingApplicationMembers = [];
-        if (applicationIds.length > 0) {
-            existingApplicationMembers = yield repos.member.searchCustomerMembers({
-                limit: 100,
-                page: 1,
-                project: { id: project.id },
-                member: {
-                    // typeOf: {
-                    //     $eq: factory.creativeWorkType.WebApplication
-                    // },
-                    id: { $in: applicationIds }
-                }
-            });
-        }
-        // ロールで絞る(customer or pos)
-        // existingApplicationMembers = existingApplicationMembers
-        //     .filter((m) => {
-        //         return Array.isArray(m.member.hasRole) && m.member.hasRole.some((r) => AVAILABLE_ROLE_NAMES.includes(r.roleName));
-        //     });
-        for (const performanceInfo of targetInfo) {
-            const oldEventId = [
-                // tslint:disable-next-line:no-magic-numbers
-                performanceInfo.day.slice(-6),
-                workPerformedIdentifier,
-                movieTheater.branchCode,
-                screeningRoom.branchCode,
-                performanceInfo.start_time
-            ].join('');
-            const maxValue = (_g = (_f = movieTheater.offers) === null || _f === void 0 ? void 0 : _f.eligibleQuantity) === null || _g === void 0 ? void 0 : _g.maxValue;
-            const availabilityEnds = moment(performanceInfo.end_date)
-                .tz('Asia/Tokyo')
-                .endOf('date')
-                .toDate();
-            const availabilityStarts = moment(performanceInfo.start_date)
-                .tz('Asia/Tokyo')
-                .startOf('date')
-                // tslint:disable-next-line:no-magic-numbers
-                .add(-3, 'months')
-                .toDate();
-            const validThrough = moment(performanceInfo.end_date)
-                .tz('Asia/Tokyo')
-                .endOf('date')
-                .toDate();
-            const validFrom = moment(performanceInfo.start_date)
-                .tz('Asia/Tokyo')
-                .startOf('date')
-                // tslint:disable-next-line:no-magic-numbers
-                .add(-3, 'months')
-                .toDate();
-            const offersSeller = {
-                typeOf: factory.organizationType.Corporation,
-                id: String(seller === null || seller === void 0 ? void 0 : seller.id),
-                // event.offersにseller.makesOfferを追加(2022-11-18~)
-                makesOffer: existingApplicationMembers.map((a) => {
-                    return {
-                        typeOf: factory.offerType.Offer,
-                        availableAtOrFrom: { id: a.member.id }, // support no-array(2024-10-13~),
-                        availabilityEnds,
-                        availabilityStarts,
-                        validFrom,
-                        validThrough
-                    };
-                })
-            };
-            const offers = Object.assign({ typeOf: factory.offerType.Offer, eligibleQuantity: Object.assign({ typeOf: 'QuantitativeValue', unitCode: factory.unitCode.C62 }, (typeof maxValue === 'number') ? { maxValue } : undefined // ひとまず全座席予約可能なように
-                ), itemOffered: Object.assign({ 
-                    // 興行ID追加(2022-09-01~)
-                    id: eventService.id, serviceOutput: {
-                        typeOf: factory.reservationType.EventReservation,
-                        reservedTicket: {
-                            typeOf: 'Ticket',
-                            ticketedSeat: { typeOf: factory.placeType.Seat }
-                        }
-                    }, typeOf: factory.product.ProductType.EventService, availableChannel: {
-                        typeOf: 'ServiceChannel',
-                        serviceLocation: {
-                            typeOf: screeningRoom.typeOf,
-                            branchCode: screeningRoom.branchCode,
-                            name: screeningRoom.name,
-                            containedInPlace: Object.assign({ typeOf: screeningEventSeries.location.typeOf, id: screeningEventSeries.location.id, branchCode: screeningEventSeries.location.branchCode }, (screeningEventSeries.location.name !== undefined)
-                                ? { name: screeningEventSeries.location.name }
-                                : undefined)
-                        }
-                    } }, { name: { ja: (typeof eventService.name === 'string') ? eventService.name : String((_h = eventService.name) === null || _h === void 0 ? void 0 : _h.ja) } }), seller: offersSeller }, {
-            // availabilityEnds, // discontinue(2024-10-16~)
-            // availabilityStarts,
-            // validThrough,
-            // validFrom
-            });
-            const screeningEventSuperEvent = Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({ typeOf: screeningEventSeries.typeOf, id: screeningEventSeries.id, videoFormat: screeningEventSeries.videoFormat, soundFormat: screeningEventSeries.soundFormat, workPerformed: screeningEventSeries.workPerformed, location: screeningEventSeries.location, kanaName: screeningEventSeries.kanaName, name: screeningEventSeries.name }, (Array.isArray(screeningEventSeries.additionalProperty))
-                ? { additionalProperty: screeningEventSeries.additionalProperty }
-                : undefined), (screeningEventSeries.startDate !== undefined)
-                ? { startDate: screeningEventSeries.startDate }
-                : undefined), (screeningEventSeries.endDate !== undefined)
-                ? { endDate: screeningEventSeries.endDate }
-                : undefined), (screeningEventSeries.description !== undefined)
-                ? { description: screeningEventSeries.description }
-                : undefined), (screeningEventSeries.headline !== undefined)
-                ? { headline: screeningEventSeries.headline }
-                : undefined);
-            // イベント作成
-            const eventAttributes = {
-                project: { id: project.id, typeOf: factory.organizationType.Project },
-                typeOf: factory.eventType.ScreeningEvent,
-                eventStatus: factory.eventStatusType.EventScheduled,
-                name: screeningEventSeries.name,
-                doorTime: performanceInfo.door_time,
-                startDate: performanceInfo.start_date,
-                endDate: performanceInfo.end_date,
-                superEvent: screeningEventSuperEvent,
-                location: Object.assign({ typeOf: screeningRoom.typeOf, branchCode: screeningRoom.branchCode, name: screeningRoom.name }, (screeningRoom.address !== undefined) ? { address: screeningRoom.address } : undefined),
-                offers: offers,
-                // checkInCount: undefined,
-                // attendeeCount: undefined,
-                // 旧フォーマットIDを追加特性に追加(2022-09-08~)
-                additionalProperty: [
-                    { name: 'tourNumber', value: String(performanceInfo.tour_number) },
-                    { name: 'oldEventId', value: oldEventId }
-                ],
-                // organizer追加(2023-07-12~)
-                organizer: { id: seller.id }
-            };
+        const creatingEvents = yield (0, schedule2events_1.schedule2events)(schedule, createDate)(repos);
+        for (const eventAttributes of creatingEvents) {
             // domain.serviceで実装(2022-09-10~)
-            debug('updating event...', oldEventId, eventAttributes.startDate);
-            yield (0, event_1.updateEvent4ttts)({
-                oldEventId,
+            debug('updating event...', eventAttributes.identifier, eventAttributes.startDate);
+            yield updateEvent4ttts({
+                // oldEventId,
                 attributes: eventAttributes,
                 project: { id: eventAttributes.project.id }
                 // agent: eventAttributes.project
             })(repos
             // settings
             );
-            debug('event update(updateEvent4ttts)', oldEventId, eventAttributes.startDate);
+            debug('event update(updateEvent4ttts)', eventAttributes.identifier, eventAttributes.startDate);
         }
-        debug(targetInfo.length, 'events updated');
+        debug(creatingEvents.length, 'events updated');
     });
 }
-/**
- * パフォーマンス作成・作成対象情報取得
- */
-// function getTargetInfoForCreateFromSetting(
-//     settings: factory.schedule.ISchedule4ttts,
-//     createDate: Date
-// ): ITargetPerformanceInfo[] {
-//     const performanceInfos: ITargetPerformanceInfo[] = [];
-//     const { days, duration, noPerformanceTimes, hours, minutes, tours } = settings;
-//     // 本日日付+開始日までの日数から作成開始日セット
-//     // 作成日数分の作成対象日付作成
-//     for (let index = 0; index < days; index = index + 1) {
-//         const now = (createDate instanceof Date)
-//             ? moment(createDate)
-//                 .add(index, 'days')
-//             : moment()
-//                 .add(index, 'days');
-//         hours.forEach((hourStr) => {
-//             // 2桁でない時は'0'詰め
-//             // tslint:disable-next-line:no-magic-numbers
-//             const hour = `0${hourStr}`.slice(-2);
-//             minutes.forEach((minute, minuteIndex) => {
-//                 // ツアー情報作成
-//                 const tourNumber = `${hour}${tours[minuteIndex]}`;
-//                 const startDate = moment(
-//                     `${now.tz('Asia/Tokyo')
-//                         .format('YYYYMMDD')} ${hour}:${minute}:00+09:00`,
-//                     'YYYYMMDD HH:mm:ssZ'
-//                 );
-//                 const endDate = moment(startDate)
-//                     .add(duration, 'minutes');
-//                 const day = moment(startDate)
-//                     .tz('Asia/Tokyo')
-//                     .format('YYYYMMDD');
-//                 const startTime = moment(startDate)
-//                     .tz('Asia/Tokyo')
-//                     .format('HHmm');
-//                 const endTime = moment(endDate)
-//                     .tz('Asia/Tokyo')
-//                     .format('HHmm');
-//                 // パフォーマンスを作成しない時刻に指定されていなかったら作成
-//                 if (noPerformanceTimes.indexOf(`${hour}${minute}`) < 0) {
-//                     performanceInfos.push({
-//                         day: day,
-//                         start_time: startTime,
-//                         end_time: endTime,
-//                         door_time: startDate.toDate(),
-//                         start_date: startDate.toDate(),
-//                         end_date: endDate.toDate(),
-//                         tour_number: tourNumber,
-//                         duration: moment.duration(duration, 'minutes')
-//                             .toISOString()
-//                     });
-//                 }
-//             });
-//         });
-//     }
-//     return performanceInfos;
-// }
-function getTargetInfoByEventWithSchedule(settings, createDate) {
-    const performanceInfos = [];
-    const { eventSchedule } = settings;
-    // 作成対象時間: 9,10,11など
-    // const hours: string[] = ['9', '10', '11', '12', '13', '14', '15', '16', '17', '18', '19', '20', '21', '22'];
-    // const minutes = ['00', '15', '30', '45'];
-    // const tours = ['1', '2', '3', '4'];
-    // 1日分作成する
-    const now = (createDate instanceof Date)
-        ? moment(createDate)
-        : moment();
-    let startDate = moment.tz(`${now.tz(eventSchedule.scheduleTimezone)
-        .format('YYYYMMDD')} ${eventSchedule.startTime}`, 'YYYYMMDD HH:mm:ss', eventSchedule.scheduleTimezone);
-    const startDateShouldBeLte = moment.tz(`${now.tz(eventSchedule.scheduleTimezone)
-        .format('YYYYMMDD')} ${eventSchedule.endTime}`, 'YYYYMMDD HH:mm:ss', eventSchedule.scheduleTimezone);
-    const frequencyInMinutes = moment.duration(eventSchedule.repeatFrequency)
-        .asMinutes();
-    // tslint:disable-next-line:no-magic-numbers
-    const repeatCountInHour = Math.floor(60 / frequencyInMinutes);
-    let i = 0;
-    while (startDate < startDateShouldBeLte) {
-        i += 1;
-        if (i > 1) {
-            startDate = moment(startDate)
-                .add(moment.duration(eventSchedule.repeatFrequency));
-        }
-        const hour = `0${moment(startDate)
-            .format('HH')}`
-            // 2桁でない時は'0'詰め
-            // tslint:disable-next-line:no-magic-numbers
-            .slice(-2);
-        let tourIndex = i % repeatCountInHour;
-        if (tourIndex === 0) {
-            tourIndex = repeatCountInHour;
-        }
-        const tourNumber = `${hour}${tourIndex}`;
-        const endDate = moment(startDate)
-            .add(moment.duration(eventSchedule.duration));
-        const day = moment(startDate)
-            .tz(eventSchedule.scheduleTimezone)
-            .format('YYYYMMDD');
-        const startTime = moment(startDate)
-            .tz(eventSchedule.scheduleTimezone)
-            .format('HHmm');
-        const endTime = moment(endDate)
-            .tz(eventSchedule.scheduleTimezone)
-            .format('HHmm');
-        performanceInfos.push({
-            day: day,
-            start_time: startTime,
-            end_time: endTime,
-            door_time: startDate.toDate(),
-            start_date: startDate.toDate(),
-            end_date: endDate.toDate(),
-            tour_number: tourNumber,
-            duration: eventSchedule.duration
-        });
-    }
-    return performanceInfos;
-}
 function createEventBySchedule(params) {
     return (repos
     // settings: Settings

package/package.json

@@ -11,7 +11,7 @@
   "dependencies": {
     "@aws-sdk/client-cognito-identity-provider": "3.600.0",
     "@aws-sdk/credential-providers": "3.600.0",
-    "@chevre/factory": "4.398.0-alpha.3",
+    "@chevre/factory": "4.398.0-alpha.4",
     "@cinerino/sdk": "12.2.0",
     "@motionpicture/coa-service": "9.6.0",
     "@motionpicture/gmo-service": "5.4.0-alpha.1",
@@ -115,5 +115,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build && npm test && npm run doc"
   },
-  "version": "22.13.0-alpha.6"
+  "version": "22.13.0-alpha.7"
 }