@chevre/domain 21.28.0-alpha.4 → 21.28.0-alpha.5

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

@@ -63,19 +63,11 @@ function createDeleteTransactionTasksByAgentId(params) {
                             numberOfTried: 0,
                             executionResults: [],
                             data: {
-                                object: {
-                                    specifyingMethod: factory.task.deleteTransaction.SpecifyingMethod.Id,
-                                    endDate: transaction.endDate,
-                                    id: transaction.id,
-                                    object: Object.assign(Object.assign({}, (typeof transaction.object.confirmationNumber === 'string')
+                                object: Object.assign({ specifyingMethod: factory.task.deleteTransaction.SpecifyingMethod.Id, id: transaction.id, object: Object.assign(Object.assign({}, (typeof transaction.object.confirmationNumber === 'string')
                                         ? { confirmationNumber: transaction.object.confirmationNumber }
                                         : undefined), (typeof transaction.object.orderNumber === 'string')
                                         ? { orderNumber: transaction.object.orderNumber }
-                                        : undefined),
-                                    project: transaction.project,
-                                    startDate: transaction.startDate,
-                                    typeOf: transaction.typeOf
-                                }
+                                        : undefined), project: transaction.project, startDate: transaction.startDate, typeOf: transaction.typeOf }, (transaction.endDate !== undefined) ? { endDate: transaction.endDate } : undefined)
                             }
                         };
                     });
@@ -91,17 +83,9 @@ function createDeleteTransactionTasksByAgentId(params) {
                             numberOfTried: 0,
                             executionResults: [],
                             data: {
-                                object: {
-                                    specifyingMethod: factory.task.deleteTransaction.SpecifyingMethod.Id,
-                                    endDate: transaction.endDate,
-                                    id: transaction.id,
-                                    object: {
+                                object: Object.assign({ specifyingMethod: factory.task.deleteTransaction.SpecifyingMethod.Id, id: transaction.id, object: {
                                         order: transaction.object.order
-                                    },
-                                    project: transaction.project,
-                                    startDate: transaction.startDate,
-                                    typeOf: transaction.typeOf
-                                }
+                                    }, project: transaction.project, startDate: transaction.startDate, typeOf: transaction.typeOf }, (transaction.endDate !== undefined) ? { endDate: transaction.endDate } : undefined)
                             }
                         };
                     });
@@ -117,17 +101,9 @@ function createDeleteTransactionTasksByAgentId(params) {
                             numberOfTried: 0,
                             executionResults: [],
                             data: {
-                                object: {
-                                    specifyingMethod: factory.task.deleteTransaction.SpecifyingMethod.Id,
-                                    endDate: transaction.endDate,
-                                    id: transaction.id,
-                                    object: Object.assign({}, (transaction.object.pendingTransaction !== undefined)
+                                object: Object.assign({ specifyingMethod: factory.task.deleteTransaction.SpecifyingMethod.Id, id: transaction.id, object: Object.assign({}, (transaction.object.pendingTransaction !== undefined)
                                         ? { pendingTransaction: transaction.object.pendingTransaction }
-                                        : undefined),
-                                    project: transaction.project,
-                                    startDate: transaction.startDate,
-                                    typeOf: transaction.typeOf
-                                }
+                                        : undefined), project: transaction.project, startDate: transaction.startDate, typeOf: transaction.typeOf }, (transaction.endDate !== undefined) ? { endDate: transaction.endDate } : undefined)
                             }
                         };
                     });

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

@@ -36,17 +36,9 @@ function createTasks(params) {
         numberOfTried: 0,
         executionResults: [],
         data: {
-            object: {
-                specifyingMethod: factory.task.deleteTransaction.SpecifyingMethod.Id,
-                endDate: transaction.endDate,
-                id: transaction.id,
-                object: Object.assign({}, (transaction.object.pendingTransaction !== undefined)
+            object: Object.assign({ specifyingMethod: factory.task.deleteTransaction.SpecifyingMethod.Id, id: transaction.id, object: Object.assign({}, (transaction.object.pendingTransaction !== undefined)
                     ? { pendingTransaction: transaction.object.pendingTransaction }
-                    : undefined),
-                project: transaction.project,
-                startDate: transaction.startDate,
-                typeOf: transaction.typeOf
-            }
+                    : undefined), project: transaction.project, startDate: transaction.startDate, typeOf: transaction.typeOf }, (transaction.endDate !== undefined) ? { endDate: transaction.endDate } : undefined)
         }
     };
     taskAttributes.push(deleteTransactionTask);

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

