@chevre/domain 23.2.0-alpha.8 → 23.2.0

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

@@ -1,17 +1,42 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createPlacingOrder = createPlacingOrder;
 exports.createSeller = createSeller;
 exports.createPaymentMethods = createPaymentMethods;
-const moment = require("moment");
-const factory = require("../../../factory");
+const moment_1 = __importDefault(require("moment"));
+const factory = __importStar(require("../../../factory"));
 const orderedItem_1 = require("./factory/orderedItem");
 function createPaymentMethods(params) {
     const paymentMethods = [];
     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 +44,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 +85,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 +129,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: (0, moment_1.default)(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,33 +1,27 @@
 "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 __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.voidAcceptedOfferIfNecessary = voidAcceptedOfferIfNecessary;
-const createDebug = require("debug");
+const debug_1 = __importDefault(require("debug"));
 // import type { TransactionRepo } from '../../../repo/transaction';
 // import * as factory from '../../../factory';
-const debug = createDebug('chevre-domain:service:order');
+const debug = (0, debug_1.default)('chevre-domain:service:order');
 // type IPlaceOrderTransaction = Pick<
 //     factory.transaction.placeOrder.ITransaction,
 //     '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,16 +1,30 @@
 "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 __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.placeOrder = placeOrder;
-const factory = require("../../factory");
+const factory = __importStar(require("../../factory"));
 const onAssetTransactionStatusChanged_1 = require("./onAssetTransactionStatusChanged");
 const onOrderStatusChanged_1 = require("./onOrderStatusChanged");
 const createPlacingOrderFromExistingTransaction_1 = require("./placeOrder/createPlacingOrderFromExistingTransaction");
@@ -19,14 +33,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 +64,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 +72,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 +84,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 +132,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 +141,5 @@ function placeOrder(params) {
             }
         }
         return { order };
-    });
+    };
 }

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

@@ -1,22 +1,35 @@
 "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 __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.placeOrderWithoutTransaction = placeOrderWithoutTransaction;
-const factory = require("../../factory");
+const factory = __importStar(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 +45,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,31 +1,51 @@
 "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 __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.returnOrder = returnOrder;
-const createDebug = require("debug");
+const debug_1 = __importDefault(require("debug"));
 // import { createMaskedCustomer } from '../../factory/order';
 const onOrderStatusChanged_1 = require("./onOrderStatusChanged");
-const factory = require("../../factory");
+const factory = __importStar(require("../../factory"));
 // import { Settings } from '../../settings';
-const debug = createDebug('chevre-domain:service:order');
+const debug = (0, debug_1.default)('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 +54,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 +72,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 +107,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 +124,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 +132,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 +150,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 +183,8 @@ function processReturnOrder(order, dateReturned) {
                     }
                 });
                 returnedOwnershipInfos.push(ownershipInfoReturned);
-            })));
+            }));
         }
         return returnedOwnershipInfos;
-    });
+    };
 }