@chevre/domain 24.1.0-alpha.8 → 25.0.0-alpha.0

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

@@ -2,30 +2,20 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createOrderAsResult = createOrderAsResult;
 const factory_1 = require("../../../../../factory");
-// import { acceptedOffers2orderedItem } from './result/orderedItem';
 /**
  * 注文取引結果としての注文を生成する
  */
 function createOrderAsResult(params) {
-    const { orderDate, orderNumber, orderStatus, price } = params;
+    const { orderDate, orderNumber, price } = params;
     return {
-        typeOf: factory_1.factory.order.OrderType.Order,
-        price,
-        priceCurrency: factory_1.factory.priceCurrency.JPY,
-        // discounts: discounts, // 廃止(2024-04-16~)
         confirmationNumber: '',
         orderNumber,
-        url: '',
-        orderStatus,
         orderDate,
-        identifier: []
-        // orderedItem: params.orderedItem, // discontinue(2024-06-20~)
-        // paymentMethods: params.paymentMethods, // discontinue(2024-06-20~)
-        // customer, // discontinue(2024-06-20~)
-        // project: params.transaction.project, // discontinue(2024-06-20~)
-        // seller, // discontinue(2024-06-20~)
-        // isGift: params.isGift, // discontinue(2024-06-20~)
-        // ...(typeof name === 'string') ? { name } : undefined, // discontinue(2024-06-20~)
-        // ...(typeof broker?.typeOf === 'string') ? { broker } : undefined // discontinue(2024-06-20~)
+        typeOf: factory_1.factory.order.OrderType.Order,
+        price,
+        priceCurrency: factory_1.factory.priceCurrency.JPY,
+        orderStatus: factory_1.factory.orderStatus.OrderPaymentDue // 注文作成時のステータスとなる
+        // url: '', // discontinue(2026-06-11~)
+        // identifier: [] // discontinue(2026-06-11~)
     };
 }

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

