@chevre/domain 23.2.0-alpha.60 → 23.2.0-alpha.62

package/lib/chevre/service/order/onAssetTransactionStatusChanged.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.onAssetTransactionStatusChanged = onAssetTransactionStatusChanged;
 exports.paymentDue2Processing = paymentDue2Processing;
@@ -19,21 +10,20 @@ const factory = require("../../factory");
 const debug = createDebug('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 +32,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 +48,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 +60,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 +77,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 +94,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 +118,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 +131,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 +148,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 +157,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 +172,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 +184,12 @@ 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 +201,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 +211,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 +238,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 +277,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 +295,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 +307,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 +318,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 +337,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 +356,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 +372,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 +383,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 +393,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 +411,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/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)[];
+}): (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 };

package/lib/chevre/service/order/onOrderStatusChanged/onOrderCancelled/factory.js

@@ -9,10 +9,9 @@ const factory = require("../../../../factory");
  * 注文中止時のアクション
  */
 function createOnOrderCancelledTasksByTransaction(params) {
-    var _a;
     const now = new Date();
     const taskAttributes = [];
-    if (typeof ((_a = params.transaction) === null || _a === void 0 ? void 0 : _a.id) === 'string') {
+    if (typeof params.transaction?.id === 'string') {
         const voidPaymentTaskAttributes = {
             project: params.transaction.project,
             name: factory.taskName.VoidPayTransaction,

package/lib/chevre/service/order/onOrderStatusChanged/onOrderCancelled.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.onOrderCancelled = onOrderCancelled;
 /**
@@ -18,7 +9,7 @@ const factory = require("../../../factory");
 const factory_1 = require("./onOrderCancelled/factory");
 const debug = createDebug('chevre-domain:service:order');
 function onOrderCancelled(params) {
-    return (repos) => __awaiter(this, void 0, void 0, function* () {
+    return async (repos) => {
         debug('onOrderStatusChanged called.', params.order.orderNumber, params.order.orderStatus, params.order.orderDate);
         let tasks = [];
         switch (params.order.orderStatus) {
@@ -32,6 +23,6 @@ function onOrderCancelled(params) {
             default:
                 throw new factory.errors.NotImplemented(`${params.order.orderStatus} not implemented`);
         }
-        yield repos.task.saveMany(tasks, { emitImmediately: true });
-    });
+        await repos.task.saveMany(tasks, { emitImmediately: true });
+    };
 }

package/lib/chevre/service/order/onOrderStatusChanged/onOrderDelivered/factory.js

@@ -5,10 +5,9 @@ const factory = require("../../../../factory");
 function createInformTasks(order, 
 // settings: Settings,
 setting) {
-    var _a;
     const taskRunsAt = new Date();
     // const informOrder = settings.onOrderStatusChanged?.informOrder;
-    const informOrder = (_a = setting === null || setting === void 0 ? void 0 : setting.onOrderStatusChanged) === null || _a === void 0 ? void 0 : _a.informOrder;
+    const informOrder = setting?.onOrderStatusChanged?.informOrder;
     const informTasks = [];
     const order4inform = creteOrder4inform(order);
     const informIdentifier = `${factory.order.OrderType.Order}:${order4inform.orderNumber}:${order4inform.orderStatus}`;
@@ -16,15 +15,14 @@ setting) {
         let recipientId = '';
         recipientId = order.customer.id;
         informOrder.forEach((informOrderParams) => {
-            var _a, _b;
-            if (typeof ((_a = informOrderParams.recipient) === null || _a === void 0 ? void 0 : _a.url) === 'string') {
+            if (typeof informOrderParams.recipient?.url === 'string') {
                 const informActionAttributes = {
                     about: { orderNumber: order.orderNumber, typeOf: factory.order.OrderType.Order },
                     object: order4inform,
                     recipient: {
                         // url: informOrderParams.recipient.url, // discontinue(2025-02-13~)
                         id: recipientId,
-                        name: (_b = informOrderParams.recipient) === null || _b === void 0 ? void 0 : _b.name,
+                        name: informOrderParams.recipient?.name,
                         typeOf: factory.creativeWorkType.WebApplication
                     },
                     target: {
@@ -52,5 +50,12 @@ setting) {
 }
 function creteOrder4inform(order) {
     // 配送済注文通知内容を最適化(2022-12-29~)
-    return Object.assign({ project: order.project, typeOf: order.typeOf, orderNumber: order.orderNumber, orderStatus: order.orderStatus }, (typeof order.id === 'string') ? { id: order.id } : undefined);
+    return {
+        project: order.project,
+        typeOf: order.typeOf,
+        orderNumber: order.orderNumber,
+        orderStatus: order.orderStatus,
+        // ↓hub側で使用している可能性もあるので念のため
+        ...(typeof order.id === 'string') ? { id: order.id } : undefined
+    };
 }

package/lib/chevre/service/order/onOrderStatusChanged/onOrderDelivered.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.onOrderDelivered = onOrderDelivered;
 /**
@@ -19,10 +10,10 @@ const factory = require("../../../factory");
 const factory_1 = require("./onOrderDelivered/factory");
 const debug = createDebug('chevre-domain:service:order');
 function onOrderDelivered(params) {
-    return (repos
+    return async (repos
     // settings: Settings
-    ) => __awaiter(this, void 0, void 0, function* () {
-        const setting = yield repos.setting.findOne({ project: { id: { $eq: '*' } } }, ['onOrderStatusChanged']);
+    ) => {
+        const setting = await repos.setting.findOne({ project: { id: { $eq: '*' } } }, ['onOrderStatusChanged']);
         debug('onOrderStatusChanged called.', params.order.orderNumber, params.order.orderStatus, params.order.orderDate);
         let tasks = [];
         // const sendOrderPotentialActions =
@@ -39,7 +30,7 @@ function onOrderDelivered(params) {
             default:
                 throw new factory.errors.NotImplemented(`${params.order.orderStatus} not implemented`);
         }
-        yield repos.task.saveMany(tasks, { emitImmediately: true });
+        await repos.task.saveMany(tasks, { emitImmediately: true });
         switch (params.order.orderStatus) {
             case factory.orderStatus.OrderDelivered:
                 // discontinue(2024-06-20~)
@@ -51,5 +42,5 @@ function onOrderDelivered(params) {
             default:
                 throw new factory.errors.NotImplemented(`${params.order.orderStatus} not implemented`);
         }
-    });
+    };
 }

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

@@ -13,5 +13,5 @@ declare function createInformTasks(params: {
 }, setting: Pick<ISetting, 'onOrderStatusChanged'> | null): factory.task.IAttributes<factory.taskName.TriggerWebhook>[];
 declare function createNextSendOrderTasks(params: {
     order: IInTransitOrder;
-}): (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/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)[];
+}): (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 { createInformTasks, createNextSendOrderTasks, IInTransitOrder };

package/lib/chevre/service/order/onOrderStatusChanged/onOrderDeliveredPartially/factory.js

@@ -4,16 +4,23 @@ exports.createInformTasks = createInformTasks;
 exports.createNextSendOrderTasks = createNextSendOrderTasks;
 const factory = require("../../../../factory");
 function creteOrder4inform(order) {
-    return Object.assign({ project: order.project, typeOf: order.typeOf, orderNumber: order.orderNumber, acceptedOffers: order.deliveredAcceptedOffers, orderStatus: factory.orderStatus.OrderInTransit }, (typeof order.id === 'string') ? { id: order.id } : undefined);
+    return {
+        project: order.project,
+        typeOf: order.typeOf,
+        orderNumber: order.orderNumber,
+        acceptedOffers: order.deliveredAcceptedOffers,
+        orderStatus: factory.orderStatus.OrderInTransit,
+        // ↓hub側で使用している可能性もあるので念のため
+        ...(typeof order.id === 'string') ? { id: order.id } : undefined
+    };
 }
 function createInformTasks(params, 
 // settings: Settings,
 setting) {
-    var _a;
     const { order } = params;
     const taskRunsAt = new Date();
     // const informOrder = settings.onOrderStatusChanged?.informOrder;
-    const informOrder = (_a = setting === null || setting === void 0 ? void 0 : setting.onOrderStatusChanged) === null || _a === void 0 ? void 0 : _a.informOrder;
+    const informOrder = setting?.onOrderStatusChanged?.informOrder;
     const informTasks = [];
     const order4inform = creteOrder4inform(order);
     const informIdentifier = `${factory.order.OrderType.Order}:${order4inform.orderNumber}:${order4inform.orderStatus}:${order.acceptedOffers.page}`;
@@ -21,15 +28,14 @@ setting) {
         let recipientId = '';
         recipientId = order.customer.id;
         informOrder.forEach((informOrderParams) => {
-            var _a, _b;
-            if (typeof ((_a = informOrderParams.recipient) === null || _a === void 0 ? void 0 : _a.url) === 'string') {
+            if (typeof informOrderParams.recipient?.url === 'string') {
                 const informActionAttributes = {
                     about: { orderNumber: order.orderNumber, typeOf: factory.order.OrderType.Order },
                     object: order4inform,
                     recipient: {
                         // url: informOrderParams.recipient.url, // discontinue(2025-02-13~)
                         id: recipientId,
-                        name: (_b = informOrderParams.recipient) === null || _b === void 0 ? void 0 : _b.name,
+                        name: informOrderParams.recipient?.name,
                         typeOf: factory.creativeWorkType.WebApplication
                     },
                     target: {
@@ -73,13 +79,20 @@ function createNextSendOrderTasks(params) {
         // priceCurrency: params.order.priceCurrency,
         orderDate: params.order.orderDate
     };
-    const sendOrderObject = Object.assign(Object.assign({}, simpleOrder), { acceptedOffers: {
+    const sendOrderObject = {
+        ...simpleOrder,
+        acceptedOffers: {
             limit: params.order.acceptedOffers.limit,
             page: params.order.acceptedOffers.page + 1
-        } });
+        }
+    };
     const sendOrderTaskData = {
         project: params.order.project,
-        object: Object.assign(Object.assign({}, sendOrderObject), { confirmationNumber: params.order.confirmationNumber, previousOrderStatus: params.order.orderStatus })
+        object: {
+            ...sendOrderObject,
+            confirmationNumber: params.order.confirmationNumber,
+            previousOrderStatus: params.order.orderStatus
+        }
     };
     const sendOrderTask = {
         project: params.order.project,