@chevre/domain 21.6.0-alpha.6 → 21.6.0-alpha.8

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

@@ -72,11 +72,17 @@ function createStartParams(params) {
         : undefined), (Array.isArray((_v = params.object.paymentMethod) === null || _v === void 0 ? void 0 : _v.movieTickets))
         ? { movieTickets: (_w = params.object.paymentMethod) === null || _w === void 0 ? void 0 : _w.movieTickets }
         : undefined);
+    const serviceOutput = (typeof creditCardAsPaymentServiceOutputCurrency === 'string')
+        ? {
+            amount: {
+                currency: creditCardAsPaymentServiceOutputCurrency,
+                value: paymentMethod.amount // 通貨区分としての金額
+            }
+        }
+        : undefined;
     const object = Object.assign({ 
         // パラメータから必要なもののみ取り込む
-        accountId: (typeof accountId === 'string') ? accountId : '', paymentMethodId: params.transactionNumber, typeOf: params.paymentServiceType, id: paymentServiceId, onPaymentStatusChanged: { informPayment: informPaymentParams }, paymentMethod }, (typeof creditCardAsPaymentServiceOutputCurrency === 'string')
-        ? { serviceOutput: { amount: { currency: creditCardAsPaymentServiceOutputCurrency } } }
-        : undefined);
+        accountId: (typeof accountId === 'string') ? accountId : '', paymentMethodId: params.transactionNumber, typeOf: params.paymentServiceType, id: paymentServiceId, onPaymentStatusChanged: { informPayment: informPaymentParams }, paymentMethod }, (typeof serviceOutput !== undefined) ? { serviceOutput } : undefined);
     return Object.assign({ project: { typeOf: factory.organizationType.Project, id: params.project.id }, transactionNumber: params.transactionNumber, typeOf: factory.assetTransactionType.Pay, agent: params.agent, recipient: params.recipient, object, expires: params.expires }, (typeof ((_x = params.location) === null || _x === void 0 ? void 0 : _x.typeOf) === 'string')
         ? { location: params.location }
         : undefined);

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

