@chevre/domain 21.20.0-alpha.8 → 21.20.0

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

@@ -1,89 +1,4 @@
-import type { MongoRepository as ActionRepo } from '../../repo/action';
-import type { MongoRepository as CategoryCodeRepo } from '../../repo/categoryCode';
-import type { MongoRepository as EventRepo } from '../../repo/event';
-import type { MongoRepository as OfferRepo } from '../../repo/offer';
-import type { MongoRepository as TransactionRepo } from '../../repo/transaction';
-import { IAcceptedOfferBeforeAuthorize4COA } from './eventServiceByCOA/validateAcceptedOffers';
-import * as factory from '../../factory';
-export import WebAPIIdentifier = factory.service.webAPI.Identifier;
-interface IAuthorizeRepos {
-    action: ActionRepo;
-    categoryCode: CategoryCodeRepo;
-    event: EventRepo;
-    offer: OfferRepo;
-    transaction: TransactionRepo;
-}
-export type IAuthorizeOperation<T> = (repos: IAuthorizeRepos) => Promise<T>;
-export type IAuthorizeOfferAction = factory.action.authorize.offer.eventService.IAction<WebAPIIdentifier.COA>;
-/**
- * COA興行オファー承認
- */
-export declare function authorize(params: {
-    object: {
-        acceptedOffer: IAcceptedOfferBeforeAuthorize4COA[];
-        event: {
-            id: string;
-        };
-    };
-    agent: {
-        id: string;
-    };
-    transaction: {
-        id: string;
-    };
-    result: {
-        requestBody: factory.action.authorize.offer.eventService.IRequestBody<WebAPIIdentifier.COA>;
-        responseBody: factory.action.authorize.offer.eventService.IResponseBody<WebAPIIdentifier.COA>;
-    };
-}): IAuthorizeOperation<IAuthorizeOfferAction>;
-interface ICancelResult {
-    theaterCode: string;
-    dateJouei: string;
-    titleCode: string;
-    titleBranchNum: string;
-    timeBegin: string;
-    tmpReserveNum: string;
-}
-/**
- * COA興行オファー承認取消
- */
-export declare function cancel(params: {
-    /**
-     * 承認アクションID
-     */
-    id: string;
-    /**
-     * 取引進行者
-     */
-    agent: {
-        id: string;
-    };
-    /**
-     * 取引
-     */
-    transaction: {
-        id: string;
-    };
-}): (repos: {
-    action: ActionRepo;
-    transaction: TransactionRepo;
-}) => Promise<ICancelResult | undefined>;
-/**
- * COA興行オファー承認のオファーを変更
- */
-export declare function changeOffers(params: {
-    id: string;
-    object: {
-        acceptedOffer: IAcceptedOfferBeforeAuthorize4COA[];
-        event: {
-            id: string;
-        };
-    };
-    agent: {
-        id: string;
-    };
-    transaction: {
-        id: string;
-    };
-}): IAuthorizeOperation<IAuthorizeOfferAction>;
-export {};
+import { authorize } from './eventServiceByCOA/authorize';
+import { cancel } from './eventServiceByCOA/cancel';
+import { changeOffers } from './eventServiceByCOA/changeOffers';
+export { authorize, cancel, changeOffers };

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

@@ -1,294 +1,9 @@
 "use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.changeOffers = exports.cancel = exports.authorize = exports.WebAPIIdentifier = void 0;
