@chevre/domain 21.27.0-alpha.10 → 21.27.0-alpha.12

package/example/src/chevre/transaction/processPlaceOrder.ts

@@ -50,7 +50,6 @@ async function main() {
         project: { id: project.id },
         agent: { id: CLIENT_ID },
         object: {
-            typeOf: chevre.factory.action.authorize.paymentMethod.any.ResultType.Payment,
             amount: AMOUNT,
             paymentMethod: paymentMethodType,
             issuedThrough: { id: paymentServiceId },
@@ -99,7 +98,6 @@ async function main() {
                                 project: { id: project.id },
                                 agent: { id: CLIENT_ID },
                                 object: {
-                                    typeOf: chevre.factory.action.authorize.paymentMethod.any.ResultType.Payment,
                                     amount: AMOUNT,
                                     paymentMethodId: publishPaymentUrlResult.paymentMethodId,
                                     paymentMethod: paymentMethodType,

package/lib/chevre/service/assetTransaction/reserve.js

@@ -17,6 +17,7 @@ const moment = require("moment");
 const pecorinoapi = require("../../pecorinoapi");
 const factory = require("../../factory");
 const OfferService = require("../offer");
+const onEventChanged_1 = require("../offer/onEventChanged");
 const cancelReservation_1 = require("../reserve/cancelReservation");
 const confirmReservation_1 = require("../reserve/confirmReservation");
 const settings_1 = require("../../settings");
@@ -838,7 +839,7 @@ function processLockSeats(params) {
 function onReservationsCreated(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         // 集計タスク
-        yield OfferService.createAggregateScreeningEventIfNotExist({
+        yield (0, onEventChanged_1.createAggregateScreeningEventIfNotExist)({
             project: params.event.project,
             reservationFor: [{ id: params.event.id }],
             force: false,

package/lib/chevre/service/event.js

@@ -23,7 +23,7 @@ const credentials_1 = require("../credentials");
 const factory = require("../factory");
 const createEvent_1 = require("./event/createEvent");
 Object.defineProperty(exports, "createEvent", { enumerable: true, get: function () { return createEvent_1.createEvent; } });
-const offer_1 = require("./offer");
+const onEventChanged_1 = require("./offer/onEventChanged");
 const debug = createDebug('chevre-domain:service:event');
 const coaAuthClient = new COA.auth.RefreshToken({
     endpoint: credentials_1.credentials.coa.endpoint,
@@ -793,7 +793,7 @@ function updateEvent4ttts(params) {
         }
         // アクション完了
         yield repos.action.completeWithVoid({ typeOf: action.typeOf, id: action.id, result: { id: event.id } });
-        yield (0, offer_1.onEventChanged)({
+        yield (0, onEventChanged_1.onEventChanged)({
             id: [event.id],
             project: { id: event.project.id },
             typeOf: event.typeOf,

package/lib/chevre/service/offer/onEventChanged.d.ts

@@ -0,0 +1,25 @@
+import type { MongoRepository as EventRepo } from '../../repo/event';
+import type { MongoRepository as ProjectRepo } from '../../repo/project';
+import type { MongoRepository as TaskRepo } from '../../repo/task';
+import * as factory from '../../factory';
+/**
+ * イベント変更時処理
+ */
+declare function onEventChanged(params: factory.task.onEventChanged.IData): (repos: {
+    event: EventRepo;
+    project: ProjectRepo;
+    task: TaskRepo;
+}) => Promise<void>;
+declare function createAggregateScreeningEventIfNotExist(params: {
+    project: {
+        id: string;
+    };
+    reservationFor: {
+        id: string;
+    }[];
+    force: boolean;
+    identifier: string;
+}): (repos: {
+    task: TaskRepo;
+}) => Promise<void>;
+export { createAggregateScreeningEventIfNotExist, onEventChanged };

package/lib/chevre/service/offer/onEventChanged.js

@@ -0,0 +1,217 @@
+"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.onEventChanged = exports.createAggregateScreeningEventIfNotExist = void 0;
+const factory = require("../../factory");
+const settings_1 = require("../../settings");
+const informEvents = settings_1.settings.onEventChanged.informEvent;
+/**
+ * イベント変更時処理
+ */
+function onEventChanged(params) {
+    return (repos) => __awaiter(this, void 0, void 0, function* () {
+        if (params.id.length > 0) {
+            // ScreeningEventであれば集計タスク
+            if (params.typeOf === factory.eventType.ScreeningEvent) {
+                yield createAggregateScreeningEventIfNotExist({
+                    project: { id: params.project.id },
+                    reservationFor: params.id.map((id) => {
+                        return { id };
+                    }),
+                    // 新規作成の場合は強制的に集計
+                    force: params.isNew,
+                    identifier: `onEventChanged`
+                })(repos);
+            }
+            // 通知タスク作成(2023-06-08~)
+            if (params.useInform === true) {
+                yield createInformTasks({
+                    project: { id: params.project.id },
+                    ids: params.id,
+                    typeOf: params.typeOf
+                })(repos);
+            }
+            if (params.useSync === true) {
+                switch (params.typeOf) {
+                    case factory.eventType.ScreeningEventSeries:
+                        // 施設コンテンツを興行イベントへ同期(2023-07-28~)
+                        yield syncEventSeries2screeningEvents({
+                            project: { id: params.project.id },
+                            ids: params.id
+                        })(repos);
+                        break;
+                    default:
+                    // no op
+                }
+            }
+        }
+    });
+}
+exports.onEventChanged = onEventChanged;
+function syncEventSeries2screeningEvents(params) {
+    return (repos) => __awaiter(this, void 0, void 0, function* () {
+        const now = new Date();
+        for (const eventSeriesId of params.ids) {
+            yield repos.event.syncScreeningEventSeries2screeningEvents({
+                project: { id: params.project.id },
+                superEvent: { id: eventSeriesId },
+                startDate: { $gte: now }
+            });
+        }
+    });
+}
+function createAggregateScreeningEventIfNotExist(params) {
+    return (repos) => __awaiter(this, void 0, void 0, function* () {
+        let aggregateTasks = [];
+        const runsAt = new Date();
+        const remainingNumberOfTries = 2;
+        const project = {
+            id: params.project.id, typeOf: factory.organizationType.Project
+        };
+        const nowInMilliseconds = Date.now();
+        if (params.force) {
+            aggregateTasks = params.reservationFor.map((reservationFor) => {
+                const taskIdentifier = `${params.project.id}:${factory.taskName.AggregateScreeningEvent}:${reservationFor.id}:${params.identifier}:${nowInMilliseconds}`;
+                return {
+                    identifier: taskIdentifier,
+                    project,
+                    name: factory.taskName.AggregateScreeningEvent,
+                    status: factory.taskStatus.Ready,
+                    runsAt,
+                    remainingNumberOfTries,
+                    numberOfTried: 0,
+                    executionResults: [],
+                    data: { typeOf: factory.eventType.ScreeningEvent, id: reservationFor.id }
+                };
+            });
+        }
+        else {
+            for (const reservationFor of params.reservationFor) {
+                // 冗長な作成を避ける
+                const readyAggregateScreeningEventTaskDoc = yield repos.task.taskModel.findOne({
+                    'project.id': { $eq: project.id },
+                    name: { $eq: factory.taskName.AggregateScreeningEvent },
+                    status: { $eq: factory.taskStatus.Ready },
+                    'data.id': { $exists: true, $eq: reservationFor.id }
+                }, { _id: 1 })
+                    .exec();
+                if (readyAggregateScreeningEventTaskDoc === null) {
+                    const taskIdentifier = `${params.project.id}:${factory.taskName.AggregateScreeningEvent}:${reservationFor.id}:${params.identifier}:${nowInMilliseconds}`;
+                    aggregateTasks.push({
+                        identifier: taskIdentifier,
+                        project,
+                        name: factory.taskName.AggregateScreeningEvent,
+                        status: factory.taskStatus.Ready,
+                        runsAt,
+                        remainingNumberOfTries,
+                        numberOfTried: 0,
+                        executionResults: [],
+                        data: { typeOf: factory.eventType.ScreeningEvent, id: reservationFor.id }
+                    });
+                }
+            }
+        }
+        if (aggregateTasks.length > 0) {
+            yield repos.task.saveMany(aggregateTasks, { emitImmediately: true });
+        }
+    });
+}
+exports.createAggregateScreeningEventIfNotExist = createAggregateScreeningEventIfNotExist;
+function createInformTasks(params) {
+    // tslint:disable-next-line:max-func-body-length
+    return (repos) => __awaiter(this, void 0, void 0, function* () {
+        let events4inform;
+        if (params.typeOf === factory.eventType.Event) {
+            events4inform = yield repos.event.search({
+                id: { $in: params.ids },
+                typeOf: params.typeOf
+            }, [], [
+                'aggregateEntranceGate', 'aggregateOffer', 'aggregateReservation',
+                'remainingAttendeeCapacity', 'checkInCount', 'attendeeCount'
+            ]);
+        }
+        else if (params.typeOf === factory.eventType.ScreeningEvent) {
+            const screeningEvents4inform = yield repos.event.search({
+                id: { $in: params.ids },
+                typeOf: params.typeOf
+            }, [], [
+                'aggregateEntranceGate', 'aggregateOffer', 'aggregateReservation',
+                'remainingAttendeeCapacity', 'checkInCount', 'attendeeCount'
+            ]);
+            // 最適化(2024-03-22~)
+            events4inform = screeningEvents4inform.map(({ project, organizer, typeOf, name, doorTime, endDate, eventStatus, location, startDate, superEvent, offers, id, additionalProperty }) => {
+                var _a;
+                return Object.assign({ project, organizer, typeOf, name, doorTime, endDate,
+                    eventStatus, location, startDate, superEvent, id, additionalProperty }, (settings_1.USE_OPTIMIZE_INFORM_EVENT)
+                    ? {
+                        offers: (((_a = offers.offeredThrough) === null || _a === void 0 ? void 0 : _a.identifier) === factory.service.webAPI.Identifier.COA)
+                            ? {
+                                typeOf: offers.typeOf,
+                                itemOffered: offers.itemOffered
+                            }
+                            : {
+                                typeOf: offers.typeOf,
+                                itemOffered: offers.itemOffered,
+                                seller: {
+                                    id: offers.seller.id,
+                                    typeOf: offers.seller.typeOf
+                                }
+                            }
+                    }
+                    : { offers });
+            });
+        }
+        else {
+            events4inform = yield repos.event.search({
+                id: { $in: params.ids },
+                typeOf: params.typeOf
+            }, [], []);
+        }
+        if (events4inform.length > 0) {
+            const taskRunsAt = new Date();
+            const informTasks = [];
+            informEvents === null || informEvents === void 0 ? void 0 : informEvents.forEach((informEvent) => {
+                var _a;
+                const informUrl = String((_a = informEvent.recipient) === null || _a === void 0 ? void 0 : _a.url);
+                events4inform.forEach((event4inform) => {
+                    var _a;
+                    // _idは不要であり、存在すると予期せぬ影響を及ぼす可能性がある
+                    delete event4inform._id;
+                    const informActionAttributes = {
+                        agent: event4inform.project,
+                        object: event4inform,
+                        project: event4inform.project,
+                        recipient: {
+                            id: '',
+                            name: String((_a = informEvent.recipient) === null || _a === void 0 ? void 0 : _a.name),
+                            typeOf: factory.creativeWorkType.WebApplication,
+                            url: informUrl
+                        },
+                        typeOf: factory.actionType.InformAction
+                    };
+                    informTasks.push({
+                        project: event4inform.project,
+                        name: factory.taskName.TriggerWebhook,
+                        status: factory.taskStatus.Ready,
+                        runsAt: taskRunsAt,
+                        remainingNumberOfTries: 10,
+                        numberOfTried: 0,
+                        executionResults: [],
+                        data: informActionAttributes
+                    });
+                });
+            });
+            if (informTasks.length > 0) {
+                yield repos.task.saveMany(informTasks, { emitImmediately: true });
+            }
+        }
+    });
+}

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

@@ -1,9 +1,7 @@
 import type { MongoRepository as EventRepo } from '../repo/event';
 import type { MongoRepository as PlaceRepo } from '../repo/place';
 import type { MongoRepository as PriceSpecificationRepo } from '../repo/priceSpecification';
-import type { MongoRepository as ProjectRepo } from '../repo/project';
 import type { StockHolderRepository as StockHolderRepo } from '../repo/stockHolder';
-import type { MongoRepository as TaskRepo } from '../repo/task';
 import * as factory from '../factory';
 import * as EventOfferService from './offer/event';
 import * as EventServiceByCOAOfferService from './offer/eventServiceByCOA';
@@ -46,41 +44,3 @@ export declare function searchEventSeatOffersWithPaging(params: {
     stockHolder: StockHolderRepo;
     place: PlaceRepo;
 }) => Promise<Pick<factory.place.seat.IPlaceWithOffer, 'branchCode' | 'containedInPlace' | 'offers' | 'seatingType' | 'typeOf'>[]>;
-/**
- * イベント変更時処理
- */
-export declare function onEventChanged(params: factory.task.onEventChanged.IData): (repos: {
-    event: EventRepo;
-    project: ProjectRepo;
-    task: TaskRepo;
-}) => Promise<void>;
-export declare function syncEventSeries2screeningEvents(params: {
-    project: {
-        id: string;
-    };
-    ids: string[];
-}): (repos: {
-    event: EventRepo;
-}) => Promise<void>;
-export declare function createAggregateScreeningEventIfNotExist(params: {
-    project: {
-        id: string;
-    };
-    reservationFor: {
-        id: string;
-    }[];
-    force: boolean;
-    identifier: string;
-}): (repos: {
-    task: TaskRepo;
-}) => Promise<void>;
-export declare function createInformTasks(params: {
-    project: {
-        id: string;
-    };
-    ids: string[];
-    typeOf: factory.eventType;
-}): (repos: {
-    event: EventRepo;
-    task: TaskRepo;
-}) => Promise<void>;

package/lib/chevre/service/offer.js

@@ -9,7 +9,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createInformTasks = exports.createAggregateScreeningEventIfNotExist = exports.syncEventSeries2screeningEvents = exports.onEventChanged = exports.searchEventSeatOffersWithPaging = exports.addOffers2Seat = exports.product = exports.moneyTransfer = exports.eventServiceByCOA = exports.event = void 0;
+exports.searchEventSeatOffersWithPaging = exports.addOffers2Seat = exports.product = exports.moneyTransfer = exports.eventServiceByCOA = exports.event = void 0;
 const moment = require("moment");
 const factory = require("../factory");
 const EventOfferService = require("./offer/event");
@@ -20,8 +20,6 @@ const MoneyTransferOfferService = require("./offer/moneyTransfer");
 exports.moneyTransfer = MoneyTransferOfferService;
 const ProductOfferService = require("./offer/product");
 exports.product = ProductOfferService;
-const settings_1 = require("../settings");
-const informEvents = settings_1.settings.onEventChanged.informEvent;
 /**
  * 座席にオファー情報を付加する
  */
@@ -127,184 +125,3 @@ function searchEventSeatOffersWithPaging(params) {
     });
 }
 exports.searchEventSeatOffersWithPaging = searchEventSeatOffersWithPaging;
-/**
- * イベント変更時処理
- */
-function onEventChanged(params) {
-    return (repos) => __awaiter(this, void 0, void 0, function* () {
-        if (params.id.length > 0) {
-            // ScreeningEventであれば集計タスク
-            if (params.typeOf === factory.eventType.ScreeningEvent) {
-                yield createAggregateScreeningEventIfNotExist({
-                    project: { id: params.project.id },
-                    reservationFor: params.id.map((id) => {
-                        return { id };
-                    }),
-                    // 新規作成の場合は強制的に集計
-                    force: params.isNew,
-                    identifier: `onEventChanged`
-                })(repos);
-            }
-            // 通知タスク作成(2023-06-08~)
-            if (params.useInform === true) {
-                yield createInformTasks({
-                    project: { id: params.project.id },
-                    ids: params.id,
-                    typeOf: params.typeOf
-                })(repos);
-            }
-            if (params.useSync === true) {
-                switch (params.typeOf) {
-                    case factory.eventType.ScreeningEventSeries:
-                        // 施設コンテンツを興行イベントへ同期(2023-07-28~)
-                        yield syncEventSeries2screeningEvents({
-                            project: { id: params.project.id },
-                            ids: params.id
-                        })(repos);
-                        break;
-                    default:
-                    // no op
-                }
-            }
-        }
-    });
-}
-exports.onEventChanged = onEventChanged;
-function syncEventSeries2screeningEvents(params) {
-    return (repos) => __awaiter(this, void 0, void 0, function* () {
-        const now = new Date();
-        for (const eventSeriesId of params.ids) {
-            yield repos.event.syncScreeningEventSeries2screeningEvents({
-                project: { id: params.project.id },
-                superEvent: { id: eventSeriesId },
-                startDate: { $gte: now }
-            });
-        }
-    });
-}
-exports.syncEventSeries2screeningEvents = syncEventSeries2screeningEvents;
-function createAggregateScreeningEventIfNotExist(params) {
-    return (repos) => __awaiter(this, void 0, void 0, function* () {
-        let aggregateTasks = [];
-        const runsAt = new Date();
-        const remainingNumberOfTries = 2;
-        const project = {
-            id: params.project.id, typeOf: factory.organizationType.Project
-        };
-        const nowInMilliseconds = Date.now();
-        if (params.force) {
-            aggregateTasks = params.reservationFor.map((reservationFor) => {
-                const taskIdentifier = `${params.project.id}:${factory.taskName.AggregateScreeningEvent}:${reservationFor.id}:${params.identifier}:${nowInMilliseconds}`;
-                return {
-                    identifier: taskIdentifier,
-                    project,
-                    name: factory.taskName.AggregateScreeningEvent,
-                    status: factory.taskStatus.Ready,
-                    runsAt,
-                    remainingNumberOfTries,
-                    numberOfTried: 0,
-                    executionResults: [],
-                    data: { typeOf: factory.eventType.ScreeningEvent, id: reservationFor.id }
-                };
-            });
-        }
-        else {
-            for (const reservationFor of params.reservationFor) {
-                // 冗長な作成を避ける
-                const readyAggregateScreeningEventTaskDoc = yield repos.task.taskModel.findOne({
-                    'project.id': { $eq: project.id },
-                    name: { $eq: factory.taskName.AggregateScreeningEvent },
-                    status: { $eq: factory.taskStatus.Ready },
-                    'data.id': { $exists: true, $eq: reservationFor.id }
-                }, { _id: 1 })
-                    .exec();
-                if (readyAggregateScreeningEventTaskDoc === null) {
-                    const taskIdentifier = `${params.project.id}:${factory.taskName.AggregateScreeningEvent}:${reservationFor.id}:${params.identifier}:${nowInMilliseconds}`;
-                    aggregateTasks.push({
-                        identifier: taskIdentifier,
-                        project,
-                        name: factory.taskName.AggregateScreeningEvent,
-                        status: factory.taskStatus.Ready,
-                        runsAt,
-                        remainingNumberOfTries,
-                        numberOfTried: 0,
-                        executionResults: [],
-                        data: { typeOf: factory.eventType.ScreeningEvent, id: reservationFor.id }
-                    });
-                }
-            }
-        }
-        if (aggregateTasks.length > 0) {
-            yield repos.task.saveMany(aggregateTasks, { emitImmediately: true });
-        }
-    });
-}
-exports.createAggregateScreeningEventIfNotExist = createAggregateScreeningEventIfNotExist;
-function createInformTasks(params) {
-    return (repos) => __awaiter(this, void 0, void 0, function* () {
-        let events4inform;
-        if (params.typeOf === factory.eventType.Event) {
-            events4inform = yield repos.event.search({
-                id: { $in: params.ids },
-                typeOf: params.typeOf
-            }, [], [
-                'aggregateEntranceGate', 'aggregateOffer', 'aggregateReservation',
-                'remainingAttendeeCapacity', 'checkInCount', 'attendeeCount'
-            ]);
-        }
-        else if (params.typeOf === factory.eventType.ScreeningEvent) {
-            events4inform = yield repos.event.search({
-                id: { $in: params.ids },
-                typeOf: params.typeOf
-            }, [], [
-                'aggregateEntranceGate', 'aggregateOffer', 'aggregateReservation',
-                'remainingAttendeeCapacity', 'checkInCount', 'attendeeCount'
-            ]);
-        }
-        else {
-            events4inform = yield repos.event.search({
-                id: { $in: params.ids },
-                typeOf: params.typeOf
-            }, [], []);
-        }
-        if (events4inform.length > 0) {
-            const taskRunsAt = new Date();
-            const informTasks = [];
-            informEvents === null || informEvents === void 0 ? void 0 : informEvents.forEach((informEvent) => {
-                var _a;
-                const informUrl = String((_a = informEvent.recipient) === null || _a === void 0 ? void 0 : _a.url);
-                events4inform.forEach((event4inform) => {
-                    var _a;
-                    // _idは不要であり、存在すると予期せぬ影響を及ぼす可能性がある
-                    delete event4inform._id;
-                    const informActionAttributes = {
-                        agent: event4inform.project,
-                        object: event4inform,
-                        project: event4inform.project,
-                        recipient: {
-                            id: '',
-                            name: String((_a = informEvent.recipient) === null || _a === void 0 ? void 0 : _a.name),
-                            typeOf: factory.creativeWorkType.WebApplication,
-                            url: informUrl
-                        },
-                        typeOf: factory.actionType.InformAction
-                    };
-                    informTasks.push({
-                        project: event4inform.project,
-                        name: factory.taskName.TriggerWebhook,
-                        status: factory.taskStatus.Ready,
-                        runsAt: taskRunsAt,
-                        remainingNumberOfTries: 10,
-                        numberOfTried: 0,
-                        executionResults: [],
-                        data: informActionAttributes
-                    });
-                });
-            });
-            if (informTasks.length > 0) {
-                yield repos.task.saveMany(informTasks, { emitImmediately: true });
-            }
-        }
-    });
-}
-exports.createInformTasks = createInformTasks;

package/lib/chevre/service/payment/any.d.ts

@@ -84,11 +84,12 @@ declare function publishPaymentUrl(params: {
     agent: {
         id: string;
     };
-    object: factory.action.authorize.paymentMethod.any.IObject;
+    object: Pick<IObjectWithoutDetail, 'amount' | 'creditCard' | 'issuedThrough' | 'method' | 'paymentMethod'>;
     purpose: factory.action.authorize.paymentMethod.any.IPurpose;
     paymentServiceType: factory.service.paymentService.PaymentServiceType;
     location: factory.action.trade.pay.ILocation;
 }): IPublishPaymentUrlOperation<Pick<PayTransactionService.IPublishPaymentUrlResult, 'paymentMethodId' | 'paymentUrl'>>;
+type IObjectWithoutDetail = factory.action.authorize.paymentMethod.any.IObjectWithoutDetail;
 /**
  * 決済承認
  */
@@ -99,7 +100,7 @@ declare function authorize(params: {
     agent: {
         id: string;
     };
-    object: factory.action.authorize.paymentMethod.any.IObject;
+    object: IObjectWithoutDetail;
     purpose: factory.action.authorize.paymentMethod.any.IPurpose;
     paymentServiceType: factory.service.paymentService.PaymentServiceType;
     location?: factory.action.trade.pay.ILocation;

package/lib/chevre/service/payment/any.js

@@ -230,8 +230,9 @@ function publishPaymentUrl(params) {
         });
         let result;
         // URL発行
+        const authorizeObject = Object.assign(Object.assign({}, params.object), { accountId: '', paymentMethodId: transactionNumber, typeOf: factory.action.authorize.paymentMethod.any.ResultType.Payment });
         const startParams = (0, factory_1.creatPayTransactionStartParams)({
-            object: params.object,
+            object: authorizeObject,
             paymentServiceType,
             transaction: transaction,
             transactionNumber: transactionNumber,
@@ -318,7 +319,11 @@ function authorize(params) {
             const publishTransactionNumberResult = yield repos.transactionNumber.publishByTimestamp({ startDate: new Date() });
             transactionNumber = publishTransactionNumberResult.transactionNumber;
         }
-        const authorizeObject = Object.assign(Object.assign(Object.assign({}, params.object), { paymentMethodId: transactionNumber, typeOf: factory.action.authorize.paymentMethod.any.ResultType.Payment }), (creditCard !== undefined) ? { creditCard } : undefined);
+        const { accountId } = yield fixAccountIdIfPossible({
+            object: params.object,
+            project: { id: transaction.project.id }
+        })({ action: repos.action });
+        const authorizeObject = Object.assign(Object.assign(Object.assign({}, params.object), { accountId, paymentMethodId: transactionNumber, typeOf: factory.action.authorize.paymentMethod.any.ResultType.Payment }), (creditCard !== undefined) ? { creditCard } : undefined);
         // 承認アクションを開始する
         const actionAttributes = {
             project: transaction.project,
@@ -346,10 +351,6 @@ function authorize(params) {
         const action = yield repos.action.start(actionAttributes);
         let payTransaction;
         try {
-            const { accountId } = yield validateFromLocation({
-                object: authorizeObject,
-                project: { id: transaction.project.id }
-            })({ action: repos.action });
             const startParams = (0, factory_1.creatPayTransactionStartParams)({
                 accountId,
                 object: authorizeObject,
@@ -393,6 +394,9 @@ function authorize(params) {
     });
 }
 exports.authorize = authorize;
+/**
+ * 注文取引に保管された決済情報を承認しようとしている決済の整合性をを検証する
+ */
 function validatePaymentMethodByTransaction(params) {
     var _a, _b;
     const paymentServiceIdByObject = params.object.issuedThrough.id;
@@ -414,11 +418,16 @@ function validatePaymentMethodByTransaction(params) {
         throw new factory.errors.Argument('object.paymentMethod', 'paymentMethod must match the target of the paymentUrl');
     }
 }
-function validateFromLocation(params) {
+/**
+ * 承認しようとしているobjectからaccountIdを決定する
+ */
+function fixAccountIdIfPossible(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         var _a, _b;
-        let accountId = (_a = params.object) === null || _a === void 0 ? void 0 : _a.accountId;
-        const fromLocation = (_b = params.object) === null || _b === void 0 ? void 0 : _b.fromLocation;
+        // let accountId = params.object?.accountId;
+        let accountId = '';
+        const fromLocation = (_a = params.object) === null || _a === void 0 ? void 0 : _a.fromLocation;
+        const movieTickets = (_b = params.object) === null || _b === void 0 ? void 0 : _b.movieTickets;
         // トークン化されたペイメントカード情報でリクエストされた場合、実ペイメントカード情報へ変換する
         if (typeof fromLocation === 'string') {
             const paymentCardOwnershipInfo = yield (0, code_1.verifyToken)({
@@ -434,6 +443,10 @@ function validateFromLocation(params) {
             }
             accountId = paymentCardOwnershipInfo.typeOfGood.identifier;
         }
+        // 購入番号管理番号をaccountIdにセット(2024-03-24~)
+        if (Array.isArray(movieTickets) && movieTickets.length > 0) {
+            accountId = movieTickets[0].identifier; // 決済カードidentifierは1つのみ許可の前提
+        }
         return { accountId };
     });
 }

package/lib/chevre/service/reserve/potentialActions/onReservationCanceled.js

@@ -15,7 +15,7 @@ exports.onReservationCanceled = void 0;
  */
 const factory = require("../../../factory");
 const settings_1 = require("../../../settings");
-const offer_1 = require("../../offer");
+const onEventChanged_1 = require("../../offer/onEventChanged");
 const factory_1 = require("../factory");
 const informReservations = settings_1.settings.onReservationStatusChanged.informReservation;
 function onReservationCanceled(
@@ -94,7 +94,7 @@ reservationFor) {
         }
         if (typeof (reservationFor === null || reservationFor === void 0 ? void 0 : reservationFor.id) === 'string') {
             // 冗長な作成を避ける
-            yield (0, offer_1.createAggregateScreeningEventIfNotExist)({
+            yield (0, onEventChanged_1.createAggregateScreeningEventIfNotExist)({
                 project: { id: reservationFor.project.id },
                 reservationFor: [{ id: reservationFor.id }],
                 force: false,

package/lib/chevre/service/reserve/potentialActions/onReservationCheckedIn.js

@@ -15,7 +15,7 @@ exports.onReservationCheckedIn = void 0;
  */
 const factory = require("../../../factory");
 const settings_1 = require("../../../settings");
-const offer_1 = require("../../offer");
+const onEventChanged_1 = require("../../offer/onEventChanged");
 const factory_1 = require("../factory");
 const informReservations = settings_1.settings.onReservationStatusChanged.informReservation;
 // tslint:disable-next-line:max-func-body-length
@@ -118,7 +118,7 @@ function onReservationCheckedIn(params) {
                 // { _id: 1 }
                 );
                 if (existingEvents.length > 0) {
-                    yield (0, offer_1.createAggregateScreeningEventIfNotExist)({
+                    yield (0, onEventChanged_1.createAggregateScreeningEventIfNotExist)({
                         project: { id: params.project.id },
                         reservationFor: [{ id: reservationForId }],
                         force: false,

package/lib/chevre/service/reserve/potentialActions/onReservationConfirmed.js

@@ -15,7 +15,7 @@ exports.onReservationConfirmed = exports.onReservationConfirmedByAction = void 0
  */
 const factory = require("../../../factory");
 const settings_1 = require("../../../settings");
-const offer_1 = require("../../offer");
+const onEventChanged_1 = require("../../offer/onEventChanged");
 const factory_1 = require("../factory");
 const informReservations = settings_1.settings.onReservationStatusChanged.informReservation;
 /**
@@ -56,7 +56,7 @@ function onReservationConfirmed(confirmedReservations) {
         if (Array.isArray(confirmedReservations) && confirmedReservations.length > 0) {
             // ひとつめの予約からReservationPackageの共有属性を取り出す
             const { issuedThrough, project, provider, reservationFor, reservationNumber, reservationStatus, underName } = confirmedReservations[0];
-            yield (0, offer_1.createAggregateScreeningEventIfNotExist)({
+            yield (0, onEventChanged_1.createAggregateScreeningEventIfNotExist)({
                 project,
                 reservationFor: [{ id: reservationFor.id }],
                 force: false,

package/lib/chevre/service/reserve/potentialActions/onReservationUsed.js

@@ -15,7 +15,7 @@ exports.onReservationUsed = void 0;
  */
 const factory = require("../../../factory");
 const settings_1 = require("../../../settings");
-const offer_1 = require("../../offer");
+const onEventChanged_1 = require("../../offer/onEventChanged");
 const factory_1 = require("../factory");
 const informReservations = settings_1.settings.onReservationStatusChanged.informReservation;
 /**
@@ -96,7 +96,7 @@ function onReservationUsed(attendedReservation) {
             yield repos.task.saveMany(tasks, { emitImmediately: true });
         }
         // 冗長な作成を避ける
-        yield (0, offer_1.createAggregateScreeningEventIfNotExist)({
+        yield (0, onEventChanged_1.createAggregateScreeningEventIfNotExist)({
             project: attendedReservation.project,
             reservationFor: [{ id: attendedReservation.reservationFor.id }],
             force: false,

package/lib/chevre/service/task/onEventChanged.js

@@ -13,13 +13,13 @@ exports.call = void 0;
 const event_1 = require("../../repo/event");
 const project_1 = require("../../repo/project");
 const task_1 = require("../../repo/task");
-const offer_1 = require("../offer");
+const onEventChanged_1 = require("../offer/onEventChanged");
 /**
  * タスク実行関数
  */
 function call(data) {
     return (settings) => __awaiter(this, void 0, void 0, function* () {
-        yield (0, offer_1.onEventChanged)(data)({
+        yield (0, onEventChanged_1.onEventChanged)(data)({
             event: new event_1.MongoRepository(settings.connection),
             project: new project_1.MongoRepository(settings.connection),
             task: new task_1.MongoRepository(settings.connection)

package/lib/chevre/settings.d.ts

@@ -42,6 +42,7 @@ export declare const USE_SEND_EMAIL_MESSAGE_ON_ORDER_PROCESSING: boolean;
 export declare const USE_OWNERSHIP_INFO_BY_WEB_APPLICATION: boolean;
 export declare const USE_CHECK_RESOURCE_TASK: boolean;
 export declare const USE_OPTIMIZE_RESERVATION_EXCEPTIONS: string[];
+export declare const USE_OPTIMIZE_INFORM_EVENT: boolean;
 export declare const MONGO_MAX_TIME_MS: number;
 export declare const MONGO_READ_PREFERENCE: string;
 export declare const MONGO_AUTO_INDEX: boolean;

package/lib/chevre/settings.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.settings = exports.DELIVER_ORDER_LIMIT = exports.MONGO_AUTO_INDEX = exports.MONGO_READ_PREFERENCE = exports.MONGO_MAX_TIME_MS = exports.USE_OPTIMIZE_RESERVATION_EXCEPTIONS = exports.USE_CHECK_RESOURCE_TASK = exports.USE_OWNERSHIP_INFO_BY_WEB_APPLICATION = exports.USE_SEND_EMAIL_MESSAGE_ON_ORDER_PROCESSING = exports.USE_FETCH_API = exports.USE_OPTIMIZE_TICKET_OFFER = exports.USE_DELETE_EVENT_BY_ORDER = exports.USE_ASSET_TRANSACTION_SYNC_PROCESSING = exports.DEFAULT_TASKS_EXPORT_AGENT_NAME = exports.DEFAULT_SENDER_EMAIL = exports.TRANSACTION_CANCELED_STORAGE_PERIOD_IN_DAYS = exports.TRANSACTION_CONFIRMED_STORAGE_PERIOD_IN_DAYS = exports.ASSET_TRANSACTION_STORAGE_PERIOD_IN_DAYS = exports.MAX_NUM_CREDIT_CARD_PAYMENT_METHOD = exports.ABORTED_TASKS_WITHOUT_REPORT = exports.MAXIMUM_RESERVATION_GRACE_PERIOD_IN_DAYS = exports.TRIGGER_WEBHOOK_RETRY_INTERVAL_IN_MS = exports.TRIGGER_WEBHOOK_MAX_RETRY_COUNT = void 0;
+exports.settings = exports.DELIVER_ORDER_LIMIT = exports.MONGO_AUTO_INDEX = exports.MONGO_READ_PREFERENCE = exports.MONGO_MAX_TIME_MS = exports.USE_OPTIMIZE_INFORM_EVENT = exports.USE_OPTIMIZE_RESERVATION_EXCEPTIONS = exports.USE_CHECK_RESOURCE_TASK = exports.USE_OWNERSHIP_INFO_BY_WEB_APPLICATION = exports.USE_SEND_EMAIL_MESSAGE_ON_ORDER_PROCESSING = exports.USE_FETCH_API = exports.USE_OPTIMIZE_TICKET_OFFER = exports.USE_DELETE_EVENT_BY_ORDER = exports.USE_ASSET_TRANSACTION_SYNC_PROCESSING = exports.DEFAULT_TASKS_EXPORT_AGENT_NAME = exports.DEFAULT_SENDER_EMAIL = exports.TRANSACTION_CANCELED_STORAGE_PERIOD_IN_DAYS = exports.TRANSACTION_CONFIRMED_STORAGE_PERIOD_IN_DAYS = exports.ASSET_TRANSACTION_STORAGE_PERIOD_IN_DAYS = exports.MAX_NUM_CREDIT_CARD_PAYMENT_METHOD = exports.ABORTED_TASKS_WITHOUT_REPORT = exports.MAXIMUM_RESERVATION_GRACE_PERIOD_IN_DAYS = exports.TRIGGER_WEBHOOK_RETRY_INTERVAL_IN_MS = exports.TRIGGER_WEBHOOK_MAX_RETRY_COUNT = void 0;
 const factory = require("./factory");
 const transactionWebhookUrls = (typeof process.env.INFORM_TRANSACTION_URL === 'string')
     ? process.env.INFORM_TRANSACTION_URL.split(' ')
@@ -68,6 +68,7 @@ exports.USE_CHECK_RESOURCE_TASK = process.env.USE_CHECK_RESOURCE_TASK === '1';
 exports.USE_OPTIMIZE_RESERVATION_EXCEPTIONS = (typeof process.env.USE_OPTIMIZE_RESERVATION_EXCEPTIONS === 'string')
     ? process.env.USE_OPTIMIZE_RESERVATION_EXCEPTIONS.split(' ')
     : [];
+exports.USE_OPTIMIZE_INFORM_EVENT = process.env.USE_OPTIMIZE_INFORM_EVENT === '1';
 exports.MONGO_MAX_TIME_MS = (typeof process.env.MONGO_MAX_TIME_MS === 'string')
     ? Number(process.env.MONGO_MAX_TIME_MS)
     // tslint:disable-next-line:no-magic-numbers

package/package.json

@@ -10,8 +10,8 @@
   ],
   "dependencies": {
     "@aws-sdk/credential-providers": "3.433.0",
-    "@chevre/factory": "4.364.0-alpha.0",
-    "@cinerino/sdk": "5.14.1",
+    "@chevre/factory": "4.364.0-alpha.1",
+    "@cinerino/sdk": "5.15.0-alpha.0",
     "@motionpicture/coa-service": "9.4.0",
     "@motionpicture/gmo-service": "5.3.0",
     "@sendgrid/mail": "6.4.0",
@@ -110,5 +110,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build && npm test && npm run doc"
   },
-  "version": "21.27.0-alpha.10"
+  "version": "21.27.0-alpha.12"
 }