@chevre/domain 23.2.0-alpha.2 → 23.2.0-alpha.20

package/lib/chevre/service/offer/event/searchOfferAppliesToMovieTicket.js

@@ -28,7 +28,7 @@ function getUnacceptedPaymentMethodByEvent(params) {
  */
 function searchOfferAppliesToMovieTicket(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
-        var _a, _b, _c, _d;
+        var _a, _b, _c, _d, _e;
         // optimize(2024-07-18~)
         const event = yield repos.event.projectEventFieldsById({ id: params.event.id }, ['project', 'startDate', 'typeOf', 'superEvent.id', 'offers.itemOffered.id', 'offers.unacceptedPaymentMethod']);
         // let soundFormatTypes: string[] = [];
@@ -39,13 +39,16 @@ function searchOfferAppliesToMovieTicket(params) {
                 page: 1,
                 id: { $eq: event.superEvent.id }
                 // typeOf: factory.eventType.ScreeningEventSeries
-            }, ['soundFormat', 'videoFormat']);
+            }, 
+            // ['soundFormat', 'videoFormat', 'subEvent']
+            ['soundFormat', 'subEvent']);
             const superEvent = superEvents.shift();
             if (superEvent === undefined) {
                 throw new factory.errors.NotFound(factory.eventType.ScreeningEventSeries);
             }
             // soundFormatTypes = (Array.isArray(superEvent.soundFormat)) ? superEvent.soundFormat.map((f) => f.typeOf) : [];
-            videoFormatTypes = (Array.isArray(superEvent.videoFormat)) ? superEvent.videoFormat.map((f) => f.typeOf) : [];
+            // videoFormatTypes = (Array.isArray(superEvent.videoFormat)) ? superEvent.videoFormat.map((f) => f.typeOf) : [];
+            videoFormatTypes = (Array.isArray((_a = superEvent.subEvent) === null || _a === void 0 ? void 0 : _a.videoFormat)) ? superEvent.subEvent.videoFormat : [];
         }
         const unacceptedPaymentMethod = getUnacceptedPaymentMethodByEvent({ event });
         // 上映方式がなければMovieTicket除外
