@chevre/domain 25.0.0-alpha.2 → 25.0.0-alpha.21

package/lib/chevre/emailMessageBuilder.d.ts

@@ -4,14 +4,20 @@ type ISendableEmailMessage = factory.action.transfer.send.message.email.IObjectA
     identifier: string;
     name: string;
 };
-export type IOrderAsCreateEmailParams = Pick<factory.order.IOrder, 'confirmationNumber' | 'customer' | 'orderDate' | 'orderNumber' | 'orderStatus' | 'orderedItem' | 'paymentMethods' | 'price' | 'priceCurrency' | 'seller' | 'typeOf'>;
+/**
+ * 注文取引確定時の指定テンプレートで利用可能な注文変数
+ */
+type IOrderAsCreateEmailParams = Pick<factory.order.IOrder, 'orderNumber' | 'confirmationNumber' | 'price'> & {
+    customer: Pick<factory.order.ICustomer, 'givenName' | 'familyName' | 'email' | 'typeOf'>;
+    seller: Pick<factory.order.ISeller, 'name' | 'typeOf'>;
+};
 /**
  * 注文配送メッセージを作成する
  */
 declare function createSendOrderMessage(params: {
     order: IOrderAsCreateEmailParams;
     email?: factory.creativeWork.message.email.ICustomization;
-    emailMessage?: factory.creativeWork.message.email.ICreativeWork;
+    emailMessage?: never;
     index: number;
 }, setting: Pick<ISetting, 'defaultSenderEmail'>): Promise<ISendableEmailMessage>;
 /**
@@ -20,7 +26,7 @@ declare function createSendOrderMessage(params: {
 declare function createReturnOrderMessage(params: {
     order: IOrderAsCreateEmailParams;
     email?: factory.creativeWork.message.email.ICustomization;
-    emailMessage?: factory.creativeWork.message.email.ICreativeWork;
+    emailMessage?: never;
     index: number;
 }, setting: Pick<ISetting, 'defaultSenderEmail'>): Promise<ISendableEmailMessage>;
 /**
@@ -31,4 +37,4 @@ declare function createRefundMessage(params: {
     email?: factory.creativeWork.message.email.ICustomization;
     paymentMethodId: string;
 }, setting: Pick<ISetting, 'defaultSenderEmail'>): Promise<ISendableEmailMessage>;
-export { createSendOrderMessage, createReturnOrderMessage, createRefundMessage };
+export { createSendOrderMessage, createReturnOrderMessage, createRefundMessage, IOrderAsCreateEmailParams };

package/lib/chevre/emailMessageBuilder.js

@@ -12,7 +12,6 @@ const factory_1 = require("./factory");
 async function createEmailMessageText(params) {
     const emailTemplate = params.email?.template;
     const emailText = params.email?.text;
-    const emailMessageTextByDB = params.emailMessage?.text;
     let emailMessageText;
     if (typeof emailText === 'string') {
         emailMessageText = emailText;
@@ -28,26 +27,12 @@ async function createEmailMessageText(params) {
             });
         });
     }
-    else if (typeof emailMessageTextByDB === 'string') {
-        // デフォルトEメールメッセージを適用する
-        emailMessageText = await new Promise((resolve, reject) => {
-            (0, pug_1.render)(emailMessageTextByDB, { order: params.order }, (err, message) => {
-                if (err instanceof Error) {
-                    reject(new factory_1.factory.errors.Argument('emailMessage.text', err.message));
-                    return;
-                }
-                resolve(message);
-            });
-        });
-    }
     else {
         emailMessageText = `orderNumber: ${params.order.orderNumber}`;
     }
     return emailMessageText;
 }
 async function createEmailMessageAbout(params) {
-    const abouyIdentifierByDB = params.emailMessage?.about.identifier;
-    const abouyNameByDB = params.emailMessage?.about.name;
     let about;
     if (typeof params.email?.about === 'string') {
         // aboutをStringで指定された場合
@@ -66,23 +51,6 @@ async function createEmailMessageAbout(params) {
             name: params.email.about.name
         };
     }
-    else if (typeof abouyIdentifierByDB === 'string' && typeof abouyNameByDB === 'string') {
-        // デフォルトEメールメッセージを適用する
-        const aboutName = await new Promise((resolve, reject) => {
-            (0, pug_1.render)(abouyNameByDB, { order: params.order }, (err, message) => {
-                if (err instanceof Error) {
-                    reject(new factory_1.factory.errors.Argument('emailMessage.about.name', err.message));
-                    return;
-                }
-                resolve(message);
-            });
-        });
-        about = {
-            typeOf: 'Thing',
-            identifier: abouyIdentifierByDB,
-            name: aboutName
-        };
-    }
     else {
         // aboutの指定がない場合
         about = {
@@ -97,44 +65,59 @@ function createEmailMessageSender(params, setting) {
     if (typeof setting.defaultSenderEmail !== 'string') {
         throw new factory_1.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
-            : (typeof params.order.seller.name === 'string')
-                ? params.order.seller.name
-                : String(params.order.seller.id),
-        // email: settings.defaultSenderEmail
+            : defaultSellerName,
         email: setting.defaultSenderEmail
     };
 }
+/**
+ * pug templateに渡す変数を確実に最小化する
+ */
+function minimizeOrderAsCreateEmailParams(order) {
+    const { confirmationNumber, orderNumber, price, customer, seller } = order;
+    const defaultToRecipientEmail = customer.email;
+    if (typeof defaultToRecipientEmail !== 'string' || defaultToRecipientEmail === '') {
+        throw new factory_1.factory.errors.Argument('order', 'order.customer.email undefined');
+    }
+    return {
+        customer: {
+            email: defaultToRecipientEmail,
+            typeOf: customer.typeOf,
+            ...((typeof customer.givenName === 'string') && { givenName: customer.givenName }),
+            ...((typeof customer.familyName === 'string') && { familyName: customer.familyName })
+        },
+        seller: { name: seller.name, typeOf: seller.typeOf },
+        orderNumber,
+        confirmationNumber,
+        price
+    };
+}
 /**
  * 注文配送メッセージを作成する
  */
 async function createSendOrderMessage(params, setting) {
+    const minimizedOrder = minimizeOrderAsCreateEmailParams(params.order);
     const emailMessageText = await createEmailMessageText({
-        order: params.order,
+        order: minimizedOrder,
         email: params.email,
-        emailMessage: params.emailMessage
     });
     const about = await createEmailMessageAbout({
-        order: params.order,
         email: params.email,
-        emailMessage: params.emailMessage,
         aboutIdentifier: factory_1.factory.creativeWork.message.email.AboutIdentifier.OnOrderSent,
         defaultName: 'Order Delivered'
     });
-    const defaultToRecipientEmail = params.order.customer.email;
-    if (defaultToRecipientEmail === undefined) {
-        throw new factory_1.factory.errors.Argument('order', 'order.customer.email undefined');
-    }
-    const defaultRecipientName = `${params.order.customer.familyName} ${params.order.customer.givenName}`;
+    const defaultToRecipientEmail = minimizedOrder.customer.email;
+    const defaultRecipientName = `${minimizedOrder.customer.familyName} ${minimizedOrder.customer.givenName}`;
     const sender = createEmailMessageSender(params, setting);
     const toRecipientCustomization = params.email?.toRecipient;
     const toRecipient = (Array.isArray(toRecipientCustomization))
         ? toRecipientCustomization.map((customizedRecipient) => {
             return {
-                typeOf: params.order.customer.typeOf,
+                typeOf: minimizedOrder.customer.typeOf,
                 name: (typeof customizedRecipient.name === 'string')
                     ? customizedRecipient.name
                     : defaultRecipientName,
@@ -144,7 +127,7 @@ async function createSendOrderMessage(params, setting) {
             };
         })
         : [{
-                typeOf: params.order.customer.typeOf,
+                typeOf: minimizedOrder.customer.typeOf,
                 name: (typeof toRecipientCustomization?.name === 'string')
                     ? toRecipientCustomization.name
                     : defaultRecipientName,
@@ -154,8 +137,8 @@ async function createSendOrderMessage(params, setting) {
             }];
     return {
         typeOf: factory_1.factory.creativeWorkType.EmailMessage,
-        identifier: `${about.identifier}:${params.order.orderNumber}:${params.index}`,
-        name: `${about.identifier}:${params.order.orderNumber}:${params.index}`,
+        identifier: `${about.identifier}:${minimizedOrder.orderNumber}:${params.index}`,
+        name: `${about.identifier}:${minimizedOrder.orderNumber}:${params.index}`,
         sender: sender,
         toRecipient: toRecipient,
         about: about,
@@ -166,29 +149,24 @@ async function createSendOrderMessage(params, setting) {
  * 注文返品メッセージを作成する
  */
 async function createReturnOrderMessage(params, setting) {
+    const minimizedOrder = minimizeOrderAsCreateEmailParams(params.order);
     const emailMessageText = await createEmailMessageText({
-        order: params.order,
+        order: minimizedOrder,
         email: params.email,
-        emailMessage: params.emailMessage
     });
     const about = await createEmailMessageAbout({
-        order: params.order,
         email: params.email,
-        emailMessage: params.emailMessage,
         aboutIdentifier: factory_1.factory.creativeWork.message.email.AboutIdentifier.OnOrderReturned,
         defaultName: 'Order Returned'
     });
-    const defaultToRecipientEmail = params.order.customer.email;
-    if (defaultToRecipientEmail === undefined) {
-        throw new factory_1.factory.errors.Argument('order', 'order.customer.email undefined');
-    }
-    const defaultRecipientName = `${params.order.customer.familyName} ${params.order.customer.givenName}`;
+    const defaultToRecipientEmail = minimizedOrder.customer.email;
+    const defaultRecipientName = `${minimizedOrder.customer.familyName} ${minimizedOrder.customer.givenName}`;
     const sender = createEmailMessageSender(params, setting);
     const toRecipientCustomization = params.email?.toRecipient;
     const toRecipient = (Array.isArray(toRecipientCustomization))
         ? toRecipientCustomization.map((customizedRecipient) => {
             return {
-                typeOf: params.order.customer.typeOf,
+                typeOf: minimizedOrder.customer.typeOf,
                 name: (typeof customizedRecipient.name === 'string')
                     ? customizedRecipient.name
                     : defaultRecipientName,
@@ -198,7 +176,7 @@ async function createReturnOrderMessage(params, setting) {
             };
         })
         : [{
-                typeOf: params.order.customer.typeOf,
+                typeOf: minimizedOrder.customer.typeOf,
                 name: (typeof toRecipientCustomization?.name === 'string')
                     ? toRecipientCustomization.name
                     : defaultRecipientName,
@@ -208,8 +186,8 @@ async function createReturnOrderMessage(params, setting) {
             }];
     return {
         typeOf: factory_1.factory.creativeWorkType.EmailMessage,
-        identifier: `${about.identifier}:${params.order.orderNumber}:${params.index}`,
-        name: `${about.identifier}:${params.order.orderNumber}:${params.index}`,
+        identifier: `${about.identifier}:${minimizedOrder.orderNumber}:${params.index}`,
+        name: `${about.identifier}:${minimizedOrder.orderNumber}:${params.index}`,
         sender: sender,
         toRecipient: toRecipient,
         about: about,
@@ -220,27 +198,24 @@ async function createReturnOrderMessage(params, setting) {
  * 返金メッセージを作成する
  */
 async function createRefundMessage(params, setting) {
+    const minimizedOrder = minimizeOrderAsCreateEmailParams(params.order);
     const emailMessageText = await createEmailMessageText({
-        order: params.order,
+        order: minimizedOrder,
         email: params.email
     });
     const about = await createEmailMessageAbout({
-        order: params.order,
         email: params.email,
         aboutIdentifier: factory_1.factory.creativeWork.message.email.AboutIdentifier.OnOrderRefunded,
         defaultName: 'Refunded'
     });
-    const defaultToRecipientEmail = params.order.customer.email;
-    if (defaultToRecipientEmail === undefined) {
-        throw new factory_1.factory.errors.Argument('order', 'order.customer.email undefined');
-    }
-    const defaultRecipientName = `${params.order.customer.familyName} ${params.order.customer.givenName}`;
+    const defaultToRecipientEmail = minimizedOrder.customer.email;
+    const defaultRecipientName = `${minimizedOrder.customer.familyName} ${minimizedOrder.customer.givenName}`;
     const sender = createEmailMessageSender(params, setting);
     const toRecipientCustomization = params.email?.toRecipient;
     const toRecipient = (Array.isArray(toRecipientCustomization))
         ? toRecipientCustomization.map((customizedRecipient) => {
             return {
-                typeOf: params.order.customer.typeOf,
+                typeOf: minimizedOrder.customer.typeOf,
                 name: (typeof customizedRecipient.name === 'string')
                     ? customizedRecipient.name
                     : defaultRecipientName,
@@ -250,7 +225,7 @@ async function createRefundMessage(params, setting) {
             };
         })
         : [{
-                typeOf: params.order.customer.typeOf,
+                typeOf: minimizedOrder.customer.typeOf,
                 name: (typeof toRecipientCustomization?.name === 'string')
                     ? toRecipientCustomization.name
                     : defaultRecipientName,
@@ -260,8 +235,8 @@ async function createRefundMessage(params, setting) {
             }];
     return {
         typeOf: factory_1.factory.creativeWorkType.EmailMessage,
-        identifier: `${about.identifier}:${params.order.orderNumber}:${params.paymentMethodId}`,
-        name: `${about.identifier}:${params.order.orderNumber}:${params.paymentMethodId}`,
+        identifier: `${about.identifier}:${minimizedOrder.orderNumber}:${params.paymentMethodId}`,
+        name: `${about.identifier}:${minimizedOrder.orderNumber}:${params.paymentMethodId}`,
         sender: sender,
         toRecipient: toRecipient,
         about: about,

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

@@ -23,9 +23,7 @@ export declare class AcceptedOfferRepo extends AcceptedOfferInReserveRepo {
     /**
      * 索条件を最小化(2026-06-05~)
      */
-    params: Pick<factory.order.ISearchConditions, 'limit' | 'orderNumbers' | 'page' | 'project' | 'provider' | 'sort' | 'orderDate'>, projection: IProjection4searchWithUnwoundAcceptedOffers, options: {
-        noName: boolean;
-    }): Promise<(factory.order.IOrder & {
+    params: Pick<factory.order.ISearchConditions, 'limit' | 'orderNumbers' | 'page' | 'project' | 'provider' | 'sort' | 'orderDate'>, projection: IProjection4searchWithUnwoundAcceptedOffers): Promise<(factory.order.IOrder & {
         acceptedOffers: [IAcceptedOffer];
         _id?: never;
     })[]>;
@@ -66,8 +64,6 @@ export declare class AcceptedOfferRepo extends AcceptedOfferInReserveRepo {
                 reservedTicket?: never;
             };
         };
-    }, options: {
-        noName: boolean;
     }): Promise<Pick<IAcceptedOffer, 'id' | 'itemOffered' | 'offeredThrough' | 'priceSpecification' | 'serialNumber' | 'typeOf'>[]>;
     /**
      * 注文オファーをsliceして検索する(2024-01-10~)

package/lib/chevre/repo/acceptedOffer.js

@@ -24,7 +24,7 @@ class AcceptedOfferRepo extends acceptedOfferInReserve_1.AcceptedOfferInReserveR
     /**
      * 索条件を最小化(2026-06-05~)
      */
-    params, projection, options) {
+    params, projection) {
         const conditions = order_2.OrderRepo.CREATE_MONGO_CONDITIONS(params);
         const aggregate = this.orderModel.aggregate();
         // unwind->matchでは遅い
@@ -63,7 +63,7 @@ class AcceptedOfferRepo extends acceptedOfferInReserve_1.AcceptedOfferInReserveR
             const reservationNumbers = [...new Set(orders.map((order) => String(order.acceptedOffers[0].serialNumber)))];
             let acceptedOffersByReserveTransaction = [];
             if (reservationNumbers.length > 0) {
-                acceptedOffersByReserveTransaction = await this.findAcceptedOffersByReservationNumbers({ reservationNumbers }, options);
+                acceptedOffersByReserveTransaction = await this.findAcceptedOffersByReservationNumbers({ reservationNumbers });
             }
             return orders.map((order) => {
                 const acceptedOffer = order.acceptedOffers[0];
@@ -136,7 +136,7 @@ class AcceptedOfferRepo extends acceptedOfferInReserve_1.AcceptedOfferInReserveR
      * 注文オファーを展開して検索する
      * 注文番号指定で1注文ドキュメントから参照する想定
      */
-    async searchAcceptedOffersByOrderNumber(filter, options) {
+    async searchAcceptedOffersByOrderNumber(filter) {
         /**
          * unwind前に1ドキュメントを特定するためのstage
          */
@@ -183,7 +183,7 @@ class AcceptedOfferRepo extends acceptedOfferInReserve_1.AcceptedOfferInReserveR
             .option({ maxTimeMS: settings_1.MONGO_MAX_TIME_MS })
             .exec();
         // 予約取引を参照(2026-05-18~)
-        return this.addAcceptedOffersDetails(acceptedOffers, options);
+        return this.addAcceptedOffersDetails(acceptedOffers);
     }
     /**
      * 注文オファーをsliceして検索する(2024-01-10~)
@@ -210,7 +210,7 @@ class AcceptedOfferRepo extends acceptedOfferInReserve_1.AcceptedOfferInReserveR
         const { acceptedOffers, numAcceptedOffers } = result;
         // 予約取引を参照(2026-05-18~)
         return {
-            acceptedOffers: await this.addAcceptedOffersDetails(acceptedOffers, { noName: true }),
+            acceptedOffers: await this.addAcceptedOffersDetails(acceptedOffers),
             numAcceptedOffers
         };
     }

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

@@ -22,13 +22,9 @@ export declare class AcceptedOfferInReserveRepo {
          * 予約番号リスト
          */
         reservationNumbers: string[];
-    }, options: {
-        noName: boolean;
     }): Promise<IAcceptedOfferByReserveTransaction[]>;
     /**
      * 予約取引からオファー詳細情報を付加する
      */
-    protected addAcceptedOffersDetails(acceptedOffers: IAcceptedOffer[], options: {
-        noName: boolean;
-    }): Promise<IAcceptedOffer[]>;
+    protected addAcceptedOffersDetails(acceptedOffers: IAcceptedOffer[]): Promise<IAcceptedOffer[]>;
 }

package/lib/chevre/repo/acceptedOfferInReserve.js

@@ -20,7 +20,7 @@ class AcceptedOfferInReserveRepo {
     /**
      * 予約番号指定で予約取引から注文オファーを生成する
      */
-    async findAcceptedOffersByReservationNumbers(params, options) {
+    async findAcceptedOffersByReservationNumbers(params) {
         const { reservationNumbers } = params;
         if (!Array.isArray(reservationNumbers) || reservationNumbers.length === 0) {
             throw new factory_1.factory.errors.ArgumentNull('reservationNumbers');
@@ -35,13 +35,13 @@ class AcceptedOfferInReserveRepo {
             .exec();
         debug('findSubReservationsByReservationNumbers: reservationNumbers.length === reserveTransactions.length?', reservationNumbers.length === reserveTransactions.length);
         return reserveTransactions.reduce((a, b) => {
-            return [...a, ...(0, reserveTransaction2itemOffered_1.reserveTransaction2itemOffered)(b, options)];
+            return [...a, ...(0, reserveTransaction2itemOffered_1.reserveTransaction2itemOffered)(b)];
         }, []);
     }
     /**
      * 予約取引からオファー詳細情報を付加する
      */
-    async addAcceptedOffersDetails(acceptedOffers, options) {
+    async addAcceptedOffersDetails(acceptedOffers) {
         const offeredThroughIdentifier = acceptedOffers.at(0)?.offeredThrough?.identifier;
         if (offeredThroughIdentifier === factory_1.factory.service.webAPI.Identifier.COA) {
             // COAでは予約取引を参照しない
@@ -50,7 +50,7 @@ class AcceptedOfferInReserveRepo {
         const reservationNumbers = [...new Set(acceptedOffers.map((acceptedOffer) => String(acceptedOffer.serialNumber)))];
         let acceptedOffersByReserveTransaction = [];
         if (reservationNumbers.length > 0) {
-            acceptedOffersByReserveTransaction = await this.findAcceptedOffersByReservationNumbers({ reservationNumbers }, options);
+            acceptedOffersByReserveTransaction = await this.findAcceptedOffersByReservationNumbers({ reservationNumbers });
         }
         return acceptedOffers.map((acceptedOffer) => {
             const acceptedOfferByReserveTransaction = acceptedOffersByReserveTransaction.find(((offer) => offer.itemOffered.id === acceptedOffer.itemOffered.id));

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

@@ -1,21 +1,33 @@
-import type { Connection } from 'mongoose';
+import type { Connection, FilterQuery } from 'mongoose';
+import { IDocType } from './mongoose/schemas/emailMessages';
 import { factory } from '../factory';
-export type IEmailMessage = factory.creativeWork.message.email.ICreativeWork;
+export type IEmailMessage = IDocType & {
+    id: string;
+};
 export interface ISearchConditions {
     limit?: number;
     page?: number;
-    sort?: any;
+    sort?: {
+        identifier?: factory.sortType;
+    };
     project?: {
         id?: {
             $eq?: string;
         };
     };
+    id?: {
+        $eq?: string;
+    };
     identifier?: {
         $eq?: string;
     };
     about?: {
         identifier?: {
-            $eq?: string;
+            /**
+             * 現時点でOnEventStatusChangedしかサポートしていない
+             * 2026-06-18
+             */
+            $eq?: factory.creativeWork.message.email.AboutIdentifier.OnEventStatusChanged;
         };
     };
 }
@@ -25,12 +37,9 @@ export interface ISearchConditions {
 export declare class EmailMessageRepo {
     private readonly emailMessageModel;
     constructor(connection: Connection);
-    static CREATE_MONGO_CONDITIONS(params: ISearchConditions): any[];
+    static CREATE_MONGO_CONDITIONS(params: ISearchConditions): FilterQuery<IDocType>[];
     save(params: IEmailMessage): Promise<any>;
-    findById(params: {
-        id: string;
-    }): Promise<IEmailMessage>;
-    search(params: ISearchConditions): Promise<IEmailMessage[]>;
+    findEmailMessages(params: ISearchConditions): Promise<IEmailMessage[]>;
     deleteById(params: {
         id: string;
     }): Promise<void>;

package/lib/chevre/repo/emailMessage.js

@@ -4,6 +4,17 @@ exports.EmailMessageRepo = void 0;
 const emailMessages_1 = require("./mongoose/schemas/emailMessages");
 const factory_1 = require("../factory");
 const settings_1 = require("../settings");
+const DEFAULT_PROJECTION = {
+    _id: 0,
+    id: { $toString: '$_id' },
+    project: 1,
+    typeOf: 1,
+    identifier: 1,
+    name: 1,
+    about: 1,
+    sender: 1,
+    text: 1,
+};
 /**
  * Eメールメッセージリポジトリ
  */
@@ -13,28 +24,24 @@ class EmailMessageRepo {
         this.emailMessageModel = connection.model(emailMessages_1.modelName, (0, emailMessages_1.createSchema)());
     }
     static CREATE_MONGO_CONDITIONS(params) {
-        // MongoDB検索条件
-        const andConditions = [{ typeOf: factory_1.factory.creativeWorkType.EmailMessage }]; // eslint-disable-line @typescript-eslint/no-explicit-any
+        const andConditions = [
+        // { typeOf: factory.creativeWorkType.EmailMessage }
+        ];
         const projectIdEq = params.project?.id?.$eq;
         if (typeof projectIdEq === 'string') {
-            andConditions.push({
-                'project.id': { $eq: projectIdEq }
-            });
+            andConditions.push({ 'project.id': { $eq: projectIdEq } });
+        }
+        const idEq = params.id?.$eq;
+        if (typeof idEq === 'string') {
+            andConditions.push({ _id: { $eq: idEq } });
         }
         const identifierEq = params.identifier?.$eq;
         if (typeof identifierEq === 'string') {
-            andConditions.push({
-                identifier: { $eq: identifierEq }
-            });
+            andConditions.push({ identifier: { $eq: identifierEq } });
         }
         const aboutIdentifierEq = params.about?.identifier?.$eq;
         if (typeof aboutIdentifierEq === 'string') {
-            andConditions.push({
-                'about.identifier': {
-                    $exists: true,
-                    $eq: aboutIdentifierEq
-                }
-            });
+            andConditions.push({ 'about.identifier': { $exists: true, $eq: aboutIdentifierEq } });
         }
         return andConditions;
     }
@@ -45,7 +52,7 @@ class EmailMessageRepo {
         }
         else {
             // 上書き禁止属性を除外(2022-08-24~)
-            const { id, identifier, project, typeOf, ...updateFields } = params; // eslint-disable-line @typescript-eslint/no-unused-vars
+            const { id: _id, identifier: _identifier, project: _project, typeOf: _typeOf, ...updateFields } = params;
             doc = await this.emailMessageModel.findOneAndUpdate({ _id: params.id }, updateFields, { upsert: false, new: true })
                 .exec();
         }
@@ -54,37 +61,20 @@ class EmailMessageRepo {
         }
         return doc.toObject();
     }
-    async findById(params) {
-        const doc = await this.emailMessageModel.findOne({ _id: params.id }, {
-            __v: 0,
-            createdAt: 0,
-            updatedAt: 0
-        })
-            .exec();
-        if (doc === null) {
-            throw new factory_1.factory.errors.NotFound(this.emailMessageModel.modelName);
-        }
-        return doc.toObject();
-    }
-    async search(params) {
+    async findEmailMessages(params) {
         const conditions = EmailMessageRepo.CREATE_MONGO_CONDITIONS(params);
-        const query = this.emailMessageModel.find({ $and: conditions }, {
-            __v: 0,
-            createdAt: 0,
-            updatedAt: 0
-        });
+        const query = this.emailMessageModel.find({ $and: conditions }, DEFAULT_PROJECTION);
         if (typeof params.limit === 'number' && params.limit > 0) {
             const page = (typeof params.page === 'number' && params.page > 0) ? params.page : 1;
             query.limit(params.limit)
                 .skip(params.limit * (page - 1));
         }
-        /* istanbul ignore else */
         if (params.sort !== undefined) {
             query.sort(params.sort);
         }
         return query.setOptions({ maxTimeMS: settings_1.MONGO_MAX_TIME_MS })
-            .exec()
-            .then((docs) => docs.map((doc) => doc.toObject()));
+            .lean()
+            .exec();
     }
     async deleteById(params) {
         await this.emailMessageModel.findOneAndDelete({ _id: { $eq: params.id } }, { projection: { _id: 1 } })

package/lib/chevre/repo/factory/acceptedOffer/reserveTransaction2itemOffered.d.ts

@@ -3,7 +3,5 @@ type IAcceptedOfferByReserveTransaction = Pick<factory.order.IOptimizedAcceptedO
 /**
  * 予約取引を注文のitemOfferedへ変換する
  */
-declare function reserveTransaction2itemOffered(params: Pick<factory.assetTransaction.reserve.ITransaction, 'object'>, options: {
-    noName: boolean;
-}): IAcceptedOfferByReserveTransaction[];
+declare function reserveTransaction2itemOffered(params: Pick<factory.assetTransaction.reserve.ITransaction, 'object'>): IAcceptedOfferByReserveTransaction[];
 export { IAcceptedOfferByReserveTransaction, reserveTransaction2itemOffered };

package/lib/chevre/repo/factory/acceptedOffer/reserveTransaction2itemOffered.js

@@ -38,8 +38,7 @@ function createReservedTicket(reservedTicket) {
 /**
  * 予約取引を注文のitemOfferedへ変換する
  */
-function reserveTransaction2itemOffered(params, options) {
-    const { noName } = options;
+function reserveTransaction2itemOffered(params) {
     const { object } = params;
     // subReservationは配列のはず
     if (!Array.isArray(object.subReservation)) {
@@ -70,7 +69,7 @@ function reserveTransaction2itemOffered(params, options) {
         return {
             itemOffered: reservationByReserveTransaction,
             ...((price !== undefined) && { priceSpecification: price }),
-            ...((!noName && reservedTicket.ticketType.name !== undefined) && { name: reservedTicket.ticketType.name })
+            // ...((!noName && reservedTicket.ticketType.name !== undefined) && { name: reservedTicket.ticketType.name }) // 完全廃止(2026-06-19~)
         };
     });
 }

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

@@ -1,7 +1,15 @@
 import { IndexDefinition, IndexOptions, Model, Schema, SchemaDefinition } from 'mongoose';
 import { IVirtuals } from '../virtuals';
 import { factory } from '../../../factory';
-type IDocType = factory.creativeWork.message.email.ICreativeWork;
+type IDocType = Pick<factory.creativeWork.message.email.ICreativeWork, 'identifier' | 'name' | 'project' | 'sender' | 'text' | 'typeOf'> & {
+    about: Pick<factory.creativeWork.message.email.IAbout, 'name' | 'typeOf'> & {
+        /**
+         * 現時点でOnEventStatusChangedしかサポートしていない
+         * 2026-06-18
+         */
+        identifier: factory.creativeWork.message.email.AboutIdentifier.OnEventStatusChanged;
+    };
+};
 type IModel = Model<IDocType, Record<string, never>, Record<string, never>, IVirtuals>;
 type ISchemaDefinition = SchemaDefinition<IDocType>;
 type ISchema = Schema<IDocType, IModel, Record<string, never>, Record<string, never>, IVirtuals, Record<string, never>, ISchemaDefinition, IDocType>;

package/lib/chevre/repo/mongoose/schemas/emailMessages.js

@@ -8,12 +8,9 @@ const settings_1 = require("../../../settings");
 const modelName = 'EmailMessage';
 exports.modelName = modelName;
 const schemaDefinition = {
-    project: mongoose_1.SchemaTypes.Mixed,
-    typeOf: {
-        type: String,
-        required: true
-    },
-    identifier: String,
+    project: { type: mongoose_1.SchemaTypes.Mixed, required: true },
+    typeOf: { type: String, required: true },
+    identifier: { type: String, required: true },
     name: mongoose_1.SchemaTypes.Mixed,
     about: mongoose_1.SchemaTypes.Mixed,
     sender: mongoose_1.SchemaTypes.Mixed,
@@ -54,25 +51,13 @@ function createSchema() {
     return schema;
 }
 const indexes = [
-    // [ // discontinue(2024-08-07~)
-    //     { createdAt: 1 },
-    //     { name: 'searchByCreatedAt' }
-    // ],
-    // [
-    //     { updatedAt: 1 },
-    //     { name: 'searchByUpdatedAt' }
-    // ],
     [
         { identifier: 1 },
-        {
-            name: 'searchByIdentifier'
-        }
+        { name: 'searchByIdentifier' }
     ],
     [
         { 'project.id': 1, identifier: 1 },
-        {
-            name: 'searchByProjectId'
-        }
+        { name: 'searchByProjectId' }
     ]
 ];
 exports.indexes = indexes;