@chevre/domain 25.0.0-alpha.1 → 25.0.0-alpha.3

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

@@ -15,7 +15,11 @@ export interface ISearchConditions {
     };
     about?: {
         identifier?: {
-            $eq?: string;
+            /**
+             * 現時点でOnEventStatusChangedしかサポートしていない
+             * 2026-06-18
+             */
+            $eq?: factory.creativeWork.message.email.AboutIdentifier.OnEventStatusChanged;
         };
     };
 }

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

@@ -1,4 +1,4 @@
-import type { Connection } from 'mongoose';
+import type { Connection, UpdateQuery } from 'mongoose';
 import { factory } from '../factory';
 import { IDocType } from './mongoose/schemas/transaction';
 interface IAggregationByStatus {
@@ -116,6 +116,10 @@ export declare class TransactionRepo {
         filter: any;
         $unset: any;
     }): Promise<import("mongoose").UpdateWriteOpResult>;
+    updateById4migration(params: {
+        id: string;
+        update: UpdateQuery<IDocType>;
+    }): Promise<import("mongoose").UpdateWriteOpResult>;
     /**
      * 終了日時を一定期間過ぎたアクションを削除する
      */

package/lib/chevre/repo/transaction.js

@@ -297,6 +297,10 @@ class TransactionRepo {
         return this.transactionModel.updateMany(params.filter, { $unset: params.$unset }, { timestamps: false })
             .exec();
     }
+    async updateById4migration(params) {
+        return this.transactionModel.updateOne({ _id: { $eq: params.id } }, params.update)
+            .exec();
+    }
     /**
      * 終了日時を一定期間過ぎたアクションを削除する
      */

package/lib/chevre/service/transaction/placeOrder/confirm/potentialActions/sendEmailMessage.d.ts

@@ -12,7 +12,6 @@ export declare function createSendEmailMessageActions(params: {
     seller: factory.order.ISeller;
     paymentMethods: factory.order.IReferencedInvoice[];
     potentialActions?: factory.transaction.placeOrder.IPotentialActionsParams;
-    emailMessage?: factory.creativeWork.message.email.ICreativeWork;
 }, setting: Pick<ISetting, 'defaultSenderEmail'>): Promise<{
     emailMessages: factory.action.transfer.send.message.email.IObjectAsEmailMessage[];
     sendEmailMessageActions: factory.transaction.placeOrder.IPotentialSendEmailMessageAction[];

package/lib/chevre/service/transaction/placeOrder/confirm/potentialActions/sendEmailMessage.js

@@ -3,20 +3,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.createSendEmailMessageActions = createSendEmailMessageActions;
 const emailMessageBuilder_1 = require("../../../../../emailMessageBuilder");
 const factory_1 = require("../../../../../factory");
-async function createSendEmailMessageActions(params, 
-// settings: Settings
-setting) {
+async function createSendEmailMessageActions(params, setting) {
     // 注文配送メール送信設定
     const emailMessages = [];
-    // const sendEmailMessageActions: factory.action.transfer.send.message.email.IAttributes[] = [];
     const sendEmailMessageActions = [];
-    // const sendActionPurpose: factory.action.transfer.send.message.email.IPurpose = {
-    //     typeOf: params.order.typeOf,
-    //     orderNumber: params.order.orderNumber,
-    //     price: params.order.price,
-    //     priceCurrency: params.order.priceCurrency,
-    //     orderDate: params.order.orderDate
-    // };
     const sendEmailMessageOnOrderSentParams = params.potentialActions?.order?.potentialActions?.sendOrder?.potentialActions?.sendEmailMessage;
     if (Array.isArray(sendEmailMessageOnOrderSentParams)) {
         const orderAsCreateEmailParams = {
@@ -30,7 +20,7 @@ setting) {
                 order: orderAsCreateEmailParams,
                 index,
                 ...(s.object !== undefined) ? { email: s.object } : undefined,
-                ...(params.emailMessage !== undefined) ? { emailMessage: params.emailMessage } : undefined
+                // ...(params.emailMessage !== undefined) ? { emailMessage: params.emailMessage } : undefined
             }, setting);
             emailMessages.push(emailMessage);
             // 送信アクション最適化に対応(2024-04-29~)
@@ -40,16 +30,7 @@ setting) {
             };
             // optimize(2024-05-07~)
             sendEmailMessageActions.push({
-                // project: params.order.project,
-                // typeOf: factory.actionType.SendAction,
                 object: sendEmailMessageActionObject
-                // agent: params.order.project,
-                // recipient: {
-                //     typeOf: params.order.customer.typeOf,
-                //     id: params.order.customer.id
-                // },
-                // potentialActions: {},
-                // purpose: sendActionPurpose
             });
         }));
     }

