@chevre/domain 23.2.0-alpha.0 → 23.2.0-alpha.10

package/lib/chevre/service/assetTransaction/pay/validateAcceptedPaymentMethodIfNeeded.js

@@ -19,14 +19,18 @@ const debug = createDebug('chevre-domain:service:assetTransaction:pay');
 /**
  * 必要あらば関連リソースの対応決済方法を検証する
  */
+// tslint:disable-next-line:max-func-body-length
 function validateAcceptedPaymentMethodIfNeeded(params) {
+    // tslint:disable-next-line:max-func-body-length
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         var _a, _b;
+        const now = new Date();
         /**
          * 検証対象のイベントIDリスト
          */
         let checkingEventIds;
         const paymentServiceType = params.object.typeOf;
+        const paymentServiceId = params.object.id;
         // CreditCard or MovieTicket?
         if (paymentServiceType === factory.service.paymentService.PaymentServiceType.CreditCard) {
             // クレジットカードIF決済の場合、objectに注文アイテム指定があればそちらで検証する
@@ -77,10 +81,28 @@ function validateAcceptedPaymentMethodIfNeeded(params) {
                 }
                 if (((_b = eventSeries.offers) === null || _b === void 0 ? void 0 : _b.typeOf) === factory.offerType.AggregateOffer) {
                     // 対応決済方法オファーIDの指定が必要
-                    throw new factory.errors.ArgumentNull('acceptedPaymentMethodOfferId');
-                    // if (paymentAccepted !== true) {
-                    //     throw new factory.errors.Argument('recipient', `payment not accepted [${paymentMethodType}]`);
-                    // }
+                    const acceptedPaymentMethodOfferIds = [];
+                    params.instrument.forEach((instrument) => {
+                        if (instrument.typeOf === factory.offerType.Offer) {
+                            acceptedPaymentMethodOfferIds.push(instrument.id);
+                        }
+                    });
+                    if (acceptedPaymentMethodOfferIds.length === 0) {
+                        throw new factory.errors.ArgumentNull('acceptedPaymentMethodOfferIds');
+                    }
+                    // 全施設コンテンツについて有効な対応決済方法オファーの存在を検証
+                    const validAcceptedPaymentMethodOffer = (yield repos.acceptedPaymentMethod.findAcceptedPaymentMethods({
+                        limit: 1,
+                        page: 1,
+                        id: { $in: acceptedPaymentMethodOfferIds }, // 指定されたIDで
+                        itemOffered: { id: { $eq: eventSeriesId } }, // リソースに対して
+                        acceptedPaymentMethod: { id: { $eq: paymentServiceId } }, // 決済方法を許可
+                        validFrom: { $lte: now }, // 現在有効
+                        validThrough: { $gte: now } // 現在有効
+                    }, ['identifier'])).shift();
+                    if (validAcceptedPaymentMethodOffer === undefined) {
+                        throw new factory.errors.NotFound(factory.offerType.Offer, `payment not accepted. eventSeriesId: ${eventSeriesId}`);
+                    }
                 }
                 else {
                     // 集約オファーでなければ検証の必要なし

package/lib/chevre/service/assetTransaction/pay.d.ts

@@ -5,6 +5,7 @@ import * as GMO from '@motionpicture/gmo-service';
 import * as factory from '../../factory';
 import { Settings } from '../../settings';
 import type { AcceptedOfferRepo } from '../../repo/acceptedOffer';
+import type { AcceptedPaymentMethodRepo } from '../../repo/acceptedPaymentMethod';
 import type { AccountingReportRepo } from '../../repo/accountingReport';
 import type { ActionRepo } from '../../repo/action';
 import type { AssetTransactionRepo } from '../../repo/assetTransaction';
@@ -21,6 +22,7 @@ import type { TaskRepo } from '../../repo/task';
 import * as CreditCardPayment from '../payment/creditCard';
 import * as MovieTicketPayment from '../payment/movieTicket';
 export interface IStartOperationRepos {
+    acceptedPaymentMethod: AcceptedPaymentMethodRepo;
     accountingReport: AccountingReportRepo;
     action: ActionRepo;
     credentials: CredentialsRepo;
@@ -62,6 +64,7 @@ export type ICheckOperation<T> = (repos: {
     paymentServiceProvider: PaymentServiceProviderRepo;
 }, settings: Settings) => Promise<T>;
 export type IPublishPaymentUrlOperation<T> = (repos: {
+    acceptedPaymentMethod: AcceptedPaymentMethodRepo;
     action: ActionRepo;
     event: EventRepo;
     eventSeries: EventSeriesRepo;

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

@@ -16,6 +16,7 @@ export declare function creatPublishPaymentUrlParams(params: {
      * 決済採用に使用される決済方法チケットトークン
      */
     ticketToken?: string;
+    instrument: factory.action.trade.pay.IAcceptedPaymentMethodOfferAsInstrument[];
 }): Pick<factory.assetTransaction.pay.IStartParamsWithoutDetail, 'agent' | 'location' | 'project' | 'recipient' | 'transactionNumber' | 'typeOf'> & {
     object: factory.action.accept.pay.IPayObject;
     identifier?: string;
@@ -40,6 +41,10 @@ export declare function creatPayTransactionStartParams(params: {
      * 決済方法チケット
      */
     ticketToken?: string;
+    /**
+     * ツールとしての対応決済方法オファー
+     */
+    instrument: factory.action.trade.pay.IAcceptedPaymentMethodOfferAsInstrument[];
 }): factory.assetTransaction.pay.IStartParamsWithoutDetail & {
     instrument: factory.action.trade.pay.IPlaceOrderRelatedInstrument[];
 };

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

@@ -28,7 +28,15 @@ function creatPublishPaymentUrlParams(params) {
             referencesOrder: params.object.referencesOrder
         }
     };
+    const instrument = [];
     const ticketAsInstrument = (typeof params.ticketToken === 'string') ? { ticketToken: params.ticketToken, typeOf: 'Ticket' } : undefined;
+    if (ticketAsInstrument !== undefined) {
+        instrument.push(ticketAsInstrument);
+    }
+    // instrumentを対応決済方法オファーに対応(2025-12-14~)
+    if (Array.isArray(params.instrument)) {
+        instrument.push(...params.instrument);
+    }
     return Object.assign(Object.assign(Object.assign({ project: { id: params.transaction.project.id, typeOf: factory.organizationType.Project }, typeOf: factory.assetTransactionType.Pay, transactionNumber: params.transactionNumber, agent: {
             typeOf: params.transaction.seller.typeOf,
             id: params.transaction.seller.id,
@@ -43,7 +51,7 @@ function creatPublishPaymentUrlParams(params) {
             typeOf: params.transaction.seller.typeOf
         }, object }, (typeof ((_d = params.location) === null || _d === void 0 ? void 0 : _d.typeOf) === 'string')
         ? { location: params.location }
-        : undefined), { instrument: (ticketAsInstrument !== undefined) ? [ticketAsInstrument] : [] }), (typeof params.identifier === 'string')
+        : undefined), { instrument }), (typeof params.identifier === 'string')
         ? { identifier: params.identifier }
         : undefined);
 }
@@ -71,7 +79,8 @@ function creatPayTransactionStartParams(params) {
     const instrument = [
         { id: params.action.id, typeOf: params.action.typeOf },
         { orderNumber, typeOf: factory.order.OrderType.Order },
-        ...(ticketAsInstrument !== undefined) ? [ticketAsInstrument] : [] // add ticketAsInstrument(2025-11-25~)
+        ...(ticketAsInstrument !== undefined) ? [ticketAsInstrument] : [], // add ticketAsInstrument(2025-11-25~)
+        ...(Array.isArray(params.instrument)) ? params.instrument : [] // instrumentを対応決済方法オファーに対応(2025-12-14~)
     ];
     return Object.assign({ project: { id: params.transaction.project.id, typeOf: factory.organizationType.Project }, typeOf: factory.assetTransactionType.Pay, transactionNumber: params.transactionNumber, agent: {
             typeOf: params.transaction.seller.typeOf,

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

@@ -1,5 +1,6 @@
 import * as factory from '../../factory';
 import { Settings } from '../../settings';
+import type { AcceptedPaymentMethodRepo } from '../../repo/acceptedPaymentMethod';
 import type { AccountingReportRepo } from '../../repo/accountingReport';
 import type { ActionRepo, IMinimizedPurchaseNumberAuthResult } from '../../repo/action';
 import type { AssetTransactionRepo } from '../../repo/assetTransaction';
@@ -79,6 +80,7 @@ declare function processVoidPayTransaction(params: factory.task.IData<factory.ta
     transaction: TransactionRepo;
 }) => Promise<void>;
 interface IAuthorizeRepos {
+    acceptedPaymentMethod: AcceptedPaymentMethodRepo;
     accountingReport: AccountingReportRepo;
     action: ActionRepo;
     assetTransaction: AssetTransactionRepo;
@@ -101,6 +103,7 @@ interface IAuthorizeRepos {
 }
 type IAuthorizeOperation<T> = (repos: IAuthorizeRepos, settings: Settings) => Promise<T>;
 interface IPublishPaymentUrlRepos {
+    acceptedPaymentMethod: AcceptedPaymentMethodRepo;
     action: ActionRepo;
     assetTransaction: AssetTransactionRepo;
     authorization: AuthorizationRepo;
@@ -143,6 +146,7 @@ declare function publishPaymentUrl(params: {
      * add identifier for an unique index(2025-02-25~)
      */
     identifier?: string;
+    instrument: factory.action.trade.pay.IAcceptedPaymentMethodOfferAsInstrument[];
 }): IPublishPaymentUrlOperation<Pick<PayTransactionService.IPublishPaymentUrlResult, 'paymentMethodId' | 'paymentUrl'>>;
 /**
  * 決済承認
@@ -173,6 +177,10 @@ declare function authorize(params: {
          */
         id: string;
     };
+    /**
+     * ツールとしての対応決済方法オファー
+     */
+    instrument: factory.action.trade.pay.IAcceptedPaymentMethodOfferAsInstrument[];
 }): IAuthorizeOperation<{
     /**
      * 承認アクションID

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

@@ -366,7 +366,7 @@ function publishPaymentUrl(params) {
                 referencesOrder: (((_a = params.object.referencesOrder) === null || _a === void 0 ? void 0 : _a.typeOf) === factory.order.OrderType.Order)
                     ? params.object.referencesOrder
                     : { typeOf: factory.order.OrderType.Order } });
-            const startParams = (0, factory_1.creatPublishPaymentUrlParams)(Object.assign(Object.assign({ object: authorizeObject, paymentServiceType, transaction: transaction, transactionNumber: transactionNumber, location: params.location }, (typeof params.identifier === 'string') ? { identifier: params.identifier } : undefined), (typeof ticketToken === 'string') ? { ticketToken } : undefined));
+            const startParams = (0, factory_1.creatPublishPaymentUrlParams)(Object.assign(Object.assign({ object: authorizeObject, paymentServiceType, transaction: transaction, transactionNumber: transactionNumber, location: params.location, instrument: params.instrument }, (typeof params.identifier === 'string') ? { identifier: params.identifier } : undefined), (typeof ticketToken === 'string') ? { ticketToken } : undefined));
             const taskId = (_b = params.sameAs) === null || _b === void 0 ? void 0 : _b.id;
             result = yield PayTransactionService.publishPaymentUrl(startParams, {
                 purposeAsTransaction: { id: transaction.id },
@@ -539,7 +539,8 @@ function authorize(params) {
                 // orderNumber required(2025-02-14~)
                 order: { confirmationNumber, orderNumber },
                 action: { id: action.id, typeOf: action.typeOf },
-                ticketToken
+                ticketToken,
+                instrument: params.instrument
             });
             payTransaction = yield PayTransactionService.start(startParams, Object.assign({ 
                 // useCheckByIdentifierIfNotYet: params.options.useCheckByIdentifierIfNotYet,

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

@@ -11,6 +11,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.call = call;
 const factory = require("../../factory");
+const acceptedPaymentMethod_1 = require("../../repo/acceptedPaymentMethod");
 const accountingReport_1 = require("../../repo/accountingReport");
 const action_1 = require("../../repo/action");
 const assetTransaction_1 = require("../../repo/assetTransaction");
@@ -52,8 +53,9 @@ function call(params) {
         const useCredentialsRepo = typeof paymentServiceId === 'string' && paymentServiceId !== ''
             && typeof credentialsExpireInSeconds === 'number' && credentialsExpireInSeconds > 0;
         try {
-            yield (0, any_1.authorize)(Object.assign(Object.assign({}, params.data), { sameAs: { id: params.id } // タスクIDを関連付け(2024-04-20~)
+            yield (0, any_1.authorize)(Object.assign(Object.assign({}, params.data), { instrument: (Array.isArray(params.data.instrument)) ? params.data.instrument : [], sameAs: { id: params.id } // タスクIDを関連付け(2024-04-20~)
              }))({
+                acceptedPaymentMethod: new acceptedPaymentMethod_1.AcceptedPaymentMethodRepo(connection),
                 accountingReport: new accountingReport_1.AccountingReportRepo(connection),
                 action: actionRepo,
                 assetTransaction: new assetTransaction_1.AssetTransactionRepo(connection),

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

@@ -11,6 +11,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.call = call;
 const factory = require("../../factory");
+const acceptedPaymentMethod_1 = require("../../repo/acceptedPaymentMethod");
 const action_1 = require("../../repo/action");
 const assetTransaction_1 = require("../../repo/assetTransaction");
 const authorization_1 = require("../../repo/authorization");
@@ -41,7 +42,8 @@ function call(params) {
         const actionRepo = new action_1.ActionRepo(connection);
         // const transactionProcessRepo = new TransactionProcessRepo(redisClient, { lockExpiresInSeconds: 120 });
         try {
-            yield (0, any_1.publishPaymentUrl)(Object.assign(Object.assign({}, params.data), { sameAs: { id: params.id } }))({
+            yield (0, any_1.publishPaymentUrl)(Object.assign(Object.assign({}, params.data), { instrument: (Array.isArray(params.data.instrument)) ? params.data.instrument : [], sameAs: { id: params.id } }))({
+                acceptedPaymentMethod: new acceptedPaymentMethod_1.AcceptedPaymentMethodRepo(connection),
                 action: actionRepo,
                 assetTransaction: new assetTransaction_1.AssetTransactionRepo(connection),
                 authorization: new authorization_1.AuthorizationRepo(connection),

package/lib/chevre/service/task/syncResourcesFromCOA.d.ts

@@ -0,0 +1,6 @@
+import * as factory from '../../factory';
+import type { ICallResult, IExecutableTaskKeys, IOperationExecute } from '../taskHandler';
+/**
+ * タスク実行関数
+ */
+export declare function call(params: Pick<factory.task.syncResourcesFromCOA.ITask, IExecutableTaskKeys>): IOperationExecute<ICallResult>;

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

@@ -0,0 +1,299 @@
+"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.call = call;
+const COA = require("@motionpicture/coa-service");
+const moment = require("moment-timezone");
+const factory = require("../../factory");
+const action_1 = require("../../repo/action");
+const categoryCode_1 = require("../../repo/categoryCode");
+const creativeWork_1 = require("../../repo/creativeWork");
+const credentials_1 = require("../../repo/credentials");
+const event_1 = require("../../repo/event");
+const eventSeries_1 = require("../../repo/eventSeries");
+const movieTheater_1 = require("../../repo/place/movieTheater");
+const screeningRoom_1 = require("../../repo/place/screeningRoom");
+const reserveInterface_1 = require("../../repo/reserveInterface");
+const saveScreeningEvents_1 = require("../event/saveScreeningEvents");
+const saveScreeningEventSeries_1 = require("../event/saveScreeningEventSeries");
+let coaAuthClient;
+/**
+ * タスク実行関数
+ */
+function call(params) {
+    // tslint:disable-next-line:max-func-body-length
+    return (_a, options_1) => __awaiter(this, [_a, options_1], void 0, function* ({ connection, redisClient, settings }, options) {
+        var _b, _c, _d;
+        if (redisClient === undefined) {
+            throw new factory.errors.Argument('settings', 'redisClient required');
+        }
+        // 遅延実行(executeByName)には対応しない
+        if (!options.executeById) {
+            return;
+        }
+        const reserveInterfaceRepo = new reserveInterface_1.ReserveInterfaceRepo(connection);
+        const coaAPI = yield reserveInterfaceRepo.findOne({ project: { id: { $eq: params.project.id } } });
+        if (typeof (coaAPI === null || coaAPI === void 0 ? void 0 : coaAPI.id) !== 'string') {
+            throw new factory.errors.NotFound('WebAPI');
+        }
+        const credentials = (_b = coaAPI.availableChannel) === null || _b === void 0 ? void 0 : _b.credentials;
+        if (typeof (credentials === null || credentials === void 0 ? void 0 : credentials.refreshToken) !== 'string') {
+            throw new factory.errors.NotFound('WebAPI');
+        }
+        if (coaAuthClient === undefined) {
+            let credentialsRepo;
+            const credentialsExpireInSeconds = (_d = (_c = coaAPI.availableChannel) === null || _c === void 0 ? void 0 : _c.credentials) === null || _d === void 0 ? void 0 : _d.expireInSeconds;
+            if (typeof credentialsExpireInSeconds === 'number') {
+                // set credentialsRepo(2024-11-20~)
+                credentialsRepo = new credentials_1.CredentialsRepo(redisClient, {
+                    scope: `COA:${coaAPI.id}`,
+                    expireInSeconds: credentialsExpireInSeconds
+                });
+            }
+            coaAuthClient = new COA.auth.RefreshToken(Object.assign(Object.assign({}, credentials), (credentialsRepo !== undefined) ? { credentialsRepo } : undefined));
+        }
+        const actionRepo = new action_1.ActionRepo(connection);
+        try {
+            const masterService = new COA.service.Master({
+                endpoint: coaAuthClient.options.endpoint, // same as authClient(2024-07-17~)
+                auth: coaAuthClient
+            }, { timeout: settings.coa.timeout });
+            const { agent, object } = params.data;
+            if (object.typeOf === factory.eventType.ScreeningEventSeries) {
+                yield syncEventSeries({
+                    project: { id: params.project.id },
+                    agent,
+                    object,
+                    sameAs: { id: params.id }
+                })({
+                    action: actionRepo,
+                    categoryCode: new categoryCode_1.CategoryCodeRepo(connection),
+                    creativeWork: new creativeWork_1.CreativeWorkRepo(connection),
+                    eventSeries: new eventSeries_1.EventSeriesRepo(connection),
+                    movieTheater: new movieTheater_1.MovieTheaterRepo(connection),
+                    masterService
+                });
+            }
+            else if (object.typeOf === factory.eventType.ScreeningEvent) {
+                yield syncEvents({
+                    project: { id: params.project.id },
+                    agent,
+                    object,
+                    sameAs: { id: params.id }
+                })({
+                    action: actionRepo,
+                    categoryCode: new categoryCode_1.CategoryCodeRepo(connection),
+                    creativeWork: new creativeWork_1.CreativeWorkRepo(connection),
+                    event: new event_1.EventRepo(connection),
+                    eventSeries: new eventSeries_1.EventSeriesRepo(connection),
+                    movieTheater: new movieTheater_1.MovieTheaterRepo(connection),
+                    screeningRoom: new screeningRoom_1.ScreeningRoomRepo(connection),
+                    masterService
+                });
+            }
+        }
+        catch (error) {
+            let throwsError = true;
+            // アクションが存在すればタスクを実行済扱いにする
+            const action = (yield actionRepo.searchBySameAs({
+                sameAs: { id: { $eq: params.id } },
+                typeOf: { $eq: factory.actionType.ReplaceAction }
+            })).shift();
+            if (typeof (action === null || action === void 0 ? void 0 : action.id) === 'string') {
+                throwsError = false;
+            }
+            if (throwsError) {
+                throw error;
+            }
+        }
+        finally {
+            // no op
+        }
+    });
+}
+function syncEventSeries(params) {
+    return (repos) => __awaiter(this, void 0, void 0, function* () {
+        const { locationBranchCode, titleBranchNum, titleCode } = params.object;
+        const actionAttributes = {
+            project: { typeOf: factory.organizationType.Project, id: params.project.id },
+            typeOf: factory.actionType.ReplaceAction,
+            agent: params.agent,
+            // tslint:disable-next-line:no-suspicious-comment
+            // TODO define object
+            object: Object.assign(Object.assign({}, params.object), { typeOf: factory.eventType.ScreeningEventSeries }),
+            // instrument,
+            targetCollection: { typeOf: factory.eventType.ScreeningEventSeries },
+            sameAs: { id: params.sameAs.id, typeOf: 'Task' }
+        };
+        const action = yield repos.action.start(actionAttributes);
+        let saveResult;
+        try {
+            const movieTheater = (yield repos.movieTheater.projectFields({
+                limit: 1,
+                page: 1,
+                project: { id: { $eq: params.project.id } },
+                branchCode: { $eq: locationBranchCode }
+            }, ['id', 'typeOf', 'branchCode', 'name', 'kanaName', 'parentOrganization']
+            // []
+            )).shift();
+            if (movieTheater === undefined) {
+                throw new factory.errors.NotFound(factory.placeType.MovieTheater);
+            }
+            // console.log('movieTheater:', movieTheater);
+            saveResult = yield (0, saveScreeningEventSeries_1.saveScreeningEventSeries)({
+                project: { id: params.project.id, typeOf: factory.organizationType.Project },
+                seller: { id: movieTheater.parentOrganization.id },
+                movieTheater,
+                locationBranchCode,
+                saveScreeningEventSeries: true,
+                saveScreeningEventSeriesPeriodInMonth: 3
+            }, {
+                filterFilmsFromCOA: {
+                    titleBranchNum,
+                    titleCode
+                }
+            })(repos);
+            // console.log(
+            //     'result:',
+            //     saveResult.savedEventsCount,
+            //     saveResult.screeningEventSerieses.length
+            // );
+        }
+        catch (error) {
+            try {
+                yield repos.action.giveUp({ typeOf: action.typeOf, id: action.id, error });
+            }
+            catch (__) {
+                // no op
+            }
+            throw error;
+        }
+        const result = saveResult.screeningEventSerieses.map((eventSeries) => {
+            return {
+                id: eventSeries.id,
+                typeOf: eventSeries.typeOf
+            };
+        });
+        yield repos.action.completeWithVoid({ typeOf: action.typeOf, id: action.id, result });
+    });
+}
+// tslint:disable-next-line:max-func-body-length
+function syncEvents(params) {
+    // tslint:disable-next-line:max-func-body-length
+    return (repos) => __awaiter(this, void 0, void 0, function* () {
+        const { locationBranchCode, titleBranchNum, titleCode, roomCode, startDate } = params.object;
+        const actionAttributes = {
+            project: { typeOf: factory.organizationType.Project, id: params.project.id },
+            typeOf: factory.actionType.ReplaceAction,
+            agent: params.agent,
+            // tslint:disable-next-line:no-suspicious-comment
+            // TODO define object
+            object: Object.assign(Object.assign({}, params.object), { typeOf: factory.eventType.ScreeningEvent }),
+            // instrument,
+            targetCollection: { typeOf: factory.eventType.ScreeningEvent },
+            sameAs: { id: params.sameAs.id, typeOf: 'Task' }
+        };
+        const action = yield repos.action.start(actionAttributes);
+        let saveResult;
+        try {
+            const movieTheater = (yield repos.movieTheater.projectFields({
+                limit: 1,
+                page: 1,
+                project: { id: { $eq: params.project.id } },
+                branchCode: { $eq: locationBranchCode }
+            }, ['id', 'typeOf', 'branchCode', 'name', 'kanaName', 'parentOrganization']
+            // []
+            )).shift();
+            if (movieTheater === undefined) {
+                throw new factory.errors.NotFound(factory.placeType.MovieTheater);
+            }
+            // console.log('movieTheater:', movieTheater);
+            const screeningRoom = (yield repos.screeningRoom.searchScreeningRooms({
+                project: { id: { $eq: params.project.id } },
+                containedInPlace: { branchCode: { $eq: movieTheater.branchCode } },
+                branchCode: { $eq: roomCode }
+            })).shift();
+            if (screeningRoom === undefined) {
+                throw new factory.errors.NotFound(factory.placeType.ScreeningRoom);
+            }
+            // console.log(screeningRoom);
+            const eventSeriesId = (0, saveScreeningEventSeries_1.createScreeningEventSeriesId)({
+                theaterCode: locationBranchCode,
+                titleCode,
+                titleBranchNum
+            });
+            const eventSeries = (yield repos.eventSeries.projectEventSeriesFields({
+                id: { $eq: eventSeriesId },
+                project: { id: { $eq: params.project.id } }
+            }, [
+                'project', 'typeOf', 'eventStatus', 'identifier',
+                'name', 'kanaName', 'alternativeHeadline', 'location',
+                'organizer', 'videoFormat', 'soundFormat', 'workPerformed',
+                'duration', 'endDate', 'startDate', 'coaInfo',
+                'offers', 'additionalProperty'
+            ])).shift();
+            if (eventSeries === undefined) {
+                throw new factory.errors.NotFound(factory.eventType.ScreeningEventSeries);
+            }
+            // console.log(eventSeries);
+            const targetImportFrom = moment(startDate)
+                .tz('Asia/Tokyo')
+                .startOf('day');
+            const targetImportThrough = moment(startDate)
+                .tz('Asia/Tokyo')
+                .endOf('day');
+            const begin = moment(targetImportFrom)
+                .add(-1, 'day') // 深夜帯スケジュールが前日検索の結果に含まれるため
+                .tz('Asia/Tokyo')
+                .format('YYYYMMDD'); // COAは日本時間で判断
+            const end = moment(targetImportThrough)
+                // .add(-1, 'day')
+                .tz('Asia/Tokyo')
+                .format('YYYYMMDD'); // COAは日本時間で判断
+            // console.log('importing screening events...', targetImportFrom, targetImportThrough, begin, end);
+            saveResult = yield (0, saveScreeningEvents_1.saveScreeningEvents)({
+                project: { id: params.project.id, typeOf: factory.organizationType.Project },
+                seller: { id: movieTheater.parentOrganization.id },
+                movieTheater,
+                screeningRooms: [screeningRoom],
+                screeningEventSerieses: [eventSeries],
+                targetImportFrom: targetImportFrom.toDate(),
+                targetImportThrough: targetImportThrough.toDate(),
+                instrument: {
+                    theaterCode: locationBranchCode,
+                    begin, // debug(2024-04-24~)
+                    end, // debug(2024-04-24~)
+                    typeOf: 'WebAPI',
+                    identifier: factory.service.webAPI.Identifier.COA
+                }
+            }, {
+                filterSchedulesFromCOA: { titleBranchNum, titleCode, roomCode }
+            })(repos);
+            // console.log('saveResult:', saveResult.length, 'events');
+        }
+        catch (error) {
+            try {
+                yield repos.action.giveUp({ typeOf: action.typeOf, id: action.id, error });
+            }
+            catch (__) {
+                // no op
+            }
+            throw error;
+        }
+        const result = saveResult.map((event) => {
+            return {
+                id: event.id,
+                typeOf: event.typeOf
+            };
+        });
+        yield repos.action.completeWithVoid({ typeOf: action.typeOf, id: action.id, result });
+    });
+}

package/lib/chevre/service/taskHandler.js

@@ -69,6 +69,7 @@ function executeTask(task, next) {
                 case factory.taskName.ReturnPayTransaction:
                 case factory.taskName.ReturnReserveTransaction:
                 case factory.taskName.SendEmailMessage:
+                case factory.taskName.SyncResourcesFromCOA:
                 case factory.taskName.TriggerWebhook:
                     callResult = yield call(task)(settings, options);
                     break;

package/lib/chevre/service/transaction/placeOrder/confirm/validation/factory.d.ts

@@ -3,7 +3,7 @@ export type IAcceptPayAction = Pick<factory.action.accept.pay.IAction, 'object'
 export type IAuthorizeEventServiceOffer = factory.action.authorize.offer.eventService.IAction;
 export type IAuthorizeProductOffer = factory.action.authorize.offer.product.IAction;
 export type IAuthorizeMoneyTransferOffer = factory.action.authorize.offer.moneyTransfer.IAction;
-export type IAuthorizePaymentAction = Pick<factory.action.authorize.paymentMethod.any.IAction, 'id' | 'result' | 'endDate' | 'instrument'> & {
-    object: Pick<factory.action.authorize.paymentMethod.any.IObject, 'typeOf'>;
+export type IAuthorizePaymentAction = Pick<factory.action.authorize.paymentMethod.any.IAction, 'id' | 'result' | 'endDate'> & {
+    object: Pick<factory.action.authorize.paymentMethod.any.IObject, 'typeOf' | 'paymentMethodId'>;
 };
 export type IPayTransaction = Pick<factory.assetTransaction.pay.ITransaction, 'object'>;

package/lib/chevre/service/transaction/placeOrder/confirm/validation.js

@@ -47,7 +47,9 @@ function validateTransaction(transaction, acceptPayActions, authorizePaymentActi
                 // authorizeMovieTicketActions.forEach((a) => {
                 //     authorizedMovieTickets.push(...(Array.isArray(a.object.movieTickets)) ? a.object.movieTickets : []);
                 // });
-                const payTransactionNumbers = authorizeMovieTicketActions.map(({ instrument }) => instrument.transactionNumber);
+                // 決済承認アクションのinstrument依存をobject依存へ変更(2025-12-14~)
+                const payTransactionNumbers = authorizeMovieTicketActions.map((authorizeAction) => authorizeAction.object.paymentMethodId);
+                // const payTransactionNumbers = authorizeMovieTicketActions.map(({ instrument }) => instrument.transactionNumber);
                 payTransactions.filter(({ object }) => payTransactionNumbers.includes(object.paymentMethodId))
                     .forEach(({ object }) => {
                     if (Array.isArray(object.paymentMethod.movieTickets)) {

package/lib/chevre/service/transaction/placeOrder/confirm.js

@@ -106,7 +106,9 @@ function confirm(params, options) {
             .filter(({ serialNumber }) => typeof serialNumber === 'string' && serialNumbers.includes(serialNumber));
         // authorizePaymentActionsからpayTransactionsを参照(2024-06-20~)
         let payTransactions = [];
-        const payTransactionNumbers = authorizePaymentActions.map(({ instrument }) => instrument.transactionNumber);
+        // 決済承認アクションのinstrument依存をobject依存へ変更(2025-12-14~)
+        const payTransactionNumbers = authorizePaymentActions.map((authorizeAction) => authorizeAction.object.paymentMethodId);
+        // const payTransactionNumbers = authorizePaymentActions.map(({ instrument }) => instrument.transactionNumber);
         if (payTransactionNumbers.length > 0) {
             payTransactions = yield repos.assetTransaction.search({
                 typeOf: factory.assetTransactionType.Pay,

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": "5.4.0-alpha.3",
+    "@chevre/factory": "5.4.0-alpha.9",
     "@cinerino/sdk": "12.12.1",
     "@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": "23.2.0-alpha.0"
+  "version": "23.2.0-alpha.10"
 }