@@ -53,7 +56,7 @@ function searchOfferAppliesToMovieTicket(params) {
         // 興行設定があれば興行のカタログを参照する
         const eventOffers = event.offers;
         let catalogId;
-        if (typeof ((_a = eventOffers.itemOffered) === null || _a === void 0 ? void 0 : _a.id) === 'string') {
+        if (typeof ((_b = eventOffers.itemOffered) === null || _b === void 0 ? void 0 : _b.id) === 'string') {
             const eventService = (yield repos.product.projectFields({
                 limit: 1,
                 page: 1,
@@ -65,7 +68,7 @@ function searchOfferAppliesToMovieTicket(params) {
                 throw new factory.errors.NotFound(factory.product.ProductType.EventService);
             }
             // const firstCatalogIdOfProduct = eventService.hasOfferCatalog?.id; // migrate to itemListElement(2024-09-30~)
-            const firstCatalogIdOfProduct = (_c = (_b = eventService.hasOfferCatalog) === null || _b === void 0 ? void 0 : _b.itemListElement.at(0)) === null || _c === void 0 ? void 0 : _c.id;
+            const firstCatalogIdOfProduct = (_d = (_c = eventService.hasOfferCatalog) === null || _c === void 0 ? void 0 : _c.itemListElement.at(0)) === null || _d === void 0 ? void 0 : _d.id;
             if (typeof firstCatalogIdOfProduct === 'string') {
                 catalogId = firstCatalogIdOfProduct;
             }
@@ -83,7 +86,7 @@ function searchOfferAppliesToMovieTicket(params) {
         }
         return repos.offer.searchAvaialbleAppliesToMovieTicketByOfferCatalogId({
             subOfferCatalog: { id: subOfferCatalogId, isOfferCatalogItem },
-            availableAtOrFrom: { id: (_d = params.store) === null || _d === void 0 ? void 0 : _d.id },
+            availableAtOrFrom: { id: (_e = params.store) === null || _e === void 0 ? void 0 : _e.id },
             unacceptedPaymentMethod: unacceptedPaymentMethod,
             excludeAppliesToMovieTicket: excludeAppliesToMovieTicket,
             onlyValid: params.onlyValid === true,

package/lib/chevre/service/offer/event/searchOffersByIds.js

@@ -110,7 +110,7 @@ function searchTicketOffersByItemOffered(params) {
 function searchEventTicketOffersByEvent(params) {
     // tslint:disable-next-line:max-func-body-length
     return (repos) => __awaiter(this, void 0, void 0, function* () {
-        var _a;
+        var _a, _b;
         const event = params.event;
         let soundFormatTypes = [];
         let videoFormatTypes = [];
@@ -120,13 +120,16 @@ function searchEventTicketOffersByEvent(params) {
                 page: 1,
                 id: { $eq: event.superEvent.id }
                 // typeOf: factory.eventType.ScreeningEventSeries
-            }, ['soundFormat', 'videoFormat']);
+            }, 
+            // ['soundFormat', 'videoFormat', 'subEvent']
+            ['soundFormat', 'subEvent']);
             const superEvent = superEvents.shift();
             if (superEvent === undefined) {
                 throw new factory.errors.NotFound(factory.eventType.ScreeningEventSeries);
             }
             soundFormatTypes = (Array.isArray(superEvent.soundFormat)) ? superEvent.soundFormat.map((f) => f.typeOf) : [];
-            videoFormatTypes = (Array.isArray(superEvent.videoFormat)) ? superEvent.videoFormat.map((f) => f.typeOf) : [];
+            // videoFormatTypes = (Array.isArray(superEvent.videoFormat)) ? superEvent.videoFormat.map((f) => f.typeOf) : [];
+            videoFormatTypes = (Array.isArray((_a = superEvent.subEvent) === null || _a === void 0 ? void 0 : _a.videoFormat)) ? superEvent.subEvent.videoFormat : [];
         }
         const unacceptedPaymentMethod = getUnacceptedPaymentMethodByEvent({ event });
         // 上映方式がなければMovieTicket除外(2023-02-21~)
@@ -134,7 +137,7 @@ function searchEventTicketOffersByEvent(params) {
         // 興行設定があれば興行のカタログを参照する(2022-08-31~)
         const eventOffers = event.offers;
         const { availableOffers } = yield searchTicketOffersByItemOffered({
-            itemOffered: { id: String((_a = eventOffers === null || eventOffers === void 0 ? void 0 : eventOffers.itemOffered) === null || _a === void 0 ? void 0 : _a.id) },
+            itemOffered: { id: String((_b = eventOffers === null || eventOffers === void 0 ? void 0 : eventOffers.itemOffered) === null || _b === void 0 ? void 0 : _b.id) },
             ids: params.ids,
             store: params.store,
             // limit: params.limit,

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

@@ -165,15 +165,17 @@ function createInformTasks(params, setting) {
                 id: { $in: params.ids }
                 // typeOf: params.typeOf
             }, [
-                'project', 'organizer', 'typeOf', 'name', 'location', 'videoFormat', 'soundFormat', 'workPerformed', 'kanaName', 'eventStatus',
+                'project', 'organizer', 'typeOf', 'name', 'location', 'soundFormat', 'workPerformed', 'kanaName', 'eventStatus',
                 'endDate', 'startDate', 'additionalProperty', 'subtitleLanguage', 'dubLanguage',
-                'alternativeHeadline', 'description', 'duration', 'headline'
+                'alternativeHeadline', 'description', 'duration', 'headline', 'subEvent'
             ] // inclusion(2024-07-30~)
             );
             // 最適化(2024-03-25~)
-            events4inform = screeningEventSeries4inform.map(({ project, organizer, typeOf, name, location, id, videoFormat, soundFormat, workPerformed, kanaName, eventStatus, endDate, startDate, additionalProperty, subtitleLanguage, dubLanguage, alternativeHeadline, description, duration, headline }) => {
-                return Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({ project, organizer, typeOf, name, location, id, videoFormat, soundFormat, workPerformed, kanaName, eventStatus,
-                    endDate, startDate }, (Array.isArray(additionalProperty)) ? { additionalProperty } : undefined), (subtitleLanguage !== undefined) ? {} : undefined), (dubLanguage !== undefined) ? { dubLanguage } : undefined), (alternativeHeadline !== undefined) ? { alternativeHeadline } : undefined), (description !== undefined) ? { description } : undefined), (typeof duration === 'string') ? { duration } : undefined), (headline !== undefined) ? { headline } : undefined);
+            events4inform = screeningEventSeries4inform.map(({ project, organizer, typeOf, name, location, id, soundFormat, workPerformed, kanaName, eventStatus, endDate, startDate, additionalProperty, subtitleLanguage, dubLanguage, alternativeHeadline, description, duration, headline, subEvent }) => {
+                return Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({ project, organizer, typeOf, name, location, id, soundFormat, workPerformed, kanaName, eventStatus,
+                    endDate, startDate, videoFormat: (Array.isArray(subEvent === null || subEvent === void 0 ? void 0 : subEvent.videoFormat))
+                        ? subEvent.videoFormat.map((codeValue) => ({ typeOf: codeValue, name: codeValue }))
+                        : [] }, (Array.isArray(additionalProperty)) ? { additionalProperty } : undefined), (subtitleLanguage !== undefined) ? {} : undefined), (dubLanguage !== undefined) ? { dubLanguage } : undefined), (alternativeHeadline !== undefined) ? { alternativeHeadline } : undefined), (description !== undefined) ? { description } : undefined), (typeof duration === 'string') ? { duration } : undefined), (headline !== undefined) ? { headline } : undefined);
             });
         }
         if (events4inform.length > 0) {

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/createEvent/createEventBySchedule/factory.d.ts

@@ -1,7 +1,7 @@
 import type { ICreatingEvent4ttts } from '../../../../repo/event';
 import type { ICustomerMember } from '../../../../repo/member';
 import * as factory from '../../../../factory';
-declare function tour2creatingEvent(tour: ITourBySchedule, movieTheater: Pick<factory.place.movieTheater.IPlace, 'id' | 'branchCode' | 'parentOrganization'>, screeningRoom: Omit<factory.place.screeningRoom.IPlace, 'containsPlace' | 'parentOrganization'>, existingApplicationMembers: {
+declare function tour2creatingEvent(tour: ITourBySchedule, movieTheater: Pick<factory.place.movieTheater.IPlace, 'id' | 'branchCode' | 'parentOrganization'>, screeningRoom: Pick<factory.place.screeningRoom.IPlace, 'additionalProperty' | 'address' | 'branchCode' | 'name' | 'maximumAttendeeCapacity'>, existingApplicationMembers: {
     member: ICustomerMember;
 }[], maxValue: number, eventService: Pick<factory.product.IProduct, 'id' | 'name'> & {
     id: string;

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

@@ -83,7 +83,7 @@ function tour2creatingEvent(tour, movieTheater, screeningRoom, existingApplicati
             }, typeOf: factory.product.ProductType.EventService, availableChannel: {
                 typeOf: 'ServiceChannel',
                 serviceLocation: {
-                    typeOf: screeningRoom.typeOf,
+                    typeOf: factory.placeType.ScreeningRoom,
                     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)
@@ -104,7 +104,7 @@ function tour2creatingEvent(tour, movieTheater, screeningRoom, existingApplicati
         : undefined), (screeningEventSeries.headline !== undefined)
         ? { headline: screeningEventSeries.headline }
         : undefined);
-    const location = Object.assign({ typeOf: screeningRoom.typeOf, branchCode: screeningRoom.branchCode, name: screeningRoom.name }, (screeningRoom.address !== undefined) ? { address: screeningRoom.address } : undefined);
+    const location = Object.assign({ typeOf: factory.placeType.ScreeningRoom, branchCode: screeningRoom.branchCode, name: screeningRoom.name }, (screeningRoom.address !== undefined) ? { address: screeningRoom.address } : undefined);
     return {
         project: { id: project.id, typeOf: factory.organizationType.Project },
         typeOf: factory.eventType.ScreeningEvent,

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

@@ -61,7 +61,7 @@ function schedule2relatedResources(schedule) {
         if (movieTheater === undefined) {
             throw new factory.errors.NotFound(factory.placeType.MovieTheater);
         }
-        const screeningRoom = (yield repos.screeningRoom.searchScreeningRooms({
+        const screeningRoom = (yield repos.screeningRoom.findRooms({
             limit: 1,
             page: 1,
             project: { id: { $eq: project.id } },

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

@@ -433,14 +433,14 @@ function createInformMovieTheaterTasks(params, setting) {
             throw new factory.errors.NotFound(factory.placeType.MovieTheater);
         }
         // ルームを検索
-        const screeningRooms = yield repos.screeningRoom.searchScreeningRooms({
+        const screeningRooms = yield repos.screeningRoom.findRooms({
             containedInPlace: { id: { $eq: movieTheater.id } }
         });
         const movieTheaters4inform = [Object.assign(Object.assign({}, movieTheater), { containsPlace: screeningRooms.map((room) => {
                     return {
                         branchCode: room.branchCode,
                         name: room.name,
-                        typeOf: room.typeOf,
+                        typeOf: factory.placeType.ScreeningRoom,
                         additionalProperty: room.additionalProperty,
                         address: room.address
                     };

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.js

@@ -216,7 +216,7 @@ function syncEvents(params) {
                 throw new factory.errors.NotFound(factory.placeType.MovieTheater);
             }
             // console.log('movieTheater:', movieTheater);
-            const screeningRoom = (yield repos.screeningRoom.searchScreeningRooms({
+            const screeningRoom = (yield repos.screeningRoom.findRooms({
                 project: { id: { $eq: params.project.id } },
                 containedInPlace: { branchCode: { $eq: movieTheater.branchCode } },
                 branchCode: { $eq: roomCode }

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.5",
+    "@chevre/factory": "5.4.0-alpha.12",
     "@cinerino/sdk": "12.12.1",
     "@motionpicture/coa-service": "9.6.0",
     "@motionpicture/gmo-service": "5.4.0-alpha.1",
@@ -33,6 +33,7 @@
   "description": "Chevre Domain Library for Node.js",
   "devDependencies": {
     "@eslint/js": "9.16.0",
+    "@json2csv/plainjs": "7.0.6",
     "@sendgrid/helpers": "8.0.0",
     "@types/debug": "0.0.30",
     "@types/google-libphonenumber": "^7.4.19",
@@ -115,5 +116,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build && npm test && npm run doc"
   },
-  "version": "23.2.0-alpha.2"
+  "version": "23.2.0-alpha.20"
 }

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

@@ -1,60 +0,0 @@
-/**
- * マスターデータ同期サービス
- */
-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 } 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 { SellerRepo } from '../repo/seller';
-import * as factory from '../factory';
-interface IImportFromCOAParams {
-    project: {
-        id: string;
-        typeOf: factory.organizationType.Project;
-    };
-    /**
-     * 施設コード
-     */
-    locationBranchCode: string;
-    importFrom: Date;
-    importThrough: Date;
-    /**
-     * 施設を保管するかどうか
-     */
-    saveMovieTheater: boolean;
-    /**
-     * 施設コンテンツを保管するかどうか
-     */
-    saveScreeningEventSeries: boolean;
-    saveScreeningEventSeriesPeriodInMonth: number;
-}
-/**
- * イベントをインポートする
- */
-declare function importFromCOA(params: IImportFromCOAParams): (repos: {
-    action: ActionRepo;
-    categoryCode: CategoryCodeRepo;
-    creativeWork: CreativeWorkRepo;
-    event: EventRepo;
-    eventSeries: EventSeriesRepo;
-    movieTheater: MovieTheaterRepo;
-    screeningRoom: ScreeningRoomRepo;
-    seller: SellerRepo;
-    masterService: COA.service.Master;
-}) => Promise<void>;
-/**
- * COA情報からイベントIDを作成する
- */
-declare function createScreeningEventIdFromCOA(params: {
-    theaterCode: string;
-    titleCode: string;
-    titleBranchNum: string;
-    dateJouei: string;
-    screenCode: string;
-    timeBegin: string;
-}): string;
-export { importFromCOA, createScreeningEventIdFromCOA };