package/lib/chevre/service/transaction/placeOrder/confirm/potentialActions.d.ts

@@ -15,7 +15,6 @@ export declare function createPotentialActions(params: {
     seller: factory.order.ISeller;
     paymentMethods: factory.order.IReferencedInvoice[];
     potentialActions?: factory.transaction.placeOrder.IPotentialActionsParams;
-    emailMessage?: factory.creativeWork.message.email.ICreativeWork;
 }, setting: Pick<ISetting, 'defaultSenderEmail'>): Promise<{
     potentialActions: factory.transaction.placeOrder.IPotentialActions;
     emailMessages: factory.creativeWork.message.email.ICreativeWork[];

package/lib/chevre/service/transaction/placeOrder/confirm/potentialActions.js

@@ -5,14 +5,9 @@ const sendEmailMessage_1 = require("./potentialActions/sendEmailMessage");
 /**
  * 取引のポストアクションを作成する
  */
-async function createPotentialActions(params, 
-// settings: Settings
-setting) {
+async function createPotentialActions(params, setting) {
     // 注文処理開始メール送信設定
     const { emailMessages, sendEmailMessageActions } = await (0, sendEmailMessage_1.createSendEmailMessageActions)(params, setting);
-    // const sendOrderActionAttributes: factory.transaction.placeOrder.IPotentialSendOrderAction = {
-    //     potentialActions: { sendEmailMessage: sendEmailMessageActions }
-    // };
     return {
         emailMessages,
         potentialActions: {

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

@@ -4,7 +4,6 @@ import type { AuthorizeOfferActionRepo } from '../../../repo/action/authorizeOff
 import type { AssetTransactionRepo } from '../../../repo/assetTransaction';
 import type { AuthorizationRepo } from '../../../repo/authorization';
 import type { ConfirmationNumberRepo } from '../../../repo/confirmationNumber';
-import type { EmailMessageRepo } from '../../../repo/emailMessage';
 import type { MessageRepo } from '../../../repo/message';
 import type { OrderInTransactionRepo } from '../../../repo/orderInTransaction';
 import type { ProjectRepo } from '../../../repo/project';
@@ -18,7 +17,6 @@ interface IConfirmOperationRepos {
     authorizeOfferAction: AuthorizeOfferActionRepo;
     assetTransaction: AssetTransactionRepo;
     authorization: AuthorizationRepo;
-    emailMessage?: EmailMessageRepo;
     message: MessageRepo;
     project: ProjectRepo;
     placeOrder: PlaceOrderRepo;
@@ -41,7 +39,7 @@ interface IConfirmOptions {
      */
     maxNumCreditCardPaymentMethod: number;
     /**
-     * 取引ドキュメントのresult.orderを保管しないオプション(2026-06-15~)
+     * 取引ドキュメントのresult.order,result,numAcceptedOffersを保管しないオプション(2026-06-15~)
      */
     disableResultOrder: boolean;
 }

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

@@ -136,17 +136,18 @@ function confirm(params, options) {
             acceptedOffers, payTransactions, customer,
             ...(typeof code === 'string') ? { code } : undefined
         }, options);
-        // デフォルトEメールメッセージを検索
-        let emailMessageOnOrderSent;
-        if (repos.emailMessage !== undefined) {
-            const searchEmailMessagesResult = await repos.emailMessage.search({
-                limit: 1,
-                page: 1,
-                project: { id: { $eq: transaction.project.id } },
-                about: { identifier: { $eq: factory_1.factory.creativeWork.message.email.AboutIdentifier.OnOrderSent } }
-            });
-            emailMessageOnOrderSent = searchEmailMessagesResult.shift();
-        }
+        // discontinue emailMessageRepo
+        // // デフォルトEメールメッセージを検索
+        // let emailMessageOnOrderSent: factory.creativeWork.message.email.ICreativeWork | undefined;
+        // if (repos.emailMessage !== undefined) {
+        //     const searchEmailMessagesResult = await repos.emailMessage.search({
+        //         limit: 1,
+        //         page: 1,
+        //         project: { id: { $eq: transaction.project.id } },
+        //         about: { identifier: { $eq: factory.creativeWork.message.email.AboutIdentifier.OnOrderSent } }
+        //     });
+        //     emailMessageOnOrderSent = searchEmailMessagesResult.shift();
+        // }
         // ポストアクションを作成
         const setting = await repos.setting.findOne({ project: { id: { $eq: '*' } } }, ['defaultSenderEmail']);
         if (typeof setting?.defaultSenderEmail !== 'string') {
@@ -160,7 +161,7 @@ function confirm(params, options) {
             // order: orderWithAcceptedOffers, // 現時点でcreateEmailMessageでorder.acceptedOffersを使用している(2024-02-06~)
             // transaction: transaction,
             ...(params.potentialActions !== undefined) ? { potentialActions: params.potentialActions } : undefined,
-            ...(emailMessageOnOrderSent !== undefined) ? { emailMessage: emailMessageOnOrderSent } : undefined
+            // ...(emailMessageOnOrderSent !== undefined) ? { emailMessage: emailMessageOnOrderSent } : undefined
         }, 
         // settings
         setting);
@@ -372,9 +373,11 @@ function createResult(params, options) {
         placingOrder,
         result: {
             authorizeActions, // 追加(2024-01-17~)
-            numAcceptedOffers: params.acceptedOffers.length, // 追加(2024-01-17~)
             ...(typeof params.code === 'string') ? { code: params.code } : undefined,
-            ...((!options.disableResultOrder) && { order: orderAsResult }) // support disableResultOrder(2026-06-15~)
+            ...((!options.disableResultOrder) && { order: orderAsResult }), // support disableResultOrder(2026-06-15~)
+            ...((!options.disableResultOrder) && {
+                numAcceptedOffers: params.acceptedOffers.length, // 追加(2024-01-17~)
+            }) // support disableResultOrder(2026-06-17~)
         },
         ...(typeof eventId === 'string') ? { eventId } : undefined,
         ...(Array.isArray(reservationIds)) ? { reservationIds } : undefined

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

@@ -4,7 +4,6 @@ type IPotentialSendEmailMessageAction = factory.action.transfer.returnAction.ord
 export declare function createSendEmailMessaegActionsOnReturn(params: {
     order: Pick<factory.order.IOrder, 'confirmationNumber' | 'customer' | 'orderDate' | 'orderNumber' | 'orderStatus' | 'orderedItem' | 'paymentMethods' | 'price' | 'priceCurrency' | 'seller' | 'typeOf'>;
     returnOrderActionParams?: factory.transaction.returnOrder.IReturnOrderActionParams;
-    emailMessageOnOrderReturned?: factory.creativeWork.message.email.ICreativeWork;
 }, setting: Pick<ISetting, 'defaultSenderEmail'>): Promise<{
     emailMessagesOnReturn: factory.action.transfer.send.message.email.IObjectAsEmailMessage[];
     sendEmailMessaegActionsOnReturn: IPotentialSendEmailMessageAction[];

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

@@ -7,13 +7,6 @@ async function createSendEmailMessaegActionsOnReturn(params,
 // settings: Settings
 setting) {
     const order = params.order;
-    // const sendActionPurpose: factory.action.transfer.send.message.email.IPurpose = {
-    //     typeOf: order.typeOf,
-    //     orderNumber: order.orderNumber,
-    //     price: order.price,
-    //     priceCurrency: order.priceCurrency,
-    //     orderDate: order.orderDate
-    // };
     // 返品後のEメール送信アクション
     const emailMessagesOnReturn = [];
     const sendEmailMessaegActionsOnReturn = [];
@@ -24,24 +17,16 @@ setting) {
                 order,
                 index,
                 ...(sendEmailMessageParams.object !== undefined) ? { email: sendEmailMessageParams.object } : undefined,
-                ...(params.emailMessageOnOrderReturned !== undefined)
-                    ? { emailMessage: params.emailMessageOnOrderReturned }
-                    : undefined
+                // ...(params.emailMessageOnOrderReturned !== undefined)
+                //     ? { emailMessage: params.emailMessageOnOrderReturned }
+                //     : undefined
             }, setting);
             emailMessagesOnReturn.push(emailMessage);
             return {
-                // project: order.project, // optimize(2024-06-25~)
-                // typeOf: factory.actionType.SendAction, // optimize(2024-06-25~)
-                // standardize object(2024-06-27~)
-                // object: emailMessage
                 object: {
                     identifier: emailMessage.identifier,
                     typeOf: factory_1.factory.creativeWorkType.EmailMessage
                 }
-                // agent: order.project, // optimize(2024-06-25~)
-                // recipient: { typeOf: order.customer.typeOf, id: order.customer.id }, // optimize(2024-06-25~)
-                // potentialActions: {} // optimize(2024-06-25~)
-                // purpose: sendActionPurpose // optimize(2024-06-25~)
             };
         })));
     }

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

@@ -6,7 +6,6 @@ declare function createPotentialActions(params: {
     orders: IReturningOrder4potentialActions[];
     potentialActions?: factory.transaction.returnOrder.IPotentialActionsParams;
     transaction: Pick<factory.transaction.returnOrder.ITransaction, 'agent' | 'object'>;
-    emailMessageOnOrderReturned?: factory.creativeWork.message.email.ICreativeWork;
 }, setting: Pick<ISetting, 'defaultSenderEmail'>): Promise<{
     emailMessages: factory.action.transfer.send.message.email.IObjectAsEmailMessage[];
     potentialActions: factory.transaction.returnOrder.IPotentialActions;

package/lib/chevre/service/transaction/returnOrder/potentialActions.js

@@ -22,9 +22,6 @@ setting) {
             ...(returnOrderActionParams !== undefined) ? { returnOrderActionParams } : undefined
         }, setting);
         emailMessages.push(...emailMessagesOnReturnInvoice);
