@chevre/domain 21.25.0-alpha.2 → 21.25.0-alpha.3

package/example/src/chevre/deleteOwnershipInfosByWebApplication.ts

@@ -0,0 +1,80 @@
+// tslint:disable:no-console
+import * as mongoose from 'mongoose';
+
+import { chevre } from '../../../lib/index';
+
+// const project = { id: String(process.env.PROJECT_ID) };
+
+// tslint:disable-next-line:max-func-body-length
+async function main() {
+    await mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: false });
+
+    const ownershipInfoRepo = await chevre.repository.OwnershipInfo.createInstance(mongoose.connection);
+
+    const cursor = ownershipInfoRepo.getCursor(
+        {
+            'ownedBy.typeOf': { $eq: chevre.factory.creativeWorkType.WebApplication }
+        },
+        {
+        }
+    );
+    console.log('infos found');
+
+    let i = 0;
+    let updateCount = 0;
+    await cursor.eachAsync(async (doc) => {
+        i += 1;
+        const ownershipInfo: Pick<
+            chevre.factory.ownershipInfo.IOwnershipInfo<chevre.factory.ownershipInfo.IGood>,
+            'id' | 'project' | 'identifier' | 'ownedBy' | 'ownedFrom' | 'ownedThrough'
+        > = doc.toObject();
+
+        let noNeedToDelete = true;
+        let ownedById: string | undefined;
+        let ownedByTypeOf: string;
+        if (Array.isArray(ownershipInfo.ownedBy)) {
+            ownedByTypeOf = ownershipInfo.ownedBy[0].typeOf;
+            if (ownershipInfo.ownedBy.every(({ typeOf }) => typeOf === chevre.factory.creativeWorkType.WebApplication)) {
+                noNeedToDelete = false;
+                ownedById = ownershipInfo.ownedBy[0].id;
+            }
+        } else {
+            ownedByTypeOf = ownershipInfo.ownedBy.typeOf;
+            if (ownershipInfo.ownedBy.typeOf === chevre.factory.creativeWorkType.WebApplication) {
+                noNeedToDelete = false;
+                ownedById = ownershipInfo.ownedBy.id;
+            }
+        }
+
+        if (noNeedToDelete) {
+            console.log(
+                'noNeedToDelete.',
+                ownershipInfo.project.id, ownershipInfo.identifier, ownershipInfo.id, ownedByTypeOf, ownershipInfo.ownedFrom,
+                i, updateCount);
+        } else {
+            console.log(
+                'deleting...',
+                ownershipInfo.project.id, ownershipInfo.identifier, ownershipInfo.id, ownedByTypeOf, ownershipInfo.ownedFrom,
+                i, updateCount);
+            if (typeof ownedById === 'string') {
+                await ownershipInfoRepo.deleteByIdAndOwnedById({
+                    project: { id: ownershipInfo.project.id },
+                    id: ownershipInfo.id,
+                    ownedBy: { id: ownedById }
+                });
+            }
+            updateCount += 1;
+            console.log(
+                'deleted.',
+                ownershipInfo.project.id, ownershipInfo.identifier, ownershipInfo.id, ownedByTypeOf, ownershipInfo.ownedFrom,
+                i, updateCount);
+        }
+    });
+
+    console.log(i, 'infos checked');
+    console.log(updateCount, 'infos updated');
+}
+
+main()
+    .then()
+    .catch(console.error);

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

