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

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/payment/any/factory.d.ts

@@ -21,7 +21,7 @@ export declare function creatPayTransactionStartParams(params: {
 export declare function createAuthorizeResult(params: {
     object: factory.action.authorize.paymentMethod.any.IObject;
     payTransaction: factory.assetTransaction.pay.ITransaction;
-}): factory.action.authorize.paymentMethod.any.IResult;
+}): factory.action.authorize.paymentMethod.any.IResultAsInvoice[];
 /**
  * 通知対象としてのアクションを最適化
  */

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,15 @@ 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, authorizePaymentActions, authorizeEventServiceOfferActions, authorizeMoneyTansferActions, authorizeProductOfferActions } = dissolveAuthorizeActions(completedAuthorizeActions);
+        const { result, eventId, reservationIds } = createResult(Object.assign(Object.assign({}, params), { orderNumber, transaction: transaction, authorizePaymentActions,
+            authorizeEventServiceOfferActions,
+            authorizeMoneyTansferActions,
+            authorizeProductOfferActions,
+            // authorizeActions: completedAuthorizeActions,
+            code,
+            acceptedOffers }));
         // デフォルトEメールメッセージを検索
         let emailMessageOnOrderSent;
         if (repos.emailMessage !== undefined) {
@@ -125,7 +123,64 @@ function confirm(params) {
     });
 }
 exports.confirm = confirm;
-function createReservationIdsResult(order) {
+/**
+ * 全承認アクションを分解する
+ */
+function dissolveAuthorizeActions(completedAuthorizeActions) {
+    const acceptedOffers = [];
+    const authorizePaymentActions = [];
+    const authorizeEventServiceOfferActions = [];
+    const authorizeMoneyTansferActions = [];
+    const authorizeProductOfferActions = [];
+    completedAuthorizeActions.forEach((a) => {
+        var _a;
+        if (Array.isArray(a.object)) {
+            if (a.object.length > 0
+                && a.object.every(({ typeOf }) => typeOf === factory.offerType.Offer)
+                && a.object.every(({ itemOffered }) => availableProductTypes_1.availableProductTypes.indexOf(itemOffered.typeOf) >= 0)) {
+                authorizeProductOfferActions.push(a);
+            }
+        }
+        else {
+            if (a.object.typeOf === factory.action.authorize.offer.eventService.ObjectType.SeatReservation) {
+                authorizeEventServiceOfferActions.push(a);
+            }
+            else if (a.object.typeOf === factory.offerType.Offer
+                && ((_a = a.object.itemOffered) === null || _a === void 0 ? void 0 : _a.typeOf) === factory.actionType.MoneyTransfer) {
+                authorizeMoneyTansferActions.push(a);
+            }
+            else if (a.object.typeOf === factory.action.authorize.paymentMethod.any.ResultType.Payment) {
+                authorizePaymentActions.push(a);
+            }
+        }
+    });
+    authorizeEventServiceOfferActions.forEach(({ result }) => {
+        const acceptedOffersByAuthorizeAction = result === null || result === void 0 ? void 0 : result.acceptedOffers;
+        if (Array.isArray(acceptedOffersByAuthorizeAction)) {
+            acceptedOffers.push(...acceptedOffersByAuthorizeAction);
+        }
+    });
+    authorizeProductOfferActions.forEach(({ result }) => {
+        const acceptedOffersByAuthorizeAction = result === null || result === void 0 ? void 0 : result.acceptedOffers;
+        if (Array.isArray(acceptedOffersByAuthorizeAction)) {
+            acceptedOffers.push(...acceptedOffersByAuthorizeAction);
+        }
+    });
+    authorizeMoneyTansferActions.forEach(({ result }) => {
+        const acceptedOffersByAuthorizeAction = result === null || result === void 0 ? void 0 : result.acceptedOffers;
+        if (Array.isArray(acceptedOffersByAuthorizeAction)) {
+            acceptedOffers.push(...acceptedOffersByAuthorizeAction);
+        }
+    });
+    return {
+        acceptedOffers,
+        authorizePaymentActions,
+        authorizeEventServiceOfferActions,
+        authorizeProductOfferActions,
+        authorizeMoneyTansferActions
+    };
+}
+function createReservationIdsResult(order, acceptedOffers) {
     var _a;
     let eventId = '';
     const reservationIds = [];
@@ -137,8 +192,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 +204,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.authorizePaymentActions, params.authorizeEventServiceOfferActions, params.authorizeMoneyTansferActions, params.authorizeProductOfferActions, eventReservationAcceptedOffers);
     // 注文作成
     const order = (0, result_1.createOrder)({
         orderNumber: params.orderNumber,
@@ -160,17 +236,21 @@ function createResult(params) {
         orderDate: params.result.order.orderDate,
         orderStatus: factory.orderStatus.OrderPaymentDue,
         isGift: false,
-        authorizeActions: params.authorizeActions
+        authorizePaymentActions: params.authorizePaymentActions,
+        eventReservationAcceptedOffers,
+        productAcceptedOffers,
+        moneyTransferAcceptedOffers
     });
     (0, validation_1.validateEventOffers)({
-        transaction: transaction,
+        // transaction: transaction,
         order: order,
-        authorizeActions: params.authorizeActions
+        authorizeEventServiceOfferActions: params.authorizeEventServiceOfferActions
     });
     // 注文オファー検証
     (0, validation_1.validateNumItems)({
         order: order,
-        result: params.result
+        result: params.result,
+        acceptedOffers: params.acceptedOffers
     });
     // 注文アイテム検証(2024-01-20~)
     (0, validation_1.validateOrderedItem)({
@@ -187,20 +267,27 @@ function createResult(params) {
     order.confirmationNumber = confirmationNumber;
     order.identifier = identifier;
     order.url = url;
-    const authorizeActions = params.authorizeActions.map(({ id }) => ({ id }));
-    const { acceptedOffers } = order, orderWithoutAcceptedOffers = __rest(order, ["acceptedOffers"]);
-    const orderAsResult = orderWithoutAcceptedOffers;
+    const authorizeActions = [
+        ...params.authorizePaymentActions.map(({ id }) => ({ id })),
+        ...params.authorizeEventServiceOfferActions.map(({ id }) => ({ id })),
+        ...params.authorizeProductOfferActions.map(({ id }) => ({ id })),
+        ...params.authorizeMoneyTansferActions.map(({ id }) => ({ id }))
+    ];
+    // params.authorizeActions.map(({ id }) => ({ id }));
+    // 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

@@ -1,25 +1,16 @@
 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,37 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createMoneyTransferAcceptedOffers = exports.createProductItems = exports.createReservationAcceptedOffers = void 0;
 const factory = require("../../../../factory");
-const availableProductTypes_1 = require("../../../../factory/availableProductTypes");
+// import { availableProductTypes } from '../../../../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 +84,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;