-const moment = require("moment");
-const factory_1 = require("./eventServiceByCOA/factory");
-const validateAcceptedOffers_1 = require("./eventServiceByCOA/validateAcceptedOffers");
-const factory = require("../../factory");
-exports.WebAPIIdentifier = factory.service.webAPI.Identifier;
-/**
- * COA興行オファー承認
- */
-function authorize(params) {
-    // tslint:disable-next-line:max-func-body-length
-    return (repos) => __awaiter(this, void 0, void 0, function* () {
-        const transaction = yield repos.transaction.findInProgressById({
-            typeOf: factory.transactionType.PlaceOrder,
-            id: params.transaction.id
-        });
-        if (transaction.agent.id !== params.agent.id) {
-            throw new factory.errors.Forbidden('Transaction not yours');
-        }
-        let screeningEvent;
-        let acceptedOffers;
-        const pendingTransaction = {
-            theaterCode: params.result.requestBody.theaterCode,
-            dateJouei: params.result.requestBody.dateJouei,
-            titleCode: params.result.requestBody.titleCode,
-            titleBranchNum: params.result.requestBody.titleBranchNum,
-            timeBegin: params.result.requestBody.timeBegin,
-            tmpReserveNum: params.result.responseBody.tmpReserveNum,
-            transactionNumber: params.result.responseBody.tmpReserveNum,
-            typeOf: 'COAReserveTransaction'
-        };
-        try {
-            // イベント取得属性最適化(2023-01-23~)
-            screeningEvent =
-                yield repos.event.findMinimizedIndividualEventById({ id: params.object.event.id });
-            const availablePaymentMethodTypes = yield repos.categoryCode.search({
-                project: { id: { $eq: transaction.project.id } },
-                inCodeSet: { identifier: { $eq: factory.categoryCode.CategorySetIdentifier.PaymentMethodType } }
-            }, [], []);
-            const seatingTypes = yield repos.categoryCode.search({
-                project: { id: { $eq: transaction.project.id } },
-                inCodeSet: { identifier: { $eq: factory.categoryCode.CategorySetIdentifier.SeatingType } }
-            }, [], []);
-            const videoFormatTypes = yield repos.categoryCode.search({
-                project: { id: { $eq: transaction.project.id } },
-                inCodeSet: { identifier: { $eq: factory.categoryCode.CategorySetIdentifier.VideoFormatType } }
-            }, [], []);
-            // COA仮予約後にリクエストが来る前提
-            const validateAcceptedOffersResult = yield (0, validateAcceptedOffers_1.validateAcceptedOffers)({
-                object: params.object,
-                project: { id: transaction.project.id },
-                screeningEvent,
-                availablePaymentMethodTypes,
-                seatingTypes,
-                videoFormatTypes
-            })(repos);
-            acceptedOffers = validateAcceptedOffersResult.acceptedOffers;
-        }
-        catch (error) {
-            // アクション開始前に例外がthrowされてもCOA仮予約を取り消す機会をつくるためにFailedアクションを作成する(2023-09-12~)
-            const failedActionAttributes = (0, factory_1.createAuthorizeSeatReservationActionAttributes)({
-                acceptedOffers: [],
-                event: { id: params.object.event.id, typeOf: factory.eventType.ScreeningEvent },
-                transaction,
-                pendingTransaction
-            });
-            const failedAction = yield repos.action.start(failedActionAttributes);
-            yield repos.action.giveUp({ typeOf: failedAction.typeOf, id: failedAction.id, error });
-            throw error;
-        }
-        // 承認アクションを開始
-        const actionAttributes = (0, factory_1.createAuthorizeSeatReservationActionAttributes)({
-            acceptedOffers,
-            event: screeningEvent,
-            transaction,
-            pendingTransaction
-        });
-        const action = yield repos.action.start(actionAttributes);
-        try {
-            // no op
-        }
-        catch (error) {
-            try {
-                yield repos.action.giveUp({ typeOf: action.typeOf, id: action.id, error });
-            }
-            catch (__) {
-                // no op
-            }
-            throw error;
-        }
-        // 座席仮予約からオファー情報を生成する
-        const { price, eligibleMonetaryAmount } = (0, factory_1.offers2resultPrice)(acceptedOffers);
-        const acceptedOffers4result = (0, factory_1.responseBody2acceptedOffers4result)({
-            responseBody: params.result.responseBody,
-            object: action.object,
-            event: screeningEvent,
-            seller: transaction.seller,
-            bookingTime: moment(action.startDate)
-                .toDate(),
-            totalPrice: price
-        });
-        const result = {
-            price: price,
-            priceCurrency: factory.priceCurrency.JPY,
-            // eligibleMonetaryAmountを使用(2023-03-08~)
-            // amount: (requiredPoint > 0)
-            //     ? [{
-            //         typeOf: 'MonetaryAmount',
-            //         currency: 'Point',
-            //         value: requiredPoint
-            //     }]
-            //     : [],
-            amount: eligibleMonetaryAmount,
-            requestBody: params.result.requestBody,
-            responseBody: params.result.responseBody,
-            acceptedOffers: acceptedOffers4result
-        };
-        return yield repos.action.complete({ typeOf: action.typeOf, id: action.id, result: result });
-    });
-}
-exports.authorize = authorize;
-/**
- * COA興行オファー承認取消
- */
-function cancel(params) {
-    return (repos) => __awaiter(this, void 0, void 0, function* () {
-        const transaction = yield repos.transaction.findInProgressById({
-            typeOf: factory.transactionType.PlaceOrder,
-            id: params.transaction.id
-        });
-        if (transaction.agent.id !== params.agent.id) {
-            throw new factory.errors.Forbidden('Transaction not yours');
-        }
-        // 取引内のアクションかどうか確認
-        let action = yield repos.action.findById({ typeOf: factory.actionType.AuthorizeAction, id: params.id });
-        if (action.purpose.typeOf !== transaction.typeOf || action.purpose.id !== transaction.id) {
-            throw new factory.errors.Argument('Transaction', 'Action not found in the transaction');
-        }
-        // MongoDBでcompleteステータスであるにも関わらず、COAでは削除されている、というのが最悪の状況
-        // それだけは回避するためにMongoDBを先に変更
-        action = yield repos.action.cancel({ typeOf: factory.actionType.AuthorizeAction, id: params.id });
-        let cancelResult;
-        const actionResult = action.result;
-        if ((actionResult === null || actionResult === void 0 ? void 0 : actionResult.requestBody) !== undefined && actionResult.responseBody !== undefined) {
-            cancelResult = {
-                theaterCode: actionResult.requestBody.theaterCode,
-                dateJouei: actionResult.requestBody.dateJouei,
-                titleCode: actionResult.requestBody.titleCode,
-                titleBranchNum: actionResult.requestBody.titleBranchNum,
-                timeBegin: actionResult.requestBody.timeBegin,
-                tmpReserveNum: actionResult.responseBody.tmpReserveNum
-            };
-        }
-        return cancelResult;
-    });
-}
-exports.cancel = cancel;
-/**
- * COA興行オファー承認のオファーを変更
- */
-function changeOffers(params) {
-    // tslint:disable-next-line:max-func-body-length
-    return (repos) => __awaiter(this, void 0, void 0, function* () {
-        var _a;
-        const transaction = yield repos.transaction.findInProgressById({
-            typeOf: factory.transactionType.PlaceOrder,
-            id: params.transaction.id
-        });
-        if (transaction.agent.id !== params.agent.id) {
-            throw new factory.errors.Forbidden('Transaction not yours');
-        }
-        // 取引内のアクションかどうか確認
-        const authorizeAction = yield repos.action.findById({ typeOf: factory.actionType.AuthorizeAction, id: params.id });
-        if (authorizeAction.purpose.typeOf !== transaction.typeOf || authorizeAction.purpose.id !== transaction.id) {
-            throw new factory.errors.Argument('Transaction', 'Action not found in the transaction');
-        }
-        validate4changeOffer({ action: authorizeAction, object: params.object });
-        // 座席情報に関しては元のacceptedOffersで自動補完する(リクエストでは正しく指定されないので注意)(2023-03-20~)
-        params.object.acceptedOffer = params.object.acceptedOffer.map((offer) => {
-            const originalAcceptedOfferBySeatNumber = authorizeAction.object.acceptedOffer.find((originalOffer) => {
-                var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o;
-                return ((_d = (_c = (_b = (_a = originalOffer.itemOffered) === null || _a === void 0 ? void 0 : _a.serviceOutput) === null || _b === void 0 ? void 0 : _b.reservedTicket) === null || _c === void 0 ? void 0 : _c.ticketedSeat) === null || _d === void 0 ? void 0 : _d.seatSection)
-                    === ((_g = (_f = (_e = offer.itemOffered.serviceOutput) === null || _e === void 0 ? void 0 : _e.reservedTicket) === null || _f === void 0 ? void 0 : _f.ticketedSeat) === null || _g === void 0 ? void 0 : _g.seatSection)
-                    && ((_k = (_j = (_h = originalOffer.itemOffered.serviceOutput) === null || _h === void 0 ? void 0 : _h.reservedTicket) === null || _j === void 0 ? void 0 : _j.ticketedSeat) === null || _k === void 0 ? void 0 : _k.seatNumber)
-                        === ((_o = (_m = (_l = offer.itemOffered.serviceOutput) === null || _l === void 0 ? void 0 : _l.reservedTicket) === null || _m === void 0 ? void 0 : _m.ticketedSeat) === null || _o === void 0 ? void 0 : _o.seatNumber);
-            });
-            if (originalAcceptedOfferBySeatNumber === undefined) {
-                throw new factory.errors.Argument('offers', 'seatSection or seatNumber not matched.');
-            }
-            return Object.assign(Object.assign({}, offer), { ticketInfo: Object.assign(Object.assign({}, offer.ticketInfo), { spseatAdd1: originalAcceptedOfferBySeatNumber.ticketInfo.spseatAdd1, spseatAdd2: originalAcceptedOfferBySeatNumber.ticketInfo.spseatAdd2, spseatKbn: originalAcceptedOfferBySeatNumber.ticketInfo.spseatKbn }) });
-        });
-        // イベント取得属性最適化(2023-01-23~)
-        const screeningEvent = yield repos.event.findMinimizedIndividualEventById({
-            id: params.object.event.id
-        });
-        const availablePaymentMethodTypes = yield repos.categoryCode.search({
-            project: { id: { $eq: transaction.project.id } },
-            inCodeSet: { identifier: { $eq: factory.categoryCode.CategorySetIdentifier.PaymentMethodType } }
-        }, [], []);
-        const seatingTypes = yield repos.categoryCode.search({
-            project: { id: { $eq: transaction.project.id } },
-            inCodeSet: { identifier: { $eq: factory.categoryCode.CategorySetIdentifier.SeatingType } }
-        }, [], []);
-        const videoFormatTypes = yield repos.categoryCode.search({
-            project: { id: { $eq: transaction.project.id } },
-            inCodeSet: { identifier: { $eq: factory.categoryCode.CategorySetIdentifier.VideoFormatType } }
-        }, [], []);
-        // COA仮予約後にリクエストが来る前提
-        const { acceptedOffers } = yield (0, validateAcceptedOffers_1.validateAcceptedOffers)({
-            object: params.object,
-            project: { id: transaction.project.id },
-            screeningEvent,
-            availablePaymentMethodTypes,
-            seatingTypes,
-            videoFormatTypes
-        })(repos);
-        // 供給情報と価格を変更してからDB更新
-        authorizeAction.object.acceptedOffer = acceptedOffers;
-        const updTmpReserveSeatResult = (_a = authorizeAction.result) === null || _a === void 0 ? void 0 : _a.responseBody;
-        if (updTmpReserveSeatResult === undefined) {
-            throw new factory.errors.NotFound('action.result.responseBody');
-        }
-        const { price, eligibleMonetaryAmount } = (0, factory_1.offers2resultPrice)(acceptedOffers);
-        const acceptedOffers4result = (0, factory_1.responseBody2acceptedOffers4result)({
-            responseBody: updTmpReserveSeatResult,
-            object: authorizeAction.object,
-            event: screeningEvent,
-            seller: transaction.seller,
-            bookingTime: moment(authorizeAction.startDate)
-                .toDate(),
-            totalPrice: price
-        });
-        const actionResult = Object.assign(Object.assign({}, authorizeAction.result), { price: price, 
-            // eligibleMonetaryAmountを使用(2023-03-08~)
-            // amount: (requiredPoint > 0)
-            //     ? [{
-            //         typeOf: 'MonetaryAmount',
-            //         currency: 'Point',
-            //         value: requiredPoint
-            //     }]
-            //     : [],
-            amount: eligibleMonetaryAmount, acceptedOffers: acceptedOffers4result });
-        // 座席予約承認アクションの供給情報を変更する
-        return repos.action.updateAuthorizeEventOfferAction({
-            id: params.id,
-            object: authorizeAction.object,
-            result: actionResult
-        });
-    });
-}
-exports.changeOffers = changeOffers;
-function validate4changeOffer(params) {
-    // アクション中のイベント識別子と座席リストが合っているかどうか確認
-    const authorizeAction = params.action;
-    // 完了ステータスのアクションのみ更新可能
-    if (authorizeAction.actionStatus !== factory.actionStatusType.CompletedActionStatus) {
-        throw new factory.errors.NotFound('authorizeAction');
-    }
-    // tslint:disable-next-line:no-single-line-block-comment
-    /* istanbul ignore if */
-    if (authorizeAction.object.event === undefined) {
-        throw new factory.errors.NotFound('authorizeAction.object.event');
-    }
-    // イベントが一致しているかどうか
-    if (authorizeAction.object.event.id !== params.object.event.id) {
-        throw new factory.errors.Argument('Event', 'Event ID not matched.');
-    }
-    // 座席セクションと座席番号が一致しているかどうか
-    const acceptedOfferParams = (Array.isArray(params.object.acceptedOffer)) ? params.object.acceptedOffer : [];
-    const allSeatsExisted = authorizeAction.object.acceptedOffer.every((originalAcceptedOffer) => {
-        return acceptedOfferParams.some((o) => {
-            var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o;
-            const newSeatSection = (_c = (_b = (_a = o.itemOffered.serviceOutput) === null || _a === void 0 ? void 0 : _a.reservedTicket) === null || _b === void 0 ? void 0 : _b.ticketedSeat) === null || _c === void 0 ? void 0 : _c.seatSection;
-            const newSeatNumber = (_f = (_e = (_d = o.itemOffered.serviceOutput) === null || _d === void 0 ? void 0 : _d.reservedTicket) === null || _e === void 0 ? void 0 : _e.ticketedSeat) === null || _f === void 0 ? void 0 : _f.seatNumber;
-            return ((_k = (_j = (_h = (_g = originalAcceptedOffer.itemOffered) === null || _g === void 0 ? void 0 : _g.serviceOutput) === null || _h === void 0 ? void 0 : _h.reservedTicket) === null || _j === void 0 ? void 0 : _j.ticketedSeat) === null || _k === void 0 ? void 0 : _k.seatSection) === newSeatSection
-                && ((_o = (_m = (_l = originalAcceptedOffer.itemOffered.serviceOutput) === null || _l === void 0 ? void 0 : _l.reservedTicket) === null || _m === void 0 ? void 0 : _m.ticketedSeat) === null || _o === void 0 ? void 0 : _o.seatNumber) === newSeatNumber;
-        });
-    });
-    const allSeatsMatched = (acceptedOfferParams.length === authorizeAction.object.acceptedOffer.length) && allSeatsExisted;
-    if (!allSeatsMatched) {
-        throw new factory.errors.Argument('offers', 'seatSection or seatNumber not matched.');
-    }
-}
+exports.changeOffers = exports.cancel = exports.authorize = void 0;
+const authorize_1 = require("./eventServiceByCOA/authorize");
+Object.defineProperty(exports, "authorize", { enumerable: true, get: function () { return authorize_1.authorize; } });
+const cancel_1 = require("./eventServiceByCOA/cancel");
+Object.defineProperty(exports, "cancel", { enumerable: true, get: function () { return cancel_1.cancel; } });
+const changeOffers_1 = require("./eventServiceByCOA/changeOffers");
+Object.defineProperty(exports, "changeOffers", { enumerable: true, get: function () { return changeOffers_1.changeOffers; } });

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

