@chevre/domain 25.0.0-alpha.4 → 25.0.0-alpha.5

package/lib/chevre/emailMessageBuilder.d.ts

@@ -4,14 +4,18 @@ 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 IPlacingOrderAsCreateEmailParams = Pick<factory.order.IOrder, 'orderNumber' | 'confirmationNumber' | 'customer' | 'price' | 'seller'>;
+type IOrderAsCreateEmailParams = Pick<factory.order.IOrder, 'confirmationNumber' | 'customer' | 'orderDate' | 'orderNumber' | 'orderStatus' | 'orderedItem' | 'paymentMethods' | 'price' | 'priceCurrency' | 'seller' | 'typeOf'>;
 /**
  * 注文配送メッセージを作成する
  */
 declare function createSendOrderMessage(params: {
-    order: IOrderAsCreateEmailParams;
+    order: IPlacingOrderAsCreateEmailParams;
     email?: factory.creativeWork.message.email.ICustomization;
-    emailMessage?: factory.creativeWork.message.email.ICreativeWork;
+    emailMessage?: never;
     index: number;
 }, setting: Pick<ISetting, 'defaultSenderEmail'>): Promise<ISendableEmailMessage>;
 /**
@@ -20,7 +24,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 +35,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, IPlacingOrderAsCreateEmailParams };

package/lib/chevre/emailMessageBuilder.js

@@ -12,7 +12,7 @@ const factory_1 = require("./factory");
 async function createEmailMessageText(params) {
     const emailTemplate = params.email?.template;
     const emailText = params.email?.text;
-    const emailMessageTextByDB = params.emailMessage?.text;
+    // const emailMessageTextByDB = params.emailMessage?.text;
     let emailMessageText;
     if (typeof emailText === 'string') {
         emailMessageText = emailText;
@@ -27,18 +27,21 @@ async function createEmailMessageText(params) {
                 resolve(message);
             });
         });
-    }
-    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 if (typeof emailMessageTextByDB === 'string') {
+        //     // デフォルトEメールメッセージを適用する
+        //     emailMessageText = await new Promise<string>((resolve, reject) => {
+        //         render(
+        //             emailMessageTextByDB,
+        //             { order: params.order },
+        //             (err, message) => {
+        //                 if (err instanceof Error) {
+        //                     reject(new factory.errors.Argument('emailMessage.text', err.message));
+        //                     return;
+        //                 }
+        //                 resolve(message);
+        //             }
+        //         );
+        //     });
     }
     else {
         emailMessageText = `orderNumber: ${params.order.orderNumber}`;
@@ -46,8 +49,8 @@ async function createEmailMessageText(params) {
     return emailMessageText;
 }
 async function createEmailMessageAbout(params) {
-    const abouyIdentifierByDB = params.emailMessage?.about.identifier;
-    const abouyNameByDB = params.emailMessage?.about.name;
+    // const abouyIdentifierByDB = params.emailMessage?.about.identifier;
+    // const abouyNameByDB = params.emailMessage?.about.name;
     let about;
     if (typeof params.email?.about === 'string') {
         // aboutをStringで指定された場合
@@ -65,23 +68,26 @@ async function createEmailMessageAbout(params) {
             identifier: params.email.about.identifier,
             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 if (typeof abouyIdentifierByDB === 'string' && typeof abouyNameByDB === 'string') {
+        //     // デフォルトEメールメッセージを適用する
+        //     const aboutName = await new Promise<string>((resolve, reject) => {
+        //         render(
+        //             abouyNameByDB,
+        //             { order: params.order },
+        //             (err, message) => {
+        //                 if (err instanceof Error) {
+        //                     reject(new factory.errors.Argument('emailMessage.about.name', err.message));
+        //                     return;
+        //                 }
+        //                 resolve(message);
+        //             }
+        //         );
+        //     });
+        //     about = {
+        //         typeOf: 'Thing',
+        //         identifier: abouyIdentifierByDB,
+        //         name: aboutName
+        //     };
     }
     else {
         // aboutの指定がない場合
@@ -115,12 +121,12 @@ async function createSendOrderMessage(params, setting) {
     const emailMessageText = await createEmailMessageText({
         order: params.order,
         email: params.email,
-        emailMessage: params.emailMessage
+        // emailMessage: params.emailMessage
     });
     const about = await createEmailMessageAbout({
-        order: params.order,
+        // order: params.order,
         email: params.email,
-        emailMessage: params.emailMessage,
+        // emailMessage: params.emailMessage,
         aboutIdentifier: factory_1.factory.creativeWork.message.email.AboutIdentifier.OnOrderSent,
         defaultName: 'Order Delivered'
     });
@@ -169,12 +175,12 @@ async function createReturnOrderMessage(params, setting) {
     const emailMessageText = await createEmailMessageText({
         order: params.order,
         email: params.email,
-        emailMessage: params.emailMessage
+        // emailMessage: params.emailMessage
     });
     const about = await createEmailMessageAbout({
-        order: params.order,
+        // order: params.order,
         email: params.email,
-        emailMessage: params.emailMessage,
+        // emailMessage: params.emailMessage,
         aboutIdentifier: factory_1.factory.creativeWork.message.email.AboutIdentifier.OnOrderReturned,
         defaultName: 'Order Returned'
     });
@@ -225,7 +231,7 @@ async function createRefundMessage(params, setting) {
         email: params.email
     });
     const about = await createEmailMessageAbout({
-        order: params.order,
+        // order: params.order,
         email: params.email,
         aboutIdentifier: factory_1.factory.creativeWork.message.email.AboutIdentifier.OnOrderRefunded,
         defaultName: 'Refunded'

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/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/orderInTransaction.js

@@ -38,7 +38,7 @@ class OrderInTransactionRepo extends acceptedOfferInReserve_1.AcceptedOfferInRes
         let acceptedOffersByReserveTransaction = [];
         const reservationNumbers = [...new Set(doc.acceptedOffers.map((aceptedOffer) => aceptedOffer.itemOffered.reservationNumber))];
         if (reservationNumbers.length > 0) {
-            acceptedOffersByReserveTransaction = await this.findAcceptedOffersByReservationNumbers({ reservationNumbers }, { noName: true });
+            acceptedOffersByReserveTransaction = await this.findAcceptedOffersByReservationNumbers({ reservationNumbers });
         }
         return doc.acceptedOffers.map((acceptedOffer) => {
             const acceptedOfferByReserve = acceptedOffersByReserveTransaction.find((acceptedOfferByReserveTransaction) => acceptedOfferByReserveTransaction.itemOffered.id === acceptedOffer.itemOffered.id);

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

@@ -93,7 +93,7 @@ function deleteReservationsByOrder(order) {
         const acceptedOffers = await repos.acceptedOffer.searchAcceptedOffersByOrderNumber({
             orderNumber: { $eq: order.orderNumber },
             project: { id: { $eq: order.project.id } },
-        }, { noName: true });
+        });
         const reservationIds = acceptedOffers.map((o) => String(o.itemOffered.id));
         if (reservationIds.length > 0) {
             await repos.reservation.deleteByIds({ project: { id: order.project.id }, ids: reservationIds });

package/lib/chevre/service/reserve/findByCode.js

@@ -39,7 +39,7 @@ function findByCode(params) {
                                 // typeOf?: { $in?: factory.order.IItemOffered['typeOf'][] };
                             }
                         }
-                    }, { noName: true })).shift();
+                    })).shift();
                     if (acceptedOffer === undefined) {
                         throw new factory_1.factory.errors.NotFound('acceptedOffer');
                     }

package/lib/chevre/service/reserve/searchByOrder.js

@@ -16,7 +16,7 @@ function searchByOrder(params) {
                 // typeOf: { $in: [reservationType] }
                 }
             }
-        }, { noName: true });
+        });
         const reservationIds = acceptedOffers.map((offer) => {
             if (offer.itemOffered.typeOf === reservationType) {
                 return offer.itemOffered.id;

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

@@ -139,7 +139,7 @@ function fixOrderAsPurpose(params) {
         const acceptedOffers = await repos.acceptedOffer.searchAcceptedOffersByOrderNumber({
             orderNumber: { $eq: order.orderNumber },
             project: { id: { $eq: params.project.id } }
-        }, { noName: true });
+        });
         return {
             ...order,
             acceptedOffers

package/lib/chevre/service/task/payment/payByTask.js

@@ -76,7 +76,7 @@ function fixOrderAsPurpose(params, transaction) {
                     // reservedTicket: { ticketedSeat: { seatNumber: { $in: seatNumbers } } } // 座席番号による絞りは廃止(2026-06-01~)
                     }
                 }
-            }, { noName: true });
+            });
         }
         return {
             ...orderWithoutAcceptedOffers,

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

@@ -9,11 +9,15 @@ async function createSendEmailMessageActions(params, setting) {
     const sendEmailMessageActions = [];
     const sendEmailMessageOnOrderSentParams = params.potentialActions?.order?.potentialActions?.sendOrder?.potentialActions?.sendEmailMessage;
     if (Array.isArray(sendEmailMessageOnOrderSentParams)) {
+        // pugテンプレートに渡す変数を最小化(2026-06-19~)
         const orderAsCreateEmailParams = {
-            ...params.order,
+            // ...params.order,
+            // paymentMethods: params.paymentMethods
             customer: params.customer,
             seller: params.seller,
-            paymentMethods: params.paymentMethods
+            orderNumber: params.order.orderNumber,
+            confirmationNumber: params.order.confirmationNumber,
+            price: params.order.price
         };
         await Promise.all(sendEmailMessageOnOrderSentParams.map(async (s, index) => {
             const emailMessage = await (0, emailMessageBuilder_1.createSendOrderMessage)({

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

@@ -144,7 +144,7 @@ function fixOrders(params) {
         const acceptedOffers = await repos.acceptedOffer.searchAcceptedOffersByOrderNumber({
             orderNumber: { $eq: params.object.order[0].orderNumber },
             project: { id: { $eq: params.project.id } }
-        }, { noName: true });
+        });
         return { acceptedOffers, eventIds, offerIds, orders };
     };
 }

package/lib/chevre/service/validation/validateOrder.js

@@ -22,7 +22,7 @@ function validateOrder(params) {
         const acceptedOffers = await repos.acceptedOffer.searchAcceptedOffersByOrderNumber({
             orderNumber: { $eq: params.orderNumber },
             project: { id: { $eq: params.project.id } }
-        }, { noName: true });
+        });
         let payTransactions = [];
         if (order.paymentMethods.length > 0) {
             payTransactions = await repos.assetTransaction.search({

package/package.json

@@ -11,7 +11,7 @@
   "dependencies": {
     "@aws-sdk/client-cognito-identity-provider": "3.600.0",
     "@aws-sdk/credential-providers": "3.600.0",
-    "@chevre/factory": "9.0.0-alpha.1",
+    "@chevre/factory": "9.0.0-alpha.2",
     "@motionpicture/coa-service": "10.0.0",
     "@motionpicture/gmo-service": "6.1.0-alpha.0",
     "@sendgrid/client": "8.1.4",
@@ -91,5 +91,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build"
   },
-  "version": "25.0.0-alpha.4"
+  "version": "25.0.0-alpha.5"
 }