@chevre/domain 21.34.0 → 21.35.0-alpha.1

package/example/src/chevre/migratePayTransactionRecipes.ts

@@ -48,10 +48,7 @@ async function main() {
                 limit: 1,
                 page: 1,
                 project: { id: { $eq: payTransaction.project.id } },
-                agent: {
-                    id: { $in: [payTransaction.project.id] },
-                    typeOf: { $in: [chevre.factory.organizationType.Project] }
-                },
+                sameAs: { id: { $eq: payTransaction.id } },
                 object: {
                     typeOf: { $eq: 'Invoice' },
                     paymentMethodId: { $eq: payTransaction.transactionNumber }
@@ -74,7 +71,8 @@ async function main() {
             console.log(
                 'authorizeInvoiceAction already exists. step:',
                 authorizeInvoiceAction.object.paymentMethodId,
-                payTransaction.project.id, payTransaction.transactionNumber, payTransaction.startDate, i
+                payTransaction.project.id, payTransaction.transactionNumber, payTransaction.startDate, i,
+                updateCount, saveRecipeCount, saveActionCount
             );
 
             const actionRecipe = await actionRepo.findRecipeByAction<chevre.factory.recipe.RecipeCategory.checkMovieTicket>({
@@ -85,32 +83,35 @@ async function main() {
             if (actionRecipe !== null) {
                 console.log(
                     'actionRecipe already exists. step:',
-                    payTransaction.project.id, payTransaction.transactionNumber, payTransaction.startDate, i
+                    payTransaction.project.id, payTransaction.transactionNumber, payTransaction.startDate, i,
+                    updateCount, saveRecipeCount, saveActionCount
                 );
 
                 // optimize payTransaction.object
                 let unsetResult: any;
                 if (secureTran2Result !== undefined) {
-                    // unsetResult = await assetTransactionRepo.unsetUnnecessaryFields({
-                    //     filter: { _id: { $eq: payTransaction.id } },
-                    //     $unset: {
-                    //         'object.secureTran2Result': 1
-                    //     }
-                    // });
+                    unsetResult = await assetTransactionRepo.unsetUnnecessaryFields({
+                        filter: { _id: { $eq: payTransaction.id } },
+                        $unset: {
+                            'object.entryTranArgs': 1,
+                            'object.entryTranResult': 1,
+                            'object.execTranArgs': 1,
+                            'object.execTranResult': 1,
+                            'object.secureTran2Result': 1
+                        }
+                    });
                     updateCount += 1;
                 } else if (entryTranArgs !== undefined && execTranResult !== undefined) {
-                    if (typeof (<any>execTranResult).redirectUrl !== 'string') {
-                        // unsetResult = await assetTransactionRepo.unsetUnnecessaryFields({
-                        //     filter: { _id: { $eq: payTransaction.id } },
-                        //     $unset: {
-                        //         'object.entryTranArgs': 1,
-                        //         'object.entryTranResult': 1,
-                        //         'object.execTranArgs': 1,
-                        //         'object.execTranResult': 1
-                        //     }
-                        // });
-                        updateCount += 1;
-                    }
+                    unsetResult = await assetTransactionRepo.unsetUnnecessaryFields({
+                        filter: { _id: { $eq: payTransaction.id } },
+                        $unset: {
+                            'object.entryTranArgs': 1,
+                            'object.entryTranResult': 1,
+                            'object.execTranArgs': 1,
+                            'object.execTranResult': 1
+                        }
+                    });
+                    updateCount += 1;
                 }
                 console.log(
                     'result unset. unsetResult:', unsetResult,

package/lib/chevre/emailMessageBuilder.d.ts

@@ -3,11 +3,14 @@ type ISendableEmailMessage = factory.action.transfer.send.message.email.IObjectA
     identifier: string;
     name: string;
 };
+export type IOrderAsCreateEmailParams = Pick<factory.order.IOrder, 'confirmationNumber' | 'identifier' | 'orderDate' | 'orderNumber' | 'orderStatus' | 'orderedItem' | 'paymentMethods' | 'price' | 'priceCurrency' | 'seller' | 'typeOf'> & {
+    customer: factory.order.ICustomer;
+};
 /**
  * 注文配送メッセージを作成する
  */
 declare function createSendOrderMessage(params: {
-    order: factory.order.IOrder;
+    order: IOrderAsCreateEmailParams;
     email?: factory.creativeWork.message.email.ICustomization;
     emailMessage?: factory.creativeWork.message.email.ICreativeWork;
     index: number;

package/lib/chevre/factory/transaction.d.ts

@@ -12,7 +12,7 @@ export declare namespace placeOrder {
         passportValidator?: IPassportValidator;
         broker?: factory.order.IBroker;
     };
-    type IOrderURLGenerator = (order: factory.order.IOrder) => string;
+    type IOrderURLGenerator = (order: factory.transaction.placeOrder.IOrderAsResult) => string;
     type IResultOrderParams = factory.transaction.placeOrder.IResultOrderParams & {
         /**
          * 注文日時

package/lib/chevre/repo/action.js

@@ -1128,16 +1128,16 @@ class MongoRepository {
     }
     saveActionWithEndDate(savingAction) {
         return __awaiter(this, void 0, void 0, function* () {
-            const { typeOf, project, agent, object } = savingAction, updateFields = __rest(savingAction, ["typeOf", "project", "agent", "object"]);
+            const { sameAs, typeOf, project, agent, object } = savingAction, updateFields = __rest(savingAction, ["sameAs", "typeOf", "project", "agent", "object"]);
             const filter = {
                 'project.id': { $eq: project.id },
-                'agent.id': { $exists: true, $eq: agent.id },
-                'object.typeOf': { $exists: true, $eq: object.typeOf },
+                // 'agent.id': { $exists: true, $eq: agent.id },
+                // 'object.typeOf': { $exists: true, $eq: object.typeOf },
                 'object.paymentMethodId': { $exists: true, $eq: object.paymentMethodId },
-                typeOf: { $eq: typeOf }
-                // 'sameAs.id': { $exists: true, $eq: sameAs.id }
+                typeOf: { $eq: typeOf },
+                'sameAs.id': { $exists: true, $eq: sameAs.id }
             };
-            const setOnInsert = { typeOf, project, agent, object };
+            const setOnInsert = { typeOf, project, agent, object, sameAs };
             const setKeys = updateFields;
             const update = {
                 $setOnInsert: setOnInsert,

package/lib/chevre/repo/orderInTransaction.d.ts

@@ -4,6 +4,7 @@ type IOrderInTransaction = Pick<factory.order.IOrder, 'orderNumber' | 'project'>
     typeOf: factory.transactionType.PlaceOrder;
     acceptedOffers: factory.order.IAcceptedOffer<factory.order.IItemOffered>[];
 };
+export type IPlacingOrder = Pick<factory.order.IOrder, 'broker' | 'confirmationNumber' | 'customer' | 'identifier' | 'isGift' | 'name' | 'orderDate' | 'orderNumber' | 'orderStatus' | 'orderedItem' | 'paymentMethods' | 'price' | 'priceCurrency' | 'seller' | 'typeOf' | 'url'>;
 /**
  * 取引中注文リポジトリ
  */
@@ -21,7 +22,7 @@ export declare class MongoRepository {
     /**
      * 注文を受注する
      */
-    placeOrder(order: Omit<factory.order.IOrder, 'id'>): Promise<void>;
+    placeOrder(order: IPlacingOrder): Promise<void>;
     acceptOffer(params: Pick<IOrderInTransaction, 'acceptedOffers' | 'orderNumber' | 'project'>): Promise<import("mongodb").UpdateResult | undefined>;
     /**
      * serialNumberからオファーを除外する

package/lib/chevre/repo/orderInTransaction.js

@@ -41,7 +41,9 @@ class MongoRepository {
     /**
      * 注文を受注する
      */
-    placeOrder(order) {
+    placeOrder(
+    // order: Omit<factory.order.IOrder, 'id'>
+    order) {
         return __awaiter(this, void 0, void 0, function* () {
             let setFields;
             // acceptedOffersを上書きしない

package/lib/chevre/service/order/deleteOrder.d.ts

@@ -11,7 +11,7 @@ import * as factory from '../../factory';
  * 冪等性を確保すること
  */
 declare function deleteOrder(params: {
-    object: Pick<factory.order.IOrder, 'project' | 'typeOf' | 'confirmationNumber' | 'orderDate' | 'orderNumber'>;
+    object: Pick<factory.order.IOrder, 'typeOf' | 'confirmationNumber' | 'orderDate' | 'orderNumber'>;
 }): (repos: {
     acceptedOffer: AcceptedOfferRepo;
     accountingReport: AccountingReportRepo;

package/lib/chevre/service/order/onOrderStatusChanged/onOrderPaymentDue.d.ts

@@ -1,7 +1,7 @@
 import type { MongoRepository as TaskRepo } from '../../../repo/task';
 import * as factory from '../../../factory';
 declare function onOrderPaymentDue(params: {
-    order: Pick<factory.order.IOrder, 'paymentMethods' | 'project' | 'orderNumber' | 'confirmationNumber' | 'customer' | 'orderDate' | 'seller' | 'typeOf' | 'price' | 'priceCurrency'> & {
+    order: Pick<factory.order.IOrder, 'paymentMethods' | 'project' | 'orderNumber' | 'confirmationNumber' | 'orderDate' | 'seller' | 'typeOf' | 'price' | 'priceCurrency'> & {
         orderStatus: factory.orderStatus.OrderPaymentDue;
     };
 }): (repos: {

package/lib/chevre/service/order/placeOrder.d.ts

@@ -44,6 +44,6 @@ declare function placeOrder(params: {
     task: TaskRepo;
     transaction: TransactionRepo;
 }) => Promise<{
-    order: factory.order.IOrder;
+    order: factory.transaction.placeOrder.IOrderAsResult;
 }>;
 export { placeOrder, placeOrderWithoutTransaction };

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

@@ -13,22 +13,36 @@ exports.placeOrderWithoutTransaction = exports.placeOrder = void 0;
 const createDebug = require("debug");
 const moment = require("moment");
 const factory = require("../../factory");
+const result_1 = require("../transaction/placeOrderInProgress/result");
 const onAssetTransactionStatusChanged_1 = require("./onAssetTransactionStatusChanged");
 const onOrderStatusChanged_1 = require("./onOrderStatusChanged");
 const debug = createDebug('chevre-domain:service:order');
-function createOrder(params) {
-    const orderedItems = (Array.isArray(params.orderedItem)) ? params.orderedItem : [];
-    return Object.assign(Object.assign(Object.assign({}, params), { orderDate: moment(params.orderDate)
-            .toDate(), orderedItem: orderedItems }), (params.dateReturned !== null && params.dateReturned !== undefined)
-        ? {
-            dateReturned: moment(params.dateReturned)
-                .toDate()
-        }
-        : undefined);
+function createPlacingOrder(params) {
+    var _a, _b;
+    const { transaction } = params;
+    const orderByTransaction = (_a = transaction.result) === null || _a === void 0 ? void 0 : _a.order;
+    if (orderByTransaction === undefined) {
+        throw new factory.errors.NotFound('transaction.result.order');
+    }
+    const orderedItems = (Array.isArray(orderByTransaction.orderedItem)) ? orderByTransaction.orderedItem : [];
+    const customer = (0, result_1.createCustomer)({ transaction });
+    const seller = (0, result_1.createSeller)({ transaction });
+    const name = (typeof transaction.object.name === 'string') ? transaction.object.name : undefined;
+    const broker = (typeof ((_b = transaction.object.broker) === null || _b === void 0 ? void 0 : _b.typeOf) === 'string') ? transaction.object.broker : undefined;
+    return Object.assign(Object.assign(Object.assign(Object.assign({}, orderByTransaction), { customer,
+        seller, orderDate: moment(orderByTransaction.orderDate)
+            .toDate(), orderedItem: orderedItems }), (typeof name === 'string') ? { name } : undefined), (typeof (broker === null || broker === void 0 ? void 0 : broker.typeOf) === 'string') ? { broker } : undefined
+    // discontinue(2024-06-17~)
+    // ...(params.dateReturned !== null && params.dateReturned !== undefined)
+    //     ? {
+    //         dateReturned: moment(params.dateReturned)
+    //             .toDate()
+    //     }
+    //     : undefined
+    );
 }
-function createOrderFromBody(params) {
+function createPlacingOrderFromExistingTransaction(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
-        var _a;
         const confirmationNumber = String(params.confirmationNumber);
         const orderNumber = params.orderNumber;
         let order;
@@ -44,18 +58,18 @@ function createOrderFromBody(params) {
                     orderNumbers: [orderNumber]
                 }
             },
-            inclusion: ['project', 'typeOf', 'result'],
+            inclusion: ['project', 'typeOf', 'result', 'object', 'seller'],
             exclusion: []
         });
         const placeOrderTransactionWithResult = placeOrderTransactions.shift();
         if (placeOrderTransactionWithResult === undefined) {
             throw new factory.errors.NotFound(factory.transactionType.PlaceOrder);
         }
-        const orderByTransaction = (_a = placeOrderTransactionWithResult.result) === null || _a === void 0 ? void 0 : _a.order;
-        if (orderByTransaction === undefined) {
-            throw new factory.errors.NotFound('transaction.result.order');
-        }
-        order = createOrder(orderByTransaction);
+        // const orderByTransaction = placeOrderTransactionWithResult.result?.order;
+        // if (orderByTransaction === undefined) {
+        //     throw new factory.errors.NotFound('transaction.result.order');
+        // }
+        order = createPlacingOrder({ transaction: placeOrderTransactionWithResult });
         return { order, placeOrderTransaction: placeOrderTransactionWithResult };
     });
 }
@@ -66,8 +80,6 @@ function placeOrderWithoutTransaction(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         var _a;
         const order = params.object;
-        // アクションを作成する(2022-04-11~)
-        // const maskedCustomer = createMaskedCustomer(order, { noProfile: true });
         const simpleOrder = {
             typeOf: order.typeOf,
             // seller: {
@@ -116,20 +128,6 @@ function voidAcceptedOfferIfNecessary(params) {
         if (Array.isArray(authorizeActionsAsResult) && authorizeActionsAsResult.length > 0) {
             const completedAuthorizeActionIds = authorizeActionsAsResult.map(({ id }) => id);
             debug(completedAuthorizeActionIds.length, 'completedAuthorizeActionIds found from transaction', params.purpose.id);
-            // const authorizeActions = <Pick<IAuthorizeEventServiceOfferAction, 'object'>[]>
-            //     await repos.action.search(
-            //         {
-            //             typeOf: factory.actionType.AuthorizeAction,
-            //             purpose: {
-            //                 typeOf: { $in: [factory.transactionType.PlaceOrder] },
-            //                 id: { $in: [params.purpose.id] }
-            //             },
-            //             object: { typeOf: { $eq: factory.action.authorize.offer.eventService.ObjectType.SeatReservation } },
-            //             id: { $nin: completedAuthorizeActionIds }
-            //         },
-            //         ['object'],
-            //         []
-            //     );
             const authorizeActionsWithInstrument = yield repos.action.search({
                 typeOf: factory.actionType.AuthorizeAction,
                 purpose: {
@@ -155,68 +153,9 @@ function voidAcceptedOfferIfNecessary(params) {
                 acceptedOffers: { serialNumber: { $nin: serialNumbersMustBeIn } }
             });
             debug('voidAcceptedOfferBySerialNumber processed.', params.object.orderNumber, 'voidAcceptedOfferBySerialNumberResult:', voidAcceptedOfferBySerialNumberResult);
-            // await voidAcceptedOffer({
-            //     authorizeActions,
-            //     authorizeActionsWithInstrument,
-            //     orderNumber: params.object.orderNumber
-            // })(repos);
         }
     });
 }
-// function verifyAcceptedOffers(params: {
-//     order: factory.order.IOrder & {
-//         acceptedOffers: factory.order.IAcceptedOffer<factory.order.IItemOffered>[];
-//     };
-// }) {
-//     return async (repos: {
-//         orderInTransaction: OrderInTransactionRepo;
-//     }) => {
-//         const { order } = params;
-//         const orderInTransaction = (await repos.orderInTransaction.searchByOrderNumber({
-//             orderNumber: { $eq: order.orderNumber }
-//         })).shift();
-//         if (orderInTransaction !== undefined) {
-//             debug('verifying acceptedOffers...', order.orderNumber);
-//             const acceptedOffersLengthMatched = orderInTransaction.acceptedOffers.length === order.acceptedOffers.length;
-//             debug('acceptedOffers.length matched?', acceptedOffersLengthMatched);
-//             if (!acceptedOffersLengthMatched) {
-//                 throw new factory.errors.ServiceUnavailable('acceptedOffers.length not matched');
-//             }
-//             const reservationIdsByOrderInTransation = orderInTransaction.acceptedOffers.map((offer) => {
-//                 return (offer.itemOffered.typeOf === factory.reservationType.EventReservation)
-//                     ? offer.itemOffered.id
-//                     : '';
-//             });
-//             const reservationIdsByOrder = order.acceptedOffers.map((offer) => {
-//                 return (offer.itemOffered.typeOf === factory.reservationType.EventReservation)
-//                     ? offer.itemOffered.id
-//                     : '';
-//             });
-//             debug('reservationIdsByOrderInTransation:', reservationIdsByOrderInTransation);
-//             debug('reservationIdsByOrder:', reservationIdsByOrder);
-//             const offerIdsByOrderInTransation = [...new Set(orderInTransaction.acceptedOffers.map((offer) => {
-//                 return String(offer.id);
-//             }))];
-//             const offerIdsByOrder = [...new Set(order.acceptedOffers.map((offer) => {
-//                 return String(offer.id);
-//             }))];
-//             debug('offerIdsByOrderInTransation:', offerIdsByOrderInTransation);
-//             debug('offerIdsByOrder:', offerIdsByOrder);
-//             const reservationIdsMatched = reservationIdsByOrderInTransation.length === reservationIdsByOrder.length
-//                 && reservationIdsByOrderInTransation.every((reservationId) => reservationIdsByOrder.includes(reservationId));
-//             debug('reservationIds matched?', reservationIdsMatched);
-//             const offerIdsMatched = offerIdsByOrderInTransation.length === offerIdsByOrder.length
-//                 && offerIdsByOrderInTransation.every((offerId) => offerIdsByOrder.includes(offerId));
-//             debug('offerIds matched?', offerIdsMatched);
-//             if (!reservationIdsMatched) {
-//                 throw new factory.errors.ServiceUnavailable('reservationIds not matched');
-//             }
-//             if (!offerIdsMatched) {
-//                 throw new factory.errors.ServiceUnavailable('offerIds not matched');
-//             }
-//         }
-//     };
-// }
 /**
  * 注文を作成する
  */
@@ -228,7 +167,7 @@ function placeOrder(params) {
             throw new factory.errors.Argument('useOnOrderStatusChanged', 'must be boolean');
         }
         // 注文番号から取引と注文をfixする
-        const { order, placeOrderTransaction } = yield createOrderFromBody({
+        const { order, placeOrderTransaction } = yield createPlacingOrderFromExistingTransaction({
             project: { id: params.project.id },
             confirmationNumber: params.object.confirmationNumber,
             orderNumber: params.object.orderNumber
@@ -255,10 +194,10 @@ function placeOrder(params) {
             typeOf: placeOrderTransaction.typeOf, id: placeOrderTransaction.id
         };
         const orderActionAttributes = {
-            agent: (typeof ((_a = params.agent) === null || _a === void 0 ? void 0 : _a.typeOf) === 'string') ? params.agent : order.project,
+            agent: (typeof ((_a = params.agent) === null || _a === void 0 ? void 0 : _a.typeOf) === 'string') ? params.agent : placeOrderTransaction.project,
             object: simpleOrder,
             potentialActions: {},
-            project: order.project,
+            project: placeOrderTransaction.project,
             purpose: orderActionPurpose,
             typeOf: factory.actionType.OrderAction
         };
@@ -317,10 +256,10 @@ function placeOrder(params) {
                 yield (0, onOrderStatusChanged_1.onOrderPaymentDue)({
                     order: {
                         paymentMethods: order.paymentMethods,
-                        project: order.project,
+                        project: placeOrderTransaction.project,
                         orderNumber: order.orderNumber,
                         confirmationNumber: order.confirmationNumber,
-                        customer: order.customer,
+                        // customer: order.customer,
                         orderDate: order.orderDate,
                         seller: order.seller,
                         typeOf: order.typeOf,
@@ -359,7 +298,7 @@ function placeOrder(params) {
             if (order.paymentMethods.length === 0) {
                 // paymentMethods.length: 0の場合に、confirmPayTransactionは実行されないので、ここで強制的にpaymentDue2Processingを実行する必要がある
                 yield (0, onAssetTransactionStatusChanged_1.paymentDue2Processing)({
-                    project: { id: order.project.id },
+                    project: { id: placeOrderTransaction.project.id },
                     confirmationNumber: order.confirmationNumber,
                     orderNumber: order.orderNumber,
                     useOnOrderStatusChanged: params.useOnOrderStatusChanged === true

package/lib/chevre/service/transaction/placeOrderInProgress/confirm.d.ts

@@ -43,7 +43,8 @@ type IConfirmParams = PlaceOrderFactory.IConfirmParams & {
  * 注文取引を確定する
  */
 declare function confirm(params: IConfirmParams): IConfirmOperation<{
-    order: factory.order.IOrder;
+    order: factory.transaction.placeOrder.IOrderAsResult;
+    customer: factory.order.ICustomer;
     code?: string;
     /**
      * expectsReservationIdsの場合のみ

package/lib/chevre/service/transaction/placeOrderInProgress/confirm.js

@@ -41,7 +41,7 @@ function confirm(params) {
         }, ['typeOf', 'project', 'status', 'agent', 'seller', 'object', 'result']);
         if (transaction.status === factory.transactionStatusType.Confirmed) {
             // すでに確定済の場合
-            return transaction.result;
+            return Object.assign(Object.assign({}, transaction.result), { customer: (0, result_1.createCustomer)({ transaction }) });
         }
         else if (transaction.status === factory.transactionStatusType.Expired) {
             throw new factory.errors.Argument('transactionId', 'Transaction already expired');
@@ -89,6 +89,8 @@ function confirm(params) {
             authorizeMoneyTansferActions,
             authorizeProductOfferActions,
             acceptedOffers }), (typeof code === 'string') ? { code } : undefined));
+        const customer = (0, result_1.createCustomer)({ transaction });
+        const seller = (0, result_1.createSeller)({ transaction });
         // デフォルトEメールメッセージを検索
         let emailMessageOnOrderSent;
         if (repos.emailMessage !== undefined) {
@@ -101,12 +103,18 @@ function confirm(params) {
             emailMessageOnOrderSent = searchEmailMessagesResult.shift();
         }
         // ポストアクションを作成
-        const { emailMessages, potentialActions } = yield (0, potentialActions_1.createPotentialActions)(Object.assign(Object.assign({ order: result.order, 
+        const { emailMessages, potentialActions } = yield (0, potentialActions_1.createPotentialActions)(Object.assign(Object.assign({ order: result.order, // createEmailMessageでのorder.acceptedOffersへの依存性を排除したのでこちらでよいはず(2024-02-21~)
+            customer,
+            seller, 
             // order: orderWithAcceptedOffers, // 現時点でcreateEmailMessageでorder.acceptedOffersを使用している(2024-02-06~)
             // transaction: transaction,
             useOptimizedSendEmailAction: params.options.useOptimizedSendEmailAction }, (params.potentialActions !== undefined) ? { potentialActions: params.potentialActions } : undefined), (emailMessageOnOrderSent !== undefined) ? { emailMessage: emailMessageOnOrderSent } : undefined));
         // メッセージ保管(2024-04-28~)
-        yield saveMessagesIfNeeded({ options: params.options }, result.order, emailMessages)(repos);
+        yield saveMessagesIfNeeded({
+            options: params.options,
+            project: { id: transaction.project.id },
+            order: result.order, seller, emailMessages
+        })(repos);
         // ステータス変更
         try {
             yield repos.transaction.confirm({
@@ -127,20 +135,22 @@ function confirm(params) {
             throw error;
         }
         const { order } = result;
-        return Object.assign(Object.assign(Object.assign({ order }, (typeof code === 'string') ? { code } : undefined), (typeof eventId === 'string') ? { eventId } : undefined), (Array.isArray(reservationIds)) ? { reservationIds } : undefined);
+        return Object.assign(Object.assign(Object.assign({ order,
+            customer }, (typeof code === 'string') ? { code } : undefined), (typeof eventId === 'string') ? { eventId } : undefined), (Array.isArray(reservationIds)) ? { reservationIds } : undefined);
     });
 }
 exports.confirm = confirm;
-function saveMessagesIfNeeded(params, order, emailMessages) {
+function saveMessagesIfNeeded(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
-        if (params.options.useSaveMessages) {
+        const { options, project, order, emailMessages, seller } = params;
+        if (options.useSaveMessages) {
             if (emailMessages.length > 0) {
-                const { orderNumber, typeOf, project, seller } = order;
+                const { orderNumber, typeOf } = order;
                 debug('saving', emailMessages.length, 'messages...', emailMessages);
                 const saveMessageResult = yield repos.message.upsertByIdentifier(emailMessages.map(({ identifier, name, about, text, toRecipient, sender }) => {
                     return {
                         identifier, name, about, text, toRecipient, sender,
-                        project,
+                        project: { id: project.id, typeOf: factory.organizationType.Project },
                         provider: { id: seller.id, typeOf: seller.typeOf },
                         mainEntity: { orderNumber, typeOf }
                     };
@@ -273,7 +283,7 @@ function createResult(params) {
     // 注文作成
     const order = (0, result_1.createOrder)({
         orderNumber: params.orderNumber,
-        transaction: transaction,
+        transaction,
         orderDate: params.result.order.orderDate,
         orderStatus: factory.orderStatus.OrderPaymentDue,
         isGift: false,

package/lib/chevre/service/transaction/placeOrderInProgress/potentialActions/sendEmailMessage.d.ts

@@ -1,6 +1,8 @@
 import * as factory from '../../../../factory';
 export declare function createSendEmailMessageActions(params: {
-    order: factory.order.IOrder;
+    order: factory.transaction.placeOrder.IOrderAsResult;
+    customer: factory.order.ICustomer;
+    seller: factory.order.ISeller;
     potentialActions?: factory.transaction.placeOrder.IPotentialActionsParams;
     emailMessage?: factory.creativeWork.message.email.ICreativeWork;
     useOptimizedSendEmailAction: boolean;

package/lib/chevre/service/transaction/placeOrderInProgress/potentialActions/sendEmailMessage.js

@@ -28,8 +28,9 @@ function createSendEmailMessageActions(params) {
         // };
         const sendEmailMessageOnOrderSentParams = (_e = (_d = (_c = (_b = (_a = params.potentialActions) === null || _a === void 0 ? void 0 : _a.order) === null || _b === void 0 ? void 0 : _b.potentialActions) === null || _c === void 0 ? void 0 : _c.sendOrder) === null || _d === void 0 ? void 0 : _d.potentialActions) === null || _e === void 0 ? void 0 : _e.sendEmailMessage;
         if (Array.isArray(sendEmailMessageOnOrderSentParams)) {
+            const orderAsCreateEmailParams = Object.assign(Object.assign({}, params.order), { customer: params.customer, seller: params.seller });
             yield Promise.all(sendEmailMessageOnOrderSentParams.map((s, index) => __awaiter(this, void 0, void 0, function* () {
-                const emailMessage = yield emailMessageBuilder.createSendOrderMessage(Object.assign(Object.assign({ order: params.order, index }, (s.object !== undefined) ? { email: s.object } : undefined), (params.emailMessage !== undefined) ? { emailMessage: params.emailMessage } : undefined));
+                const emailMessage = yield emailMessageBuilder.createSendOrderMessage(Object.assign(Object.assign({ order: orderAsCreateEmailParams, index }, (s.object !== undefined) ? { email: s.object } : undefined), (params.emailMessage !== undefined) ? { emailMessage: params.emailMessage } : undefined));
                 emailMessages.push(emailMessage);
                 let sendEmailMessageActionObject = emailMessage;
                 // 送信アクション最適化に対応(2024-04-29~)

package/lib/chevre/service/transaction/placeOrderInProgress/potentialActions.d.ts

@@ -3,7 +3,9 @@ import * as factory from '../../../factory';
  * 取引のポストアクションを作成する
  */
 export declare function createPotentialActions(params: {
-    order: factory.order.IOrder;
+    order: factory.transaction.placeOrder.IOrderAsResult;
+    customer: factory.order.ICustomer;
+    seller: factory.order.ISeller;
     potentialActions?: factory.transaction.placeOrder.IPotentialActionsParams;
     emailMessage?: factory.creativeWork.message.email.ICreativeWork;
     useOptimizedSendEmailAction: boolean;

package/lib/chevre/service/transaction/placeOrderInProgress/result.d.ts

@@ -2,7 +2,7 @@ import * as factory from '../../../factory';
 /**
  * 注文を生成する
  */
-export declare function createOrder(params: {
+declare function createOrder(params: {
     orderNumber: string;
     transaction: Pick<factory.transaction.placeOrder.ITransaction, 'object' | 'seller' | 'project'>;
     orderDate: Date;
@@ -13,3 +13,10 @@ export declare function createOrder(params: {
     productAcceptedOffers: factory.order.IAcceptedOffer<factory.order.IPermit>[];
     moneyTransferAcceptedOffers: factory.order.IAcceptedOffer<factory.order.IMoneyTransfer>[];
 }): factory.transaction.placeOrder.IOrderAsResult;
+declare function createSeller(params: {
+    transaction: Pick<factory.transaction.placeOrder.ITransaction, 'seller'>;
+}): factory.order.ISeller;
+declare function createCustomer(params: {
+    transaction: Pick<factory.transaction.placeOrder.ITransaction, 'object'>;
+}): factory.order.ICustomer;
+export { createOrder, createCustomer, createSeller };

package/lib/chevre/service/transaction/placeOrderInProgress/result.js

@@ -1,7 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createOrder = void 0;
+exports.createSeller = exports.createCustomer = exports.createOrder = void 0;
 const factory = require("../../../factory");
+const settings_1 = require("../../../settings");
 const orderedItem_1 = require("./result/orderedItem");
 /**
  * 注文を生成する
@@ -18,11 +19,11 @@ function createOrder(params) {
     // const discounts: factory.order.IDiscount[] = [];
     const name = (typeof params.transaction.object.name === 'string') ? params.transaction.object.name : undefined;
     const broker = (typeof ((_a = params.transaction.object.broker) === null || _a === void 0 ? void 0 : _a.typeOf) === 'string') ? params.transaction.object.broker : undefined;
-    return Object.assign(Object.assign({ project: params.transaction.project, typeOf: factory.order.OrderType.Order, seller: seller, customer: customer, price: price, priceCurrency: factory.priceCurrency.JPY, paymentMethods: paymentMethods, 
+    return Object.assign({ typeOf: factory.order.OrderType.Order, price: price, priceCurrency: factory.priceCurrency.JPY, paymentMethods: paymentMethods, 
         // discounts: discounts, // 廃止(2024-04-16~)
-        confirmationNumber: '', orderNumber: params.orderNumber, orderedItem: orderedItems, 
-        // acceptedOffers: acceptedOffers,
-        url: '', orderStatus: params.orderStatus, orderDate: params.orderDate, identifier: [], isGift: params.isGift }, (typeof name === 'string') ? { name } : undefined), (typeof (broker === null || broker === void 0 ? void 0 : broker.typeOf) === 'string') ? { broker } : undefined);
+        confirmationNumber: '', orderNumber: params.orderNumber, orderedItem: orderedItems, url: '', orderStatus: params.orderStatus, orderDate: params.orderDate, identifier: [] }, (settings_1.USE_EXPERIMENTAL_FEATURE)
+        ? {}
+        : Object.assign(Object.assign({ customer, project: params.transaction.project, seller, isGift: params.isGift }, (typeof name === 'string') ? { name } : undefined), (typeof (broker === null || broker === void 0 ? void 0 : broker.typeOf) === 'string') ? { broker } : undefined));
 }
 exports.createOrder = createOrder;
 function createSeller(params) {
@@ -36,6 +37,7 @@ function createSeller(params) {
         additionalProperty: (Array.isArray(seller.additionalProperty)) ? seller.additionalProperty : []
     };
 }
+exports.createSeller = createSeller;
 function createCustomer(params) {
     // transaction.object.customerはstart時点でapiが自動的に指定、あるいは、その後クライアントから変更されるか
     const customerByTransaction = params.transaction.object.customer;
@@ -54,6 +56,7 @@ function createCustomer(params) {
     }
     return Object.assign(Object.assign({}, customerByTransaction), { identifier: (Array.isArray(customerByTransaction.identifier)) ? customerByTransaction.identifier : [], name: customerName });
 }
+exports.createCustomer = createCustomer;
 function createPaymentMethods(params) {
     const paymentMethods = [];
     let price = 0;

package/lib/chevre/service/transaction/placeOrderInProgress/validation.d.ts

@@ -25,12 +25,12 @@ export declare function validateOrderedItem(params: {
     };
 }): void;
 export declare function validatePaymentMethods(params: {
-    order: factory.order.IOrder;
+    order: factory.transaction.placeOrder.IOrderAsResult;
 }): void;
 /**
  * 興行オファー適用条件確認
  */
 export declare function validateEventOffers(params: {
-    order: factory.order.IOrder;
+    order: factory.transaction.placeOrder.IOrderAsResult;
     authorizeEventServiceOfferActions: IAuthorizeEventServiceOffer[];
 }): void;

package/package.json

@@ -10,7 +10,7 @@
   ],
   "dependencies": {
     "@aws-sdk/credential-providers": "3.433.0",
-    "@chevre/factory": "4.374.0",
+    "@chevre/factory": "4.375.0-alpha.1",
     "@cinerino/sdk": "7.2.0",
     "@motionpicture/coa-service": "9.4.0",
     "@motionpicture/gmo-service": "5.3.0",
@@ -110,5 +110,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build && npm test && npm run doc"
   },
-  "version": "21.34.0"
+  "version": "21.35.0-alpha.1"
 }