@chevre/domain 20.1.0-alpha.4 → 20.1.0-alpha.40

package/lib/chevre/service/reserve/cancelReservation.js

@@ -19,78 +19,121 @@ const onReservationCanceled_1 = require("./potentialActions/onReservationCancele
 /**
  * 進行中の予約をキャンセルする
  */
+// tslint:disable-next-line:max-func-body-length
 function cancelPendingReservation(actionAttributesList) {
+    // tslint:disable-next-line:max-func-body-length
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         const now = new Date();
-        const canceledReservations = [];
-        yield Promise.all(actionAttributesList.map((actionAttributes) => __awaiter(this, void 0, void 0, function* () {
-            var _a;
-            let canceledReservation;
-            const reserveTransactionId = actionAttributes.purpose.id;
-            // アクション開始
-            const action = yield repos.action.start(actionAttributes);
-            try {
-                // 予約取引を検索
-                const reserveTransactions = yield repos.assetTransaction.search({
-                    limit: 1,
-                    page: 1,
-                    typeOf: factory.assetTransactionType.Reserve,
-                    ids: [reserveTransactionId]
-                });
-                const reserveTransaction = reserveTransactions.shift();
-                if (reserveTransaction !== undefined) {
-                    const cancelingSubReservation = (_a = reserveTransaction.object.subReservation) === null || _a === void 0 ? void 0 : _a.find((r) => {
-                        return r.id === actionAttributes.object.id;
+        let canceledReservations = [];
+        if (actionAttributesList.length > 0) {
+            // tslint:disable-next-line:max-func-body-length
+            yield Promise.all(actionAttributesList.map((actionAttributes) => __awaiter(this, void 0, void 0, function* () {
+                var _a;
+                // let canceledReservation: factory.reservation.eventReservation.IReservation | undefined;
+                const reserveTransactionId = actionAttributes.purpose.id;
+                // アクション開始
+                const action = yield repos.action.start(actionAttributes);
+                try {
+                    // 予約取引を検索
+                    const reserveTransactions = yield repos.assetTransaction.search({
+                        limit: 1,
+                        page: 1,
+                        typeOf: factory.assetTransactionType.Reserve,
+                        ids: [reserveTransactionId]
                     });
-                    // 取消対象予約が取引に存在すれば、適宜unlock
-                    if (cancelingSubReservation !== undefined) {
-                        const reservationFor = reserveTransaction.object.reservationFor;
-                        if (reservationFor === undefined) {
-                            throw new factory.errors.NotFound('transaction.object.reservationFor');
-                        }
-                        const cancelingReservation = Object.assign(Object.assign({}, cancelingSubReservation), { reservationFor });
-                        yield processUnlockSeat({
-                            reservation: cancelingReservation,
-                            expectedHolder: reserveTransactionId
-                        })(repos);
-                        yield processUnlockOfferRateLimit({ reservation: cancelingReservation, reservationFor })(repos);
-                        // 予約が存在すればキャンセル状態に変更する
-                        const reservationCount = yield repos.reservation.count({
-                            typeOf: cancelingSubReservation.typeOf,
-                            ids: [cancelingSubReservation.id]
-                        });
-                        if (reservationCount > 0) {
-                            canceledReservation = yield repos.reservation.cancel({
-                                id: cancelingSubReservation.id,
-                                previousReservationStatus: actionAttributes.object.reservationStatus,
+                    const reserveTransaction = reserveTransactions.shift();
+                    const actionObject = actionAttributes.object;
+                    if (reserveTransaction !== undefined) {
+                        // ReservationPackageに対応(2022-12-23~)
+                        if (actionObject.typeOf === factory.reservationType.ReservationPackage) {
+                            const reservationFor = reserveTransaction.object.reservationFor;
+                            if (reservationFor === undefined) {
+                                throw new factory.errors.NotFound('transaction.object.reservationFor');
+                            }
+                            const subReservation = reserveTransaction.object.subReservation;
+                            if (Array.isArray(subReservation) && subReservation.length > 0) {
+                                yield Promise.all(subReservation.map((cancelingSubReservation) => __awaiter(this, void 0, void 0, function* () {
+                                    const cancelingReservation = Object.assign(Object.assign({}, cancelingSubReservation), { reservationFor });
+                                    yield processUnlockSeat({
+                                        reservation: cancelingReservation,
+                                        expectedHolder: reserveTransactionId
+                                    })(repos);
+                                    yield processUnlockOfferRateLimit({ reservation: cancelingReservation, reservationFor })(repos);
+                                })));
+                            }
+                            // 予約番号単位でキャンセル状態に変更する
+                            yield repos.reservation.cancelByReservationNumber({
+                                reservationNumber: actionObject.reservationNumber,
+                                previousReservationStatus: actionObject.reservationStatus,
                                 now
                             });
-                            canceledReservations.push(canceledReservation);
+                        }
+                        else {
+                            const cancelingSubReservation = (_a = reserveTransaction.object.subReservation) === null || _a === void 0 ? void 0 : _a.find((r) => {
+                                return r.id === actionObject.id;
+                            });
+                            // 取消対象予約が取引に存在すれば、適宜unlock
+                            if (cancelingSubReservation !== undefined) {
+                                const reservationFor = reserveTransaction.object.reservationFor;
+                                if (reservationFor === undefined) {
+                                    throw new factory.errors.NotFound('transaction.object.reservationFor');
+                                }
+                                const cancelingReservation = Object.assign(Object.assign({}, cancelingSubReservation), { reservationFor });
+                                yield processUnlockSeat({
+                                    reservation: cancelingReservation,
+                                    expectedHolder: reserveTransactionId
+                                })(repos);
+                                yield processUnlockOfferRateLimit({ reservation: cancelingReservation, reservationFor })(repos);
+                                // 予約が存在すればキャンセル状態に変更する
+                                const reservationCount = yield repos.reservation.count({
+                                    typeOf: cancelingSubReservation.typeOf,
+                                    ids: [cancelingSubReservation.id]
+                                });
+                                if (reservationCount > 0) {
+                                    yield repos.reservation.cancel({
+                                        id: cancelingSubReservation.id,
+                                        previousReservationStatus: actionObject.reservationStatus,
+                                        now
+                                    });
+                                    // canceledReservations.push(canceledReservation);
+                                }
+                            }
                         }
                     }
                 }
-            }
-            catch (error) {
-                // actionにエラー結果を追加
-                try {
-                    const actionError = Object.assign(Object.assign({}, error), { message: error.message, name: error.name });
-                    yield repos.action.giveUp({ typeOf: action.typeOf, id: action.id, error: actionError });
-                }
-                catch (__) {
-                    // 失敗したら仕方ない
+                catch (error) {
+                    // actionにエラー結果を追加
+                    try {
+                        const actionError = Object.assign(Object.assign({}, error), { message: error.message, name: error.name });
+                        yield repos.action.giveUp({ typeOf: action.typeOf, id: action.id, error: actionError });
+                    }
+                    catch (__) {
+                        // 失敗したら仕方ない
+                    }
+                    throw error;
                 }
-                throw error;
-            }
-            // アクション完了
-            const actionResult = {
-                canceledReservationId: canceledReservation === null || canceledReservation === void 0 ? void 0 : canceledReservation.id
-            };
-            yield repos.action.complete({ typeOf: action.typeOf, id: action.id, result: actionResult });
-            if (canceledReservation !== undefined) {
+                // アクション完了
+                const actionResult = {
+                // canceledReservationId: canceledReservation?.id
+                };
+                yield repos.action.complete({ typeOf: action.typeOf, id: action.id, result: actionResult });
                 yield (0, onReservationCanceled_1.onReservationCanceledByAction)(actionAttributes)({ task: repos.task });
+            })));
+            const reservationNumber = actionAttributesList[0].object.reservationNumber;
+            if (typeof reservationNumber === 'string' && reservationNumber.length > 0) {
+                // 最新のconfirmedReservationsを検索
+                canceledReservations = yield repos.reservation.search({
+                    reservationNumber: { $eq: reservationNumber },
+                    typeOf: factory.reservationType.EventReservation
+                });
+                canceledReservations = canceledReservations.map((r) => {
+                    // _idは不要であり、存在すると予期せぬ影響を及ぼす可能性がある
+                    delete r._id;
+                    return r;
+                });
             }
-        })));
-        yield (0, onReservationCanceled_1.onReservationCanceled)(canceledReservations, false)({ task: repos.task });
+            yield (0, onReservationCanceled_1.onReservationCanceled)(canceledReservations, false)({ task: repos.task });
+        }
     });
 }
 exports.cancelPendingReservation = cancelPendingReservation;
@@ -105,35 +148,40 @@ function cancelReservation(actionAttributesList) {
             let canceledReservation;
             const action = yield repos.action.start(actionAttributes);
             try {
-                const reservation = yield repos.reservation.findById({
-                    id: actionAttributes.object.id
-                });
-                // 予約取引を検索
-                const reserveTransactions = yield repos.assetTransaction.search({
-                    limit: 1,
-                    page: 1,
-                    typeOf: factory.assetTransactionType.Reserve,
-                    object: { reservations: { id: { $in: [reservation.id] } } }
-                });
-                const reserveTransaction = reserveTransactions.shift();
-                let exectedHolder;
-                if (reserveTransaction !== undefined) {
-                    exectedHolder = reserveTransaction.id;
+                if (actionAttributes.object.typeOf === factory.reservationType.ReservationPackage) {
+                    throw new factory.errors.NotImplemented('ReservationPackage not implemented');
                 }
-                if (typeof exectedHolder === 'string') {
-                    yield processUnlockSeat({
-                        reservation: reservation,
-                        expectedHolder: exectedHolder
-                    })(repos);
+                else {
+                    const reservation = yield repos.reservation.findById({
+                        id: actionAttributes.object.id
+                    });
+                    // 予約取引を検索
+                    const reserveTransactions = yield repos.assetTransaction.search({
+                        limit: 1,
+                        page: 1,
+                        typeOf: factory.assetTransactionType.Reserve,
+                        object: { reservations: { id: { $in: [reservation.id] } } }
+                    });
+                    const reserveTransaction = reserveTransactions.shift();
+                    let exectedHolder;
+                    if (reserveTransaction !== undefined) {
+                        exectedHolder = reserveTransaction.id;
+                    }
+                    if (typeof exectedHolder === 'string') {
+                        yield processUnlockSeat({
+                            reservation: reservation,
+                            expectedHolder: exectedHolder
+                        })(repos);
+                    }
+                    yield processUnlockOfferRateLimit({ reservation, reservationFor: reservation.reservationFor })(repos);
+                    // 予約をキャンセル状態に変更する
+                    canceledReservation = yield repos.reservation.cancel({
+                        id: reservation.id,
+                        previousReservationStatus: actionAttributes.object.reservationStatus,
+                        now
+                    });
+                    canceledReservations.push(canceledReservation);
                 }
-                yield processUnlockOfferRateLimit({ reservation, reservationFor: reservation.reservationFor })(repos);
-                // 予約をキャンセル状態に変更する
-                canceledReservation = yield repos.reservation.cancel({
-                    id: reservation.id,
-                    previousReservationStatus: actionAttributes.object.reservationStatus,
-                    now
-                });
-                canceledReservations.push(canceledReservation);
             }
             catch (error) {
                 // actionにエラー結果を追加

package/lib/chevre/service/reserve/confirmReservation.js

@@ -10,49 +10,81 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.confirmReservation = void 0;
+/**
+ * 予約サービス
+ */
+const factory = require("../../factory");
 const onReservationConfirmed_1 = require("./potentialActions/onReservationConfirmed");
 /**
  * 予約を確定する
  */
 function confirmReservation(actionAttributesList) {
+    // tslint:disable-next-line:max-func-body-length
     return (repos) => __awaiter(this, void 0, void 0, function* () {
-        const confirmedReservations = [];
-        yield Promise.all(actionAttributesList.map((actionAttributes) => __awaiter(this, void 0, void 0, function* () {
-            let reservation = actionAttributes.object;
-            const action = yield repos.action.start(actionAttributes);
-            try {
-                // 予約を確定状態に変更する
-                reservation = yield repos.reservation.confirm({
-                    // 更新属性をwhitelist化(2022-06-13~)
-                    // ...actionAttributes.object,
-                    id: reservation.id,
-                    previousReservationStatus: reservation.reservationStatus,
-                    underName: reservation.underName,
-                    reservedTicket: reservation.reservedTicket
-                });
-                // _idは不要であり、存在すると予期せぬ影響を及ぼす可能性がある
-                delete reservation._id;
-                confirmedReservations.push(reservation);
-            }
-            catch (error) {
-                // actionにエラー結果を追加
+        let confirmedReservations = [];
+        if (actionAttributesList.length > 0) {
+            yield Promise.all(actionAttributesList.map((actionAttributes) => __awaiter(this, void 0, void 0, function* () {
+                const reservation = actionAttributes.object;
+                const action = yield repos.action.start(actionAttributes);
                 try {
-                    const actionError = Object.assign(Object.assign({}, error), { message: error.message, name: error.name });
-                    yield repos.action.giveUp({ typeOf: action.typeOf, id: action.id, error: actionError });
+                    // ReservationPackageに対応(2022-12-22~)
+                    if (reservation.typeOf === factory.reservationType.ReservationPackage) {
+                        // 予約を確定状態に変更する
+                        yield repos.reservation.confirmByReservationNumber({
+                            reservationNumber: reservation.reservationNumber,
+                            previousReservationStatus: reservation.reservationStatus,
+                            underName: reservation.underName
+                        });
+                    }
+                    else {
+                        // 予約を確定状態に変更する
+                        // reservation = await repos.reservation.confirm<factory.reservationType.EventReservation>({
+                        yield repos.reservation.confirm({
+                            // 更新属性をwhitelist化(2022-06-13~)
+                            // ...actionAttributes.object,
+                            id: reservation.id,
+                            previousReservationStatus: reservation.reservationStatus,
+                            underName: reservation.underName
+                            // issuedThroughは予約取引開始時に確定しているので更新不要(2022-12-21~)
+                            // reservedTicket: reservation.reservedTicket
+                        });
+                        // _idは不要であり、存在すると予期せぬ影響を及ぼす可能性がある
+                        // delete (<any>reservation)._id;
+                        // confirmedReservations.push(reservation);
+                    }
                 }
-                catch (__) {
-                    // 失敗したら仕方ない
+                catch (error) {
+                    // actionにエラー結果を追加
+                    try {
+                        const actionError = Object.assign(Object.assign({}, error), { message: error.message, name: error.name });
+                        yield repos.action.giveUp({ typeOf: action.typeOf, id: action.id, error: actionError });
+                    }
+                    catch (__) {
+                        // 失敗したら仕方ない
+                    }
+                    throw error;
                 }
-                throw error;
+                // アクション完了
+                const actionResult = {};
+                yield repos.action.complete({ typeOf: action.typeOf, id: action.id, result: actionResult });
+                yield (0, onReservationConfirmed_1.onReservationConfirmedByAction)(actionAttributes)({ task: repos.task });
+            })));
+            // 確定予約通知タスクを予約番号単位で作成する(2022-12-21~)
+            const reservationNumber = actionAttributesList[0].object.reservationNumber;
+            if (typeof reservationNumber === 'string' && reservationNumber.length > 0) {
+                // 最新のconfirmedReservationsを検索
+                confirmedReservations = yield repos.reservation.search({
+                    reservationNumber: { $eq: reservationNumber },
+                    typeOf: factory.reservationType.EventReservation
+                });
+                confirmedReservations = confirmedReservations.map((r) => {
+                    // _idは不要であり、存在すると予期せぬ影響を及ぼす可能性がある
+                    delete r._id;
+                    return r;
+                });
             }
-            // アクション完了
-            const actionResult = {
-                confirmedReservationId: reservation.id
-            };
-            yield repos.action.complete({ typeOf: action.typeOf, id: action.id, result: actionResult });
-            yield (0, onReservationConfirmed_1.onReservationConfirmedByAction)(actionAttributes, reservation)({ task: repos.task });
-        })));
-        yield (0, onReservationConfirmed_1.onReservationConfirmed)(confirmedReservations)({ task: repos.task });
+            yield (0, onReservationConfirmed_1.onReservationConfirmed)(confirmedReservations)({ task: repos.task });
+        }
     });
 }
 exports.confirmReservation = confirmReservation;

package/lib/chevre/service/reserve/potentialActions/onReservationConfirmed.d.ts

@@ -7,7 +7,7 @@ declare type IEventReservation = factory.reservation.IReservation<factory.reserv
 /**
  * 予約確定後のアクション
  */
-export declare function onReservationConfirmedByAction(actionAttributes: factory.action.reserve.IAttributes, confirmedReservation: IEventReservation): (repos: {
+export declare function onReservationConfirmedByAction(actionAttributes: factory.action.reserve.IAttributes): (repos: {
     task: TaskRepo;
 }) => Promise<void>;
 export declare function onReservationConfirmed(confirmedReservations: IEventReservation[]): (repos: {

package/lib/chevre/service/reserve/potentialActions/onReservationConfirmed.js

@@ -21,7 +21,9 @@ const informReservations = settings_1.settings.onReservationStatusChanged.inform
 /**
  * 予約確定後のアクション
  */
-function onReservationConfirmedByAction(actionAttributes, confirmedReservation) {
+function onReservationConfirmedByAction(actionAttributes
+// confirmedReservation: IEventReservation
+) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         const potentialActions = actionAttributes.potentialActions;
         const now = new Date();
@@ -45,35 +47,34 @@ function onReservationConfirmedByAction(actionAttributes, confirmedReservation)
             }
         }
         // inform galobally
-        if (Array.isArray(informReservations)) {
-            const reservation4inform = (0, factory_1.maskUnderName)(confirmedReservation);
-            taskAttributes.push(...informReservations.map((informReservation) => {
-                var _a;
-                const informUrl = String((_a = informReservation.recipient) === null || _a === void 0 ? void 0 : _a.url);
-                const informReservationAttributes = {
-                    agent: confirmedReservation.project,
-                    object: [reservation4inform],
-                    project: confirmedReservation.project,
-                    recipient: {
-                        id: '',
-                        name: informUrl,
-                        typeOf: factory.creativeWorkType.WebApplication,
-                        url: informUrl
-                    },
-                    typeOf: factory.actionType.InformAction
-                };
-                return {
-                    project: actionAttributes.project,
-                    name: factory.taskName.TriggerWebhook,
-                    status: factory.taskStatus.Ready,
-                    runsAt: now,
-                    remainingNumberOfTries: factory_1.NUM_TRY_INFORM_RESERVATION,
-                    numberOfTried: 0,
-                    executionResults: [],
-                    data: informReservationAttributes
-                };
-            }));
-        }
+        // if (Array.isArray(informReservations)) {
+        //     const reservation4inform: IReservation4informConfirmed = maskUnderName(confirmedReservation);
+        //     taskAttributes.push(...informReservations.map<ITriggerWebhookTaskAttributes>((informReservation) => {
+        //         const informUrl: string = String(informReservation.recipient?.url);
+        //         const informReservationAttributes: InformReservationActionattributes = {
+        //             agent: confirmedReservation.project,
+        //             object: [reservation4inform],
+        //             project: confirmedReservation.project,
+        //             recipient: {
+        //                 id: '',
+        //                 name: informUrl,
+        //                 typeOf: factory.creativeWorkType.WebApplication,
+        //                 url: informUrl
+        //             },
+        //             typeOf: factory.actionType.InformAction
+        //         };
+        //         return {
+        //             project: actionAttributes.project,
+        //             name: factory.taskName.TriggerWebhook,
+        //             status: factory.taskStatus.Ready,
+        //             runsAt: now,
+        //             remainingNumberOfTries: NUM_TRY_INFORM_RESERVATION,
+        //             numberOfTried: 0,
+        //             executionResults: [],
+        //             data: informReservationAttributes
+        //         };
+        //     }));
+        // }
         // タスク保管
         if (taskAttributes.length > 0) {
             yield repos.task.saveMany(taskAttributes);
@@ -88,6 +89,42 @@ function onReservationConfirmed(confirmedReservations) {
                 project: confirmedReservations[0].project,
                 reservationFor: { id: confirmedReservations[0].reservationFor.id }
             })({ task: repos.task });
+            const now = new Date();
+            const taskAttributes = [];
+            // inform galobally
+            if (Array.isArray(informReservations)) {
+                taskAttributes.push(...informReservations.map((informReservation) => {
+                    var _a;
+                    const informUrl = String((_a = informReservation.recipient) === null || _a === void 0 ? void 0 : _a.url);
+                    const informObject = confirmedReservations.map(factory_1.maskUnderName);
+                    const informReservationAttributes = {
+                        agent: confirmedReservations[0].project,
+                        object: informObject,
+                        project: confirmedReservations[0].project,
+                        recipient: {
+                            id: '',
+                            name: informUrl,
+                            typeOf: factory.creativeWorkType.WebApplication,
+                            url: informUrl
+                        },
+                        typeOf: factory.actionType.InformAction
+                    };
+                    return {
+                        project: confirmedReservations[0].project,
+                        name: factory.taskName.TriggerWebhook,
+                        status: factory.taskStatus.Ready,
+                        runsAt: now,
+                        remainingNumberOfTries: factory_1.NUM_TRY_INFORM_RESERVATION,
+                        numberOfTried: 0,
+                        executionResults: [],
+                        data: informReservationAttributes
+                    };
+                }));
+            }
+            // タスク保管
+            if (taskAttributes.length > 0) {
+                yield repos.task.saveMany(taskAttributes);
+            }
         }
     });
 }

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

@@ -72,7 +72,7 @@ function confirmReserveTransaction(params) {
                     object = object;
                     yield ReserveTransactionService.confirm({
                         transactionNumber: object.transactionNumber,
-                        object: object.object,
+                        // object: object.object,
                         potentialActions: object.potentialActions
                     })(repos);
             }

package/lib/chevre/service/transaction/orderProgramMembership.js

@@ -15,7 +15,6 @@ exports.orderProgramMembership = exports.ISS_PREFIX = void 0;
  */
 const GMO = require("@motionpicture/gmo-service");
 const createDebug = require("debug");
-const moment = require("moment-timezone");
 const accountTransactionIdentifier_1 = require("../../factory/accountTransactionIdentifier");
 const OfferService = require("../offer");
 const AnyPaymentService = require("../payment/any");
@@ -120,16 +119,15 @@ function createStartPlaceOrderInProgressParams(params) {
         id: customer.id,
         identifier: customer.identifier,
         memberOf: customer.memberOf
-        // ↓不要なので廃止(2022-05-26~)
-        // paramsにadditionalPropertyの指定があれば反映する
-        // ...(Array.isArray(params.agent.additionalProperty)) ? { additionalProperty: params.agent.additionalProperty } : []
     };
     return {
         project: { typeOf: factory.organizationType.Project, id: params.project.id },
-        expires: moment()
-            // tslint:disable-next-line:no-magic-numbers
-            .add(5, 'minutes')
-            .toDate(),
+        // expiresInSeconds指定に変更(2022-11-29~)
+        // expires: moment()
+        //     // tslint:disable-next-line:no-magic-numbers
+        //     .add(5, 'minutes')
+        //     .toDate(),
+        expiresInSeconds: 300,
         agent,
         seller: { id: params.seller.id },
         object: {

package/lib/chevre/service/transaction/placeOrder/exportTasks/factory.js

@@ -9,6 +9,7 @@ const settings_1 = require("../../../../settings");
  */
 // tslint:disable-next-line:max-func-body-length
 function createTasks(params) {
+    var _a;
     const taskAttributes = [];
     const transaction = params.transaction;
     const taskRunsAt = params.runsAt;
@@ -24,7 +25,6 @@ function createTasks(params) {
             executionResults: [],
             data: {
                 agent: transaction.project,
-                // agent: transaction.seller,
                 object: transaction,
                 project: transaction.project,
                 purpose: { typeOf: transaction.typeOf, id: transaction.id },
@@ -72,6 +72,10 @@ function createTasks(params) {
             if (potentialActions === undefined) {
                 throw new factory.errors.NotFound('Transaction PotentialActions');
             }
+            const orderFromTransaction = (_a = transaction.result) === null || _a === void 0 ? void 0 : _a.order;
+            if (orderFromTransaction === undefined) {
+                throw new factory.errors.NotFound('Transaction Result');
+            }
             const orderActionAttributes = potentialActions.order;
             const placeOrderTaskAttributes = {
                 project: transaction.project,
@@ -81,9 +85,8 @@ function createTasks(params) {
                 remainingNumberOfTries: 10,
                 numberOfTried: 0,
                 executionResults: [],
-                // data: orderActionAttributes
                 data: Object.assign({ project: orderActionAttributes.project, object: {
-                        confirmationNumber: orderActionAttributes.object.confirmationNumber,
+                        confirmationNumber: orderFromTransaction.confirmationNumber,
                         orderNumber: orderActionAttributes.object.orderNumber
                     } }, (orderActionAttributes.potentialActions !== undefined)
                     ? { potentialActions: orderActionAttributes.potentialActions }

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

@@ -10,7 +10,9 @@ function createStartParams(params, passport, seller, broker) {
     if (typeof seller.id !== 'string') {
         throw new factory.errors.NotFound('seller.id');
     }
-    // 取引ファクトリーで新しい進行中取引オブジェクトを作成
+    if (typeof params.expiresInSeconds !== 'number') {
+        throw new factory.errors.ArgumentNull('expiresInSeconds');
+    }
     return {
         project: { typeOf: seller.project.typeOf, id: seller.project.id },
         typeOf: factory.transactionType.PlaceOrder,
@@ -19,11 +21,14 @@ function createStartParams(params, passport, seller, broker) {
             id: seller.id,
             name: seller.name,
             typeOf: seller.typeOf
-            // ↓最適化(2022-05-24~)
-            // ...{ project: seller.project }
         },
         object: transactionObject,
-        expires: params.expires
+        // expires: params.expires,
+        expiresInSeconds: params.expiresInSeconds
+        // 販売者にexpires設定があれば適用
+        // ...(typeof makesOfferFromClient?.eligibleTransactionDuration?.maxValue === 'number')
+        //     ? { expiresInSeconds: makesOfferFromClient.eligibleTransactionDuration.maxValue }
+        //     : undefined
     };
 }
 exports.createStartParams = createStartParams;

package/lib/chevre/service/transaction/placeOrderInProgress/potentialActions/givePointAward.js

@@ -48,7 +48,8 @@ function createGivePointAwardActions(params) {
                             seller: params.order.seller,
                             // mask
                             customer: (0, order_1.createMaskedCustomer)(params.order),
-                            confirmationNumber: params.order.confirmationNumber,
+                            // IOrderへ移行(2022-11-17~)
+                            // confirmationNumber: params.order.confirmationNumber,
                             orderNumber: params.order.orderNumber,
                             price: params.order.price,
                             priceCurrency: params.order.priceCurrency,

package/lib/chevre/service/transaction/placeOrderInProgress/potentialActions/moneyTransfer.js

@@ -66,7 +66,8 @@ function createMoneyTransferActions(params) {
                         seller: params.order.seller,
                         // mask
                         customer: (0, order_1.createMaskedCustomer)(params.order),
-                        confirmationNumber: params.order.confirmationNumber,
+                        // IOrderへ移行(2022-11-17~)
+                        // confirmationNumber: params.order.confirmationNumber,
                         orderNumber: params.order.orderNumber,
                         price: params.order.price,
                         priceCurrency: params.order.priceCurrency,

package/lib/chevre/service/transaction/placeOrderInProgress/potentialActions/registerService.js

@@ -51,7 +51,8 @@ function createRegisterServiceActions(params) {
                         seller: params.order.seller,
                         // mask
                         customer: (0, order_1.createMaskedCustomer)(params.order),
-                        confirmationNumber: params.order.confirmationNumber,
+                        // IOrderへ移行(2022-11-17~)
+                        // confirmationNumber: params.order.confirmationNumber,
                         orderNumber: params.order.orderNumber,
                         price: params.order.price,
                         priceCurrency: params.order.priceCurrency,