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

package/lib/chevre/service/transaction/placeOrder/confirm.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.confirm = confirm;
 const createDebug = require("debug");
@@ -26,18 +17,21 @@ const publishConfirmationNumberIfNotExist_1 = require("./publishConfirmationNumb
 const publishOrderNumberIfNotExist_1 = require("./publishOrderNumberIfNotExist");
 const debug = createDebug('chevre-domain:service:transaction');
 function processTransactionNotInProgress(transaction) {
-    return (repos) => __awaiter(this, void 0, void 0, function* () {
+    return async (repos) => {
         if (transaction.status === factory.transactionStatusType.Confirmed) {
             // retrieve customer from orderInTransaction(2024-06-24~)
             // let resultCustomer: factory.order.ICustomer | undefined = createCustomer({ transaction });
-            const resultCustomer = yield repos.orderInTransaction.findCustomerByOrderNumber({
+            const resultCustomer = await repos.orderInTransaction.findCustomerByOrderNumber({
                 orderNumber: { $eq: String(transaction.object.orderNumber) }
             });
             if (resultCustomer === undefined) {
                 throw new factory.errors.Internal('resultCustomer undefined'); // impossible process
             }
             // すでに確定済の場合
-            return Object.assign(Object.assign({}, transaction.result), { customer: resultCustomer });
+            return {
+                ...transaction.result,
+                customer: resultCustomer
+            };
         }
         else if (transaction.status === factory.transactionStatusType.Expired) {
             throw new factory.errors.Argument('transactionId', 'Transaction already expired');
@@ -45,39 +39,38 @@ function processTransactionNotInProgress(transaction) {
         else if (transaction.status === factory.transactionStatusType.Canceled) {
             throw new factory.errors.Argument('transactionId', 'Transaction already canceled');
         }
-    });
+    };
 }
 /**
  * 注文取引を確定する
  */
 function confirm(params, options) {
     // tslint:disable-next-line:max-func-body-length
-    return (repos
+    return async (repos
     // settings: Settings
-    ) => __awaiter(this, void 0, void 0, function* () {
-        var _a, _b;
+    ) => {
         // 確認番号を事前発行
-        yield (0, publishConfirmationNumberIfNotExist_1.publishConfirmationNumberIfNotExist)({
+        await (0, publishConfirmationNumberIfNotExist_1.publishConfirmationNumberIfNotExist)({
             id: params.id,
             status: { $in: [factory.transactionStatusType.Confirmed, factory.transactionStatusType.InProgress] },
             object: { orderDate: params.result.order.orderDate }
         })(repos);
-        const transaction = yield repos.transaction.projectFieldsById({ typeOf: factory.transactionType.PlaceOrder, id: params.id }, ['typeOf', 'project', 'status', 'agent', 'seller', 'object', 'result']);
-        const confirmResult = yield processTransactionNotInProgress(transaction)(repos);
+        const transaction = await repos.transaction.projectFieldsById({ typeOf: factory.transactionType.PlaceOrder, id: params.id }, ['typeOf', 'project', 'status', 'agent', 'seller', 'object', 'result']);
+        const confirmResult = await processTransactionNotInProgress(transaction)(repos);
         if (confirmResult !== undefined) {
             return confirmResult;
         }
-        if (typeof ((_a = params.agent) === null || _a === void 0 ? void 0 : _a.id) === 'string' && transaction.agent.id !== params.agent.id) {
+        if (typeof params.agent?.id === 'string' && transaction.agent.id !== params.agent.id) {
             throw new factory.errors.Forbidden('Transaction not yours');
         }
         // 取引に対する全ての承認アクションをマージ
-        const completedAuthorizeActions = yield searchAuthorizeActions(params)(repos);
+        const completedAuthorizeActions = await searchAuthorizeActions(params)(repos);
         let acceptPayActions = [];
-        if (typeof ((_b = transaction.object.paymentMethods) === null || _b === void 0 ? void 0 : _b.paymentMethodId) === 'string') {
-            acceptPayActions = yield searchAcceptPayActions(params)(repos);
+        if (typeof transaction.object.paymentMethods?.paymentMethodId === 'string') {
+            acceptPayActions = await searchAcceptPayActions(params)(repos);
         }
         // 注文番号を発行
-        const orderNumber = yield (0, publishOrderNumberIfNotExist_1.publishOrderNumberIfNotExist)({
+        const orderNumber = await (0, publishOrderNumberIfNotExist_1.publishOrderNumberIfNotExist)({
             project: { id: transaction.project.id },
             id: transaction.id,
             object: { orderDate: params.result.order.orderDate }
@@ -86,7 +79,7 @@ function confirm(params, options) {
         let code;
         const publishCodeExpiresInSeconds = options.publishCodeExpiresInSeconds;
         if (typeof publishCodeExpiresInSeconds === 'number') {
-            code = yield (0, publishCode_1.publishCode)({
+            code = await (0, publishCode_1.publishCode)({
                 project: { id: transaction.project.id },
                 object: {
                     orderNumber,
@@ -102,7 +95,7 @@ function confirm(params, options) {
         // acceptedOffersFromAuthorizeAction, // discontinue(2024-06-17~)
         authorizePaymentActions, authorizeEventServiceOfferActions, authorizeMoneyTansferActions, authorizeProductOfferActions, serialNumbers } = dissolveAuthorizeActions(completedAuthorizeActions);
         // orderInTransactionから検索する(2024-03-04~)
-        acceptedOffers = (yield repos.orderInTransaction.findAcceptedOffersByOrderNumber({ orderNumber: { $eq: orderNumber } }))
+        acceptedOffers = (await repos.orderInTransaction.findAcceptedOffersByOrderNumber({ orderNumber: { $eq: orderNumber } }))
             .filter(({ serialNumber }) => typeof serialNumber === 'string' && serialNumbers.includes(serialNumber));
         // authorizePaymentActionsからpayTransactionsを参照(2024-06-20~)
         let payTransactions = [];
@@ -110,23 +103,27 @@ function confirm(params, options) {
         const payTransactionNumbers = authorizePaymentActions.map((authorizeAction) => authorizeAction.object.paymentMethodId);
         // const payTransactionNumbers = authorizePaymentActions.map(({ instrument }) => instrument.transactionNumber);
         if (payTransactionNumbers.length > 0) {
-            payTransactions = yield repos.assetTransaction.search({
+            payTransactions = await repos.assetTransaction.search({
                 typeOf: factory.assetTransactionType.Pay,
                 transactionNumber: { $in: payTransactionNumbers }
             }, ['object']);
         }
         // retrieve customer from orderInTransaction(2024-06-24~)
         // let customer: factory.order.ICustomer = createCustomer({ transaction });
-        const customer = yield repos.orderInTransaction.findCustomerByOrderNumber({ orderNumber: { $eq: orderNumber } });
+        const customer = await repos.orderInTransaction.findCustomerByOrderNumber({ orderNumber: { $eq: orderNumber } });
         const seller = (0, factory_1.createSeller)({ transaction });
-        const { paymentMethods, result, eventId, reservationIds } = createResult(Object.assign(Object.assign(Object.assign({}, params), { orderNumber, transaction,
+        const { paymentMethods, result, eventId, reservationIds } = createResult({
+            ...params,
+            orderNumber, transaction,
             acceptPayActions,
             authorizePaymentActions, authorizeEventServiceOfferActions, authorizeMoneyTansferActions, authorizeProductOfferActions,
-            acceptedOffers, payTransactions, customer }), (typeof code === 'string') ? { code } : undefined), options);
+            acceptedOffers, payTransactions, customer,
+            ...(typeof code === 'string') ? { code } : undefined
+        }, options);
         // デフォルトEメールメッセージを検索
         let emailMessageOnOrderSent;
         if (repos.emailMessage !== undefined) {
-            const searchEmailMessagesResult = yield repos.emailMessage.search({
+            const searchEmailMessagesResult = await repos.emailMessage.search({
                 limit: 1,
                 page: 1,
                 project: { id: { $eq: transaction.project.id } },
@@ -135,24 +132,30 @@ function confirm(params, options) {
             emailMessageOnOrderSent = searchEmailMessagesResult.shift();
         }
         // ポストアクションを作成
-        const setting = yield repos.setting.findOne({ project: { id: { $eq: '*' } } }, ['defaultSenderEmail']);
-        if (typeof (setting === null || setting === void 0 ? void 0 : setting.defaultSenderEmail) !== 'string') {
+        const setting = await repos.setting.findOne({ project: { id: { $eq: '*' } } }, ['defaultSenderEmail']);
+        if (typeof setting?.defaultSenderEmail !== 'string') {
             throw new factory.errors.NotFound('setting.defaultSenderEmail');
         }
-        const { emailMessages, potentialActions } = yield (0, potentialActions_1.createPotentialActions)(Object.assign(Object.assign({ order: result.order, // createEmailMessageでのorder.acceptedOffersへの依存性を排除したのでこちらでよいはず(2024-02-21~)
+        const { emailMessages, potentialActions } = await (0, potentialActions_1.createPotentialActions)({
+            order: result.order, // createEmailMessageでのorder.acceptedOffersへの依存性を排除したのでこちらでよいはず(2024-02-21~)
             customer,
             seller,
-            paymentMethods }, (params.potentialActions !== undefined) ? { potentialActions: params.potentialActions } : undefined), (emailMessageOnOrderSent !== undefined) ? { emailMessage: emailMessageOnOrderSent } : undefined), 
+            paymentMethods,
+            // order: orderWithAcceptedOffers, // 現時点でcreateEmailMessageでorder.acceptedOffersを使用している(2024-02-06~)
+            // transaction: transaction,
+            ...(params.potentialActions !== undefined) ? { potentialActions: params.potentialActions } : undefined,
+            ...(emailMessageOnOrderSent !== undefined) ? { emailMessage: emailMessageOnOrderSent } : undefined
+        }, 
         // settings
         setting);
         // メッセージ保管(2024-04-28~)
-        yield saveMessagesIfNeeded({
+        await saveMessagesIfNeeded({
             project: { id: transaction.project.id },
             order: { orderNumber, typeOf: factory.order.OrderType.Order }, seller: { id: seller.id }, emailMessages
         })(repos);
         // ステータス変更
         try {
-            yield repos.transaction.confirm({
+            await repos.transaction.confirm({
                 typeOf: transaction.typeOf,
                 id: transaction.id,
                 result: result,
@@ -160,7 +163,7 @@ function confirm(params, options) {
             });
         }
         catch (error) {
-            if (yield (0, errorHandler_1.isMongoError)(error)) {
+            if (await (0, errorHandler_1.isMongoError)(error)) {
                 // 万が一同一注文番号で確定しようとすると、MongoDBでE11000 duplicate key errorが発生する
                 // message: 'E11000 duplicate key error collection: prodttts.transactions index:result.order.orderNumber_1 dup key:...',
                 if (error.code === errorHandler_1.MongoErrorCode.DuplicateKey) {
@@ -170,12 +173,17 @@ function confirm(params, options) {
             throw error;
         }
         const { order } = result;
-        return Object.assign(Object.assign(Object.assign({ order,
-            customer }, (typeof code === 'string') ? { code } : undefined), (typeof eventId === 'string') ? { eventId } : undefined), (Array.isArray(reservationIds)) ? { reservationIds } : undefined);
-    });
+        return {
+            order,
+            customer,
+            ...(typeof code === 'string') ? { code } : undefined,
+            ...(typeof eventId === 'string') ? { eventId } : undefined,
+            ...(Array.isArray(reservationIds)) ? { reservationIds } : undefined
+        };
+    };
 }
 function saveMessagesIfNeeded(params) {
-    return (repos) => __awaiter(this, void 0, void 0, function* () {
+    return async (repos) => {
         const { project, order, emailMessages, seller } = params;
         if (emailMessages.length > 0) {
             const { orderNumber, typeOf } = order;
@@ -190,7 +198,7 @@ function saveMessagesIfNeeded(params) {
             //     })
             // );
             for (const { identifier, name, about, text, toRecipient, sender } of emailMessages) {
-                yield repos.message.upsertOneByIdentifier({
+                await repos.message.upsertOneByIdentifier({
                     identifier, name, about, text, toRecipient, sender,
                     project: { id: project.id, typeOf: factory.organizationType.Project },
                     provider: { id: seller.id, typeOf: factory.organizationType.Corporation },
@@ -198,7 +206,7 @@ function saveMessagesIfNeeded(params) {
                 });
             }
         }
-    });
+    };
 }
 /**
  * 全承認アクションを分解する
@@ -211,7 +219,6 @@ function dissolveAuthorizeActions(completedAuthorizeActions) {
     const authorizeProductOfferActions = [];
     const serialNumbers = [];
     completedAuthorizeActions.forEach((a) => {
-        var _a;
         let serialNumber;
         if (Array.isArray(a.object)) {
             if (a.object.length > 0
@@ -231,7 +238,7 @@ function dissolveAuthorizeActions(completedAuthorizeActions) {
                 serialNumber = assetTransactionNumber;
             }
             else if (a.object.typeOf === factory.offerType.Offer
-                && ((_a = a.object.itemOffered) === null || _a === void 0 ? void 0 : _a.typeOf) === factory.actionType.MoneyTransfer) {
+                && a.object.itemOffered?.typeOf === factory.actionType.MoneyTransfer) {
                 authorizeMoneyTansferActions.push(a);
                 serialNumber = a.instrument.transactionNumber;
             }
@@ -253,10 +260,10 @@ function dissolveAuthorizeActions(completedAuthorizeActions) {
     };
 }
 function createReservationIdsResult(order, acceptedOffers) {
-    var _a;
     let eventId = '';
     const reservationIds = [];
-    let eventIdsByOrder = (_a = order.orderedItem) === null || _a === void 0 ? void 0 : _a.filter((o) => o.orderedItem.typeOf === factory.product.ProductType.EventService).map((o) => {
+    let eventIdsByOrder = order.orderedItem?.filter((o) => o.orderedItem.typeOf === factory.product.ProductType.EventService)
+        .map((o) => {
         return o.orderedItem.serviceOutput.reservationFor.id;
     });
     if (Array.isArray(eventIdsByOrder)) {
@@ -355,11 +362,24 @@ function createResult(params, options) {
         eventId = reservationIdsResult.eventId;
         reservationIds = reservationIdsResult.reservationIds;
     }
-    return Object.assign(Object.assign({ paymentMethods, result: Object.assign({ order: orderAsResult, authorizeActions, numAcceptedOffers: params.acceptedOffers.length }, (typeof params.code === 'string') ? { code: params.code } : undefined) }, (typeof eventId === 'string') ? { eventId } : undefined), (Array.isArray(reservationIds)) ? { reservationIds } : undefined);
+    return {
+        paymentMethods,
+        result: {
+            order: orderAsResult,
+            authorizeActions, // 追加(2024-01-17~)
+            numAcceptedOffers: params.acceptedOffers.length, // 追加(2024-01-17~)
+            // options: { // discontinue(2024-06-20~)
+            //     ignoreAccpetedOffersFromResult: true
+            // },
+            ...(typeof params.code === 'string') ? { code: params.code } : undefined
+        },
+        ...(typeof eventId === 'string') ? { eventId } : undefined,
+        ...(Array.isArray(reservationIds)) ? { reservationIds } : undefined
+    };
 }
 function searchAcceptPayActions(params) {
-    return (repos) => __awaiter(this, void 0, void 0, function* () {
-        let acceptPayActions = yield repos.action.search({
+    return async (repos) => {
+        let acceptPayActions = await repos.action.search({
             project: { id: { $eq: params.project.id } },
             typeOf: { $eq: factory.actionType.AcceptAction },
             actionStatus: { $in: [factory.actionStatusType.CompletedActionStatus] },
@@ -377,12 +397,12 @@ function searchAcceptPayActions(params) {
                 .isBefore(moment(params.result.order.orderDate));
         });
         return acceptPayActions;
-    });
+    };
 }
 function searchAuthorizeActions(params) {
-    return (repos) => __awaiter(this, void 0, void 0, function* () {
+    return async (repos) => {
         // 取引に対する全ての承認アクションをマージ
-        let authorizeActions = yield repos.action.searchByPurpose({
+        let authorizeActions = await repos.action.searchByPurpose({
             typeOf: factory.actionType.AuthorizeAction,
             purpose: {
                 typeOf: factory.transactionType.PlaceOrder,
@@ -397,7 +417,7 @@ function searchAuthorizeActions(params) {
                 .isBefore(moment(params.result.order.orderDate));
         });
         return authorizeActions;
-    });
+    };
 }
 function createConfirmationNumber(params) {
     const confirmationNumber = params.transaction.object.confirmationNumber;

package/lib/chevre/service/transaction/placeOrder/exportTasks/factory.js

@@ -12,21 +12,28 @@ const factory = require("../../../../factory");
 function createTasks(params, setting
 // settings: Settings
 ) {
-    var _a, _b, _c;
     const taskAttributes = [];
     const transaction = params.transaction;
     const taskRunsAt = params.runsAt;
-    const informTransaction = (_a = setting === null || setting === void 0 ? void 0 : setting.onTransactionStatusChanged) === null || _a === void 0 ? void 0 : _a.informTransaction;
+    const informTransaction = setting?.onTransactionStatusChanged?.informTransaction;
     const transactionWebhookUrls = (Array.isArray(informTransaction)) ? informTransaction : [];
     const triggerWebhookTaskAttributes = [];
     transactionWebhookUrls.forEach(({ recipient }) => {
-        if (typeof (recipient === null || recipient === void 0 ? void 0 : recipient.url) === 'string') {
-            const informObject = Object.assign({ id: transaction.id, typeOf: transaction.typeOf, project: transaction.project, seller: transaction.seller, startDate: transaction.startDate, status: transaction.status }, (transaction.endDate !== undefined) ? { endDate: transaction.endDate } : undefined);
+        if (typeof recipient?.url === 'string') {
+            const informObject = {
+                id: transaction.id,
+                typeOf: transaction.typeOf,
+                project: transaction.project,
+                seller: transaction.seller,
+                startDate: transaction.startDate,
+                status: transaction.status,
+                ...(transaction.endDate !== undefined) ? { endDate: transaction.endDate } : undefined
+            };
             const data = {
                 object: informObject,
                 recipient: {
-                    id: (typeof (recipient === null || recipient === void 0 ? void 0 : recipient.id) === 'string') ? recipient.id : '',
-                    name: recipient === null || recipient === void 0 ? void 0 : recipient.name,
+                    id: (typeof recipient?.id === 'string') ? recipient.id : '',
+                    name: recipient?.name,
                     typeOf: factory.creativeWorkType.WebApplication
                     // url: recipient.url // discontinue(2025-02-13~)
                 },
@@ -49,8 +56,8 @@ function createTasks(params, setting
             });
         }
     });
-    const confirmedStoragePeriodInDays = (_b = setting === null || setting === void 0 ? void 0 : setting.storage) === null || _b === void 0 ? void 0 : _b.transactionConfirmedInDays;
-    const canceledStoragePeriodInDays = (_c = setting === null || setting === void 0 ? void 0 : setting.storage) === null || _c === void 0 ? void 0 : _c.transactionCanceledInDays;
+    const confirmedStoragePeriodInDays = setting?.storage?.transactionConfirmedInDays;
+    const canceledStoragePeriodInDays = setting?.storage?.transactionCanceledInDays;
     if (typeof confirmedStoragePeriodInDays !== 'number') {
         throw new factory.errors.NotFound('setting.storage.confirmedStoragePeriodInDays');
     }
@@ -87,11 +94,22 @@ function createTasks(params, setting
         numberOfTried: 0,
         executionResults: [],
         data: {
-            object: Object.assign({ specifyingMethod: factory.action.update.deleteAction.ObjectAsTransactionSpecifyingMethod.Id, id: transaction.id, object: Object.assign(Object.assign({}, (typeof transaction.object.confirmationNumber === 'string')
-                    ? { confirmationNumber: transaction.object.confirmationNumber }
-                    : undefined), (typeof transaction.object.orderNumber === 'string')
-                    ? { orderNumber: transaction.object.orderNumber }
-                    : undefined), project: transaction.project, startDate: transaction.startDate, typeOf: transaction.typeOf }, (transaction.endDate !== undefined) ? { endDate: transaction.endDate } : undefined)
+            object: {
+                specifyingMethod: factory.action.update.deleteAction.ObjectAsTransactionSpecifyingMethod.Id,
+                id: transaction.id,
+                object: {
+                    ...(typeof transaction.object.confirmationNumber === 'string')
+                        ? { confirmationNumber: transaction.object.confirmationNumber }
+                        : undefined,
+                    ...(typeof transaction.object.orderNumber === 'string')
+                        ? { orderNumber: transaction.object.orderNumber }
+                        : undefined
+                },
+                project: transaction.project,
+                startDate: transaction.startDate,
+                typeOf: transaction.typeOf,
+                ...(transaction.endDate !== undefined) ? { endDate: transaction.endDate } : undefined
+            }
         }
     };
     // 確定取引にも興行オファー承認中止タスクを追加(2023-05-09~)

package/lib/chevre/service/transaction/placeOrder/exportTasksById.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.exportTasksById = exportTasksById;
 const moment = require("moment");
@@ -18,10 +9,10 @@ const factory_1 = require("./exportTasks/factory");
  * 取引のタスクを出力します
  */
 function exportTasksById(params) {
-    return (repos
+    return async (repos
     // settings: Settings
-    ) => __awaiter(this, void 0, void 0, function* () {
-        const transaction = yield repos.transaction.projectFieldsById({
+    ) => {
+        const transaction = await repos.transaction.projectFieldsById({
             typeOf: factory.transactionType.PlaceOrder,
             id: params.id
         }, ['endDate', 'object', 'project', 'seller', 'startDate', 'status', 'typeOf']);
@@ -33,7 +24,7 @@ function exportTasksById(params) {
                 .toDate();
         }
         // search settings
-        const setting = yield repos.setting.findOne({ project: { id: { $eq: '*' } } }, ['onTransactionStatusChanged', 'storage']);
+        const setting = await repos.setting.findOne({ project: { id: { $eq: '*' } } }, ['onTransactionStatusChanged', 'storage']);
         const taskAttributes = (0, factory_1.createTasks)({
             transaction,
             runsAt: taskRunsAt,
@@ -41,6 +32,6 @@ function exportTasksById(params) {
         }, setting
         // settings
         );
-        yield repos.task.saveMany(taskAttributes, { emitImmediately: true });
-    });
+        await repos.task.saveMany(taskAttributes, { emitImmediately: true });
+    };
 }

package/lib/chevre/service/transaction/placeOrder/publishConfirmationNumberIfNotExist.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.publishConfirmationNumberIfNotExist = publishConfirmationNumberIfNotExist;
 const factory = require("../../../factory");
@@ -15,8 +6,8 @@ const factory = require("../../../factory");
  * 未発行であれば、注文の確認番号を発行して取引に保管する
  */
 function publishConfirmationNumberIfNotExist(params) {
-    return (repos) => __awaiter(this, void 0, void 0, function* () {
-        let confirmationNumber = yield repos.transaction.findInProgressConfirmationNumberById({
+    return async (repos) => {
+        let confirmationNumber = await repos.transaction.findInProgressConfirmationNumberById({
             id: params.id,
             status: { $in: params.status.$in }
         });
@@ -25,15 +16,15 @@ function publishConfirmationNumberIfNotExist(params) {
             return confirmationNumber;
         }
         // 確認番号を発行
-        confirmationNumber = yield repos.confirmationNumber.publish({ orderDate: params.object.orderDate });
+        confirmationNumber = await repos.confirmationNumber.publish({ orderDate: params.object.orderDate });
         // 取引に存在しなければ保管
-        yield repos.transaction.saveConfirmationNumberIfNotExist({
+        await repos.transaction.saveConfirmationNumberIfNotExist({
             id: params.id,
             status: { $in: params.status.$in },
             confirmationNumber
         });
         // 確認番号を取引から再取得
-        confirmationNumber = yield repos.transaction.findInProgressConfirmationNumberById({
+        confirmationNumber = await repos.transaction.findInProgressConfirmationNumberById({
             id: params.id,
             status: { $in: params.status.$in }
         });
@@ -42,5 +33,5 @@ function publishConfirmationNumberIfNotExist(params) {
             throw new factory.errors.Internal('transaction.object.confirmationNumber not found');
         }
         return confirmationNumber;
-    });
+    };
 }

package/lib/chevre/service/transaction/placeOrder/publishOrderNumberIfNotExist.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.publishOrderNumberIfNotExist = publishOrderNumberIfNotExist;
 const factory = require("../../../factory");
@@ -15,31 +6,31 @@ const factory = require("../../../factory");
  * 未発行であれば、注文番号を発行して取引に保管する
  */
 function publishOrderNumberIfNotExist(params) {
-    return (repos) => __awaiter(this, void 0, void 0, function* () {
+    return async (repos) => {
         // 最適化(2023-02-03~)
-        let orderNumber = yield repos.transaction.findInProgressOrderNumberById({ id: params.id });
+        let orderNumber = await repos.transaction.findInProgressOrderNumberById({ id: params.id });
         // すでに発行済であれば何もしない
         if (typeof orderNumber === 'string') {
             return orderNumber;
         }
         // 注文番号を発行
-        const { alternateName } = yield repos.project.findAlternateNameById({ id: params.project.id });
+        const { alternateName } = await repos.project.findAlternateNameById({ id: params.project.id });
         if (typeof alternateName !== 'string') {
             throw new factory.errors.NotFound('project.alternateName');
         }
-        orderNumber = yield repos.orderNumber.publishByTimestamp({
+        orderNumber = await repos.orderNumber.publishByTimestamp({
             project: { alternateName },
             orderDate: params.object.orderDate
         });
         // 取引に存在しなければ保管
-        yield repos.transaction.saveOrderNumberIfNotExist({ id: params.id, orderNumber });
+        await repos.transaction.saveOrderNumberIfNotExist({ id: params.id, orderNumber });
         // 注文番号を取引から再取得
         // 最適化(2023-02-03~)
-        orderNumber = yield repos.transaction.findInProgressOrderNumberById({ id: params.id });
+        orderNumber = await repos.transaction.findInProgressOrderNumberById({ id: params.id });
         // 万が一処理が想定通りでない場合orderNumberが存在しない
         if (typeof orderNumber !== 'string') {
             throw new factory.errors.Internal('transaction.object.orderNumber not found');
         }
         return orderNumber;
-    });
+    };
 }

package/lib/chevre/service/transaction/placeOrder/start/factory.js

@@ -6,15 +6,23 @@ const factory = require("../../../../factory");
 const AGENT_IDENTIFIER_NAME_PASSPORT = 'passport';
 exports.AGENT_IDENTIFIER_NAME_PASSPORT = AGENT_IDENTIFIER_NAME_PASSPORT;
 function createStartParams(params, expiresInSeconds, passport, seller, broker, customerType, memeberOfPayload) {
-    var _a, _b, _c, _d;
     let clientUser;
     let instrument;
-    if (typeof ((_a = params.object.clientUser) === null || _a === void 0 ? void 0 : _a.client_id) === 'string') {
+    if (typeof params.object.clientUser?.client_id === 'string') {
         const { sub, token_use, iss, exp, iat, version, jti, client_id, username, aud, typ } = params.object.clientUser;
         clientUser = { sub, token_use, iss, exp, iat, version, jti, client_id, username, aud, typ };
         instrument = { id: client_id, typeOf: factory.creativeWorkType.WebApplication };
     }
-    const transactionObject = Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({}, (typeof (passport === null || passport === void 0 ? void 0 : passport.scope) === 'string') ? { passport } : undefined), (typeof (clientUser === null || clientUser === void 0 ? void 0 : clientUser.client_id) === 'string') ? { clientUser } : undefined), (typeof ((_b = params.object) === null || _b === void 0 ? void 0 : _b.name) === 'string') ? { name: (_c = params.object) === null || _c === void 0 ? void 0 : _c.name } : undefined), (typeof (broker === null || broker === void 0 ? void 0 : broker.typeOf) === 'string') ? { broker: broker } : undefined), (typeof ((_d = params.object.customer) === null || _d === void 0 ? void 0 : _d.typeOf) === 'string') ? { customer: params.object.customer } : undefined), (typeof customerType === 'string') ? { customerType } : undefined);
+    const transactionObject = {
+        // discontinue passportToken(2024-07-05~)
+        // ...(typeof params.object.passport?.token === 'string') ? { passportToken: params.object.passport.token } : undefined,
+        ...(typeof passport?.scope === 'string') ? { passport } : undefined,
+        ...(typeof clientUser?.client_id === 'string') ? { clientUser } : undefined,
+        ...(typeof params.object?.name === 'string') ? { name: params.object?.name } : undefined,
+        ...(typeof broker?.typeOf === 'string') ? { broker: broker } : undefined,
+        ...(typeof params.object.customer?.typeOf === 'string') ? { customer: params.object.customer } : undefined,
+        ...(typeof customerType === 'string') ? { customerType } : undefined
+    };
     if (typeof seller.id !== 'string') {
         throw new factory.errors.NotFound('seller.id');
     }
@@ -24,13 +32,25 @@ function createStartParams(params, expiresInSeconds, passport, seller, broker, c
     const agentIdentifier = [
         ...(Array.isArray(params.agent.identifier)) ? params.agent.identifier : [],
         // add passport(2024-07-05~)
-        ...(typeof (passport === null || passport === void 0 ? void 0 : passport.identifier) === 'string') ? [{ name: AGENT_IDENTIFIER_NAME_PASSPORT, value: passport.identifier }] : []
+        ...(typeof passport?.identifier === 'string') ? [{ name: AGENT_IDENTIFIER_NAME_PASSPORT, value: passport.identifier }] : []
     ];
-    const agent = Object.assign(Object.assign(Object.assign({}, params.agent), (memeberOfPayload !== undefined) ? { memeberOfPayload } : undefined), { identifier: agentIdentifier });
-    return Object.assign({ project: { typeOf: seller.project.typeOf, id: seller.project.id }, typeOf: factory.transactionType.PlaceOrder, agent, seller: {
+    const agent = {
+        ...params.agent,
+        ...(memeberOfPayload !== undefined) ? { memeberOfPayload } : undefined,
+        identifier: agentIdentifier
+    };
+    return {
+        project: { typeOf: seller.project.typeOf, id: seller.project.id },
+        typeOf: factory.transactionType.PlaceOrder,
+        agent,
+        seller: {
             id: seller.id,
             name: seller.name,
             typeOf: seller.typeOf,
             additionalProperty: (Array.isArray(seller.additionalProperty)) ? seller.additionalProperty : [] // 追加特性を追加(2023-08-08~)
-        }, object: transactionObject, expiresInSeconds }, (typeof (instrument === null || instrument === void 0 ? void 0 : instrument.id) === 'string') ? { instrument } : undefined);
+        },
+        object: transactionObject,
+        expiresInSeconds,
+        ...(typeof instrument?.id === 'string') ? { instrument } : undefined
+    };
 }