@chevre/domain 23.2.0-alpha.8 → 23.2.0

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

@@ -1,12 +1,34 @@
 "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;
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createInformTasks = createInformTasks;
 exports.createOnOrderReturnedTasksByTransaction = createOnOrderReturnedTasksByTransaction;
-const factory = require("../../../../factory");
+const factory = __importStar(require("../../../../factory"));
 function createInformTasks(order, returnOrderAction, setting) {
-    var _a, _b;
     const taskRunsAt = new Date();
-    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 useInformReturnAction = (<any>setting)?.onOrderStatusChanged?.useInformReturnAction === true; // discontinue(2025-07-01~)
     const informTasks = [];
     const informIdentifier = `${factory.order.OrderType.Order}:${order.orderNumber}:${factory.orderStatus.OrderReturned}`;
@@ -19,19 +41,18 @@ function createInformTasks(order, returnOrderAction, setting) {
     if (Array.isArray(informOrder) && informOrder.length > 0) {
         let recipientId = '';
         recipientId = order.customer.id;
-        if (typeof ((_b = order.returner) === null || _b === void 0 ? void 0 : _b.id) === 'string') {
+        if (typeof order.returner?.id === 'string') {
             recipientId = order.returner.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: informObject,
                     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: {
@@ -59,7 +80,10 @@ function createInformTasks(order, returnOrderAction, setting) {
 }
 function createReturnAction4inform(returnOrderAction) {
     const { id, instrument, object, project, typeOf } = returnOrderAction;
-    return Object.assign({ id, object, project, typeOf }, (Array.isArray(instrument)) ? { instrument } : undefined);
+    return {
+        id, object, project, typeOf,
+        ...(Array.isArray(instrument)) ? { instrument } : undefined
+    };
 }
 // function createOrder4inform(
 //     order: IReturnedOrder
@@ -101,7 +125,7 @@ function createOnOrderReturnedTasksByTransaction(params) {
     //     ));
     // }
     // ポイント特典返却タスク
-    const returnPointAwardAttributes = potentialActions === null || potentialActions === void 0 ? void 0 : potentialActions.returnPointAward;
+    const returnPointAwardAttributes = potentialActions?.returnPointAward;
     if (Array.isArray(returnPointAwardAttributes)) {
         taskAttributes.push(...returnPointAwardAttributes.map((a) => {
             return {
@@ -116,7 +140,7 @@ function createOnOrderReturnedTasksByTransaction(params) {
             };
         }));
     }
-    const sendEmailMessageAttributes = potentialActions === null || potentialActions === void 0 ? void 0 : potentialActions.sendEmailMessage;
+    const sendEmailMessageAttributes = potentialActions?.sendEmailMessage;
     if (Array.isArray(sendEmailMessageAttributes)) {
         const simpleOrder = {
             typeOf: params.order.typeOf,

package/lib/chevre/service/order/onOrderStatusChanged/onOrderReturned.js

@@ -1,31 +1,47 @@
 "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.onOrderReturned = onOrderReturned;
 /**
  * 注文返品時処理
  */
-const createDebug = require("debug");
+const debug_1 = __importDefault(require("debug"));
 const google_libphonenumber_1 = require("google-libphonenumber");
-const factory = require("../../../factory");
+const factory = __importStar(require("../../../factory"));
 // import { Settings } from '../../../settings';
 // import { createMaskedCustomer } from '../../../factory/order';
 const factory_1 = require("./onOrderReturned/factory");
-const debug = createDebug('chevre-domain:service:order');
+const debug = (0, debug_1.default)('chevre-domain:service:order');
 function onOrderReturned(params) {
-    return (repos
+    return async (repos
     // settings: Settings
-    ) => __awaiter(this, void 0, void 0, function* () {
-        var _a, _b, _c, _d;
-        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 maskedCustomer = createMaskedCustomer(params.order, { noProfile: true });
@@ -44,33 +60,39 @@ function onOrderReturned(params) {
         };
         switch (params.order.orderStatus) {
             case factory.orderStatus.OrderReturned:
-                const potentialActionsByTransaction = (_d = (_c = (_b = (_a = params.returnOrderTransaction) === null || _a === void 0 ? void 0 : _a.potentialActions) === null || _b === void 0 ? void 0 : _b.returnOrder) === null || _c === void 0 ? void 0 : _c.find((returnOrderActionByTransaction) => {
+                const potentialActionsByTransaction = params.returnOrderTransaction?.potentialActions?.returnOrder?.find((returnOrderActionByTransaction) => {
                     return returnOrderActionByTransaction.object.orderNumber === params.order.orderNumber;
-                })) === null || _d === void 0 ? void 0 : _d.potentialActions;
-                const itemOfferedTypeOfs = yield repos.acceptedOffer.distinctValues({ orderNumber: { $in: [params.order.orderNumber] } }, 'acceptedOffers.itemOffered.typeOf');
-                const serialNumbers = yield repos.acceptedOffer.distinctValues({ orderNumber: { $in: [params.order.orderNumber] } }, 'acceptedOffers.serialNumber');
-                const reservationNumbers = yield repos.acceptedOffer.distinctValues({ orderNumber: { $in: [params.order.orderNumber] } }, 'acceptedOffers.itemOffered.reservationNumber');
-                const offeredThroughIdentifier = (yield repos.acceptedOffer.distinctValues({ orderNumber: { $in: [params.order.orderNumber] } }, 'acceptedOffers.offeredThrough.identifier'))[0];
-                const reservationForSuperEventLocationBranchCodes = yield repos.acceptedOffer.distinctValues({ orderNumber: { $in: [params.order.orderNumber] } }, 'acceptedOffers.itemOffered.reservationFor.superEvent.location.branchCode');
+                })?.potentialActions;
+                const itemOfferedTypeOfs = await repos.acceptedOffer.distinctValues({ orderNumber: { $in: [params.order.orderNumber] } }, 'acceptedOffers.itemOffered.typeOf');
+                const serialNumbers = await repos.acceptedOffer.distinctValues({ orderNumber: { $in: [params.order.orderNumber] } }, 'acceptedOffers.serialNumber');
+                const reservationNumbers = await repos.acceptedOffer.distinctValues({ orderNumber: { $in: [params.order.orderNumber] } }, 'acceptedOffers.itemOffered.reservationNumber');
+                const offeredThroughIdentifier = (await repos.acceptedOffer.distinctValues({ orderNumber: { $in: [params.order.orderNumber] } }, 'acceptedOffers.offeredThrough.identifier'))[0];
+                const reservationForSuperEventLocationBranchCodes = await repos.acceptedOffer.distinctValues({ orderNumber: { $in: [params.order.orderNumber] } }, 'acceptedOffers.itemOffered.reservationFor.superEvent.location.branchCode');
                 tasks = [
                     ...(0, factory_1.createInformTasks)(params.order, params.returnOrderAction, setting),
-                    ...createReturnReserveTransactionTasks(Object.assign(Object.assign({}, params.order), { reservationNumbers,
+                    ...createReturnReserveTransactionTasks({
+                        ...params.order,
+                        reservationNumbers,
                         offeredThroughIdentifier,
-                        reservationForSuperEventLocationBranchCodes }), simpleOrder),
+                        reservationForSuperEventLocationBranchCodes
+                    }, simpleOrder),
                     // 決済取引返却タスクを作成(2022-06-09~)
                     ...createReturnPayTransactionTasks({ orderNumber: params.order.orderNumber, project: params.order.project }, params.returnOrderTransaction),
                     // 取引のpotentialActionsを適用(2023-08-19~)
                     ...(0, factory_1.createOnOrderReturnedTasksByTransaction)({ order: params.order, potentialActions: potentialActionsByTransaction }),
                     ...(itemOfferedTypeOfs[0] === factory.actionType.MoneyTransfer)
-                        ? createReturnMoneyTransferTasks(Object.assign(Object.assign({}, params.order), { serialNumbers }), simpleOrder)
+                        ? createReturnMoneyTransferTasks({
+                            ...params.order,
+                            serialNumbers
+                        }, simpleOrder)
                         : []
                 ];
                 break;
             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 });
+    };
 }
 function createReturnReserveTransactionTasks(order, simpleOrder) {
     debug('onOrderReturn.createReturnReserveTransactionTasks processing...', 'project:', order.project.id, 'orderNumber:', simpleOrder.orderNumber, 'reservationNumbers:', order.reservationNumbers, 'offeredThroughIdentifier:', order.offeredThroughIdentifier, 'reservationForSuperEventLocationBranchCodes:', order.reservationForSuperEventLocationBranchCodes);
@@ -204,14 +226,13 @@ function createReturnMoneyTransferTasks(order, simpleOrder) {
     return tasks;
 }
 function createReturnPayTransactionTasks(order, returnOrderTransaction) {
-    var _a, _b;
     const taskRunsAt = new Date();
     // const taskRunsAt = moment(order.dateReturned)
     //     .add(RETURN_PAY_TASK_DELAY_IN_SECONDS, 'seconds')
     //     .toDate();
     const tasks = [];
-    const returnOrderPotentialActions = (_b = (_a = returnOrderTransaction === null || returnOrderTransaction === void 0 ? void 0 : returnOrderTransaction.potentialActions) === null || _a === void 0 ? void 0 : _a.returnOrder.find((action) => action.object.orderNumber === order.orderNumber)) === null || _b === void 0 ? void 0 : _b.potentialActions;
-    const returnPayActionsByReturnOrderTransaction = returnOrderPotentialActions === null || returnOrderPotentialActions === void 0 ? void 0 : returnOrderPotentialActions.returnPaymentMethod;
+    const returnOrderPotentialActions = returnOrderTransaction?.potentialActions?.returnOrder.find((action) => action.object.orderNumber === order.orderNumber)?.potentialActions;
+    const returnPayActionsByReturnOrderTransaction = returnOrderPotentialActions?.returnPaymentMethod;
     if (Array.isArray(returnPayActionsByReturnOrderTransaction)) {
         tasks.push(...returnPayActionsByReturnOrderTransaction.map((a) => {
             return {

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

@@ -1,27 +1,48 @@
 "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;
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createInformTasks = createInformTasks;
-const factory = require("../../../factory");
+const factory = __importStar(require("../../../factory"));
 function createInformTasks(order, 
 // settings: Settings,
 setting) {
-    var _a;
     const taskRunsAt = new Date();
-    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);
     if (Array.isArray(informOrder) && informOrder.length > 0) {
         const recipientId = '';
         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: order4inform.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: {

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

@@ -1,27 +1,48 @@
 "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.onOrderUpdated = onOrderUpdated;
-const factory = require("../../factory");
+const factory = __importStar(require("../../factory"));
 // import { Settings } from '../../settings';
 const factory_1 = require("./onOrderUpdated/factory");
 function onOrderUpdated(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']);
         let tasks = [];
-        tasks = (0, factory_1.createInformTasks)(Object.assign(Object.assign({ typeOf: factory.order.OrderType.Order, orderNumber: params.orderNumber, project: { id: params.project.id, typeOf: factory.organizationType.Project }, updatedAt: params.updatedAt }, (typeof params.name === 'string') ? { name: params.name } : undefined), (Array.isArray(params.additionalProperty)) ? { additionalProperty: params.additionalProperty } : undefined), 
+        tasks = (0, factory_1.createInformTasks)({
+            typeOf: factory.order.OrderType.Order,
+            orderNumber: params.orderNumber,
+            project: { id: params.project.id, typeOf: factory.organizationType.Project },
+            updatedAt: params.updatedAt,
+            ...(typeof params.name === 'string') ? { name: params.name } : undefined,
+            ...(Array.isArray(params.additionalProperty)) ? { additionalProperty: params.additionalProperty } : undefined
+        }, 
         // settings,
         setting);
-        yield repos.task.saveMany(tasks, { emitImmediately: true });
-    });
+        await repos.task.saveMany(tasks, { emitImmediately: true });
+    };
 }

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

@@ -1,32 +1,46 @@
 "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.payOrder = payOrder;
 const onAssetTransactionStatusChanged_1 = require("./onAssetTransactionStatusChanged");
-const factory = require("../../factory");
+const factory = __importStar(require("../../factory"));
 /**
  * 注文を決済する
  */
 function payOrder(params) {
-    return (repos, settings) => __awaiter(this, void 0, void 0, function* () {
+    return async (repos, settings) => {
         if (typeof params.useOnOrderStatusChanged !== 'boolean') {
             throw new factory.errors.Argument('useOnOrderStatusChanged', 'must be boolean');
         }
         const orderNumber = params.object.orderNumber;
         const confirmationNumber = params.object.confirmationNumber;
-        yield (0, onAssetTransactionStatusChanged_1.paymentDue2Processing)({
+        await (0, onAssetTransactionStatusChanged_1.paymentDue2Processing)({
             project: { id: params.project.id },
             confirmationNumber,
             orderNumber,
             useOnOrderStatusChanged: params.useOnOrderStatusChanged
         })(repos, settings);
-    });
+    };
 }

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

@@ -1,25 +1,37 @@
 "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.createPlacingOrderFromExistingTransaction = createPlacingOrderFromExistingTransaction;
-const factory = require("../../../factory");
+const factory = __importStar(require("../../../factory"));
 const factory_1 = require("./factory");
 function createPlacingOrderFromExistingTransaction(params) {
-    // tslint:disable-next-line:max-func-body-length
-    return (repos) => __awaiter(this, void 0, void 0, function* () {
-        var _a;
+    return async (repos) => {
         const confirmationNumber = String(params.confirmationNumber);
         const orderNumber = params.orderNumber;
         let order;
-        const placeOrderTransactions = yield repos.transaction.projectFields({
+        const placeOrderTransactions = await repos.transaction.projectFields({
             limit: 1,
             page: 1,
             project: { id: { $eq: params.project.id } },
@@ -39,11 +51,11 @@ function createPlacingOrderFromExistingTransaction(params) {
         }
         let authorizePaymentActions = [];
         let authorizeOfferActionsWithInstrument = [];
-        const authorizeActionsAsResult = (_a = placeOrderTransactionWithResult.result) === null || _a === void 0 ? void 0 : _a.authorizeActions;
+        const authorizeActionsAsResult = placeOrderTransactionWithResult.result?.authorizeActions;
         if (Array.isArray(authorizeActionsAsResult) && authorizeActionsAsResult.length > 0) {
             const completedAuthorizeActionIds = authorizeActionsAsResult.map(({ id }) => id);
             if (completedAuthorizeActionIds.length > 0) {
-                authorizePaymentActions = (yield repos.action.search({
+                authorizePaymentActions = await repos.action.search({
                     typeOf: factory.actionType.AuthorizeAction,
                     purpose: {
                         typeOf: { $in: [factory.transactionType.PlaceOrder] },
@@ -51,8 +63,8 @@ function createPlacingOrderFromExistingTransaction(params) {
                     },
                     object: { typeOf: { $eq: factory.action.authorize.paymentMethod.any.ResultType.Payment } },
                     id: { $in: completedAuthorizeActionIds }
-                }, ['result']));
-                authorizeOfferActionsWithInstrument = (yield repos.action.search({
+                }, ['result']);
+                authorizeOfferActionsWithInstrument = await repos.action.search({
                     typeOf: factory.actionType.AuthorizeAction,
                     purpose: {
                         typeOf: { $in: [factory.transactionType.PlaceOrder] },
@@ -67,7 +79,7 @@ function createPlacingOrderFromExistingTransaction(params) {
                         }
                     },
                     id: { $in: completedAuthorizeActionIds }
-                }, ['instrument']));
+                }, ['instrument']);
             }
         }
         // orderedItem生成のためにacceptedOffersを取得
@@ -77,7 +89,7 @@ function createPlacingOrderFromExistingTransaction(params) {
             .map(({ instrument }) => String(instrument.transactionNumber));
         try {
             // すでにtypeOf: Orderに変更済の場合acceptedOffersは空になるが、そもそもorderedItemはその後上書きされないので、空のまま処理して問題なし
-            acceptedOffers = (yield repos.orderInTransaction.findAcceptedOffersByOrderNumber({ orderNumber: { $eq: orderNumber } }))
+            acceptedOffers = (await repos.orderInTransaction.findAcceptedOffersByOrderNumber({ orderNumber: { $eq: orderNumber } }))
                 .filter(({ serialNumber }) => typeof serialNumber === 'string' && serialNumbers.includes(serialNumber));
         }
         catch (error) {
@@ -92,5 +104,5 @@ function createPlacingOrderFromExistingTransaction(params) {
         }
         order = (0, factory_1.createPlacingOrder)({ transaction: placeOrderTransactionWithResult, authorizePaymentActions, acceptedOffers });
         return { order, placeOrderTransaction: placeOrderTransactionWithResult, serialNumbers };
-    });
+    };
 }

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

@@ -1,7 +1,30 @@
 "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;
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.acceptedOffers2orderedItem = acceptedOffers2orderedItem;
-const factory = require("../../../../factory");
+const factory = __importStar(require("../../../../factory"));
 /**
  * 受入オファーを注文アイテムに変換する
  */
@@ -37,25 +60,33 @@ function createReservationAcceptedOffers(params) {
     };
 }
 function reservationOffers2orderedItem(params) {
-    var _a, _b;
     const reservationFor = params.reservationFor;
     const issuedThrough = params.issuedThrough;
     if (reservationFor.typeOf === factory.eventType.ScreeningEvent
         && issuedThrough.typeOf === factory.product.ProductType.EventService) {
         const reservationFor4orderedItem = {
-            location: Object.assign({ branchCode: reservationFor.location.branchCode, typeOf: reservationFor.location.typeOf }, (reservationFor.location.name !== undefined) ? { name: reservationFor.location.name } : undefined),
+            location: {
+                branchCode: reservationFor.location.branchCode,
+                typeOf: reservationFor.location.typeOf,
+                ...(reservationFor.location.name !== undefined) ? { name: reservationFor.location.name } : undefined
+            },
             typeOf: reservationFor.typeOf,
             id: reservationFor.id,
             name: reservationFor.name,
             startDate: reservationFor.startDate,
             endDate: reservationFor.endDate
         };
-        return Object.assign(Object.assign({ typeOf: issuedThrough.typeOf, serviceOutput: {
+        return {
+            typeOf: issuedThrough.typeOf,
+            serviceOutput: {
                 typeOf: factory.reservationType.EventReservation,
                 reservationFor: reservationFor4orderedItem
-            } }, (typeof issuedThrough.id === 'string') ? { id: issuedThrough.id } : undefined), (typeof ((_a = issuedThrough.serviceType) === null || _a === void 0 ? void 0 : _a.typeOf) === 'string')
-            ? { serviceType: issuedThrough.serviceType }
-            : undefined);
+            },
+            ...(typeof issuedThrough.id === 'string') ? { id: issuedThrough.id } : undefined,
+            ...(typeof issuedThrough.serviceType?.typeOf === 'string')
+                ? { serviceType: issuedThrough.serviceType }
+                : undefined
+        };
     }
     else if (reservationFor.typeOf === factory.tripType.BusTrip
         && issuedThrough.typeOf === factory.product.ProductType.Transportation) {
@@ -65,32 +96,40 @@ function reservationOffers2orderedItem(params) {
             departureTime: reservationFor.departureTime,
             arrivalTime: reservationFor.arrivalTime
         };
-        return Object.assign(Object.assign({ typeOf: issuedThrough.typeOf, id: issuedThrough.id }, (typeof ((_b = issuedThrough.serviceType) === null || _b === void 0 ? void 0 : _b.typeOf) === 'string')
-            ? { serviceType: issuedThrough.serviceType }
-            : undefined), { serviceOutput: {
+        return {
+            typeOf: issuedThrough.typeOf,
+            id: issuedThrough.id,
+            ...(typeof issuedThrough.serviceType?.typeOf === 'string')
+                ? { serviceType: issuedThrough.serviceType }
+                : undefined,
+            serviceOutput: {
                 typeOf: factory.reservationType.ReservationPackage,
                 reservationFor: reservationFor4orderedItem
-            } });
+            }
+        };
     }
     else {
         throw new factory.errors.Internal('unexpected params on reservationOffers2orderedItem');
     }
 }
 function createProductItems(params) {
-    var _a;
     const orderedItems = [];
     const productIds = [];
     if (Array.isArray(params.productAcceptedOffers) && params.productAcceptedOffers.length > 0) {
         // プロダクトIDで最適化する
         const issuedThrough = params.productAcceptedOffers[0].itemOffered.issuedThrough;
-        if (typeof (issuedThrough === null || issuedThrough === void 0 ? void 0 : issuedThrough.id) === 'string') {
+        if (typeof issuedThrough?.id === 'string') {
             if (!productIds.includes(issuedThrough.id)) {
                 productIds.push(issuedThrough.id);
                 orderedItems.push({
                     typeOf: 'OrderItem',
-                    orderedItem: Object.assign({ id: String(issuedThrough.id), typeOf: issuedThrough.typeOf }, (typeof ((_a = issuedThrough.serviceType) === null || _a === void 0 ? void 0 : _a.typeOf) === 'string')
-                        ? { serviceType: issuedThrough.serviceType }
-                        : undefined)
+                    orderedItem: {
+                        id: String(issuedThrough.id),
+                        typeOf: issuedThrough.typeOf,
+                        ...(typeof issuedThrough.serviceType?.typeOf === 'string')
+                            ? { serviceType: issuedThrough.serviceType }
+                            : undefined
+                    }
                 });
             }
         }