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

package/lib/chevre/service/task/onResourceUpdated.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.call = call;
 const factory_1 = require("../../factory");
-const accountTitle_1 = require("../../repo/accountTitle");
+const adminAccountTitleCategory_1 = require("../../repo/adminAccountTitleCategory");
 const aggregateOffer_1 = require("../../repo/aggregateOffer");
 const categoryCode_1 = require("../../repo/categoryCode");
 const creativeWork_1 = require("../../repo/creativeWork");
@@ -15,7 +15,7 @@ const offerCatalog_1 = require("../../repo/offerCatalog");
 const offerCatalogItem_1 = require("../../repo/offerCatalogItem");
 const paymentServiceProvider_1 = require("../../repo/paymentServiceProvider");
 const entranceGate_1 = require("../../repo/place/entranceGate");
-const hasPOS_1 = require("../../repo/place/hasPOS");
+const pos_1 = require("../../repo/place/pos");
 const movieTheater_1 = require("../../repo/place/movieTheater");
 const screeningRoom_1 = require("../../repo/place/screeningRoom");
 const product_1 = require("../../repo/product");
@@ -32,14 +32,14 @@ function call(params) {
     return async ({ connection }) => {
         const { data } = params;
         await onResourceUpdated(data)({
-            accountTitle: new accountTitle_1.AccountTitleRepo(connection),
+            adminAccountTitleCategory: new adminAccountTitleCategory_1.AdminAccountTitleCategoryRepo(connection),
             aggregateOffer: new aggregateOffer_1.AggregateOfferRepo(connection),
             categoryCode: new categoryCode_1.CategoryCodeRepo(connection),
             creativeWork: new creativeWork_1.CreativeWorkRepo(connection),
             entranceGate: new entranceGate_1.EntranceGateRepo(connection, { id: '' }), // 先の処理で明示的に指定される
             event: new event_1.EventRepo(connection),
             eventSeries: new eventSeries_1.EventSeriesRepo(connection),
-            hasPOS: new hasPOS_1.HasPOSRepo(connection, { id: '' }), // 先の処理で明示的に指定される
+            pos: new pos_1.POSRepo(connection, { id: '' }), // 先の処理で明示的に指定される
             member: new member_1.MemberRepo(connection),
             movieTheater: new movieTheater_1.MovieTheaterRepo(connection),
             note: new note_1.NoteRepo(connection),
@@ -123,8 +123,9 @@ function onResourceUpdated(params) {
                     case 'POS':
                         await (0, onHasPOSUpdated_1.createInformHasPOSTasks)({
                             project: { id: params.project.id },
-                            ids: [params.operator.id],
-                            typeOf: factory_1.factory.placeType.MovieTheater
+                            id: params.operator.id,
+                            typeOf: factory_1.factory.placeType.MovieTheater,
+                            branchCode: params.branchCode
                         })(repos);
                         break;
                     case factory_1.factory.offerType.AggregateOffer:
@@ -401,32 +402,11 @@ function createInformMovieTheaterTasks(params, setting) {
         ]
         // []
         );
-        // const movieTheater = movieTheaters.shift();
-        // if (movieTheater === undefined) {
-        //     throw new factory.errors.NotFound(factory.placeType.MovieTheater);
-        // }
-        // // ルームを検索
-        // const screeningRooms = await repos.screeningRoom.findRooms(
-        //     {
-        //         containedInPlace: { id: { $eq: movieTheater.id } }
-        //     }
-        // );
         // 入場ゲートを廃止(2026-01-17~)
         const movieTheaters4inform = movieTheaters.map((movieTheater) => {
             const { hasEntranceGate, ...movieTheaterWithoutEntranceGates } = movieTheater; // eslint-disable-line @typescript-eslint/no-unused-vars
             return {
                 ...movieTheaterWithoutEntranceGates
-                // ...movieTheater
-                // migrate to IRoomAsNotification(2026-01-16~)
-                // containsPlace: screeningRooms.map((room) => {
-                //     return {
-                //         branchCode: room.branchCode,
-                //         name: room.name,
-                //         typeOf: factory.placeType.ScreeningRoom,
-                //         additionalProperty: room.additionalProperty,
-                //         address: room.address
-                //     };
-                // })
             };
         });
         if (movieTheaters4inform.length > 0) {
@@ -596,26 +576,9 @@ function createInformAccountTitleTasks(params, setting) {
         }
         // const informResources = settings.onResourceUpdated.informResource;
         const informResources = setting?.onResourceUpdated?.informResource;
-        const accountTitle = await repos.accountTitle.accountTitleModel.findOne({
-            _id: { $eq: params.ids[0] },
-            'project.id': { $eq: params.project.id }
-        }, {
-            _id: 0,
-            id: { $toString: '$_id' },
-            additionalProperty: 1,
-            codeValue: 1,
-            hasCategoryCode: 1,
-            name: 1,
-            project: 1,
-            typeOf: 1
-        })
-            .lean()
-            .exec()
-            .then((doc) => {
-            if (doc === null) {
-                throw new factory_1.factory.errors.NotFound(params.typeOf);
-            }
-            return doc;
+        const accountTitle = await repos.adminAccountTitleCategory.findAccountTitleCategorAsNotification({
+            id: params.ids[0],
+            projectId: params.project.id
         });
         const accountTitles4inform = [accountTitle];
         if (accountTitles4inform.length > 0) {

package/lib/chevre/service/task/sendEmailMessage.js

@@ -5,6 +5,7 @@ const sendEmailMessage_1 = require("../../repo/action/sendEmailMessage");
 const message_1 = require("../../repo/message");
 const project_1 = require("../../repo/project");
 const integration_1 = require("../../repo/setting/integration");
+const setting_1 = require("../../repo/setting");
 const notification_1 = require("../notification");
 /**
  * タスク実行関数
@@ -18,7 +19,8 @@ function call(params) {
             actions: { sendEmailMessage: new sendEmailMessage_1.SendEmailMessageActionRepo(connection) },
             message: new message_1.MessageRepo(connection),
             project: new project_1.ProjectRepo(connection),
-            integrationSetting: new integration_1.IntegrationSettingRepo({ connection })
+            integrationSetting: new integration_1.IntegrationSettingRepo({ connection }),
+            setting: new setting_1.SettingRepo(connection)
         });
     };
 }

package/lib/chevre/service/task/syncResourcesFromCOA.js

@@ -12,6 +12,7 @@ const categoryCode_1 = require("../../repo/categoryCode");
 const creativeWork_1 = require("../../repo/creativeWork");
 const credentials_1 = require("../../repo/credentials");
 const adminEvent_1 = require("../../repo/adminEvent");
+const adminEventSeries_1 = require("../../repo/adminEventSeries");
 const eventSeries_1 = require("../../repo/eventSeries");
 const movieTheater_1 = require("../../repo/place/movieTheater");
 const screeningRoom_1 = require("../../repo/place/screeningRoom");
@@ -71,7 +72,7 @@ function call(params) {
                     },
                     categoryCode: new categoryCode_1.CategoryCodeRepo(connection),
                     creativeWork: new creativeWork_1.CreativeWorkRepo(connection),
-                    eventSeries: new eventSeries_1.EventSeriesRepo(connection),
+                    adminEventSeries: new adminEventSeries_1.AdminEventSeriesRepo(connection),
                     movieTheater: new movieTheater_1.MovieTheaterRepo(connection),
                     masterService
                 });
@@ -88,6 +89,7 @@ function call(params) {
                     categoryCode: new categoryCode_1.CategoryCodeRepo(connection),
                     creativeWork: new creativeWork_1.CreativeWorkRepo(connection),
                     adminEvent: new adminEvent_1.AdminEventRepo(connection),
+                    adminEventSeries: new adminEventSeries_1.AdminEventSeriesRepo(connection),
                     eventSeries: new eventSeries_1.EventSeriesRepo(connection),
                     movieTheater: new movieTheater_1.MovieTheaterRepo(connection),
                     screeningRoom: new screeningRoom_1.ScreeningRoomRepo(connection),
@@ -239,7 +241,7 @@ function syncEvents(params) {
                 titleCode,
                 titleBranchNum
             });
-            const eventSeries = (await repos.eventSeries.projectEventSeriesFields({
+            const eventSeries = (await repos.eventSeries.findEventSeries({
                 id: { $eq: eventSeriesId },
                 project: { id: { $eq: params.project.id } }
             }, [
@@ -247,7 +249,7 @@ function syncEvents(params) {
                 'name', 'kanaName', 'alternativeHeadline', 'location',
                 'organizer',
                 // 'videoFormat', // 参照廃止(2026-02-10~)
-                'soundFormat', 'workPerformed',
+                'workPerformed',
                 'duration', 'endDate', 'startDate', 'coaInfo',
                 'offers', 'additionalProperty'
             ])).shift();

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,7 +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<{
-    potentialActions?: never;
-    emailMessages: factory.creativeWork.message.email.ICreativeWork[];
+}): 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,19 +1,15 @@
 "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,
-        // potentialActions: {
-        //     order: {
-        //         onOrderProcessing: { sendEmailMessage: sendEmailMessageActions } // optimize(2024-06-29~)
-        //     }
-        // }
     };
 }

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

@@ -1,7 +1,7 @@
 import type { OfferRepo } from '../../../../repo/offer/unitPriceInCatalog';
 import { factory } from '../../../../factory';
 export type IAuthorizeEventServiceOffer = factory.action.authorize.offer.eventService.IAction;
-type IOrderAcceptedOffer = Pick<factory.order.IAcceptedOffer, 'itemOffered' | 'offeredThrough' | 'serialNumber' | 'priceSpecification' | 'id'>;
+type IOrderAcceptedOffer = Pick<factory.acceptedOffer.IAcceptedOffer, 'itemOffered' | 'offeredThrough' | 'serialNumber' | 'priceSpecification' | 'id'>;
 interface IAcceptedOfferInResult extends Pick<factory.product.ITicketOffer, 'acceptedPaymentMethod' | 'id' | 'typeOf'> {
     typeOf: factory.offerType.Offer;
     id: string;

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

@@ -4,5 +4,5 @@ declare function validateInvoiceReferencesOrder(authorizePaymentActions: IAuthor
 /**
  * 受け入れられた興行オファー
  */
-eventReservationAcceptedOffers: Pick<factory.order.IAcceptedOffer, 'itemOffered'>[]): void;
+eventReservationAcceptedOffers: Pick<factory.acceptedOffer.IAcceptedOffer, 'itemOffered'>[]): void;
 export { validateInvoiceReferencesOrder };

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

@@ -18,4 +18,4 @@ authorizedMovieTickets: IMovieTicket4validate[],
 /**
  * 受け入れられた興行オファー
  */
-eventReservationAcceptedOffers: Pick<factory.order.IAcceptedOffer, 'itemOffered' | 'priceSpecification'>[]): void;
+eventReservationAcceptedOffers: Pick<factory.acceptedOffer.IAcceptedOffer, 'itemOffered' | 'priceSpecification'>[]): void;

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

@@ -8,7 +8,7 @@ export { IAcceptPayAction, IAuthorizeEventServiceOffer, IAuthorizePaymentAction,
  */
 export declare function validateTransaction(transaction: {
     id: string;
-}, acceptPayActions: IAcceptPayAction[], authorizePaymentActions: IAuthorizePaymentAction[], authorizeEventServiceOfferActions: Pick<IAuthorizeEventServiceOffer, 'id' | 'result'>[], eventReservationAcceptedOffers: Pick<factory.order.IAcceptedOffer, 'itemOffered' | 'priceSpecification'>[], payTransactions: IPayTransaction[], customer: factory.order.ICustomer, options: {
+}, acceptPayActions: IAcceptPayAction[], authorizePaymentActions: IAuthorizePaymentAction[], authorizeEventServiceOfferActions: Pick<IAuthorizeEventServiceOffer, 'id' | 'result'>[], eventReservationAcceptedOffers: Pick<factory.acceptedOffer.IAcceptedOffer, 'itemOffered' | 'priceSpecification'>[], payTransactions: IPayTransaction[], customer: factory.order.ICustomer, options: {
     paymentMethodIdByTransaction?: string;
 }): void;
 /**
@@ -18,7 +18,7 @@ export declare function validateAcceptedOffers(params: {
     result: {
         order: PlaceOrderFactory.IResultOrderParams;
     };
-    acceptedOffers: (Pick<factory.order.IAcceptedOffer, 'itemOffered' | 'offeredThrough' | 'serialNumber'>)[];
+    acceptedOffers: (Pick<factory.acceptedOffer.IAcceptedOffer, 'itemOffered' | 'offeredThrough' | 'serialNumber'>)[];
 }): void;
 export declare function validateOrderedItem(params: {
     order: Pick<factory.order.IOrder, 'orderedItem'>;

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 },
@@ -297,17 +297,12 @@ function createReservationIdsResult(order, acceptedOffers) {
 function createResult(params, options) {
     const transaction = params.transaction;
     const eventReservationAcceptedOffers = [];
-    // const productAcceptedOffers: factory.order.IAcceptedOffer<factory.order.IPermit>[] = [];
-    // const moneyTransferAcceptedOffers: factory.order.IAcceptedOffer<factory.order.IMoneyTransfer>[] = [];
     params.acceptedOffers.forEach((acceptedOffer) => {
         const itemOfferedTypeOf = acceptedOffer.itemOffered.typeOf;
         switch (itemOfferedTypeOf) {
             case factory_1.factory.reservationType.EventReservation:
                 eventReservationAcceptedOffers.push((acceptedOffer));
                 break;
-            // case factory.permit.PermitType.Permit:
-            //     productAcceptedOffers.push((acceptedOffer as factory.order.IAcceptedOffer<factory.order.IPermit>));
-            //     break;
             default:
                 throw new factory_1.factory.errors.NotImplemented(`${itemOfferedTypeOf} not implemented`);
         }

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/preStart/factory.d.ts

@@ -15,6 +15,6 @@ type ICustomSellerReturnPolicy = Pick<factory.sellerReturnPolicy.ISellerReturnPo
     applicablePaymentMethod?: never;
     merchantReturnDays?: never;
 };
-type IFixedAcceptedOffer = Pick<factory.order.IAcceptedOffer, 'id' | 'priceSpecification' | 'itemOffered'>;
+type IFixedAcceptedOffer = Pick<factory.acceptedOffer.IAcceptedOffer, 'id' | 'priceSpecification' | 'itemOffered'>;
 type IFixedOrder = Pick<factory.order.IOrder, 'confirmationNumber' | 'dateReturned' | 'orderDate' | 'orderNumber' | 'orderStatus' | 'paymentMethods' | 'price' | 'project' | 'seller' | 'typeOf'>;
 export { IAvailableSellerReturnPolicy, ICustomSellerReturnPolicy, IFixedAcceptedOffer, IFixedOrder };

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

@@ -36,8 +36,7 @@ function preStart(params) {
         let events = [];
         if (eventIds.length > 0) {
             events = await repos.event.projectEventFields({
-                id: { $in: eventIds },
-                typeOf: factory_1.factory.eventType.ScreeningEvent
+                id: { $in: eventIds }
             }, ['startDate']);
         }
         let returnPolicies = [];

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 },