@chevre/domain 23.2.0-alpha.61 → 23.2.0-alpha.63

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

@@ -9,16 +9,24 @@ const moment = require("moment");
 const util = require("util");
 const factory = require("../../../factory");
 function creatPublishPaymentUrlParams(params) {
-    var _a, _b, _c, _d;
-    const issuedThroughId = (_a = params.object.issuedThrough) === null || _a === void 0 ? void 0 : _a.id;
+    const issuedThroughId = params.object.issuedThrough?.id;
     // const accountId: string | undefined = (typeof params.accountId === 'string')
     //     ? params.accountId
     //     : (typeof params.object.accountId === 'string') ? params.object.accountId : undefined;
     // const movieTickets: factory.action.trade.pay.IMovieTicket[] | undefined
     //     = (Array.isArray(params.object.movieTickets)) ? params.object.movieTickets.map(createMovieTicket) : undefined;
-    const paymentMethod = Object.assign(Object.assign({ identifier: params.object.paymentMethod, amount: params.object.amount }, (typeof params.object.method === 'string') ? { method: params.object.method } : undefined), (params.object.creditCard !== undefined) ? { creditCard: params.object.creditCard } : undefined
-    // ...(Array.isArray(movieTickets)) ? { movieTickets } : undefined
-    );
+    const paymentMethod = {
+        identifier: params.object.paymentMethod, // 追加(2023-08-29~)
+        amount: params.object.amount,
+        // additionalProperty: (Array.isArray(params.object.additionalProperty)) ? params.object.additionalProperty : [],
+        ...(typeof params.object.method === 'string') ? { method: params.object.method } : undefined,
+        // ...(typeof params.object.name === 'string') ? { name: params.object.name } : undefined,
+        // ...(typeof accountId === 'string') ? { accountId } : undefined,
+        // ...(typeof params.object.description === 'string') ? { description: params.object.description } : undefined,
+        // ...(typeof params.object.fromLocation === 'string') ? { fromLocation: params.object.fromLocation } : undefined,
+        ...(params.object.creditCard !== undefined) ? { creditCard: params.object.creditCard } : undefined
+        // ...(Array.isArray(movieTickets)) ? { movieTickets } : undefined
+    };
     const object = {
         typeOf: params.paymentServiceType,
         id: issuedThroughId,
@@ -37,26 +45,35 @@ function creatPublishPaymentUrlParams(params) {
     if (Array.isArray(params.instrument)) {
         instrument.push(...params.instrument);
     }
-    return Object.assign(Object.assign(Object.assign({ project: { id: params.transaction.project.id, typeOf: factory.organizationType.Project }, typeOf: factory.assetTransactionType.Pay, transactionNumber: params.transactionNumber, agent: {
+    return {
+        project: { id: params.transaction.project.id, typeOf: factory.organizationType.Project },
+        typeOf: factory.assetTransactionType.Pay,
+        transactionNumber: params.transactionNumber,
+        agent: {
             typeOf: params.transaction.seller.typeOf,
             id: params.transaction.seller.id,
             name: (typeof params.transaction.seller.name === 'string')
                 ? params.transaction.seller.name
-                : String((_b = params.transaction.seller.name) === null || _b === void 0 ? void 0 : _b.ja)
-        }, recipient: {
+                : String(params.transaction.seller.name?.ja)
+        },
+        recipient: {
             id: params.transaction.seller.id,
             name: (typeof params.transaction.seller.name === 'string')
                 ? params.transaction.seller.name
-                : String((_c = params.transaction.seller.name) === null || _c === void 0 ? void 0 : _c.ja),
+                : String(params.transaction.seller.name?.ja),
             typeOf: params.transaction.seller.typeOf
-        }, object }, (typeof ((_d = params.location) === null || _d === void 0 ? void 0 : _d.typeOf) === 'string')
-        ? { location: params.location }
-        : undefined), { instrument }), (typeof params.identifier === 'string')
-        ? { identifier: params.identifier }
-        : undefined);
+        },
+        object,
+        ...(typeof params.location?.typeOf === 'string')
+            ? { location: params.location }
+            : undefined,
+        instrument, // instrumentを保証(2025-11-22~)
+        ...(typeof params.identifier === 'string')
+            ? { identifier: params.identifier }
+            : undefined
+    };
 }
 function creatPayTransactionStartParams(params) {
-    var _a, _b, _c, _d;
     const { ticketToken } = params;
     let expires = moment(params.transaction.expires)
         .add(1, 'month')
@@ -70,7 +87,7 @@ function creatPayTransactionStartParams(params) {
         }
     }
     const { confirmationNumber, orderNumber } = params.order;
-    const issuedThroughId = (_a = params.object.issuedThrough) === null || _a === void 0 ? void 0 : _a.id;
+    const issuedThroughId = params.object.issuedThrough?.id;
     const accountId = (typeof params.accountId === 'string')
         ? params.accountId
         : (typeof params.object.accountId === 'string') ? params.object.accountId : undefined;
@@ -82,12 +99,16 @@ function creatPayTransactionStartParams(params) {
         ...(ticketAsInstrument !== undefined) ? [ticketAsInstrument] : [], // add ticketAsInstrument(2025-11-25~)
         ...(Array.isArray(params.instrument)) ? params.instrument : [] // instrumentを対応決済方法オファーに対応(2025-12-14~)
     ];
-    return Object.assign({ project: { id: params.transaction.project.id, typeOf: factory.organizationType.Project }, typeOf: factory.assetTransactionType.Pay, transactionNumber: params.transactionNumber, agent: {
+    return {
+        project: { id: params.transaction.project.id, typeOf: factory.organizationType.Project },
+        typeOf: factory.assetTransactionType.Pay,
+        transactionNumber: params.transactionNumber,
+        agent: {
             typeOf: params.transaction.seller.typeOf,
             id: params.transaction.seller.id,
             name: (typeof params.transaction.seller.name === 'string')
                 ? params.transaction.seller.name
-                : String((_b = params.transaction.seller.name) === null || _b === void 0 ? void 0 : _b.ja)
+                : String(params.transaction.seller.name?.ja)
             // identifierを廃止(2024-03-05~)
             // identifier: [
             //     { name: 'transaction', value: params.transaction.id },
@@ -97,30 +118,47 @@ function creatPayTransactionStartParams(params) {
             //             .toISOString()
             //     }
             // ]
-        }, recipient: {
+        },
+        recipient: {
             id: params.transaction.seller.id,
             name: (typeof params.transaction.seller.name === 'string')
                 ? params.transaction.seller.name
-                : String((_c = params.transaction.seller.name) === null || _c === void 0 ? void 0 : _c.ja),
+                : String(params.transaction.seller.name?.ja),
             typeOf: params.transaction.seller.typeOf
-        }, object: {
+        },
+        object: {
             typeOf: params.paymentServiceType,
             id: issuedThroughId,
-            paymentMethod: Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({ identifier: params.object.paymentMethod, amount: params.object.amount, additionalProperty: (Array.isArray(params.object.additionalProperty)) ? params.object.additionalProperty : [] }, (typeof params.object.method === 'string') ? { method: params.object.method } : undefined), (typeof params.object.name === 'string') ? { name: params.object.name } : undefined), (typeof accountId === 'string') ? { accountId } : undefined), (typeof params.object.description === 'string') ? { description: params.object.description } : undefined), (typeof params.object.fromLocation === 'string') ? { fromLocation: params.object.fromLocation } : undefined), (params.object.creditCard !== undefined) ? { creditCard: params.object.creditCard } : undefined), (Array.isArray(movieTickets)) ? { movieTickets } : undefined),
+            paymentMethod: {
+                identifier: params.object.paymentMethod, // 追加(2023-08-29~)
+                amount: params.object.amount,
+                additionalProperty: (Array.isArray(params.object.additionalProperty)) ? params.object.additionalProperty : [],
+                ...(typeof params.object.method === 'string') ? { method: params.object.method } : undefined,
+                ...(typeof params.object.name === 'string') ? { name: params.object.name } : undefined,
+                ...(typeof accountId === 'string') ? { accountId } : undefined,
+                ...(typeof params.object.description === 'string') ? { description: params.object.description } : undefined,
+                ...(typeof params.object.fromLocation === 'string') ? { fromLocation: params.object.fromLocation } : undefined,
+                ...(params.object.creditCard !== undefined) ? { creditCard: params.object.creditCard } : undefined,
+                ...(Array.isArray(movieTickets)) ? { movieTickets } : undefined
+            },
             serviceOutput: {
                 typeOf: 'Invoice',
                 referencesOrder: params.object.referencesOrder
             }
-        }, expires: expires, purpose: {
+        },
+        expires: expires,
+        purpose: {
             typeOf: factory.order.OrderType.Order,
             confirmationNumber,
             orderNumber
-        }, instrument }, (typeof ((_d = params.location) === null || _d === void 0 ? void 0 : _d.typeOf) === 'string')
-        ? { location: params.location }
-        : undefined);
+        },
+        instrument, // add(2025-02-18~)
+        ...(typeof params.location?.typeOf === 'string')
+            ? { location: params.location }
+            : undefined
+    };
 }
 function createMovieTicket(params) {
-    var _a;
     let ticketIdentifier = util.format('%s:%s:%s', params.serviceOutput.reservationFor.id, params.serviceOutput.reservedTicket.ticketedSeat.seatSection, params.serviceOutput.reservedTicket.ticketedSeat.seatNumber);
     // 指定があれば採用(2024-04-16~)
     const ticketIdentifierByRequest = params.serviceOutput.reservedTicket.identifier;
@@ -146,16 +184,15 @@ function createMovieTicket(params) {
         typeOf: params.typeOf,
         identifier: params.identifier,
         accessCode: params.accessCode,
-        category: { codeValue: (typeof ((_a = params.category) === null || _a === void 0 ? void 0 : _a.codeValue) === 'string') ? params.category.codeValue : '' },
+        category: { codeValue: (typeof params.category?.codeValue === 'string') ? params.category.codeValue : '' },
         serviceType: params.serviceType,
         serviceOutput
     };
 }
 function createAuthorizeResult(params) {
-    var _a, _b, _c, _d, _e, _f;
     const payTransactionObject = params.payTransaction.object;
-    const totalPaymentDue = (_a = payTransactionObject.paymentMethod) === null || _a === void 0 ? void 0 : _a.totalPaymentDue;
-    if (typeof (totalPaymentDue === null || totalPaymentDue === void 0 ? void 0 : totalPaymentDue.typeOf) !== 'string') {
+    const totalPaymentDue = payTransactionObject.paymentMethod?.totalPaymentDue;
+    if (typeof totalPaymentDue?.typeOf !== 'string') {
         throw new factory.errors.Internal('payTransaction.object.paymentMethod.totalPaymentDue undefined');
     }
     const issuedThrough = {
@@ -163,13 +200,17 @@ function createAuthorizeResult(params) {
         id: (typeof payTransactionObject.id === 'string') ? payTransactionObject.id : ''
     };
     // 決済取引から決済カード通貨区分を取り出す
-    const paymentMethodAmountCurrencyByPayTransaction = (typeof ((_b = payTransactionObject.paymentMethod) === null || _b === void 0 ? void 0 : _b.amount) !== 'number')
-        ? (_d = (_c = payTransactionObject.paymentMethod) === null || _c === void 0 ? void 0 : _c.amount) === null || _d === void 0 ? void 0 : _d.currency
+    const paymentMethodAmountCurrencyByPayTransaction = (typeof payTransactionObject.paymentMethod?.amount !== 'number')
+        ? payTransactionObject.paymentMethod?.amount?.currency
         : undefined;
-    const paymentMethodAsObject = Object.assign({ typeOf: params.object.paymentMethod }, (payTransactionObject.typeOf === factory.service.paymentService.PaymentServiceType.CreditCard
-        && typeof paymentMethodAmountCurrencyByPayTransaction === 'string')
-        ? { amount: { currency: paymentMethodAmountCurrencyByPayTransaction } }
-        : undefined);
+    const paymentMethodAsObject = {
+        typeOf: params.object.paymentMethod,
+        // CreditCardIFのカード通貨区分を追加(2023-08-15~)
+        ...(payTransactionObject.typeOf === factory.service.paymentService.PaymentServiceType.CreditCard
+            && typeof paymentMethodAmountCurrencyByPayTransaction === 'string')
+            ? { amount: { currency: paymentMethodAmountCurrencyByPayTransaction } }
+            : undefined
+    };
     // FaceToFaceの場合、決済方法区分未指定に対応(2023-08-29~)
     let paymentStatus = factory.paymentStatusType.PaymentAutomaticallyApplied;
     if (issuedThrough.typeOf === factory.service.paymentService.PaymentServiceType.FaceToFace) {
@@ -183,10 +224,14 @@ function createAuthorizeResult(params) {
             invoiceOrderItems = params.object.referencesOrder.orderedItem;
         }
     }
-    const referencesOrder = Object.assign({ typeOf: factory.order.OrderType.Order }, (Array.isArray(invoiceOrderItems) && invoiceOrderItems.length > 0) ? { orderedItem: invoiceOrderItems } : undefined);
+    const referencesOrder = {
+        typeOf: factory.order.OrderType.Order,
+        // 決済承認時に注文アイテムの指定がある場合のみ、決済承認結果にorderedItemを連携する -> 連携された場合のみ注文取引確定時に検証される
+        ...(Array.isArray(invoiceOrderItems) && invoiceOrderItems.length > 0) ? { orderedItem: invoiceOrderItems } : undefined
+    };
     // Array対応(2023-09-02~)
     const resultAsInvoice = {
-        accountId: (typeof ((_e = payTransactionObject.paymentMethod) === null || _e === void 0 ? void 0 : _e.accountId) === 'string')
+        accountId: (typeof payTransactionObject.paymentMethod?.accountId === 'string')
             ? payTransactionObject.paymentMethod.accountId
             : '',
         issuedThrough,
@@ -197,7 +242,7 @@ function createAuthorizeResult(params) {
         paymentMethodId: (typeof payTransactionObject.paymentMethodId === 'string')
             ? payTransactionObject.paymentMethodId
             : '',
-        name: (typeof ((_f = payTransactionObject.paymentMethod) === null || _f === void 0 ? void 0 : _f.name) === 'string')
+        name: (typeof payTransactionObject.paymentMethod?.name === 'string')
             ? payTransactionObject.paymentMethod.name
             : params.object.paymentMethod,
         totalPaymentDue: totalPaymentDue,
@@ -205,7 +250,6 @@ function createAuthorizeResult(params) {
         typeOf: factory.action.authorize.paymentMethod.any.ResultType.Payment,
         referencesOrder // add(2025-11-23~)
     };
-    // tslint:disable-next-line:no-suspicious-comment
     // TODO 保留 resultにメンバーシップを追加(2024-08-13~)
     // let resultAsPermit: factory.action.authorize.paymentMethod.any.IResultAsPermit | undefined;
     // if (typeof params.permit?.identifier === 'string') {
@@ -224,19 +268,31 @@ function createAuthorizeResult(params) {
     return [resultAsInvoice];
 }
 function payActionObject2invoice(params) {
-    var _a;
-    return Object.assign({ paymentMethod: Object.assign({ id: params.id, typeOf: params.typeOf }, (Array.isArray(params.serviceOutput)) ? { serviceOutput: params.serviceOutput } : undefined), paymentMethodId: params.paymentMethod.paymentMethodId, typeOf: 'Invoice' }, (typeof ((_a = params.paymentMethod.totalPaymentDue) === null || _a === void 0 ? void 0 : _a.typeOf) === 'string')
-        ? { totalPaymentDue: params.paymentMethod.totalPaymentDue }
-        : undefined);
+    return {
+        paymentMethod: {
+            id: params.id,
+            typeOf: params.typeOf,
+            ...(Array.isArray(params.serviceOutput)) ? { serviceOutput: params.serviceOutput } : undefined
+        },
+        paymentMethodId: params.paymentMethod.paymentMethodId,
+        typeOf: 'Invoice',
+        ...(typeof params.paymentMethod.totalPaymentDue?.typeOf === 'string')
+            ? { totalPaymentDue: params.paymentMethod.totalPaymentDue }
+            : undefined
+    };
 }
 function refundActionObject2invoice(params) {
-    var _a;
-    return Object.assign({ paymentMethod: {
+    return {
+        paymentMethod: {
             id: params.id,
             typeOf: params.typeOf
-        }, paymentMethodId: params.paymentMethod.paymentMethodId, typeOf: 'Invoice' }, (typeof ((_a = params.paymentMethod.totalPaymentDue) === null || _a === void 0 ? void 0 : _a.typeOf) === 'string')
-        ? { totalPaymentDue: params.paymentMethod.totalPaymentDue }
-        : undefined);
+        },
+        paymentMethodId: params.paymentMethod.paymentMethodId,
+        typeOf: 'Invoice',
+        ...(typeof params.paymentMethod.totalPaymentDue?.typeOf === 'string')
+            ? { totalPaymentDue: params.paymentMethod.totalPaymentDue }
+            : undefined
+    };
 }
 /**
  * 通知対象としてのアクションを最適化

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

@@ -1,27 +1,18 @@
 "use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.fixOrderAsNeeded = fixOrderAsNeeded;
 const factory = require("../../../factory");
 const publishConfirmationNumberIfNotExist_1 = require("../../transaction/placeOrder/publishConfirmationNumberIfNotExist");
 const publishOrderNumberIfNotExist_1 = require("../../transaction/placeOrder/publishOrderNumberIfNotExist");
 function fixOrderAsNeeded(params) {
-    return (repos) => __awaiter(this, void 0, void 0, function* () {
+    return async (repos) => {
         const orderDate = new Date();
         // publish always(2025-02-12~)
         // MovieTicketの場合、確認番号を発行(着券に連携するため)(2024-05-27~)
         // let confirmationNumber: string | undefined;
         let confirmationNumber;
         // if (params.paymentServiceType === factory.service.paymentService.PaymentServiceType.MovieTicket) {
-        confirmationNumber = yield (0, publishConfirmationNumberIfNotExist_1.publishConfirmationNumberIfNotExist)({
+        confirmationNumber = await (0, publishConfirmationNumberIfNotExist_1.publishConfirmationNumberIfNotExist)({
             id: params.purpose.id,
             status: { $in: [factory.transactionStatusType.InProgress] },
             object: { orderDate }
@@ -31,11 +22,11 @@ function fixOrderAsNeeded(params) {
         });
         // }
         // publish orderNumber(2025-02-14~)
-        const orderNumber = yield (0, publishOrderNumberIfNotExist_1.publishOrderNumberIfNotExist)({
+        const orderNumber = await (0, publishOrderNumberIfNotExist_1.publishOrderNumberIfNotExist)({
             project: { id: params.project.id },
             id: params.purpose.id,
             object: { orderDate }
         })(repos);
         return { confirmationNumber, orderNumber };
-    });
+    };
 }

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

@@ -1,13 +1,4 @@
 "use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.onPayActionCompleted = onPayActionCompleted;
 /**
@@ -17,17 +8,17 @@ const factory = require("../../../factory");
 const factory_1 = require("./factory");
 const onPaymentStatusChanged_1 = require("./onPaymentStatusChanged");
 function onPayActionCompleted(payAction) {
-    return (repos) => __awaiter(this, void 0, void 0, function* () {
+    return async (repos) => {
         const aciton4inform = (0, factory_1.optimizeAction4inform)(payAction);
         const potentialActions = payAction.potentialActions;
         const now = new Date();
         const taskAttributes = [];
-        const add2report = potentialActions === null || potentialActions === void 0 ? void 0 : potentialActions.add2report;
+        const add2report = potentialActions?.add2report;
         if (add2report === true) {
             // 同期的に経理レポート連携する(2022-08-27~)
-            yield (0, onPaymentStatusChanged_1.onPaymentStatusChanged)(aciton4inform)(repos);
+            await (0, onPaymentStatusChanged_1.onPaymentStatusChanged)(aciton4inform)(repos);
         }
-        const informPayment = potentialActions === null || potentialActions === void 0 ? void 0 : potentialActions.informPayment;
+        const informPayment = potentialActions?.informPayment;
         if (Array.isArray(informPayment)) {
             taskAttributes.push(...informPayment.map(({ purpose, id }) => {
                 let data;
@@ -41,11 +32,15 @@ function onPayActionCompleted(payAction) {
                     else if (payAction.purpose.typeOf === factory.actionType.ReturnAction) {
                         about = { orderNumber: payAction.purpose.object.orderNumber, typeOf: factory.order.OrderType.Order };
                     }
-                    data = Object.assign(Object.assign({ 
+                    data = {
                         // optimize(2024-07-01~)
                         // recipient, // discontinue recipient(2025-02-19~)
-                        object: aciton4inform, id, typeOf: factory.actionType.InformAction }, (typeof (purpose === null || purpose === void 0 ? void 0 : purpose.typeOf) === 'string') ? { purpose } : undefined), (typeof (about === null || about === void 0 ? void 0 : about.typeOf) === 'string') ? { about } : undefined // add(2025-02-14~)
-                    );
+                        object: aciton4inform,
+                        id, // add potentialAction(2025-02-05~)
+                        typeOf: factory.actionType.InformAction,
+                        ...(typeof purpose?.typeOf === 'string') ? { purpose } : undefined,
+                        ...(typeof about?.typeOf === 'string') ? { about } : undefined // add(2025-02-14~)
+                    };
                 }
                 else {
                     throw new factory.errors.ArgumentNull('potentialActions.informPayment.id'); // 2025-02-09~
@@ -74,6 +69,6 @@ function onPayActionCompleted(payAction) {
             }));
         }
         // タスク保管
-        yield repos.task.saveMany(taskAttributes, { emitImmediately: true });
-    });
+        await repos.task.saveMany(taskAttributes, { emitImmediately: true });
+    };
 }

package/lib/chevre/service/payment/any/onPaymentStatusChanged/onPaid.js

@@ -1,13 +1,4 @@
 "use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.onPaid = onPaid;
 /**
@@ -16,63 +7,69 @@ exports.onPaid = onPaid;
 const moment = require("moment-timezone");
 const factory = require("../../../../factory");
 function onPaid(params, project) {
-    return (repos) => __awaiter(this, void 0, void 0, function* () {
+    return async (repos) => {
         switch (params.purpose.typeOf) {
             // 返品手数料決済であれば
             case factory.actionType.ReturnAction:
-                yield onReturnFeePaid(params, project)(repos);
+                await onReturnFeePaid(params, project)(repos);
                 break;
             // 注文決済であれば
             case factory.order.OrderType.Order:
-                yield onOrderPaid(params, project)(repos);
+                await onOrderPaid(params, project)(repos);
                 break;
             default:
         }
-    });
+    };
 }
 function onReturnFeePaid(params, project) {
-    return (repos) => __awaiter(this, void 0, void 0, function* () {
-        var _a, _b;
-        const orderNumber = (_b = (_a = params.purpose) === null || _a === void 0 ? void 0 : _a.object) === null || _b === void 0 ? void 0 : _b.orderNumber;
+    return async (repos) => {
+        const orderNumber = params.purpose?.object?.orderNumber;
         if (typeof orderNumber !== 'string') {
             throw new factory.errors.Internal('params.purpose.object.orderNumber not string');
         }
         // 経理レポートに決済アクションを追加
-        const action4save = Object.assign(Object.assign(Object.assign({}, params), { startDate: moment(params.startDate)
-                .toDate() }), (params.endDate !== undefined)
-            ? {
-                endDate: moment(params.startDate)
-                    .toDate()
-            }
-            : undefined);
+        const action4save = {
+            ...params,
+            startDate: moment(params.startDate)
+                .toDate(),
+            ...(params.endDate !== undefined)
+                ? {
+                    endDate: moment(params.startDate)
+                        .toDate()
+                }
+                : undefined
+        };
         const childReport = { typeOf: 'Report', mainEntity: action4save };
-        yield repos.accountingReport.addChildReport({
+        await repos.accountingReport.addChildReport({
             project: { id: project.id },
             mainEntity: { orderNumber },
             hasPart: childReport
         });
-    });
+    };
 }
 function onOrderPaid(params, project) {
-    return (repos) => __awaiter(this, void 0, void 0, function* () {
-        var _a;
-        const orderNumber = (_a = params.purpose) === null || _a === void 0 ? void 0 : _a.orderNumber;
+    return async (repos) => {
+        const orderNumber = params.purpose?.orderNumber;
         if (typeof orderNumber !== 'string') {
             throw new factory.errors.Internal('params.purpose.orderNumber not string');
         }
         // 経理レポートに決済アクションを追加
-        const action4save = Object.assign(Object.assign(Object.assign({}, params), { startDate: moment(params.startDate)
-                .toDate() }), (params.endDate !== undefined)
-            ? {
-                endDate: moment(params.startDate)
-                    .toDate()
-            }
-            : undefined);
+        const action4save = {
+            ...params,
+            startDate: moment(params.startDate)
+                .toDate(),
+            ...(params.endDate !== undefined)
+                ? {
+                    endDate: moment(params.startDate)
+                        .toDate()
+                }
+                : undefined
+        };
         const childReport = { typeOf: 'Report', mainEntity: action4save };
-        yield repos.accountingReport.addChildReport({
+        await repos.accountingReport.addChildReport({
             project: { id: project.id },
             mainEntity: { orderNumber },
             hasPart: childReport
         });
-    });
+    };
 }

package/lib/chevre/service/payment/any/onPaymentStatusChanged/onRefunded.js

@@ -1,13 +1,4 @@
 "use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.onRefunded = onRefunded;
 /**
@@ -16,36 +7,39 @@ exports.onRefunded = onRefunded;
 const moment = require("moment-timezone");
 const factory = require("../../../../factory");
 function onRefunded(params, project) {
-    return (repos) => __awaiter(this, void 0, void 0, function* () {
+    return async (repos) => {
         switch (params.purpose.typeOf) {
             // 返品手数料決済であれば
             case factory.actionType.ReturnAction:
-                yield onOrderRefunded(params, project)(repos);
+                await onOrderRefunded(params, project)(repos);
                 break;
             default:
         }
-    });
+    };
 }
 function onOrderRefunded(params, project) {
-    return (repos) => __awaiter(this, void 0, void 0, function* () {
-        var _a, _b;
-        const orderNumber = (_b = (_a = params.purpose) === null || _a === void 0 ? void 0 : _a.object) === null || _b === void 0 ? void 0 : _b.orderNumber;
+    return async (repos) => {
+        const orderNumber = params.purpose?.object?.orderNumber;
         if (typeof orderNumber !== 'string') {
             throw new factory.errors.Internal('params.purpose.orderNumber not string');
         }
         // 経理レポートに決済アクションを追加
-        const action4save = Object.assign(Object.assign(Object.assign({}, params), { startDate: moment(params.startDate)
-                .toDate() }), (params.endDate !== undefined)
-            ? {
-                endDate: moment(params.startDate)
-                    .toDate()
-            }
-            : undefined);
+        const action4save = {
+            ...params,
+            startDate: moment(params.startDate)
+                .toDate(),
+            ...(params.endDate !== undefined)
+                ? {
+                    endDate: moment(params.startDate)
+                        .toDate()
+                }
+                : undefined
+        };
         const childReport = { typeOf: 'Report', mainEntity: action4save };
-        yield repos.accountingReport.addChildReport({
+        await repos.accountingReport.addChildReport({
             project: { id: project.id },
             mainEntity: { orderNumber },
             hasPart: childReport
         });
-    });
+    };
 }

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

@@ -1,13 +1,4 @@
 "use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.onPaymentStatusChanged = onPaymentStatusChanged;
 const factory = require("../../../factory");
@@ -17,22 +8,22 @@ const onRefunded_1 = require("./onPaymentStatusChanged/onRefunded");
  * 決済ステータス変更イベント
  */
 function onPaymentStatusChanged(params) {
-    return (repos) => __awaiter(this, void 0, void 0, function* () {
+    return async (repos) => {
         // アクションリポジトリから実アクションを参照する
         // そうすることで、通知する情報は最低限で済む
-        const action = yield repos.action.findById({ id: params.id, typeOf: params.typeOf });
+        const action = await repos.action.findById({ id: params.id, typeOf: params.typeOf });
         const optimizedAction = optimizeAction4report(action);
         switch (optimizedAction.typeOf) {
             case factory.actionType.PayAction:
-                yield (0, onPaid_1.onPaid)(optimizedAction, { id: action.project.id })(repos);
+                await (0, onPaid_1.onPaid)(optimizedAction, { id: action.project.id })(repos);
                 break;
             case factory.actionType.RefundAction:
-                yield (0, onRefunded_1.onRefunded)(optimizedAction, { id: action.project.id })(repos);
+                await (0, onRefunded_1.onRefunded)(optimizedAction, { id: action.project.id })(repos);
                 break;
             default:
             // no op
         }
-    });
+    };
 }
 /**
  * 経理レポート連携対象としてのアクションを最適化
@@ -71,10 +62,19 @@ function optimizeAction4report(action) {
                     typeOf: o.typeOf
                 };
             });
-            const optimizedRefundAction = Object.assign({ actionStatus: action.actionStatus, endDate: action.endDate, id: action.id, object: optimizedRefundActionObject, 
+            const optimizedRefundAction = {
+                actionStatus: action.actionStatus,
+                endDate: action.endDate,
+                id: action.id,
+                object: optimizedRefundActionObject,
                 // 最適化(2023-06-30~)
                 // project: action.project,
-                purpose: action.purpose, startDate: action.startDate, typeOf: action.typeOf }, (action.error !== undefined) ? { error: action.error } : undefined);
+                purpose: action.purpose,
+                startDate: action.startDate,
+                typeOf: action.typeOf,
+                // FailedActionStatusに対応(errorも保管)(2024-03-21~)
+                ...(action.error !== undefined) ? { error: action.error } : undefined
+            };
             optimizedAction = optimizedRefundAction;
             break;
         default: