@chevre/domain 20.1.0-alpha.2 → 20.1.0-alpha.21

package/lib/chevre/service/accountTransaction/transfer.js

@@ -14,7 +14,6 @@ exports.start = void 0;
  * 転送取引サービス
  */
 const factory = require("../../factory");
-const factory_1 = require("./factory");
 /**
  * 取引開始
  */
@@ -96,9 +95,10 @@ function start(params) {
             accountNumber: params.object.toLocation.accountNumber,
             transaction: pendingTransaction
         });
+        // 口座取引におけるAccountAction管理を廃止(2022-11-28~)
         // アクション開始
-        const moneyTransferActionAttributes = (0, factory_1.createMoneyTransferActionAttributes)({ transaction });
-        yield repos.accountAction.startByIdentifier(moneyTransferActionAttributes);
+        // const moneyTransferActionAttributes = createMoneyTransferActionAttributes({ transaction });
+        // await repos.accountAction.startByIdentifier(moneyTransferActionAttributes);
         // 結果返却
         return transaction;
     });

package/lib/chevre/service/accountTransaction/withdraw.d.ts

@@ -3,11 +3,9 @@
  */
 import * as factory from '../../factory';
 import { MongoRepository as AccountRepo } from '../../repo/account';
-import { MongoRepository as AccountActionRepo } from '../../repo/accountAction';
 import { MongoRepository as AccountTransactionRepo } from '../../repo/accountTransaction';
 export declare type IStartOperation<T> = (repos: {
     account: AccountRepo;
-    accountAction: AccountActionRepo;
     accountTransaction: AccountTransactionRepo;
 }) => Promise<T>;
 /**

package/lib/chevre/service/accountTransaction/withdraw.js

@@ -14,7 +14,6 @@ exports.start = void 0;
  * 出金取引サービス
  */
 const factory = require("../../factory");
-const factory_1 = require("./factory");
 /**
  * 取引開始
  */
@@ -75,9 +74,10 @@ function start(params) {
             transaction: pendingTransaction,
             force: forcibly
         });
+        // 口座取引におけるAccountAction管理を廃止(2022-11-28~)
         // アクション開始
-        const moneyTransferActionAttributes = (0, factory_1.createMoneyTransferActionAttributes)({ transaction });
-        yield repos.accountAction.startByIdentifier(moneyTransferActionAttributes);
+        // const moneyTransferActionAttributes = createMoneyTransferActionAttributes({ transaction });
+        // await repos.accountAction.startByIdentifier(moneyTransferActionAttributes);
         // 結果返却
         return transaction;
     });

package/lib/chevre/service/assetTransaction/pay/potentialActions.js

@@ -3,20 +3,21 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.createPotentialActions = void 0;
 const factory = require("../../../factory");
 const order_1 = require("../../../factory/order");
