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

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

@@ -1,24 +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());
-    });
-};
-var __rest = (this && this.__rest) || function (s, e) {
-    var t = {};
-    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
-        t[p] = s[p];
-    if (s != null && typeof Object.getOwnPropertySymbols === "function")
-        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
-            if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
-                t[p[i]] = s[p[i]];
-        }
-    return t;
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getReturnPolicyByProject = getReturnPolicyByProject;
 const http_status_1 = require("http-status");
@@ -29,10 +9,9 @@ function createOrder4returnPolicy(params) {
         orderNumber: params.order.orderNumber,
         price: params.order.price,
         acceptedOffers: params.order.acceptedOffers.map((o) => {
-            var _a;
             if (o.itemOffered.typeOf === factory.reservationType.EventReservation) {
                 const reservation = o.itemOffered;
-                const priceComponent = (_a = o.priceSpecification) === null || _a === void 0 ? void 0 : _a.priceComponent;
+                const priceComponent = o.priceSpecification?.priceComponent;
                 return {
                     itemOffered: {
                         additionalProperty: reservation.additionalProperty,
@@ -49,7 +28,7 @@ function createOrder4returnPolicy(params) {
                     priceSpecification: {
                         priceComponent: (Array.isArray(priceComponent))
                             ? priceComponent.map((component) => {
-                                const { accounting, name, priceCurrency, valueAddedTaxIncluded } = component, postingComponent = __rest(component, ["accounting", "name", "priceCurrency", "valueAddedTaxIncluded"]);
+                                const { accounting, name, priceCurrency, valueAddedTaxIncluded, ...postingComponent } = component;
                                 return postingComponent;
                             })
                             : []
@@ -68,65 +47,66 @@ const TIMEOUT = 5000;
 /**
  * プロジェクトのカスタム返品ポリシーをリモートから取得する
  */
-function getReturnPolicyByProject(params) {
-    return __awaiter(this, void 0, void 0, function* () {
-        var _a;
-        // implement with fetch(2024-01-20~)
+async function getReturnPolicyByProject(params) {
+    // implement with fetch(2024-01-20~)
+    try {
+        const { identifier, sameAs } = params;
+        const res = await fetch(sameAs, {
+            method: 'POST',
+            headers: {
+                'Content-Type': 'application/json'
+            },
+            body: JSON.stringify({
+                order: createOrder4returnPolicy({ order: params.order })
+            }),
+            // body data type must match "Content-Type" header
+            signal: AbortSignal.timeout(TIMEOUT)
+        });
+        let body;
         try {
-            const { identifier, sameAs } = params;
-            const res = yield fetch(sameAs, {
-                method: 'POST',
-                headers: {
-                    'Content-Type': 'application/json'
-                },
-                body: JSON.stringify({
-                    order: createOrder4returnPolicy({ order: params.order })
-                }),
-                // body data type must match "Content-Type" header
-                signal: AbortSignal.timeout(TIMEOUT)
-            });
-            let body;
-            try {
-                body = (yield res.json());
-            }
-            catch (error) {
-                // no op
-            }
-            let returnPolicy;
-            switch (res.status) {
-                case http_status_1.OK:
-                case http_status_1.CREATED:
-                case http_status_1.ACCEPTED:
-                case http_status_1.NO_CONTENT:
-                    const restockingFeeValue = (_a = body === null || body === void 0 ? void 0 : body.restockingFee) === null || _a === void 0 ? void 0 : _a.value;
-                    if (typeof restockingFeeValue !== 'number') {
-                        throw new factory.errors.Internal('invalid return policy');
-                    }
-                    else {
-                        const itemCondition = body === null || body === void 0 ? void 0 : body.itemCondition;
-                        if (itemCondition !== undefined) {
-                            if (itemCondition !== factory.offerItemCondition.OfferItemCondition.NewCondition) {
-                                throw new factory.errors.Argument('', `unknown itemCondition: ${itemCondition}`);
-                            }
+            body = await res.json();
+        }
+        catch (error) {
+            // no op
+        }
+        let returnPolicy;
+        switch (res.status) {
+            case http_status_1.OK:
+            case http_status_1.CREATED:
+            case http_status_1.ACCEPTED:
+            case http_status_1.NO_CONTENT:
+                const restockingFeeValue = body?.restockingFee?.value;
+                if (typeof restockingFeeValue !== 'number') {
+                    throw new factory.errors.Internal('invalid return policy');
+                }
+                else {
+                    const itemCondition = body?.itemCondition;
+                    if (itemCondition !== undefined) {
+                        if (itemCondition !== factory.offerItemCondition.OfferItemCondition.NewCondition) {
+                            throw new factory.errors.Argument('', `unknown itemCondition: ${itemCondition}`);
                         }
-                        returnPolicy = Object.assign({ typeOf: 'MerchantReturnPolicy', restockingFee: {
-                                currency: factory.priceCurrency.JPY,
-                                typeOf: 'MonetaryAmount',
-                                value: restockingFeeValue
-                            }, identifier }, (typeof itemCondition === 'string') ? { itemCondition } : undefined // support itemCondition(2025-05-17~)
-                        );
                     }
-                    break;
-                case http_status_1.NOT_FOUND:
-                    throw new factory.errors.Argument('', `custom return policy returned statusCode: ${res.status}`);
-                // break;
-                default:
-                    throw new factory.errors.Internal(`ProjectReturnPolicy unavailable. statusCode: ${res.status} body: ${body}`);
-            }
-            return returnPolicy;
-        }
-        catch (err) {
-            throw err;
+                    returnPolicy = {
+                        typeOf: 'MerchantReturnPolicy',
+                        restockingFee: {
+                            currency: factory.priceCurrency.JPY,
+                            typeOf: 'MonetaryAmount',
+                            value: restockingFeeValue
+                        },
+                        identifier, // keep identifier(2024-06-26~)
+                        ...(typeof itemCondition === 'string') ? { itemCondition } : undefined // support itemCondition(2025-05-17~)
+                    };
+                }
+                break;
+            case http_status_1.NOT_FOUND:
+                throw new factory.errors.Argument('', `custom return policy returned statusCode: ${res.status}`);
+            // break;
+            default:
+                throw new factory.errors.Internal(`ProjectReturnPolicy unavailable. statusCode: ${res.status} body: ${body}`);
         }
-    });
+        return returnPolicy;
+    }
+    catch (err) {
+        throw err;
+    }
 }

package/lib/chevre/service/transaction/returnOrder/preStart.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.preStart = preStart;
 const createDebug = require("debug");
@@ -18,12 +9,11 @@ const debug = createDebug('chevre-domain:service');
  * 返品取引開始前処理
  */
 function preStart(params) {
-    // tslint:disable-next-line:max-func-body-length
-    return (repos) => __awaiter(this, void 0, void 0, function* () {
+    return async (repos) => {
         const now = new Date();
-        const { acceptedOffers, eventIds, offerIds, orders } = yield fixOrders(params)(repos);
+        const { acceptedOffers, eventIds, offerIds, orders } = await fixOrders(params)(repos);
         // sellerはorderから自動取得
-        const sellers = yield repos.seller.projectFields({
+        const sellers = await repos.seller.projectFields({
             limit: 1,
             page: 1,
             id: { $eq: String(orders[0].seller.id) }
@@ -32,17 +22,17 @@ function preStart(params) {
         if (seller === undefined) {
             throw new factory.errors.NotFound(factory.organizationType.Corporation);
         }
-        yield validateOrder({ orders })();
+        await validateOrder({ orders })();
         let offers = [];
         if (offerIds.length > 0) {
-            offers = yield repos.offer.search({
+            offers = await repos.offer.search({
                 id: { $in: offerIds }
             });
         }
         // イベント開始日時取得
         let events = [];
         if (eventIds.length > 0) {
-            events = yield repos.event.projectEventFields({
+            events = await repos.event.projectEventFields({
                 id: { $in: eventIds },
                 typeOf: factory.eventType.ScreeningEvent
             }, ['startDate']);
@@ -52,7 +42,7 @@ function preStart(params) {
             const sellerReturnPolicyIdentifiers = seller.hasMerchantReturnPolicy.map(({ identifier }) => identifier);
             // support sellerReturnPolicyRepo(2025-01-19~)
             if (sellerReturnPolicyIdentifiers.length > 0) {
-                returnPolicies = yield repos.sellerReturnPolicy.projectFields({
+                returnPolicies = await repos.sellerReturnPolicy.projectFields({
                     project: { id: { $eq: seller.project.id } },
                     identifier: { $in: sellerReturnPolicyIdentifiers }
                 }, ['applicablePaymentMethod', 'identifier', 'itemCondition', 'merchantReturnDays', 'restockingFee', 'typeOf']);
@@ -62,29 +52,35 @@ function preStart(params) {
         // アイテムコンディション取得
         let offerItemConditions = [];
         const itemConditionIds = returnPolicies
-            .filter((returnPolicy) => { var _a; return typeof ((_a = returnPolicy.itemCondition) === null || _a === void 0 ? void 0 : _a.id) === 'string'; })
-            .map((returnPolicy) => { var _a; return String((_a = returnPolicy.itemCondition) === null || _a === void 0 ? void 0 : _a.id); });
+            .filter((returnPolicy) => typeof returnPolicy.itemCondition?.id === 'string')
+            .map((returnPolicy) => String(returnPolicy.itemCondition?.id));
         if (itemConditionIds.length > 0) {
-            offerItemConditions = yield repos.offerItemCondition.projectFields({
+            offerItemConditions = await repos.offerItemCondition.projectFields({
                 id: { $in: itemConditionIds }
             }, ['id', 'identifier', 'itemOffered', 'typeOf']);
         }
-        const policiesByOffer = yield searchPoliciesByOffer({ offers })(repos);
-        const { usedReservationExists } = yield checkUsedReservationExists({ orders })(repos);
-        const { hasMerchantReturnPolicy } = yield repos.project.findById({
+        const policiesByOffer = await searchPoliciesByOffer({ offers })(repos);
+        const { usedReservationExists } = await checkUsedReservationExists({ orders })(repos);
+        const { hasMerchantReturnPolicy } = await repos.project.findById({
             id: seller.project.id,
             inclusion: ['hasMerchantReturnPolicy']
         });
-        const appliedReturnPolicy = yield (0, findApplicableReturnPolicy_1.findApplicableReturnPolicy)(Object.assign({ acceptedOffers,
+        const appliedReturnPolicy = await (0, findApplicableReturnPolicy_1.findApplicableReturnPolicy)({
+            acceptedOffers,
             events,
             offerItemConditions,
-            orders, returningDate: now, reason: params.object.reason, returnPolicies,
+            orders,
+            returningDate: now,
+            reason: params.object.reason,
+            returnPolicies,
             offers,
             policiesByOffer,
-            usedReservationExists }, (hasMerchantReturnPolicy !== undefined) ? { returnPolicySettingsByProject: hasMerchantReturnPolicy } : undefined));
+            usedReservationExists,
+            ...(hasMerchantReturnPolicy !== undefined) ? { returnPolicySettingsByProject: hasMerchantReturnPolicy } : undefined
+        });
         validateAppliedReturnPolicy({ merchantReturnPolicy: appliedReturnPolicy });
         // アイテム検証
-        yield validateItems({ orders, reason: params.object.reason })({ order: repos.order, reservation: repos.reservation });
+        await validateItems({ orders, reason: params.object.reason })({ order: repos.order, reservation: repos.reservation });
         const transactionObject = {
             order: orders.map(({ confirmationNumber, orderNumber }) => ({ confirmationNumber, orderNumber })),
             returnPolicy: appliedReturnPolicy,
@@ -100,10 +96,10 @@ function preStart(params) {
             throw new factory.errors.ArgumentNull('expiresInSeconds');
         }
         return { transactionObject, seller, expiresInSeconds };
-    });
+    };
 }
 function fixOrders(params) {
-    return (repos) => __awaiter(this, void 0, void 0, function* () {
+    return async (repos) => {
         if (!Array.isArray(params.object.order)) {
             params.object.order = [params.object.order];
         }
@@ -112,7 +108,7 @@ function fixOrders(params) {
             throw new factory.errors.Argument('object.order', 'number of orders must be 1');
         }
         // 注文数を1に限定であれば、findByConfirmationNumberに変更できる(2022-04-28~)
-        const orders = yield repos.order.projectFields({
+        const orders = await repos.order.projectFields({
             limit: 1,
             page: 1,
             project: { id: { $eq: params.project.id } },
@@ -136,45 +132,45 @@ function fixOrders(params) {
         if (orders.length !== params.object.order.length) {
             throw new factory.errors.NotFound('Order');
         }
-        const offerIds = yield repos.acceptedOffer.distinctValues({
+        const offerIds = await repos.acceptedOffer.distinctValues({
             orderNumber: { $in: [params.object.order[0].orderNumber] }
         }, 'acceptedOffers.id');
-        const eventIds = yield repos.acceptedOffer.distinctValues({
+        const eventIds = await repos.acceptedOffer.distinctValues({
             orderNumber: { $in: [params.object.order[0].orderNumber] }
         }, 'acceptedOffers.itemOffered.reservationFor.id');
         // const acceptedOffers = await repos.acceptedOffer.searchAcceptedOffersByOrderNumbers({
         //     orderNumber: { $in: [params.object.order[0].orderNumber] }
         // });
-        const acceptedOffers = yield repos.acceptedOffer.searchAcceptedOffersByOrderNumber({
+        const acceptedOffers = await repos.acceptedOffer.searchAcceptedOffersByOrderNumber({
             orderNumber: { $eq: params.object.order[0].orderNumber },
             project: { id: { $eq: params.project.id } }
         });
         return { acceptedOffers, eventIds, offerIds, orders };
-    });
+    };
 }
 function validateOrder(__) {
-    return () => __awaiter(this, void 0, void 0, function* () {
+    return async () => {
         // returnOrderタスクの処理の中でステータス整合性を担保しているので検証不要(2024-01-10~)
         // 注文ステータスが配送済の場合のみ受け付け
         // const allOrdersDelivered = params.orders.every((o) => o.orderStatus === factory.orderStatus.OrderDelivered);
         // if (!allOrdersDelivered) {
         //     throw new factory.errors.Argument('Order Number', 'Invalid Order Status');
         // }
-    });
+    };
 }
 function checkUsedReservationExists(params) {
-    return (repos) => __awaiter(this, void 0, void 0, function* () {
+    return async (repos) => {
         let usedReservationExists = false;
         // 注文に含まれる予約の状態検証
         // const reservationNumbers = await repos.acceptedOffer.searchReservationNumbersByOrderNumbers({
         //     orderNumber: { $in: params.orders.map((order) => order.orderNumber) }
         // });
-        const reservationNumbers = yield repos.acceptedOffer.distinctValues({
+        const reservationNumbers = await repos.acceptedOffer.distinctValues({
             orderNumber: { $in: params.orders.map((order) => order.orderNumber) }
         }, 'acceptedOffers.itemOffered.reservationNumber');
         if (reservationNumbers.length > 0) {
             // 使用済の予約がひとつでもあれば不可
-            const existingUsedReservations = yield repos.reservation.projectFields({
+            const existingUsedReservations = await repos.reservation.projectFields({
                 limit: 1,
                 page: 1,
                 typeOf: factory.reservationType.EventReservation,
@@ -186,10 +182,10 @@ function checkUsedReservationExists(params) {
             }
         }
         return { usedReservationExists };
-    });
+    };
 }
 function validateItems(params) {
-    return (__) => __awaiter(this, void 0, void 0, function* () {
+    return async (__) => {
         if (params.reason === factory.transaction.returnOrder.Reason.Seller) {
             // 販売者都合の場合、特に検証しない
             return;
@@ -212,10 +208,10 @@ function validateItems(params) {
         //         throw new factory.errors.Argument('orderNumber', 'some reservations already used');
         //     }
         // }
-    });
+    };
 }
 function searchPoliciesByOffer(params) {
-    return (repos) => __awaiter(this, void 0, void 0, function* () {
+    return async (repos) => {
         let merchantReturnPolicyIds = [];
         params.offers.forEach((offer) => {
             if (Array.isArray(offer.hasMerchantReturnPolicy) && offer.hasMerchantReturnPolicy.length > 0) {
@@ -225,7 +221,7 @@ function searchPoliciesByOffer(params) {
         merchantReturnPolicyIds = [...new Set(merchantReturnPolicyIds)];
         let policiesByOffer = [];
         if (merchantReturnPolicyIds.length > 0) {
-            policiesByOffer = yield repos.merchantReturnPolicy.search({
+            policiesByOffer = await repos.merchantReturnPolicy.search({
                 id: { $in: merchantReturnPolicyIds }
             });
         }
@@ -233,10 +229,9 @@ function searchPoliciesByOffer(params) {
             throw new factory.errors.NotFound('MerchantReturnPolicy with offers');
         }
         return policiesByOffer;
-    });
+    };
 }
 function validateAppliedReturnPolicy(params) {
-    var _a;
     const appliedReturnPolicy = params.merchantReturnPolicy;
     switch (appliedReturnPolicy.returnFees) {
         case factory.merchantReturnPolicy.ReturnFeesEnumeration.RestockingFees:
@@ -245,7 +240,7 @@ function validateAppliedReturnPolicy(params) {
                 throw new factory.errors.NotImplemented('restockingFee in type of number not implemented');
             }
             else {
-                const returnFeeByPolicy = (_a = appliedReturnPolicy.restockingFee) === null || _a === void 0 ? void 0 : _a.value;
+                const returnFeeByPolicy = appliedReturnPolicy.restockingFee?.value;
                 if (typeof returnFeeByPolicy !== 'number') {
                     throw new factory.errors.NotFound('appliedReturnPolicy.restockingFee.value');
                 }

package/lib/chevre/service/transaction/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.preStart = void 0;
 exports.start = start;
@@ -27,8 +18,8 @@ const errorHandler_1 = require("../../errorHandler");
  * 返品取引開始
  */
 function start(params) {
-    return (repos) => __awaiter(this, void 0, void 0, function* () {
-        const { transactionObject, expiresInSeconds, seller } = yield (0, preStart_1.preStart)(params)(repos);
+    return async (repos) => {
+        const { transactionObject, expiresInSeconds, seller } = await (0, preStart_1.preStart)(params)(repos);
         const returnOrderAttributes = {
             project: params.project,
             typeOf: factory.transactionType.ReturnOrder,
@@ -43,12 +34,11 @@ function start(params) {
         };
         let returnOrderTransaction;
         try {
-            returnOrderTransaction = yield repos.transaction.start(returnOrderAttributes);
+            returnOrderTransaction = await repos.transaction.start(returnOrderAttributes);
         }
         catch (error) {
-            if (yield (0, errorHandler_1.isMongoError)(error)) {
+            if (await (0, errorHandler_1.isMongoError)(error)) {
                 // 同一取引に対して返品取引を作成しようとすると、MongoDBでE11000 duplicate key errorが発生する
-                // tslint:disable-next-line:no-single-line-block-comment
                 /* istanbul ignore else */
                 if (error.code === errorHandler_1.MongoErrorCode.DuplicateKey) {
                     throw new factory.errors.Argument('orderNumber', 'Already returned');
@@ -57,10 +47,10 @@ function start(params) {
             throw error;
         }
         return returnOrderTransaction;
-    });
+    };
 }
 function saveMessagesIfNeeded(params) {
-    return (repos) => __awaiter(this, void 0, void 0, function* () {
+    return async (repos) => {
         const { project, order, emailMessages, seller } = params;
         if (emailMessages.length > 0) {
             const { orderNumber } = order;
@@ -75,7 +65,7 @@ function saveMessagesIfNeeded(params) {
             //     })
             // );
             for (const { identifier, name, about, text, toRecipient, sender } of emailMessages) {
-                yield repos.message.upsertOneByIdentifier({
+                await repos.message.upsertOneByIdentifier({
                     identifier, name, about, text, toRecipient, sender,
                     project: { id: project.id, typeOf: factory.organizationType.Project },
                     provider: { id: seller.id, typeOf: factory.organizationType.Corporation },
@@ -83,17 +73,16 @@ function saveMessagesIfNeeded(params) {
                 });
             }
         }
-    });
+    };
 }
 /**
  * 取引確定
  */
 function confirm(params) {
-    return (repos
+    return async (repos
     // settings: Settings
-    ) => __awaiter(this, void 0, void 0, function* () {
-        var _a;
-        const transaction = yield repos.transaction.projectFieldsById({ typeOf: factory.transactionType.ReturnOrder, id: params.id }, ['typeOf', 'status', 'project', 'agent', 'object', 'result']);
+    ) => {
+        const transaction = await repos.transaction.projectFieldsById({ typeOf: factory.transactionType.ReturnOrder, id: params.id }, ['typeOf', 'status', 'project', 'agent', 'object', 'result']);
         if (transaction.status === factory.transactionStatusType.Confirmed) {
             // すでに確定済の場合
             return transaction.result;
@@ -104,14 +93,14 @@ function confirm(params) {
         else if (transaction.status === factory.transactionStatusType.Canceled) {
             throw new factory.errors.Argument('transaction', 'Transaction already canceled');
         }
-        if (typeof ((_a = params.agent) === null || _a === void 0 ? void 0 : _a.id) === 'string' && transaction.agent.id !== params.agent.id) {
+        if (typeof params.agent?.id === 'string' && transaction.agent.id !== params.agent.id) {
             throw new factory.errors.Forbidden('Transaction not yours');
         }
         // ひとまず同時返品可能な注文数を1に限定(2022-04-28~)
         if (transaction.object.order.length !== 1) {
             throw new factory.errors.Argument('object.order', 'number of orders must be 1');
         }
-        const returningOrders = yield repos.order.projectFields({
+        const returningOrders = await repos.order.projectFields({
             limit: 1,
             page: 1,
             project: { id: { $eq: transaction.project.id } },
@@ -126,7 +115,7 @@ function confirm(params) {
         // デフォルトEメールメッセージを検索
         let emailMessageOnOrderReturned;
         if (repos.emailMessage !== undefined) {
-            const searchEmailMessagesResult = yield repos.emailMessage.search({
+            const searchEmailMessagesResult = await repos.emailMessage.search({
                 limit: 1,
                 page: 1,
                 project: { id: { $eq: transaction.project.id } },
@@ -134,27 +123,33 @@ function confirm(params) {
             });
             emailMessageOnOrderReturned = searchEmailMessagesResult.shift();
         }
-        const setting = yield repos.setting.findOne({ project: { id: { $eq: '*' } } }, ['defaultSenderEmail']);
-        if (typeof (setting === null || setting === void 0 ? void 0 : setting.defaultSenderEmail) !== 'string') {
+        const setting = await repos.setting.findOne({ project: { id: { $eq: '*' } } }, ['defaultSenderEmail']);
+        if (typeof setting?.defaultSenderEmail !== 'string') {
             throw new factory.errors.NotFound('setting.defaultSenderEmail');
         }
         const result = {};
-        const { emailMessages, potentialActions } = yield (0, potentialActions_1.createPotentialActions)(Object.assign(Object.assign({ dateReturned: params.object.order.dateReturned, orders: returningOrders, transaction: transaction }, (params.potentialActions !== undefined) ? { potentialActions: params.potentialActions } : undefined), (emailMessageOnOrderReturned !== undefined) ? { emailMessageOnOrderReturned } : undefined), 
+        const { emailMessages, potentialActions } = await (0, potentialActions_1.createPotentialActions)({
+            dateReturned: params.object.order.dateReturned,
+            orders: returningOrders,
+            transaction: transaction,
+            ...(params.potentialActions !== undefined) ? { potentialActions: params.potentialActions } : undefined,
+            ...(emailMessageOnOrderReturned !== undefined) ? { emailMessageOnOrderReturned } : undefined
+        }, 
         // settings
         setting);
         // save messages(2024-06-27~)
-        yield saveMessagesIfNeeded({
+        await saveMessagesIfNeeded({
             project: { id: transaction.project.id },
             order: { orderNumber: returningOrders[0].orderNumber }, seller: { id: returningOrders[0].seller.id }, emailMessages
         })(repos);
         // ステータス変更
-        yield repos.transaction.confirm({
+        await repos.transaction.confirm({
             typeOf: transaction.typeOf,
             id: transaction.id,
             result, potentialActions
         });
         return result;
-    });
+    };
 }
 /**
  * 取引のタスクを出力します
@@ -162,10 +157,10 @@ function confirm(params) {
  * この関数では、取引のタスクエクスポートステータスは見ません
  */
 function exportTasksById(params) {
-    return (repos
+    return async (repos
     // settings: Settings
-    ) => __awaiter(this, void 0, void 0, function* () {
-        const transaction = yield repos.transaction.projectFieldsById({ typeOf: factory.transactionType.ReturnOrder, id: params.id }, ['typeOf', 'status', 'project', 'endDate', 'startDate', 'object', 'potentialActions']);
+    ) => {
+        const transaction = await repos.transaction.projectFieldsById({ typeOf: factory.transactionType.ReturnOrder, id: params.id }, ['typeOf', 'status', 'project', 'endDate', 'startDate', 'object', 'potentialActions']);
         // タスク実行日時バッファの指定があれば調整
         let taskRunsAt = new Date();
         if (typeof params.runsTasksAfterInSeconds === 'number') {
@@ -174,13 +169,13 @@ function exportTasksById(params) {
                 .toDate();
         }
         // search settings
-        const setting = yield repos.setting.findOne({ project: { id: { $eq: '*' } } }, ['storage']);
+        const setting = await repos.setting.findOne({ project: { id: { $eq: '*' } } }, ['storage']);
         const taskAttributes = (0, factory_1.createTasks)({
             transaction,
             runsAt: taskRunsAt
         }, setting
         // settings
         );
-        yield repos.task.saveMany(taskAttributes, { emitImmediately: true });
-    });
+        await repos.task.saveMany(taskAttributes, { emitImmediately: true });
+    };
 }