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

package/lib/chevre/service/order/onOrderStatusChanged/onOrderReturned.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.onOrderReturned = onOrderReturned;
 /**
@@ -21,11 +12,10 @@ const factory = require("../../../factory");
 const factory_1 = require("./onOrderReturned/factory");
 const debug = createDebug('chevre-domain:service:order');
 function onOrderReturned(params) {
-    return (repos
+    return async (repos
     // settings: Settings
-    ) => __awaiter(this, void 0, void 0, function* () {
-        var _a, _b, _c, _d;
-        const setting = yield repos.setting.findOne({ project: { id: { $eq: '*' } } }, ['onOrderStatusChanged']);
+    ) => {
+        const setting = await repos.setting.findOne({ project: { id: { $eq: '*' } } }, ['onOrderStatusChanged']);
         debug('onOrderStatusChanged called.', params.order.orderNumber, params.order.orderStatus, params.order.orderDate);
         let tasks = [];
         // const maskedCustomer = createMaskedCustomer(params.order, { noProfile: true });
@@ -44,33 +34,39 @@ function onOrderReturned(params) {
         };
         switch (params.order.orderStatus) {
             case factory.orderStatus.OrderReturned:
-                const potentialActionsByTransaction = (_d = (_c = (_b = (_a = params.returnOrderTransaction) === null || _a === void 0 ? void 0 : _a.potentialActions) === null || _b === void 0 ? void 0 : _b.returnOrder) === null || _c === void 0 ? void 0 : _c.find((returnOrderActionByTransaction) => {
+                const potentialActionsByTransaction = params.returnOrderTransaction?.potentialActions?.returnOrder?.find((returnOrderActionByTransaction) => {
                     return returnOrderActionByTransaction.object.orderNumber === params.order.orderNumber;
-                })) === null || _d === void 0 ? void 0 : _d.potentialActions;
-                const itemOfferedTypeOfs = yield repos.acceptedOffer.distinctValues({ orderNumber: { $in: [params.order.orderNumber] } }, 'acceptedOffers.itemOffered.typeOf');
-                const serialNumbers = yield repos.acceptedOffer.distinctValues({ orderNumber: { $in: [params.order.orderNumber] } }, 'acceptedOffers.serialNumber');
-                const reservationNumbers = yield repos.acceptedOffer.distinctValues({ orderNumber: { $in: [params.order.orderNumber] } }, 'acceptedOffers.itemOffered.reservationNumber');
-                const offeredThroughIdentifier = (yield repos.acceptedOffer.distinctValues({ orderNumber: { $in: [params.order.orderNumber] } }, 'acceptedOffers.offeredThrough.identifier'))[0];
-                const reservationForSuperEventLocationBranchCodes = yield repos.acceptedOffer.distinctValues({ orderNumber: { $in: [params.order.orderNumber] } }, 'acceptedOffers.itemOffered.reservationFor.superEvent.location.branchCode');
+                })?.potentialActions;
+                const itemOfferedTypeOfs = await repos.acceptedOffer.distinctValues({ orderNumber: { $in: [params.order.orderNumber] } }, 'acceptedOffers.itemOffered.typeOf');
+                const serialNumbers = await repos.acceptedOffer.distinctValues({ orderNumber: { $in: [params.order.orderNumber] } }, 'acceptedOffers.serialNumber');
+                const reservationNumbers = await repos.acceptedOffer.distinctValues({ orderNumber: { $in: [params.order.orderNumber] } }, 'acceptedOffers.itemOffered.reservationNumber');
+                const offeredThroughIdentifier = (await repos.acceptedOffer.distinctValues({ orderNumber: { $in: [params.order.orderNumber] } }, 'acceptedOffers.offeredThrough.identifier'))[0];
+                const reservationForSuperEventLocationBranchCodes = await repos.acceptedOffer.distinctValues({ orderNumber: { $in: [params.order.orderNumber] } }, 'acceptedOffers.itemOffered.reservationFor.superEvent.location.branchCode');
                 tasks = [
                     ...(0, factory_1.createInformTasks)(params.order, params.returnOrderAction, setting),
-                    ...createReturnReserveTransactionTasks(Object.assign(Object.assign({}, params.order), { reservationNumbers,
+                    ...createReturnReserveTransactionTasks({
+                        ...params.order,
+                        reservationNumbers,
                         offeredThroughIdentifier,
-                        reservationForSuperEventLocationBranchCodes }), simpleOrder),
+                        reservationForSuperEventLocationBranchCodes
+                    }, simpleOrder),
                     // 決済取引返却タスクを作成(2022-06-09~)
                     ...createReturnPayTransactionTasks({ orderNumber: params.order.orderNumber, project: params.order.project }, params.returnOrderTransaction),
                     // 取引のpotentialActionsを適用(2023-08-19~)
                     ...(0, factory_1.createOnOrderReturnedTasksByTransaction)({ order: params.order, potentialActions: potentialActionsByTransaction }),
                     ...(itemOfferedTypeOfs[0] === factory.actionType.MoneyTransfer)
-                        ? createReturnMoneyTransferTasks(Object.assign(Object.assign({}, params.order), { serialNumbers }), simpleOrder)
+                        ? createReturnMoneyTransferTasks({
+                            ...params.order,
+                            serialNumbers
+                        }, simpleOrder)
                         : []
                 ];
                 break;
             default:
                 throw new factory.errors.NotImplemented(`${params.order.orderStatus} not implemented`);
         }
-        yield repos.task.saveMany(tasks, { emitImmediately: true });
-    });
+        await repos.task.saveMany(tasks, { emitImmediately: true });
+    };
 }
 function createReturnReserveTransactionTasks(order, simpleOrder) {
     debug('onOrderReturn.createReturnReserveTransactionTasks processing...', 'project:', order.project.id, 'orderNumber:', simpleOrder.orderNumber, 'reservationNumbers:', order.reservationNumbers, 'offeredThroughIdentifier:', order.offeredThroughIdentifier, 'reservationForSuperEventLocationBranchCodes:', order.reservationForSuperEventLocationBranchCodes);
@@ -204,14 +200,13 @@ function createReturnMoneyTransferTasks(order, simpleOrder) {
     return tasks;
 }
 function createReturnPayTransactionTasks(order, returnOrderTransaction) {
-    var _a, _b;
     const taskRunsAt = new Date();
     // const taskRunsAt = moment(order.dateReturned)
     //     .add(RETURN_PAY_TASK_DELAY_IN_SECONDS, 'seconds')
     //     .toDate();
     const tasks = [];
-    const returnOrderPotentialActions = (_b = (_a = returnOrderTransaction === null || returnOrderTransaction === void 0 ? void 0 : returnOrderTransaction.potentialActions) === null || _a === void 0 ? void 0 : _a.returnOrder.find((action) => action.object.orderNumber === order.orderNumber)) === null || _b === void 0 ? void 0 : _b.potentialActions;
-    const returnPayActionsByReturnOrderTransaction = returnOrderPotentialActions === null || returnOrderPotentialActions === void 0 ? void 0 : returnOrderPotentialActions.returnPaymentMethod;
+    const returnOrderPotentialActions = returnOrderTransaction?.potentialActions?.returnOrder.find((action) => action.object.orderNumber === order.orderNumber)?.potentialActions;
+    const returnPayActionsByReturnOrderTransaction = returnOrderPotentialActions?.returnPaymentMethod;
     if (Array.isArray(returnPayActionsByReturnOrderTransaction)) {
         tasks.push(...returnPayActionsByReturnOrderTransaction.map((a) => {
             return {

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

@@ -5,23 +5,21 @@ const factory = require("../../../factory");
 function createInformTasks(order, 
 // settings: Settings,
 setting) {
-    var _a;
     const taskRunsAt = new Date();
-    const informOrder = (_a = setting === null || setting === void 0 ? void 0 : setting.onOrderStatusChanged) === null || _a === void 0 ? void 0 : _a.informOrder;
+    const informOrder = setting?.onOrderStatusChanged?.informOrder;
     const informTasks = [];
     const order4inform = creteOrder4inform(order);
     if (Array.isArray(informOrder) && informOrder.length > 0) {
         const recipientId = '';
         informOrder.forEach((informOrderParams) => {
-            var _a, _b;
-            if (typeof ((_a = informOrderParams.recipient) === null || _a === void 0 ? void 0 : _a.url) === 'string') {
+            if (typeof informOrderParams.recipient?.url === 'string') {
                 const informActionAttributes = {
                     about: { orderNumber: order4inform.orderNumber, typeOf: factory.order.OrderType.Order },
                     object: order4inform,
                     recipient: {
                         // url: informOrderParams.recipient.url, // discontinue(2025-02-13~)
                         id: recipientId,
-                        name: (_b = informOrderParams.recipient) === null || _b === void 0 ? void 0 : _b.name,
+                        name: informOrderParams.recipient?.name,
                         typeOf: factory.creativeWorkType.WebApplication
                     },
                     target: {

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

@@ -1,27 +1,25 @@
 "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.onOrderUpdated = onOrderUpdated;
 const factory = require("../../factory");
 // import { Settings } from '../../settings';
 const factory_1 = require("./onOrderUpdated/factory");
 function onOrderUpdated(params) {
-    return (repos
+    return async (repos
     // settings: Settings
-    ) => __awaiter(this, void 0, void 0, function* () {
-        const setting = yield repos.setting.findOne({ project: { id: { $eq: '*' } } }, ['onOrderStatusChanged']);
+    ) => {
+        const setting = await repos.setting.findOne({ project: { id: { $eq: '*' } } }, ['onOrderStatusChanged']);
         let tasks = [];
-        tasks = (0, factory_1.createInformTasks)(Object.assign(Object.assign({ typeOf: factory.order.OrderType.Order, orderNumber: params.orderNumber, project: { id: params.project.id, typeOf: factory.organizationType.Project }, updatedAt: params.updatedAt }, (typeof params.name === 'string') ? { name: params.name } : undefined), (Array.isArray(params.additionalProperty)) ? { additionalProperty: params.additionalProperty } : undefined), 
+        tasks = (0, factory_1.createInformTasks)({
+            typeOf: factory.order.OrderType.Order,
+            orderNumber: params.orderNumber,
+            project: { id: params.project.id, typeOf: factory.organizationType.Project },
+            updatedAt: params.updatedAt,
+            ...(typeof params.name === 'string') ? { name: params.name } : undefined,
+            ...(Array.isArray(params.additionalProperty)) ? { additionalProperty: params.additionalProperty } : undefined
+        }, 
         // settings,
         setting);
-        yield repos.task.saveMany(tasks, { emitImmediately: true });
-    });
+        await repos.task.saveMany(tasks, { emitImmediately: true });
+    };
 }

package/lib/chevre/service/order/payOrder.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.payOrder = payOrder;
 const onAssetTransactionStatusChanged_1 = require("./onAssetTransactionStatusChanged");
@@ -16,17 +7,17 @@ const factory = require("../../factory");
  * 注文を決済する
  */
 function payOrder(params) {
-    return (repos, settings) => __awaiter(this, void 0, void 0, function* () {
+    return async (repos, settings) => {
         if (typeof params.useOnOrderStatusChanged !== 'boolean') {
             throw new factory.errors.Argument('useOnOrderStatusChanged', 'must be boolean');
         }
         const orderNumber = params.object.orderNumber;
         const confirmationNumber = params.object.confirmationNumber;
-        yield (0, onAssetTransactionStatusChanged_1.paymentDue2Processing)({
+        await (0, onAssetTransactionStatusChanged_1.paymentDue2Processing)({
             project: { id: params.project.id },
             confirmationNumber,
             orderNumber,
             useOnOrderStatusChanged: params.useOnOrderStatusChanged
         })(repos, settings);
-    });
+    };
 }

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

@@ -1,25 +1,14 @@
 "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.createPlacingOrderFromExistingTransaction = createPlacingOrderFromExistingTransaction;
 const factory = require("../../../factory");
 const factory_1 = require("./factory");
 function createPlacingOrderFromExistingTransaction(params) {
-    // tslint:disable-next-line:max-func-body-length
-    return (repos) => __awaiter(this, void 0, void 0, function* () {
-        var _a;
+    return async (repos) => {
         const confirmationNumber = String(params.confirmationNumber);
         const orderNumber = params.orderNumber;
         let order;
-        const placeOrderTransactions = yield repos.transaction.projectFields({
+        const placeOrderTransactions = await repos.transaction.projectFields({
             limit: 1,
             page: 1,
             project: { id: { $eq: params.project.id } },
@@ -39,11 +28,11 @@ function createPlacingOrderFromExistingTransaction(params) {
         }
         let authorizePaymentActions = [];
         let authorizeOfferActionsWithInstrument = [];
-        const authorizeActionsAsResult = (_a = placeOrderTransactionWithResult.result) === null || _a === void 0 ? void 0 : _a.authorizeActions;
+        const authorizeActionsAsResult = placeOrderTransactionWithResult.result?.authorizeActions;
         if (Array.isArray(authorizeActionsAsResult) && authorizeActionsAsResult.length > 0) {
             const completedAuthorizeActionIds = authorizeActionsAsResult.map(({ id }) => id);
             if (completedAuthorizeActionIds.length > 0) {
-                authorizePaymentActions = (yield repos.action.search({
+                authorizePaymentActions = await repos.action.search({
                     typeOf: factory.actionType.AuthorizeAction,
                     purpose: {
                         typeOf: { $in: [factory.transactionType.PlaceOrder] },
@@ -51,8 +40,8 @@ function createPlacingOrderFromExistingTransaction(params) {
                     },
                     object: { typeOf: { $eq: factory.action.authorize.paymentMethod.any.ResultType.Payment } },
                     id: { $in: completedAuthorizeActionIds }
-                }, ['result']));
-                authorizeOfferActionsWithInstrument = (yield repos.action.search({
+                }, ['result']);
+                authorizeOfferActionsWithInstrument = await repos.action.search({
                     typeOf: factory.actionType.AuthorizeAction,
                     purpose: {
                         typeOf: { $in: [factory.transactionType.PlaceOrder] },
@@ -67,7 +56,7 @@ function createPlacingOrderFromExistingTransaction(params) {
                         }
                     },
                     id: { $in: completedAuthorizeActionIds }
-                }, ['instrument']));
+                }, ['instrument']);
             }
         }
         // orderedItem生成のためにacceptedOffersを取得
@@ -77,7 +66,7 @@ function createPlacingOrderFromExistingTransaction(params) {
             .map(({ instrument }) => String(instrument.transactionNumber));
         try {
             // すでにtypeOf: Orderに変更済の場合acceptedOffersは空になるが、そもそもorderedItemはその後上書きされないので、空のまま処理して問題なし
-            acceptedOffers = (yield repos.orderInTransaction.findAcceptedOffersByOrderNumber({ orderNumber: { $eq: orderNumber } }))
+            acceptedOffers = (await repos.orderInTransaction.findAcceptedOffersByOrderNumber({ orderNumber: { $eq: orderNumber } }))
                 .filter(({ serialNumber }) => typeof serialNumber === 'string' && serialNumbers.includes(serialNumber));
         }
         catch (error) {
@@ -92,5 +81,5 @@ function createPlacingOrderFromExistingTransaction(params) {
         }
         order = (0, factory_1.createPlacingOrder)({ transaction: placeOrderTransactionWithResult, authorizePaymentActions, acceptedOffers });
         return { order, placeOrderTransaction: placeOrderTransactionWithResult, serialNumbers };
-    });
+    };
 }

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

@@ -37,25 +37,33 @@ function createReservationAcceptedOffers(params) {
     };
 }
 function reservationOffers2orderedItem(params) {
-    var _a, _b;
     const reservationFor = params.reservationFor;
     const issuedThrough = params.issuedThrough;
     if (reservationFor.typeOf === factory.eventType.ScreeningEvent
         && issuedThrough.typeOf === factory.product.ProductType.EventService) {
         const reservationFor4orderedItem = {
-            location: Object.assign({ branchCode: reservationFor.location.branchCode, typeOf: reservationFor.location.typeOf }, (reservationFor.location.name !== undefined) ? { name: reservationFor.location.name } : undefined),
+            location: {
+                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,
             startDate: reservationFor.startDate,
             endDate: reservationFor.endDate
         };
-        return Object.assign(Object.assign({ typeOf: issuedThrough.typeOf, serviceOutput: {
+        return {
+            typeOf: issuedThrough.typeOf,
+            serviceOutput: {
                 typeOf: factory.reservationType.EventReservation,
                 reservationFor: reservationFor4orderedItem
-            } }, (typeof issuedThrough.id === 'string') ? { id: issuedThrough.id } : undefined), (typeof ((_a = issuedThrough.serviceType) === null || _a === void 0 ? void 0 : _a.typeOf) === 'string')
-            ? { serviceType: issuedThrough.serviceType }
-            : undefined);
+            },
+            ...(typeof issuedThrough.id === 'string') ? { id: issuedThrough.id } : undefined,
+            ...(typeof issuedThrough.serviceType?.typeOf === 'string')
+                ? { serviceType: issuedThrough.serviceType }
+                : undefined
+        };
     }
     else if (reservationFor.typeOf === factory.tripType.BusTrip
         && issuedThrough.typeOf === factory.product.ProductType.Transportation) {
@@ -65,32 +73,40 @@ function reservationOffers2orderedItem(params) {
             departureTime: reservationFor.departureTime,
             arrivalTime: reservationFor.arrivalTime
         };
-        return Object.assign(Object.assign({ typeOf: issuedThrough.typeOf, id: issuedThrough.id }, (typeof ((_b = issuedThrough.serviceType) === null || _b === void 0 ? void 0 : _b.typeOf) === 'string')
-            ? { serviceType: issuedThrough.serviceType }
-            : undefined), { serviceOutput: {
+        return {
+            typeOf: issuedThrough.typeOf,
+            id: issuedThrough.id,
+            ...(typeof issuedThrough.serviceType?.typeOf === 'string')
+                ? { serviceType: issuedThrough.serviceType }
+                : undefined,
+            serviceOutput: {
                 typeOf: factory.reservationType.ReservationPackage,
                 reservationFor: reservationFor4orderedItem
-            } });
+            }
+        };
     }
     else {
         throw new factory.errors.Internal('unexpected params on reservationOffers2orderedItem');
     }
 }
 function createProductItems(params) {
-    var _a;
     const orderedItems = [];
     const productIds = [];
     if (Array.isArray(params.productAcceptedOffers) && params.productAcceptedOffers.length > 0) {
         // プロダクトIDで最適化する
         const issuedThrough = params.productAcceptedOffers[0].itemOffered.issuedThrough;
-        if (typeof (issuedThrough === null || issuedThrough === void 0 ? void 0 : issuedThrough.id) === 'string') {
+        if (typeof issuedThrough?.id === 'string') {
             if (!productIds.includes(issuedThrough.id)) {
                 productIds.push(issuedThrough.id);
                 orderedItems.push({
                     typeOf: 'OrderItem',
-                    orderedItem: Object.assign({ id: String(issuedThrough.id), typeOf: issuedThrough.typeOf }, (typeof ((_a = issuedThrough.serviceType) === null || _a === void 0 ? void 0 : _a.typeOf) === 'string')
-                        ? { serviceType: issuedThrough.serviceType }
-                        : undefined)
+                    orderedItem: {
+                        id: String(issuedThrough.id),
+                        typeOf: issuedThrough.typeOf,
+                        ...(typeof issuedThrough.serviceType?.typeOf === 'string')
+                            ? { serviceType: issuedThrough.serviceType }
+                            : undefined
+                    }
                 });
             }
         }

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

@@ -11,7 +11,6 @@ function createPaymentMethods(params) {
     let price = 0;
     // 決済方法をセット
     params.authorizePaymentActions.forEach((a) => {
-        var _a, _b, _c;
         const resultAsInvoice = (Array.isArray(a.result))
             // ? a.result?.find(({ typeOf }) => typeOf === factory.action.authorize.paymentMethod.any.ResultType.Payment)
             ? a.result[0]
@@ -19,30 +18,40 @@ function createPaymentMethods(params) {
         if (resultAsInvoice === undefined) {
             throw new factory.errors.NotFound('authorizePaymentAction.resultAsInvoice'); // resultは必ず存在するはず
         }
-        const paymentMethodAmountCurrencyByAuthorizeAction = (_b = (_a = resultAsInvoice.paymentMethodAsObject) === null || _a === void 0 ? void 0 : _a.amount) === null || _b === void 0 ? void 0 : _b.currency;
+        const paymentMethodAmountCurrencyByAuthorizeAction = resultAsInvoice.paymentMethodAsObject?.amount?.currency;
         // 決済方法区分は必ず存在するはず(2023-08-15~)
-        const paymentMethodType = (_c = resultAsInvoice.paymentMethodAsObject) === null || _c === void 0 ? void 0 : _c.typeOf;
+        const paymentMethodType = resultAsInvoice.paymentMethodAsObject?.typeOf;
         if (typeof paymentMethodType !== 'string') {
             throw new factory.errors.NotFound('authorizePaymentAction.result.paymentMethodAsObject.typeOf');
         }
-        const paymentMethodOfInvoice = Object.assign({ identifier: paymentMethodType }, (typeof paymentMethodAmountCurrencyByAuthorizeAction === 'string') ?
-            { amount: { currency: paymentMethodAmountCurrencyByAuthorizeAction } } // CreditCardIFのカード通貨区分を追加(2023-08-15~)
-            : 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
-        ));
+        const paymentMethodOfInvoice = {
+            identifier: paymentMethodType, // 決済方法区分を保証(2023-08-28~)
+            ...(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,
+            paymentMethod: paymentMethodOfInvoice,
+            ...(resultAsInvoice.totalPaymentDue !== undefined) ? { totalPaymentDue: resultAsInvoice.totalPaymentDue } : undefined
+            // ...(USE_ORDER_PAYMENT_METHOD_TYPE_OF) // 完全廃止(2024-01-17~)
+            //     ? { typeOf: paymentMethodType }
+            //     : undefined
+        });
     });
     // 決済方法から注文金額の計算
     price += params.authorizePaymentActions
         .reduce((a, b) => {
-        var _a;
         const resultAsInvoice = (Array.isArray(b.result))
             // ? b.result?.find(({ typeOf }) => typeOf === factory.action.authorize.paymentMethod.any.ResultType.Payment)
             ? b.result[0]
             : undefined;
-        const jpyAmount = (((_a = resultAsInvoice === null || resultAsInvoice === void 0 ? void 0 : resultAsInvoice.totalPaymentDue) === null || _a === void 0 ? void 0 : _a.currency) === factory.priceCurrency.JPY)
+        const jpyAmount = (resultAsInvoice?.totalPaymentDue?.currency === factory.priceCurrency.JPY)
             ? resultAsInvoice.totalPaymentDue.value
             : 0;
         return a + jpyAmount;
@@ -50,26 +59,24 @@ function createPaymentMethods(params) {
     return { paymentMethods, price };
 }
 function createSeller(params) {
-    var _a;
     const seller = params.transaction.seller;
     return {
         id: seller.id,
-        name: (typeof seller.name === 'string') ? seller.name : String((_a = seller.name) === null || _a === void 0 ? void 0 : _a.ja),
+        name: (typeof seller.name === 'string') ? seller.name : String(seller.name?.ja),
         typeOf: seller.typeOf,
         // 追加特性を追加(2023-08-08~)
         additionalProperty: (Array.isArray(seller.additionalProperty)) ? seller.additionalProperty : []
     };
 }
 function createPlacingOrder(params) {
-    var _a, _b;
     const { transaction, authorizePaymentActions } = params;
-    const orderByTransaction = (_a = transaction.result) === null || _a === void 0 ? void 0 : _a.order;
+    const orderByTransaction = transaction.result?.order;
     if (orderByTransaction === undefined) {
         throw new factory.errors.NotFound('transaction.result.order');
     }
     const seller = createSeller({ transaction });
     const name = (typeof transaction.object.name === 'string') ? transaction.object.name : undefined;
-    const broker = (typeof ((_b = transaction.object.broker) === null || _b === void 0 ? void 0 : _b.typeOf) === 'string') ? transaction.object.broker : undefined;
+    const broker = (typeof transaction.object.broker?.typeOf === 'string') ? transaction.object.broker : undefined;
     const { paymentMethods, price } = createPaymentMethods({ authorizePaymentActions });
     const eventReservationAcceptedOffers = [];
     const productAcceptedOffers = [];
@@ -96,9 +103,15 @@ function createPlacingOrder(params) {
         productAcceptedOffers,
         moneyTransferAcceptedOffers
     });
-    return Object.assign(Object.assign(Object.assign(Object.assign({}, orderByTransaction), { seller, // 2024-06-17~
+    return {
+        ...orderByTransaction,
+        seller, // 2024-06-17~
         paymentMethods, // 2024-06-17~
-        price, orderDate: moment(orderByTransaction.orderDate)
-            .toDate(), orderedItem }), (typeof name === 'string') ? { name } : undefined), (typeof (broker === null || broker === void 0 ? void 0 : broker.typeOf) === 'string') ? { broker } : undefined // 2024-06-17~
-    );
+        price, // 2024-06-17~
+        orderDate: moment(orderByTransaction.orderDate)
+            .toDate(),
+        orderedItem, // 2024-06-18~
+        ...(typeof name === 'string') ? { name } : undefined, // 2024-06-17~
+        ...(typeof broker?.typeOf === 'string') ? { broker } : undefined // 2024-06-17~
+    };
 }

package/lib/chevre/service/order/placeOrder/voidAcceptedOfferIfNecessary.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.voidAcceptedOfferIfNecessary = voidAcceptedOfferIfNecessary;
 const createDebug = require("debug");
@@ -19,15 +10,15 @@ const debug = createDebug('chevre-domain:service:order');
 //     'id' | 'project' | 'typeOf' | 'result' | 'object' | 'seller'
 // >;
 function voidAcceptedOfferIfNecessary(params) {
-    return (repos) => __awaiter(this, void 0, void 0, function* () {
+    return async (repos) => {
         if (Array.isArray(params.serialNumbers) && params.serialNumbers.length > 0) {
             // 取引に保管された承認アクション以外のアクションについて、オファーを除外する
             debug('voidAcceptedOfferBySerialNumber processing...', params.object.orderNumber, 'serialNumbersMustBeIn:', params.serialNumbers);
-            const voidAcceptedOfferBySerialNumberResult = yield repos.orderInTransaction.voidAcceptedOfferBySerialNumber({
+            const voidAcceptedOfferBySerialNumberResult = await repos.orderInTransaction.voidAcceptedOfferBySerialNumber({
                 orderNumber: params.object.orderNumber,
                 acceptedOffers: { serialNumber: { $nin: params.serialNumbers } }
             });
             debug('voidAcceptedOfferBySerialNumber processed.', params.object.orderNumber, 'voidAcceptedOfferBySerialNumberResult:', voidAcceptedOfferBySerialNumberResult);
         }
-    });
+    };
 }

package/lib/chevre/service/order/placeOrder.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.placeOrder = placeOrder;
 const factory = require("../../factory");
@@ -19,14 +10,12 @@ const voidAcceptedOfferIfNecessary_1 = require("./placeOrder/voidAcceptedOfferIf
  * 注文を作成する
  */
 function placeOrder(params) {
-    // tslint:disable-next-line:max-func-body-length
-    return (repos, settings) => __awaiter(this, void 0, void 0, function* () {
-        var _a;
+    return async (repos, settings) => {
         if (typeof params.useOnOrderStatusChanged !== 'boolean') {
             throw new factory.errors.Argument('useOnOrderStatusChanged', 'must be boolean');
         }
         // 注文番号から取引と注文をfixする
-        const { order, placeOrderTransaction, serialNumbers } = yield (0, createPlacingOrderFromExistingTransaction_1.createPlacingOrderFromExistingTransaction)({
+        const { order, placeOrderTransaction, serialNumbers } = await (0, createPlacingOrderFromExistingTransaction_1.createPlacingOrderFromExistingTransaction)({
             project: { id: params.project.id },
             confirmationNumber: params.object.confirmationNumber,
             orderNumber: params.object.orderNumber
@@ -52,7 +41,7 @@ function placeOrder(params) {
             typeOf: placeOrderTransaction.typeOf, id: placeOrderTransaction.id
         };
         const orderActionAttributes = {
-            agent: (typeof ((_a = params.agent) === null || _a === void 0 ? void 0 : _a.typeOf) === 'string') ? params.agent : placeOrderTransaction.project,
+            agent: (typeof params.agent?.typeOf === 'string') ? params.agent : placeOrderTransaction.project,
             object: simpleOrder,
             // potentialActions: {}, // discontinue(2024-06-28~)
             project: placeOrderTransaction.project,
@@ -60,7 +49,7 @@ function placeOrder(params) {
             typeOf: factory.actionType.OrderAction
         };
         // 冪等性を担保(2023-05-31~)
-        const completedActions = yield repos.action.search({
+        const completedActions = await repos.action.search({
             limit: 1,
             page: 1,
             actionStatus: { $in: [factory.actionStatusType.CompletedActionStatus] },
@@ -72,32 +61,32 @@ function placeOrder(params) {
             }
         }, ['id']);
         if (completedActions.length === 0) {
-            const action = yield repos.action.start(orderActionAttributes);
+            const action = await repos.action.start(orderActionAttributes);
             try {
                 // 冗長なオファーを除外する(念のため)
-                yield (0, voidAcceptedOfferIfNecessary_1.voidAcceptedOfferIfNecessary)({
+                await (0, voidAcceptedOfferIfNecessary_1.voidAcceptedOfferIfNecessary)({
                     object: { orderNumber: order.orderNumber },
                     // purpose: placeOrderTransaction,
                     serialNumbers
                 })(repos);
-                yield repos.orderInTransaction.placeOrder(order);
+                await repos.orderInTransaction.placeOrder(order);
             }
             catch (error) {
                 try {
-                    yield repos.action.giveUp({ typeOf: orderActionAttributes.typeOf, id: action.id, error });
+                    await repos.action.giveUp({ typeOf: orderActionAttributes.typeOf, id: action.id, error });
                 }
                 catch (__) {
                     // 失敗したら仕方ない
                 }
                 throw error;
             }
-            yield repos.action.completeWithVoid({ typeOf: orderActionAttributes.typeOf, id: action.id, result: {} });
+            await repos.action.completeWithVoid({ typeOf: orderActionAttributes.typeOf, id: action.id, result: {} });
         }
         if (params.useOnOrderStatusChanged) {
             // 経理レポートを保管->CreateAccountingReportへ移行(2024-02-02~)
             // PaymentDueであればonOrderStatusChangedを実行(2023-08-23~)
             if (order.orderStatus === factory.orderStatus.OrderPaymentDue) {
-                yield (0, onOrderStatusChanged_1.onOrderPaymentDue)({
+                await (0, onOrderStatusChanged_1.onOrderPaymentDue)({
                     order: {
                         paymentMethods: order.paymentMethods,
                         project: placeOrderTransaction.project,
@@ -120,7 +109,7 @@ function placeOrder(params) {
             // paymentMethods.length: 0の場合を考慮(2023-08-24~)
             if (order.paymentMethods.length === 0) {
                 // paymentMethods.length: 0の場合に、confirmPayTransactionは実行されないので、ここで強制的にpaymentDue2Processingを実行する必要がある
-                yield (0, onAssetTransactionStatusChanged_1.paymentDue2Processing)({
+                await (0, onAssetTransactionStatusChanged_1.paymentDue2Processing)({
                     project: { id: placeOrderTransaction.project.id },
                     confirmationNumber: order.confirmationNumber,
                     orderNumber: order.orderNumber,
@@ -129,5 +118,5 @@ function placeOrder(params) {
             }
         }
         return { order };
-    });
+    };
 }