-const USE_NEW_PRICE_SPEC_ON_INFORM_PAY_ACTION = process.env.USE_NEW_PRICE_SPEC_ON_INFORM_PAY_ACTION === '1';
 function createPayActions(params) {
     var _a;
     const payActions = [];
     const payObject = createPayObject(params);
     const informPaymentActions = createInformPaymentActions(params);
     if (payObject !== undefined) {
+        const maskedCustomer = (0, order_1.createMaskedCustomer)(params.order);
         const simpleOrder = {
             // project: params.order.project,
             typeOf: params.order.typeOf,
             seller: params.order.seller,
             // mask
-            customer: (0, order_1.createMaskedCustomer)(params.order),
-            confirmationNumber: params.order.confirmationNumber,
+            customer: { typeOf: maskedCustomer.typeOf, id: maskedCustomer.id, name: maskedCustomer.name },
+            // IOrderへ移行(2022-11-17~)
+            // confirmationNumber: params.order.confirmationNumber,
             orderNumber: params.order.orderNumber,
             price: params.order.price,
             priceCurrency: params.order.priceCurrency,
@@ -121,8 +122,7 @@ function createPayObjectServiceOutput(params) {
                 paymentServiceOutput = movieTickets.map((movieTicket) => {
                     var _a;
                     const reservation4invoice = movieTicket2reservation4invoice(movieTicket, order, String(paymentMethodType));
-                    return Object.assign({ identifier: movieTicket.identifier }, (typeof reservation4invoice.price === 'number'
-                        || typeof ((_a = reservation4invoice.priceSpecification) === null || _a === void 0 ? void 0 : _a.typeOf) === 'string')
+                    return Object.assign({ identifier: movieTicket.identifier }, (typeof ((_a = reservation4invoice.priceSpecification) === null || _a === void 0 ? void 0 : _a.typeOf) === 'string')
                         ? {
                             serviceOutput: reservation4invoice
                         }
@@ -137,7 +137,6 @@ function createPayObjectServiceOutput(params) {
 }
 function movieTicket2reservation4invoice(movieTicket, order, paymentMethodType) {
     var _a, _b;
-    let reservationPrice;
     let priceComponents4invoice = [];
     // Orderから対象予約を取得
     const reservationOffer = (_a = order === null || order === void 0 ? void 0 : order.acceptedOffers) === null || _a === void 0 ? void 0 : _a.find((o) => {
@@ -172,7 +171,6 @@ function movieTicket2reservation4invoice(movieTicket, order, paymentMethodType)
     if (reservationOffer !== undefined) {
         const priceComponent = (_b = reservationOffer.priceSpecification) === null || _b === void 0 ? void 0 : _b.priceComponent;
         if (Array.isArray(priceComponent)) {
-            reservationPrice = priceComponent.reduce((a, b) => a + Number(b.price), 0);
             priceComponents4invoice = priceComponent.map((component) => {
                 var _a;
                 const accounting = (typeof ((_a = component.accounting) === null || _a === void 0 ? void 0 : _a.accountsReceivable) === 'number')
@@ -192,19 +190,12 @@ function movieTicket2reservation4invoice(movieTicket, order, paymentMethodType)
             });
         }
     }
-    if (USE_NEW_PRICE_SPEC_ON_INFORM_PAY_ACTION) {
-        return {
-            priceSpecification: {
-                typeOf: factory.priceSpecificationType.CompoundPriceSpecification,
-                priceComponent: priceComponents4invoice
-            }
-        };
-    }
-    else {
-        return {
-            price: reservationPrice
-        };
-    }
+    return {
+        priceSpecification: {
+            typeOf: factory.priceSpecificationType.CompoundPriceSpecification,
+            priceComponent: priceComponents4invoice
+        }
+    };
 }
 function createInformPaymentActions(params) {
     var _a;

package/lib/chevre/service/delivery/factory.js

@@ -63,7 +63,8 @@ function createAcquiredFrom(params) {
     // 最低限の情報に絞る
     const seller = params.order.seller;
     return {
-        project: { typeOf: params.order.project.typeOf, id: params.order.project.id },
+        // 最適化(2022-11-15~)
+        // project: { typeOf: params.order.project.typeOf, id: params.order.project.id },
         id: seller.id,
         typeOf: seller.typeOf,
         name: (typeof seller.name === 'string')

package/lib/chevre/service/event.js

@@ -648,6 +648,16 @@ function createMovieTheaterFromCOA(project, theaterFromCOA, screensFromCOA) {
                 typeOf: 'QuantitativeValue',
                 value: 1200,
                 unitCode: factory.unitCode.Sec
+            },
+            availabilityStartsGraceTimeOnPOS: {
+                typeOf: 'QuantitativeValue',
+                value: -93,
+                unitCode: factory.unitCode.Day
+            },
+            availabilityEndsGraceTimeOnPOS: {
+                typeOf: 'QuantitativeValue',
+                value: 2678400,
+                unitCode: factory.unitCode.Sec
             }
         }
     };

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

@@ -49,11 +49,15 @@ export declare function authorize(params: {
     transaction: {
         id: string;
     };
+    validateEventOfferPeriod?: boolean;
     validateEvent?: boolean;
     /**
      * どの店舗に対して
      */
     store: {
+        /**
+         * 販売アプリケーションID
+         */
         id: string;
     };
 }): IAuthorizeOperation<IAuthorizeOfferAction>;

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

@@ -23,7 +23,7 @@ function authorize(params) {
     // tslint:disable-next-line:max-func-body-length
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         const now = new Date();
-        const { transaction, event, bookingServiceIdentifire } = yield validateCreateRequest(Object.assign(Object.assign({}, params), { now }))({ event: repos.event, transaction: repos.transaction });
+        const { transaction, event, bookingServiceIdentifire } = yield validateCreateRequest(Object.assign(Object.assign({}, params), { now, store: params.store }))({ event: repos.event, transaction: repos.transaction });
         const acceptedOffers = yield validateAcceptedOffers({
             object: params.object,
             event,
@@ -121,12 +121,11 @@ function validateCreateRequest(params) {
         }
         const bookingServiceIdentifire = offeredThrough.identifier;
         if (bookingServiceIdentifire === factory.service.webAPI.Identifier.Chevre) {
+            if (params.validateEventOfferPeriod === true) {
+                validateEventOfferPeriod({ event, now, availableAt: { id: params.store.id } });
+            }
             if (params.validateEvent === true) {
-                validateEvent({
-                    event,
-                    now,
-                    object: params.object
-                });
+                validateEvent({ event, object: params.object });
             }
         }
         return { transaction, event, bookingServiceIdentifire };
@@ -204,12 +203,23 @@ function validateObjectWithoutDetail(params) {
         return objectWithoutDetail;
     });
 }
-function validateEvent(params) {
-    var _a, _b;
+/**
+ * イベントのオファー有効期間を検証する
+ */
+function validateEventOfferPeriod(params) {
     const acceptedDate = moment(params.now);
     const eventOffers = params.event.offers;
-    const validFrom = eventOffers === null || eventOffers === void 0 ? void 0 : eventOffers.validFrom;
-    const validThrough = eventOffers === null || eventOffers === void 0 ? void 0 : eventOffers.validThrough;
+    // アプリケーションごとの設定を参照する(2022-11-19~)
+    const makesOfferOnApplication = eventOffers === null || eventOffers === void 0 ? void 0 : eventOffers.seller.makesOffer.find((offer) => {
+        return Array.isArray(offer.availableAtOrFrom) && offer.availableAtOrFrom[0].id === params.availableAt.id;
+    });
+    if (makesOfferOnApplication === undefined) {
+        throw new factory.errors.Argument('reservationFor.id', `seller makes no available offer at ${params.availableAt.id}`);
+    }
+    const validFrom = makesOfferOnApplication.validFrom;
+    const validThrough = makesOfferOnApplication.validThrough;
+    // const validFrom = eventOffers?.validFrom;
+    // const validThrough = eventOffers?.validThrough;
     if (validFrom !== undefined && validFrom !== null) {
         if (acceptedDate.isBefore(moment(validFrom))) {
             throw new factory.errors.Argument('reservationFor.id', `Offer of ${params.event.id} is valid from ${validFrom}`);
@@ -220,6 +230,32 @@ function validateEvent(params) {
             throw new factory.errors.Argument('reservationFor.id', `Offer of ${params.event.id} is valid through ${validThrough}`);
         }
     }
+}
+/**
+ * イベントの上限座席数を検証する
+ */
+function validateEvent(params) {
+    var _a, _b;
+    // const acceptedDate = moment(params.now);
+    const eventOffers = params.event.offers;
+    // const validFrom = eventOffers?.validFrom;
+    // const validThrough = eventOffers?.validThrough;
+    // if (validFrom !== undefined && validFrom !== null) {
+    //     if (acceptedDate.isBefore(moment(validFrom))) {
+    //         throw new factory.errors.Argument(
+    //             'reservationFor.id',
+    //             `Offer of ${params.event.id} is valid from ${validFrom}`
+    //         );
+    //     }
+    // }
+    // if (validThrough !== undefined && validThrough !== null) {
+    //     if (acceptedDate.isAfter(moment(validThrough))) {
+    //         throw new factory.errors.Argument(
+    //             'reservationFor.id',
+    //             `Offer of ${params.event.id} is valid through ${validThrough}`
+    //         );
+    //     }
+    // }
     // イベントのmaxValueを検証
     const maxValue = (_a = eventOffers === null || eventOffers === void 0 ? void 0 : eventOffers.eligibleQuantity) === null || _a === void 0 ? void 0 : _a.maxValue;
     if (typeof maxValue === 'number') {

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

@@ -13,7 +13,6 @@ var __rest = (this && this.__rest) || function (s, e) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createCompoundPriceSpec4event = void 0;
 const factory = require("../../factory");
-const USE_MULTIPLE_MOVIE_TICKET_CHARGE = process.env.USE_MULTIPLE_MOVIE_TICKET_CHARGE === '1';
 function categoryCodeChargePriceSpec2component(params) {
     var _a;
     return Object.assign({ id: params.id, typeOf: params.typeOf, name: params.name, price: params.price, priceCurrency: params.priceCurrency, valueAddedTaxIncluded: params.valueAddedTaxIncluded, appliesToCategoryCode: params.appliesToCategoryCode }, (typeof ((_a = params.accounting) === null || _a === void 0 ? void 0 : _a.typeOf) === 'string') ? { accounting: params.accounting } : undefined);
@@ -35,25 +34,13 @@ function createCompoundPriceSpec4event(params) {
     if (Array.isArray(unitPriceSpec.appliesToMovieTicket)) {
         unitPriceSpec.appliesToMovieTicket.forEach((appliesToMovieTicket) => {
             // すべての上映方式に該当する加算料金を追加(2022-10-29~)
-            if (USE_MULTIPLE_MOVIE_TICKET_CHARGE) {
-                const mvtkSpecs4appliesToMovieTicket = params.movieTicketTypeChargeSpecs.filter((s) => {
-                    var _a;
-                    return ((_a = s.appliesToMovieTicket.serviceOutput) === null || _a === void 0 ? void 0 : _a.typeOf) === appliesToMovieTicket.serviceOutput.typeOf
-                        && s.appliesToMovieTicket.serviceType === appliesToMovieTicket.serviceType
-                        && params.videoFormatTypes.includes(s.appliesToVideoFormat);
-                });
-                mvtkPriceComponents.push(...mvtkSpecs4appliesToMovieTicket.map(mvtkChargePriceSpec2component));
-            }
-            else {
-                const mvtkSpec4appliesToMovieTicket = params.movieTicketTypeChargeSpecs.find((s) => {
-                    var _a;
-                    return ((_a = s.appliesToMovieTicket.serviceOutput) === null || _a === void 0 ? void 0 : _a.typeOf) === appliesToMovieTicket.serviceOutput.typeOf
-                        && s.appliesToMovieTicket.serviceType === appliesToMovieTicket.serviceType;
-                });
-                if (mvtkSpec4appliesToMovieTicket !== undefined) {
-                    mvtkPriceComponents.push(mvtkChargePriceSpec2component(mvtkSpec4appliesToMovieTicket));
-                }
-            }
+            const mvtkSpecs4appliesToMovieTicket = params.movieTicketTypeChargeSpecs.filter((s) => {
+                var _a;
+                return ((_a = s.appliesToMovieTicket.serviceOutput) === null || _a === void 0 ? void 0 : _a.typeOf) === appliesToMovieTicket.serviceOutput.typeOf
+                    && s.appliesToMovieTicket.serviceType === appliesToMovieTicket.serviceType
+                    && params.videoFormatTypes.includes(s.appliesToVideoFormat);
+            });
+            mvtkPriceComponents.push(...mvtkSpecs4appliesToMovieTicket.map(mvtkChargePriceSpec2component));
         });
     }
     else {

package/lib/chevre/service/offer.js

@@ -40,12 +40,11 @@ function addOffers2Seat(params) {
                     && categoryCode.inCodeSet.identifier === factory.categoryCode.CategorySetIdentifier.SeatingType;
             });
     }));
+    // 最適化(2022-11-15~)
     const priceSpecification = {
-        // 不要な属性を除外(2022-11-02~)
-        // project: params.project,
         typeOf: factory.priceSpecificationType.CompoundPriceSpecification,
-        priceCurrency: factory.priceCurrency.JPY,
-        valueAddedTaxIncluded: true,
+        // priceCurrency: factory.priceCurrency.JPY,
+        // valueAddedTaxIncluded: true,
         priceComponent: priceComponent
     };
     let availability = (unavailableOffer !== undefined)
@@ -55,9 +54,10 @@ function addOffers2Seat(params) {
         availability = params.availability;
     }
     return Object.assign(Object.assign({}, params.seat), { offers: [{
-                project: params.project,
+                // 最適化(2022-11-15~)
+                // project: params.project,
                 typeOf: factory.offerType.Offer,
-                priceCurrency: factory.priceCurrency.JPY,
+                // priceCurrency: factory.priceCurrency.JPY,
                 availability: availability,
                 priceSpecification: priceSpecification
             }] });

package/lib/chevre/service/order/onOrderStatusChanged/factory.js

@@ -33,7 +33,7 @@ function getOrderWithToken(params) {
             ? {
                 id: params.order.customer.id,
                 name: '****',
-                project: params.order.customer.project,
+                // project: params.order.customer.project,
                 typeOf: params.order.customer.typeOf
             }
             : {
@@ -42,7 +42,8 @@ function getOrderWithToken(params) {
             };
         const seller4orderToken = {
             id: params.order.seller.id,
-            project: params.order.seller.project,
+            // 最適化(2022-11-15~)
+            // project: params.order.seller.project,
             typeOf: params.order.seller.typeOf
         };
         const order4token = {
@@ -50,7 +51,8 @@ function getOrderWithToken(params) {
             typeOf: params.order.typeOf,
             seller: seller4orderToken,
             customer: customer4orderToken,
-            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/order/onOrderStatusChanged.js

@@ -24,12 +24,13 @@ const TOKEN_EXPIRES_IN = 604800;
 function onOrderStatusChanged(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         let tasks = [];
+        const maskedCustomer = (0, order_1.createMaskedCustomer)(params.order);
         const simpleOrder = {
-            // project: params.order.project,
             typeOf: params.order.typeOf,
             seller: params.order.seller,
-            customer: (0, order_1.createMaskedCustomer)(params.order),
-            confirmationNumber: params.order.confirmationNumber,
+            customer: { typeOf: maskedCustomer.typeOf, id: maskedCustomer.id, name: maskedCustomer.name },
+            // IOrderへ移行(2022-11-17~)
+            // confirmationNumber: params.order.confirmationNumber,
             orderNumber: params.order.orderNumber,
             price: params.order.price,
             priceCurrency: params.order.priceCurrency,
@@ -118,7 +119,7 @@ function createConfirmPayTransactionTasks(order, simpleOrder) {
                     typeOf: factory.actionType.ConfirmAction,
                     object: [{ typeOf: factory.assetTransactionType.Pay, transactionNumber: paymentMethod.paymentMethodId }],
                     agent: order.project,
-                    purpose: simpleOrder,
+                    purpose: Object.assign(Object.assign({}, simpleOrder), { confirmationNumber: order.confirmationNumber }),
                     instrument: {
                         typeOf: 'WebAPI',
                         identifier: factory.action.authorize.paymentMethod.any.ServiceIdentifier.Chevre

package/lib/chevre/service/order/placeOrder.js

@@ -89,12 +89,14 @@ function placeOrderWithoutTransaction(params) {
         //     orderNumber: params.object.orderNumber
         // })({ transaction: repos.transaction });
         // アクションを作成する(2022-04-11~)
+        const maskedCustomer = (0, order_1.createMaskedCustomer)(order);
         const simpleOrder = {
             // project: order.project,
             typeOf: order.typeOf,
             seller: order.seller,
-            customer: (0, order_1.createMaskedCustomer)(order),
-            confirmationNumber: order.confirmationNumber,
+            customer: { typeOf: maskedCustomer.typeOf, id: maskedCustomer.id, name: maskedCustomer.name },
+            // IOrderへ移行(2022-11-17~)
+            // confirmationNumber: order.confirmationNumber,
             orderNumber: order.orderNumber,
             price: order.price,
             priceCurrency: order.priceCurrency,
@@ -131,7 +133,10 @@ function placeOrderWithoutTransaction(params) {
             task: repos.task
         });
         // 潜在アクション
-        yield onPlaceOrder(params)(repos);
+        yield onPlaceOrder({
+            object: order,
+            potentialActions: params.potentialActions
+        })(repos);
     });
 }
 exports.placeOrderWithoutTransaction = placeOrderWithoutTransaction;
@@ -148,12 +153,14 @@ function placeOrder(params) {
             orderNumber: params.object.orderNumber
         })({ transaction: repos.transaction });
         // アクションを作成する(2022-04-11~)
+        const maskedCustomer = (0, order_1.createMaskedCustomer)(order);
         const simpleOrder = {
             // project: order.project,
             typeOf: order.typeOf,
             seller: order.seller,
-            customer: (0, order_1.createMaskedCustomer)(order),
-            confirmationNumber: order.confirmationNumber,
+            customer: { typeOf: maskedCustomer.typeOf, id: maskedCustomer.id, name: maskedCustomer.name },
+            // IOrderへ移行(2022-11-17~)
+            // confirmationNumber: order.confirmationNumber,
             orderNumber: order.orderNumber,
             price: order.price,
             priceCurrency: order.priceCurrency,
@@ -190,7 +197,10 @@ function placeOrder(params) {
             task: repos.task
         });
         // 潜在アクション
-        yield onPlaceOrder(params)(repos);
+        yield onPlaceOrder({
+            object: order,
+            potentialActions: params.potentialActions
+        })(repos);
     });
 }
 exports.placeOrder = placeOrder;
@@ -218,7 +228,7 @@ function onPlaceOrder(params) {
                     numberOfTried: 0,
                     executionResults: [],
                     // data: potentialActions.sendOrder
-                    data: Object.assign({ project: potentialActions.sendOrder.project, object: potentialActions.sendOrder.object }, (potentialActions.sendOrder.potentialActions !== undefined)
+                    data: Object.assign({ project: potentialActions.sendOrder.project, object: Object.assign(Object.assign({}, potentialActions.sendOrder.object), { confirmationNumber: params.object.confirmationNumber }) }, (potentialActions.sendOrder.potentialActions !== undefined)
                         ? { potentialActions: potentialActions.sendOrder.potentialActions }
                         : undefined)
                 };

package/lib/chevre/service/order/returnOrder.js

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

package/lib/chevre/service/order/sendOrder.js

@@ -42,12 +42,14 @@ function sendOrder(params) {
             }
             // SendOrderアクションを作成する
             // minimizeする(2022-04-18~)
+            const maskedCustomer = (0, order_1.createMaskedCustomer)(order);
             const simpleOrder = {
                 // project: order.project,
                 typeOf: order.typeOf,
                 seller: order.seller,
-                customer: (0, order_1.createMaskedCustomer)(order),
-                confirmationNumber: order.confirmationNumber,
+                customer: { typeOf: maskedCustomer.typeOf, id: maskedCustomer.id, name: maskedCustomer.name },
+                // IOrderへ移行(2022-11-17~)
+                // confirmationNumber: order.confirmationNumber,
                 orderNumber: order.orderNumber,
                 price: order.price,
                 priceCurrency: order.priceCurrency,

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,

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

@@ -19,13 +19,14 @@ function createSendEmailMessageActions(params) {
         // 注文配送メール送信設定
         const sendEmailMessageActions = [];
         const project = params.transaction.project;
+        const maskedCustomer = (0, order_1.createMaskedCustomer)(params.order);
         const sendActionPurpose = {
-            // project: params.order.project,
             typeOf: params.order.typeOf,
             seller: params.order.seller,
             // mask
-            customer: (0, order_1.createMaskedCustomer)(params.order),
-            confirmationNumber: params.order.confirmationNumber,
+            customer: { typeOf: maskedCustomer.typeOf, id: maskedCustomer.id, name: maskedCustomer.name },
+            // IOrderへ移行(2022-11-17~)
+            // confirmationNumber: params.order.confirmationNumber,
             orderNumber: params.order.orderNumber,
             price: params.order.price,
             priceCurrency: params.order.priceCurrency,