@@ -1,6 +1,8 @@
 import * as factory from '../../../factory';
 import type { MongoRepository as ActionRepo } from '../../../repo/action';
 import type { MongoRepository as AssetTransactionRepo } from '../../../repo/assetTransaction';
+import type { MongoRepository as OrderInTransactionRepo } from '../../../repo/orderInTransaction';
+import type { RedisRepository as OrderNumberRepo } from '../../../repo/orderNumber';
 import type { MongoRepository as ProductRepo } from '../../../repo/product';
 import type { MongoRepository as ProjectRepo } from '../../../repo/project';
 import type { MongoRepository as TransactionRepo } from '../../../repo/transaction';
@@ -10,6 +12,8 @@ interface IAuthorizeRepos {
     product: ProductRepo;
     project: ProjectRepo;
     assetTransaction: AssetTransactionRepo;
+    orderInTransaction: OrderInTransactionRepo;
+    orderNumber: OrderNumberRepo;
     transaction: TransactionRepo;
     transactionNumber: TransactionNumberRepo;
 }
@@ -24,5 +28,10 @@ export declare function authorize(params: {
     };
     object: factory.action.authorize.offer.moneyTransfer.IObject;
     purpose: factory.action.authorize.offer.moneyTransfer.IPurpose;
-}): IAuthorizeOperation<factory.action.authorize.offer.moneyTransfer.IAction>;
+}): IAuthorizeOperation<{
+    /**
+     * 承認アクションID
+     */
+    id: string;
+}>;
 export {};

package/lib/chevre/service/offer/moneyTransfer/authorize.js

@@ -13,6 +13,7 @@ exports.authorize = void 0;
 const moment = require("moment");
 const factory = require("../../../factory");
 const MoneyTransferAssetTransactionService = require("../../assetTransaction/moneyTransfer");
+const any_1 = require("../any");
 function authorize(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         const transaction = yield repos.transaction.findInProgressById({
@@ -26,6 +27,7 @@ function authorize(params) {
         const { transactionNumber } = yield repos.transactionNumber.publishByTimestamp({ startDate: new Date() });
         let requestBody;
         let responseBody;
+        let acceptedOffers4result = [];
         // 承認アクションを開始
         const actionAttributes = createAuthorizeMoneyTransferOfferActionattributes({
             transaction,
@@ -48,6 +50,12 @@ function authorize(params) {
             if (responseBody.object.amount.currency === factory.priceCurrency.JPY) {
                 price = Number(responseBody.object.amount.value);
             }
+            acceptedOffers4result = responseBody2resultAcceptedOffer({ responseBody, object: actionAttributes.object });
+            yield (0, any_1.acceptOffer)({
+                project: transaction.project,
+                purpose: { id: transaction.id },
+                acceptedOffers: acceptedOffers4result
+            })(repos);
         }
         catch (error) {
             try {
@@ -61,13 +69,47 @@ function authorize(params) {
         const result = {
             price,
             priceCurrency: factory.priceCurrency.JPY,
-            requestBody: requestBody,
-            responseBody: responseBody
+            requestBody,
+            responseBody,
+            acceptedOffers: acceptedOffers4result
         };
-        return repos.action.complete({ typeOf: action.typeOf, id: action.id, result: result });
+        yield repos.action.completeWithVoid({ typeOf: action.typeOf, id: action.id, result: result });
+        return { id: action.id };
     });
 }
 exports.authorize = authorize;
+function responseBody2resultAcceptedOffer(params) {
+    var _a;
+    const acceptedOffers = [];
+    const { typeOf, transactionNumber } = params.responseBody;
+    const amountValue = params.responseBody.object.amount.value;
+    const currency = params.responseBody.object.amount.currency;
+    const itemOffered = {
+        typeOf: factory.actionType.MoneyTransfer,
+        amount: {
+            typeOf: 'MonetaryAmount',
+            value: amountValue,
+            currency
+        },
+        toLocation: {
+            typeOf: params.object.itemOffered.toLocation.typeOf,
+            // いったんマスク
+            identifier: 'xxx',
+            issuedThrough: { id: (_a = params.object.itemOffered.toLocation.issuedThrough) === null || _a === void 0 ? void 0 : _a.id }
+        },
+        object: {
+            // MonetaryAmountの識別子として、MoneyTransfer取引番号をセットする
+            pendingTransaction: { typeOf, transactionNumber }
+        },
+        name: `${amountValue} ${currency}`
+    };
+    acceptedOffers.push({
+        typeOf: factory.offerType.Offer,
+        itemOffered,
+        serialNumber: transactionNumber
+    });
+    return acceptedOffers;
+}
 function createAuthorizeMoneyTransferOfferActionattributes(params) {
     var _a, _b;
     const transaction = params.transaction;
@@ -75,6 +117,10 @@ function createAuthorizeMoneyTransferOfferActionattributes(params) {
     return {
         project: transaction.project,
         typeOf: factory.actionType.AuthorizeAction,
+        instrument: {
+            typeOf: factory.assetTransactionType.MoneyTransfer,
+            transactionNumber: params.transactionNumber
+        },
         object: {
             project: { typeOf: transaction.project.typeOf, id: transaction.project.id },
             typeOf: factory.offerType.Offer,

package/lib/chevre/service/offer/moneyTransfer/returnMoneyTransfer.js

@@ -74,7 +74,7 @@ function returnMoneyTransfer(params) {
             throw error;
         }
         const actionResult = {};
-        yield repos.action.complete({ typeOf: action.typeOf, id: action.id, result: actionResult });
+        yield repos.action.completeWithVoid({ typeOf: action.typeOf, id: action.id, result: actionResult });
     });
 }
 exports.returnMoneyTransfer = returnMoneyTransfer;

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

@@ -1,7 +1,9 @@
 import * as factory from '../../../factory';
 import type { MongoRepository as ActionRepo } from '../../../repo/action';
 import type { MongoRepository as AssetTransactionRepo } from '../../../repo/assetTransaction';
+import type { MongoRepository as TaskRepo } from '../../../repo/task';
 export declare function settleTransaction(params: factory.task.IData<factory.taskName.ConfirmMoneyTransfer>): (repos: {
     action: ActionRepo;
     assetTransaction: AssetTransactionRepo;
+    task: TaskRepo;
 }) => Promise<void>;

package/lib/chevre/service/offer/moneyTransfer/settleTransaction.js

@@ -10,12 +10,22 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.settleTransaction = void 0;
+const factory = require("../../../factory");
 const MoneyTransferAssetTransactionService = require("../../assetTransaction/moneyTransfer");
 function settleTransaction(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         const action = yield repos.action.start(params);
         try {
-            yield MoneyTransferAssetTransactionService.confirm({ id: params.object.pendingTransaction.id })(repos);
+            // 廃止(2024-01-30~)
+            // if (typeof params.object.pendingTransaction.id === 'string' && params.object.pendingTransaction.id.length > 0) {
+            //     await MoneyTransferAssetTransactionService.confirm({ id: params.object.pendingTransaction.id })(repos);
+            // }
+            if (typeof params.object.transactionNumber === 'string' && params.object.transactionNumber.length > 0) {
+                yield MoneyTransferAssetTransactionService.confirm({ transactionNumber: params.object.transactionNumber })(repos);
+            }
+            else {
+                throw new factory.errors.ArgumentNull('object.transactionNumber');
+            }
         }
         catch (error) {
             try {
@@ -27,7 +37,42 @@ function settleTransaction(params) {
             throw error;
         }
         const actionResult = {};
-        yield repos.action.complete({ typeOf: action.typeOf, id: action.id, result: actionResult });
+        yield repos.action.completeWithVoid({ typeOf: action.typeOf, id: action.id, result: actionResult });
+        yield onConfirmed(params)({
+            task: repos.task
+        });
     });
 }
 exports.settleTransaction = settleTransaction;
+function onConfirmed(params) {
+    return (repos) => __awaiter(this, void 0, void 0, function* () {
+        if (params.purpose.typeOf === factory.order.OrderType.Order) {
+            // タスク冪等作成
+            const onAssetTransactionStatusChangedTaskData = {
+                project: { id: params.project.id, typeOf: factory.organizationType.Project },
+                object: {
+                    typeOf: params.object.typeOf,
+                    transactionNumber: params.object.transactionNumber,
+                    status: factory.transactionStatusType.Confirmed
+                },
+                purpose: {
+                    confirmationNumber: '',
+                    orderNumber: params.purpose.orderNumber,
+                    typeOf: factory.order.OrderType.Order
+                },
+                useOnOrderStatusChanged: true
+            };
+            const onAssetTransactionStatusChangedTask = {
+                project: { id: params.project.id, typeOf: factory.organizationType.Project },
+                name: factory.taskName.OnAssetTransactionStatusChanged,
+                status: factory.taskStatus.Ready,
+                runsAt: new Date(),
+                remainingNumberOfTries: 10,
+                numberOfTried: 0,
+                executionResults: [],
+                data: onAssetTransactionStatusChangedTaskData
+            };
+            yield repos.task.createOnAssetTransactionStatusChangedTaskIfNotExist(onAssetTransactionStatusChangedTask, { emitImmediately: true });
+        }
+    });
+}

package/lib/chevre/service/offer/moneyTransfer/voidTransaction.js

@@ -45,7 +45,7 @@ function voidTransaction(params) {
         }
         yield Promise.all(authorizeActions.map((action) => __awaiter(this, void 0, void 0, function* () {
             var _a, _b;
-            yield repos.action.cancel({ typeOf: action.typeOf, id: action.id });
+            yield repos.action.cancelWithVoid({ typeOf: action.typeOf, id: action.id });
             const pendingTransactionTransactionNumber = (_b = (_a = action.object.itemOffered.object) === null || _a === void 0 ? void 0 : _a.pendingTransaction) === null || _b === void 0 ? void 0 : _b.transactionNumber;
             if (typeof pendingTransactionTransactionNumber === 'string') {
                 // 取引が存在すれば中止

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

@@ -142,11 +142,8 @@ function responseBody2resultAcceptedOffer(params) {
                 id: offer.id,
                 name: offer.name,
                 itemOffered,
-                priceSpecification
-                // 不要なので廃止(2023-07-01~)
-                // priceCurrency: offer.priceCurrency,
-                // 不要なので廃止(2023-07-01~)
-                // seller: { name: offer.seller.name, typeOf: offer.seller.typeOf }
+                priceSpecification,
+                serialNumber: params.responseBody.transactionNumber
             };
             return permitAcceptedOffer;
         });

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

@@ -4,6 +4,7 @@ import type { MongoRepository as ActionRepo } from '../../repo/action';
 import type { MongoRepository as AssetTransactionRepo } from '../../repo/assetTransaction';
 import type { MongoRepository as OfferRepo } from '../../repo/offer';
 import type { MongoRepository as OfferCatalogRepo } from '../../repo/offerCatalog';
+import type { MongoRepository as OrderInTransactionRepo } from '../../repo/orderInTransaction';
 import type { RedisRepository as OrderNumberRepo } from '../../repo/orderNumber';
 import type { MongoRepository as OwnershipInfoRepo } from '../../repo/ownershipInfo';
 import type { MongoRepository as ProductRepo } from '../../repo/product';
@@ -19,6 +20,7 @@ export interface IAuthorizeOperationRepos {
     assetTransaction: AssetTransactionRepo;
     offer: OfferRepo;
     offerCatalog: OfferCatalogRepo;
+    orderInTransaction: OrderInTransactionRepo;
     orderNumber: OrderNumberRepo;
     ownershipInfo: OwnershipInfoRepo;
     product: ProductRepo;