@chevre/domain 28.0.0-alpha.40 → 28.0.0-alpha.41

package/lib/chevre/emailMessageBuilder.d.ts

@@ -1,6 +1,10 @@
 import { factory } from './factory';
-import type { ISetting } from './repo/setting';
-type ISendableEmailMessage = factory.action.transfer.send.message.email.IObjectAsEmailMessage & {
+type ISender = Pick<factory.action.transfer.send.message.email.IObjectAsEmailMessage['sender'], 'name' | 'typeOf'> & {
+    email?: never;
+};
+type ISendableEmailMessage = Pick<factory.action.transfer.send.message.email.IObjectAsEmailMessage, 'about' | 'identifier' | 'name' | 'text' | 'toRecipient' | 'typeOf'> & {
+    sender: ISender;
+} & {
     identifier: string;
     name: string;
 };
@@ -19,7 +23,7 @@ declare function createSendOrderMessage(params: {
     email?: factory.creativeWork.message.email.ICustomization;
     emailMessage?: never;
     index: number;
-}, setting: Pick<ISetting, 'defaultSenderEmail'>): Promise<ISendableEmailMessage>;
+}): Promise<ISendableEmailMessage>;
 /**
  * 注文返品メッセージを作成する
  */
@@ -28,7 +32,7 @@ declare function createReturnOrderMessage(params: {
     email?: factory.creativeWork.message.email.ICustomization;
     emailMessage?: never;
     index: number;
-}, setting: Pick<ISetting, 'defaultSenderEmail'>): Promise<ISendableEmailMessage>;
+}): Promise<ISendableEmailMessage>;
 /**
  * 返金メッセージを作成する
  */
@@ -36,5 +40,5 @@ declare function createRefundMessage(params: {
     order: IOrderAsCreateEmailParams;
     email?: factory.creativeWork.message.email.ICustomization;
     paymentMethodId: string;
-}, setting: Pick<ISetting, 'defaultSenderEmail'>): Promise<ISendableEmailMessage>;
+}): Promise<ISendableEmailMessage>;
 export { createSendOrderMessage, createReturnOrderMessage, createRefundMessage, IOrderAsCreateEmailParams };

package/lib/chevre/emailMessageBuilder.js

@@ -61,17 +61,18 @@ async function createEmailMessageAbout(params) {
     }
     return about;
 }
