@chevre/domain 25.2.0-alpha.0 → 25.2.0-alpha.1

package/lib/chevre/repo/action/actionProcess.js

@@ -272,23 +272,13 @@ class ActionProcessRepo {
                 }
             });
         }
-        const objectEventIdIn = params.object?.event?.id?.$in;
-        if (Array.isArray(objectEventIdIn)) {
-            andConditions.push({
-                'object.event.id': {
-                    $exists: true,
-                    $in: objectEventIdIn
-                }
-            });
-        }
-        // discontinue(2024-06-18~)
-        // const objectAcceptedOfferSeatNumberIn =
-        //     params.object?.acceptedOffer?.itemOffered?.serviceOutput?.reservedTicket?.ticketedSeat?.seatNumber?.$in;
-        // if (Array.isArray(objectAcceptedOfferSeatNumberIn)) {
+        // 承認アクションのobject.event廃止につき検索条件も廃止(2026-07-04~)
+        // const objectEventIdIn = params.object?.event?.id?.$in;
+        // if (Array.isArray(objectEventIdIn)) {
         //     andConditions.push({
-        //         'object.acceptedOffer.itemOffered.serviceOutput.reservedTicket.ticketedSeat.seatNumber': {
+        //         'object.event.id': {
         //             $exists: true,
-        //             $in: objectAcceptedOfferSeatNumberIn
+        //             $in: objectEventIdIn
         //         }
         //     });
         // }

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

@@ -21,6 +21,8 @@ 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,29 +80,19 @@ function createReserveTransactionStartParams(params) {
             .toDate() // 余裕を持って
     };
 }
