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

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

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.issueOrderNumberIfNotExist = issueOrderNumberIfNotExist;
 const factory_1 = require("../../../factory");
+// const USE_LEGACY_ISSUE_ORDER_NUMBER = process.env.USE_LEGACY_ISSUE_ORDER_NUMBER === '1';
 /**
  * 未発行であれば、注文番号を発行して取引に保管する
  */

package/lib/chevre/service/transaction/placeOrder/start/factory.d.ts

@@ -6,14 +6,29 @@ type IVerifiedPassport = factory.waiter.passport.IPassport & {
      */
     identifier: string;
 };
-type IStartPlaceOrderParams = factory.transaction.placeOrder.IStartParamsWithoutDetail & {
-    object: factory.transaction.placeOrder.IStartParamsWithoutDetail['object'] & {
+type ICustomerInObject = Pick<factory.order.ICustomer, 'id' | 'identifier' | 'typeOf'>;
+interface IStartPlaceOrderParams {
+    project: Pick<factory.project.IProject, 'id' | 'typeOf'>;
+    agent: factory.transaction.placeOrder.IAgent;
+    seller: {
+        id: string;
+    };
+    object: {
         /**
          * api経由で取引が開始されれば必ず存在するはず
          */
         clientUser: factory.transaction.placeOrder.IClientUserBeforeStart;
+        /**
+         * 注文ドキュメントに保管するcustomer
+         */
+        customer?: ICustomerInObject;
+        passport?: factory.transaction.IPassportBeforeStart;
+        name?: never;
     };
+    /**
+     * 注文ドキュメントに保管する代理人
+     */
     broker?: factory.order.IBroker;
-};
-declare function createStartParams(params: IStartPlaceOrderParams, expiresInSeconds: number, passport: IVerifiedPassport | undefined, seller: Pick<factory.seller.ISeller, 'id' | 'name' | 'typeOf' | 'project' | 'additionalProperty'>, customerType?: string): factory.transaction.placeOrder.IStartParams;
+}
+declare function createStartParams(params: IStartPlaceOrderParams, expiresInSeconds: number, passport: IVerifiedPassport | undefined, seller: Pick<factory.seller.ISeller, 'id' | 'name' | 'typeOf' | 'project'>, customerType?: string): factory.transaction.placeOrder.IStartParams;
 export { AGENT_IDENTIFIER_NAME_PASSPORT, createStartParams, IStartPlaceOrderParams };

package/lib/chevre/service/transaction/placeOrder/start/factory.js

@@ -5,10 +5,9 @@ exports.createStartParams = createStartParams;
 const factory_1 = require("../../../../factory");
 const AGENT_IDENTIFIER_NAME_PASSPORT = 'passport';
 exports.AGENT_IDENTIFIER_NAME_PASSPORT = AGENT_IDENTIFIER_NAME_PASSPORT;
-function createStartParams(params, expiresInSeconds, passport, seller, 
-// broker?: factory.order.IBroker,
-customerType) {
-    const { broker } = params;
+;
+function createStartParams(params, expiresInSeconds, passport, seller, customerType) {
+    // const { broker } = params;
     // let clientUser: Omit<factory.clientUser.IClientUser, 'scope' | 'scopes'> | undefined;
     let instrument;
     if (typeof params.object.clientUser?.client_id === 'string') {
@@ -21,8 +20,8 @@ customerType) {
         // ...(typeof passport?.scope === 'string') ? { passport } : undefined, // discontinue(2026-06-10~)
         // ...(typeof clientUser?.client_id === 'string') ? { clientUser } : undefined, // discontinue(2026-06-10~)
         // ...(typeof params.object?.name === 'string') ? { name: params.object?.name } : undefined, // discontinue(2026-06-11~)
-        ...(typeof broker?.typeOf === 'string') ? { broker: broker } : undefined,
-        ...(typeof params.object.customer?.typeOf === 'string') ? { customer: params.object.customer } : undefined,
+        // ...(typeof broker?.typeOf === 'string') ? { broker: broker } : undefined, // discontinue(2026-06-22~)
+        // ...(!minimizeStartPlaceOrderParams && typeof params.object.customer?.typeOf === 'string') ? { customer: params.object.customer } : undefined, // discontinue(2026-06-26~)
         ...(typeof customerType === 'string') ? { customerType } : undefined
     };
     if (typeof seller.id !== 'string') {
@@ -41,16 +40,28 @@ customerType) {
         // ...(memeberOfPayload !== undefined) ? { memeberOfPayload } : undefined, // discontinue(2026-06-10~)
         identifier: agentIdentifier
     };
+    const sellerOfPlaceOrder = {
+        id: seller.id,
+        name: { ja: String(seller.name.ja) },
+        typeOf: seller.typeOf
+    };
     return {
         project: { typeOf: seller.project.typeOf, id: seller.project.id },
         typeOf: factory_1.factory.transactionType.PlaceOrder,
         agent,
-        seller: {
-            id: seller.id,
-            name: seller.name,
-            typeOf: seller.typeOf,
-            additionalProperty: (Array.isArray(seller.additionalProperty)) ? seller.additionalProperty : [] // 追加特性を追加(2023-08-08~)
-        },
+        seller: sellerOfPlaceOrder, // sellerを最小化(2026-06-26~)
+        // seller: (minimizeStartPlaceOrderParams)
+        //     ? {
+        //         id: seller.id,
+        //         name: { ja: String(seller.name.ja) },
+        //         typeOf: seller.typeOf
+        //     }
+        //     : {
+        //         id: seller.id,
+        //         name: seller.name,
+        //         typeOf: seller.typeOf,
+        //         additionalProperty: (Array.isArray(seller.additionalProperty)) ? seller.additionalProperty : [] // 追加特性を追加(2023-08-08~)
+        //     },
         object: transactionObject,
         expiresInSeconds,
         ...(typeof instrument?.id === 'string') ? { instrument } : undefined

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

@@ -1,7 +1,10 @@
 import type { IssuerRepo } from '../../../repo/issuer';
 import type { MemberRepo } from '../../../repo/member';
 import type { MemberProgramRepo } from '../../../repo/memberProgram';
+import type { OrderInTransactionRepo } from '../../../repo/orderInTransaction';
+import type { OrderNumberRepo } from '../../../repo/orderNumber';
 import type { PassportRepo } from '../../../repo/passport';
+import type { ProjectRepo } from '../../../repo/project';
 import type { ProjectMakesOfferRepo } from '../../../repo/projectMakesOffer';
 import type { SellerRepo } from '../../../repo/seller';
 import type { IStartedPlaceOrder, PlaceOrderRepo } from '../../../repo/transaction/placeOrder';
@@ -14,13 +17,13 @@ interface IStartOperationRepos {
     projectMakesOffer: ProjectMakesOfferRepo;
     seller: SellerRepo;
     placeOrder: PlaceOrderRepo;
+    orderInTransaction: OrderInTransactionRepo;
+    project: ProjectRepo;
+    orderNumber: OrderNumberRepo;
 }
 type IStartOperation<T> = (repos: IStartOperationRepos) => Promise<T>;
-interface IStartOptions {
-    lockPassport: boolean;
-}
 /**
  * 取引開始
  */
-declare function start(params: IStartPlaceOrderParams, options: IStartOptions): IStartOperation<IStartedPlaceOrder>;
+declare function start(params: IStartPlaceOrderParams): IStartOperation<IStartedPlaceOrder>;
 export { start, IStartPlaceOrderParams };

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

@@ -4,10 +4,11 @@ exports.start = start;
 const factory_1 = require("../../../factory");
 const factory_2 = require("./start/factory");
 const validateStartRequest_1 = require("./start/validateStartRequest");
+const issueOrderNumberIfNotExist_1 = require("./issueOrderNumberIfNotExist");
 /**
  * 取引開始
  */
-function start(params, options) {
+function start(params) {
     return async (repos) => {
         const { passport, customerType } = await repos.passport.validatePassportTokenIfExist(params);
         const { sellerMakesOffer, seller } = await (0, validateStartRequest_1.validateStartRequest)({
@@ -25,7 +26,7 @@ function start(params, options) {
         const startParams = (0, factory_2.createStartParams)(params, expiresInSeconds, passport, seller, customerType);
         let transaction;
         // lock passport(2024-07-05~)
-        if (options.lockPassport && passport !== undefined) {
+        if (passport !== undefined) {
             try {
                 await repos.passport.lock(passport);
             }
@@ -51,6 +52,26 @@ function start(params, options) {
         if (transaction === undefined) {
             transaction = await repos.placeOrder.startPlaceOrder(startParams);
         }
+        // support createOrderDocument(2026-06-23~)
+        const orderNumber = await (0, issueOrderNumberIfNotExist_1.issueOrderNumberIfNotExist)({
+            project: { id: params.project.id },
+            id: transaction.id,
+            object: { orderDate: new Date() }
+        })(repos);
+        await repos.orderInTransaction.createPlaceOrderIfNotExists({
+            orderNumber,
+            project: { id: params.project.id, typeOf: factory_1.factory.organizationType.Project },
+            identifier: transaction.id,
+            seller: {
+                id: seller.id,
+                name: (typeof seller.name === 'string') ? seller.name : String(seller.name?.ja),
+                typeOf: seller.typeOf,
+                additionalProperty: (Array.isArray(seller.additionalProperty)) ? seller.additionalProperty : [] // 追加特性を追加(2023-08-08~)
+            },
+            ...((typeof params.object.customer?.typeOf === 'string') && { customer: params.object.customer }),
+            ...((typeof params.broker?.typeOf === 'string') && { broker: params.broker })
+        });
+        // console.log('createPlaceOrderResult:', createPlaceOrderResult);
         return transaction;
     };
 }

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

@@ -1,7 +1,5 @@
 import { factory } from '../../../factory';
 import type { OrderInTransactionRepo } from '../../../repo/orderInTransaction';
-import type { OrderNumberRepo } from '../../../repo/orderNumber';
-import type { ProjectRepo } from '../../../repo/project';
 import type { PlaceOrderRepo } from '../../../repo/transaction/placeOrder';
 /**
  * 取引人プロフィール更新
@@ -17,7 +15,5 @@ export declare function updateAgent(params: {
     };
 }): (repos: {
     orderInTransaction: OrderInTransactionRepo;
-    orderNumber: OrderNumberRepo;
-    project: ProjectRepo;
     placeOrder: PlaceOrderRepo;
 }) => Promise<void>;

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

@@ -3,8 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.updateAgent = updateAgent;
 const google_libphonenumber_1 = require("google-libphonenumber");
 const factory_1 = require("../../../factory");
-const issueOrderNumberIfNotExist_1 = require("./issueOrderNumberIfNotExist");
-// export type ITransactionOperation<T> = (repos: { transaction: TransactionRepo }) => Promise<T>;
 function fixCustomer(params) {
     return async (repos) => {
         let formattedTelephone;
@@ -20,7 +18,7 @@ function fixCustomer(params) {
             throw new factory_1.factory.errors.Argument('telephone', (error instanceof Error) ? error.message : String(error));
         }
         const transaction = await repos.placeOrder.findPlaceOrderInProgressById({
-            typeOf: params.typeOf,
+            typeOf: factory_1.factory.transactionType.PlaceOrder,
             id: params.id
         }, ['agent', 'object', 'typeOf', 'project']);
         if (transaction.agent.id !== params.agent.id) {
@@ -29,20 +27,20 @@ function fixCustomer(params) {
         // 注文取引の場合、object.customerにも適用
         let customer;
         if (transaction.typeOf === factory_1.factory.transactionType.PlaceOrder) {
-            // いったんtransaction.object.customer?.typeOfは取引開始時にセットされている前提
-            const trasactionObject = transaction.object;
-            if (typeof trasactionObject.customer?.typeOf === 'string') {
+            // orderInTransaction.customer?.typeOfは取引開始時にセットされている前提で再実装(2026-06-24~)
+            const customerByTransaction = await repos.orderInTransaction.findCustomerByOrderIdentifier({
+                identifier: params.id,
+                // project: { id: transaction.project.id }
+            });
+            // // いったんtransaction.object.customer?.typeOfは取引開始時にセットされている前提
+            // const customerByTransaction = transaction.object.customer;
+            if (typeof customerByTransaction?.typeOf === 'string') {
                 customer = {
-                    typeOf: trasactionObject.customer.typeOf,
-                    id: trasactionObject.customer.id,
-                    ...(Array.isArray(trasactionObject.customer.identifier))
-                        ? { identifier: trasactionObject.customer.identifier }
+                    typeOf: customerByTransaction.typeOf,
+                    id: customerByTransaction.id,
+                    ...(Array.isArray(customerByTransaction.identifier))
+                        ? { identifier: customerByTransaction.identifier }
                         : /* istanbul ignore next */ undefined,
-                    // discontinue(2024-05-16~)
-                    // ...(transaction.object.customer.typeOf === factory.personType.Person
-                    //     && typeof transaction.object.customer.memberOf?.typeOf === 'string')
-                    //     ? { memberOf: transaction.object.customer.memberOf }
-                    //     : undefined,
                     ...(Array.isArray(params.agent.additionalProperty))
                         ? { additionalProperty: params.agent.additionalProperty }
                         : /* istanbul ignore next */ undefined,
@@ -75,11 +73,11 @@ function updateAgent(params) {
         const { customer, transaction } = await fixCustomer(params)(repos);
         // also save in orderInTransaction(2024-06-20~)
         if (customer !== undefined) {
-            const orderNumber = await (0, issueOrderNumberIfNotExist_1.issueOrderNumberIfNotExist)({
-                project: { id: transaction.project.id },
-                id: params.id,
-                object: { orderDate: new Date() }
-            })(repos);
+            // // 注文ドキュメントを参照(2026-06-24~)
+            // const orderNumber = await repos.orderInTransaction.findOrderNumberByIdentifier({
+            //     identifier: params.id,
+            //     project: { id: transaction.project.id },
+            // }, { onlyPlaceOrder: true });
             const customerName = (typeof customer.name === 'string' && customer.name !== '')
                 ? customer.name
                 : (typeof customer.givenName === 'string' && typeof customer.familyName === 'string'
@@ -91,9 +89,9 @@ function updateAgent(params) {
                 identifier: (Array.isArray(customer.identifier)) ? customer.identifier : [],
                 ...(typeof customerName === 'string') ? { name: customerName } : undefined
             };
-            await repos.orderInTransaction.setCustomer({
-                orderNumber,
+            await repos.orderInTransaction.setCustomerByIdentifier({
                 project: transaction.project,
+                identifier: params.id,
                 customer: customerInOrder
             });
         }

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

@@ -1,9 +1,8 @@
 /**
  * 注文取引サービス
  */
-import { POINT_AWARD_IDENTIFIER_NAME } from '../../factory/order';
 import { confirm } from './placeOrder/confirm';
 import { exportTasksById } from './placeOrder/exportTasksById';
 import { start, IStartPlaceOrderParams } from './placeOrder/start';
 import { updateAgent } from './placeOrder/updateAgent';
-export { confirm, POINT_AWARD_IDENTIFIER_NAME, start, IStartPlaceOrderParams, exportTasksById, updateAgent };
+export { confirm, start, IStartPlaceOrderParams, exportTasksById, updateAgent };

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

@@ -1,11 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.updateAgent = exports.exportTasksById = exports.start = exports.POINT_AWARD_IDENTIFIER_NAME = exports.confirm = void 0;
+exports.updateAgent = exports.exportTasksById = exports.start = exports.confirm = void 0;
 /**
  * 注文取引サービス
  */
-const order_1 = require("../../factory/order");
-Object.defineProperty(exports, "POINT_AWARD_IDENTIFIER_NAME", { enumerable: true, get: function () { return order_1.POINT_AWARD_IDENTIFIER_NAME; } });
 const confirm_1 = require("./placeOrder/confirm");
 Object.defineProperty(exports, "confirm", { enumerable: true, get: function () { return confirm_1.confirm; } });
 const exportTasksById_1 = require("./placeOrder/exportTasksById");

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

@@ -3,9 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.createReturnPaymentMethodActions = createReturnPaymentMethodActions;
 const emailMessageBuilder_1 = require("../../../../emailMessageBuilder");
 const factory_1 = require("../../../../factory");
-async function createReturnInvoicePotentialActions(params, 
-// settings: Settings
-setting) {
+async function createReturnInvoicePotentialActions(params, setting) {
     const order = params.order;
     const emailMessagesOnReturnEachPaymentMethodId = [];
     const sendEmailMessageOnRefund = [];
@@ -32,21 +30,10 @@ setting) {
         }, setting);
         emailMessagesOnReturnEachPaymentMethodId.push(emailMessage);
         sendEmailMessageOnRefund.push({
-            // project: order.project, // discontinue(2024-06-26~)
-            // typeOf: factory.actionType.SendAction, // discontinue(2024-06-26~)
-            // standardize object(2024-06-27~)
-            // object: emailMessage
             object: {
                 identifier: emailMessage.identifier,
                 typeOf: factory_1.factory.creativeWorkType.EmailMessage
             }
-            // agent: order.project, // discontinue(2024-06-26~)
-            // recipient: { // discontinue(2024-06-26~)
-            //     typeOf: order.customer.typeOf,
-            //     id: order.customer.id
-            // },
-            // potentialActions: {}, // discontinue(2024-06-25~)
-            // purpose: sendActionPurpose // discontinue(2024-06-26~)
         });
     }
     return {
@@ -56,18 +43,9 @@ setting) {
         }
     };
 }
-async function createReturnPaymentMethodActions(params, 
-// settings: Settings
-setting) {
+async function createReturnPaymentMethodActions(params, setting) {
     const emailMessagesOnReturnInvoice = [];
     const potentialReturnInvoiceActions = [];
-    // const returnPaymentMethodPurpose: factory.order.ISimpleOrder = {
-    //     typeOf: order.typeOf,
-    //     orderNumber: order.orderNumber,
-    //     price: order.price,
-    //     priceCurrency: order.priceCurrency,
-    //     orderDate: order.orderDate
-    // };
     // MovieTicket決済以外について返品ポリシーのreturnFeesを適用する(2022-08-10~)
     const returnFees = params.transaction.object.returnPolicy.returnFees;
     // ReturnFeesCustomerResponsibilityであれば返金はなし、それ以外は返金する
@@ -95,19 +73,6 @@ setting) {
                 };
                 // optimize(2024-06-19~)
                 return { object, potentialActions: potentialActionsOnRefund };
-                // return {
-                //     project: order.project,
-                //     typeOf: factory.actionType.ReturnAction,
-                //     object,
-                //     agent: order.project,
-                //     recipient: {
-                //         typeOf: order.customer.typeOf,
-                //         id: order.customer.id,
-                //         name: String(order.customer.name)
-                //     },
-                //     purpose: returnPaymentMethodPurpose,
-                //     potentialActions: potentialActionsOnRefund
-                // };
             })));
     }
     // 決済カード決済について

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

@@ -1,10 +1,10 @@
+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: Pick<factory.order.IOrder, 'confirmationNumber' | 'customer' | 'orderDate' | 'orderNumber' | 'orderStatus' | 'orderedItem' | 'paymentMethods' | 'price' | 'priceCurrency' | 'seller' | 'typeOf'>;
+    order: IOrderAsCreateEmailParams;
     returnOrderActionParams?: factory.transaction.returnOrder.IReturnOrderActionParams;
-    emailMessageOnOrderReturned?: factory.creativeWork.message.email.ICreativeWork;
 }, setting: Pick<ISetting, 'defaultSenderEmail'>): Promise<{
     emailMessagesOnReturn: factory.action.transfer.send.message.email.IObjectAsEmailMessage[];
     sendEmailMessaegActionsOnReturn: IPotentialSendEmailMessageAction[];

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

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

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

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

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

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

package/lib/chevre/service/transaction/returnOrder/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/transaction/returnOrder.d.ts

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

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

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

package/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/lib/chevre/service.d.ts

@@ -3,7 +3,6 @@
  */
 import * as AccountTransactionIdentifierFactory from './factory/accountTransactionIdentifier';
 import * as EventFactory from './factory/event';
-import * as OrderFactory from './factory/order';
 import * as ReservedAgentIdentifireNamesFactory from './factory/reservedAgentIdentifireNames';
 import * as TaskIdentifierFactory from './factory/taskIdentifier';
 import * as TransactionFactory from './factory/transaction';
@@ -60,7 +59,6 @@ export declare namespace transaction {
 export declare namespace factory {
     export import accountTransactionIdentifier = AccountTransactionIdentifierFactory;
     export import event = EventFactory;
-    export import order = OrderFactory;
     export import reservedAgentIdentifireNames = ReservedAgentIdentifireNamesFactory;
     export import taskIdentifier = TaskIdentifierFactory;
     export import transaction = TransactionFactory;

package/lib/chevre/service.js

@@ -40,7 +40,6 @@ exports.factory = exports.transaction = exports.task = exports.reserve = exports
  */
 const AccountTransactionIdentifierFactory = __importStar(require("./factory/accountTransactionIdentifier"));
 const EventFactory = __importStar(require("./factory/event"));
-const OrderFactory = __importStar(require("./factory/order"));
 const ReservedAgentIdentifireNamesFactory = __importStar(require("./factory/reservedAgentIdentifireNames"));
 const TaskIdentifierFactory = __importStar(require("./factory/taskIdentifier"));
 const TransactionFactory = __importStar(require("./factory/transaction"));
@@ -183,7 +182,6 @@ var factory;
 (function (factory) {
     factory.accountTransactionIdentifier = AccountTransactionIdentifierFactory;
     factory.event = EventFactory;
-    factory.order = OrderFactory;
     factory.reservedAgentIdentifireNames = ReservedAgentIdentifireNamesFactory;
     factory.taskIdentifier = TaskIdentifierFactory;
     factory.transaction = TransactionFactory;

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",
     "@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.2"
+  "version": "25.0.0-alpha.20"
 }

package/lib/chevre/factory/order.d.ts

@@ -1,2 +0,0 @@
-export declare const POINT_AWARD_IDENTIFIER_NAME = "pointAwardIdentifiers";
-export declare const AWARD_ACCOUNTS_IDENTIFIER_NAME = "awardAccounts";

package/lib/chevre/factory/order.js

@@ -1,5 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.AWARD_ACCOUNTS_IDENTIFIER_NAME = exports.POINT_AWARD_IDENTIFIER_NAME = void 0;
-exports.POINT_AWARD_IDENTIFIER_NAME = 'pointAwardIdentifiers';
-exports.AWARD_ACCOUNTS_IDENTIFIER_NAME = 'awardAccounts';

package/lib/chevre/service/order/placeOrderWithoutTransaction.d.ts

@@ -1,22 +0,0 @@
-import type { AccountingReportRepo } from '../../repo/accountingReport';
-import type { ActionRepo } from '../../repo/action';
-import type { OrderRepo } from '../../repo/order';
-import type { TaskRepo } from '../../repo/task';
-import { factory } from '../../factory';
-import { IExternalOrder } from './onOrderStatusChanged';
-/**
- * 注文取引なしに注文を作成する
- */
-declare function placeOrderWithoutTransaction(params: {
-    agent?: factory.action.trade.order.IAgent;
-    project: {
-        id: string;
-    };
-    object: IExternalOrder;
-}): (repos: {
-    accountingReport: AccountingReportRepo;
-    action: ActionRepo;
-    order: OrderRepo;
-    task: TaskRepo;
-}) => Promise<void>;
-export { placeOrderWithoutTransaction };