@chevre/domain 23.2.0-alpha.9 → 24.0.0-alpha.0

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

@@ -1,24 +1,38 @@
 "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.deleteOrder = deleteOrder;
 const factory_1 = require("../delivery/factory");
-const factory = require("../../factory");
+const factory = __importStar(require("../../factory"));
 /**
  * 注文に関わるリソースを削除する
  * 冪等性を確保すること
  */
 function deleteOrder(params) {
-    return (repos) => __awaiter(this, void 0, void 0, function* () {
-        const orders = yield repos.order.projectFields({
+    return async (repos) => {
+        const orders = await repos.order.projectFields({
             limit: 1,
             page: 1,
             orderNumbers: [params.object.orderNumber]
@@ -32,45 +46,43 @@ function deleteOrder(params) {
             throw new factory.errors.Internal(`order.id undefined. orderNumber: ${params.object.orderNumber}`);
         }
         // 注文アイテムの予約を削除
-        yield deleteReservationsByOrder(order)(repos);
+        await deleteReservationsByOrder(order)(repos);
         // 所有権削除
         try {
-            yield deleteOwnershipInfosByOrder(order)(repos);
+            await deleteOwnershipInfosByOrder(order)(repos);
         }
         catch (error) {
-            // tslint:disable-next-line:no-console
             console.error('deleteOwnershipInfosByOrder throws', error);
         }
         // 経理レポート削除
-        yield repos.accountingReport.deleteByOrderNumber({ mainEntity: { orderNumber: order.orderNumber } });
+        await repos.accountingReport.deleteByOrderNumber({ mainEntity: { orderNumber: order.orderNumber } });
         // メモ削除(2024-02-15~)
-        yield repos.note.deleteNotesByAbout({
+        await repos.note.deleteNotesByAbout({
             about: {
                 id: order.id,
                 typeOf: factory.order.OrderType.Order
             }
         });
         // 注文削除
-        yield repos.order.deleteByOrderNumber({ orderNumber: order.orderNumber });
+        await repos.order.deleteByOrderNumber({ orderNumber: order.orderNumber });
         // deletePerson(2024-12-25~)
-        yield deletePersonIfNecessary(order)(repos);
-    });
+        await deletePersonIfNecessary(order)(repos);
+    };
 }
 function deletePersonIfNecessary(order) {
-    return (repos) => __awaiter(this, void 0, void 0, function* () {
-        var _a;
+    return async (repos) => {
         // 代理注文を除く
         const isCustomerPerson = order.customer.typeOf === factory.personType.Person
-            && typeof ((_a = order.broker) === null || _a === void 0 ? void 0 : _a.typeOf) !== 'string';
+            && typeof order.broker?.typeOf !== 'string';
         if (isCustomerPerson) {
-            const ordersByPerson = yield repos.order.projectFields({
+            const ordersByPerson = await repos.order.projectFields({
                 limit: 1,
                 page: 1,
                 customer: { ids: [order.customer.id] }
             }, { inclusion: ['orderNumber'] });
             if (ordersByPerson.length === 0) {
-                const setting = yield repos.setting.findOne({ project: { id: { $eq: '*' } } }, ['userPoolIdNew']);
-                if (typeof (setting === null || setting === void 0 ? void 0 : setting.userPoolIdNew) !== 'string') {
+                const setting = await repos.setting.findOne({ project: { id: { $eq: '*' } } }, ['userPoolIdNew']);
+                if (typeof setting?.userPoolIdNew !== 'string') {
                     throw new factory.errors.NotFound('setting.userPoolIdNew');
                 }
                 const deletePersonTask = {
@@ -96,14 +108,14 @@ function deletePersonIfNecessary(order) {
                         executeBackground: true
                     }
                 };
-                yield repos.task.saveMany([deletePersonTask], { emitImmediately: true });
+                await repos.task.saveMany([deletePersonTask], { emitImmediately: true });
             }
         }
-    });
+    };
 }
 function deleteReservationsByOrder(order) {
-    return (repos) => __awaiter(this, void 0, void 0, function* () {
-        const acceptedOffers = yield repos.acceptedOffer.searchAcceptedOffersByOrderNumber({
+    return async (repos) => {
+        const acceptedOffers = await repos.acceptedOffer.searchAcceptedOffersByOrderNumber({
             orderNumber: { $eq: order.orderNumber },
             project: { id: { $eq: order.project.id } },
             acceptedOffers: {
@@ -112,28 +124,31 @@ function deleteReservationsByOrder(order) {
         });
         const reservationIds = acceptedOffers.map((o) => String(o.itemOffered.id));
         if (reservationIds.length > 0) {
-            yield repos.reservation.deleteByIds({ project: { id: order.project.id }, ids: reservationIds });
+            await repos.reservation.deleteByIds({ project: { id: order.project.id }, ids: reservationIds });
         }
-    });
+    };
 }
 function deleteOwnershipInfosByOrder(order) {
-    return (repos) => __awaiter(this, void 0, void 0, function* () {
+    return async (repos) => {
         const now = new Date();
         const ownershipInfos = (0, factory_1.createOwnershipInfosFromOrder)({
-            order: Object.assign(Object.assign({}, order), { acceptedOffers: yield repos.acceptedOffer.searchAcceptedOffersByOrderNumber({
+            order: {
+                ...order,
+                acceptedOffers: await repos.acceptedOffer.searchAcceptedOffersByOrderNumber({
                     orderNumber: { $eq: order.orderNumber },
                     project: { id: { $eq: order.project.id } }
-                }) }),
+                })
+            },
             offerIndexBase: 0
         });
         const ownershipIdentifiers = ownershipInfos.map((o) => String(o.identifier));
         if (ownershipIdentifiers.length > 0) {
-            yield repos.ownershipInfo.deleteExpiredByIdentifiers({
+            await repos.ownershipInfo.deleteExpiredByIdentifiers({
                 project: { id: order.project.id },
                 identifiers: ownershipIdentifiers,
                 // 所有期限切れのもの(ownedThroughの存在しないものは削除してはいけない)
                 ownedThrough: { $lt: now }
             });
         }
-    });
+    };
 }

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

@@ -1,19 +1,33 @@
 "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.findPlaceOrderTransaction = findPlaceOrderTransaction;
-const factory = require("../../factory");
+const factory = __importStar(require("../../factory"));
 function findPlaceOrderTransaction(params) {
-    return (repos) => __awaiter(this, void 0, void 0, function* () {
-        const placeOrderTransactions = yield repos.transaction.projectFields({
+    return async (repos) => {
+        const placeOrderTransactions = await repos.transaction.projectFields({
             limit: 1,
             page: 1,
             project: { id: { $eq: params.project.id } },
@@ -32,5 +46,5 @@ function findPlaceOrderTransaction(params) {
             throw new factory.errors.NotFound(factory.transactionType.PlaceOrder);
         }
         return placeOrderTransaction;
-    });
+    };
 }

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

@@ -1,39 +1,54 @@
 "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.onAssetTransactionStatusChanged = onAssetTransactionStatusChanged;
 exports.paymentDue2Processing = paymentDue2Processing;
 exports.processing2inTransit = processing2inTransit;
-const createDebug = require("debug");
+const debug_1 = __importDefault(require("debug"));
 const findPlaceOrderTransaction_1 = require("./findPlaceOrderTransaction");
 const onOrderStatusChanged_1 = require("./onOrderStatusChanged");
-const factory = require("../../factory");
-const debug = createDebug('chevre-domain:service:order');
+const factory = __importStar(require("../../factory"));
+const debug = (0, debug_1.default)('chevre-domain:service:order');
 function onAssetTransactionStatusChanged(params) {
-    // tslint:disable-next-line:cyclomatic-complexity max-func-body-length
-    return (repos, settings) => __awaiter(this, void 0, void 0, function* () {
-        var _a, _b, _c, _d, _e;
+    return async (repos, settings) => {
         if (typeof params.useOnOrderStatusChanged !== 'boolean') {
             throw new factory.errors.Argument('useOnOrderStatusChanged', 'must be boolean');
         }
         switch (params.object.status) {
             case factory.transactionStatusType.Confirmed:
-                const orderNumber = (_a = params.purpose) === null || _a === void 0 ? void 0 : _a.orderNumber;
-                const confirmationNumber = (_b = params.purpose) === null || _b === void 0 ? void 0 : _b.confirmationNumber;
+                const orderNumber = params.purpose?.orderNumber;
+                const confirmationNumber = params.purpose?.confirmationNumber;
                 switch (params.object.typeOf) {
                     case factory.assetTransactionType.Pay:
                         // 確定時の決済方法区分指定(2023-08-29~)
-                        const specifiedPaymentMethodIdentifire = (_e = (_d = (_c = params.object) === null || _c === void 0 ? void 0 : _c.object) === null || _d === void 0 ? void 0 : _d.paymentMethod) === null || _e === void 0 ? void 0 : _e.identifier;
+                        const specifiedPaymentMethodIdentifire = params.object?.object?.paymentMethod?.identifier;
                         if (typeof specifiedPaymentMethodIdentifire === 'string' && specifiedPaymentMethodIdentifire.length > 0) {
-                            yield fixPaymentMethodIdentifierIfPossible({
+                            await fixPaymentMethodIdentifierIfPossible({
                                 project: { id: params.project.id },
                                 paymentMethodId: params.object.transactionNumber,
                                 paymentMethod: { identifier: specifiedPaymentMethodIdentifire },
@@ -42,9 +57,9 @@ function onAssetTransactionStatusChanged(params) {
                         }
                         if (typeof orderNumber === 'string' && typeof confirmationNumber === 'string') {
                             // PayTransactionのステータス検証
-                            const processable = yield isProcessable({ project: { id: params.project.id }, orderNumber })(repos);
+                            const processable = await isProcessable({ project: { id: params.project.id }, orderNumber })(repos);
                             if (processable) {
-                                yield paymentDue2Processing({
+                                await paymentDue2Processing({
                                     project: { id: params.project.id },
                                     confirmationNumber,
                                     orderNumber,
@@ -58,7 +73,7 @@ function onAssetTransactionStatusChanged(params) {
                             // 基本的に1注文に1予約番号なのでdeliverable = true
                             const deliverable = true;
                             if (deliverable) {
-                                yield processing2inTransit({
+                                await processing2inTransit({
                                     project: { id: params.project.id },
                                     // confirmationNumber,
                                     orderNumber,
@@ -70,13 +85,13 @@ function onAssetTransactionStatusChanged(params) {
                     case factory.assetTransactionType.Reserve:
                         if (typeof orderNumber === 'string' && typeof confirmationNumber === 'string') {
                             // ReserveTransactionのステータス検証
-                            const deliverable = yield isDeliverable({
+                            const deliverable = await isDeliverable({
                                 project: { id: params.project.id },
                                 orderNumber,
                                 assetTransactionType: params.object.typeOf
                             })(repos);
                             if (deliverable) {
-                                yield processing2inTransit({
+                                await processing2inTransit({
                                     project: { id: params.project.id },
                                     // confirmationNumber,
                                     orderNumber,
@@ -87,13 +102,13 @@ function onAssetTransactionStatusChanged(params) {
                         break;
                     case factory.assetTransactionType.MoneyTransfer:
                         if (typeof orderNumber === 'string' && typeof confirmationNumber === 'string') {
-                            const deliverable = yield isDeliverable({
+                            const deliverable = await isDeliverable({
                                 project: { id: params.project.id },
                                 orderNumber,
                                 assetTransactionType: params.object.typeOf
                             })(repos);
                             if (deliverable) {
-                                yield processing2inTransit({
+                                await processing2inTransit({
                                     project: { id: params.project.id },
                                     // confirmationNumber,
                                     orderNumber,
@@ -104,13 +119,13 @@ function onAssetTransactionStatusChanged(params) {
                         break;
                     case factory.assetTransactionType.RegisterService:
                         if (typeof orderNumber === 'string' && typeof confirmationNumber === 'string') {
-                            const deliverable = yield isDeliverable({
+                            const deliverable = await isDeliverable({
                                 project: { id: params.project.id },
                                 orderNumber,
                                 assetTransactionType: params.object.typeOf
                             })(repos);
                             if (deliverable) {
-                                yield processing2inTransit({
+                                await processing2inTransit({
                                     project: { id: params.project.id },
                                     // confirmationNumber,
                                     orderNumber,
@@ -128,7 +143,7 @@ function onAssetTransactionStatusChanged(params) {
                 switch (params.object.typeOf) {
                     case factory.assetTransactionType.Pay:
                         // 注文が存在すればキャンセル(2023-08-30~)
-                        yield cancelOrderIfExist({
+                        await cancelOrderIfExist({
                             project: { id: params.project.id },
                             paymentMethodId: params.object.transactionNumber,
                             useOnOrderStatusChanged: params.useOnOrderStatusChanged
@@ -141,11 +156,11 @@ function onAssetTransactionStatusChanged(params) {
             default:
             // no op
         }
-    });
+    };
 }
 function fixPaymentMethodIdentifierIfPossible(params) {
-    return (repos) => __awaiter(this, void 0, void 0, function* () {
-        const referencedPayTransactions = yield repos.assetTransaction.search({
+    return async (repos) => {
+        const referencedPayTransactions = await repos.assetTransaction.search({
             project: { id: { $eq: params.project.id } },
             typeOf: factory.assetTransactionType.Pay,
             statuses: [factory.transactionStatusType.Confirmed],
@@ -158,7 +173,7 @@ function fixPaymentMethodIdentifierIfPossible(params) {
         // 対面決済かつ決済取引上の決済方法区分と一致すれば、注文を変更
         if (referencedPayTransaction.object.typeOf === factory.service.paymentService.PaymentServiceType.FaceToFace
             && referencedPayTransaction.object.paymentMethod.identifier === params.paymentMethod.identifier) {
-            yield repos.order.fixPaymentMethodIdentifier({
+            await repos.order.fixPaymentMethodIdentifier({
                 project: { id: params.project.id },
                 orderNumber: params.referencesOrder.orderNumber,
                 invoice: {
@@ -167,12 +182,12 @@ function fixPaymentMethodIdentifierIfPossible(params) {
                 }
             });
         }
-    });
+    };
 }
 function isProcessable(params) {
-    return (repos) => __awaiter(this, void 0, void 0, function* () {
+    return async (repos) => {
         // 注文のpaymentMethodIdを取得
-        const order = yield repos.order.projectFieldsByOrderNumber({
+        const order = await repos.order.projectFieldsByOrderNumber({
             orderNumber: params.orderNumber,
             project: { id: params.project.id },
             inclusion: ['paymentMethods']
@@ -182,7 +197,7 @@ function isProcessable(params) {
         const paymentMethodIds = order.paymentMethods.filter((invoice) => typeof invoice.paymentMethodId === 'string' && invoice.paymentMethodId.length > 0)
             .map((invoice) => invoice.paymentMethodId);
         if (paymentMethodIds.length > 0) {
-            const referencedPayTransactions = yield repos.assetTransaction.search({
+            const referencedPayTransactions = await repos.assetTransaction.search({
                 project: { id: { $eq: params.project.id } },
                 typeOf: factory.assetTransactionType.Pay,
                 transactionNumber: { $in: paymentMethodIds }
@@ -194,12 +209,11 @@ function isProcessable(params) {
             allPayTransactionConfirmed = true;
         }
         return allPayTransactionConfirmed;
-    });
+    };
 }
-// tslint:disable-next-line:max-func-body-length
 function paymentDue2Processing(params) {
-    return (repos, settings) => __awaiter(this, void 0, void 0, function* () {
-        const placeOrderTransaction = yield (0, findPlaceOrderTransaction_1.findPlaceOrderTransaction)({
+    return async (repos, settings) => {
+        const placeOrderTransaction = await (0, findPlaceOrderTransaction_1.findPlaceOrderTransaction)({
             project: { id: params.project.id },
             confirmationNumber: params.confirmationNumber,
             orderNumber: params.orderNumber
@@ -211,7 +225,7 @@ function paymentDue2Processing(params) {
         // });
         let order;
         try {
-            order = yield repos.order.changeStatus({
+            order = await repos.order.changeStatus({
                 project: { id: params.project.id },
                 orderNumber: params.orderNumber,
                 orderStatus: factory.orderStatus.OrderProcessing,
@@ -221,7 +235,7 @@ function paymentDue2Processing(params) {
         catch (error) {
             let throwsError = true;
             // すでにステータスが進行していた場合、OrderPaymentDue->OrderProcessingの処理自体は成功しているので、後処理を続行する
-            order = yield repos.order.projectFieldsByOrderNumber({
+            order = await repos.order.projectFieldsByOrderNumber({
                 orderNumber: params.orderNumber,
                 project: { id: params.project.id },
                 inclusion: [
@@ -248,33 +262,36 @@ function paymentDue2Processing(params) {
             //     },
             //     ['itemOffered', 'offeredThrough']
             // );
-            const { numAcceptedOffers } = yield repos.acceptedOffer.countByOrderNumber({
+            const { numAcceptedOffers } = await repos.acceptedOffer.countByOrderNumber({
                 orderNumber: { $eq: order.orderNumber },
                 project: { id: { $eq: params.project.id } }
             });
-            const itemOfferedTypeOfs = yield repos.acceptedOffer.distinctValues({ orderNumber: { $in: [params.orderNumber] } }, 'acceptedOffers.itemOffered.typeOf');
-            const serialNumbers = yield repos.acceptedOffer.distinctValues({ orderNumber: { $in: [params.orderNumber] } }, 'acceptedOffers.serialNumber');
-            const offeredThroughIdentifier = (yield repos.acceptedOffer.distinctValues({ orderNumber: { $in: [params.orderNumber] } }, 'acceptedOffers.offeredThrough.identifier')).shift();
+            const itemOfferedTypeOfs = await repos.acceptedOffer.distinctValues({ orderNumber: { $in: [params.orderNumber] } }, 'acceptedOffers.itemOffered.typeOf');
+            const serialNumbers = await repos.acceptedOffer.distinctValues({ orderNumber: { $in: [params.orderNumber] } }, 'acceptedOffers.serialNumber');
+            const offeredThroughIdentifier = (await repos.acceptedOffer.distinctValues({ orderNumber: { $in: [params.orderNumber] } }, 'acceptedOffers.offeredThrough.identifier')).shift();
             debug('onAssetTransactionStatusChanged paymentDue2Processing: calling onOrderProcessing...', 'numAcceptedOffers:', numAcceptedOffers, 'itemOfferedTypeOfs:', itemOfferedTypeOfs, 'serialNumbers:', serialNumbers, 'offeredThroughIdentifier:', offeredThroughIdentifier);
-            yield (0, onOrderStatusChanged_1.onOrderProcessing)({
-                order: Object.assign(Object.assign({}, order), { 
+            await (0, onOrderStatusChanged_1.onOrderProcessing)({
+                order: {
+                    ...order,
                     // acceptedOffers,
-                    numAcceptedOffers, itemOfferedTypeOf: itemOfferedTypeOfs[0], // 1つしかない前提
+                    numAcceptedOffers,
+                    itemOfferedTypeOf: itemOfferedTypeOfs[0], // 1つしかない前提
                     serialNumbers,
-                    offeredThroughIdentifier, orderStatus: factory.orderStatus.OrderProcessing // 強制的にOrderProcessingとして処理する
-                 }),
+                    offeredThroughIdentifier,
+                    orderStatus: factory.orderStatus.OrderProcessing // 強制的にOrderProcessingとして処理する
+                },
                 placeOrderTransaction
             })(repos, settings);
         }
-    });
+    };
 }
 function cancelOrderIfExist(params) {
-    return (repos) => __awaiter(this, void 0, void 0, function* () {
+    return async (repos) => {
         if (params.paymentMethodId.length === 0) {
             return;
         }
         // 注文のpaymentMethodIdを取得
-        const ordersByPaymentMethodId = yield repos.order.projectFields({
+        const ordersByPaymentMethodId = await repos.order.projectFields({
             limit: 1,
             page: 1,
             paymentMethods: {
@@ -284,14 +301,14 @@ function cancelOrderIfExist(params) {
         }, { inclusion: ['confirmationNumber', 'orderNumber'] });
         const orderByPaymentMethodId = ordersByPaymentMethodId.shift();
         if (orderByPaymentMethodId !== undefined) {
-            const placeOrderTransaction = yield (0, findPlaceOrderTransaction_1.findPlaceOrderTransaction)({
+            const placeOrderTransaction = await (0, findPlaceOrderTransaction_1.findPlaceOrderTransaction)({
                 project: { id: params.project.id },
                 confirmationNumber: orderByPaymentMethodId.confirmationNumber,
                 orderNumber: orderByPaymentMethodId.orderNumber
             })({ transaction: repos.transaction });
             let order;
             try {
-                order = yield repos.order.changeStatus({
+                order = await repos.order.changeStatus({
                     project: { id: params.project.id },
                     orderNumber: orderByPaymentMethodId.orderNumber,
                     orderStatus: factory.orderStatus.OrderCancelled,
@@ -302,7 +319,7 @@ function cancelOrderIfExist(params) {
                 throw error;
             }
             if (params.useOnOrderStatusChanged) {
-                yield (0, onOrderStatusChanged_1.onOrderCancelled)({
+                await (0, onOrderStatusChanged_1.onOrderCancelled)({
                     order: {
                         orderDate: order.orderDate,
                         orderNumber: order.orderNumber,
@@ -314,10 +331,10 @@ function cancelOrderIfExist(params) {
                 });
             }
         }
-    });
+    };
 }
 function isDeliverable(params) {
-    return (repos) => __awaiter(this, void 0, void 0, function* () {
+    return async (repos) => {
         let allReserveTransactionConfirmed = false;
         let allMoneyTransferTransactionConfirmed = false;
         let allRegisterServiceTransactionConfirmed = false;
@@ -325,9 +342,9 @@ function isDeliverable(params) {
             allMoneyTransferTransactionConfirmed = true;
             allRegisterServiceTransactionConfirmed = true;
             // 注文のreservationNumberを取得
-            const reservationNumbers = yield repos.acceptedOffer.distinctValues({ orderNumber: { $in: [params.orderNumber] } }, 'acceptedOffers.itemOffered.reservationNumber');
+            const reservationNumbers = await repos.acceptedOffer.distinctValues({ orderNumber: { $in: [params.orderNumber] } }, 'acceptedOffers.itemOffered.reservationNumber');
             if (reservationNumbers.length > 0) {
-                const referencedReserveTransactions = yield repos.assetTransaction.search({
+                const referencedReserveTransactions = await repos.assetTransaction.search({
                     project: { id: { $eq: params.project.id } },
                     typeOf: factory.assetTransactionType.Reserve,
                     transactionNumber: { $in: reservationNumbers }
@@ -344,10 +361,10 @@ function isDeliverable(params) {
             allReserveTransactionConfirmed = true;
             allRegisterServiceTransactionConfirmed = true;
             // 注文のMoneyTransferTransaction.transactionNumberを取得
-            const moneyTransferTransactionNumbers = yield repos.acceptedOffer.distinctValues({ orderNumber: { $in: [params.orderNumber] } }, 'acceptedOffers.serialNumber');
+            const moneyTransferTransactionNumbers = await repos.acceptedOffer.distinctValues({ orderNumber: { $in: [params.orderNumber] } }, 'acceptedOffers.serialNumber');
             if (moneyTransferTransactionNumbers.length > 0) {
                 debug('is deliverable?...', params.orderNumber, 'moneyTransferTransactionNumbers:', moneyTransferTransactionNumbers);
-                const referencedMoneyTransferTransactions = yield repos.assetTransaction.search({
+                const referencedMoneyTransferTransactions = await repos.assetTransaction.search({
                     project: { id: { $eq: params.project.id } },
                     typeOf: factory.assetTransactionType.MoneyTransfer,
                     transactionNumber: { $in: moneyTransferTransactionNumbers }
@@ -363,9 +380,9 @@ function isDeliverable(params) {
         else if (params.assetTransactionType === factory.assetTransactionType.RegisterService) {
             allReserveTransactionConfirmed = true;
             allMoneyTransferTransactionConfirmed = true;
-            const registerServiceTransactionNumbers = yield repos.acceptedOffer.distinctValues({ orderNumber: { $in: [params.orderNumber] } }, 'acceptedOffers.serialNumber');
+            const registerServiceTransactionNumbers = await repos.acceptedOffer.distinctValues({ orderNumber: { $in: [params.orderNumber] } }, 'acceptedOffers.serialNumber');
             if (registerServiceTransactionNumbers.length > 0) {
-                const referencedRegisterServiceTransactions = yield repos.assetTransaction.search({
+                const referencedRegisterServiceTransactions = await repos.assetTransaction.search({
                     project: { id: { $eq: params.project.id } },
                     typeOf: factory.assetTransactionType.RegisterService,
                     transactionNumber: { $in: registerServiceTransactionNumbers }
@@ -379,10 +396,10 @@ function isDeliverable(params) {
             }
         }
         return allReserveTransactionConfirmed && allMoneyTransferTransactionConfirmed && allRegisterServiceTransactionConfirmed;
-    });
+    };
 }
 function processing2inTransit(params) {
-    return (repos, settings) => __awaiter(this, void 0, void 0, function* () {
+    return async (repos, settings) => {
         // const existingOrder: Pick<factory.order.IOrder, 'project'> = await repos.order.projectFieldsByOrderNumber({
         //     orderNumber: params.orderNumber,
         //     project: { id: params.project.id },
@@ -390,7 +407,7 @@ function processing2inTransit(params) {
         // });
         let order;
         try {
-            order = yield repos.order.changeStatus({
+            order = await repos.order.changeStatus({
                 project: { id: params.project.id },
                 orderNumber: params.orderNumber,
                 orderStatus: factory.orderStatus.OrderInTransit,
@@ -400,7 +417,7 @@ function processing2inTransit(params) {
         catch (error) {
             let throwsError = true;
             // すでにステータスが進行していた場合、OrderProcessing->OrderInTransitの処理自体は成功しているので、後処理を続行する
-            order = yield repos.order.projectFieldsByOrderNumber({
+            order = await repos.order.projectFieldsByOrderNumber({
                 orderNumber: params.orderNumber,
                 project: { id: params.project.id },
                 inclusion: [
@@ -418,12 +435,15 @@ function processing2inTransit(params) {
             }
         }
         if (params.useOnOrderStatusChanged) {
-            yield (0, onOrderStatusChanged_1.onOrderInTransit)({
-                order: Object.assign(Object.assign({}, order), { orderStatus: factory.orderStatus.OrderInTransit })
+            await (0, onOrderStatusChanged_1.onOrderInTransit)({
+                order: {
+                    ...order,
+                    orderStatus: factory.orderStatus.OrderInTransit
+                }
             })({
                 task: repos.task,
                 transaction: repos.transaction
             }, settings);
         }
-    });
+    };
 }

package/lib/chevre/service/order/onOrderStatusChanged/onOrderCancelled/factory.d.ts

@@ -7,5 +7,5 @@ import * as factory from '../../../../factory';
  */
 declare function createOnOrderCancelledTasksByTransaction(params: {
     transaction: Pick<factory.transaction.placeOrder.ITransaction, 'id' | 'project' | 'typeOf'>;
-}): (import("@chevre/factory/lib/task").IAttributes | import("@chevre/factory/lib/task/confirmMoneyTransfer").IAttributes | import("@chevre/factory/lib/task/confirmRegisterService").IAttributes | import("@chevre/factory/lib/task/confirmPayTransaction").IAttributes | import("@chevre/factory/lib/task/confirmRegisterServiceTransaction").IAttributes | import("@chevre/factory/lib/task/confirmReserveTransaction").IAttributes | import("@chevre/factory/lib/task/createAccountingReport").IAttributes | import("@chevre/factory/lib/task/createEvent").IAttributes | import("@chevre/factory/lib/task/deletePerson").IAttributes | import("@chevre/factory/lib/task/deleteTransaction").IAttributes | import("@chevre/factory/lib/task/givePointAward").IAttributes | import("@chevre/factory/lib/task/onAssetTransactionStatusChanged").IAttributes | import("@chevre/factory/lib/task/onAuthorizationCreated").IAttributes | import("@chevre/factory/lib/task/onEventChanged").IAttributes | import("@chevre/factory/lib/task/onResourceUpdated").IAttributes | import("@chevre/factory/lib/task/onOrderPaymentCompleted").IAttributes | import("@chevre/factory/lib/task/placeOrder").IAttributes | import("@chevre/factory/lib/task/returnOrder").IAttributes | import("@chevre/factory/lib/task/returnMoneyTransfer").IAttributes | import("@chevre/factory/lib/task/returnPayTransaction").IAttributes | import("@chevre/factory/lib/task/returnPointAward").IAttributes | import("@chevre/factory/lib/task/returnReserveTransaction").IAttributes | import("@chevre/factory/lib/task/sendEmailMessage").IAttributes | import("@chevre/factory/lib/task/sendOrder").IAttributes | import("@chevre/factory/lib/task/triggerWebhook").IAttributes | import("@chevre/factory/lib/task/useReservation").IAttributes | import("@chevre/factory/lib/task/voidMoneyTransferTransaction").IAttributes | import("@chevre/factory/lib/task/voidPayTransaction").IAttributes | import("@chevre/factory/lib/task/voidRegisterServiceTransaction").IAttributes | import("@chevre/factory/lib/task/voidReserveTransaction").IAttributes)[];
+}): (import("@chevre/factory/lib/task").IAttributes | import("@chevre/factory/lib/task/confirmMoneyTransfer").IAttributes | import("@chevre/factory/lib/task/confirmRegisterService").IAttributes | import("@chevre/factory/lib/task/confirmPayTransaction").IAttributes | import("@chevre/factory/lib/task/confirmRegisterServiceTransaction").IAttributes | import("@chevre/factory/lib/task/confirmReserveTransaction").IAttributes | import("@chevre/factory/lib/task/createAccountingReport").IAttributes | import("@chevre/factory/lib/task/deletePerson").IAttributes | import("@chevre/factory/lib/task/deleteTransaction").IAttributes | import("@chevre/factory/lib/task/givePointAward").IAttributes | import("@chevre/factory/lib/task/onAssetTransactionStatusChanged").IAttributes | import("@chevre/factory/lib/task/onAuthorizationCreated").IAttributes | import("@chevre/factory/lib/task/onEventChanged").IAttributes | import("@chevre/factory/lib/task/onResourceDeleted").IAttributes | import("@chevre/factory/lib/task/onResourceUpdated").IAttributes | import("@chevre/factory/lib/task/onOrderPaymentCompleted").IAttributes | import("@chevre/factory/lib/task/placeOrder").IAttributes | import("@chevre/factory/lib/task/returnOrder").IAttributes | import("@chevre/factory/lib/task/returnMoneyTransfer").IAttributes | import("@chevre/factory/lib/task/returnPayTransaction").IAttributes | import("@chevre/factory/lib/task/returnPointAward").IAttributes | import("@chevre/factory/lib/task/returnReserveTransaction").IAttributes | import("@chevre/factory/lib/task/sendEmailMessage").IAttributes | import("@chevre/factory/lib/task/sendOrder").IAttributes | import("@chevre/factory/lib/task/triggerWebhook").IAttributes | import("@chevre/factory/lib/task/useReservation").IAttributes | import("@chevre/factory/lib/task/voidMoneyTransferTransaction").IAttributes | import("@chevre/factory/lib/task/voidPayTransaction").IAttributes | import("@chevre/factory/lib/task/voidRegisterServiceTransaction").IAttributes | import("@chevre/factory/lib/task/voidReserveTransaction").IAttributes)[];
 export { createOnOrderCancelledTasksByTransaction };