-        // discontinue(2026-04-18~)
-        // // ポイント特典の数だけ、返却アクションを作成
-        // const returnPointAwardActions = await createReturnPointAwardActions({ ...params, order });
         // 返品後のEメール送信アクション
         const { emailMessagesOnReturn, sendEmailMessaegActionsOnReturn } = await (0, sendEmailMessage_1.createSendEmailMessaegActionsOnReturn)({
             ...params,
@@ -34,7 +31,6 @@ setting) {
         emailMessages.push(...emailMessagesOnReturn);
         const potentialActionsOnReturnOrder = {
             returnPaymentMethod: returnPaymentMethodActions,
-            // returnPointAward: returnPointAwardActions, // discontinue(2026-04-18~)
             sendEmailMessage: sendEmailMessaegActionsOnReturn
         };
         const returnOrderObject = {

package/lib/chevre/service/transaction/returnOrder.d.ts

@@ -1,6 +1,5 @@
 import { factory } from '../../factory';
 import type { AcceptedOfferRepo } from '../../repo/acceptedOffer';
-import type { EmailMessageRepo } from '../../repo/emailMessage';
 import type { EventRepo } from '../../repo/event';
 import type { MerchantReturnPolicyRepo } from '../../repo/merchantReturnPolicy';
 import type { MessageRepo } from '../../repo/message';
@@ -41,7 +40,6 @@ type ITaskAndTransactionOperation<T> = (repos: IExportTasksByIdRepos) => Promise
 declare function start(params: factory.transaction.returnOrder.IStartParamsWithoutDetail): IStartOperation<IStartedTransaction>;
 interface IConfirmRepos {
     acceptedOffer: AcceptedOfferRepo;
-    emailMessage?: EmailMessageRepo;
     message: MessageRepo;
     order: OrderRepo;
     setting: SettingRepo;

package/lib/chevre/service/transaction/returnOrder.js

@@ -112,17 +112,18 @@ function confirm(params) {
                 'orderedItem', 'paymentMethods', 'price', 'priceCurrency', 'project', 'seller', 'typeOf'
             ]
         });
-        // デフォルトEメールメッセージを検索
-        let emailMessageOnOrderReturned;
-        if (repos.emailMessage !== undefined) {
-            const searchEmailMessagesResult = await repos.emailMessage.search({
-                limit: 1,
-                page: 1,
-                project: { id: { $eq: transaction.project.id } },
-                about: { identifier: { $eq: factory_1.factory.creativeWork.message.email.AboutIdentifier.OnOrderReturned } }
-            });
-            emailMessageOnOrderReturned = searchEmailMessagesResult.shift();
-        }
+        // discontinue emailMessageRepo
+        // // デフォルトEメールメッセージを検索
+        // let emailMessageOnOrderReturned: factory.creativeWork.message.email.ICreativeWork | undefined;
+        // if (repos.emailMessage !== undefined) {
+        //     const searchEmailMessagesResult = await repos.emailMessage.search({
+        //         limit: 1,
+        //         page: 1,
+        //         project: { id: { $eq: transaction.project.id } },
+        //         about: { identifier: { $eq: factory.creativeWork.message.email.AboutIdentifier.OnOrderReturned } }
+        //     });
+        //     emailMessageOnOrderReturned = searchEmailMessagesResult.shift();
+        // }
         const setting = await repos.setting.findOne({ project: { id: { $eq: '*' } } }, ['defaultSenderEmail']);
         if (typeof setting?.defaultSenderEmail !== 'string') {
             throw new factory_1.factory.errors.NotFound('setting.defaultSenderEmail');
@@ -133,7 +134,7 @@ function confirm(params) {
             orders: returningOrders,
             transaction: transaction,
             ...(params.potentialActions !== undefined) ? { potentialActions: params.potentialActions } : undefined,
-            ...(emailMessageOnOrderReturned !== undefined) ? { emailMessageOnOrderReturned } : undefined
+            // ...(emailMessageOnOrderReturned !== undefined) ? { emailMessageOnOrderReturned } : undefined
         }, 
         // settings
         setting);

package/package.json

@@ -91,5 +91,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build"
   },
-  "version": "25.0.0-alpha.1"
+  "version": "25.0.0-alpha.3"
 }