@chevre/domain 25.0.0-alpha.17 → 25.0.0-alpha.19

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

@@ -72,6 +72,11 @@ export declare class OrderInTransactionRepo extends AcceptedOfferInReserveRepo {
         project: {
             id: string;
         };
+    }, options: {
+        /**
+         * 注文取引タイプのドキュメントのみを参照対象にするかどうか
+         */
+        onlyPlaceOrder: boolean;
     }): Promise<string>;
     /**
      * 注文取引からcustomerを参照する

package/lib/chevre/repo/orderInTransaction.js

@@ -49,12 +49,13 @@ class OrderInTransactionRepo extends acceptedOfferInReserve_1.AcceptedOfferInRes
      * 注文取引から注文番号を参照する
      * 存在しなければNotFoundError
      */
-    async findOrderNumberByIdentifier(params) {
+    async findOrderNumberByIdentifier(params, options) {
         const { project, identifier } = params;
+        const onlyPlaceOrder = options.onlyPlaceOrder === true;
         const doc = await this.orderModel.findOne({
             identifier: { $eq: identifier },
-            typeOf: { $eq: factory_1.factory.transactionType.PlaceOrder },
-            'project.id': { $eq: project.id }
+            'project.id': { $eq: project.id },
+            ...((onlyPlaceOrder) && { typeOf: { $eq: factory_1.factory.transactionType.PlaceOrder } })
         }, {
             _id: 0,
             orderNumber: 1

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

@@ -20,7 +20,6 @@ interface IOptions {
     secret: string;
     passportValidator?: IPassportValidator;
 }
-type IStartParams = (factory.transaction.placeOrder.IStartParamsWithoutDetail) & {};
 /**
  * 取引許可証リポジトリ
  */
@@ -34,7 +33,11 @@ export declare class PassportRepo {
     /**
      * 許可証トークンがあれば検証する
      */
-    validatePassportTokenIfExist(params: Pick<IStartParams, 'object'>): Promise<{
+    validatePassportTokenIfExist(params: {
+        object?: {
+            passport?: factory.transaction.IPassportBeforeStart;
+        };
+    }): Promise<{
         passport?: IVerifiedPassport;
         customerType?: string;
     }>;

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

@@ -122,16 +122,18 @@ class PlaceOrderRepo {
         if (Array.isArray(sellerIdIn)) {
             andConditions.push({ 'seller.id': { $exists: true, $in: sellerIdIn } });
         }
-        const resultOrderNumberIn = params.result?.order?.orderNumbers;
-        if (Array.isArray(resultOrderNumberIn)) {
-            andConditions.push({ 'result.order.orderNumber': { $exists: true, $in: resultOrderNumberIn } });
-        }
-        const resultOrderConfirmationNumberEq = params.result?.order?.confirmationNumber?.$eq;
-        if (typeof resultOrderConfirmationNumberEq === 'string') {
-            andConditions.push({
-                'result.order.confirmationNumber': { $exists: true, $eq: resultOrderConfirmationNumberEq }
-            });
-        }
+        // result.orderは完全に廃止したので検索条件としても廃止(2026-06-26~)
+        // const resultOrderNumberIn = params.result?.order?.orderNumbers;
+        // if (Array.isArray(resultOrderNumberIn)) {
+        //     andConditions.push({ 'result.order.orderNumber': { $exists: true, $in: resultOrderNumberIn } });
+        // }
+        // result.orderは完全に廃止したので検索条件としても廃止(2026-06-26~)
+        // const resultOrderConfirmationNumberEq = params.result?.order?.confirmationNumber?.$eq;
+        // if (typeof resultOrderConfirmationNumberEq === 'string') {
+        //     andConditions.push({
+        //         'result.order.confirmationNumber': { $exists: true, $eq: resultOrderConfirmationNumberEq }
+        //     });
+        // }
         const objectOrderNumberEq = params.object?.orderNumber?.$eq;
         if (typeof objectOrderNumberEq === 'string') {
             andConditions.push({ 'object.orderNumber': { $exists: true, $eq: objectOrderNumberEq } });

package/lib/chevre/service/offer/event/authorize.js

@@ -28,7 +28,7 @@ function authorize(params, options) {
         const orderNumber = await repos.orderInTransaction.findOrderNumberByIdentifier({
             identifier: transaction.id,
             project: { id: params.project.id },
-        });
+        }, { onlyPlaceOrder: true });
         // まず取引番号発行
         const { transactionNumber } = await repos.transactionNumber.publishByTimestamp({ startDate: now });
         const actionAttributes = (0, factory_2.createAuthorizeSeatReservationActionAttributes)({

package/lib/chevre/service/order/placeOrder/factory.js

@@ -79,7 +79,7 @@ function createPlacingOrder(params) {
         throw new factory_1.factory.errors.Internal('object.orderNumber undefined');
     }
     if (orderDate === undefined) {
-        orderDateByTransaction = transaction.result?.order?.orderDate;
+        // orderDateByTransaction = transaction.result?.order?.orderDate
     }
     else {
         orderDateByTransaction = orderDate;

package/lib/chevre/service/payment/any/authorize/fixOrderAsNeeded.js

@@ -20,7 +20,7 @@ function fixOrderAsNeeded(params) {
         const orderNumber = await repos.orderInTransaction.findOrderNumberByIdentifier({
             identifier: params.purpose.id,
             project: { id: params.project.id },
-        });
+        }, { onlyPlaceOrder: true });
         return { confirmationNumber, orderNumber };
     };
 }

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

@@ -1,4 +1,9 @@
 import { factory } from '../../../../../factory';
+type IOrderAsResult = Pick<factory.order.IOrder, 'confirmationNumber' | 'orderDate' | 'orderNumber' | 'price' | 'priceCurrency' | 'typeOf'> & {
+    orderStatus: factory.orderStatus.OrderPaymentDue;
+    identifier?: never;
+    url?: never;
+};
 /**
  * 注文取引結果としての注文を生成する
  */
@@ -6,5 +11,5 @@ declare function createOrderAsResult(params: {
     orderNumber: string;
     orderDate: Date;
     price: number;
-}): factory.transaction.placeOrder.IOrderAsResult;
-export { createOrderAsResult };
+}): IOrderAsResult;
+export { createOrderAsResult, IOrderAsResult };

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

@@ -1,7 +1,8 @@
 import { factory } from '../../../../../factory';
 import type { ISetting } from '../../../../../repo/setting';
+import type { IOrderAsResult } from '../factory/result';
 export declare function createSendEmailMessageActions(params: {
-    order: factory.transaction.placeOrder.IOrderAsResult & {
+    order: IOrderAsResult & {
         confirmationNumber: string;
         orderStatus: factory.orderStatus;
         price: number;

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

@@ -1,10 +1,11 @@
 import { factory } from '../../../../factory';
 import type { ISetting } from '../../../../repo/setting';
+import { IOrderAsResult } from './factory/result';
 /**
  * 取引のポストアクションを作成する
  */
 export declare function createPotentialActions(params: {
-    order: factory.transaction.placeOrder.IOrderAsResult & {
+    order: IOrderAsResult & {
         confirmationNumber: string;
         orderStatus: factory.orderStatus.OrderPaymentDue;
         price: number;

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

@@ -11,6 +11,7 @@ import type { SettingRepo } from '../../../repo/setting';
 import type { PlaceOrderRepo } from '../../../repo/transaction/placeOrder';
 import { factory } from '../../../factory';
 import { PlaceOrderFactory } from '../../../factory/transaction';
+import { IOrderAsResult } from './confirm/factory/result';
 interface IConfirmOperationRepos {
     acceptPayAction: AcceptPayActionRepo;
     authorizePaymentMethodAction: AuthorizePaymentMethodActionRepo;
@@ -45,7 +46,7 @@ interface IConfirmOptions {
 }
 type IConfirmParams = PlaceOrderFactory.IConfirmParams;
 interface IConfirmResult {
-    order: Pick<factory.transaction.placeOrder.IOrderAsResult, 'confirmationNumber' | 'orderNumber'>;
+    order: Pick<IOrderAsResult, 'confirmationNumber' | 'orderNumber'>;
     customer: factory.order.ICustomer;
     code?: string;
     /**

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

@@ -19,16 +19,17 @@ const debug = (0, debug_1.default)('chevre-domain:service:transaction');
 /**
  * 進行中でない取引を処理する
  */
-function processTransactionNotInProgress(transaction) {
+function processTransactionNotInProgress(params) {
     return async (repos) => {
+        const { transaction, orderNumber } = params;
         if (transaction.status === factory_1.factory.transactionStatusType.Confirmed) {
             const resultCustomer = await repos.orderInTransaction.findCustomerByOrderNumber({
-                orderNumber: { $eq: String(transaction.object.orderNumber) }
+                orderNumber: { $eq: orderNumber }
             });
             // if (resultCustomer === undefined) {
             //     throw new factory.errors.Internal('resultCustomer undefined'); // impossible process
             // }
-            const { confirmationNumber, orderNumber } = transaction.object;
+            const { confirmationNumber } = transaction.object;
             // Confirmedの取引であればobjectには必ず存在するはず
             if (typeof confirmationNumber !== 'string' || typeof orderNumber !== 'string'
                 || confirmationNumber === '' || orderNumber === '') {
@@ -62,18 +63,24 @@ function confirm(params, options) {
             object: { orderDate: params.result.order.orderDate }
         })(repos);
         const transaction = await repos.placeOrder.findPlaceOrderById({ typeOf: factory_1.factory.transactionType.PlaceOrder, id: params.id }, ['typeOf', 'project', 'status', 'agent', 'seller', 'object', 'result']);
-        const confirmResult = await processTransactionNotInProgress(transaction)(repos);
+        // 注文ドキュメントから注文番号を参照(取引開始時に発行済の前提)(2026-06-26~)
+        const orderNumber = await repos.orderInTransaction.findOrderNumberByIdentifier({
+            identifier: params.id,
+            project: { id: transaction.project.id }
+        }, { onlyPlaceOrder: false } // すでに取引確定済かもしれないのでfalse
+        );
+        const confirmResult = await processTransactionNotInProgress({ transaction, orderNumber })(repos);
         if (confirmResult !== undefined) {
             return confirmResult;
         }
         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');
-        }
+        // // 注文番号は興行オファー承認時に発行済のはず(2026-06-16~)
+        // const orderNumber = transaction.object.orderNumber;
+        // if (typeof orderNumber !== 'string' || orderNumber === '') {
+        //     throw new factory.errors.Argument('transactionId', 'orderNumber not issued');
+        // }
         // 取引に対する全ての承認アクションをマージ
         const completedAuthorizeActions = await searchAuthorizeActions(params)(repos);
         let acceptPayActions = [];
@@ -368,10 +375,10 @@ function createResult(params, options) {
         result: {
             authorizeActions, // 追加(2024-01-17~)
             ...(typeof params.code === 'string') ? { code: params.code } : undefined,
-            ...((!options.disableResultOrder) && { order: orderAsResult }), // support disableResultOrder(2026-06-15~)
-            ...((!options.disableResultOrder) && {
-                numAcceptedOffers: params.acceptedOffers.length, // 追加(2024-01-17~)
-            }) // support disableResultOrder(2026-06-17~)
+            // ...((!options.disableResultOrder) && { order: orderAsResult }), // 完全廃止(2026-06-26~)
+            // ...((!options.disableResultOrder) && {
+            //     numAcceptedOffers: params.acceptedOffers.length,
+            // }) // 完全廃止(2026-06-26~)
         },
         ...(typeof eventId === 'string') ? { eventId } : undefined,
         ...(Array.isArray(reservationIds)) ? { reservationIds } : undefined

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

@@ -6,19 +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'>, options: {
-    minimizeStartPlaceOrderParams: boolean;
-}, 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,8 +5,8 @@ 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, options, customerType) {
-    const { minimizeStartPlaceOrderParams } = options;
+;
+function createStartParams(params, expiresInSeconds, passport, seller, customerType) {
     // const { broker } = params;
     // let clientUser: Omit<factory.clientUser.IClientUser, 'scope' | 'scopes'> | undefined;
     let instrument;
@@ -21,7 +21,7 @@ function createStartParams(params, expiresInSeconds, passport, seller, options,
         // ...(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, // discontinue(2026-06-22~)
-        ...(!minimizeStartPlaceOrderParams && typeof params.object.customer?.typeOf === 'string') ? { customer: params.object.customer } : undefined,
+        // ...(!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') {
@@ -40,22 +40,28 @@ function createStartParams(params, expiresInSeconds, passport, seller, options,
         // ...(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: (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~)
-            },
+        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

@@ -22,11 +22,8 @@ interface IStartOperationRepos {
     orderNumber: OrderNumberRepo;
 }
 type IStartOperation<T> = (repos: IStartOperationRepos) => Promise<T>;
-interface IStartOptions {
-    minimizeStartPlaceOrderParams: 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

@@ -8,7 +8,7 @@ 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)({
@@ -23,8 +23,7 @@ function start(params, options) {
             throw new factory_1.factory.errors.NotFound('eligibleTransactionDuration.maxValue');
         }
         // 取引ファクトリーで新しい進行中取引オブジェクトを作成
-        const { minimizeStartPlaceOrderParams } = options;
-        const startParams = (0, factory_2.createStartParams)(params, expiresInSeconds, passport, seller, { minimizeStartPlaceOrderParams }, customerType);
+        const startParams = (0, factory_2.createStartParams)(params, expiresInSeconds, passport, seller, customerType);
         let transaction;
         // lock passport(2024-07-05~)
         if (passport !== undefined) {

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

@@ -77,7 +77,7 @@ function updateAgent(params) {
             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'

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.3",
+    "@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.17"
+  "version": "25.0.0-alpha.19"
 }