@@ -1,7 +1,13 @@
 import { factory } from '../../../../../factory';
 import type { ISetting } from '../../../../../repo/setting';
 export declare function createSendEmailMessageActions(params: {
-    order: factory.transaction.placeOrder.IOrderAsResult;
+    order: factory.transaction.placeOrder.IOrderAsResult & {
+        confirmationNumber: string;
+        orderStatus: factory.orderStatus;
+        price: number;
+        priceCurrency: factory.priceCurrency;
+        typeOf: factory.order.OrderType;
+    };
     customer: factory.order.ICustomer;
     seller: factory.order.ISeller;
     paymentMethods: factory.order.IReferencedInvoice[];

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

@@ -3,7 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.createSendEmailMessageActions = createSendEmailMessageActions;
 const emailMessageBuilder_1 = require("../../../../../emailMessageBuilder");
 const factory_1 = require("../../../../../factory");
-// import { Settings } from '../../../../../settings';
 async function createSendEmailMessageActions(params, 
 // settings: Settings
 setting) {

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

@@ -4,7 +4,13 @@ import type { ISetting } from '../../../../repo/setting';
  * 取引のポストアクションを作成する
  */
 export declare function createPotentialActions(params: {
-    order: factory.transaction.placeOrder.IOrderAsResult;
+    order: factory.transaction.placeOrder.IOrderAsResult & {
+        confirmationNumber: string;
+        orderStatus: factory.orderStatus.OrderPaymentDue;
+        price: number;
+        priceCurrency: factory.priceCurrency;
+        typeOf: factory.order.OrderType;
+    };
     customer: factory.order.ICustomer;
     seller: factory.order.ISeller;
     paymentMethods: factory.order.IReferencedInvoice[];

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

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createPotentialActions = createPotentialActions;
-// import { Settings } from '../../../../settings';
 const sendEmailMessage_1 = require("./potentialActions/sendEmailMessage");
 /**
  * 取引のポストアクションを作成する

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

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

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

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

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

@@ -5,8 +5,7 @@ export { IAcceptPayAction, IAuthorizeEventServiceOffer, IAuthorizePaymentAction,
 /**
  * 取引が確定可能な状態かどうかをチェックする
  */
-export declare function validateTransaction(transaction: Pick<factory.transaction.placeOrder.ITransaction, 'id' | 'object'>, acceptPayActions: IAcceptPayAction[], authorizePaymentActions: IAuthorizePaymentAction[], authorizeEventServiceOfferActions: Pick<IAuthorizeEventServiceOffer, 'id' | 'result'>[], eventReservationAcceptedOffers: factory.order.IAcceptedOffer[], payTransactions: IPayTransaction[], customer: factory.order.ICustomer): void;
-export type IOrderURLGenerator = (order: factory.order.IOrder) => string;
+export declare function validateTransaction(transaction: Pick<factory.transaction.placeOrder.ITransaction, 'id' | 'object'>, acceptPayActions: IAcceptPayAction[], authorizePaymentActions: IAuthorizePaymentAction[], authorizeEventServiceOfferActions: Pick<IAuthorizeEventServiceOffer, 'id' | 'result'>[], eventReservationAcceptedOffers: Pick<factory.order.IAcceptedOffer, 'itemOffered' | 'priceSpecification'>[], payTransactions: IPayTransaction[], customer: factory.order.ICustomer): void;
 /**
  * 注文オファー数検証
  */
@@ -14,7 +13,7 @@ export declare function validateAcceptedOffers(params: {
     result: {
         order: PlaceOrderFactory.IResultOrderParams;
     };
-    acceptedOffers: factory.order.IAcceptedOffer[];
+    acceptedOffers: (Pick<factory.order.IAcceptedOffer, 'itemOffered' | 'offeredThrough' | 'serialNumber'>)[];
 }): void;
 export declare function validateOrderedItem(params: {
     order: Pick<factory.order.IOrder, 'orderedItem'>;
@@ -36,7 +35,9 @@ export declare function validatePaymentMethods(params: {
  * 興行オファー適用条件確認
  */
 export declare function validateEventOffers(params: {
-    order: Pick<factory.transaction.placeOrder.IOrderAsResult, 'price'>;
+    order: {
+        price: number;
+    };
     paymentMethods: factory.order.IReferencedInvoice[];
     authorizeEventServiceOfferActions: Pick<IAuthorizeEventServiceOffer, 'id' | 'instrument' | 'object' | 'result'>[];
 }): void;

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

@@ -7,14 +7,12 @@ import type { ConfirmationNumberRepo } from '../../../repo/confirmationNumber';
 import type { EmailMessageRepo } from '../../../repo/emailMessage';
 import type { MessageRepo } from '../../../repo/message';
 import type { OrderInTransactionRepo } from '../../../repo/orderInTransaction';
-import type { OrderNumberRepo } from '../../../repo/orderNumber';
 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';
 interface IConfirmOperationRepos {
-    action?: never;
     acceptPayAction: AcceptPayActionRepo;
     authorizePaymentMethodAction: AuthorizePaymentMethodActionRepo;
     authorizeOfferAction: AuthorizeOfferActionRepo;
@@ -25,7 +23,6 @@ interface IConfirmOperationRepos {
     project: ProjectRepo;
     placeOrder: PlaceOrderRepo;
     orderInTransaction: OrderInTransactionRepo;
-    orderNumber: OrderNumberRepo;
     confirmationNumber: ConfirmationNumberRepo;
     setting: SettingRepo;
 }
@@ -43,10 +40,14 @@ interface IConfirmOptions {
      * 注文における最大CreditCardIF決済方法数
      */
     maxNumCreditCardPaymentMethod: number;
+    /**
+     * 取引ドキュメントのresult.orderを保管しないオプション(2026-06-15~)
+     */
+    disableResultOrder: boolean;
 }
 type IConfirmParams = PlaceOrderFactory.IConfirmParams;
 interface IConfirmResult {
-    order: factory.transaction.placeOrder.IOrderAsResult;
+    order: Pick<factory.transaction.placeOrder.IOrderAsResult, 'confirmationNumber' | 'orderNumber'>;
     customer: factory.order.ICustomer;
     code?: string;
     /**

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

@@ -8,7 +8,6 @@ const debug_1 = __importDefault(require("debug"));
 const moment_1 = __importDefault(require("moment"));
 const errorHandler_1 = require("../../../errorHandler");
 const factory_1 = require("../../../factory");
-// import { Settings } from '../../../settings';
 const factory_2 = require("../../order/placeOrder/factory");
 const orderedItem_1 = require("../../order/placeOrder/factory/orderedItem");
 const result_1 = require("./confirm/factory/result");
@@ -16,7 +15,6 @@ const potentialActions_1 = require("./confirm/potentialActions");
 const publishCode_1 = require("./confirm/publishCode");
 const validation_1 = require("./confirm/validation");
 const publishConfirmationNumberIfNotExist_1 = require("./publishConfirmationNumberIfNotExist");
-const issueOrderNumberIfNotExist_1 = require("./issueOrderNumberIfNotExist");
 const debug = (0, debug_1.default)('chevre-domain:service:transaction');
 /**
  * 進行中でない取引を処理する
@@ -30,9 +28,16 @@ function processTransactionNotInProgress(transaction) {
             // if (resultCustomer === undefined) {
             //     throw new factory.errors.Internal('resultCustomer undefined'); // impossible process
             // }
+            const { confirmationNumber, orderNumber } = transaction.object;
+            // Confirmedの取引であればobjectには必ず存在するはず
+            if (typeof confirmationNumber !== 'string' || typeof orderNumber !== 'string'
+                || confirmationNumber === '' || orderNumber === '') {
+                throw new factory_1.factory.errors.Internal('confirmationNumber, orderNumber undefined unexpectedly');
+            }
             // すでに確定済の場合
             return {
                 ...transaction.result,
+                order: { confirmationNumber, orderNumber },
                 customer: resultCustomer
             };
         }
@@ -49,9 +54,7 @@ function processTransactionNotInProgress(transaction) {
  * 注文取引を確定する
  */
 function confirm(params, options) {
-    return async (repos
-    // settings: Settings
-    ) => {
+    return async (repos) => {
         // 確認番号を事前発行
         await (0, publishConfirmationNumberIfNotExist_1.publishConfirmationNumberIfNotExist)({
             id: params.id,
@@ -66,18 +69,23 @@ function confirm(params, options) {
         if (typeof params.agent?.id === 'string' && transaction.agent.id !== params.agent.id) {
             throw new factory_1.factory.errors.Forbidden('Transaction not yours');
         }
+        // 注文番号は興行オファー承認時に発行済のはず(2026-06-16~)
+        const orderNumber = transaction.object.orderNumber;
+        if (typeof orderNumber !== 'string' || orderNumber === '') {
+            throw new factory_1.factory.errors.Argument('transactionId', 'orderNumber not issued');
+        }
         // 取引に対する全ての承認アクションをマージ
         const completedAuthorizeActions = await searchAuthorizeActions(params)(repos);
         let acceptPayActions = [];
         if (typeof transaction.object.paymentMethods?.paymentMethodId === 'string') {
             acceptPayActions = await searchAcceptPayActions(params)(repos);
         }
-        // 注文番号を発行
-        const orderNumber = await (0, issueOrderNumberIfNotExist_1.issueOrderNumberIfNotExist)({
-            project: { id: transaction.project.id },
-            id: transaction.id,
-            object: { orderDate: params.result.order.orderDate }
-        })(repos);
+        // 注文番号は興行オファー承認時に発行済のはずなので、ここは不要(承認オファーなしの注文は存在しえない)(2026-06-16~)
+        // const orderNumber = await issueOrderNumberIfNotExist({
+        //     project: { id: transaction.project.id },
+        //     id: transaction.id,
+        //     object: { orderDate: params.result.order.orderDate }
+        // })(repos);
         // 必要あらば注文コード発行(2024-02-05~)
         let code;
         const publishCodeExpiresInSeconds = options.publishCodeExpiresInSeconds;
@@ -99,7 +107,10 @@ function confirm(params, options) {
         // authorizeProductOfferActions,
         serialNumbers } = dissolveAuthorizeActions(completedAuthorizeActions);
         // orderInTransactionから検索する(2024-03-04~)
-        const acceptedOffers = (await repos.orderInTransaction.findAcceptedOffersByOrderNumber({ orderNumber: { $eq: orderNumber } }))
+        const acceptedOffers = (await repos.orderInTransaction.findAcceptedOffersWithPriceByOrderNumber({
+            orderNumber,
+            project: { id: transaction.project.id }
+        }))
             .filter(({ serialNumber }) => typeof serialNumber === 'string' && serialNumbers.includes(serialNumber));
         // authorizePaymentActionsからpayTransactionsを参照(2024-06-20~)
         let payTransactions = [];
@@ -116,7 +127,7 @@ function confirm(params, options) {
         // let customer: factory.order.ICustomer = createCustomer({ transaction });
         const customer = await repos.orderInTransaction.findCustomerByOrderNumber({ orderNumber: { $eq: orderNumber } });
         const seller = (0, factory_2.createSeller)({ transaction });
-        const { paymentMethods, result, eventId, reservationIds } = createResult({
+        const { paymentMethods, placingOrder, result, eventId, reservationIds } = createResult({
             ...params,
             orderNumber, transaction,
             acceptPayActions,
@@ -142,7 +153,7 @@ function confirm(params, options) {
             throw new factory_1.factory.errors.NotFound('setting.defaultSenderEmail');
         }
         const { emailMessages, potentialActions } = await (0, potentialActions_1.createPotentialActions)({
-            order: result.order, // createEmailMessageでのorder.acceptedOffersへの依存性を排除したのでこちらでよいはず(2024-02-21~)
+            order: placingOrder, // createEmailMessageでのorder.acceptedOffersへの依存性を排除したのでこちらでよいはず(2024-02-21~)
             customer,
             seller,
             paymentMethods,
@@ -163,6 +174,7 @@ function confirm(params, options) {
             await repos.placeOrder.confirmPlaceOrder({
                 typeOf: transaction.typeOf,
                 id: transaction.id,
+                object: { orderDate: params.result.order.orderDate },
                 result: result,
                 potentialActions: potentialActions
             });
@@ -175,9 +187,12 @@ function confirm(params, options) {
             }
             throw error;
         }
-        const { order } = result;
+        // const { order } = result;
         return {
-            order,
+            order: {
+                confirmationNumber: placingOrder.confirmationNumber,
+                orderNumber: placingOrder.orderNumber
+            },
             customer,
             ...(typeof code === 'string') ? { code } : undefined,
             ...(typeof eventId === 'string') ? { eventId } : undefined,
@@ -288,7 +303,7 @@ function createResult(params, options) {
         const itemOfferedTypeOf = acceptedOffer.itemOffered.typeOf;
         switch (itemOfferedTypeOf) {
             case factory_1.factory.reservationType.EventReservation:
-                eventReservationAcceptedOffers.push(acceptedOffer);
+                eventReservationAcceptedOffers.push((acceptedOffer));
                 break;
             // case factory.permit.PermitType.Permit:
             //     productAcceptedOffers.push((acceptedOffer as factory.order.IAcceptedOffer<factory.order.IPermit>));
@@ -303,18 +318,7 @@ function createResult(params, options) {
     eventReservationAcceptedOffers, params.payTransactions, params.customer);
     const { paymentMethods, price } = (0, factory_2.createPaymentMethods)({ authorizePaymentActions: params.authorizePaymentActions });
     const orderedItem = (0, orderedItem_1.acceptedOffers2orderedItem)({
-        eventReservationAcceptedOffers,
-        // productAcceptedOffers,
-        // moneyTransferAcceptedOffers
-    });
-    // 注文作成
-    const orderAsResult = (0, result_1.createOrderAsResult)({
-        orderNumber: params.orderNumber,
-        orderDate: params.result.order.orderDate,
-        orderStatus: factory_1.factory.orderStatus.OrderPaymentDue, // 注文作成時のステータスとなる
-        // orderedItem,
-        // paymentMethods,
-        price
+        eventReservationAcceptedOffers
     });
     (0, validation_1.validateEventOffers)({
         order: { price },
@@ -333,18 +337,27 @@ function createResult(params, options) {
     });
     (0, validation_1.validatePaymentMethods)({ order: { paymentMethods } }, options);
     // 確認番号を発行
-    const { confirmationNumber, identifier, url } = createConfirmationNumber({
-        order: orderAsResult,
-        transaction: transaction,
-        result: params.result
+    const { confirmationNumber } = createConfirmationNumber({ transaction });
+    // 注文作成
+    const orderAsResult = (0, result_1.createOrderAsResult)({
+        orderNumber: params.orderNumber,
+        orderDate: params.result.order.orderDate,
+        price
     });
     orderAsResult.confirmationNumber = confirmationNumber;
-    orderAsResult.identifier = identifier;
-    orderAsResult.url = url;
+    // orderAsResult.identifier = identifier; // discontinue(2026-06-11~)
+    // orderAsResult.url = url; // discontinue(2026-06-11~)
+    const placingOrder = {
+        ...orderAsResult,
+        confirmationNumber,
+        typeOf: factory_1.factory.order.OrderType.Order,
+        price,
+        priceCurrency: factory_1.factory.priceCurrency.JPY,
+        orderStatus: factory_1.factory.orderStatus.OrderPaymentDue
+    };
     const authorizeActions = [
         ...params.authorizePaymentActions.map(({ id }) => ({ id })),
         ...params.authorizeEventServiceOfferActions.map(({ id }) => ({ id })),
-        // ...params.authorizeProductOfferActions.map(({ id }) => ({ id }))
     ];
     let eventId;
     let reservationIds;
@@ -356,14 +369,12 @@ function createResult(params, options) {
     }
     return {
         paymentMethods,
+        placingOrder,
         result: {
-            order: orderAsResult,
             authorizeActions, // 追加(2024-01-17~)
             numAcceptedOffers: params.acceptedOffers.length, // 追加(2024-01-17~)
-            // options: { // discontinue(2024-06-20~)
-            //     ignoreAccpetedOffersFromResult: true
-            // },
-            ...(typeof params.code === 'string') ? { code: params.code } : undefined
+            ...(typeof params.code === 'string') ? { code: params.code } : undefined,
+            ...((!options.disableResultOrder) && { order: orderAsResult }) // support disableResultOrder(2026-06-15~)
         },
         ...(typeof eventId === 'string') ? { eventId } : undefined,
         ...(Array.isArray(reservationIds)) ? { reservationIds } : undefined
@@ -441,26 +452,12 @@ function searchAuthorizeActions(params) {
 }
 function createConfirmationNumber(params) {
     const confirmationNumber = params.transaction.object.confirmationNumber;
-    let url = '';
     // 取引に確認番号が保管されていなければ、確認番号を発行
     if (typeof confirmationNumber !== 'string') {
         // 事前に発行済なはずなので、ありえないフロー
         throw new factory_1.factory.errors.Internal('object.confirmationNumber undefined');
     }
-    // URLの指定があれば上書き
-    /* istanbul ignore if */
-    if (typeof params.result.order.url === 'string') {
-        url = params.result.order.url;
-    }
-    else /* istanbul ignore next */ if (typeof params.result.order.url === 'function') {
-        /* istanbul ignore next */
-        url = params.result.order.url(params.order);
-    }
-    // 識別子の指定があれば上書き
-    const identifier = [
-        ...(Array.isArray(params.result.order.identifier)) ? params.result.order.identifier : [],
-        // 取引に指定があれば追加
-        ...(Array.isArray(params.transaction.object.identifier)) ? params.transaction.object.identifier : []
-    ];
-    return { confirmationNumber, url, identifier };
+    return {
+        confirmationNumber,
+    };
 }

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

@@ -6,7 +6,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.exportTasksById = exportTasksById;
 const moment_1 = __importDefault(require("moment"));
 const factory_1 = require("../../../factory");
-// import { Settings } from '../../../settings';
 const factory_2 = require("./exportTasks/factory");
 /**
  * 取引のタスクを出力します

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

@@ -6,5 +6,14 @@ type IVerifiedPassport = factory.waiter.passport.IPassport & {
      */
     identifier: string;
 };
-declare function createStartParams(params: factory.transaction.placeOrder.IStartParamsWithoutDetail, expiresInSeconds: number, passport: IVerifiedPassport | undefined, seller: Pick<factory.seller.ISeller, 'id' | 'name' | 'typeOf' | 'project' | 'additionalProperty'>, broker?: factory.order.IBroker, customerType?: string, memeberOfPayload?: factory.transaction.placeOrder.IMemberOfPayload): factory.transaction.placeOrder.IStartParams;
-export { AGENT_IDENTIFIER_NAME_PASSPORT, createStartParams };
+type IStartPlaceOrderParams = factory.transaction.placeOrder.IStartParamsWithoutDetail & {
+    object: factory.transaction.placeOrder.IStartParamsWithoutDetail['object'] & {
+        /**
+         * api経由で取引が開始されれば必ず存在するはず
+         */
+        clientUser: factory.transaction.placeOrder.IClientUserBeforeStart;
+    };
+    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;
+export { AGENT_IDENTIFIER_NAME_PASSPORT, createStartParams, IStartPlaceOrderParams };

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

@@ -5,20 +5,22 @@ 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, customerType, memeberOfPayload) {
-    let clientUser;
+function createStartParams(params, expiresInSeconds, passport, seller, 
+// broker?: factory.order.IBroker,
+customerType) {
+    const { broker } = params;
+    // let clientUser: Omit<factory.clientUser.IClientUser, 'scope' | 'scopes'> | undefined;
     let instrument;
     if (typeof params.object.clientUser?.client_id === 'string') {
-        const { sub, token_use, iss, exp, iat, version, jti, client_id, username, aud, typ } = params.object.clientUser;
-        clientUser = { sub, token_use, iss, exp, iat, version, jti, client_id, username, aud, typ };
+        const { client_id } = params.object.clientUser;
+        // const { sub, token_use, iss, exp, iat, version, jti, client_id, username, aud, typ } = params.object.clientUser;
+        // clientUser = { sub, token_use, iss, exp, iat, version, jti, client_id, username, aud, typ };
         instrument = { id: client_id, typeOf: factory_1.factory.creativeWorkType.WebApplication };
     }
     const transactionObject = {
-        // discontinue passportToken(2024-07-05~)
-        // ...(typeof params.object.passport?.token === 'string') ? { passportToken: params.object.passport.token } : undefined,
-        ...(typeof passport?.scope === 'string') ? { passport } : undefined,
-        ...(typeof clientUser?.client_id === 'string') ? { clientUser } : undefined,
-        ...(typeof params.object?.name === 'string') ? { name: params.object?.name } : undefined,
+        // ...(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 customerType === 'string') ? { customerType } : undefined
@@ -36,7 +38,7 @@ function createStartParams(params, expiresInSeconds, passport, seller, broker, c
     ];
     const agent = {
         ...params.agent,
-        ...(memeberOfPayload !== undefined) ? { memeberOfPayload } : undefined,
+        // ...(memeberOfPayload !== undefined) ? { memeberOfPayload } : undefined, // discontinue(2026-06-10~)
         identifier: agentIdentifier
     };
     return {

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

@@ -12,7 +12,7 @@ declare function validateStartRequest(params: {
     seller: {
         id: string;
     };
-    clientUser?: Omit<factory.clientUser.IClientUser, 'scope' | 'scopes'>;
+    clientUser?: factory.transaction.placeOrder.IClientUserBeforeStart;
     /**
      * passportによって決定するカスタマータイプ
      */
@@ -31,6 +31,5 @@ declare function validateStartRequest(params: {
 }) => Promise<{
     seller: ISeller;
     sellerMakesOffer: factory.seller.IMakesOffer;
-    memeberOfPayload?: factory.transaction.placeOrder.IMemberOfPayload;
 }>;
 export { validateStartRequest };

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

@@ -104,8 +104,8 @@ function validateStartRequest(params) {
         if (iamMember === undefined) {
             throw new factory_1.factory.errors.NotFound(factory_1.factory.role.RoleType.OrganizationRole);
         }
-        // メンバーシップトークン検証(2024-01-31~)
-        let memeberOfPayload;
+        // // メンバーシップトークン検証(2024-01-31~)
+        // let memeberOfPayload: factory.transaction.placeOrder.IMemberOfPayload | undefined;
         // 適用メンバーシップについてはproject.makesOfferを参照(2025-01-13~)
         const validMemberProgramIdentifier = projectMakesOffer.validForMemberTier?.isTierOf.identifier;
         if (typeof validMemberProgramIdentifier === 'string') {
@@ -126,29 +126,18 @@ function validateStartRequest(params) {
             if (typeof issuer.tokenSecret !== 'string' || issuer.tokenSecret === '') {
                 throw new factory_1.factory.errors.NotFound('issuer.tokenSecret');
             }
-            memeberOfPayload = await verifyMembershipToken({
+            // memeberOfPayload =
+            await verifyMembershipToken({
                 secret: issuer.tokenSecret,
                 // issuer: issuer.identifier,
                 issuer: issuer.url, // identifier -> url(2025-05-11~)
                 ...(typeof params.memberOfToken === 'string') ? { token: params.memberOfToken } : undefined
             });
         }
-        // discontinue(2025-01-14~)
-        // if (Array.isArray(iamMember.member.member)) {
-        //     const verifySecret = iamMember.member.member[0]?.memberOf?.secret; // ひとまず1種類のメンバーシップのみ対応
-        //     const verifyIssuer = iamMember.member.member[0]?.memberOf?.issuer; // ひとまず1種類のメンバーシップのみ対応
-        //     if (typeof verifySecret === 'string') {
-        //         memeberOfPayload = await verifyMembershipToken({
-        //             secret: verifySecret,
-        //             ...(typeof params.memberOfToken === 'string') ? { token: params.memberOfToken } : undefined,
-        //             ...(typeof verifyIssuer === 'string') ? { issuer: verifyIssuer } : undefined
-        //         });
-        //     }
-        // }
         return {
             sellerMakesOffer,
             seller,
-            ...(memeberOfPayload !== undefined) ? { memeberOfPayload } : undefined
+            // ...(memeberOfPayload !== undefined) ? { memeberOfPayload } : undefined
         };
     };
 }

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

@@ -5,7 +5,7 @@ import type { PassportRepo } from '../../../repo/passport';
 import type { ProjectMakesOfferRepo } from '../../../repo/projectMakesOffer';
 import type { SellerRepo } from '../../../repo/seller';
 import type { IStartedPlaceOrder, PlaceOrderRepo } from '../../../repo/transaction/placeOrder';
-import { PlaceOrderFactory } from '../../../factory/transaction';
+import { IStartPlaceOrderParams } from './start/factory';
 interface IStartOperationRepos {
     issuer: IssuerRepo;
     member: MemberRepo;
@@ -16,12 +16,11 @@ interface IStartOperationRepos {
     placeOrder: PlaceOrderRepo;
 }
 type IStartOperation<T> = (repos: IStartOperationRepos) => Promise<T>;
-type IStartParams = PlaceOrderFactory.IStartParams;
 interface IStartOptions {
     lockPassport: boolean;
 }
 /**
  * 取引開始
  */
-declare function start(params: IStartParams, options: IStartOptions): IStartOperation<IStartedPlaceOrder>;
-export { start };
+declare function start(params: IStartPlaceOrderParams, options: IStartOptions): IStartOperation<IStartedPlaceOrder>;
+export { start, IStartPlaceOrderParams };

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

@@ -10,7 +10,7 @@ const validateStartRequest_1 = require("./start/validateStartRequest");
 function start(params, options) {
     return async (repos) => {
         const { passport, customerType } = await repos.passport.validatePassportTokenIfExist(params);
-        const { memeberOfPayload, sellerMakesOffer, seller } = await (0, validateStartRequest_1.validateStartRequest)({
+        const { sellerMakesOffer, seller } = await (0, validateStartRequest_1.validateStartRequest)({
             project: { id: params.project.id },
             seller: { id: params.seller.id },
             ...(typeof passport?.scope === 'string') ? { customerType } : undefined,
@@ -22,7 +22,7 @@ function start(params, options) {
             throw new factory_1.factory.errors.NotFound('eligibleTransactionDuration.maxValue');
         }
         // 取引ファクトリーで新しい進行中取引オブジェクトを作成
-        const startParams = (0, factory_2.createStartParams)(params, expiresInSeconds, passport, seller, params.broker, customerType, memeberOfPayload);
+        const startParams = (0, factory_2.createStartParams)(params, expiresInSeconds, passport, seller, customerType);
         let transaction;
         // lock passport(2024-07-05~)
         if (options.lockPassport && passport !== undefined) {

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

@@ -4,7 +4,6 @@ exports.updateAgent = updateAgent;
 const google_libphonenumber_1 = require("google-libphonenumber");
 const factory_1 = require("../../../factory");
 const issueOrderNumberIfNotExist_1 = require("./issueOrderNumberIfNotExist");
-// import { Settings } from '../settings';
 // export type ITransactionOperation<T> = (repos: { transaction: TransactionRepo }) => Promise<T>;
 function fixCustomer(params) {
     return async (repos) => {

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

@@ -4,6 +4,6 @@
 import { POINT_AWARD_IDENTIFIER_NAME } from '../../factory/order';
 import { confirm } from './placeOrder/confirm';
 import { exportTasksById } from './placeOrder/exportTasksById';
-import { start } from './placeOrder/start';
+import { start, IStartPlaceOrderParams } from './placeOrder/start';
 import { updateAgent } from './placeOrder/updateAgent';
-export { confirm, POINT_AWARD_IDENTIFIER_NAME, start, exportTasksById, updateAgent };
+export { confirm, POINT_AWARD_IDENTIFIER_NAME, start, IStartPlaceOrderParams, exportTasksById, updateAgent };

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

@@ -6,7 +6,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.createTasks = createTasks;
 const moment_1 = __importDefault(require("moment"));
 const factory_1 = require("../../../../factory");
-// import { Settings } from '../../../../settings';
 /**
  * 取引のタスクを作成する
  */

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

@@ -1,7 +1,7 @@
 import { factory } from '../../../../factory';
 import type { ISetting } from '../../../../repo/setting';
 export declare function createReturnPaymentMethodActions(params: {
-    order: Pick<factory.order.IOrder, 'confirmationNumber' | 'identifier' | 'customer' | 'orderDate' | 'orderNumber' | 'orderStatus' | 'orderedItem' | 'paymentMethods' | 'price' | 'priceCurrency' | 'seller' | 'typeOf'>;
+    order: Pick<factory.order.IOrder, 'confirmationNumber' | 'customer' | 'orderDate' | 'orderNumber' | 'orderStatus' | 'orderedItem' | 'paymentMethods' | 'price' | 'priceCurrency' | 'seller' | 'typeOf'>;
     returnOrderActionParams?: factory.transaction.returnOrder.IReturnOrderActionParams;
     transaction: Pick<factory.transaction.returnOrder.ITransaction, 'object'>;
 }, setting: Pick<ISetting, 'defaultSenderEmail'>): Promise<{

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

@@ -3,7 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.createReturnPaymentMethodActions = createReturnPaymentMethodActions;
 const emailMessageBuilder_1 = require("../../../../emailMessageBuilder");
 const factory_1 = require("../../../../factory");
-// import { Settings } from '../../../../settings';
 async function createReturnInvoicePotentialActions(params, 
 // settings: Settings
 setting) {