@@ -73,16 +73,11 @@ function authorizePaymentCard(params) {
             yield processAuthorizePaymentCard({
                 project: { id: transaction.project.id },
                 agent: { id: transaction.agent.id },
-                object: {
-                    project: { typeOf: transaction.project.typeOf, id: transaction.project.id },
-                    typeOf: factory.offerType.AggregateOffer,
-                    itemOffered: {
+                object: Object.assign({ project: { typeOf: transaction.project.typeOf, id: transaction.project.id }, typeOf: factory.offerType.AggregateOffer, itemOffered: {
                         typeOf: factory.actionType.MoneyTransfer,
-                        amount: {
-                            typeOf: 'MonetaryAmount',
-                            value: transaction.object.amount.value,
-                            currency: transaction.object.amount.currency
-                        },
+                        amount: Object.assign({ typeOf: 'MonetaryAmount', currency: transaction.object.amount.currency }, (typeof transaction.object.amount.value === 'number')
+                            ? { value: transaction.object.amount.value }
+                            : undefined),
                         toLocation: toLocation,
                         object: {
                             pendingTransaction: {
@@ -91,20 +86,13 @@ function authorizePaymentCard(params) {
                                 transactionNumber: ''
                             }
                         }
-                    },
-                    fromLocation: fromLocation,
-                    seller: {
-                        // project: transaction.project,
+                    }, fromLocation: fromLocation, seller: {
                         id: transaction.seller.id,
                         typeOf: transaction.seller.typeOf,
                         name: (typeof transaction.seller.name === 'string')
                             ? transaction.seller.name
                             : String((_a = transaction.seller.name) === null || _a === void 0 ? void 0 : _a.ja)
-                    },
-                    price: 0,
-                    priceCurrency: factory.priceCurrency.JPY,
-                    description: transaction.object.description
-                },
+                    }, price: 0, priceCurrency: factory.priceCurrency.JPY }, (typeof transaction.object.description === 'string') ? { description: transaction.object.description } : undefined),
                 purpose: { typeOf: transaction.typeOf, id: transaction.id }
             })(repos);
         }
@@ -256,11 +244,9 @@ function createAuthorizeMoneyTransferOfferActionAttributes(params) {
             typeOf: factory.offerType.Offer,
             itemOffered: {
                 typeOf: factory.actionType.MoneyTransfer,
-                amount: {
-                    typeOf: 'MonetaryAmount',
-                    currency: params.object.itemOffered.amount.currency,
-                    value: params.object.itemOffered.amount.value
-                },
+                amount: Object.assign({ typeOf: 'MonetaryAmount', currency: params.object.itemOffered.amount.currency }, (typeof params.object.itemOffered.amount.value === 'number')
+                    ? { value: params.object.itemOffered.amount.value }
+                    : undefined),
                 toLocation: params.object.itemOffered.toLocation,
                 object: {
                     pendingTransaction: {

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

@@ -14,15 +14,7 @@ function createTasks(params) {
     const taskRunsAt = params.runsAt;
     const transactionWebhookUrls = (Array.isArray(settings_1.settings.transactionWebhookUrls)) ? settings_1.settings.transactionWebhookUrls : [];
     const triggerWebhookTaskAttributes = transactionWebhookUrls.map((webhookUrl) => {
-        const informObject = {
-            id: transaction.id,
-            typeOf: transaction.typeOf,
-            endDate: transaction.endDate,
-            project: transaction.project,
-            seller: transaction.seller,
-            startDate: transaction.startDate,
-            status: transaction.status
-        };
+        const informObject = Object.assign({ id: transaction.id, typeOf: transaction.typeOf, project: transaction.project, seller: transaction.seller, startDate: transaction.startDate, status: transaction.status }, (transaction.endDate !== undefined) ? { endDate: transaction.endDate } : undefined);
         return {
             project: transaction.project,
             name: factory.taskName.TriggerWebhook,
@@ -71,19 +63,11 @@ function createTasks(params) {
         numberOfTried: 0,
         executionResults: [],
         data: {
-            object: {
-                specifyingMethod: factory.task.deleteTransaction.SpecifyingMethod.Id,
-                endDate: transaction.endDate,
-                id: transaction.id,
-                object: Object.assign(Object.assign({}, (typeof transaction.object.confirmationNumber === 'string')
+            object: Object.assign({ specifyingMethod: factory.task.deleteTransaction.SpecifyingMethod.Id, id: transaction.id, object: Object.assign(Object.assign({}, (typeof transaction.object.confirmationNumber === 'string')
                     ? { confirmationNumber: transaction.object.confirmationNumber }
                     : undefined), (typeof transaction.object.orderNumber === 'string')
                     ? { orderNumber: transaction.object.orderNumber }
-                    : undefined),
-                project: transaction.project,
-                startDate: transaction.startDate,
-                typeOf: transaction.typeOf
-            }
+                    : undefined), project: transaction.project, startDate: transaction.startDate, typeOf: transaction.typeOf }, (transaction.endDate !== undefined) ? { endDate: transaction.endDate } : undefined)
         }
     };
     // 確定取引にも決済承認中止タスクを追加(2023-05-03~)

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

@@ -79,13 +79,11 @@ function confirm(params) {
                 .filter(({ serialNumber }) => typeof serialNumber === 'string' && serialNumbers.includes(serialNumber));
             debug('confirming PlaceOrder...', orderNumber, acceptedOffers.length, 'acceptedOffers found in orderInTransaction.');
         }
-        const { result, eventId, reservationIds } = createResult(Object.assign(Object.assign({}, params), { orderNumber, transaction: transaction, authorizePaymentActions,
+        const { result, eventId, reservationIds } = createResult(Object.assign(Object.assign(Object.assign({}, params), { orderNumber, transaction: transaction, authorizePaymentActions,
             authorizeEventServiceOfferActions,
             authorizeMoneyTansferActions,
             authorizeProductOfferActions,
-            // authorizeActions: completedAuthorizeActions,
-            code,
-            acceptedOffers }));
+            acceptedOffers }), (typeof code === 'string') ? { code } : undefined));
         // デフォルトEメールメッセージを検索
         let emailMessageOnOrderSent;
         if (repos.emailMessage !== undefined) {
@@ -98,14 +96,9 @@ function confirm(params) {
             emailMessageOnOrderSent = searchEmailMessagesResult.shift();
         }
         // ポストアクションを作成
-        const potentialActions = yield (0, potentialActions_1.createPotentialActions)({
-            order: result.order,
+        const potentialActions = yield (0, potentialActions_1.createPotentialActions)(Object.assign(Object.assign({ order: result.order, 
             // order: orderWithAcceptedOffers, // 現時点でcreateEmailMessageでorder.acceptedOffersを使用している(2024-02-06~)
-            potentialActions: params.potentialActions,
-            transaction: transaction,
-            emailMessage: emailMessageOnOrderSent
-            // authorizeActions: completedAuthorizeActions
-        });
+            transaction: transaction }, (params.potentialActions !== undefined) ? { potentialActions: params.potentialActions } : undefined), (emailMessageOnOrderSent !== undefined) ? { emailMessage: emailMessageOnOrderSent } : undefined));
         // ステータス変更
         try {
             yield repos.transaction.confirm({
@@ -126,9 +119,7 @@ function confirm(params) {
             throw error;
         }
         const { order } = result;
-        return Object.assign({ order,
-            eventId,
-            reservationIds }, (typeof code === 'string') ? { code } : undefined);
+        return Object.assign(Object.assign(Object.assign({ order }, (typeof code === 'string') ? { code } : undefined), (typeof eventId === 'string') ? { eventId } : undefined), (Array.isArray(reservationIds)) ? { reservationIds } : undefined);
     });
 }
 exports.confirm = confirm;
@@ -305,15 +296,12 @@ function createResult(params) {
         eventId = reservationIdsResult.eventId;
         reservationIds = reservationIdsResult.reservationIds;
     }
-    return {
+    return Object.assign(Object.assign({ 
         // orderWithAcceptedOffers: order,
         result: Object.assign({ order,
             authorizeActions, numAcceptedOffers: params.acceptedOffers.length, options: {
                 ignoreAccpetedOffersFromResult: true
-            } }, (typeof params.code === 'string') ? { code: params.code } : undefined),
-        eventId,
-        reservationIds
-    };
+            } }, (typeof params.code === 'string') ? { code: params.code } : undefined) }, (typeof eventId === 'string') ? { eventId } : undefined), (Array.isArray(reservationIds)) ? { reservationIds } : undefined);
 }
 function searchAuthorizeActions(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {

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

@@ -36,12 +36,7 @@ function createSendEmailMessageActions(params) {
         const sendEmailMessageOnOrderSentParams = (_e = (_d = (_c = (_b = (_a = params.potentialActions) === null || _a === void 0 ? void 0 : _a.order) === null || _b === void 0 ? void 0 : _b.potentialActions) === null || _c === void 0 ? void 0 : _c.sendOrder) === null || _d === void 0 ? void 0 : _d.potentialActions) === null || _e === void 0 ? void 0 : _e.sendEmailMessage;
         if (Array.isArray(sendEmailMessageOnOrderSentParams)) {
             yield Promise.all(sendEmailMessageOnOrderSentParams.map((s) => __awaiter(this, void 0, void 0, function* () {
-                const emailMessage = yield emailMessageBuilder.createSendOrderMessage({
-                    // project: params.order.project,
-                    order: params.order,
-                    email: s.object,
-                    emailMessage: params.emailMessage
-                });
+                const emailMessage = yield emailMessageBuilder.createSendOrderMessage(Object.assign(Object.assign({ order: params.order }, (s.object !== undefined) ? { email: s.object } : undefined), (params.emailMessage !== undefined) ? { emailMessage: params.emailMessage } : undefined));
                 sendEmailMessageActions.push({
                     project: params.order.project,
                     typeOf: factory.actionType.SendAction,

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

@@ -44,11 +44,7 @@ function reservationOffers2orderedItem(params) {
     if (reservationFor.typeOf === factory.eventType.ScreeningEvent
         && issuedThrough.typeOf === factory.product.ProductType.EventService) {
         const reservationFor4orderedItem = {
-            location: {
-                branchCode: reservationFor.location.branchCode,
-                name: reservationFor.location.name,
-                typeOf: reservationFor.location.typeOf
-            },
+            location: Object.assign({ branchCode: reservationFor.location.branchCode, typeOf: reservationFor.location.typeOf }, (reservationFor.location.name !== undefined) ? { name: reservationFor.location.name } : undefined),
             typeOf: reservationFor.typeOf,
             id: reservationFor.id,
             name: reservationFor.name,

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

@@ -71,19 +71,11 @@ function createPaymentMethods(params) {
         const paymentMethodOfInvoice = Object.assign({ identifier: paymentMethodType }, (typeof paymentMethodAmountCurrencyByAuthorizeAction === 'string') ?
             { amount: { currency: paymentMethodAmountCurrencyByAuthorizeAction } } // CreditCardIFのカード通貨区分を追加(2023-08-15~)
             : undefined);
-        paymentMethods.push({
-            accountId: resultAsInvoice.accountId,
-            additionalProperty: (Array.isArray(resultAsInvoice.additionalProperty)) ? resultAsInvoice.additionalProperty : [],
-            issuedThrough: resultAsInvoice.issuedThrough,
-            name: resultAsInvoice.name,
-            paymentMethodId: resultAsInvoice.paymentMethodId,
-            paymentStatus: resultAsInvoice.paymentStatus,
-            totalPaymentDue: resultAsInvoice.totalPaymentDue,
-            paymentMethod: paymentMethodOfInvoice
-            // ...(USE_ORDER_PAYMENT_METHOD_TYPE_OF) // 完全廃止(2024-01-17~)
-            //     ? { typeOf: paymentMethodType }
-            //     : undefined
-        });
+        paymentMethods.push(Object.assign({ accountId: resultAsInvoice.accountId, additionalProperty: (Array.isArray(resultAsInvoice.additionalProperty)) ? resultAsInvoice.additionalProperty : [], issuedThrough: resultAsInvoice.issuedThrough, name: resultAsInvoice.name, paymentMethodId: resultAsInvoice.paymentMethodId, paymentStatus: resultAsInvoice.paymentStatus, paymentMethod: paymentMethodOfInvoice }, (resultAsInvoice.totalPaymentDue !== undefined) ? { totalPaymentDue: resultAsInvoice.totalPaymentDue } : undefined
+        // ...(USE_ORDER_PAYMENT_METHOD_TYPE_OF) // 完全廃止(2024-01-17~)
+        //     ? { typeOf: paymentMethodType }
+        //     : undefined
+        ));
     });
     // 決済方法から注文金額の計算
     price += params.authorizePaymentActions

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

@@ -22,7 +22,7 @@ function start(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         var _a;
         const { passport, customerType } = yield (0, validation_1.validateWaiterPassport)(params);
-        const { memeberOfPayload, sellerMakesOffer, seller } = yield (0, validateStartRequest_1.validateStartRequest)(Object.assign({ project: { id: params.project.id }, seller: { id: params.seller.id }, clientUser: params.object.clientUser, memberOfToken: params.agent.memberOfToken }, (typeof (passport === null || passport === void 0 ? void 0 : passport.scope) === 'string') ? { customerType } : undefined))(repos);
+        const { memeberOfPayload, sellerMakesOffer, seller } = yield (0, validateStartRequest_1.validateStartRequest)(Object.assign(Object.assign(Object.assign({ project: { id: params.project.id }, seller: { id: params.seller.id } }, (typeof (passport === null || passport === void 0 ? void 0 : passport.scope) === 'string') ? { customerType } : undefined), (params.object.clientUser !== undefined) ? { clientUser: params.object.clientUser } : undefined), (typeof params.agent.memberOfToken === 'string') ? { memberOfToken: params.agent.memberOfToken } : undefined))(repos);
         const expiresInSeconds = (_a = sellerMakesOffer.eligibleTransactionDuration) === null || _a === void 0 ? void 0 : _a.maxValue;
         if (typeof expiresInSeconds !== 'number') {
             throw new factory.errors.NotFound('eligibleTransactionDuration.maxValue');

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

@@ -49,6 +49,7 @@ function verifyMembershipToken(params) {
         return result;
     });
 }
+// tslint:disable-next-line:max-func-body-length
 function validateStartRequest(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         var _a, _b, _c, _d, _e, _f;
@@ -119,10 +120,11 @@ function validateStartRequest(params) {
             const verifySecret = (_d = (_c = iamMember.member.member[0]) === null || _c === void 0 ? void 0 : _c.memberOf) === null || _d === void 0 ? void 0 : _d.secret; // ひとまず1種類のメンバーシップのみ対応
             const verifyIssuer = (_f = (_e = iamMember.member.member[0]) === null || _e === void 0 ? void 0 : _e.memberOf) === null || _f === void 0 ? void 0 : _f.issuer; // ひとまず1種類のメンバーシップのみ対応
             if (typeof verifySecret === 'string') {
-                memeberOfPayload = yield verifyMembershipToken({ token: params.memberOfToken, secret: verifySecret, issuer: verifyIssuer });
+                memeberOfPayload = yield verifyMembershipToken(Object.assign(Object.assign({ secret: verifySecret }, (typeof params.memberOfToken === 'string') ? { token: params.memberOfToken } : undefined), (typeof verifyIssuer === 'string') ? { issuer: verifyIssuer } : undefined));
             }
         }
-        return { sellerMakesOffer, memeberOfPayload, seller };
+        return Object.assign({ sellerMakesOffer,
+            seller }, (memeberOfPayload !== undefined) ? { memeberOfPayload } : undefined);
     });
 }
 exports.validateStartRequest = validateStartRequest;

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

@@ -36,17 +36,9 @@ function createTasks(params) {
         numberOfTried: 0,
         executionResults: [],
         data: {
-            object: {
-                specifyingMethod: factory.task.deleteTransaction.SpecifyingMethod.Id,
-                endDate: transaction.endDate,
-                id: transaction.id,
-                object: {
+            object: Object.assign({ specifyingMethod: factory.task.deleteTransaction.SpecifyingMethod.Id, id: transaction.id, object: {
                     order: transaction.object.order
-                },
-                project: transaction.project,
-                startDate: transaction.startDate,
-                typeOf: transaction.typeOf
-            }
+                }, project: transaction.project, startDate: transaction.startDate, typeOf: transaction.typeOf }, (transaction.endDate !== undefined) ? { endDate: transaction.endDate } : undefined)
         }
     };
     taskAttributes.push(deleteTransactionTask);

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

@@ -115,11 +115,9 @@ function createReturnPaymentMethodActions(params) {
                     return paymentMethod.issuedThrough.typeOf !== factory.service.paymentService.PaymentServiceType.MovieTicket;
                 })
                     .map((referencedInvoice) => __awaiter(this, void 0, void 0, function* () {
-                    const potentialActionsOnRefund = yield createReturnPaymentMethodPotentialActions({
-                        paymentMethod: { paymentMethodId: referencedInvoice.paymentMethodId },
-                        order: params.order,
-                        returnOrderActionParams: params.returnOrderActionParams
-                    });
+                    const potentialActionsOnRefund = yield createReturnPaymentMethodPotentialActions(Object.assign({ paymentMethod: { paymentMethodId: referencedInvoice.paymentMethodId }, order: params.order }, (params.returnOrderActionParams !== undefined)
+                        ? { returnOrderActionParams: params.returnOrderActionParams }
+                        : undefined));
                     const { paymentStatus } = referencedInvoice, referencedInvoiceAsObject = __rest(referencedInvoice, ["paymentStatus"]);
                     const object = Object.assign(Object.assign({}, referencedInvoiceAsObject), { typeOf: 'Invoice' });
                     return {
@@ -185,11 +183,9 @@ function createReturnPaymentMethodIssuedThroughMovieTicketActions(params) {
             return returnPaymentMethod;
         })
             .map((referencedInvoice) => __awaiter(this, void 0, void 0, function* () {
-            const potentialActionsOnRefund = yield createReturnPaymentMethodPotentialActions({
-                paymentMethod: { paymentMethodId: referencedInvoice.paymentMethodId },
-                order: params.order,
-                returnOrderActionParams: params.returnOrderActionParams
-            });
+            const potentialActionsOnRefund = yield createReturnPaymentMethodPotentialActions(Object.assign({ paymentMethod: { paymentMethodId: referencedInvoice.paymentMethodId }, order: params.order }, (params.returnOrderActionParams !== undefined)
+                ? { returnOrderActionParams: params.returnOrderActionParams }
+                : undefined));
             const { paymentStatus } = referencedInvoice, referencedInvoiceAsObject = __rest(referencedInvoice, ["paymentStatus"]);
             const object = Object.assign(Object.assign({}, referencedInvoiceAsObject), { typeOf: 'Invoice' });
             return {

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

@@ -36,11 +36,9 @@ function createSendEmailMessaegActionsOnReturn(params) {
         const sendEmailMessage = (_b = (_a = params.returnOrderActionParams) === null || _a === void 0 ? void 0 : _a.potentialActions) === null || _b === void 0 ? void 0 : _b.sendEmailMessage;
         if (Array.isArray(sendEmailMessage)) {
             sendEmailMessaegActionsOnReturn.push(...yield Promise.all(sendEmailMessage.map((sendEmailMessageParams) => __awaiter(this, void 0, void 0, function* () {
-                const emailMessage = yield emailMessageBuilder.createReturnOrderMessage({
-                    order,
-                    email: sendEmailMessageParams.object,
-                    emailMessage: params.emailMessageOnOrderReturned
-                });
+                const emailMessage = yield emailMessageBuilder.createReturnOrderMessage(Object.assign(Object.assign({ order }, (sendEmailMessageParams.object !== undefined) ? { email: sendEmailMessageParams.object } : undefined), (params.emailMessageOnOrderReturned !== undefined)
+                    ? { emailMessage: params.emailMessageOnOrderReturned }
+                    : undefined));
                 return {
                     project: order.project,
                     typeOf: factory.actionType.SendAction,

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

@@ -31,7 +31,7 @@ function createPotentialActions(params) {
             }
             const returnOrderActionParams = returnOrderParams === null || returnOrderParams === void 0 ? void 0 : returnOrderParams.find((p) => { var _a; return ((_a = p.object) === null || _a === void 0 ? void 0 : _a.orderNumber) === order.orderNumber; });
             // 決済返却アクション
-            const returnPaymentMethodActions = yield (0, returnPaymentMethod_1.createReturnPaymentMethodActions)(Object.assign(Object.assign({}, params), { order, returnOrderActionParams }));
+            const returnPaymentMethodActions = yield (0, returnPaymentMethod_1.createReturnPaymentMethodActions)(Object.assign(Object.assign(Object.assign({}, params), { order }), (returnOrderActionParams !== undefined) ? { returnOrderActionParams } : undefined));
             // ポイント特典の数だけ、返却アクションを作成
             const returnPointAwardActions = yield (0, returnPointAward_1.createReturnPointAwardActions)(Object.assign(Object.assign({}, params), { order }));
             // onOrderReturnedで生成へ移行(2024-02-04~)
@@ -41,7 +41,7 @@ function createPotentialActions(params) {
             //     moneyTransferAcceptedOffers: params.moneyTransferAcceptedOffers
             // });
             // 返品後のEメール送信アクション
-            const sendEmailMessaegActionsOnReturn = yield (0, sendEmailMessage_1.createSendEmailMessaegActionsOnReturn)(Object.assign(Object.assign({}, params), { order, returnOrderActionParams }));
+            const sendEmailMessaegActionsOnReturn = yield (0, sendEmailMessage_1.createSendEmailMessaegActionsOnReturn)(Object.assign(Object.assign(Object.assign({}, params), { order }), (returnOrderActionParams !== undefined) ? { returnOrderActionParams } : undefined));
             const potentialActionsOnReturnOrder = {
                 returnPaymentMethod: returnPaymentMethodActions,
                 // returnMoneyTransfer: returnMoneyTransferActions, // onOrderReturnedで生成へ移行(2024-02-04~)

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

@@ -81,19 +81,13 @@ function preStart(params) {
             inclusion: ['hasMerchantReturnPolicy'],
             exclusion: []
         });
-        const appliedReturnPolicy = yield findApplicableReturnPolicy({
-            acceptedOffers,
+        const appliedReturnPolicy = yield findApplicableReturnPolicy(Object.assign({ acceptedOffers,
             events,
             offerItemConditions,
-            orders,
-            returningDate: now,
-            reason: params.object.reason,
-            returnPolicies,
-            returnPolicySettingsByProject: hasMerchantReturnPolicy,
+            orders, returningDate: now, reason: params.object.reason, returnPolicies,
             offers,
             policiesByOffer,
-            usedReservationExists
-        });
+            usedReservationExists }, (hasMerchantReturnPolicy !== undefined) ? { returnPolicySettingsByProject: hasMerchantReturnPolicy } : undefined));
         validateAppliedReturnPolicy({ merchantReturnPolicy: appliedReturnPolicy });
         // アイテム検証
         yield validateItems({ orders, reason: params.object.reason })({ order: repos.order, reservation: repos.reservation });
@@ -418,8 +412,10 @@ function findApplicableReturnPolicy(params) {
                 throw new factory.errors.NotFound('OfferItemCondition');
             }
         }
-        return Object.assign({ merchantReturnDays: appliedReturnPolicy.merchantReturnDays, restockingFee: appliedReturnPolicy.restockingFee, returnFees,
-            returnFeesMovieTicket, typeOf: appliedReturnPolicy.typeOf }, (typeof (appliedItemCondition === null || appliedItemCondition === void 0 ? void 0 : appliedItemCondition.typeOf) === 'string') ? { itemCondition: appliedItemCondition } : undefined);
+        return Object.assign(Object.assign({ restockingFee: appliedReturnPolicy.restockingFee, returnFees,
+            returnFeesMovieTicket, typeOf: appliedReturnPolicy.typeOf }, (typeof appliedReturnPolicy.merchantReturnDays === 'number')
+            ? { merchantReturnDays: appliedReturnPolicy.merchantReturnDays }
+            : undefined), (typeof (appliedItemCondition === null || appliedItemCondition === void 0 ? void 0 : appliedItemCondition.typeOf) === 'string') ? { itemCondition: appliedItemCondition } : undefined);
     });
 }
 // tslint:disable-next-line:cyclomatic-complexity max-func-body-length

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

@@ -105,13 +105,7 @@ function confirm(params) {
             emailMessageOnOrderReturned = searchEmailMessagesResult.shift();
         }
         const result = {};
-        const potentialActions = yield (0, potentialActions_1.createPotentialActions)({
-            dateReturned: params.object.order.dateReturned,
-            orders: orders,
-            potentialActions: params.potentialActions,
-            transaction: transaction,
-            emailMessageOnOrderReturned: emailMessageOnOrderReturned
-        });
+        const potentialActions = yield (0, potentialActions_1.createPotentialActions)(Object.assign(Object.assign({ dateReturned: params.object.order.dateReturned, orders: orders, transaction: transaction }, (params.potentialActions !== undefined) ? { potentialActions: params.potentialActions } : undefined), (emailMessageOnOrderReturned !== undefined) ? { emailMessageOnOrderReturned } : undefined));
         // ステータス変更
         yield repos.transaction.confirm({
             typeOf: transaction.typeOf,

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

@@ -95,7 +95,7 @@ function validateWaiterPassport(params) {
             // tslint:disable-next-line:no-magic-numbers
             customerType = splittedScope[3];
         }
-        return { customerType, passport };
+        return Object.assign(Object.assign({}, (typeof customerType === 'string') ? { customerType } : undefined), { passport });
     });
 }
 exports.validateWaiterPassport = validateWaiterPassport;

package/lib/chevre/service/transaction.js

@@ -81,35 +81,32 @@ exports.updateAgent = updateAgent;
 function exportTasks(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         var _a;
-        const transaction = yield repos.transaction.startExportTasks(Object.assign({ project: params.project, typeOf: params.typeOf, status: params.status, tasksExportAction: {
+        const transaction = yield repos.transaction.startExportTasks(Object.assign(Object.assign(Object.assign({ status: params.status, tasksExportAction: {
                 agent: {
                     name: (typeof ((_a = params.tasksExportAction) === null || _a === void 0 ? void 0 : _a.agent.name) === 'string')
                         ? params.tasksExportAction.agent.name
                         : settings_1.DEFAULT_TASKS_EXPORT_AGENT_NAME
                 }
-            } }, (typeof params.id === 'string') ? { id: params.id } : undefined));
+            } }, (params.typeOf !== undefined) ? { typeOf: params.typeOf } : undefined), (params.project !== undefined) ? { project: params.project } : undefined), (typeof params.id === 'string') ? { id: params.id } : undefined));
         if (transaction === null) {
             return;
         }
         // 失敗してもここでは戻さない(RUNNINGのまま待機)
         switch (transaction.typeOf) {
             case factory.transactionType.MoneyTransfer:
-                yield MoneyTransferTransactionService.exportTasksById({
-                    id: transaction.id,
-                    runsTasksAfterInSeconds: params.runsTasksAfterInSeconds
-                })(repos);
+                yield MoneyTransferTransactionService.exportTasksById(Object.assign({ id: transaction.id }, (typeof params.runsTasksAfterInSeconds === 'number')
+                    ? { runsTasksAfterInSeconds: params.runsTasksAfterInSeconds }
+                    : undefined))(repos);
                 break;
             case factory.transactionType.PlaceOrder:
-                yield PlaceOrderTransactionService.exportTasksById({
-                    id: transaction.id,
-                    runsTasksAfterInSeconds: params.runsTasksAfterInSeconds
-                })(repos);
+                yield PlaceOrderTransactionService.exportTasksById(Object.assign({ id: transaction.id }, (typeof params.runsTasksAfterInSeconds === 'number')
+                    ? { runsTasksAfterInSeconds: params.runsTasksAfterInSeconds }
+                    : undefined))(repos);
                 break;
             case factory.transactionType.ReturnOrder:
-                yield ReturnOrderTransactionService.exportTasksById({
-                    id: transaction.id,
-                    runsTasksAfterInSeconds: params.runsTasksAfterInSeconds
-                })(repos);
+                yield ReturnOrderTransactionService.exportTasksById(Object.assign({ id: transaction.id }, (typeof params.runsTasksAfterInSeconds === 'number')
+                    ? { runsTasksAfterInSeconds: params.runsTasksAfterInSeconds }
+                    : undefined))(repos);
                 break;
             default:
         }

package/package.json

@@ -110,5 +110,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build && npm test && npm run doc"
   },
-  "version": "21.28.0-alpha.4"
+  "version": "21.28.0-alpha.5"
 }