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

package/lib/chevre/service/order/placeOrderWithoutTransaction.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.placeOrderWithoutTransaction = placeOrderWithoutTransaction;
 const factory = require("../../factory");
@@ -15,8 +6,7 @@ const factory = require("../../factory");
  * 注文取引なしに注文を作成する
  */
 function placeOrderWithoutTransaction(params) {
-    return (repos) => __awaiter(this, void 0, void 0, function* () {
-        var _a;
+    return async (repos) => {
         const order = params.object;
         const simpleOrder = {
             typeOf: order.typeOf,
@@ -32,28 +22,30 @@ function placeOrderWithoutTransaction(params) {
             orderDate: order.orderDate
         };
         const orderActionAttributes = {
-            agent: (typeof ((_a = params.agent) === null || _a === void 0 ? void 0 : _a.typeOf) === 'string') ? params.agent : order.project,
+            agent: (typeof params.agent?.typeOf === 'string') ? params.agent : order.project,
             object: simpleOrder,
             // potentialActions: {}, // discontinue(2024-06-28~)
             project: order.project,
             // purpose: { typeOf: placeOrderTransaction.typeOf, id: placeOrderTransaction.id },
             typeOf: factory.actionType.OrderAction
         };
-        const action = yield repos.action.start(orderActionAttributes);
+        const action = await repos.action.start(orderActionAttributes);
         try {
-            yield repos.order.createIfNotExist(Object.assign(Object.assign({}, order), { 
+            await repos.order.createIfNotExist({
+                ...order,
                 // discounts: [], // 廃止(2024-04-16~)
-                acceptedOffers: [] }));
+                acceptedOffers: []
+            });
         }
         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: {} });
+    };
 }

package/lib/chevre/service/order/returnOrder.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.returnOrder = returnOrder;
 const createDebug = require("debug");
@@ -18,14 +9,17 @@ const factory = require("../../factory");
 const debug = createDebug('chevre-domain:service:order');
 function createReturnPolicy(params) {
     const { identifier, returnFees, restockingFee, typeOf } = params.returnOrderTransaction.object.returnPolicy;
-    return Object.assign(Object.assign({ returnFees,
-        typeOf }, (typeof identifier === 'string') ? { identifier } : undefined), (typeof (restockingFee === null || restockingFee === void 0 ? void 0 : restockingFee.value) === 'number') ? { restockingFee } : undefined);
+    return {
+        returnFees,
+        typeOf,
+        ...(typeof identifier === 'string') ? { identifier } : undefined,
+        ...(typeof restockingFee?.value === 'number') ? { restockingFee } : undefined
+    };
 }
 function returnOrder(params) {
-    // tslint:disable-next-line:max-func-body-length
-    return (repos
+    return async (repos
     // settings: Settings
-    ) => __awaiter(this, void 0, void 0, function* () {
+    ) => {
         if (typeof params.useOnOrderStatusChanged !== 'boolean') {
             throw new factory.errors.Argument('useOnOrderStatusChanged', 'must be boolean');
         }
@@ -34,7 +28,7 @@ function returnOrder(params) {
             ? params.object.dateReturned
             : new Date();
         const returner = params.agent;
-        const order = yield repos.order.projectFieldsByOrderNumber({
+        const order = await repos.order.projectFieldsByOrderNumber({
             orderNumber,
             project: { id: params.project.id },
             inclusion: [
@@ -52,7 +46,7 @@ function returnOrder(params) {
                 throw new factory.errors.Argument('object.orderNumber', `orderStatus not returnable: ${order.orderStatus}`);
         }
         // 返品取引検索
-        const returnOrderTransactions = yield repos.transaction.projectFields({
+        const returnOrderTransactions = await repos.transaction.projectFields({
             limit: 1,
             page: 1,
             project: { id: { $eq: order.project.id } },
@@ -87,14 +81,14 @@ function returnOrder(params) {
         };
         let returnedOwnershipInfos = [];
         let returnedOrder;
-        const action = yield repos.action.start(returnOrderActionAttributes);
+        const action = await repos.action.start(returnOrderActionAttributes);
         try {
-            returnedOwnershipInfos = yield processReturnOrder(order, dateReturned)({
+            returnedOwnershipInfos = await processReturnOrder(order, dateReturned)({
                 acceptedOffer: repos.acceptedOffer,
                 ownershipInfo: repos.ownershipInfo
             });
             // 注文ステータス変更
-            returnedOrder = yield repos.order.returnOrder({
+            returnedOrder = await repos.order.returnOrder({
                 project: { id: order.project.id },
                 orderNumber,
                 dateReturned,
@@ -104,7 +98,7 @@ function returnOrder(params) {
         }
         catch (error) {
             try {
-                yield repos.action.giveUp({ typeOf: action.typeOf, id: action.id, error });
+                await repos.action.giveUp({ typeOf: action.typeOf, id: action.id, error });
             }
             catch (__) {
                 // 失敗したら仕方ない
@@ -112,9 +106,9 @@ function returnOrder(params) {
             throw error;
         }
         const result = returnedOwnershipInfos;
-        yield repos.action.completeWithVoid({ typeOf: action.typeOf, id: action.id, result });
+        await repos.action.completeWithVoid({ typeOf: action.typeOf, id: action.id, result });
         if (params.useOnOrderStatusChanged) {
-            yield (0, onOrderStatusChanged_1.onOrderReturned)({
+            await (0, onOrderStatusChanged_1.onOrderReturned)({
                 order: {
                     project: returnedOrder.project,
                     typeOf: returnedOrder.typeOf,
@@ -130,22 +124,25 @@ function returnOrder(params) {
                     orderStatus: factory.orderStatus.OrderReturned
                 },
                 returnOrderTransaction,
-                returnOrderAction: Object.assign(Object.assign({}, returnOrderActionAttributes), { id: action.id })
+                returnOrderAction: {
+                    ...returnOrderActionAttributes,
+                    id: action.id
+                }
             })(repos
             // settings
             );
         }
-    });
+    };
 }
 function processReturnOrder(order, dateReturned) {
-    return (repos) => __awaiter(this, void 0, void 0, function* () {
+    return async (repos) => {
         const returnedOwnershipInfos = [];
         // 所有権の所有期間変更
         // 注文オファーリポジトリから所有権識別子を検索する(2023-12-07~)
-        const ownershipInfos = yield repos.acceptedOffer.aggreateOwnershipInfosByOrder({ orderNumber: { $eq: order.orderNumber } });
+        const ownershipInfos = await repos.acceptedOffer.aggreateOwnershipInfosByOrder({ orderNumber: { $eq: order.orderNumber } });
         if (Array.isArray(ownershipInfos)) {
-            yield Promise.all(ownershipInfos.map((ownershipInfo) => __awaiter(this, void 0, void 0, function* () {
-                const ownershipInfoReturned = yield repos.ownershipInfo.findByIdentifierAndUpdateOwnedThrough({
+            await Promise.all(ownershipInfos.map(async (ownershipInfo) => {
+                const ownershipInfoReturned = await repos.ownershipInfo.findByIdentifierAndUpdateOwnedThrough({
                     project: { id: order.project.id },
                     identifier: String(ownershipInfo.identifier),
                     ownedThrough: dateReturned
@@ -160,8 +157,8 @@ function processReturnOrder(order, dateReturned) {
                     }
                 });
                 returnedOwnershipInfos.push(ownershipInfoReturned);
-            })));
+            }));
         }
         return returnedOwnershipInfos;
-    });
+    };
 }

package/lib/chevre/service/order/sendOrder.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.sendOrder = sendOrder;
 const createDebug = require("debug");
@@ -21,18 +12,16 @@ const debug = createDebug('chevre-domain:service:order');
  * 注文を配送する
  */
 function sendOrder(params) {
-    // tslint:disable-next-line:max-func-body-length
-    return (repos
+    return async (repos
     // settings: Settings
-    ) => __awaiter(this, void 0, void 0, function* () {
-        var _a, _b, _c;
+    ) => {
         if (typeof params.useOnOrderStatusChanged !== 'boolean') {
             throw new factory.errors.Argument('useOnOrderStatusChanged', 'must be boolean');
         }
-        if (typeof ((_a = params.object.acceptedOffers) === null || _a === void 0 ? void 0 : _a.limit) !== 'number') {
+        if (typeof params.object.acceptedOffers?.limit !== 'number') {
             throw new factory.errors.Argument('object.acceptedOffers.limit', 'must be number');
         }
-        if (typeof ((_b = params.object.acceptedOffers) === null || _b === void 0 ? void 0 : _b.page) !== 'number') {
+        if (typeof params.object.acceptedOffers?.page !== 'number') {
             throw new factory.errors.Argument('object.acceptedOffers.page', 'must be number');
         }
         if (params.object.acceptedOffers.limit <= 0) {
@@ -44,13 +33,13 @@ function sendOrder(params) {
         try {
             const orderNumber = params.object.orderNumber;
             const confirmationNumber = params.object.confirmationNumber;
-            const placeOrderTransaction = yield (0, findPlaceOrderTransaction_1.findPlaceOrderTransaction)({
+            const placeOrderTransaction = await (0, findPlaceOrderTransaction_1.findPlaceOrderTransaction)({
                 project: { id: params.project.id },
                 confirmationNumber,
                 orderNumber
             })({ transaction: repos.transaction });
             // 注文取得
-            let order = yield repos.order.projectFieldsByOrderNumber({
+            let order = await repos.order.projectFieldsByOrderNumber({
                 orderNumber,
                 project: { id: params.project.id },
                 inclusion: ['confirmationNumber', 'project', 'typeOf', 'seller', 'orderNumber', 'price', 'priceCurrency', 'orderDate', 'customer']
@@ -78,16 +67,19 @@ function sendOrder(params) {
                 orderDate: order.orderDate
             };
             const { limit, page } = params.object.acceptedOffers;
-            const sendOrderObject = Object.assign(Object.assign({}, simpleOrder), { acceptedOffers: { limit, page } });
+            const sendOrderObject = {
+                ...simpleOrder,
+                acceptedOffers: { limit, page }
+            };
             const sendOrderActionAttributes = {
-                agent: (typeof ((_c = params.agent) === null || _c === void 0 ? void 0 : _c.typeOf) === 'string') ? params.agent : order.project,
+                agent: (typeof params.agent?.typeOf === 'string') ? params.agent : order.project,
                 object: sendOrderObject,
                 // potentialActions: {},
                 project: order.project,
                 recipient: { id: order.customer.id, typeOf: order.customer.typeOf },
                 typeOf: factory.actionType.SendAction
             };
-            const action = yield repos.action.start(sendOrderActionAttributes);
+            const action = await repos.action.start(sendOrderActionAttributes);
             let creatingOwnershipInfos = [];
             let createdOwnershipInfos = [];
             let allOffersDelivered = false;
@@ -102,7 +94,7 @@ function sendOrder(params) {
             }
             try {
                 const offerIndexBase = (limit * (page - 1));
-                const searchSlicedAcceptedOffersResult = yield repos.acceptedOffer.searchSlicedAcceptedOffersByOrderNumber({
+                const searchSlicedAcceptedOffersResult = await repos.acceptedOffer.searchSlicedAcceptedOffersByOrderNumber({
                     $slice: [offerIndexBase, limit],
                     orderNumber: { $eq: order.orderNumber },
                     project: { id: { $eq: order.project.id } }
@@ -112,20 +104,23 @@ function sendOrder(params) {
                 // 所有権作成
                 if (createOwnerships) {
                     creatingOwnershipInfos = (0, factory_1.createOwnershipInfosFromOrder)({
-                        order: Object.assign(Object.assign({}, order), { acceptedOffers }),
+                        order: { ...order, acceptedOffers },
                         offerIndexBase
                     });
-                    createdOwnershipInfos = yield Promise.all(creatingOwnershipInfos.map((creatingOwnershipInfo) => __awaiter(this, void 0, void 0, function* () {
-                        const { id } = yield repos.ownershipInfo.createIfNotExistByIdentifier(creatingOwnershipInfo);
-                        return Object.assign({ id }, (typeof creatingOwnershipInfo.identifier === 'string')
-                            ? { identifier: creatingOwnershipInfo.identifier }
-                            : undefined);
-                    })));
+                    createdOwnershipInfos = await Promise.all(creatingOwnershipInfos.map(async (creatingOwnershipInfo) => {
+                        const { id } = await repos.ownershipInfo.createIfNotExistByIdentifier(creatingOwnershipInfo);
+                        return {
+                            id,
+                            ...(typeof creatingOwnershipInfo.identifier === 'string')
+                                ? { identifier: creatingOwnershipInfo.identifier }
+                                : undefined
+                        };
+                    }));
                 }
                 // const deliveredCount = limit * page;
                 // debug(deliveredCount, 'delivered.', order.orderNumber, params.object.acceptedOffers);
                 if (acceptedOffers.length === 0) {
-                    order = yield repos.order.changeStatus({
+                    order = await repos.order.changeStatus({
                         project: { id: order.project.id },
                         orderNumber,
                         orderStatus: factory.orderStatus.OrderDelivered,
@@ -136,7 +131,7 @@ function sendOrder(params) {
             }
             catch (error) {
                 try {
-                    yield repos.action.giveUp({ typeOf: sendOrderActionAttributes.typeOf, id: action.id, error });
+                    await repos.action.giveUp({ typeOf: sendOrderActionAttributes.typeOf, id: action.id, error });
                 }
                 catch (_) {
                     // no op
@@ -144,11 +139,11 @@ function sendOrder(params) {
                 throw error;
             }
             const result = createdOwnershipInfos;
-            yield repos.action.completeWithVoid({ typeOf: sendOrderActionAttributes.typeOf, id: action.id, result: result });
+            await repos.action.completeWithVoid({ typeOf: sendOrderActionAttributes.typeOf, id: action.id, result: result });
             debug('allOffersDelivered?:', allOffersDelivered, order.orderNumber);
             if (params.useOnOrderStatusChanged) {
                 if (allOffersDelivered) {
-                    yield (0, onOrderStatusChanged_1.onOrderDelivered)({
+                    await (0, onOrderStatusChanged_1.onOrderDelivered)({
                         order: {
                             id: order.id,
                             customer: order.customer,
@@ -164,8 +159,13 @@ function sendOrder(params) {
                     })(repos);
                 }
                 else {
-                    yield (0, onOrderStatusChanged_1.onOrderDeliveredPartially)({
-                        order: Object.assign(Object.assign({}, order), { acceptedOffers: params.object.acceptedOffers, orderStatus: params.object.previousOrderStatus, deliveredAcceptedOffers: acceptedOffers })
+                    await (0, onOrderStatusChanged_1.onOrderDeliveredPartially)({
+                        order: {
+                            ...order,
+                            acceptedOffers: params.object.acceptedOffers,
+                            orderStatus: params.object.previousOrderStatus,
+                            deliveredAcceptedOffers: acceptedOffers
+                        }
                     })(repos);
                 }
             }
@@ -173,17 +173,17 @@ function sendOrder(params) {
         catch (error) {
             let throwsError = true;
             // すでにOrderReturnedだった場合、OrderDelivered->OrderReturnedの処理自体は成功しているので、後処理を続行する
-            const currentOrder = yield repos.order.projectFieldsByOrderNumber({
+            const currentOrder = await repos.order.projectFieldsByOrderNumber({
                 orderNumber: params.object.orderNumber,
                 project: { id: params.project.id },
                 inclusion: ['orderStatus']
             });
-            if ((currentOrder === null || currentOrder === void 0 ? void 0 : currentOrder.orderStatus) === factory.orderStatus.OrderReturned) {
+            if (currentOrder?.orderStatus === factory.orderStatus.OrderReturned) {
                 throwsError = false;
             }
             if (throwsError) {
                 throw error;
             }
         }
-    });
+    };
 }

package/lib/chevre/service/payment/any/authorize/fixTransactionNumber.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.fixTransactionNumber = fixTransactionNumber;
 const factory = require("../../../../factory");
@@ -17,8 +8,7 @@ const handlePrePublishedPaymentMethodIdOnAuthorizing_1 = require("./handlePrePub
  * 決済承認時の取引番号を決定する
  */
 function fixTransactionNumber(params) {
-    return (repos) => __awaiter(this, void 0, void 0, function* () {
-        var _a, _b, _c, _d, _e, _f;
+    return async (repos) => {
         const { paymentServiceType, transaction, object } = params;
         // 取引番号生成
         let transactionNumber;
@@ -27,7 +17,7 @@ function fixTransactionNumber(params) {
         let invoiceByTicketToken;
         let ticketToken;
         // ticketTokenを解釈(2024-08-13~)
-        const { verifyPaymentMethodTicketResult } = yield (0, verifyTicketTokenAsNeeded_1.verifyTicketTokenAsNeeded)({
+        const { verifyPaymentMethodTicketResult } = await (0, verifyTicketTokenAsNeeded_1.verifyTicketTokenAsNeeded)({
             project: { id: transaction.project.id },
             object: object,
             paymentServiceType,
@@ -37,17 +27,17 @@ function fixTransactionNumber(params) {
          * ticketTokenによって指定された決済方法ID
          */
         let paymentMethodIdByTicketToken;
-        if (((_a = verifyPaymentMethodTicketResult === null || verifyPaymentMethodTicketResult === void 0 ? void 0 : verifyPaymentMethodTicketResult.invoiceByTicketToken) === null || _a === void 0 ? void 0 : _a.typeOf) === factory.permit.PermitType.Permit) {
-            throw new factory.errors.Argument('ticketToken', `typeOfGood.typeOf ${(_b = verifyPaymentMethodTicketResult === null || verifyPaymentMethodTicketResult === void 0 ? void 0 : verifyPaymentMethodTicketResult.invoiceByTicketToken) === null || _b === void 0 ? void 0 : _b.typeOf} discontinued`);
+        if (verifyPaymentMethodTicketResult?.invoiceByTicketToken?.typeOf === factory.permit.PermitType.Permit) {
+            throw new factory.errors.Argument('ticketToken', `typeOfGood.typeOf ${verifyPaymentMethodTicketResult?.invoiceByTicketToken?.typeOf} discontinued`);
             // paymentMethodIdByTicketToken = permitOrInvoice?.identifier;
             // if (typeof paymentMethodIdByTicketToken === 'string') {
             //     transactionNumber = paymentMethodIdByTicketToken; // メンバーシップ指定の場合、取引番号に適用(2024-08-13~)
             // }
         }
-        else if (((_c = verifyPaymentMethodTicketResult === null || verifyPaymentMethodTicketResult === void 0 ? void 0 : verifyPaymentMethodTicketResult.invoiceByTicketToken) === null || _c === void 0 ? void 0 : _c.typeOf) === 'Invoice') {
+        else if (verifyPaymentMethodTicketResult?.invoiceByTicketToken?.typeOf === 'Invoice') {
             // support paymentServiceType.MovieTicket(2024-11-23~)
-            if (typeof ((_d = verifyPaymentMethodTicketResult.invoiceByTicketToken) === null || _d === void 0 ? void 0 : _d.paymentMethodId) === 'string') {
-                paymentMethodIdByTicketToken = (_e = verifyPaymentMethodTicketResult.invoiceByTicketToken) === null || _e === void 0 ? void 0 : _e.paymentMethodId;
+            if (typeof verifyPaymentMethodTicketResult.invoiceByTicketToken?.paymentMethodId === 'string') {
+                paymentMethodIdByTicketToken = verifyPaymentMethodTicketResult.invoiceByTicketToken?.paymentMethodId;
                 if (typeof paymentMethodIdByTicketToken === 'string') {
                     transactionNumber = paymentMethodIdByTicketToken;
                     invoiceByTicketToken = verifyPaymentMethodTicketResult.invoiceByTicketToken;
@@ -63,7 +53,7 @@ function fixTransactionNumber(params) {
                     throw new factory.errors.Argument('ticketToken', 'not matched with paymentMethodId');
                 }
             }
-            const { authorizeParams, existingCompletedAuthorizeAction } = yield (0, handlePrePublishedPaymentMethodIdOnAuthorizing_1.handlePrePublishedPaymentMethodIdOnAuthorizing)({
+            const { authorizeParams, existingCompletedAuthorizeAction } = await (0, handlePrePublishedPaymentMethodIdOnAuthorizing_1.handlePrePublishedPaymentMethodIdOnAuthorizing)({
                 object: object,
                 prePublishedPaymentMethodId: object.paymentMethodId,
                 transaction
@@ -77,7 +67,7 @@ function fixTransactionNumber(params) {
                 creditCard = authorizeParams.creditCard;
                 transactionNumber = object.paymentMethodId;
                 pendingPaymentAgencyTransaction = authorizeParams.pendingPaymentAgencyTransaction;
-                if (typeof ((_f = authorizeParams.acceptAction2ticketResult) === null || _f === void 0 ? void 0 : _f.ticketToken) === 'string') {
+                if (typeof authorizeParams.acceptAction2ticketResult?.ticketToken === 'string') {
                     invoiceByTicketToken = authorizeParams.acceptAction2ticketResult.invoiceByTicketToken;
                     ticketToken = authorizeParams.acceptAction2ticketResult.ticketToken;
                 }
@@ -88,12 +78,16 @@ function fixTransactionNumber(params) {
         }
         // 取引番号発行済でなければ発行
         if (typeof transactionNumber !== 'string') {
-            const publishTransactionNumberResult = yield repos.transactionNumber.publishByTimestamp({ startDate: new Date() });
+            const publishTransactionNumberResult = await repos.transactionNumber.publishByTimestamp({ startDate: new Date() });
             transactionNumber = publishTransactionNumberResult.transactionNumber;
         }
-        return Object.assign(Object.assign(Object.assign({ transactionNumber,
-            ticketToken }, (pendingPaymentAgencyTransaction !== undefined) ? { pendingPaymentAgencyTransaction } : undefined), (creditCard !== undefined) ? { creditCard } : undefined), (invoiceByTicketToken !== undefined) ? { invoiceByTicketToken } : undefined
-        // ...(permitOrInvoice !== undefined) ? { permitOrInvoice } : undefined
-        );
-    });
+        return {
+            transactionNumber,
+            ticketToken,
+            ...(pendingPaymentAgencyTransaction !== undefined) ? { pendingPaymentAgencyTransaction } : undefined,
+            ...(creditCard !== undefined) ? { creditCard } : undefined,
+            ...(invoiceByTicketToken !== undefined) ? { invoiceByTicketToken } : undefined
+            // ...(permitOrInvoice !== undefined) ? { permitOrInvoice } : undefined
+        };
+    };
 }

package/lib/chevre/service/payment/any/authorize/handlePrePublishedPaymentMethodIdOnAuthorizing.js

@@ -1,20 +1,10 @@
 "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.handlePrePublishedPaymentMethodIdOnAuthorizing = handlePrePublishedPaymentMethodIdOnAuthorizing;
 const createDebug = require("debug");
 const factory = require("../../../../factory");
 const debug = createDebug('chevre-domain:service:payment');
 function recipe2paymentAgencyTransaction(actionRecipe) {
-    var _a;
     let entryTranArgs;
     let entryTranResult;
     let execTranArgs;
@@ -23,18 +13,17 @@ function recipe2paymentAgencyTransaction(actionRecipe) {
         throw new factory.errors.NotFound('', `Recipe with category ${factory.recipe.RecipeCategory.publishPaymentUrl} not found`);
     }
     const howToSection = actionRecipe.step;
-    const howToSteps = (_a = howToSection.at(0)) === null || _a === void 0 ? void 0 : _a.itemListElement;
+    const howToSteps = howToSection.at(0)?.itemListElement;
     if (Array.isArray(howToSteps)) {
         howToSteps.forEach((howToStep) => {
-            var _a, _b, _c, _d;
             const stepIdentifier = howToStep.identifier;
             if (stepIdentifier === factory.recipe.StepIdentifier.entryTran) {
-                entryTranArgs = (_a = howToStep.itemListElement.at(0)) === null || _a === void 0 ? void 0 : _a.beforeMedia;
-                entryTranResult = (_b = howToStep.itemListElement.at(0)) === null || _b === void 0 ? void 0 : _b.afterMedia;
+                entryTranArgs = howToStep.itemListElement.at(0)?.beforeMedia;
+                entryTranResult = howToStep.itemListElement.at(0)?.afterMedia;
             }
             else if (stepIdentifier === factory.recipe.StepIdentifier.execTran) {
-                execTranArgs = (_c = howToStep.itemListElement.at(0)) === null || _c === void 0 ? void 0 : _c.beforeMedia;
-                execTranResult = (_d = howToStep.itemListElement.at(0)) === null || _d === void 0 ? void 0 : _d.afterMedia;
+                execTranArgs = howToStep.itemListElement.at(0)?.beforeMedia;
+                execTranResult = howToStep.itemListElement.at(0)?.afterMedia;
             }
             else {
                 throw new factory.errors.NotImplemented(`howToStep.identifier '${stepIdentifier}' not implemented`);
@@ -51,14 +40,12 @@ function recipe2paymentAgencyTransaction(actionRecipe) {
  * 決済採用アクションから決済方法チケットを参照する
  */
 function acceptAction2ticket(params) {
-    // tslint:disable-next-line:cyclomatic-complexity
-    return (repos) => __awaiter(this, void 0, void 0, function* () {
-        var _a, _b;
+    return async (repos) => {
         const { acceptPayAction, project } = params;
-        const ticketToken = (_b = (_a = acceptPayAction.instrument) === null || _a === void 0 ? void 0 : _a.find((ticketAsInstrument) => ticketAsInstrument.typeOf === 'Ticket')) === null || _b === void 0 ? void 0 : _b.ticketToken;
+        const ticketToken = acceptPayAction.instrument?.find((ticketAsInstrument) => ticketAsInstrument.typeOf === 'Ticket')?.ticketToken;
         let acceptAction2ticketResult;
         if (typeof ticketToken === 'string' && ticketToken !== '') {
-            const ticket = (yield repos.ticket.findTickets({
+            const ticket = (await repos.ticket.findTickets({
                 limit: 1,
                 page: 1,
                 project: { id: { $eq: project.id } },
@@ -68,7 +55,7 @@ function acceptAction2ticket(params) {
                 throw new factory.errors.NotFound('Ticket');
             }
             // 承認を参照
-            const validAuthorization = yield repos.authorization.findValidOneByCode({
+            const validAuthorization = await repos.authorization.findValidOneByCode({
                 project: { id: params.project.id },
                 code: ticket.ticketToken
             });
@@ -96,24 +83,23 @@ function acceptAction2ticket(params) {
             }
         }
         return { acceptAction2ticketResult };
-    });
+    };
 }
 /**
  * 決済承認前の決済採用アクションを参照する
  */
-// tslint:disable-next-line:max-func-body-length
 function handlePrePublishedPaymentMethodIdOnAuthorizing(params) {
-    return (repos) => __awaiter(this, void 0, void 0, function* () {
+    return async (repos) => {
         let creditCard;
         let pendingPaymentAgencyTransaction;
         let existingCompletedAuthorizeAction;
         let acceptPayAction;
         // transaction.objectへのアクセス回避(2024-05-30~)
         // const paymentMethodByTransaction = transaction.object.paymentMethods;
-        const paymentMethodByTransaction = yield repos.transaction.findInProgressPaymentMethodId({ id: params.transaction.id });
-        if (params.prePublishedPaymentMethodId === (paymentMethodByTransaction === null || paymentMethodByTransaction === void 0 ? void 0 : paymentMethodByTransaction.paymentMethodId)) {
+        const paymentMethodByTransaction = await repos.transaction.findInProgressPaymentMethodId({ id: params.transaction.id });
+        if (params.prePublishedPaymentMethodId === paymentMethodByTransaction?.paymentMethodId) {
             // check existence of acceptAction when authorizing payment(2024-06-01~)
-            acceptPayAction = (yield repos.action.search({
+            acceptPayAction = (await repos.action.search({
                 limit: 1,
                 page: 1,
                 project: { id: { $eq: params.transaction.project.id } },
@@ -130,18 +116,18 @@ function handlePrePublishedPaymentMethodIdOnAuthorizing(params) {
             }
             debug('acceptPayAction found:', acceptPayAction.id);
             // find recipe(2024-06-02~)
-            const actionRecipe = yield repos.action.findRecipeByAction({
+            const actionRecipe = await repos.action.findRecipeByAction({
                 project: { id: params.transaction.project.id },
                 recipeFor: { id: acceptPayAction.id }
             });
-            debug('actionRecipe found:', actionRecipe === null || actionRecipe === void 0 ? void 0 : actionRecipe.recipeCategory);
+            debug('actionRecipe found:', actionRecipe?.recipeCategory);
             // 検証強化(2024-01-04~)
             validatePaymentMethodByTransaction({
                 object: params.object,
                 acceptObject: acceptPayAction.object
             });
             // use actionRecipe(2024-06-02~)
-            if (typeof (actionRecipe === null || actionRecipe === void 0 ? void 0 : actionRecipe.recipeCategory) === 'string') {
+            if (typeof actionRecipe?.recipeCategory === 'string') {
                 pendingPaymentAgencyTransaction = recipe2paymentAgencyTransaction(actionRecipe);
                 creditCard = acceptPayAction.object.object.paymentMethod.creditCard;
             }
@@ -157,7 +143,7 @@ function handlePrePublishedPaymentMethodIdOnAuthorizing(params) {
                 throw new factory.errors.Argument('paymentMethodId', 'pendingPaymentAgencyTransaction not found');
             }
             // 既に承認済であれば何もしない(2023-05-15~)
-            const existingCompletedAuthorizeActions = yield repos.action.searchByPurpose({
+            const existingCompletedAuthorizeActions = await repos.action.searchByPurpose({
                 typeOf: factory.actionType.AuthorizeAction,
                 purpose: { id: params.transaction.id, typeOf: params.transaction.typeOf },
                 actionStatus: { $eq: factory.actionStatusType.CompletedActionStatus },
@@ -174,7 +160,7 @@ function handlePrePublishedPaymentMethodIdOnAuthorizing(params) {
                 };
             }
             // 採用アクションのinstrumentから、決済方法チケットを参照する(2025-11-23~)
-            const { acceptAction2ticketResult } = yield acceptAction2ticket({
+            const { acceptAction2ticketResult } = await acceptAction2ticket({
                 project: { id: params.transaction.project.id },
                 acceptPayAction
             })(repos);
@@ -186,19 +172,18 @@ function handlePrePublishedPaymentMethodIdOnAuthorizing(params) {
             // 取引にないpaymentMethodIdの指定はクライアントエラー
             throw new factory.errors.Argument('paymentMethodId', 'invalid paymentMethodId for the transaction');
         }
-    });
+    };
 }
 /**
  * 決済採用と決済承認の整合性を検証する
  */
 function validatePaymentMethodByTransaction(params) {
-    var _a, _b, _c, _d;
     const paymentServiceIdByObject = params.object.issuedThrough.id;
     const amountByObject = params.object.amount;
     const paymentMethodTypeByObject = params.object.paymentMethod;
     const paymentServiceIdByTransaction = params.acceptObject.object.id;
-    const amountByTransaction = (_a = params.acceptObject.object.paymentMethod) === null || _a === void 0 ? void 0 : _a.amount;
-    const paymentMethodTypeByTransaction = (_b = params.acceptObject.object.paymentMethod) === null || _b === void 0 ? void 0 : _b.identifier;
+    const amountByTransaction = params.acceptObject.object.paymentMethod?.amount;
+    const paymentMethodTypeByTransaction = params.acceptObject.object.paymentMethod?.identifier;
     // 決済サービスID検証
     if (paymentServiceIdByObject !== paymentServiceIdByTransaction) {
         throw new factory.errors.Argument('object.issuedThrough.id', 'issuedThrough.id must match the target of the paymentUrl');
@@ -214,8 +199,8 @@ function validatePaymentMethodByTransaction(params) {
     // 注文アイテム検証(2025-11-25)
     let eventIdsMustBe = [];
     let eventIdsByAuthorizeAction = [];
-    const orderedItemsByAcceptAction = (_c = params.acceptObject.object.serviceOutput) === null || _c === void 0 ? void 0 : _c.referencesOrder.orderedItem;
-    const orderedItemsByAuthorizeAction = (_d = params.object.referencesOrder) === null || _d === void 0 ? void 0 : _d.orderedItem;
+    const orderedItemsByAcceptAction = params.acceptObject.object.serviceOutput?.referencesOrder.orderedItem;
+    const orderedItemsByAuthorizeAction = params.object.referencesOrder?.orderedItem;
     if (Array.isArray(orderedItemsByAcceptAction)) {
         eventIdsMustBe = orderedItemsByAcceptAction.map((orderedItem) => orderedItem.orderedItem.serviceOutput.reservationFor.id);
     }