@chevre/domain 23.1.0-alpha.0 → 23.1.0-alpha.10

package/lib/chevre/service/assetTransaction/reserve/validateStartRequest.d.ts

@@ -1,10 +1,15 @@
 import * as factory from '../../../factory';
 import { IMinimizedIndividualEvent } from '../../../factory/event';
+import type { AuthorizationRepo } from '../../../repo/authorization';
+import type { EventOfferRepo } from '../../../repo/eventOffer';
 import type { IssuerRepo } from '../../../repo/issuer';
+import type { MemberRepo } from '../../../repo/member';
 import type { MemberProgramRepo } from '../../../repo/memberProgram';
 import type { ProductOfferRepo } from '../../../repo/productOffer';
+import type { TicketRepo } from '../../../repo/ticket';
 declare function validateStartRequest(params: {
     object: factory.assetTransaction.reserve.IObjectWithoutDetail;
+    instrument: factory.assetTransaction.reserve.IInstrument[];
     event: Pick<IMinimizedIndividualEvent, 'offers' | 'id' | 'project' | 'identifier'>;
     /**
      * アプリケーションごとのオファーを検証するかどうか
@@ -19,8 +24,12 @@ declare function validateStartRequest(params: {
         id?: string;
     };
 }): (repos: {
+    authorization: AuthorizationRepo;
+    eventOffer: EventOfferRepo;
     issuer: IssuerRepo;
+    member: MemberRepo;
     memberProgram: MemberProgramRepo;
     productOffer: ProductOfferRepo;
+    ticket: TicketRepo;
 }) => Promise<void>;
 export { validateStartRequest };

package/lib/chevre/service/assetTransaction/reserve/validateStartRequest.js

@@ -12,8 +12,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.validateStartRequest = validateStartRequest;
 const moment = require("moment");
 const factory = require("../../../factory");
+const fixExtendedEventOffer_1 = require("./validateStartRequest/fixExtendedEventOffer");
 const validateIssuedOfferIfExists_1 = require("./validateStartRequest/validateIssuedOfferIfExists");
 const validateMemberTierIfExists_1 = require("./validateStartRequest/validateMemberTierIfExists");
+const verifyTicketTokenAsNeeded_1 = require("./validateStartRequest/verifyTicketTokenAsNeeded");
 function validateStartRequest(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         var _a;
@@ -23,11 +25,20 @@ function validateStartRequest(params) {
             if (typeof ((_a = params.store) === null || _a === void 0 ? void 0 : _a.id) !== 'string') {
                 throw new factory.errors.NotFound('store.id');
             }
+            // ticketTokenから、acceptedEventOfferを生成(2025-11-18~)
+            const { acceptedEventOffer } = yield (0, verifyTicketTokenAsNeeded_1.verifyTicketTokenAsNeeded)({
+                event,
+                now,
+                availableAt: { id: params.store.id },
+                object: params.object,
+                instrument: params.instrument
+            })(repos);
             yield validateApplicationOffer({
                 event,
                 now,
                 availableAt: { id: params.store.id },
-                object: params.object
+                object: params.object,
+                acceptedEventOffer
             })(repos);
         }
         if (params.validateEvent === true) {
@@ -40,7 +51,7 @@ function validateStartRequest(params) {
  */
 function validateApplicationOffer(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
-        const { event, availableAt } = params;
+        const { event, availableAt, acceptedEventOffer } = params;
         const acceptedDate = moment(params.now);
         const eventOffers = event.offers;
         // アプリケーションごとの設定を参照する(2022-11-19~)
@@ -67,20 +78,29 @@ function validateApplicationOffer(params) {
                 throw new factory.errors.Argument('reservationFor.id', `Offer of ${params.event.id} is valid through ${validThrough}`);
             }
         }
-        // 有効メンバープログラムティアが存在する場合
-        yield (0, validateMemberTierIfExists_1.validateMemberTierIfExists)({
-            event,
-            now: params.now,
-            object: params.object,
-            makesOfferOnApplication
-        })(repos);
-        // オファートークン検証(2025-10-21~)
-        yield (0, validateIssuedOfferIfExists_1.validateIssuedOfferIfExists)({
-            event,
-            now: params.now,
-            object: params.object,
-            makesOfferOnApplication
-        })(repos);
+        // support extensibleEventOffer(2025-11-11~)
+        if (eventOffers.typeOf === factory.offerType.AggregateOffer) {
+            const existingEventOffer = yield (0, fixExtendedEventOffer_1.fixExtendedEventOffer)(params)(repos);
+            // 拡張可能なオファー設定の場合のみ、オファートークンを検証する(2025-11-11~)
+            yield (0, validateIssuedOfferIfExists_1.validateIssuedOfferIfExists)({
+                event,
+                now: params.now,
+                object: params.object,
+                eventOffer: existingEventOffer,
+                acceptedEventOffer
+            })(repos);
+        }
+        else {
+            // 拡張可能なオファーに場合に、有効メンバープログラムティア設定は存在しない前提
+            // 有効メンバープログラムティアが存在する場合
+            yield (0, validateMemberTierIfExists_1.validateMemberTierIfExists)({
+                event,
+                now: params.now,
+                object: params.object,
+                makesOfferOnApplication,
+                acceptedEventOffer
+            })(repos);
+        }
     });
 }
 /**

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

@@ -7,9 +7,6 @@ declare function createReserveTransactionStartParams(params: {
     acceptedOffers: factory.assetTransaction.reserve.IAcceptedTicketOfferWithoutDetail[];
     event: {
         id: string;
-        offers?: {
-            validForMemberTier?: factory.assetTransaction.reserve.ITokenizedMemberProgramTier;
-        };
     };
     broker?: factory.reservation.IBroker<factory.reservationType>;
     transaction: Pick<factory.transaction.ITransaction<factory.transactionType.PlaceOrder>, 'expires' | 'seller'>;

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

@@ -8,7 +8,7 @@ exports.responseBody2acceptedOffers4result = responseBody2acceptedOffers4result;
 const moment = require("moment");
 const factory = require("../../../../factory");
 function createReserveTransactionStartParams(params) {
-    var _a, _b;
+    var _a;
     const { transaction, transactionNumber } = params;
     const { seller } = transaction;
     const acceptedTicketOffersWithoutDetail = (Array.isArray(params.acceptedOffers))
@@ -48,8 +48,9 @@ function createReserveTransactionStartParams(params) {
         //     }
         // ]
     };
-    const validForMemberTier = (_b = params.event.offers) === null || _b === void 0 ? void 0 : _b.validForMemberTier;
-    const object = Object.assign({ acceptedOffer: acceptedTicketOffersWithoutDetail, reservationFor: Object.assign({ id: params.event.id }, (typeof (validForMemberTier === null || validForMemberTier === void 0 ? void 0 : validForMemberTier.token) === 'string') ? { offers: { validForMemberTier } } : undefined) }, (params.broker !== undefined) ? { broker: params.broker } : undefined);
+    const object = Object.assign({ acceptedOffer: acceptedTicketOffersWithoutDetail, reservationFor: {
+            id: params.event.id
+        } }, (params.broker !== undefined) ? { broker: params.broker } : undefined);
     return {
         project: { typeOf: factory.organizationType.Project, id: params.project.id },
         typeOf: factory.assetTransactionType.Reserve,

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

@@ -16,50 +16,13 @@ const factory = require("../../../../../factory");
  */
 function requestedProgramMembershipUsed2permit(params) {
     // tslint:disable-next-line:cyclomatic-complexity max-func-body-length
-    return (repos
-    // credentials: {
-    //     jwt: JWTCredentials;
-    // }
-    ) => __awaiter(this, void 0, void 0, function* () {
+    return (repos) => __awaiter(this, void 0, void 0, function* () {
         var _a, _b;
         let programMembershipUsedAsPermit;
         const { programMembershipUsed, placeOrder } = params;
         // discontinue token as fromLocation(ticketTokenへ移行するべき)(2024-12-18~)
         if (typeof programMembershipUsed === 'string') {
             throw new factory.errors.NotImplemented('programMembershipUsed as string not implemented');
-            // トークン化されたメンバーシップがリクエストされた場合、実メンバーシップ情報へ変換する
-            // const { authorizedObject } = await CodeService.verifyToken({
-            //     project: { id: params.project.id },
-            //     agent: { id: params.project.id, typeOf: factory.organizationType.Project },
-            //     token: String(programMembershipUsed)
-            // })(repos);
-            // const permitOwnershipInfo = authorizedObject;
-            // if (Array.isArray(permitOwnershipInfo)) {
-            //     throw new factory.errors.NotImplemented('programMembershipUsed as an array not implemented');
-            // }
-            // if (permitOwnershipInfo.typeOf !== 'OwnershipInfo') {
-            //     throw new factory.errors.Argument('programMembershipUsed', 'must be OwnershipInfo');
-            // }
-            // const typeOfGood = permitOwnershipInfo.typeOfGood;
-            // if (typeOfGood.typeOf !== factory.permit.PermitType.Permit) {
-            //     throw new factory.errors.Argument('programMembershipUsed', 'must be Permit');
-            // }
-            // const issuedThroughTypeOf = typeOfGood.issuedThrough?.typeOf;
-            // if (issuedThroughTypeOf !== factory.product.ProductType.MembershipService) {
-            //     throw new factory.errors.Argument('programMembershipUsed', 'must be issued through MembershipService');
-            // }
-            // if (typeof typeOfGood.issuedThrough?.id !== 'string') {
-            //     throw new factory.errors.NotFound('itemOffered.serviceOutput.programMembershipUsed.issuedThrough.id');
-            // }
-            // if (issuedThroughTypeOf === factory.product.ProductType.MembershipService) {
-            //     programMembershipUsedAsPermit = {
-            //         identifier: typeOfGood.identifier,
-            //         issuedThrough: { id: typeOfGood.issuedThrough.id, typeOf: issuedThroughTypeOf },
-            //         typeOf: factory.permit.PermitType.Permit
-            //     };
-            // } else {
-            //     throw new factory.errors.Argument('programMembershipUsed', `invalid issuedThrough.typeOf: ${issuedThroughTypeOf}`);
-            // }
         }
         else if ((programMembershipUsed === null || programMembershipUsed === void 0 ? void 0 : programMembershipUsed.typeOf) === 'Ticket') {
             const { ticketToken } = programMembershipUsed;
@@ -81,47 +44,71 @@ function requestedProgramMembershipUsed2permit(params) {
                 if (object.typeOf !== 'OwnershipInfo') {
                     throw new factory.errors.Argument('programMembershipUsed', 'invalid authorization');
                 }
-                // const ownershipInfoId = object.id;
-                // const permitOwnershipInfo = (await repos.ownershipInfo.search({
-                //     limit: 1,
-                //     page: 1,
-                //     project: { id: { $eq: params.project.id } },
-                //     ids: [ownershipInfoId],
-                //     ownedFrom: now,
-                //     ownedThrough: now
-                // })).shift();
-                // if (permitOwnershipInfo === undefined) {
-                //     throw new factory.errors.NotFound('OwnershipInfo');
-                // }
                 // audience検証
                 if ((audience === null || audience === void 0 ? void 0 : audience.typeOf) !== factory.transactionType.PlaceOrder || audience.id !== placeOrder.id) {
                     throw new factory.errors.Argument('programMembershipUsed', 'audience not matched with placeOrder');
                 }
                 const permitOwnershipInfo = object;
-                if (permitOwnershipInfo.typeOfGood.typeOf !== factory.permit.PermitType.Permit) {
-                    throw new factory.errors.Argument('programMembershipUsed', 'ownershipInfo.typeOfGood.typeOf must be Permit');
+                const ownedGoodType = (_a = permitOwnershipInfo.typeOfGood) === null || _a === void 0 ? void 0 : _a.typeOf;
+                if (ownedGoodType === factory.permit.PermitType.Permit) {
+                    // discontinue(2025-11-14~)
+                    throw new factory.errors.Argument('programMembershipUsed', `ownershipInfo.typeOfGood.typeOf: ${ownedGoodType} discontinued`);
+                    // const issuedThroughTypeOf = permitOwnershipInfo.typeOfGood.issuedThrough?.typeOf;
+                    // if (issuedThroughTypeOf === factory.service.paymentService.PaymentServiceType.FaceToFace) {
+                    //     programMembershipUsedAsPermit = {
+                    //         identifier: permitOwnershipInfo.typeOfGood.identifier,
+                    //         issuedThrough: { typeOf: issuedThroughTypeOf },
+                    //         typeOf: factory.permit.PermitType.Permit
+                    //     };
+                    // } else if (issuedThroughTypeOf === factory.product.ProductType.MembershipService
+                    //     || issuedThroughTypeOf === factory.service.paymentService.PaymentServiceType.CreditCard) {
+                    //     if (typeof permitOwnershipInfo.typeOfGood.issuedThrough?.id !== 'string') {
+                    //         throw new factory.errors.Argument(
+                    //             'programMembershipUsed',
+                    //             'ownershipInfo.typeOfGood.issuedThrough.id undefined'
+                    //         );
+                    //     }
+                    //     programMembershipUsedAsPermit = {
+                    //         identifier: permitOwnershipInfo.typeOfGood.identifier,
+                    //         issuedThrough: { id: permitOwnershipInfo.typeOfGood.issuedThrough.id, typeOf: issuedThroughTypeOf },
+                    //         typeOf: factory.permit.PermitType.Permit
+                    //     };
+                    // } else {
+                    //     throw new factory.errors.Argument(
+                    //         'programMembershipUsed',
+                    //         `invalid issuedThrough.typeOf: ${issuedThroughTypeOf}`
+                    //     );
+                    // }
                 }
-                const issuedThroughTypeOf = (_a = permitOwnershipInfo.typeOfGood.issuedThrough) === null || _a === void 0 ? void 0 : _a.typeOf;
-                if (issuedThroughTypeOf === factory.service.paymentService.PaymentServiceType.FaceToFace) {
+                else if (ownedGoodType === factory.service.paymentService.PaymentServiceType.FaceToFace) {
+                    const paymentMethodId = permitOwnershipInfo.typeOfGood.serviceOutput.paymentMethodId;
+                    if (typeof paymentMethodId !== 'string' || paymentMethodId === '') {
+                        throw new factory.errors.Argument('programMembershipUsed', 'paymentMethodId required');
+                    }
                     programMembershipUsedAsPermit = {
-                        identifier: permitOwnershipInfo.typeOfGood.identifier,
-                        issuedThrough: { typeOf: issuedThroughTypeOf },
+                        identifier: paymentMethodId,
+                        issuedThrough: { typeOf: ownedGoodType },
                         typeOf: factory.permit.PermitType.Permit
                     };
                 }
-                else if (issuedThroughTypeOf === factory.product.ProductType.MembershipService
-                    || issuedThroughTypeOf === factory.service.paymentService.PaymentServiceType.CreditCard) {
-                    if (typeof ((_b = permitOwnershipInfo.typeOfGood.issuedThrough) === null || _b === void 0 ? void 0 : _b.id) !== 'string') {
-                        throw new factory.errors.Argument('programMembershipUsed', 'ownershipInfo.typeOfGood.issuedThrough.id undefined');
+                else if (ownedGoodType === factory.service.paymentService.PaymentServiceType.CreditCard) {
+                    // CreditCard決済の場合、決済方法所有権を受け入れる(2025-11-11~)
+                    const paymentServiceId = (_b = permitOwnershipInfo.typeOfGood) === null || _b === void 0 ? void 0 : _b.id;
+                    const paymentMethodId = permitOwnershipInfo.typeOfGood.serviceOutput.paymentMethodId;
+                    if (typeof paymentServiceId !== 'string' || paymentServiceId === '') {
+                        throw new factory.errors.Argument('programMembershipUsed', 'paymentServiceId required');
+                    }
+                    if (typeof paymentMethodId !== 'string' || paymentMethodId === '') {
+                        throw new factory.errors.Argument('programMembershipUsed', 'paymentMethodId required');
                     }
                     programMembershipUsedAsPermit = {
-                        identifier: permitOwnershipInfo.typeOfGood.identifier,
-                        issuedThrough: { id: permitOwnershipInfo.typeOfGood.issuedThrough.id, typeOf: issuedThroughTypeOf },
+                        identifier: paymentMethodId,
+                        issuedThrough: { id: paymentServiceId, typeOf: ownedGoodType },
                         typeOf: factory.permit.PermitType.Permit
                     };
                 }
                 else {
-                    throw new factory.errors.Argument('programMembershipUsed', `invalid issuedThrough.typeOf: ${issuedThroughTypeOf}`);
+                    throw new factory.errors.Argument('programMembershipUsed', `ownershipInfo.typeOfGood.typeOf: ${ownedGoodType} invalid`);
                 }
             }
         }

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

@@ -5,8 +5,10 @@ import type { AdvanceBookingRequirementRepo } from '../../../../repo/advanceBook
 import type { AssetTransactionRepo } from '../../../../repo/assetTransaction';
 import type { AuthorizationRepo } from '../../../../repo/authorization';
 import type { EventRepo, IMinimizedIndividualEvent } from '../../../../repo/event';
+import type { EventOfferRepo } from '../../../../repo/eventOffer';
 import { EventSeriesRepo } from '../../../../repo/eventSeries';
 import type { IssuerRepo } from '../../../../repo/issuer';
+import type { MemberRepo } from '../../../../repo/member';
 import type { MemberProgramRepo } from '../../../../repo/memberProgram';
 import type { OfferRepo } from '../../../../repo/offer/unitPriceInCatalog';
 import type { OfferCatalogRepo } from '../../../../repo/offerCatalog';
@@ -28,6 +30,7 @@ declare function processStartReserve4chevre(params: {
     event: Pick<IMinimizedIndividualEvent, 'id'> & {
         offers?: {
             validForMemberTier?: factory.assetTransaction.reserve.ITokenizedMemberProgramTier;
+            identifier?: string;
         };
     };
     broker?: factory.reservation.IBroker<factory.reservationType>;
@@ -41,6 +44,7 @@ declare function processStartReserve4chevre(params: {
     validateEventOfferPeriod: boolean;
     validateEvent: boolean;
     orderNumber: string;
+    instrument: factory.action.reserve.ITicketAsInstrument[];
 }, options: {
     /**
      * 最大n日前から予約可能
@@ -52,8 +56,10 @@ declare function processStartReserve4chevre(params: {
     authorization: AuthorizationRepo;
     stockHolder: StockHolderRepo;
     event: EventRepo;
+    eventOffer: EventOfferRepo;
     eventSeries: EventSeriesRepo;
     issuer: IssuerRepo;
+    member: MemberRepo;
     memberProgram: MemberProgramRepo;
     offer: OfferRepo;
     offerCatalog: OfferCatalogRepo;

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

@@ -20,21 +20,21 @@ function processStartReserve4chevre(params, options) {
     //     jwt: JWTCredentials;
     // }
     ) => __awaiter(this, void 0, void 0, function* () {
-        var _a, _b;
         const { event, transaction, transactionNumber } = params;
         let acceptedOffers4result = [];
         // 予約取引開始
         const startParams = (0, factory_1.createReserveTransactionStartParams)(Object.assign({ project: transaction.project, 
             // object: <IObjectWithDetail>action.object,
-            acceptedOffers: params.acceptedOffers, event: Object.assign({ id: event.id }, (typeof ((_b = (_a = event.offers) === null || _a === void 0 ? void 0 : _a.validForMemberTier) === null || _b === void 0 ? void 0 : _b.token) === 'string')
-                ? { offers: { validForMemberTier: event.offers.validForMemberTier } }
-                : undefined), transaction,
+            acceptedOffers: params.acceptedOffers, event: {
+                id: event.id
+            }, transaction,
             transactionNumber }, (params.broker !== undefined) ? { broker: params.broker } : undefined));
         const startParamObject = yield validateObjectWithoutDetail(startParams, { id: params.transaction.id })(repos);
         const startReserveTransactionResult = yield ReserveTransactionService.start(Object.assign(Object.assign({}, startParams), { object: startParamObject, 
             // discontinue preSearchedEvent(2024-07-17~)
             // preSearchedEvent: event,
             preSearchedTicketOffers: params.ticketOffers, preSearchedUnitPriceOffers: params.unitPriceOffers, availableAtOrFrom: { id: params.availableAtOrFrom.id }, validateEvent: params.validateEvent, validateEventOfferPeriod: params.validateEventOfferPeriod, validateAppliesToMovieTicket: true, instrument: [
+                ...params.instrument, // support Ticket(2025-11-18~)
                 { orderNumber: params.orderNumber, typeOf: factory.order.OrderType.Order },
                 { id: transaction.id, typeOf: transaction.typeOf }
             ] }), options)(repos, settings);

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

@@ -5,8 +5,10 @@ import type { AdvanceBookingRequirementRepo } from '../../../repo/advanceBooking
 import type { AssetTransactionRepo } from '../../../repo/assetTransaction';
 import type { AuthorizationRepo } from '../../../repo/authorization';
 import type { EventRepo } from '../../../repo/event';
+import type { EventOfferRepo } from '../../../repo/eventOffer';
 import { EventSeriesRepo } from '../../../repo/eventSeries';
 import type { IssuerRepo } from '../../../repo/issuer';
+import type { MemberRepo } from '../../../repo/member';
 import type { MemberProgramRepo } from '../../../repo/memberProgram';
 import type { OfferRepo } from '../../../repo/offer/unitPriceInCatalog';
 import type { OfferCatalogRepo } from '../../../repo/offerCatalog';
@@ -32,8 +34,10 @@ interface IAuthorizeRepos {
     assetTransaction: AssetTransactionRepo;
     authorization: AuthorizationRepo;
     event: EventRepo;
+    eventOffer: EventOfferRepo;
     eventSeries: EventSeriesRepo;
     issuer: IssuerRepo;
+    member: MemberRepo;
     memberProgram: MemberProgramRepo;
     stockHolder: StockHolderRepo;
     offer: OfferRepo;
@@ -76,6 +80,7 @@ declare function authorize(params: {
         typeOf: factory.organizationType.Project;
     };
     object: IObjectWithoutDetail;
+    instrument: factory.action.reserve.ITicketAsInstrument[];
     agent: {
         id: string;
     };

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

@@ -53,7 +53,7 @@ function authorize(params, options) {
         const action = yield repos.action.start(actionAttributes);
         try {
             const processStartReserveResult = yield (0, processStartReserve4chevre_1.processStartReserve4chevre)(Object.assign({ acceptedOffers, event,
-                transactionNumber, transaction, availableAtOrFrom: { id: params.store.id }, ticketOffers, unitPriceOffers, validateEvent: params.validateEvent === true, validateEventOfferPeriod: params.validateEventOfferPeriod === true, orderNumber }, (typeof ((_a = params.object.broker) === null || _a === void 0 ? void 0 : _a.typeOf) === 'string') ? { broker: params.object.broker } : undefined), options)(repos, settings);
+                transactionNumber, transaction, availableAtOrFrom: { id: params.store.id }, ticketOffers, unitPriceOffers, validateEvent: params.validateEvent === true, validateEventOfferPeriod: params.validateEventOfferPeriod === true, orderNumber, instrument: params.instrument }, (typeof ((_a = params.object.broker) === null || _a === void 0 ? void 0 : _a.typeOf) === 'string') ? { broker: params.object.broker } : undefined), options)(repos, settings);
             acceptedOffers4result = processStartReserveResult.acceptedOffers4result;
             // add orderInTransaction(2024-01-15~)
             if (!noOfferSpecified) {
@@ -82,7 +82,7 @@ function authorize(params, options) {
 }
 function validateCreateRequest(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
-        var _a, _b, _c;
+        var _a, _b;
         const transaction = yield repos.transaction.projectFieldsInProgressById({
             typeOf: factory.transactionType.PlaceOrder,
             id: params.transaction.id
@@ -98,9 +98,14 @@ function validateCreateRequest(params) {
         if (typeof ((_b = params.object.reservationFor) === null || _b === void 0 ? void 0 : _b.id) !== 'string' || params.object.reservationFor.id.length === 0) {
             throw new factory.errors.ArgumentNull('object.reservationFor.id');
         }
-        // support validForMemberTier(2025-05-14~)
-        const validForMemberTier = (_c = params.object.reservationFor.offers) === null || _c === void 0 ? void 0 : _c.validForMemberTier;
-        const event = Object.assign({ id: params.object.reservationFor.id, typeOf: factory.eventType.ScreeningEvent }, (typeof (validForMemberTier === null || validForMemberTier === void 0 ? void 0 : validForMemberTier.token) === 'string') ? { offers: { validForMemberTier } } : undefined);
+        const event = {
+            id: params.object.reservationFor.id,
+            typeOf: 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/onEventChanged.js

@@ -116,29 +116,45 @@ function createInformTasks(params, setting) {
             );
             // 最適化(2024-03-22~)
             events4inform = screeningEvents4inform.map(({ project, organizer, typeOf, name, doorTime, endDate, eventStatus, location, startDate, superEvent, offers, id, additionalProperty, identifier }) => {
-                var _a;
-                const eventOfferAsNotification = (((_a = offers.offeredThrough) === null || _a === void 0 ? void 0 : _a.identifier) === factory.service.webAPI.Identifier.COA)
-                    ? {
+                var _a, _b;
+                const sellerMakesOffersAsNotification = (Array.isArray((_a = offers.seller) === null || _a === void 0 ? void 0 : _a.makesOffer))
+                    ? offers.seller.makesOffer.map((eventSellerMakesOffer) => {
+                        return Object.assign({ availabilityEnds: eventSellerMakesOffer.availabilityEnds, availabilityStarts: eventSellerMakesOffer.availabilityStarts, validFrom: eventSellerMakesOffer.validFrom, validThrough: eventSellerMakesOffer.validThrough, availableAtOrFrom: [eventSellerMakesOffer.availableAtOrFrom] }, (typeof eventSellerMakesOffer.identifier === 'string')
+                            ? { identifier: eventSellerMakesOffer.identifier }
+                            : undefined // support notify identifier(2025-11-01~)
+                        );
+                    })
+                    : [];
+                let eventOfferAsNotification;
+                if (((_b = offers.offeredThrough) === null || _b === void 0 ? void 0 : _b.identifier) === factory.service.webAPI.Identifier.COA) {
+                    eventOfferAsNotification = {
                         typeOf: offers.typeOf,
                         itemOffered: offers.itemOffered
-                    }
-                    : {
+                    };
+                }
+                else if (offers.typeOf === factory.offerType.AggregateOffer) {
+                    eventOfferAsNotification = {
+                        typeOf: offers.typeOf,
+                        itemOffered: offers.itemOffered,
+                        seller: {
+                            id: offers.seller.id,
+                            typeOf: offers.seller.typeOf,
+                            makesOffer: sellerMakesOffersAsNotification
+                        }
+                    };
+                }
+                else {
+                    eventOfferAsNotification = {
                         typeOf: offers.typeOf,
                         itemOffered: offers.itemOffered,
                         seller: {
                             id: offers.seller.id,
                             typeOf: offers.seller.typeOf,
                             // makesOfferを追加(2024-03-26~)
-                            makesOffer: (Array.isArray(offers.seller.makesOffer))
-                                ? offers.seller.makesOffer.map((eventSellerMakesOffer) => {
-                                    return Object.assign({ availabilityEnds: eventSellerMakesOffer.availabilityEnds, availabilityStarts: eventSellerMakesOffer.availabilityStarts, validFrom: eventSellerMakesOffer.validFrom, validThrough: eventSellerMakesOffer.validThrough, availableAtOrFrom: [eventSellerMakesOffer.availableAtOrFrom] }, (typeof eventSellerMakesOffer.identifier === 'string')
-                                        ? { identifier: eventSellerMakesOffer.identifier }
-                                        : undefined // support notify identifier(2025-11-01~)
-                                    );
-                                })
-                                : []
+                            makesOffer: sellerMakesOffersAsNotification
                         }
                     };
+                }
                 return Object.assign({ project, organizer, typeOf, name, doorTime, endDate,
                     eventStatus, location, startDate, superEvent, id, additionalProperty, offers: eventOfferAsNotification }, (typeof identifier === 'string') ? { identifier } : undefined // support notify identifier(2025-11-01~)
                 );

package/lib/chevre/service/payment/any/authorize/fixTransactionNumber.d.ts

@@ -5,7 +5,6 @@ import type { TicketRepo } from '../../../../repo/ticket';
 import type { ITransactionInProgress, TransactionRepo } from '../../../../repo/transaction';
 import type { TransactionNumberRepo } from '../../../../repo/transactionNumber';
 import * as PayTransactionService from '../../../assetTransaction/pay';
-import { IPermitOrInvoice } from '../verifyTicketTokenAsNeeded';
 interface IFixTransactionNumberRepos {
     action: ActionRepo;
     authorization: AuthorizationRepo;
@@ -28,7 +27,7 @@ declare function fixTransactionNumber(params: {
     transactionNumber: string;
     pendingPaymentAgencyTransaction?: PayTransactionService.IPaymentAgencyTransaction;
     creditCard?: factory.action.authorize.paymentMethod.any.ICreditCard;
-    permitOrInvoice?: IPermitOrInvoice;
+    permitOrInvoice?: never;
     id?: never;
 } | {
     /**

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

@@ -81,6 +81,8 @@ function fixTransactionNumber(params) {
             const publishTransactionNumberResult = yield repos.transactionNumber.publishByTimestamp({ startDate: new Date() });
             transactionNumber = publishTransactionNumberResult.transactionNumber;
         }
-        return Object.assign(Object.assign(Object.assign({ transactionNumber }, (pendingPaymentAgencyTransaction !== undefined) ? { pendingPaymentAgencyTransaction } : undefined), (creditCard !== undefined) ? { creditCard } : undefined), (permitOrInvoice !== undefined) ? { permitOrInvoice } : undefined);
+        return Object.assign(Object.assign({ transactionNumber }, (pendingPaymentAgencyTransaction !== undefined) ? { pendingPaymentAgencyTransaction } : undefined), (creditCard !== undefined) ? { creditCard } : undefined
+        // ...(permitOrInvoice !== undefined) ? { permitOrInvoice } : undefined
+        );
     });
 }

package/lib/chevre/service/payment/any/factory.d.ts

@@ -34,7 +34,6 @@ export declare function createMovieTicket(params: factory.action.trade.pay.IMovi
 export declare function createAuthorizeResult(params: {
     object: factory.action.authorize.paymentMethod.any.IObjectIncludingPaymentMethodDetails;
     payTransaction: Pick<factory.assetTransaction.pay.ITransaction, 'object'>;
-    permit?: Pick<factory.ownershipInfo.IPermitAsGood, 'identifier'>;
 }): factory.action.authorize.paymentMethod.any.IResult;
 /**
  * 通知対象としてのアクションを最適化

package/lib/chevre/service/payment/any/verifyTicketTokenAsNeeded.js

@@ -11,9 +11,11 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.verifyTicketTokenAsNeeded = verifyTicketTokenAsNeeded;
 const factory = require("../../../factory");
+// tslint:disable-next-line:max-func-body-length
 function verifyTicketTokenAsNeeded(params) {
+    // tslint:disable-next-line:cyclomatic-complexity
     return (repos) => __awaiter(this, void 0, void 0, function* () {
-        var _a, _b;
+        var _a;
         const { paymentServiceType, object, project } = params;
         const { issuedThrough, ticketToken } = object;
         let permitOrInvoice;
@@ -45,24 +47,44 @@ function verifyTicketTokenAsNeeded(params) {
                     }
                     if (authorizedObject.typeOf === 'OwnershipInfo') {
                         const { typeOfGood } = authorizedObject;
-                        if (((_b = typeOfGood.issuedThrough) === null || _b === void 0 ? void 0 : _b.typeOf) !== paymentServiceType) {
-                            throw new factory.errors.Argument('ticketToken', 'paymentServiceType not matched');
+                        if (typeOfGood.typeOf === factory.permit.PermitType.Permit || typeOfGood.typeOf === 'Invoice') {
+                            // discontinue(2025-11-14~)
+                            throw new factory.errors.Argument('ticketToken', `typeOfGood.typeOf ${typeOfGood.typeOf} discontinued`);
+                            // if (typeOfGood.issuedThrough?.typeOf !== paymentServiceType) {
+                            //     throw new factory.errors.Argument('ticketToken', 'paymentServiceType not matched');
+                            // }
+                            // // FaceToFace以外の場合、発行サービスIDを検証
+                            // if (typeOfGood.issuedThrough.typeOf !== factory.service.paymentService.PaymentServiceType.FaceToFace) {
+                            //     if (typeOfGood.issuedThrough.id !== issuedThrough.id) {
+                            //         throw new factory.errors.Argument('ticketToken', 'issuedThrough.id not matched');
+                            //     }
+                            // }
+                            // if (typeOfGood.typeOf === factory.permit.PermitType.Permit) {
+                            //     permitOrInvoice = { identifier: typeOfGood.identifier, typeOf: factory.permit.PermitType.Permit };
+                            // } else if (typeOfGood.typeOf === 'Invoice') {
+                            //     //  support paymentServiceType.MovieTicket(2024-11-23~)
+                            //     permitOrInvoice = { paymentMethodId: typeOfGood.paymentMethodId, typeOf: 'Invoice' };
+                            // } else {
+                            //     throw new factory.errors.Argument('ticketToken', 'must be Permit or Invoice');
+                            // }
                         }
-                        // FaceToFace以外の場合、発行サービスIDを検証
-                        if (typeOfGood.issuedThrough.typeOf !== factory.service.paymentService.PaymentServiceType.FaceToFace) {
-                            if (typeOfGood.issuedThrough.id !== issuedThrough.id) {
-                                throw new factory.errors.Argument('ticketToken', 'issuedThrough.id not matched');
+                        else if (typeOfGood.typeOf === factory.service.paymentService.PaymentServiceType.CreditCard
+                            || typeOfGood.typeOf === factory.service.paymentService.PaymentServiceType.MovieTicket
+                            || typeOfGood.typeOf === factory.service.paymentService.PaymentServiceType.FaceToFace) {
+                            // 決済方法所有権を受け入れる(2025-11-11~)
+                            if (typeOfGood.typeOf !== paymentServiceType) {
+                                throw new factory.errors.Argument('ticketToken', 'paymentServiceType not matched');
                             }
-                        }
-                        if (typeOfGood.typeOf === factory.permit.PermitType.Permit) {
-                            permitOrInvoice = { identifier: typeOfGood.identifier, typeOf: factory.permit.PermitType.Permit };
-                        }
-                        else if (typeOfGood.typeOf === 'Invoice') {
-                            //  support paymentServiceType.MovieTicket(2024-11-23~)
-                            permitOrInvoice = { paymentMethodId: typeOfGood.paymentMethodId, typeOf: 'Invoice' };
+                            // FaceToFace以外の場合、発行サービスIDを検証
+                            if (typeOfGood.typeOf !== factory.service.paymentService.PaymentServiceType.FaceToFace) {
+                                if (typeOfGood.id !== issuedThrough.id) {
+                                    throw new factory.errors.Argument('ticketToken', 'issuedThrough.id not matched');
+                                }
+                            }
+                            permitOrInvoice = { paymentMethodId: typeOfGood.serviceOutput.paymentMethodId, typeOf: 'Invoice' };
                         }
                         else {
-                            throw new factory.errors.Argument('ticketToken', 'must be Permit or Invoice');
+                            throw new factory.errors.Argument('ticketToken', `invalid typeOfGood.typeOf ${typeOfGood.typeOf}`);
                         }
                     }
                     else {

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

@@ -439,7 +439,7 @@ function authorize(params) {
         if (typeof fixTransactionNumberResult.id === 'string') {
             return { id: fixTransactionNumberResult.id };
         }
-        const { transactionNumber, pendingPaymentAgencyTransaction, creditCard, permitOrInvoice } = fixTransactionNumberResult;
+        const { transactionNumber, pendingPaymentAgencyTransaction, creditCard } = fixTransactionNumberResult;
         // let transactionNumber: string | undefined;
         // let pendingPaymentAgencyTransaction: PayTransactionService.IPaymentAgencyTransaction | undefined;
         // let creditCard: factory.action.authorize.paymentMethod.any.ICreditCard | undefined = params.object.creditCard;
@@ -568,7 +568,11 @@ function authorize(params) {
                 throw error;
             }
         }
-        const result = (0, factory_1.createAuthorizeResult)(Object.assign({ payTransaction, object: authorizeObjectIncludingPaymentMethodDetails }, ((permitOrInvoice === null || permitOrInvoice === void 0 ? void 0 : permitOrInvoice.typeOf) === factory.permit.PermitType.Permit) ? { permit: permitOrInvoice } : undefined));
+        const result = (0, factory_1.createAuthorizeResult)({
+            payTransaction,
+            object: authorizeObjectIncludingPaymentMethodDetails
+            // ...(permitOrInvoice?.typeOf === factory.permit.PermitType.Permit) ? { permit: permitOrInvoice } : undefined
+        });
         yield repos.action.completeWithVoid({ typeOf: action.typeOf, id: action.id, result: result });
         return { id: action.id };
     });