-function createAuthorizeSeatReservationActionAttributes(params) {
+function createAuthorizeSeatReservationActionAttributes(params, options) {
+    const { useLegacyAuthorizeOfferObject } = options;
     const { event, transaction } = params;
     const authorizeObjectEvent = {
         id: event.id,
-        // offers: { // discontinue(2024-06-22~)
-        //     offeredThrough: {
-        //         identifier: factory.service.webAPI.Identifier.Chevre,
-        //         typeOf: 'WebAPI'
-        //     }
-        // },
-        // typeOf: event.typeOf
         typeOf: factory_1.factory.eventType.ScreeningEvent // fix(2024-07-17~)
     };
     const object = {
         typeOf: factory_1.factory.action.authorize.offer.eventService.ObjectType.SeatReservation,
-        event: authorizeObjectEvent
-        // pendingTransaction: params.pendingTransaction, // discontinue(2024-06-22~)
-        // ...(params.broker !== undefined) ? { broker: params.broker } : undefined // discontinue(2024-06-24~)
+        ...((useLegacyAuthorizeOfferObject) && { event: authorizeObjectEvent })
     };
     const instrument = {
-        // typeOf: 'WebAPI',
         typeOf: factory_1.factory.assetTransactionType.Reserve, // 変更(2024-03-08~)
-        // identifier: factory.service.webAPI.Identifier.Chevre, // discontinue(2025-01-02~)
         transactionNumber: params.instrument.transactionNumber
     };
     const agent = {

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

@@ -63,6 +63,10 @@ interface IAuthorizeOptions {
      * 最大n日前から予約可能
      */
     maxReservationGracePeriodInDays: number;
+    /**
+     * 2026-07-04~
+     */
+    useLegacyAuthorizeOfferObject: boolean;
 }
 /**
  * 興行オファー承認

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

@@ -34,7 +34,7 @@ function authorize(params, options) {
         const actionAttributes = (0, factory_2.createAuthorizeSeatReservationActionAttributes)({
             event, transaction,
             instrument: { transactionNumber }
-        });
+        }, options);
         const action = await repos.authorizeOfferAction.start(actionAttributes);
         try {
             const processStartReserveResult = await (0, processStartReserve4chevre_1.processStartReserve4chevre)({
@@ -139,10 +139,6 @@ function validateCreateRequest(params) {
         const event = {
             id: params.object.reservationFor.id,
             typeOf: factory_1.factory.eventType.ScreeningEvent // ひとまずfix(2024-07-17~)
-            // offers: {
-            //     ...(typeof validForMemberTier?.token === 'string') ? { validForMemberTier } : undefined,
-            //     ...(typeof eventOfferIdentifier === 'string') ? { identifier: eventOfferIdentifier } : undefined
-            // }
         };
         return { transaction, event };
     };

package/lib/chevre/service/offer/event/voidTransaction/processVoidTransaction4coa.js

@@ -14,7 +14,7 @@ function processVoidTransaction4coa(params, options) {
             throw new factory_1.factory.errors.NotFound('action.object.id');
         }
         const acceptAction = await repos.acceptCOAOfferAction.findById({ id: acceptActionId, typeOf: factory_1.factory.actionType.AcceptAction });
-        console.log('processVoidTransaction4coa processing...', params.action.id, params.action.purpose.id, acceptAction);
+        // console.log('processVoidTransaction4coa processing...', params.action.id, params.action.purpose.id, acceptAction);
         await (0, cancel_1.cancelByAcceptAction)({ action: acceptAction }, options)(repos);
     };
 }

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

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

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

@@ -9,30 +9,23 @@ exports.responseBody2acceptedOffers4result = responseBody2acceptedOffers4result;
 const moment_1 = __importDefault(require("moment"));
 const util_1 = require("util");
 const factory_1 = require("../../../../factory");
-function createAuthorizeSeatReservationActionAttributes(params) {
+function createAuthorizeSeatReservationActionAttributes(params, options) {
+    const { useLegacyAuthorizeOfferObject } = options;
     const transaction = params.transaction;
-    // 最適化(2022-06-07~)
     const authorizeObjectEvent = {
         id: params.event.id,
-        // イベント提供サービスを識別できるようにするために追加(2022-06-04~)
-        // offers: { // discontinue(2024-06-22~)
-        //     offeredThrough: {
-        //         identifier: factory.service.webAPI.Identifier.COA,
-        //         typeOf: 'WebAPI'
-        //     }
-        // },
         typeOf: params.event.typeOf
     };
     const authorizeObject = {
         typeOf: factory_1.factory.action.authorize.offer.eventService.ObjectType.SeatReservation,
         id: params.acceptAction.id,
-        event: authorizeObjectEvent,
-        pendingTransaction: params.pendingTransaction
+        ...((useLegacyAuthorizeOfferObject) && {
+            event: authorizeObjectEvent,
+            pendingTransaction: params.pendingTransaction
+        })
     };
     const instrument = {
-        // typeOf: 'WebAPI',
         typeOf: factory_1.factory.assetTransactionType.COAReserveTransaction, // 変更(2024-03-08~)
-        // identifier: factory.service.webAPI.Identifier.COA,// discontinue(2025-01-02~)
         transactionNumber: params.pendingTransaction.transactionNumber
     };
     return {

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

@@ -53,7 +53,11 @@ export declare function authorize(params: {
         requestBody: IRequestBody;
         responseBody: IResponseBody;
     };
-    options: Record<string, never>;
+}, 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) {
+function authorize(params, options) {
     return async (repos) => {
         const transaction = await repos.placeOrder.findPlaceOrderInProgressById({
             typeOf: factory_2.factory.transactionType.PlaceOrder,
@@ -71,11 +71,10 @@ function authorize(params) {
             // アクション開始前に例外がthrowされてもCOA仮予約を取り消す機会をつくるためにFailedアクションを作成する(2023-09-12~)
             const failedActionAttributes = (0, factory_1.createAuthorizeSeatReservationActionAttributes)({
                 acceptAction: params.object.acceptAction,
-                // acceptedOffers: [],
                 event: { id: params.object.event.id, typeOf: factory_2.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;
@@ -89,11 +88,10 @@ function authorize(params) {
         // 承認アクションを開始
         const actionAttributes = (0, factory_1.createAuthorizeSeatReservationActionAttributes)({
             acceptAction: params.object.acceptAction,
-            // acceptedOffers,
             event: { id: screeningEvent.id, typeOf: screeningEvent.typeOf },
             transaction,
             pendingTransaction
-        });
+        }, options);
         const action = await repos.action.start(actionAttributes);
         try {
             // 座席仮予約からオファー情報を生成する
@@ -114,14 +112,11 @@ function authorize(params) {
                 priceCurrency: factory_2.factory.priceCurrency.JPY,
                 amount: []
             };
-            // add orderInTransaction(2024-01-15~)
-            // if (params.options.useCreateOrderOnOfferAccepted) {
             await (0, any_1.acceptOffer)({
                 project: transaction.project,
                 placeOrderId: params.transaction.id,
                 acceptedOffers: acceptedOffers4result
             })(repos);
-            // }
         }
         catch (error) {
             try {

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

@@ -26,6 +26,11 @@ 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,23 +7,8 @@ const factory_1 = require("../../../factory");
 /**
  * 採用アクションからCOA興行オファー承認
  */
-function authorizeByAcceptAction(params) {
+function authorizeByAcceptAction(params, options) {
     return async (repos) => {
-        // const acceptAction = (<IAcceptAction[]>await repos.action.search(
-        //     {
-        //         limit: 1,
-        //         page: 1,
-        //         project: { id: { $eq: params.project.id } },
-        //         id: { $in: [params.object.id] },
-        //         typeOf: { $eq: factory.actionType.AcceptAction },
-        //         purpose: { id: { $in: [params.purpose.id] } },
-        //         actionStatus: { $in: [factory.actionStatusType.CompletedActionStatus] }
-        //     },
-        //     ['result', 'object', 'potentialActions']
-        // )).shift();
-        // if (acceptAction === undefined) {
-        //     throw new factory.errors.NotFound(factory.actionType.AcceptAction);
-        // }
         const acceptAction = await repos.accpetCOAOfferAction.findCompletedById({
             project: { id: params.project.id },
             id: params.object.id,
@@ -44,9 +29,6 @@ function authorizeByAcceptAction(params) {
                 agent: { id: params.agent.id },
                 transaction: { id: params.purpose.id },
                 id: acceptAction.potentialActions.id,
-                options: {
-                // useCreateOrderOnOfferAccepted: USE_CREATE_ORDER_ON_OFFER_ACCEPTED // discontinue(2024-05-28~)
-                }
             };
             action = await (0, changeOffers_1.changeOffers)(changeOfferParams)(repos);
         }
@@ -64,14 +46,6 @@ function authorizeByAcceptAction(params) {
             if (responseBody === undefined) {
                 throw new factory_1.factory.errors.NotFound('afterMedia by recipe');
             }
-            // const requestBody = acceptAction.instrument.requestBody;
-            // if (requestBody === undefined) {
-            //     throw new chevre.factory.errors.NotFound(`${chevre.factory.actionType.AcceptAction}.result.requestBody`);
-            // }
-            // const responseBody = acceptResult.result?.responseBody;
-            // if (responseBody === undefined) {
-            //     throw new chevre.factory.errors.NotFound(`${chevre.factory.actionType.AcceptAction}.result.responseBody`);
-            // }
             const authorizeParams = {
                 object: {
                     acceptAction: { id: params.object.id },
@@ -81,12 +55,9 @@ function authorizeByAcceptAction(params) {
                 agent: { id: params.agent.id },
                 transaction: { id: params.purpose.id },
                 store: { id: params.store.id },
-                result: { requestBody, responseBody },
-                options: {
-                // useCreateOrderOnOfferAccepted: USE_CREATE_ORDER_ON_OFFER_ACCEPTED // discontinue(2024-05-28~)
-                }
+                result: { requestBody, responseBody }
             };
-            action = await (0, authorize_1.authorize)(authorizeParams)(repos);
+            action = await (0, authorize_1.authorize)(authorizeParams, options)(repos);
         }
         return action;
     };

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

@@ -17,7 +17,6 @@ export declare function changeOffers(params: {
     transaction: {
         id: string;
     };
-    options: Record<string, never>;
 }): IAuthorizeOperation<Pick<IAuthorizeOfferAction, 'id' | 'instrument'> & {
     result: IAuthorizeOfferAction['result'];
 }>;

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

@@ -9,7 +9,6 @@ const any_1 = require("../any");
 const factory_1 = require("./authorize/factory");
 const validateAcceptedOffers_1 = require("./authorize/validateAcceptedOffers");
 const factory_2 = require("../../../factory");
-// type IAcceptAction = Pick<factory.action.accept.coaOffer.IAction, 'result'>;
 /**
  * COA興行オファー承認のオファーを変更
  */

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.0",
+    "@chevre/factory": "9.5.0-alpha.1",
     "@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.0"
+  "version": "25.2.0-alpha.1"
 }