-function createEmailMessageSender(params, setting) {
-    if (typeof setting.defaultSenderEmail !== 'string') {
-        throw new factory_1.factory.errors.NotFound('setting.defaultSenderEmail');
-    }
+function createEmailMessageSender(params) {
+    // if (typeof setting.defaultSenderEmail !== 'string') {
+    //     throw new factory.errors.NotFound('setting.defaultSenderEmail');
+    // }
     const defaultSellerName = (typeof params.order.seller.name === 'string') ? params.order.seller.name : params.order.seller.typeOf;
     return {
         typeOf: params.order.seller.typeOf,
         name: (typeof params.email?.sender?.name === 'string')
             ? params.email.sender.name
             : defaultSellerName,
-        email: setting.defaultSenderEmail // 送信元未指定であればタスクで自動設定されるがとりあえず指定(2026-10-20~)
+        // 送信元アドレスはmessagesに保管しない(2026-10-20~)
+        // email: setting.defaultSenderEmail // 送信元未指定であればタスクで自動設定されるがとりあえず指定(2026-10-20~)
     };
 }
 /**
@@ -99,7 +100,7 @@ function minimizeOrderAsCreateEmailParams(order) {
 /**
  * 注文配送メッセージを作成する
  */
-async function createSendOrderMessage(params, setting) {
+async function createSendOrderMessage(params) {
     const minimizedOrder = minimizeOrderAsCreateEmailParams(params.order);
     const emailMessageText = await createEmailMessageText({
         order: minimizedOrder,
@@ -112,7 +113,7 @@ async function createSendOrderMessage(params, setting) {
     });
     const defaultToRecipientEmail = minimizedOrder.customer.email;
     const defaultRecipientName = `${minimizedOrder.customer.familyName} ${minimizedOrder.customer.givenName}`;
-    const sender = createEmailMessageSender(params, setting);
+    const sender = createEmailMessageSender(params);
     const toRecipientCustomization = params.email?.toRecipient;
     const toRecipient = (Array.isArray(toRecipientCustomization))
         ? toRecipientCustomization.map((customizedRecipient) => {
@@ -148,7 +149,7 @@ async function createSendOrderMessage(params, setting) {
 /**
  * 注文返品メッセージを作成する
  */
-async function createReturnOrderMessage(params, setting) {
+async function createReturnOrderMessage(params) {
     const minimizedOrder = minimizeOrderAsCreateEmailParams(params.order);
     const emailMessageText = await createEmailMessageText({
         order: minimizedOrder,
@@ -161,7 +162,7 @@ async function createReturnOrderMessage(params, setting) {
     });
     const defaultToRecipientEmail = minimizedOrder.customer.email;
     const defaultRecipientName = `${minimizedOrder.customer.familyName} ${minimizedOrder.customer.givenName}`;
-    const sender = createEmailMessageSender(params, setting);
+    const sender = createEmailMessageSender(params);
     const toRecipientCustomization = params.email?.toRecipient;
     const toRecipient = (Array.isArray(toRecipientCustomization))
         ? toRecipientCustomization.map((customizedRecipient) => {
@@ -197,7 +198,7 @@ async function createReturnOrderMessage(params, setting) {
 /**
  * 返金メッセージを作成する
  */
-async function createRefundMessage(params, setting) {
+async function createRefundMessage(params) {
     const minimizedOrder = minimizeOrderAsCreateEmailParams(params.order);
     const emailMessageText = await createEmailMessageText({
         order: minimizedOrder,
@@ -210,7 +211,7 @@ async function createRefundMessage(params, setting) {
     });
     const defaultToRecipientEmail = minimizedOrder.customer.email;
     const defaultRecipientName = `${minimizedOrder.customer.familyName} ${minimizedOrder.customer.givenName}`;
-    const sender = createEmailMessageSender(params, setting);
+    const sender = createEmailMessageSender(params);
     const toRecipientCustomization = params.email?.toRecipient;
     const toRecipient = (Array.isArray(toRecipientCustomization))
         ? toRecipientCustomization.map((customizedRecipient) => {

package/lib/chevre/repo/mongoose/schemas/message.d.ts

@@ -1,7 +1,11 @@
 import { IndexDefinition, IndexOptions, Model, Schema, SchemaDefinition } from 'mongoose';
 import { IVirtuals } from '../virtuals';
 import { factory } from '../../../factory';
-export type IEmailMessage = factory.creativeWork.message.email.ICreativeWork & {
+export type ISender = Pick<factory.creativeWork.message.email.ISender, 'name' | 'typeOf'> & {
+    email?: never;
+};
+export type IEmailMessage = Pick<factory.creativeWork.message.email.ICreativeWork, 'about' | 'identifier' | 'name' | 'text' | 'toRecipient' | 'typeOf'> & {
+    sender: ISender;
     datePublished: Date;
     mainEntity: Pick<factory.order.ISimpleOrder, 'orderNumber' | 'typeOf'>;
     project: {

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

@@ -22,19 +22,19 @@ export declare class ProjectRepo {
      */
     projectFields(conditions: factory.project.ISearchConditions, inclusion: IKeyOfProjection[]): Promise<factory.project.IProject[]>;
     createById(params: factory.project.IProject): Promise<Pick<factory.project.IProject, 'id'>>;
-    updateById(params: {
+    updateProjectById(params: {
         id: string;
-        alternateName?: string;
-        logo?: string;
-        hasMerchantReturnPolicy?: Pick<factory.project.IHasMerchantReturnPolicy, 'sameAs' | 'identifier'>;
-        name?: string;
-        settings?: Pick<factory.project.ISettings, 'includeCustomerAsFindByConfirmationNumberResult'> & {
-            sendEmailMessage?: factory.project.ISendEmailMessageSettings;
-            sendgridApiKey?: string;
-        };
-        subscription?: {
-            useEventServiceAsProduct?: boolean;
+        $set: {
+            alternateName?: string;
+            logo?: string;
+            hasMerchantReturnPolicy?: Pick<factory.project.IHasMerchantReturnPolicy, 'sameAs' | 'identifier'>;
+            name?: string;
+            settings?: {
+                sendEmailMessage?: factory.project.ISendEmailMessageSettings;
+                sendgridApiKey?: string;
+            };
         };
+        $unset: Record<string, 1>;
     }): Promise<void>;
     updateMakesOfferById(params: {
         id: string;

package/lib/chevre/repo/project.js

@@ -109,45 +109,41 @@ class ProjectRepo {
         }
         return { id: insertedId };
     }
-    async updateById(params) {
+    async updateProjectById(params) {
+        const { $set, $unset, id } = params;
         let hasMerchantReturnPolicy;
-        if (typeof params.hasMerchantReturnPolicy?.sameAs === 'string') {
+        if (typeof $set.hasMerchantReturnPolicy?.sameAs === 'string') {
             hasMerchantReturnPolicy = {
-                sameAs: params.hasMerchantReturnPolicy.sameAs,
+                sameAs: $set.hasMerchantReturnPolicy.sameAs,
                 typeOf: 'MerchantReturnPolicy',
-                ...(typeof params.hasMerchantReturnPolicy.identifier === 'string')
-                    ? { identifier: params.hasMerchantReturnPolicy.identifier } : undefined
+                ...(typeof $set.hasMerchantReturnPolicy.identifier === 'string')
+                    ? { identifier: $set.hasMerchantReturnPolicy.identifier } : undefined
             };
         }
-        const includeCustomerAsFindByConfirmationNumberResult = params.settings?.includeCustomerAsFindByConfirmationNumberResult;
-        await this.projectModel.findOneAndUpdate({ _id: { $eq: params.id } }, {
-            // updatedAt: new Date(),
-            ...(typeof params.alternateName === 'string' && params.alternateName.length > 0)
-                ? { alternateName: params.alternateName }
-                : undefined,
-            ...(typeof params.name === 'string' && params.name.length > 0) ? { name: params.name } : undefined,
-            ...(typeof params.logo === 'string' && params.logo.length > 0) ? { logo: params.logo } : undefined,
-            ...(typeof params.settings?.sendEmailMessage?.sender?.email === 'string')
-                ? {
-                    'settings.sendEmailMessage': {
-                        sender: { email: params.settings.sendEmailMessage.sender.email }
+        await this.projectModel.updateOne({ _id: { $eq: id } }, {
+            $set: {
+                ...(typeof $set.alternateName === 'string' && $set.alternateName.length > 0)
+                    ? { alternateName: $set.alternateName }
+                    : undefined,
+                ...(typeof $set.name === 'string' && $set.name.length > 0) ? { name: $set.name } : undefined,
+                ...(typeof $set.logo === 'string' && $set.logo.length > 0) ? { logo: $set.logo } : undefined,
+                ...(typeof $set.settings?.sendEmailMessage?.sender?.email === 'string')
+                    ? {
+                        'settings.sendEmailMessage': {
+                            sender: { email: $set.settings.sendEmailMessage.sender.email }
+                        }
                     }
-                }
-                : undefined,
-            ...(typeof params.settings?.sendgridApiKey === 'string')
-                ? { 'settings.sendgridApiKey': params.settings.sendgridApiKey }
-                : undefined,
-            ...(typeof includeCustomerAsFindByConfirmationNumberResult === 'boolean')
-                ? { 'settings.includeCustomerAsFindByConfirmationNumberResult': includeCustomerAsFindByConfirmationNumberResult }
-                : undefined,
-            ...(typeof params.subscription?.useEventServiceAsProduct === 'boolean')
-                ? { 'subscription.useEventServiceAsProduct': params.subscription.useEventServiceAsProduct }
-                : undefined,
-            ...(hasMerchantReturnPolicy !== undefined) ? { hasMerchantReturnPolicy } : undefined,
+                    : undefined,
+                ...(typeof $set.settings?.sendgridApiKey === 'string')
+                    ? { 'settings.sendgridApiKey': $set.settings.sendgridApiKey }
+                    : undefined,
+                ...(hasMerchantReturnPolicy !== undefined) ? { hasMerchantReturnPolicy } : undefined,
+            },
             $unset: {
-                'settings.cognito': 1 // 廃止(2023-11-10~)
+                ...$unset,
+                'settings.cognito': 1, // 廃止(2023-11-10~)
             }
-        }, { projection: { _id: 1 } })
+        })
             .exec();
     }
     async updateMakesOfferById(params) {

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

@@ -1,5 +1,4 @@
 import { factory } from '../../../../../factory';
-import type { ISetting } from '../../../../../repo/setting';
 import type { IOrderAsResult } from '../factory/result';
 /**
  * Eメール送信パラメータ
@@ -39,7 +38,11 @@ export declare function createSendEmailMessageActions(params: {
     seller: Pick<factory.order.ISeller, 'name' | 'typeOf'>;
     paymentMethods: factory.order.IReferencedInvoice[];
     potentialActions?: IPotentialActionsParams;
-}, setting: Pick<ISetting, 'defaultSenderEmail'>): Promise<{
-    emailMessages: factory.action.transfer.send.message.email.IObjectAsEmailMessage[];
+}): Promise<{
+    emailMessages: (Pick<factory.action.transfer.send.message.email.IObjectAsEmailMessage, 'about' | 'identifier' | 'name' | 'text' | 'toRecipient' | 'typeOf'> & {
+        sender: Pick<factory.action.transfer.send.message.email.IObjectAsEmailMessage['sender'], 'name' | 'typeOf'> & {
+            email?: never;
+        };
+    })[];
 }>;
 export {};

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

@@ -2,16 +2,13 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createSendEmailMessageActions = createSendEmailMessageActions;
 const emailMessageBuilder_1 = require("../../../../../emailMessageBuilder");
-async function createSendEmailMessageActions(params, setting) {
+async function createSendEmailMessageActions(params) {
     // 注文配送メール送信設定
     const emailMessages = [];
-    // const sendEmailMessageActions: factory.transaction.placeOrder.IPotentialSendEmailMessageAction[] = [];
     const sendEmailMessageOnOrderSentParams = params.potentialActions?.order?.potentialActions?.sendOrder?.potentialActions?.sendEmailMessage;
     if (Array.isArray(sendEmailMessageOnOrderSentParams)) {
         // pugテンプレートに渡す変数を最小化(2026-06-19~)
         const orderAsCreateEmailParams = {
-            // ...params.order,
-            // paymentMethods: params.paymentMethods
             customer: params.customer,
             seller: params.seller,
             orderNumber: params.order.orderNumber,
@@ -23,18 +20,8 @@ async function createSendEmailMessageActions(params, setting) {
                 order: orderAsCreateEmailParams,
                 index,
                 ...(s.object !== undefined) ? { email: s.object } : undefined,
-                // ...(params.emailMessage !== undefined) ? { emailMessage: params.emailMessage } : undefined
-            }, setting);
+            });
             emailMessages.push(emailMessage);
-            // // 送信アクション最適化に対応(2024-04-29~)
-            // const sendEmailMessageActionObject: factory.action.transfer.send.message.email.IObject = {
-            //     identifier: emailMessage.identifier,
-            //     typeOf: factory.creativeWorkType.EmailMessage
-            // };
-            // // optimize(2024-05-07~)
-            // sendEmailMessageActions.push({
-            //     object: sendEmailMessageActionObject
-            // });
         }));
     }
     return { emailMessages };

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

@@ -1,5 +1,4 @@
 import { factory } from '../../../../factory';
-import type { ISetting } from '../../../../repo/setting';
 import { IPotentialActionsParams } from './potentialActions/sendEmailMessage';
 import { IOrderAsResult } from './factory/result';
 export { IPotentialActionsParams };
@@ -18,6 +17,10 @@ export declare function createPotentialActions(params: {
     seller: Pick<factory.order.ISeller, 'name' | 'typeOf'>;
     paymentMethods: factory.order.IReferencedInvoice[];
     potentialActions?: IPotentialActionsParams;
-}, setting: Pick<ISetting, 'defaultSenderEmail'>): Promise<{
-    emailMessages: factory.action.transfer.send.message.email.IObjectAsEmailMessage[];
+}): Promise<{
+    emailMessages: (Pick<factory.action.transfer.send.message.email.IObjectAsEmailMessage, 'about' | 'identifier' | 'name' | 'text' | 'toRecipient' | 'typeOf'> & {
+        sender: Pick<factory.action.transfer.send.message.email.IObjectAsEmailMessage['sender'], 'name' | 'typeOf'> & {
+            email?: never;
+        };
+    })[];
 }>;

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

@@ -1,13 +1,14 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createPotentialActions = createPotentialActions;
+// import type { ISetting } from '../../../../repo/setting';
 const sendEmailMessage_1 = require("./potentialActions/sendEmailMessage");
 /**
  * 取引のポストアクションを作成する
  */
-async function createPotentialActions(params, setting) {
+async function createPotentialActions(params) {
     // 注文処理開始メール送信設定
-    const { emailMessages } = await (0, sendEmailMessage_1.createSendEmailMessageActions)(params, setting);
+    const { emailMessages } = await (0, sendEmailMessage_1.createSendEmailMessageActions)(params);
     return {
         emailMessages,
     };

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

@@ -8,7 +8,6 @@ import type { MessageRepo } from '../../../repo/message';
 import type { OfferRepo } from '../../../repo/offer/unitPriceInCatalog';
 import type { OrderInTransactionRepo } from '../../../repo/orderInTransaction';
 import type { ProjectRepo } from '../../../repo/project';
-import type { SettingRepo } from '../../../repo/setting';
 import type { PlaceOrderRepo } from '../../../repo/transaction/placeOrder';
 import { factory } from '../../../factory';
 import { PlaceOrderFactory } from '../../../factory/transaction';
@@ -26,7 +25,6 @@ interface IConfirmOperationRepos {
     placeOrder: PlaceOrderRepo;
     orderInTransaction: OrderInTransactionRepo;
     confirmationNumber: ConfirmationNumberRepo;
-    setting: SettingRepo;
 }
 type IConfirmOperation<T> = (repos: IConfirmOperationRepos) => Promise<T>;
 interface IConfirmOptions {

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

@@ -149,18 +149,18 @@ function confirm(params, options) {
             ...(typeof code === 'string') ? { code } : undefined,
             paymentMethodIdByTransaction
         }, options);
-        // ポストアクションを作成
-        const setting = await repos.setting.findOne({ project: { id: { $eq: '*' } } }, ['defaultSenderEmail']);
-        if (typeof setting?.defaultSenderEmail !== 'string') {
-            throw new factory_1.factory.errors.NotFound('setting.defaultSenderEmail');
-        }
+        // defaultSenderEmail参照不要(2026-10-20~)
+        // const setting = await repos.setting.findOne({ project: { id: { $eq: '*' } } }, ['defaultSenderEmail']) as Pick<ISetting, 'defaultSenderEmail'> | null;
+        // if (typeof setting?.defaultSenderEmail !== 'string') {
+        //     throw new factory.errors.NotFound('setting.defaultSenderEmail');
+        // }
         const { emailMessages } = await (0, potentialActions_1.createPotentialActions)({
             order: placingOrder, // createEmailMessageでのorder.acceptedOffersへの依存性を排除したのでこちらでよいはず(2024-02-21~)
             customer,
             seller,
             paymentMethods,
             ...(params.potentialActions !== undefined) ? { potentialActions: params.potentialActions } : undefined,
-        }, setting);
+        });
         // メッセージ保管(2024-04-28~)
         await saveMessagesIfNeeded({
             project: { id: transaction.project.id },

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

@@ -1,10 +1,13 @@
 import { factory } from '../../../../factory';
-import type { ISetting } from '../../../../repo/setting';
 export declare function createReturnPaymentMethodActions(params: {
     order: Pick<factory.order.IOrder, 'confirmationNumber' | 'customer' | 'orderDate' | 'orderNumber' | 'orderedItem' | 'paymentMethods' | 'price' | 'priceCurrency' | 'seller' | 'typeOf'>;
     returnOrderActionParams?: factory.transaction.returnOrder.IReturnOrderActionParams;
     transaction: Pick<factory.transaction.returnOrder.ITransaction, 'object'>;
-}, setting: Pick<ISetting, 'defaultSenderEmail'>): Promise<{
-    emailMessagesOnReturnInvoice: factory.action.transfer.send.message.email.IObjectAsEmailMessage[];
+}): Promise<{
+    emailMessagesOnReturnInvoice: (Pick<factory.action.transfer.send.message.email.IObjectAsEmailMessage, 'about' | 'identifier' | 'name' | 'text' | 'toRecipient' | 'typeOf'> & {
+        sender: Pick<factory.action.transfer.send.message.email.IObjectAsEmailMessage['sender'], 'name' | 'typeOf'> & {
+            email?: never;
+        };
+    })[];
     returnPaymentMethodActions: factory.action.transfer.returnAction.order.IPotentialReturnInvoiceAction[];
 }>;

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

@@ -3,7 +3,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.createReturnPaymentMethodActions = createReturnPaymentMethodActions;
 const emailMessageBuilder_1 = require("../../../../emailMessageBuilder");
 const factory_1 = require("../../../../factory");
-async function createReturnInvoicePotentialActions(params, setting) {
+// import type { ISetting } from '../../../../repo/setting';
+async function createReturnInvoicePotentialActions(params) {
     const order = params.order;
     const emailMessagesOnReturnEachPaymentMethodId = [];
     const sendEmailMessageOnRefund = [];
@@ -27,7 +28,7 @@ async function createReturnInvoicePotentialActions(params, setting) {
             order,
             email: emailCustomization,
             paymentMethodId: params.paymentMethod.paymentMethodId
-        }, setting);
+        });
         emailMessagesOnReturnEachPaymentMethodId.push(emailMessage);
         sendEmailMessageOnRefund.push({
             object: {
@@ -43,7 +44,7 @@ async function createReturnInvoicePotentialActions(params, setting) {
         }
     };
 }
-async function createReturnPaymentMethodActions(params, setting) {
+async function createReturnPaymentMethodActions(params) {
     const emailMessagesOnReturnInvoice = [];
     const potentialReturnInvoiceActions = [];
     // MovieTicket決済以外について返品ポリシーのreturnFeesを適用する(2022-08-10~)
@@ -64,7 +65,7 @@ async function createReturnPaymentMethodActions(params, setting) {
                     ...(params.returnOrderActionParams !== undefined)
                         ? { returnOrderActionParams: params.returnOrderActionParams }
                         : undefined
-                }, setting);
+                });
                 emailMessagesOnReturnInvoice.push(...emailMessagesOnReturnEachPaymentMethodId);
                 const { paymentStatus, ...referencedInvoiceAsObject } = referencedInvoice; // eslint-disable-line @typescript-eslint/no-unused-vars
                 const object = {
@@ -76,7 +77,7 @@ async function createReturnPaymentMethodActions(params, setting) {
             })));
     }
     // 決済カード決済について
-    const { emailMessagesOnReturnMovieTicket, returnMovieTicketActions } = await createReturnPaymentMethodIssuedThroughMovieTicketActions(params, setting);
+    const { emailMessagesOnReturnMovieTicket, returnMovieTicketActions } = await createReturnPaymentMethodIssuedThroughMovieTicketActions(params);
     emailMessagesOnReturnInvoice.push(...emailMessagesOnReturnMovieTicket);
     potentialReturnInvoiceActions.push(...returnMovieTicketActions);
     return { emailMessagesOnReturnInvoice, returnPaymentMethodActions: potentialReturnInvoiceActions };
@@ -84,9 +85,7 @@ async function createReturnPaymentMethodActions(params, setting) {
 /**
  * 決済カード決済の返却アクションを生成する
  */
-async function createReturnPaymentMethodIssuedThroughMovieTicketActions(params, 
-// settings: Settings
-setting) {
+async function createReturnPaymentMethodIssuedThroughMovieTicketActions(params) {
     const returnFeesMovieTicketByTransaction = params.transaction.object.returnPolicy.returnFeesMovieTicket;
     const emailMessagesOnReturnMovieTicket = [];
     const returnMovieTicketActions = await Promise.all(params.order.paymentMethods
@@ -129,7 +128,7 @@ setting) {
             ...(params.returnOrderActionParams !== undefined)
                 ? { returnOrderActionParams: params.returnOrderActionParams }
                 : undefined
-        }, setting);
+        });
         emailMessagesOnReturnMovieTicket.push(...emailMessagesOnReturnEachPaymentMethodId);
         const { paymentStatus, ...referencedInvoiceAsObject } = referencedInvoice; // eslint-disable-line @typescript-eslint/no-unused-vars
         const object = {

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

@@ -1,12 +1,15 @@
 import { IOrderAsCreateEmailParams } from '../../../../emailMessageBuilder';
 import { factory } from '../../../../factory';
-import type { ISetting } from '../../../../repo/setting';
 type IPotentialSendEmailMessageAction = factory.action.transfer.returnAction.order.IPotentialSendEmailMessageAction;
 export declare function createSendEmailMessaegActionsOnReturn(params: {
     order: IOrderAsCreateEmailParams;
     returnOrderActionParams?: factory.transaction.returnOrder.IReturnOrderActionParams;
-}, setting: Pick<ISetting, 'defaultSenderEmail'>): Promise<{
-    emailMessagesOnReturn: factory.action.transfer.send.message.email.IObjectAsEmailMessage[];
+}): Promise<{
+    emailMessagesOnReturn: (Pick<factory.action.transfer.send.message.email.IObjectAsEmailMessage, 'about' | 'identifier' | 'name' | 'text' | 'toRecipient' | 'typeOf'> & {
+        sender: Pick<factory.action.transfer.send.message.email.IObjectAsEmailMessage['sender'], 'name' | 'typeOf'> & {
+            email?: never;
+        };
+    })[];
     sendEmailMessaegActionsOnReturn: IPotentialSendEmailMessageAction[];
 }>;
 export {};

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

@@ -3,9 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.createSendEmailMessaegActionsOnReturn = createSendEmailMessaegActionsOnReturn;
 const emailMessageBuilder_1 = require("../../../../emailMessageBuilder");
 const factory_1 = require("../../../../factory");
-async function createSendEmailMessaegActionsOnReturn(params, 
-// settings: Settings
-setting) {
+async function createSendEmailMessaegActionsOnReturn(params) {
     const order = params.order;
     // 返品後のEメール送信アクション
     const emailMessagesOnReturn = [];
@@ -17,10 +15,7 @@ setting) {
                 order,
                 index,
                 ...(sendEmailMessageParams.object !== undefined) ? { email: sendEmailMessageParams.object } : undefined,
-                // ...(params.emailMessageOnOrderReturned !== undefined)
-                //     ? { emailMessage: params.emailMessageOnOrderReturned }
-                //     : undefined
-            }, setting);
+            });
             emailMessagesOnReturn.push(emailMessage);
             return {
                 object: {

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

@@ -1,13 +1,16 @@
 import { factory } from '../../../factory';
-import type { ISetting } from '../../../repo/setting';
 type IReturningOrder4potentialActions = Pick<factory.order.IOrder, 'confirmationNumber' | 'customer' | 'orderDate' | 'orderNumber' | 'orderStatus' | 'orderedItem' | 'paymentMethods' | 'price' | 'priceCurrency' | 'project' | 'seller' | 'typeOf'>;
 declare function createPotentialActions(params: {
     dateReturned: Date;
     orders: IReturningOrder4potentialActions[];
     potentialActions?: factory.transaction.returnOrder.IPotentialActionsParams;
     transaction: Pick<factory.transaction.returnOrder.ITransaction, 'agent' | 'object'>;
-}, setting: Pick<ISetting, 'defaultSenderEmail'>): Promise<{
-    emailMessages: factory.action.transfer.send.message.email.IObjectAsEmailMessage[];
+}): Promise<{
+    emailMessages: (Pick<factory.action.transfer.send.message.email.IObjectAsEmailMessage, 'about' | 'identifier' | 'name' | 'text' | 'toRecipient' | 'typeOf'> & {
+        sender: Pick<factory.action.transfer.send.message.email.IObjectAsEmailMessage['sender'], 'name' | 'typeOf'> & {
+            email?: never;
+        };
+    })[];
     potentialActions: factory.transaction.returnOrder.IPotentialActions;
 }>;
 export { createPotentialActions, IReturningOrder4potentialActions };

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

@@ -2,9 +2,10 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createPotentialActions = createPotentialActions;
 const factory_1 = require("../../../factory");
+// import type { ISetting } from '../../../repo/setting';
 const returnPaymentMethod_1 = require("./potentialActions/returnPaymentMethod");
 const sendEmailMessage_1 = require("./potentialActions/sendEmailMessage");
-async function createPotentialActions(params, setting) {
+async function createPotentialActions(params) {
     const emailMessages = [];
     const returnOrderActions = await Promise.all(params.orders.map(async (order) => {
         let returnOrderParams = params.potentialActions?.returnOrder;
@@ -18,14 +19,14 @@ async function createPotentialActions(params, setting) {
             ...params,
             order,
             ...(returnOrderActionParams !== undefined) ? { returnOrderActionParams } : undefined
-        }, setting);
+        });
         emailMessages.push(...emailMessagesOnReturnInvoice);
         // 返品後のEメール送信アクション
         const { emailMessagesOnReturn, sendEmailMessaegActionsOnReturn } = await (0, sendEmailMessage_1.createSendEmailMessaegActionsOnReturn)({
             ...params,
             order,
             ...(returnOrderActionParams !== undefined) ? { returnOrderActionParams } : undefined
-        }, setting);
+        });
         emailMessages.push(...emailMessagesOnReturn);
         const potentialActionsOnReturnOrder = {
             returnPaymentMethod: returnPaymentMethodActions,

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

@@ -10,7 +10,6 @@ import type { ProjectRepo } from '../../repo/project';
 import type { ReservationRepo } from '../../repo/reservation';
 import type { SellerRepo } from '../../repo/seller';
 import type { SellerReturnPolicyRepo } from '../../repo/sellerReturnPolicy';
-import type { SettingRepo } from '../../repo/setting';
 import type { TaskRepo } from '../../repo/task';
 import type { IStartedTransaction, ReturnOrderInProgressRepo } from '../../repo/transaction/returnOrderInProgress';
 import { preStart, IStartParamsWithoutDetail } from './returnOrder/preStart';
@@ -36,7 +35,6 @@ interface IConfirmRepos {
     acceptedOffer: AcceptedOfferRepo;
     message: MessageRepo;
     order: OrderRepo;
-    setting: SettingRepo;
     returnOrderInProgress: ReturnOrderInProgressRepo;
     task: TaskRepo;
 }

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

@@ -86,17 +86,17 @@ function confirm(params) {
         if (orderStatus === factory_1.factory.orderStatus.OrderReturned) {
             throw new factory_1.factory.errors.Argument('orderNumber', `invalid orderStatus: ${orderStatus}`);
         }
-        const setting = await repos.setting.findOne({ project: { id: { $eq: '*' } } }, ['defaultSenderEmail']);
-        if (typeof setting?.defaultSenderEmail !== 'string') {
-            throw new factory_1.factory.errors.NotFound('setting.defaultSenderEmail');
-        }
+        // defaultSenderEmail参照不要(2026-10-20~)
+        // const setting = await repos.setting.findOne({ project: { id: { $eq: '*' } } }, ['defaultSenderEmail']) as Pick<ISetting, 'defaultSenderEmail'> | null;
+        // if (typeof setting?.defaultSenderEmail !== 'string') {
+        //     throw new factory.errors.NotFound('setting.defaultSenderEmail');
+        // }
         const { emailMessages, potentialActions } = await (0, potentialActions_1.createPotentialActions)({
             dateReturned: params.object.order.dateReturned,
             orders: returningOrders,
             transaction: transaction,
             ...(params.potentialActions !== undefined) ? { potentialActions: params.potentialActions } : undefined,
-            // ...(emailMessageOnOrderReturned !== undefined) ? { emailMessageOnOrderReturned } : undefined
-        }, setting);
+        });
         // save messages(2024-06-27~)
         await saveMessagesIfNeeded({
             project: { id: transaction.project.id },

package/package.json

@@ -88,5 +88,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build"
   },
-  "version": "28.0.0-alpha.40"
+  "version": "28.0.0-alpha.41"
 }