@@ -9,17 +9,6 @@ function createPayActions(params) {
     const payObject = createPayObject(params);
     const informPaymentActions = createInformPaymentActions(params);
     if (payObject !== undefined) {
-        // const maskedCustomer = createMaskedCustomer(params.order);
-        // const simpleOrder: factory.order.ISimpleOrder = {
-        //     typeOf: params.order.typeOf,
-        //     seller: params.order.seller,
-        //     // mask
-        //     customer: { typeOf: maskedCustomer.typeOf, id: maskedCustomer.id, name: maskedCustomer.name },
-        //     orderNumber: params.order.orderNumber,
-        //     price: params.order.price,
-        //     priceCurrency: params.order.priceCurrency,
-        //     orderDate: params.order.orderDate
-        // };
         const payPurpose = {
             typeOf: params.order.typeOf,
             confirmationNumber: params.order.confirmationNumber,
@@ -28,10 +17,7 @@ function createPayActions(params) {
         const payAction = Object.assign({ project: params.transaction.project, typeOf: factory.actionType.PayAction, object: [payObject], agent: params.transaction.project, potentialActions: {
                 add2report: true,
                 informPayment: informPaymentActions
-            }, 
-            // optimize(2023-03-20~)
-            // purpose: simpleOrder,
-            purpose: payPurpose, recipient: {
+            }, purpose: payPurpose, recipient: {
                 id: params.transaction.recipient.id,
                 name: params.transaction.recipient.name,
                 typeOf: params.transaction.recipient.typeOf
@@ -42,6 +28,7 @@ function createPayActions(params) {
     }
     return payActions;
 }
+// tslint:disable-next-line:cyclomatic-complexity
 function createPayObject(params) {
     var _a;
     const transaction = params.transaction;
@@ -81,15 +68,11 @@ function createPayObject(params) {
             };
             break;
         case factory.service.paymentService.PaymentServiceType.CreditCard:
-            payObject = {
-                typeOf: transaction.object.typeOf,
-                id: (typeof transaction.object.id === 'string') ? transaction.object.id : '',
-                paymentMethod: Object.assign({ additionalProperty: (Array.isArray(additionalProperty)) ? additionalProperty : [], name: paymentMethodName, paymentMethodId: paymentMethodId, totalPaymentDue: {
+            payObject = Object.assign({ typeOf: transaction.object.typeOf, id: (typeof transaction.object.id === 'string') ? transaction.object.id : '', paymentMethod: Object.assign({ additionalProperty: (Array.isArray(additionalProperty)) ? additionalProperty : [], name: paymentMethodName, paymentMethodId: paymentMethodId, totalPaymentDue: {
                         typeOf: 'MonetaryAmount',
                         currency: factory.priceCurrency.JPY,
                         value: Number(paymentMethod === null || paymentMethod === void 0 ? void 0 : paymentMethod.amount)
-                    }, typeOf: paymentMethodType }, (typeof (paymentMethod === null || paymentMethod === void 0 ? void 0 : paymentMethod.accountId) === 'string') ? { accountId: paymentMethod.accountId } : undefined)
-            };
+                    }, typeOf: paymentMethodType }, (typeof (paymentMethod === null || paymentMethod === void 0 ? void 0 : paymentMethod.accountId) === 'string') ? { accountId: paymentMethod.accountId } : undefined) }, (paymentServiceOutput !== undefined) ? { serviceOutput: paymentServiceOutput } : undefined);
             break;
         case factory.service.paymentService.PaymentServiceType.MovieTicket:
             payObject = Object.assign({ typeOf: transaction.object.typeOf, id: (typeof transaction.object.id === 'string') ? transaction.object.id : '', paymentMethod: {
@@ -123,7 +106,12 @@ function createPayObjectServiceOutput(params) {
         case factory.service.paymentService.PaymentServiceType.CreditCard:
             // CreditCardIFのカード通貨区分を追加(2023-08-07~)
             const creditCardAsPaymentServiceOutput = (typeof ((_b = (_a = transaction.object.serviceOutput) === null || _a === void 0 ? void 0 : _a.amount) === null || _b === void 0 ? void 0 : _b.currency) === 'string')
-                ? { amount: { currency: transaction.object.serviceOutput.amount.currency } }
+                ? {
+                    amount: {
+                        currency: transaction.object.serviceOutput.amount.currency,
+                        value: transaction.object.paymentMethod.amount
+                    }
+                }
                 : undefined;
             if (creditCardAsPaymentServiceOutput !== undefined) {
                 paymentServiceOutput = creditCardAsPaymentServiceOutput;

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

@@ -27,10 +27,12 @@ function onOrderStatusChanged(params) {
         const maskedCustomer = (0, order_1.createMaskedCustomer)(params.order, { noProfile: true });
         const simpleOrder = {
             typeOf: params.order.typeOf,
-            seller: params.order.seller,
+            seller: {
+                id: params.order.seller.id,
+                typeOf: params.order.seller.typeOf,
+                name: params.order.seller.name
+            },
             customer: { typeOf: maskedCustomer.typeOf, id: maskedCustomer.id },
-            // 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/placeOrder.js

@@ -107,12 +107,13 @@ function placeOrderWithoutTransaction(params) {
         // アクションを作成する(2022-04-11~)
         const maskedCustomer = (0, order_1.createMaskedCustomer)(order, { noProfile: true });
         const simpleOrder = {
-            // project: order.project,
             typeOf: order.typeOf,
-            seller: order.seller,
+            seller: {
+                id: order.seller.id,
+                typeOf: order.seller.typeOf,
+                name: order.seller.name
+            },
             customer: { typeOf: maskedCustomer.typeOf, id: maskedCustomer.id },
-            // IOrderへ移行(2022-11-17~)
-            // confirmationNumber: order.confirmationNumber,
             orderNumber: order.orderNumber,
             price: order.price,
             priceCurrency: order.priceCurrency,
@@ -171,7 +172,11 @@ function placeOrder(params) {
         const maskedCustomer = (0, order_1.createMaskedCustomer)(order, { noProfile: true });
         const simpleOrder = {
             typeOf: order.typeOf,
-            seller: order.seller,
+            seller: {
+                id: order.seller.id,
+                typeOf: order.seller.typeOf,
+                name: order.seller.name
+            },
             customer: { typeOf: maskedCustomer.typeOf, id: maskedCustomer.id },
             orderNumber: order.orderNumber,
             price: order.price,

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

@@ -49,7 +49,11 @@ function returnOrder(params) {
         }
         const simpleOrder = {
             typeOf: order.typeOf,
-            seller: order.seller,
+            seller: {
+                id: order.seller.id,
+                typeOf: order.seller.typeOf,
+                name: order.seller.name
+            },
             customer: (0, order_1.createMaskedCustomer)(order, { noProfile: true }),
             orderNumber: order.orderNumber,
             price: order.price,

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

@@ -48,7 +48,11 @@ function sendOrder(params) {
             const maskedCustomer = (0, order_1.createMaskedCustomer)(order, { noProfile: true });
             const simpleOrder = {
                 typeOf: order.typeOf,
-                seller: order.seller,
+                seller: {
+                    id: order.seller.id,
+                    typeOf: order.seller.typeOf,
+                    name: order.seller.name
+                },
                 customer: { typeOf: maskedCustomer.typeOf, id: maskedCustomer.id },
                 orderNumber: order.orderNumber,
                 price: order.price,

package/lib/chevre/service/payment/any/factory.js

@@ -86,9 +86,8 @@ function createAuthorizeResult(params) {
     if (typeof (totalPaymentDue === null || totalPaymentDue === void 0 ? void 0 : totalPaymentDue.typeOf) !== 'string') {
         throw new factory.errors.ServiceUnavailable('payTransaction.object.paymentMethod.totalPaymentDue undefined');
     }
-    const creditCardAsPaymentServiceOutputCurrency = (_c = (_b = payTransactionObject.serviceOutput) === null || _b === void 0 ? void 0 : _b.amount) === null || _c === void 0 ? void 0 : _c.currency;
-    const issuedThrough = Object.assign({ typeOf: payTransactionObject.typeOf, id: (typeof payTransactionObject.id === 'string') ? payTransactionObject.id : '' }, (typeof creditCardAsPaymentServiceOutputCurrency === 'string')
-        ? { serviceOutput: { amount: { currency: creditCardAsPaymentServiceOutputCurrency } } }
+    const issuedThrough = Object.assign({ typeOf: payTransactionObject.typeOf, id: (typeof payTransactionObject.id === 'string') ? payTransactionObject.id : '' }, (typeof ((_c = (_b = payTransactionObject.serviceOutput) === null || _b === void 0 ? void 0 : _b.amount) === null || _c === void 0 ? void 0 : _c.currency) === 'string')
+        ? { serviceOutput: payTransactionObject.serviceOutput }
         : undefined);
     return {
         accountId: (typeof ((_d = payTransactionObject.paymentMethod) === null || _d === void 0 ? void 0 : _d.accountId) === 'string')

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

@@ -1,2 +1,2 @@
 import * as factory from '../../../factory';
-export declare function createStartParams(params: factory.transaction.placeOrder.IStartParamsWithoutDetail, passport: factory.waiter.passport.IPassport | undefined, seller: Pick<factory.seller.ISeller, 'id' | 'name' | 'typeOf' | 'project'>, broker?: factory.order.IBroker): factory.transaction.placeOrder.IStartParams;
+export declare function createStartParams(params: factory.transaction.placeOrder.IStartParamsWithoutDetail, passport: factory.waiter.passport.IPassport | undefined, seller: Pick<factory.seller.ISeller, 'id' | 'name' | 'typeOf' | 'project' | 'additionalProperty'>, broker?: factory.order.IBroker): factory.transaction.placeOrder.IStartParams;

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

@@ -20,15 +20,12 @@ function createStartParams(params, passport, seller, broker) {
         seller: {
             id: seller.id,
             name: seller.name,
-            typeOf: seller.typeOf
+            typeOf: seller.typeOf,
+            // 追加特性を追加(2023-08-08~)
+            additionalProperty: (Array.isArray(seller.additionalProperty)) ? seller.additionalProperty : []
         },
         object: transactionObject,
-        // 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

@@ -19,6 +19,20 @@ function createGivePointAwardActions(params) {
         // インセンティブ付与アクションの指定があればそちらを反映
         const givePointAwardParams = (_a = params.transaction.object.potentialActions) === null || _a === void 0 ? void 0 : _a.givePointAward;
         if (Array.isArray(givePointAwardParams)) {
+            const givePointAwardPurpose = {
+                typeOf: params.order.typeOf,
+                seller: {
+                    id: params.order.seller.id,
+                    typeOf: params.order.seller.typeOf,
+                    name: params.order.seller.name
+                },
+                // mask
+                customer: (0, order_1.createMaskedCustomer)(params.order, { noProfile: true }),
+                orderNumber: params.order.orderNumber,
+                price: params.order.price,
+                priceCurrency: params.order.priceCurrency,
+                orderDate: params.order.orderDate
+            };
             // メンバーシップごとに、特典を確認してインセンティブ付与
             givePointAwardParams.forEach((givePointAwardParam) => {
                 var _a, _b, _c, _d, _e, _f, _g, _h;
@@ -31,8 +45,6 @@ function createGivePointAwardActions(params) {
                         project: params.transaction.project,
                         typeOf: factory.actionType.GiveAction,
                         agent: params.transaction.project,
-                        // order.customerからrecipientを生成する(2022-05-25~)
-                        // recipient: params.transaction.agent,
                         recipient: {
                             typeOf: params.order.customer.typeOf,
                             id: params.order.customer.id,
@@ -42,19 +54,7 @@ function createGivePointAwardActions(params) {
                                 accountNumber: accountNumber,
                                 issuedThrough: { id: String((_h = (_g = (_f = givePointAwardParam.object) === null || _f === void 0 ? void 0 : _f.toLocation) === null || _g === void 0 ? void 0 : _g.issuedThrough) === null || _h === void 0 ? void 0 : _h.id) }
                             }, description: (typeof description === 'string') ? description : '' }, (typeof pointAwardIdentifier === 'string') ? { identifier: pointAwardIdentifier } : undefined),
-                        purpose: {
-                            // project: params.order.project,
-                            typeOf: params.order.typeOf,
-                            seller: params.order.seller,
-                            // mask
-                            customer: (0, order_1.createMaskedCustomer)(params.order, { noProfile: true }),
-                            // IOrderへ移行(2022-11-17~)
-                            // confirmationNumber: params.order.confirmationNumber,
-                            orderNumber: params.order.orderNumber,
-                            price: params.order.price,
-                            priceCurrency: params.order.priceCurrency,
-                            orderDate: params.order.orderDate
-                        }
+                        purpose: givePointAwardPurpose
                     });
                 }
             });

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

@@ -19,6 +19,20 @@ function createMoneyTransferActions(params) {
             .filter((a) => a.actionStatus === factory.actionStatusType.CompletedActionStatus)
             .filter((a) => a.object.typeOf === factory.offerType.Offer)
             .filter((a) => { var _a; return ((_a = a.object.itemOffered) === null || _a === void 0 ? void 0 : _a.typeOf) === factory.actionType.MoneyTransfer; });
+        const moneyTransferPurpose = {
+            typeOf: params.order.typeOf,
+            seller: {
+                id: params.order.seller.id,
+                typeOf: params.order.seller.typeOf,
+                name: params.order.seller.name
+            },
+            // mask
+            customer: (0, order_1.createMaskedCustomer)(params.order, { noProfile: true }),
+            orderNumber: params.order.orderNumber,
+            price: params.order.price,
+            priceCurrency: params.order.priceCurrency,
+            orderDate: params.order.orderDate
+        };
         // const paymentMethod = params.order.paymentMethods[0];
         authorizeMoneyTransferActions.forEach((a) => {
             var _a;
@@ -33,49 +47,8 @@ function createMoneyTransferActions(params) {
                         transactionNumber: pendingTransaction.transactionNumber,
                         typeOf: factory.assetTransactionType.MoneyTransfer
                     },
-                    // agent: Projectに統一(2022-05-16~)
                     agent: params.transaction.project,
-                    // agent: params.transaction.agent,
-                    // ↓recipient廃止(2022-05-16~)
-                    // recipient: a.recipient,
-                    // amount: {
-                    //     typeOf: 'MonetaryAmount',
-                    //     currency: pendingTransaction.object.amount.currency,
-                    //     value: pendingTransaction.object.amount.value
-                    // },
-                    // fromLocation: (paymentMethod !== undefined)
-                    //     ? {
-                    //         accountId: paymentMethod.accountId,
-                    //         typeOf: paymentMethod.typeOf,
-                    //         name: paymentMethod.name,
-                    //         paymentMethodId: paymentMethod.paymentMethodId,
-                    //         additionalProperty: paymentMethod.additionalProperty
-                    //     }
-                    //     : {
-                    //         typeOf: params.transaction.agent.typeOf,
-                    //         id: params.transaction.agent.id,
-                    //         name: <string>params.transaction.agent.name
-                    //     },
-                    // toLocation: {
-                    //     typeOf: pendingTransaction.object.toLocation.typeOf,
-                    //     identifier: pendingTransaction.object.toLocation.identifier
-                    // },
-                    purpose: {
-                        // project: params.order.project,
-                        typeOf: params.order.typeOf,
-                        seller: params.order.seller,
-                        // mask
-                        customer: (0, order_1.createMaskedCustomer)(params.order, { noProfile: true }),
-                        // IOrderへ移行(2022-11-17~)
-                        // confirmationNumber: params.order.confirmationNumber,
-                        orderNumber: params.order.orderNumber,
-                        price: params.order.price,
-                        priceCurrency: params.order.priceCurrency,
-                        orderDate: params.order.orderDate
-                    }
-                    // ...(typeof pendingTransaction.object.description === 'string')
-                    //     ? { description: pendingTransaction.object.description }
-                    //     : {}
+                    purpose: moneyTransferPurpose
                 });
             }
         });

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

@@ -23,6 +23,20 @@ function createRegisterServiceActions(params) {
             && a.object.length > 0
             && a.object[0].typeOf === factory.offerType.Offer
             && availableProductTypes_1.availableProductTypes.indexOf(a.object[0].itemOffered.typeOf) >= 0);
+        const registerServicePurpose = {
+            typeOf: params.order.typeOf,
+            seller: {
+                id: params.order.seller.id,
+                typeOf: params.order.seller.typeOf,
+                name: params.order.seller.name
+            },
+            // mask
+            customer: (0, order_1.createMaskedCustomer)(params.order, { noProfile: true }),
+            orderNumber: params.order.orderNumber,
+            price: params.order.price,
+            priceCurrency: params.order.priceCurrency,
+            orderDate: params.order.orderDate
+        };
         authorizeProductOfferActions.forEach((a) => {
             var _a;
             const actionResult = a.result;
@@ -42,22 +56,8 @@ function createRegisterServiceActions(params) {
                     project: params.transaction.project,
                     typeOf: factory.actionType.ConfirmAction,
                     object: registerServiceObject,
-                    // agent: Projectに統一(2022-05-16~)
                     agent: params.transaction.project,
-                    // agent: params.transaction.agent,
-                    purpose: {
-                        // project: params.order.project,
-                        typeOf: params.order.typeOf,
-                        seller: params.order.seller,
-                        // mask
-                        customer: (0, order_1.createMaskedCustomer)(params.order, { noProfile: true }),
-                        // IOrderへ移行(2022-11-17~)
-                        // confirmationNumber: params.order.confirmationNumber,
-                        orderNumber: params.order.orderNumber,
-                        price: params.order.price,
-                        priceCurrency: params.order.priceCurrency,
-                        orderDate: params.order.orderDate
-                    },
+                    purpose: registerServicePurpose,
                     potentialActions: Object.assign({}, (orderProgramMembershipTask !== undefined)
                         ? { orderProgramMembership: [orderProgramMembershipTask] }
                         : undefined)

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

@@ -22,11 +22,13 @@ function createSendEmailMessageActions(params) {
         const maskedCustomer = (0, order_1.createMaskedCustomer)(params.order, { noProfile: true });
         const sendActionPurpose = {
             typeOf: params.order.typeOf,
-            seller: params.order.seller,
+            seller: {
+                id: params.order.seller.id,
+                typeOf: params.order.seller.typeOf,
+                name: params.order.seller.name
+            },
             // mask
             customer: { typeOf: maskedCustomer.typeOf, id: maskedCustomer.id },
-            // 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.js

@@ -30,13 +30,14 @@ function createPotentialActions(params) {
         const sendEmailMessageActions = yield (0, sendEmailMessage_1.createSendEmailMessageActions)(params);
         const maskedCustomer = (0, order_1.createMaskedCustomer)(params.order, { noProfile: true });
         const simpleOrder = {
-            // project: params.order.project,
             typeOf: params.order.typeOf,
-            seller: params.order.seller,
+            seller: {
+                id: params.order.seller.id,
+                typeOf: params.order.seller.typeOf,
+                name: params.order.seller.name
+            },
             // mask
             customer: { typeOf: maskedCustomer.typeOf, id: maskedCustomer.id },
-            // 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/result.js

@@ -34,11 +34,11 @@ function createSeller(params) {
     var _a;
     const seller = params.transaction.seller;
     return {
-        // 最適化(2022-11-15~)
-        // project: { typeOf: params.transaction.project.typeOf, id: params.transaction.project.id },
         id: seller.id,
         name: (typeof seller.name === 'string') ? seller.name : String((_a = seller.name) === null || _a === void 0 ? void 0 : _a.ja),
-        typeOf: seller.typeOf
+        typeOf: seller.typeOf,
+        // 追加特性を追加(2023-08-08~)
+        additionalProperty: (Array.isArray(seller.additionalProperty)) ? seller.additionalProperty : []
     };
 }
 function createCustomer(params) {

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

@@ -33,7 +33,7 @@ function start(params) {
             limit: 1,
             page: 1,
             id: { $eq: params.seller.id }
-        }, ['name', 'project', 'typeOf', 'makesOffer'], []);
+        }, ['name', 'project', 'typeOf', 'makesOffer', 'additionalProperty'], []);
         const seller = sellers.shift();
         if (seller === undefined) {
             throw new factory.errors.NotFound(factory.organizationType.Corporation);

package/lib/chevre/service/transaction/returnOrder/potentialActions/returnMoneyTransfer.js

@@ -20,11 +20,13 @@ function createReturnMoneyTransferActions(params) {
         const maskedCustomer = (0, order_1.createMaskedCustomer)(order, { noProfile: true });
         const purpose = {
             typeOf: order.typeOf,
-            seller: order.seller,
+            seller: {
+                id: order.seller.id,
+                typeOf: order.seller.typeOf,
+                name: order.seller.name
+            },
             // mask
             customer: { typeOf: maskedCustomer.typeOf, id: maskedCustomer.id },
-            // IOrderへ移行(2022-11-17~)
-            // confirmationNumber: order.confirmationNumber,
             orderNumber: order.orderNumber,
             price: order.price,
             priceCurrency: order.priceCurrency,

package/lib/chevre/service/transaction/returnOrder/potentialActions/returnPaymentMethod.js

@@ -40,13 +40,14 @@ function createReturnPaymentMethodPotentialActions(params) {
                 email: emailCustomization
             });
             const sendActionPurpose = {
-                // project: order.project,
                 typeOf: order.typeOf,
-                seller: order.seller,
+                seller: {
+                    id: order.seller.id,
+                    typeOf: order.seller.typeOf,
+                    name: order.seller.name
+                },
                 // mask
                 customer: (0, order_1.createMaskedCustomer)(order, { noProfile: true }),
-                // IOrderへ移行(2022-11-17~)
-                // confirmationNumber: order.confirmationNumber,
                 orderNumber: order.orderNumber,
                 price: order.price,
                 priceCurrency: order.priceCurrency,
@@ -75,6 +76,20 @@ function createReturnPaymentMethodActions(params) {
     return __awaiter(this, void 0, void 0, function* () {
         const order = params.order;
         const returnPaymentMethodActions = [];
+        const returnPaymentMethodPurpose = {
+            typeOf: order.typeOf,
+            seller: {
+                id: order.seller.id,
+                typeOf: order.seller.typeOf,
+                name: order.seller.name
+            },
+            // mask
+            customer: (0, order_1.createMaskedCustomer)(order, { noProfile: true }),
+            orderNumber: order.orderNumber,
+            price: order.price,
+            priceCurrency: order.priceCurrency,
+            orderDate: order.orderDate
+        };
         // MovieTicket決済以外について返品ポリシーのreturnFeesを適用する(2022-08-10~)
         const returnFees = params.transaction.object.returnPolicy.returnFees;
         // ReturnFeesCustomerResponsibilityであれば返金はなし、それ以外は返金する
@@ -104,19 +119,7 @@ function createReturnPaymentMethodActions(params) {
                             id: order.customer.id,
                             name: String(order.customer.name)
                         },
-                        purpose: {
-                            // project: order.project,
-                            typeOf: order.typeOf,
-                            seller: order.seller,
-                            // mask
-                            customer: (0, order_1.createMaskedCustomer)(order, { noProfile: true }),
-                            // IOrderへ移行(2022-11-17~)
-                            // confirmationNumber: order.confirmationNumber,
-                            orderNumber: order.orderNumber,
-                            price: order.price,
-                            priceCurrency: order.priceCurrency,
-                            orderDate: order.orderDate
-                        },
+                        purpose: returnPaymentMethodPurpose,
                         potentialActions: potentialActionsOnRefund
                     };
                 }))));
@@ -184,13 +187,14 @@ function createReturnPaymentMethodIssuedThroughMovieTicketActions(params) {
                     name: String(order.customer.name)
                 },
                 purpose: {
-                    // project: order.project,
                     typeOf: order.typeOf,
-                    seller: order.seller,
+                    seller: {
+                        id: order.seller.id,
+                        typeOf: order.seller.typeOf,
+                        name: order.seller.name
+                    },
                     // mask
                     customer: (0, order_1.createMaskedCustomer)(order, { noProfile: true }),
-                    // IOrderへ移行(2022-11-17~)
-                    // confirmationNumber: order.confirmationNumber,
                     orderNumber: order.orderNumber,
                     price: order.price,
                     priceCurrency: order.priceCurrency,

package/lib/chevre/service/transaction/returnOrder/potentialActions/returnPointAward.js

@@ -51,11 +51,13 @@ function createReturnPointAwardActions(params) {
         const maskedCustomer = (0, order_1.createMaskedCustomer)(order, { noProfile: true });
         const purpose = {
             typeOf: order.typeOf,
-            seller: order.seller,
+            seller: {
+                id: order.seller.id,
+                typeOf: order.seller.typeOf,
+                name: order.seller.name
+            },
             // mask
             customer: { typeOf: maskedCustomer.typeOf, id: maskedCustomer.id },
-            // IOrderへ移行(2022-11-17~)
-            // confirmationNumber: order.confirmationNumber,
             orderNumber: order.orderNumber,
             price: order.price,
             priceCurrency: order.priceCurrency,

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

@@ -18,13 +18,14 @@ function createSendEmailMessaegActionsOnReturn(params) {
     return __awaiter(this, void 0, void 0, function* () {
         const order = params.order;
         const sendActionPurpose = {
-            // project: order.project,
             typeOf: order.typeOf,
-            seller: order.seller,
+            seller: {
+                id: order.seller.id,
+                typeOf: order.seller.typeOf,
+                name: order.seller.name
+            },
             // mask
             customer: (0, order_1.createMaskedCustomer)(order, { noProfile: true }),
-            // IOrderへ移行(2022-11-17~)
-            // confirmationNumber: order.confirmationNumber,
             orderNumber: order.orderNumber,
             price: order.price,
             priceCurrency: order.priceCurrency,

package/lib/chevre/service/transaction/returnOrder/potentialActions.js

@@ -43,24 +43,28 @@ function createPotentialActions(params) {
                 returnPointAward: returnPointAwardActions,
                 sendEmailMessage: sendEmailMessaegActionsOnReturn
             };
+            const returnOrderObject = {
+                typeOf: order.typeOf,
+                seller: {
+                    id: order.seller.id,
+                    typeOf: order.seller.typeOf,
+                    name: order.seller.name
+                },
+                // mask
+                customer: (0, order_1.createMaskedCustomer)(order, { noProfile: true }),
+                // confirmationNumber: order.confirmationNumber,
+                orderNumber: order.orderNumber,
+                price: order.price,
+                priceCurrency: order.priceCurrency,
+                orderDate: order.orderDate,
+                dateReturned: params.dateReturned
+            };
             // recipientを最低限の情報に
             const recipient = Object.assign({ id: order.seller.id, typeOf: order.seller.typeOf }, (order.seller.name !== undefined) ? { name: order.seller.name } : undefined);
             return {
                 project: order.project,
                 typeOf: factory.actionType.ReturnAction,
-                object: {
-                    project: order.project,
-                    typeOf: order.typeOf,
-                    seller: order.seller,
-                    // mask
-                    customer: (0, order_1.createMaskedCustomer)(order, { noProfile: true }),
-                    confirmationNumber: order.confirmationNumber,
-                    orderNumber: order.orderNumber,
-                    price: order.price,
-                    priceCurrency: order.priceCurrency,
-                    orderDate: order.orderDate,
-                    dateReturned: params.dateReturned
-                },
+                object: returnOrderObject,
                 // ↓agentは注文のreturnerに反映される
                 agent: {
                     typeOf: params.transaction.agent.typeOf,

package/package.json

@@ -9,8 +9,8 @@
     }
   ],
   "dependencies": {
-    "@chevre/factory": "4.324.0-alpha.2",
-    "@cinerino/sdk": "3.162.2",
+    "@chevre/factory": "4.324.0-alpha.4",
+    "@cinerino/sdk": "3.162.3",
     "@motionpicture/coa-service": "9.2.0",
     "@motionpicture/gmo-service": "5.2.0",
     "@sendgrid/mail": "6.4.0",
@@ -117,5 +117,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build && npm test && npm run doc"
   },
-  "version": "21.6.0-alpha.6"
+  "version": "21.6.0-alpha.8"
 }