@chevre/domain 25.2.0-alpha.20 → 25.2.0-alpha.22

package/lib/chevre/repo/orderInTransaction.js

@@ -323,7 +323,10 @@ class OrderInTransactionRepo extends acceptedOfferInReserve_1.AcceptedOfferInRes
             _id: { $eq: params.id },
             typeOf: { $eq: factory_1.factory.transactionType.PlaceOrder },
             status: { $eq: factory_1.factory.transactionStatusType.InProgress }
-        }, { 'object.paymentMethods': 1 })
+        }, {
+            'object.paymentMethods': 1,
+            _id: 0
+        })
             .lean()
             .exec();
         if (doc === null) {
@@ -338,7 +341,10 @@ class OrderInTransactionRepo extends acceptedOfferInReserve_1.AcceptedOfferInRes
         const doc = await this.transactionModel.findOne({
             _id: { $eq: params.id },
             typeOf: { $eq: factory_1.factory.transactionType.PlaceOrder }
-        }, { 'object.paymentMethods': 1 })
+        }, {
+            'object.paymentMethods': 1,
+            _id: 0
+        })
             .lean()
             .exec();
         if (doc === null) {
@@ -347,7 +353,10 @@ class OrderInTransactionRepo extends acceptedOfferInReserve_1.AcceptedOfferInRes
         const paymentMethodId = doc.object.paymentMethods?.paymentMethodId;
         if (typeof paymentMethodId === 'string') {
             // 注文ドキュメントにも発行済の場合、同一性を検証(2026-07-12~)
-            const orderDoc = await this.orderModel.findOne({ identifier: { $eq: params.id } }, { paymentMethodId: 1 })
+            const orderDoc = await this.orderModel.findOne({ identifier: { $eq: params.id } }, {
+                paymentMethodId: 1,
+                _id: 0
+            })
                 .lean()
                 .exec();
             if (orderDoc === null) {
@@ -355,7 +364,7 @@ class OrderInTransactionRepo extends acceptedOfferInReserve_1.AcceptedOfferInRes
             }
             const paymentMethodIdByOrder = orderDoc.paymentMethodId;
             if (typeof paymentMethodIdByOrder === 'string') {
-                console.log('paymentMethodId matched?', JSON.stringify(doc), JSON.stringify(orderDoc));
+                // console.log('paymentMethodId matched?', JSON.stringify(doc), JSON.stringify(orderDoc));
                 if (paymentMethodId !== paymentMethodIdByOrder) {
                     throw new factory_1.factory.errors.Internal('paymentMethodId not matched unexpectedly');
                 }

package/lib/chevre/service/offer/event/authorize/factory.d.ts

@@ -1,5 +1,4 @@
 import { factory } from '../../../../factory';
-import { IMinimizedIndividualEvent } from '../../../../factory/event';
 declare function createReserveTransactionStartParams(params: {
     project: {
         id: string;
@@ -13,7 +12,6 @@ declare function createReserveTransactionStartParams(params: {
     transactionNumber: string;
 }): factory.assetTransaction.reserve.IStartParamsWithoutDetail;
 declare function createAuthorizeSeatReservationActionAttributes(params: {
-    event: Pick<IMinimizedIndividualEvent, 'id'>;
     instrument: {
         /**
          * 予約取引番号
@@ -21,8 +19,6 @@ declare function createAuthorizeSeatReservationActionAttributes(params: {
         transactionNumber: string;
     };
     transaction: Pick<factory.transaction.ITransaction<factory.transactionType.PlaceOrder>, 'agent' | 'id' | 'project' | 'seller' | 'typeOf'>;
-}, options: {
-    useLegacyAuthorizeOfferObject: boolean;
 }): factory.action.authorize.offer.eventService.IAttributes;
 declare function acceptedOffers2amount(params: {
     acceptedOffers: Pick<IResultAcceptedOffer, 'priceSpecification' | 'id'>[];

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

@@ -80,16 +80,16 @@ function createReserveTransactionStartParams(params) {
             .toDate() // 余裕を持って
     };
 }
-function createAuthorizeSeatReservationActionAttributes(params, options) {
-    const { useLegacyAuthorizeOfferObject } = options;
-    const { event, transaction } = params;
-    const authorizeObjectEvent = {
-        id: event.id,
-        typeOf: factory_1.factory.eventType.ScreeningEvent // fix(2024-07-17~)
-    };
+function createAuthorizeSeatReservationActionAttributes(params) {
+    // const { useLegacyAuthorizeOfferObject } = options;
+    const { transaction } = params;
+    // const authorizeObjectEvent: factory.action.authorize.offer.eventService.IEventInObject = {
+    //     id: event.id,
+    //     typeOf: factory.eventType.ScreeningEvent // fix(2024-07-17~)
+    // };
     const object = {
         typeOf: factory_1.factory.action.authorize.offer.eventService.ObjectType.SeatReservation,
-        ...((useLegacyAuthorizeOfferObject) && { event: authorizeObjectEvent })
+        // ...((useLegacyAuthorizeOfferObject) && { event: authorizeObjectEvent })
     };
     const instrument = {
         typeOf: factory_1.factory.assetTransactionType.Reserve, // 変更(2024-03-08~)

package/lib/chevre/service/offer/event/authorize.d.ts

@@ -63,10 +63,6 @@ interface IAuthorizeOptions {
      * 最大n日前から予約可能
      */
     maxReservationGracePeriodInDays: number;
-    /**
-     * 2026-07-04~
-     */
-    useLegacyAuthorizeOfferObject: boolean;
     /**
      * 2026-07-10~
      */

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

@@ -32,9 +32,9 @@ function authorize(params, options) {
         // まず取引番号発行
         const { transactionNumber } = await repos.transactionNumber.publishByTimestamp({ startDate: now });
         const actionAttributes = (0, factory_2.createAuthorizeSeatReservationActionAttributes)({
-            event, transaction,
+            transaction,
             instrument: { transactionNumber }
-        }, options);
+        });
         const action = await repos.authorizeOfferAction.start(actionAttributes);
         try {
             const processStartReserveResult = await (0, processStartReserve4chevre_1.processStartReserve4chevre)({

package/lib/chevre/service/offer/eventServiceByCOA/authorize/factory.d.ts

@@ -8,14 +8,13 @@ export declare function createAuthorizeSeatReservationActionAttributes(params: {
     acceptAction: {
         id: string;
     };
-    event: {
-        id: string;
-        typeOf: factory.eventType.ScreeningEvent;
-    };
     transaction: Pick<factory.transaction.ITransaction<factory.transactionType.PlaceOrder>, 'agent' | 'id' | 'project' | 'seller' | 'typeOf'>;
-    pendingTransaction: factory.action.authorize.offer.eventService.ICOAPendingTransaction;
-}, options: {
-    useLegacyAuthorizeOfferObject: boolean;
+    /**
+     * 仮予約済のCOA予約取引
+     */
+    pendingTransaction: {
+        transactionNumber: string;
+    };
 }): factory.action.authorize.offer.eventService.IAttributes;
 /**
  * 供給情報から承認アクションの価格を導き出す

package/lib/chevre/service/offer/eventServiceByCOA/authorize/factory.js

@@ -9,20 +9,20 @@ exports.responseBody2acceptedOffers4result = responseBody2acceptedOffers4result;
 const moment_1 = __importDefault(require("moment"));
 const util_1 = require("util");
 const factory_1 = require("../../../../factory");
-function createAuthorizeSeatReservationActionAttributes(params, options) {
-    const { useLegacyAuthorizeOfferObject } = options;
+function createAuthorizeSeatReservationActionAttributes(params) {
+    // const { useLegacyAuthorizeOfferObject } = options;
     const transaction = params.transaction;
-    const authorizeObjectEvent = {
-        id: params.event.id,
-        typeOf: params.event.typeOf
-    };
+    // const authorizeObjectEvent: factory.action.authorize.offer.eventService.IEventInObject = {
+    //     id: params.event.id,
+    //     typeOf: params.event.typeOf
+    // };
     const authorizeObject = {
         typeOf: factory_1.factory.action.authorize.offer.eventService.ObjectType.SeatReservation,
         id: params.acceptAction.id,
-        ...((useLegacyAuthorizeOfferObject) && {
-            event: authorizeObjectEvent,
-            pendingTransaction: params.pendingTransaction
-        })
+        // ...((useLegacyAuthorizeOfferObject) && {
+        //     event: authorizeObjectEvent,
+        //     pendingTransaction: params.pendingTransaction
+        // })
     };
     const instrument = {
         typeOf: factory_1.factory.assetTransactionType.COAReserveTransaction, // 変更(2024-03-08~)

package/lib/chevre/service/offer/eventServiceByCOA/authorize.d.ts

@@ -53,11 +53,6 @@ export declare function authorize(params: {
         requestBody: IRequestBody;
         responseBody: IResponseBody;
     };
-}, options: {
-    /**
-     * 2026-07-04~
-     */
-    useLegacyAuthorizeOfferObject: boolean;
 }): IAuthorizeOperation<Pick<IAuthorizeOfferAction, 'id' | 'instrument'> & {
     result: IAuthorizeOfferAction['result'];
 }>;

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

@@ -12,7 +12,7 @@ const factory_2 = require("../../../factory");
 /**
  * COA興行オファー承認
  */
-function authorize(params, options) {
+function authorize(params) {
     return async (repos) => {
         const transaction = await repos.placeOrder.findPlaceOrderInProgressById({
             typeOf: factory_2.factory.transactionType.PlaceOrder,
@@ -28,15 +28,18 @@ function authorize(params, options) {
         }
         let screeningEvent;
         let acceptedOffers;
+        // const pendingTransaction: factory.action.authorize.offer.eventService.ICOAPendingTransaction = {
+        //     theaterCode: params.result.requestBody.theaterCode,
+        //     dateJouei: params.result.requestBody.dateJouei,
+        //     titleCode: params.result.requestBody.titleCode,
+        //     titleBranchNum: params.result.requestBody.titleBranchNum,
+        //     timeBegin: params.result.requestBody.timeBegin,
+        //     tmpReserveNum: params.result.responseBody.tmpReserveNum,
+        //     transactionNumber: params.result.responseBody.tmpReserveNum,
+        //     typeOf: factory.assetTransactionType.COAReserveTransaction
+        // };
         const pendingTransaction = {
-            theaterCode: params.result.requestBody.theaterCode,
-            dateJouei: params.result.requestBody.dateJouei,
-            titleCode: params.result.requestBody.titleCode,
-            titleBranchNum: params.result.requestBody.titleBranchNum,
-            timeBegin: params.result.requestBody.timeBegin,
-            tmpReserveNum: params.result.responseBody.tmpReserveNum,
             transactionNumber: params.result.responseBody.tmpReserveNum,
-            typeOf: factory_2.factory.assetTransactionType.COAReserveTransaction
         };
         try {
             screeningEvent = await repos.event.projectEventFieldsById({ id: params.object.event.id }, [
@@ -71,10 +74,10 @@ function authorize(params, options) {
             // アクション開始前に例外がthrowされてもCOA仮予約を取り消す機会をつくるためにFailedアクションを作成する(2023-09-12~)
             const failedActionAttributes = (0, factory_1.createAuthorizeSeatReservationActionAttributes)({
                 acceptAction: params.object.acceptAction,
-                event: { id: params.object.event.id, typeOf: factory_2.factory.eventType.ScreeningEvent },
+                // event: { id: params.object.event.id, typeOf: factory.eventType.ScreeningEvent },
                 transaction,
                 pendingTransaction
-            }, options);
+            });
             const failedAction = await repos.action.start(failedActionAttributes);
             await repos.action.giveUp({ typeOf: failedAction.typeOf, id: failedAction.id, error });
             throw error;
@@ -88,10 +91,10 @@ function authorize(params, options) {
         // 承認アクションを開始
         const actionAttributes = (0, factory_1.createAuthorizeSeatReservationActionAttributes)({
             acceptAction: params.object.acceptAction,
-            event: { id: screeningEvent.id, typeOf: screeningEvent.typeOf },
+            // event: { id: screeningEvent.id, typeOf: screeningEvent.typeOf },
             transaction,
             pendingTransaction
-        }, options);
+        });
         const action = await repos.action.start(actionAttributes);
         try {
             // 座席仮予約からオファー情報を生成する

package/lib/chevre/service/offer/eventServiceByCOA/authorizeByAcceptAction.d.ts

@@ -26,11 +26,6 @@ export declare function authorizeByAcceptAction(params: {
          */
         id: string;
     };
-}, options: {
-    /**
-     * 2026-07-04~
-     */
-    useLegacyAuthorizeOfferObject: boolean;
 }): IAuthorizeOperation<Pick<IAuthorizeOfferAction, 'id' | 'instrument'> & {
     result: IAuthorizeOfferAction['result'];
 }>;

package/lib/chevre/service/offer/eventServiceByCOA/authorizeByAcceptAction.js

@@ -7,7 +7,7 @@ const factory_1 = require("../../../factory");
 /**
  * 採用アクションからCOA興行オファー承認
  */
-function authorizeByAcceptAction(params, options) {
+function authorizeByAcceptAction(params) {
     return async (repos) => {
         const acceptAction = await repos.accpetCOAOfferAction.findCompletedById({
             project: { id: params.project.id },
@@ -57,7 +57,7 @@ function authorizeByAcceptAction(params, options) {
                 store: { id: params.store.id },
                 result: { requestBody, responseBody }
             };
-            action = await (0, authorize_1.authorize)(authorizeParams, options)(repos);
+            action = await (0, authorize_1.authorize)(authorizeParams)(repos);
         }
         return action;
     };

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.5.0-alpha.6",
+    "@chevre/factory": "9.5.0-alpha.7",
     "@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.2.0-alpha.20"
+  "version": "25.2.0-alpha.22"
 }