@@ -10,11 +10,14 @@ type IOrderInTransaction = Pick<factory.order.IOrder, 'orderNumber' | 'project'>
 export declare class MongoRepository {
     private readonly orderModel;
     constructor(connection: Connection);
-    searchByOrderNumber(params: {
+    /**
+     * 取引進行中の注文からacceptedOffersを検索する
+     */
+    findAcceptedOffersByOrderNumber(params: {
         orderNumber: {
             $eq: string;
         };
-    }): Promise<IOrderInTransaction[]>;
+    }): Promise<factory.order.IAcceptedOffer<factory.order.IItemOffered>[]>;
     /**
      * 注文を受注する
      */

package/lib/chevre/repo/orderInTransaction.js

@@ -32,15 +32,21 @@ class MongoRepository {
     constructor(connection) {
         this.orderModel = connection.model(order_1.modelName, (0, order_1.createSchema)());
     }
-    searchByOrderNumber(params) {
+    /**
+     * 取引進行中の注文からacceptedOffersを検索する
+     */
+    findAcceptedOffersByOrderNumber(params) {
         return __awaiter(this, void 0, void 0, function* () {
-            // typeOf:PlaceOrderのドキュメントが存在すれば、typeOf:Orderに変更する
-            return this.orderModel.find({
+            const doc = yield this.orderModel.findOne({
                 orderNumber: { $eq: params.orderNumber.$eq },
                 typeOf: { $eq: factory.transactionType.PlaceOrder }
-            })
-                .exec()
-                .then((docs) => docs.map((doc) => doc.toObject()));
+            }, { acceptedOffers: 1 })
+                .lean()
+                .exec();
+            if (doc === null) {
+                throw new factory.errors.NotFound('orderInTransaction');
+            }
+            return doc.acceptedOffers;
         });
     }
     /**

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

@@ -13,6 +13,15 @@ export declare function createActionAttributes(params: {
     transaction: factory.transaction.ITransaction<factory.transactionType.PlaceOrder>;
     transactionNumber: string;
 }): factory.action.authorize.offer.product.IAttributes;
+type IResultAcceptedOffer = factory.action.authorize.offer.product.IResultAcceptedOffer;
+export declare function responseBody2resultAcceptedOffer(params: {
+    project: {
+        id: string;
+        typeOf: factory.organizationType.Project;
+    };
+    responseBody: factory.assetTransaction.registerService.ITransaction;
+    acceptedOffer: factory.action.authorize.offer.product.IObject;
+}): IResultAcceptedOffer;
 export declare function createResult(params: {
     project: {
         id: string;
@@ -22,3 +31,4 @@ export declare function createResult(params: {
     responseBody: factory.assetTransaction.registerService.ITransaction;
     acceptedOffer: factory.action.authorize.offer.product.IObject;
 }): factory.action.authorize.offer.product.IResult;
+export {};

package/lib/chevre/service/offer/product/factory.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createResult = exports.createActionAttributes = exports.createRegisterServiceStartParams = void 0;
+exports.createResult = exports.responseBody2resultAcceptedOffer = exports.createActionAttributes = exports.createRegisterServiceStartParams = void 0;
 const moment = require("moment");
 const factory = require("../../../factory");
 function createRegisterServiceStartParams(params) {
@@ -150,6 +150,7 @@ function responseBody2resultAcceptedOffer(params) {
     }
     return acceptedOffers;
 }
+exports.responseBody2resultAcceptedOffer = responseBody2resultAcceptedOffer;
 function createResult(params) {
     const acceptedOffers4result = responseBody2resultAcceptedOffer(params);
     // 金額計算

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

@@ -147,11 +147,12 @@ function authorize(params) {
             });
             requestBody = startParams;
             responseBody = yield RegisterServiceTransaction.start(startParams)(repos);
+            const acceptedOffers4result = (0, factory_1.responseBody2resultAcceptedOffer)({ project: action.project, responseBody, acceptedOffer });
             result = (0, factory_1.createResult)({ project: action.project, requestBody, responseBody, acceptedOffer });
             yield (0, any_1.acceptOffer)({
                 project: transaction.project,
                 purpose: { id: transaction.id },
-                acceptedOffers: result.acceptedOffers
+                acceptedOffers: acceptedOffers4result
             })(repos);
         }
         catch (error) {

package/lib/chevre/service/transaction/placeOrderInProgress/confirm.d.ts

@@ -2,6 +2,7 @@ import type { MongoRepository as ActionRepo } from '../../../repo/action';
 import type { MongoRepository as CodeRepo } from '../../../repo/code';
 import type { RedisRepository as ConfirmationNumberRepo } from '../../../repo/confirmationNumber';
 import type { MongoRepository as EmailMessageRepo } from '../../../repo/emailMessage';
+import type { MongoRepository as OrderInTransactionRepo } from '../../../repo/orderInTransaction';
 import type { RedisRepository as OrderNumberRepo } from '../../../repo/orderNumber';
 import type { MongoRepository as ProjectRepo } from '../../../repo/project';
 import type { MongoRepository as TransactionRepo } from '../../../repo/transaction';
@@ -13,6 +14,7 @@ interface IConfirmOperationRepos {
     emailMessage?: EmailMessageRepo;
     project: ProjectRepo;
     transaction: TransactionRepo;
+    orderInTransaction: OrderInTransactionRepo;
     orderNumber: OrderNumberRepo;
     confirmationNumber: ConfirmationNumberRepo;
 }

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

@@ -8,22 +8,12 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-var __rest = (this && this.__rest) || function (s, e) {
-    var t = {};
-    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
-        t[p] = s[p];
-    if (s != null && typeof Object.getOwnPropertySymbols === "function")
-        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
-            if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
-                t[p[i]] = s[p[i]];
-        }
-    return t;
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.confirm = void 0;
 const moment = require("moment");
 const errorHandler_1 = require("../../../errorHandler");
 const factory = require("../../../factory");
+const availableProductTypes_1 = require("../../../factory/availableProductTypes");
 const potentialActions_1 = require("./potentialActions");
 const publishCode_1 = require("./publishCode");
 const publishConfirmationNumberIfNotExist_1 = require("./publishConfirmationNumberIfNotExist");
@@ -78,7 +68,10 @@ function confirm(params) {
                 expiresInSeconds: publishCodeExpiresInSeconds
             })(repos);
         }
-        const { result, eventId, reservationIds } = createResult(Object.assign(Object.assign({}, params), { orderNumber, transaction: transaction, authorizeActions: completedAuthorizeActions, code }));
+        // const acceptedOffers = await repos.orderInTransaction.findAcceptedOffersByOrderNumber({ orderNumber: { $eq: orderNumber } });
+        const { acceptedOffers } = dissolveAuthorizeActions(completedAuthorizeActions);
+        const { result, eventId, reservationIds } = createResult(Object.assign(Object.assign({}, params), { orderNumber, transaction: transaction, authorizeActions: completedAuthorizeActions, code,
+            acceptedOffers }));
         // デフォルトEメールメッセージを検索
         let emailMessageOnOrderSent;
         if (repos.emailMessage !== undefined) {
@@ -125,7 +118,52 @@ function confirm(params) {
     });
 }
 exports.confirm = confirm;
-function createReservationIdsResult(order) {
+function dissolveAuthorizeActions(completedAuthorizeActions) {
+    const authorizeEventServiceOfferActions = completedAuthorizeActions
+        .filter((a) => (!Array.isArray(a.object))
+        && a.object.typeOf === factory.action.authorize.offer.eventService.ObjectType.SeatReservation);
+    const authorizeProductOfferActions = completedAuthorizeActions
+        .filter((a) => Array.isArray(a.object)
+        && a.object.length > 0
+        && a.object.every(({ typeOf }) => typeOf === factory.offerType.Offer)
+        && a.object.every(({ itemOffered }) => availableProductTypes_1.availableProductTypes.indexOf(itemOffered.typeOf) >= 0));
+    const authorizeMoneyTansferActions = completedAuthorizeActions
+        .filter((a) => {
+        var _a;
+        return (!Array.isArray(a.object))
+            && a.object.typeOf === factory.offerType.Offer
+            && ((_a = a.object.itemOffered) === null || _a === void 0 ? void 0 : _a.typeOf) === factory.actionType.MoneyTransfer;
+    });
+    const acceptedOffers = [];
+    authorizeEventServiceOfferActions.forEach((action) => {
+        var _a;
+        const acceptedOffersByAuthorizeAction = (_a = action.result) === null || _a === void 0 ? void 0 : _a.acceptedOffers;
+        if (Array.isArray(acceptedOffersByAuthorizeAction)) {
+            acceptedOffers.push(...acceptedOffersByAuthorizeAction);
+        }
+    });
+    authorizeProductOfferActions.forEach((action) => {
+        var _a;
+        const acceptedOffersByAuthorizeAction = (_a = action.result) === null || _a === void 0 ? void 0 : _a.acceptedOffers;
+        if (Array.isArray(acceptedOffersByAuthorizeAction)) {
+            acceptedOffers.push(...acceptedOffersByAuthorizeAction);
+        }
+    });
+    authorizeMoneyTansferActions.forEach((action) => {
+        var _a;
+        const acceptedOffersByAuthorizeAction = (_a = action.result) === null || _a === void 0 ? void 0 : _a.acceptedOffers;
+        if (Array.isArray(acceptedOffersByAuthorizeAction)) {
+            acceptedOffers.push(...acceptedOffersByAuthorizeAction);
+        }
+    });
+    return {
+        acceptedOffers,
+        authorizeEventServiceOfferActions,
+        authorizeProductOfferActions,
+        authorizeMoneyTansferActions
+    };
+}
+function createReservationIdsResult(order, acceptedOffers) {
     var _a;
     let eventId = '';
     const reservationIds = [];
@@ -137,8 +175,8 @@ function createReservationIdsResult(order) {
         // イベントIDが1つのみに対応
         if (eventIdsByOrder.length === 1) {
             eventId = eventIdsByOrder[0];
-            if (Array.isArray(order.acceptedOffers)) {
-                order.acceptedOffers.forEach((o) => {
+            if (Array.isArray(acceptedOffers)) {
+                acceptedOffers.forEach((o) => {
                     if (o.itemOffered.typeOf === factory.reservationType.EventReservation
                         || o.itemOffered.typeOf === factory.reservationType.BusReservation) {
                         reservationIds.push(o.itemOffered.id);
@@ -149,10 +187,31 @@ function createReservationIdsResult(order) {
     }
     return { eventId, reservationIds };
 }
+// tslint:disable-next-line:max-func-body-length
 function createResult(params) {
     const transaction = params.transaction;
+    const eventReservationAcceptedOffers = [];
+    const productAcceptedOffers = [];
+    const moneyTransferAcceptedOffers = [];
+    params.acceptedOffers.forEach((acceptedOffer) => {
+        const itemOfferedTypeOf = acceptedOffer.itemOffered.typeOf;
+        switch (itemOfferedTypeOf) {
+            case factory.reservationType.BusReservation:
+            case factory.reservationType.EventReservation:
+                eventReservationAcceptedOffers.push(acceptedOffer);
+                break;
+            case factory.permit.PermitType.Permit:
+                productAcceptedOffers.push(acceptedOffer);
+                break;
+            case factory.actionType.MoneyTransfer:
+                moneyTransferAcceptedOffers.push(acceptedOffer);
+                break;
+            default:
+                throw new factory.errors.NotImplemented(`${itemOfferedTypeOf} not implemented`);
+        }
+    });
     // 取引の確定条件が全て整っているかどうか確認
-    (0, validation_1.validateTransaction)(transaction, params.authorizeActions);
+    (0, validation_1.validateTransaction)(transaction, params.authorizeActions, eventReservationAcceptedOffers);
     // 注文作成
     const order = (0, result_1.createOrder)({
         orderNumber: params.orderNumber,
@@ -160,7 +219,10 @@ function createResult(params) {
         orderDate: params.result.order.orderDate,
         orderStatus: factory.orderStatus.OrderPaymentDue,
         isGift: false,
-        authorizeActions: params.authorizeActions
+        authorizeActions: params.authorizeActions,
+        eventReservationAcceptedOffers,
+        productAcceptedOffers,
+        moneyTransferAcceptedOffers
     });
     (0, validation_1.validateEventOffers)({
         transaction: transaction,
@@ -170,7 +232,8 @@ function createResult(params) {
     // 注文オファー検証
     (0, validation_1.validateNumItems)({
         order: order,
-        result: params.result
+        result: params.result,
+        acceptedOffers: params.acceptedOffers
     });
     // 注文アイテム検証(2024-01-20~)
     (0, validation_1.validateOrderedItem)({
@@ -188,19 +251,20 @@ function createResult(params) {
     order.identifier = identifier;
     order.url = url;
     const authorizeActions = params.authorizeActions.map(({ id }) => ({ id }));
-    const { acceptedOffers } = order, orderWithoutAcceptedOffers = __rest(order, ["acceptedOffers"]);
-    const orderAsResult = orderWithoutAcceptedOffers;
+    // const { acceptedOffers, ...orderWithoutAcceptedOffers } = order;
+    // const orderAsResult: factory.transaction.placeOrder.IOrderAsResult = order;
     let eventId;
     let reservationIds;
     if (params.options.expectsReservationIds) {
         // ttts対応として予約IDリストとイベントIDを返却
-        const reservationIdsResult = createReservationIdsResult(order);
+        const reservationIdsResult = createReservationIdsResult(order, params.acceptedOffers);
         eventId = reservationIdsResult.eventId;
         reservationIds = reservationIdsResult.reservationIds;
     }
     return {
-        orderWithAcceptedOffers: order,
-        result: Object.assign({ order: orderAsResult, authorizeActions, numAcceptedOffers: order.acceptedOffers.length, options: {
+        // orderWithAcceptedOffers: order,
+        result: Object.assign({ order,
+            authorizeActions, numAcceptedOffers: params.acceptedOffers.length, options: {
                 ignoreAccpetedOffersFromResult: true
             } }, (typeof params.code === 'string') ? { code: params.code } : undefined),
         eventId,

package/lib/chevre/service/transaction/placeOrderInProgress/result/acceptedOffers.d.ts

@@ -2,24 +2,17 @@ import * as factory from '../../../../factory';
 export type IAuthorizeMoneyTransferOffer = factory.action.authorize.offer.moneyTransfer.IAction;
 export type IAuthorizeSeatReservationOffer = factory.action.authorize.offer.eventService.IAction<factory.service.webAPI.Identifier>;
 export declare function createReservationAcceptedOffers(params: {
-    transaction: factory.transaction.placeOrder.ITransaction;
-    authorizeActions: factory.action.authorize.IAction<factory.action.authorize.IAttributes<any, any>>[];
+    eventReservationAcceptedOffers: factory.order.IAcceptedOffer<factory.order.IReservation>[];
 }): {
-    reservationAcceptedOffers: factory.order.IAcceptedOffer<factory.order.IReservation>[];
     reservationOrderItems: factory.order.IOrderedItem[];
 };
 export declare function createProductItems(params: {
-    transaction: factory.transaction.placeOrder.ITransaction;
-    authorizeActions: factory.action.authorize.IAction<factory.action.authorize.IAttributes<any, any>>[];
-}): {
     productAcceptedOffers: factory.order.IAcceptedOffer<factory.order.IPermit>[];
+}): {
     productOrderItems: factory.order.IOrderedItem[];
 };
-export declare function createMoneyTransferAcceptedOffers(params: {
-    transaction: factory.transaction.placeOrder.ITransaction;
-    seller: factory.order.ISeller;
-    authorizeActions: factory.action.authorize.IAction<factory.action.authorize.IAttributes<any, any>>[];
-}): {
+export declare function createMoneyTransferAcceptedOffers(__: {
     moneyTransferAcceptedOffers: factory.order.IAcceptedOffer<factory.order.IMoneyTransfer>[];
+}): {
     moneyTransferOrderItems: factory.order.IOrderedItem[];
 };

package/lib/chevre/service/transaction/placeOrderInProgress/result/acceptedOffers.js

@@ -2,35 +2,36 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createMoneyTransferAcceptedOffers = exports.createProductItems = exports.createReservationAcceptedOffers = void 0;
 const factory = require("../../../../factory");
-const availableProductTypes_1 = require("../../../../factory/availableProductTypes");
 function createReservationAcceptedOffers(params) {
-    const acceptedOffers = [];
+    // const acceptedOffers: factory.order.IAcceptedOffer<factory.order.IReservation>[] = [];
     const orderedItems = [];
     // 座席予約に対する承認アクション取り出す
-    const seatReservationAuthorizeActions = params.authorizeActions
-        .filter((a) => a.object.typeOf === factory.action.authorize.offer.eventService.ObjectType.SeatReservation);
+    // const seatReservationAuthorizeActions = <IAuthorizeSeatReservationOffer[]>params.authorizeActions
+    //     .filter((a) => a.object.typeOf === factory.action.authorize.offer.eventService.ObjectType.SeatReservation);
     const eventIds = [];
-    seatReservationAuthorizeActions.forEach((authorizeSeatReservationAction) => {
-        var _a;
-        const resultAcceptedOffers = (_a = authorizeSeatReservationAction.result) === null || _a === void 0 ? void 0 : _a.acceptedOffers;
-        if (Array.isArray(resultAcceptedOffers) && resultAcceptedOffers.length > 0) {
-            acceptedOffers.push(...resultAcceptedOffers);
-            // プロダクトIDで最適化する
-            const reservationFor = resultAcceptedOffers[0].itemOffered.reservationFor;
-            const issuedThrough = resultAcceptedOffers[0].itemOffered.issuedThrough;
-            if (typeof (issuedThrough === null || issuedThrough === void 0 ? void 0 : issuedThrough.typeOf) === 'string') {
-                if (!eventIds.includes(String(reservationFor.id))) {
-                    eventIds.push(String(reservationFor.id));
-                    const orderedItem = reservationOffers2orderedItem({ reservationFor, issuedThrough });
-                    orderedItems.push({
-                        typeOf: 'OrderItem',
-                        orderedItem
-                    });
-                }
+    // seatReservationAuthorizeActions.forEach((authorizeSeatReservationAction) => {
+    //     const resultAcceptedOffers = authorizeSeatReservationAction.result?.acceptedOffers;
+    // });
+    if (Array.isArray(params.eventReservationAcceptedOffers) && params.eventReservationAcceptedOffers.length > 0) {
+        // acceptedOffers.push(...resultAcceptedOffers);
+        // プロダクトIDで最適化する
+        const reservationFor = params.eventReservationAcceptedOffers[0].itemOffered.reservationFor;
+        const issuedThrough = params.eventReservationAcceptedOffers[0].itemOffered.issuedThrough;
+        if (typeof (issuedThrough === null || issuedThrough === void 0 ? void 0 : issuedThrough.typeOf) === 'string') {
+            if (!eventIds.includes(String(reservationFor.id))) {
+                eventIds.push(String(reservationFor.id));
+                const orderedItem = reservationOffers2orderedItem({ reservationFor, issuedThrough });
+                orderedItems.push({
+                    typeOf: 'OrderItem',
+                    orderedItem
+                });
             }
         }
-    });
-    return { reservationAcceptedOffers: acceptedOffers, reservationOrderItems: orderedItems };
+    }
+    return {
+        // reservationAcceptedOffers: acceptedOffers,
+        reservationOrderItems: orderedItems
+    };
 }
 exports.createReservationAcceptedOffers = createReservationAcceptedOffers;
 function reservationOffers2orderedItem(params) {
@@ -82,85 +83,61 @@ function reservationOffers2orderedItem(params) {
     }
 }
 function createProductItems(params) {
-    const acceptedOffers = [];
+    var _a;
+    // const acceptedOffers: factory.order.IAcceptedOffer<factory.order.IPermit>[] = [];
     const orderedItems = [];
-    const authorizePaymentCardOfferActions = params.authorizeActions
-        .filter((a) => Array.isArray(a.object)
-        && a.object.length > 0
-        && a.object[0].typeOf === factory.offerType.Offer
-        && availableProductTypes_1.availableProductTypes.indexOf(a.object[0].itemOffered.typeOf) >= 0);
+    // const authorizePaymentCardOfferActions = (<factory.action.authorize.offer.product.IAction[]>params.authorizeActions)
+    //     .filter((a) =>
+    //         Array.isArray(a.object)
+    //         && a.object.length > 0
+    //         && a.object[0].typeOf === factory.offerType.Offer
+    //         && availableProductTypes.indexOf(a.object[0].itemOffered.typeOf) >= 0
+    //     );
     const productIds = [];
-    authorizePaymentCardOfferActions.forEach((a) => {
-        var _a, _b;
-        const resultAcceptedOffers = (_a = a.result) === null || _a === void 0 ? void 0 : _a.acceptedOffers;
-        if (Array.isArray(resultAcceptedOffers) && resultAcceptedOffers.length > 0) {
-            acceptedOffers.push(...resultAcceptedOffers);
-            // プロダクトIDで最適化する
-            const issuedThrough = resultAcceptedOffers[0].itemOffered.issuedThrough;
-            if (typeof (issuedThrough === null || issuedThrough === void 0 ? void 0 : issuedThrough.id) === 'string') {
-                if (!productIds.includes(issuedThrough.id)) {
-                    productIds.push(issuedThrough.id);
-                    orderedItems.push({
-                        typeOf: 'OrderItem',
-                        orderedItem: Object.assign({ id: String(issuedThrough.id), typeOf: issuedThrough.typeOf }, (typeof ((_b = issuedThrough.serviceType) === null || _b === void 0 ? void 0 : _b.typeOf) === 'string')
-                            ? { serviceType: issuedThrough.serviceType }
-                            : undefined)
-                    });
-                }
+    // authorizePaymentCardOfferActions.forEach((a) => {
+    //     const resultAcceptedOffers = a.result?.acceptedOffers;
+    // });
+    if (Array.isArray(params.productAcceptedOffers) && params.productAcceptedOffers.length > 0) {
+        // acceptedOffers.push(...resultAcceptedOffers);
+        // プロダクトIDで最適化する
+        const issuedThrough = params.productAcceptedOffers[0].itemOffered.issuedThrough;
+        if (typeof (issuedThrough === null || issuedThrough === void 0 ? void 0 : issuedThrough.id) === 'string') {
+            if (!productIds.includes(issuedThrough.id)) {
+                productIds.push(issuedThrough.id);
+                orderedItems.push({
+                    typeOf: 'OrderItem',
+                    orderedItem: Object.assign({ id: String(issuedThrough.id), typeOf: issuedThrough.typeOf }, (typeof ((_a = issuedThrough.serviceType) === null || _a === void 0 ? void 0 : _a.typeOf) === 'string')
+                        ? { serviceType: issuedThrough.serviceType }
+                        : undefined)
+                });
             }
         }
-    });
-    return { productAcceptedOffers: acceptedOffers, productOrderItems: orderedItems };
+    }
+    return {
+        // productAcceptedOffers: acceptedOffers,
+        productOrderItems: orderedItems
+    };
 }
 exports.createProductItems = createProductItems;
-function createMoneyTransferAcceptedOffers(params) {
+function createMoneyTransferAcceptedOffers(__) {
     // 通貨転送承認アクション
-    const authorizeMoneyTansferActions = params.authorizeActions
-        .filter((a) => a.object.typeOf === factory.offerType.Offer)
-        .filter((a) => { var _a; return ((_a = a.object.itemOffered) === null || _a === void 0 ? void 0 : _a.typeOf) === factory.actionType.MoneyTransfer; });
-    const acceptedOffers = [];
+    // const authorizeMoneyTansferActions = (<IAuthorizeMoneyTransferOffer[]>params.authorizeActions)
+    //     .filter((a) => a.object.typeOf === factory.offerType.Offer)
+    //     .filter((a) => a.object.itemOffered?.typeOf === factory.actionType.MoneyTransfer);
+    // const acceptedOffers: factory.order.IAcceptedOffer<factory.order.IMoneyTransfer>[] = [];
     const orderedItems = [];
-    authorizeMoneyTansferActions.forEach((authorizeMoneyTansferAction) => {
-        var _a;
-        if (authorizeMoneyTansferAction.result === undefined) {
-            throw new factory.errors.Argument('Transaction', 'authorize money transfer offer result does not exist');
-        }
-        const resultAcceptedOffers = (_a = authorizeMoneyTansferAction.result) === null || _a === void 0 ? void 0 : _a.acceptedOffers;
-        if (Array.isArray(resultAcceptedOffers) && resultAcceptedOffers.length > 0) {
-            acceptedOffers.push(...resultAcceptedOffers);
-        }
-        // const pendingTransaction = authorizeMoneyTansferAction.result.responseBody;
-        // if (pendingTransaction !== undefined) {
-        //     const amountValue = pendingTransaction.object.amount.value;
-        //     const currency = pendingTransaction.object.amount.currency;
-        //     const itemOffered: factory.order.IMoneyTransfer = {
-        //         typeOf: factory.actionType.MoneyTransfer,
-        //         amount: {
-        //             typeOf: 'MonetaryAmount',
-        //             value: amountValue,
-        //             currency
-        //         },
-        //         toLocation: {
-        //             typeOf: authorizeMoneyTansferAction.object.itemOffered.toLocation.typeOf,
-        //             // いったんマスク
-        //             identifier: 'xxx',
-        //             issuedThrough: { id: authorizeMoneyTansferAction.object.itemOffered.toLocation.issuedThrough?.id }
-        //         },
-        //         object: {
-        //             pendingTransaction: {
-        //                 typeOf: pendingTransaction.typeOf,
-        //                 // MonetaryAmountの識別子として、MoneyTransfer取引番号をセットする
-        //                 transactionNumber: String(pendingTransaction.transactionNumber)
-        //             }
-        //         },
-        //         name: `${amountValue} ${currency}`
-        //     };
-        //     acceptedOffers.push({
-        //         typeOf: factory.offerType.Offer,
-        //         itemOffered
-        //     });
-        // }
-    });
-    return { moneyTransferAcceptedOffers: acceptedOffers, moneyTransferOrderItems: orderedItems };
+    // authorizeMoneyTansferActions.forEach((authorizeMoneyTansferAction) => {
+    //     if (authorizeMoneyTansferAction.result === undefined) {
+    //         throw new factory.errors.Argument('Transaction', 'authorize money transfer offer result does not exist');
+    //     }
+    //     const resultAcceptedOffers = authorizeMoneyTansferAction.result?.acceptedOffers;
+    //     if (Array.isArray(resultAcceptedOffers) && resultAcceptedOffers.length > 0) {
+    //         acceptedOffers.push(...resultAcceptedOffers);
+    //     }
+    // });
+    return {
+        // moneyTransferAcceptedOffers: acceptedOffers,
+        moneyTransferOrderItems: orderedItems
+    };
 }
 exports.createMoneyTransferAcceptedOffers = createMoneyTransferAcceptedOffers;

package/lib/chevre/service/transaction/placeOrderInProgress/result.d.ts

@@ -10,6 +10,7 @@ export declare function createOrder(params: {
     orderStatus: factory.orderStatus;
     isGift: boolean;
     authorizeActions: factory.action.authorize.IAction<factory.action.authorize.IAttributes<any, any>>[];
-}): factory.transaction.placeOrder.IOrderAsResult & {
-    acceptedOffers: factory.order.IAcceptedOffer<factory.order.IItemOffered>[];
-};
+    eventReservationAcceptedOffers: factory.order.IAcceptedOffer<factory.order.IReservation>[];
+    productAcceptedOffers: factory.order.IAcceptedOffer<factory.order.IPermit>[];
+    moneyTransferAcceptedOffers: factory.order.IAcceptedOffer<factory.order.IMoneyTransfer>[];
+}): factory.transaction.placeOrder.IOrderAsResult & {};

package/lib/chevre/service/transaction/placeOrderInProgress/result.js

@@ -11,23 +11,28 @@ function createOrder(params) {
     const seller = createSeller({ transaction: params.transaction });
     const customer = createCustomer({ transaction: params.transaction });
     // 予約がある場合
-    const { reservationAcceptedOffers, reservationOrderItems } = (0, acceptedOffers_1.createReservationAcceptedOffers)(params);
+    // const { reservationAcceptedOffers, reservationOrderItems } = createReservationAcceptedOffers(params);
+    const { reservationOrderItems } = (0, acceptedOffers_1.createReservationAcceptedOffers)(params);
     // 通貨転送がある場合
-    const { moneyTransferAcceptedOffers, moneyTransferOrderItems } = (0, acceptedOffers_1.createMoneyTransferAcceptedOffers)(Object.assign(Object.assign({}, params), { seller: seller }));
+    // const { moneyTransferAcceptedOffers, moneyTransferOrderItems } = createMoneyTransferAcceptedOffers({ ...params, seller: seller });
+    const { moneyTransferOrderItems } = (0, acceptedOffers_1.createMoneyTransferAcceptedOffers)(params);
     // プロダクトがある場合
-    const { productAcceptedOffers, productOrderItems } = (0, acceptedOffers_1.createProductItems)(params);
-    const acceptedOffers = [
-        ...reservationAcceptedOffers,
-        ...moneyTransferAcceptedOffers,
-        ...productAcceptedOffers
-    ];
+    // const { productAcceptedOffers, productOrderItems } = createProductItems(params);
+    const { productOrderItems } = (0, acceptedOffers_1.createProductItems)(params);
+    // const acceptedOffers: factory.order.IAcceptedOffer<factory.order.IItemOffered>[] = [
+    //     ...reservationAcceptedOffers,
+    //     ...moneyTransferAcceptedOffers,
+    //     ...productAcceptedOffers
+    // ];
     const orderedItems = [...reservationOrderItems, ...moneyTransferOrderItems, ...productOrderItems];
     // 決済方法をセット
     const { paymentMethods, price } = createPaymentMethods({ transaction: params.transaction, authorizeActions: params.authorizeActions });
     const discounts = [];
     const name = (typeof params.transaction.object.name === 'string') ? params.transaction.object.name : undefined;
     const broker = (typeof ((_a = params.transaction.object.broker) === null || _a === void 0 ? void 0 : _a.typeOf) === 'string') ? params.transaction.object.broker : undefined;
-    return Object.assign(Object.assign({ project: params.transaction.project, typeOf: factory.order.OrderType.Order, seller: seller, customer: customer, price: price, priceCurrency: factory.priceCurrency.JPY, paymentMethods: paymentMethods, discounts: discounts, confirmationNumber: '', orderNumber: params.orderNumber, orderedItem: orderedItems, acceptedOffers: acceptedOffers, url: '', orderStatus: params.orderStatus, orderDate: params.orderDate, identifier: [], isGift: params.isGift }, (typeof name === 'string') ? { name } : undefined), (typeof (broker === null || broker === void 0 ? void 0 : broker.typeOf) === 'string') ? { broker } : undefined);
+    return Object.assign(Object.assign({ project: params.transaction.project, typeOf: factory.order.OrderType.Order, seller: seller, customer: customer, price: price, priceCurrency: factory.priceCurrency.JPY, paymentMethods: paymentMethods, discounts: discounts, confirmationNumber: '', orderNumber: params.orderNumber, orderedItem: orderedItems, 
+        // acceptedOffers: acceptedOffers,
+        url: '', orderStatus: params.orderStatus, orderDate: params.orderDate, identifier: [], isGift: params.isGift }, (typeof name === 'string') ? { name } : undefined), (typeof (broker === null || broker === void 0 ? void 0 : broker.typeOf) === 'string') ? { broker } : undefined);
 }
 exports.createOrder = createOrder;
 function createSeller(params) {

package/lib/chevre/service/transaction/placeOrderInProgress/validation/validateMovieTicket.d.ts

@@ -1,5 +1,20 @@
 import * as factory from '../../../../factory';
 /**
- * 座席予約オファー承認に対してムビチケ承認条件が整っているかどうか検証する
+ * 興行オファー承認に対して決済承認条件が整っているかどうか検証する
+ * 決済方法区分ごとに検証
  */
-export declare function validateMovieTicket(paymentMethodType: string, transaction: factory.transaction.placeOrder.ITransaction, authorizeActions: factory.action.authorize.IAction<factory.action.authorize.IAttributes<any, any>>[]): void;
+export declare function validateMovieTicket(
+/**
+ * 決済方法区分
+ */
+paymentMethodType: string, transaction: {
+    id: string;
+}, 
+/**
+ * 決済承認アクション
+ */
+authorizeActions: factory.action.authorize.IAction<factory.action.authorize.IAttributes<any, any>>[], 
+/**
+ * 受け入れられた興行オファー
+ */
+eventReservationAcceptedOffers: factory.order.IAcceptedOffer<factory.order.IReservation>[]): void;

package/lib/chevre/service/transaction/placeOrderInProgress/validation/validateMovieTicket.js

@@ -6,11 +6,25 @@ exports.validateMovieTicket = void 0;
  */
 const createDebug = require("debug");
 const factory = require("../../../../factory");
-const debug = createDebug('cinerino-domain:service:validateMovieTicket');
+const debug = createDebug('chevre-domain:service:validateMovieTicket');
 /**
- * 座席予約オファー承認に対してムビチケ承認条件が整っているかどうか検証する
+ * 興行オファー承認に対して決済承認条件が整っているかどうか検証する
+ * 決済方法区分ごとに検証
  */
-function validateMovieTicket(paymentMethodType, transaction, authorizeActions) {
+// tslint:disable-next-line:max-func-body-length
+function validateMovieTicket(
+/**
+ * 決済方法区分
+ */
+paymentMethodType, transaction, 
+/**
+ * 決済承認アクション
+ */
+authorizeActions, 
+/**
+ * 受け入れられた興行オファー
+ */
+eventReservationAcceptedOffers) {
     const authorizeMovieTicketActions = authorizeActions.filter((a) => {
         var _a, _b;
         const resultAsInvoice = (Array.isArray(a.result))
@@ -22,11 +36,14 @@ function validateMovieTicket(paymentMethodType, transaction, authorizeActions) {
             && ((_b = resultAsInvoice === null || resultAsInvoice === void 0 ? void 0 : resultAsInvoice.paymentMethodAsObject) === null || _b === void 0 ? void 0 : _b.typeOf) === paymentMethodType;
         // && a.result?.paymentMethod === paymentMethodType
     });
-    const seatReservationAuthorizeActions = authorizeActions.filter((a) => a.object.typeOf === factory.action.authorize.offer.eventService.ObjectType.SeatReservation);
+    // const seatReservationAuthorizeActions = (<IAuthorizeSeatReservationOffer[]>authorizeActions).filter(
+    //     (a) => a.object.typeOf === factory.action.authorize.offer.eventService.ObjectType.SeatReservation
+    // );
     // 予約によって必要とされるMovieTicket
     const requiredMovieTickets = authorizeSeatReservationActions2requiredMovieTickets({
         paymentMethodType,
-        seatReservationAuthorizeActions
+        // seatReservationAuthorizeActions
+        acceptedOffers: eventReservationAcceptedOffers
     });
     debug(requiredMovieTickets.length, 'movie tickets required', 'transaction:', transaction.id);
     const authorizedMovieTickets = [];
@@ -105,76 +122,71 @@ function validateAppliesToMovieTicketIdentifiers(params) {
         }
     });
 }
-// tslint:disable-next-line:max-func-body-length
+/**
+ * 予約オファーリストから必要なmovieTicketsを生成する
+ */
 function authorizeSeatReservationActions2requiredMovieTickets(params) {
     const paymentMethodType = params.paymentMethodType;
-    const seatReservationAuthorizeActions = params.seatReservationAuthorizeActions;
+    // const seatReservationAuthorizeActions = params.seatReservationAuthorizeActions;
     // ムビチケオファーを受け付けた座席予約を検索する
     const requiredMovieTickets = [];
     // tslint:disable-next-line:max-func-body-length
-    seatReservationAuthorizeActions.forEach((action) => {
-        var _a;
-        const event = action.object.event;
-        // ↓実際ありえないフロー
-        if (event === undefined || event === null) {
-            throw new factory.errors.ServiceUnavailable('Authorized event undefined');
-        }
-        // a.objectではなくa.resultを使用する(2022-06-04~)
-        // 予約の複数適用決済カードに対応する(2022-07-28~)
-        const acceptedOffers = (_a = action.result) === null || _a === void 0 ? void 0 : _a.acceptedOffers;
-        if (Array.isArray(acceptedOffers)) {
-            acceptedOffers.forEach((offer) => {
-                var _a, _b, _c, _d, _e;
-                let offeredTicketedSeat;
-                const acceptedTicketedSeatByItemOffered = (_b = (_a = offer.itemOffered) === null || _a === void 0 ? void 0 : _a.reservedTicket) === null || _b === void 0 ? void 0 : _b.ticketedSeat;
-                if (typeof (acceptedTicketedSeatByItemOffered === null || acceptedTicketedSeatByItemOffered === void 0 ? void 0 : acceptedTicketedSeatByItemOffered.typeOf) === 'string') {
-                    offeredTicketedSeat = acceptedTicketedSeatByItemOffered;
+    // seatReservationAuthorizeActions.forEach((action) => {
+    //     const acceptedOffers = action.result?.acceptedOffers;
+    // });
+    if (Array.isArray(params.acceptedOffers)) {
+        params.acceptedOffers.forEach((offer) => {
+            var _a, _b, _c, _d;
+            let offeredTicketedSeat;
+            const acceptedTicketedSeatByItemOffered = (_b = (_a = offer.itemOffered) === null || _a === void 0 ? void 0 : _a.reservedTicket) === null || _b === void 0 ? void 0 : _b.ticketedSeat;
+            if (typeof (acceptedTicketedSeatByItemOffered === null || acceptedTicketedSeatByItemOffered === void 0 ? void 0 : acceptedTicketedSeatByItemOffered.typeOf) === 'string') {
+                offeredTicketedSeat = acceptedTicketedSeatByItemOffered;
+            }
+            if (typeof (offeredTicketedSeat === null || offeredTicketedSeat === void 0 ? void 0 : offeredTicketedSeat.typeOf) === 'string') {
+                const ticketedSeat4MovieTicket = offeredTicketedSeat;
+                const eventOfferedThroughIdentifier = (_c = offer.offeredThrough) === null || _c === void 0 ? void 0 : _c.identifier;
+                if (typeof eventOfferedThroughIdentifier !== 'string') {
+                    throw new factory.errors.NotFound('offer.offeredThrough.identifier', `offer.offeredThrough.identifier undefined [serialNumber:${offer.serialNumber}]`);
                 }
-                if (typeof (offeredTicketedSeat === null || offeredTicketedSeat === void 0 ? void 0 : offeredTicketedSeat.typeOf) === 'string') {
-                    const ticketedSeat4MovieTicket = offeredTicketedSeat;
-                    // Chevre or COAでrequiredMovieTicketsの取り出し方が異なる
-                    const eventOfferedThroughIdentifier = (_d = (_c = event.offers) === null || _c === void 0 ? void 0 : _c.offeredThrough) === null || _d === void 0 ? void 0 : _d.identifier;
-                    // シンプルに単価仕様のappliesToMovieTicketを参照してrequiredMovieTicketsを作成する(2022-07-28~)
-                    const unitPriceSpec = (_e = offer.priceSpecification) === null || _e === void 0 ? void 0 : _e.priceComponent.find((component) => {
-                        return component.typeOf === factory.priceSpecificationType.UnitPriceSpecification
-                            && (!Array.isArray(component.appliesToAddOn));
+                // シンプルに単価仕様のappliesToMovieTicketを参照してrequiredMovieTicketsを作成する(2022-07-28~)
+                const unitPriceSpec = (_d = offer.priceSpecification) === null || _d === void 0 ? void 0 : _d.priceComponent.find((component) => {
+                    return component.typeOf === factory.priceSpecificationType.UnitPriceSpecification
+                        && (!Array.isArray(component.appliesToAddOn));
+                });
+                if (unitPriceSpec === undefined) {
+                    throw new factory.errors.NotFound('UnitPriceSpecification of acceptedOffer');
+                }
+                if (offer.itemOffered.reservationFor.typeOf !== factory.eventType.ScreeningEvent) {
+                    throw new factory.errors.NotImplemented(`offer.itemOffered.reservationFor.typeOf not imelemented [${offer.itemOffered.reservationFor.typeOf}]`);
+                }
+                const reservationFor4movieTicket = {
+                    typeOf: offer.itemOffered.reservationFor.typeOf,
+                    id: offer.itemOffered.reservationFor.id
+                    // offers: { offeredThrough: { identifier: eventOfferedThroughIdentifier } }
+                };
+                // 指定された決済方法の適用決済カードリスト
+                let appliesToMovieTickets4paymentMethod = [];
+                const appliesToMovieTickets4reservation = unitPriceSpec.appliesToMovieTicket;
+                if (Array.isArray(appliesToMovieTickets4reservation)) {
+                    appliesToMovieTickets4paymentMethod = appliesToMovieTickets4reservation.filter((a) => {
+                        return a.serviceOutput.typeOf === paymentMethodType;
                     });
-                    if (unitPriceSpec === undefined) {
-                        throw new factory.errors.NotFound('UnitPriceSpecification of acceptedOffer');
-                    }
-                    // 指定された決済方法の適用決済カードリスト
-                    let appliesToMovieTickets4paymentMethod = [];
-                    const appliesToMovieTickets4reservation = unitPriceSpec.appliesToMovieTicket;
-                    if (Array.isArray(appliesToMovieTickets4reservation)) {
-                        appliesToMovieTickets4paymentMethod = appliesToMovieTickets4reservation.filter((a) => {
-                            return a.serviceOutput.typeOf === paymentMethodType;
-                        });
-                        // Array以外への考慮自体を廃止(2023-09-01~)
-                        // } else if (typeof appliesToMovieTickets4reservation?.identifier === 'string') {
-                        //     // Arrayでない場合を廃止(2022-08-01~)
-                        //     throw new factory.errors.NotImplemented('appliesToMovieTickets.typeOf as string not implemented');
-                    }
-                    if (Array.isArray(appliesToMovieTickets4paymentMethod) && appliesToMovieTickets4paymentMethod.length > 0) {
-                        appliesToMovieTickets4paymentMethod.forEach((appliesToMovieTicket) => {
-                            requiredMovieTickets.push({
-                                // project: action.project,
-                                typeOf: paymentMethodType,
-                                identifier: String(appliesToMovieTicket.identifier),
-                                serviceType: appliesToMovieTicket.serviceType,
-                                serviceOutput: {
-                                    reservationFor: {
-                                        typeOf: event.typeOf,
-                                        id: event.id,
-                                        offers: { offeredThrough: { identifier: eventOfferedThroughIdentifier } }
-                                    },
-                                    reservedTicket: { ticketedSeat: ticketedSeat4MovieTicket }
-                                }
-                            });
+                }
+                if (Array.isArray(appliesToMovieTickets4paymentMethod) && appliesToMovieTickets4paymentMethod.length > 0) {
+                    appliesToMovieTickets4paymentMethod.forEach((appliesToMovieTicket) => {
+                        requiredMovieTickets.push({
+                            typeOf: paymentMethodType,
+                            identifier: String(appliesToMovieTicket.identifier),
+                            serviceType: appliesToMovieTicket.serviceType,
+                            serviceOutput: {
+                                reservationFor: reservationFor4movieTicket,
+                                reservedTicket: { ticketedSeat: ticketedSeat4MovieTicket }
+                            }
                         });
-                    }
+                    });
                 }
-            });
-        }
-    });
+            }
+        });
+    }
     return requiredMovieTickets;
 }

package/lib/chevre/service/transaction/placeOrderInProgress/validation.d.ts

@@ -8,15 +8,14 @@ export type IUnitPriceSpecification = factory.priceSpecification.IPriceSpecifica
 /**
  * 取引が確定可能な状態かどうかをチェックする
  */
-export declare function validateTransaction(transaction: factory.transaction.placeOrder.ITransaction, authorizeActions: factory.action.authorize.IAction<factory.action.authorize.IAttributes<any, any>>[]): void;
+export declare function validateTransaction(transaction: factory.transaction.placeOrder.ITransaction, authorizeActions: factory.action.authorize.IAction<factory.action.authorize.IAttributes<any, any>>[], eventReservationAcceptedOffers: factory.order.IAcceptedOffer<factory.order.IReservation>[]): void;
 export type IOrderURLGenerator = (order: factory.order.IOrder) => string;
 export declare function validateNumItems(params: {
-    order: factory.transaction.placeOrder.IOrderAsResult & {
-        acceptedOffers: factory.order.IAcceptedOffer<factory.order.IItemOffered>[];
-    };
+    order: factory.transaction.placeOrder.IOrderAsResult;
     result: {
         order: PlaceOrderFactory.IResultOrderParams;
     };
+    acceptedOffers: factory.order.IAcceptedOffer<factory.order.IItemOffered>[];
 }): void;
 export declare function validateOrderedItem(params: {
     order: factory.transaction.placeOrder.IOrderAsResult;

package/lib/chevre/service/transaction/placeOrderInProgress/validation.js

@@ -12,18 +12,17 @@ const validateMovieTicket_1 = require("./validation/validateMovieTicket");
 /**
  * 取引が確定可能な状態かどうかをチェックする
  */
-function validateTransaction(transaction, authorizeActions) {
+function validateTransaction(transaction, authorizeActions, eventReservationAcceptedOffers) {
     validateProfile(transaction);
     validatePrice(transaction, authorizeActions);
     // 利用可能な通貨単位に対して取引検証
     validateMonetaryAmount(authorizeActions);
     // 利用可能なMovieTicketIF決済方法タイプに対して動的にコーディング
-    // 検証すべきMovieTicketIF決済方法タイプのリストは、決済承認アクションのresult.issuedThrough.typeOf: MovieTicketで抽出できるのでは？
-    const movieTicketPaymentMethodTypes = findMovieTicketPaymentMethodTypesFromTransaction(authorizeActions);
+    const movieTicketPaymentMethodTypes = findMovieTicketPaymentMethodTypesFromTransaction(authorizeActions, eventReservationAcceptedOffers);
     if (Array.isArray(movieTicketPaymentMethodTypes) && movieTicketPaymentMethodTypes.length > 0) {
         movieTicketPaymentMethodTypes.forEach((paymentMethodType) => {
             try {
-                (0, validateMovieTicket_1.validateMovieTicket)(paymentMethodType, transaction, authorizeActions);
+                (0, validateMovieTicket_1.validateMovieTicket)(paymentMethodType, { id: transaction.id }, authorizeActions, eventReservationAcceptedOffers);
             }
             catch (error) {
                 // 検証結果をlog(2022-06-04~)
@@ -37,7 +36,7 @@ function validateTransaction(transaction, authorizeActions) {
     validatePaymentUrl(transaction, authorizeActions);
 }
 exports.validateTransaction = validateTransaction;
-function findMovieTicketPaymentMethodTypesFromTransaction(authorizeActions) {
+function findMovieTicketPaymentMethodTypesFromTransaction(authorizeActions, eventReservationAcceptedOffers) {
     const authorizeMovieTicketPaymentActions = authorizeActions.filter((a) => {
         var _a;
         const resultAsInvoice = (Array.isArray(a.result))
@@ -46,23 +45,23 @@ function findMovieTicketPaymentMethodTypesFromTransaction(authorizeActions) {
         return (resultAsInvoice === null || resultAsInvoice === void 0 ? void 0 : resultAsInvoice.typeOf) === factory.action.authorize.paymentMethod.any.ResultType.Payment
             && (resultAsInvoice === null || resultAsInvoice === void 0 ? void 0 : resultAsInvoice.issuedThrough.typeOf) === factory.service.paymentService.PaymentServiceType.MovieTicket;
     });
-    const seatReservationAuthorizeActions = authorizeActions.filter((a) => a.object.typeOf === factory.action.authorize.offer.eventService.ObjectType.SeatReservation);
-    // MovieTicketオファーを受け付けた予約承認から抽出
+    // const seatReservationAuthorizeActions = (<IAuthorizeSeatReservationOffer[]>authorizeActions).filter(
+    //     (a) => a.object.typeOf === factory.action.authorize.offer.eventService.ObjectType.SeatReservation
+    // );
+    // MovieTicketオファーを受け付けた予約から抽出
     const requiredMovieTicketPaymentMethodTypes = [];
-    seatReservationAuthorizeActions.forEach((action) => {
+    // seatReservationAuthorizeActions.forEach((action) => {
+    //     const acceptedOffers = action.result?.acceptedOffers;
+    // });
+    eventReservationAcceptedOffers.forEach((offer) => {
         var _a;
-        // a.objectではなくa.resultを使用する(2022-06-04~)
-        const acceptedOffers = (_a = action.result) === null || _a === void 0 ? void 0 : _a.acceptedOffers;
-        acceptedOffers === null || acceptedOffers === void 0 ? void 0 : acceptedOffers.forEach((offer) => {
-            var _a;
-            (_a = offer.priceSpecification) === null || _a === void 0 ? void 0 : _a.priceComponent.forEach((component) => {
-                var _a, _b;
-                // MovieTicketTypeChargeSpecificationがあれば検証リストに追加
-                if (component.typeOf === factory.priceSpecificationType.MovieTicketTypeChargeSpecification
-                    && typeof ((_b = (_a = component.appliesToMovieTicket) === null || _a === void 0 ? void 0 : _a.serviceOutput) === null || _b === void 0 ? void 0 : _b.typeOf) === 'string') {
-                    requiredMovieTicketPaymentMethodTypes.push(component.appliesToMovieTicket.serviceOutput.typeOf);
-                }
-            });
+        (_a = offer.priceSpecification) === null || _a === void 0 ? void 0 : _a.priceComponent.forEach((component) => {
+            var _a, _b;
+            // MovieTicketTypeChargeSpecificationがあれば検証リストに追加
+            if (component.typeOf === factory.priceSpecificationType.MovieTicketTypeChargeSpecification
+                && typeof ((_b = (_a = component.appliesToMovieTicket) === null || _a === void 0 ? void 0 : _a.serviceOutput) === null || _b === void 0 ? void 0 : _b.typeOf) === 'string') {
+                requiredMovieTicketPaymentMethodTypes.push(component.appliesToMovieTicket.serviceOutput.typeOf);
+            }
         });
     });
     const paymentMethodTypes = [
@@ -219,24 +218,24 @@ function validateMonetaryAmount(authorizeActions) {
 }
 function validateNumItems(params) {
     var _a, _b;
-    if (!Array.isArray(params.order.acceptedOffers)) {
+    if (!Array.isArray(params.acceptedOffers)) {
         throw new factory.errors.Argument('order.acceptedOffers', 'must be array');
     }
     // 注文アイテム数制限確認
     const numItemsMaxValue = (_a = params.result.order.numItems) === null || _a === void 0 ? void 0 : _a.maxValue;
     const numItemsMinValue = (_b = params.result.order.numItems) === null || _b === void 0 ? void 0 : _b.minValue;
     if (typeof numItemsMaxValue === 'number') {
-        if (params.order.acceptedOffers.length > numItemsMaxValue) {
+        if (params.acceptedOffers.length > numItemsMaxValue) {
             throw new factory.errors.Argument('Transaction', (0, util_1.format)('Number of order items must be less than or equal to %s', numItemsMaxValue));
         }
     }
     if (typeof numItemsMinValue === 'number') {
-        if (params.order.acceptedOffers.length < numItemsMinValue) {
+        if (params.acceptedOffers.length < numItemsMinValue) {
             throw new factory.errors.Argument('Transaction', (0, util_1.format)('Number of order items must be more than equal to %s', numItemsMinValue));
         }
     }
     // itemOffered.typeOf数検証(2024-01-31~)
-    const itemOfferedTypeOfs = [...new Set(params.order.acceptedOffers.map((offer) => offer.itemOffered.typeOf))];
+    const itemOfferedTypeOfs = [...new Set(params.acceptedOffers.map((offer) => offer.itemOffered.typeOf))];
     if (itemOfferedTypeOfs.length > 1) {
         throw new factory.errors.Argument('Transaction', `different itemOffered.typeOfs contained. [${itemOfferedTypeOfs.join(',')}]`);
     }

package/package.json

@@ -110,5 +110,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build && npm test && npm run doc"
   },
-  "version": "21.25.0-alpha.2"
+  "version": "21.25.0-alpha.3"
 }