@chevre/domain 23.1.0-alpha.2 → 23.1.0-alpha.21

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

@@ -20,13 +20,13 @@ function validateMemberTier(params) {
         const tierIdentifier = (_b = (_a = verifiedValidForMemberTier.member) === null || _a === void 0 ? void 0 : _a.memberOf) === null || _b === void 0 ? void 0 : _b.identifier;
         const memberProgramIdentifier = (_e = (_d = (_c = verifiedValidForMemberTier.member) === null || _c === void 0 ? void 0 : _c.memberOf) === null || _d === void 0 ? void 0 : _d.isTierOf) === null || _e === void 0 ? void 0 : _e.identifier;
         if (typeof tierIdentifier !== 'string') {
-            throw new factory.errors.Argument('reservationFor.offers.validForMemberTier', 'tier identifier must be string');
+            throw new factory.errors.Argument('ticketedOffer.validForMemberTier', 'tier identifier must be string');
         }
         if (typeof memberProgramIdentifier !== 'string') {
-            throw new factory.errors.Argument('reservationFor.offers.validForMemberTier', 'member program must be string');
+            throw new factory.errors.Argument('ticketedOffer.validForMemberTier', 'member program must be string');
         }
         if (memberProgramIdentifier !== memberProgramIdentifierMustBe) {
-            throw new factory.errors.Argument('reservationFor.offers.validForMemberTier', 'member program not matched');
+            throw new factory.errors.Argument('ticketedOffer.validForMemberTier', 'member program not matched');
         }
         const sellerId = event.offers.seller.id;
         if (typeof sellerId !== 'string' || sellerId === '') {
@@ -47,22 +47,6 @@ function validateMemberTier(params) {
         if (productOfferForMemberTier === undefined) {
             throw new factory.errors.NotFound(factory.offerType.Offer, 'valid product offers for member tier not found');
         }
-        // let validThroughMoment: moment.Moment;
-        // let validFromMoment: moment.Moment;
-        // validThroughMoment = moment(productOfferForMemberTier.validThrough, ROLE_DATE_FORMAT, true);
-        // validFromMoment = moment(productOfferForMemberTier.validFrom, ROLE_DATE_FORMAT, true);
-        // if (acceptedDate.isBefore(validFromMoment)) {
-        //     throw new factory.errors.Argument(
-        //         'reservationFor.offers.validForMemberTier',
-        //         `the offer id valid from ${validFromMoment}`
-        //     );
-        // }
-        // if (acceptedDate.isAfter(validThroughMoment)) {
-        //     throw new factory.errors.Argument(
-        //         'reservationFor.offers.validForMemberTier',
-        //         `the offer id valid through ${validThroughMoment}`
-        //     );
-        // }
     });
 }
 function verifyMemberTierToken(params) {
@@ -88,10 +72,10 @@ function verifyMemberTierToken(params) {
         catch (error) {
             // JWTエラーをハンドリング
             if (error instanceof jwt.TokenExpiredError) {
-                throw new factory.errors.Argument('reservationFor.offers.validForMemberTier', `invalid token. [${error.message} expiredAt:${error.expiredAt}]`);
+                throw new factory.errors.Argument('ticketedOffer.validForMemberTier', `invalid token. [${error.message} expiredAt:${error.expiredAt}]`);
             }
             else if (error instanceof jwt.JsonWebTokenError) {
-                throw new factory.errors.Argument('reservationFor.offers.validForMemberTier', `invalid token. [${error.message}]`);
+                throw new factory.errors.Argument('ticketedOffer.validForMemberTier', `invalid token. [${error.message}]`);
             }
             throw error;
         }
@@ -101,7 +85,7 @@ function verifyMemberTierToken(params) {
 function validateMemberTierIfExists(params) {
     // tslint:disable-next-line:cyclomatic-complexity max-func-body-length
     return (repos) => __awaiter(this, void 0, void 0, function* () {
-        var _a, _b, _c, _d;
+        var _a, _b, _c;
         const { event, makesOfferOnApplication } = params;
         const acceptedDate = moment(params.now);
         const eventOffers = event.offers;
@@ -109,16 +93,16 @@ function validateMemberTierIfExists(params) {
         // support validForMemberTier(2025-05-14~)
         const validForMemberTierExists = ((_a = makesOfferOnApplication.validForMemberTier) === null || _a === void 0 ? void 0 : _a.typeOf) === 'MemberProgramTier';
         if (validForMemberTierExists) {
-            const tokenizedMemberProgramTier = (_c = (_b = params.object.reservationFor) === null || _b === void 0 ? void 0 : _b.offers) === null || _c === void 0 ? void 0 : _c.validForMemberTier;
+            const tokenizedMemberProgramTier = (_b = params.acceptedEventOffer) === null || _b === void 0 ? void 0 : _b.validForMemberTier;
             const validForMemberTierToken = tokenizedMemberProgramTier === null || tokenizedMemberProgramTier === void 0 ? void 0 : tokenizedMemberProgramTier.token;
-            const memberProgramIdentifierMustBe = (_d = tokenizedMemberProgramTier === null || tokenizedMemberProgramTier === void 0 ? void 0 : tokenizedMemberProgramTier.isTierOf) === null || _d === void 0 ? void 0 : _d.identifier;
+            const memberProgramIdentifierMustBe = (_c = tokenizedMemberProgramTier === null || tokenizedMemberProgramTier === void 0 ? void 0 : tokenizedMemberProgramTier.isTierOf) === null || _c === void 0 ? void 0 : _c.identifier;
             // ティアトークンが必須
             if (typeof validForMemberTierToken !== 'string' || validForMemberTierToken === '') {
-                throw new factory.errors.ArgumentNull('reservationFor.offers.validForMemberTier.token');
+                throw new factory.errors.ArgumentNull('ticketedOffer.validForMemberTier.token');
             }
             // メンバープログラムコード指定が必須
             if (typeof memberProgramIdentifierMustBe !== 'string' || memberProgramIdentifierMustBe === '') {
-                throw new factory.errors.ArgumentNull('reservationFor.offers.validForMemberTier.isTierOf.identifier');
+                throw new factory.errors.ArgumentNull('ticketedOffer.validForMemberTier.isTierOf.identifier');
             }
             // 有効メンバープログラムティアが存在する場合、オファーコレクションコードが必須
             const aggregateOfferIdentifier = eventOffers.identifier;
@@ -152,33 +136,5 @@ function validateMemberTierIfExists(params) {
                 memberProgramIdentifierMustBe, aggregateOfferIdentifier
             })(repos);
         }
-        // tslint:disable-next-line:no-suspicious-comment
-        // TODO オファートークン検証(2025-10-21~)
-        // const offerTokenIssuer = makesOfferOnApplication.issuedBy?.identifier;
-        // const offerTokenRequired = typeof offerTokenIssuer === 'string';
-        // if (offerTokenRequired) {
-        //     const offerToken = params.object.reservationFor?.offers?.token;
-        //     if (typeof offerToken !== 'string' || offerToken === '') {
-        //         throw new factory.errors.ArgumentNull('object.reservationFor.offers.token');
-        //     }
-        //     const issuer = await repos.issuer.findByIdentifier({
-        //         project: { id: params.event.project.id },
-        //         identifier: offerTokenIssuer
-        //     });
-        //     if (typeof issuer.tokenSecret !== 'string' || issuer.tokenSecret === '') {
-        //         throw new factory.errors.NotFound('issuer.tokenSecret');
-        //     }
-        //     const verifiedOffer = await verifyOfferToken({
-        //         secret: issuer.tokenSecret,
-        //         issuer: issuer.url,
-        //         token: offerToken
-        //     });
-        //     await validateOfferToken({
-        //         acceptedDate,
-        //         verifiedOffer,
-        //         makesOfferOnApplication,
-        //         object: params.object
-        //     })();
-        // }
     });
 }

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

@@ -0,0 +1,23 @@
+import * as factory from '../../../../factory';
+import { IMinimizedIndividualEvent } from '../../../../factory/event';
+import type { AuthorizationRepo } from '../../../../repo/authorization';
+import type { TicketRepo } from '../../../../repo/ticket';
+type IPermitOrInvoice = Pick<factory.ownershipInfo.IPermitAsGood, 'identifier' | 'typeOf'> | Pick<factory.invoice.IInvoice, 'paymentMethodId' | 'typeOf'>;
+declare function verifyTicketTokenAsNeeded(params: {
+    event: Pick<IMinimizedIndividualEvent, 'offers' | 'id' | 'project' | 'identifier'>;
+    now: Date;
+    availableAt: {
+        /**
+         * 販売アプリケーションID
+         */
+        id: string;
+    };
+    object: factory.assetTransaction.reserve.IObjectWithoutDetail;
+    instrument: factory.assetTransaction.reserve.IInstrument[];
+}): (repos: {
+    authorization: AuthorizationRepo;
+    ticket: TicketRepo;
+}) => Promise<{
+    acceptedEventOffer?: factory.authorization.IOfferAsObject;
+}>;
+export { IPermitOrInvoice, verifyTicketTokenAsNeeded };

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

@@ -0,0 +1,62 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+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, _c;
+        const { instrument, event } = params;
+        let acceptedEventOffer;
+        // 興行オファーチケットが指定された場合、オファーへ変換する
+        const ticketToken = (_a = instrument.find((eachInstrument) => eachInstrument.typeOf === 'Ticket')) === null || _a === void 0 ? void 0 : _a.ticketToken;
+        if (typeof ticketToken === 'string' && ticketToken !== '') {
+            const placeOrderIdByInstrument = (_b = instrument.find((eachInstrument) => eachInstrument.typeOf === factory.transactionType.PlaceOrder)) === null || _b === void 0 ? void 0 : _b.id;
+            if (typeof placeOrderIdByInstrument !== 'string' || placeOrderIdByInstrument === '') {
+                throw new factory.errors.NotFound('instrument as placeOrder');
+            }
+            const ticket = (yield repos.ticket.projectFields({
+                limit: 1,
+                page: 1,
+                project: { id: { $eq: event.project.id } },
+                ticketToken: { $eq: ticketToken }
+            }, ['ticketToken'])).shift();
+            if (ticket === undefined) {
+                throw new factory.errors.NotFound('Ticket');
+            }
+            // 承認を参照
+            const validAuthorization = yield repos.authorization.findValidOneByCode({
+                project: { id: event.project.id },
+                code: ticket.ticketToken
+            });
+            const authorizedObject = validAuthorization.object;
+            // audience検証
+            if (((_c = validAuthorization.audience) === null || _c === void 0 ? void 0 : _c.typeOf) !== factory.transactionType.PlaceOrder
+                || validAuthorization.audience.id !== placeOrderIdByInstrument) {
+                throw new factory.errors.Argument('ticketToken', 'audience not matched with placeOrder');
+            }
+            if (authorizedObject.typeOf === factory.offerType.Offer) {
+                // イベントIDを検証
+                const eventIdMustBe = authorizedObject.itemOffered.serviceOutput.reservationFor.id;
+                if (eventIdMustBe !== event.id) {
+                    throw new factory.errors.Argument('ticketToken', 'event.id not matched');
+                }
+                acceptedEventOffer = authorizedObject;
+            }
+            else {
+                throw new factory.errors.Argument('ticketToken', 'must be Offer');
+            }
+        }
+        return { acceptedEventOffer };
+    });
+}

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

@@ -1,11 +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'>;
     /**
      * アプリケーションごとのオファーを検証するかどうか
@@ -20,9 +24,40 @@ 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 };
+/**
+ * アプリケーションに対して有効なイベントオファーが存在するかどうかを検証する
+ */
+declare function validEventOfferByApplicationExists(params: {
+    event: Pick<IMinimizedIndividualEvent, 'offers' | 'id' | 'project' | 'identifier'>;
+    now: Date;
+    availableAt: {
+        /**
+         * 販売アプリケーションID
+         */
+        id: string;
+    };
+    /**
+     * オファー承認時のticketTokenから生成されたイベントオファー
+     */
+    acceptedEventOffer?: factory.authorization.IOfferAsObject;
+    /**
+     * オファー承認時の予約数
+     * 0であれば特に何も検証されない
+     */
+    numAcceptedOffers: number;
+}): (repos: {
+    eventOffer: EventOfferRepo;
+    issuer: IssuerRepo;
+    member: MemberRepo;
+    memberProgram: MemberProgramRepo;
+    productOffer: ProductOfferRepo;
+}) => Promise<void>;
+export { validateStartRequest, validEventOfferByApplicationExists };

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

@@ -10,10 +10,13 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.validateStartRequest = validateStartRequest;
+exports.validEventOfferByApplicationExists = validEventOfferByApplicationExists;
 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 +26,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');
             }
-            yield validateApplicationOffer({
+            // ticketTokenから、acceptedEventOfferを生成(2025-11-18~)
+            const { acceptedEventOffer } = yield (0, verifyTicketTokenAsNeeded_1.verifyTicketTokenAsNeeded)({
                 event,
                 now,
                 availableAt: { id: params.store.id },
-                object: params.object
+                object: params.object,
+                instrument: params.instrument
+            })(repos);
+            yield validEventOfferByApplicationExists({
+                event,
+                now,
+                availableAt: { id: params.store.id },
+                acceptedEventOffer,
+                numAcceptedOffers: (Array.isArray(params.object.acceptedOffer)) ? params.object.acceptedOffer.length : 0
             })(repos);
         }
         if (params.validateEvent === true) {
@@ -36,12 +48,11 @@ function validateStartRequest(params) {
     });
 }
 /**
- * アプリケーションごとのオファーを検証する
+ * アプリケーションに対して有効なイベントオファーが存在するかどうかを検証する
  */
-function validateApplicationOffer(params) {
+function validEventOfferByApplicationExists(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
-        var _a, _b;
-        const { event, availableAt } = params;
+        const { event, availableAt, acceptedEventOffer, numAcceptedOffers } = params;
         const acceptedDate = moment(params.now);
         const eventOffers = event.offers;
         // アプリケーションごとの設定を参照する(2022-11-19~)
@@ -70,29 +81,14 @@ function validateApplicationOffer(params) {
         }
         // support extensibleEventOffer(2025-11-11~)
         if (eventOffers.typeOf === factory.offerType.AggregateOffer) {
-            // リクエストによるオファーコード指定が必須
-            const eventOfferIdentifierMustBe = (_b = (_a = params.object.reservationFor) === null || _a === void 0 ? void 0 : _a.offers) === null || _b === void 0 ? void 0 : _b.identifier;
-            if (typeof eventOfferIdentifierMustBe !== 'string' || eventOfferIdentifierMustBe === '') {
-                throw new factory.errors.ArgumentNull('reservationFor.offers.identifier');
-            }
-            const existingEventOffer = (yield repos.eventOffer.findEventOffers({
-                limit: 1,
-                page: 1,
-                project: { id: { $eq: event.project.id } }, // プロジェクト
-                validFrom: { $lte: acceptedDate.toDate() },
-                validThrough: { $gte: acceptedDate.toDate() },
-                itemOffered: { id: { $eq: event.id } }, // 対象イベント
-                identifier: { $eq: eventOfferIdentifierMustBe } // オファーコード
-            }, ['identifier', 'itemOffered', 'offeredBy', 'typeOf', 'validFrom', 'validThrough'])).shift();
-            if (existingEventOffer === undefined) {
-                throw new factory.errors.NotFound(`eventOffer: ${eventOfferIdentifierMustBe}`);
-            }
+            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
+                eventOffer: existingEventOffer,
+                acceptedEventOffer,
+                numAcceptedOffers
             })(repos);
         }
         else {
@@ -101,8 +97,8 @@ function validateApplicationOffer(params) {
             yield (0, validateMemberTierIfExists_1.validateMemberTierIfExists)({
                 event,
                 now: params.now,
-                object: params.object,
-                makesOfferOnApplication
+                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

@@ -17,7 +17,7 @@ const factory = require("../../../../../factory");
 function requestedProgramMembershipUsed2permit(params) {
     // tslint:disable-next-line:cyclomatic-complexity max-func-body-length
     return (repos) => __awaiter(this, void 0, void 0, function* () {
-        var _a, _b, _c, _d;
+        var _a, _b;
         let programMembershipUsedAsPermit;
         const { programMembershipUsed, placeOrder } = params;
         // discontinue token as fromLocation(ticketTokenへ移行するべき)(2024-12-18~)
@@ -51,34 +51,51 @@ function requestedProgramMembershipUsed2permit(params) {
                 const permitOwnershipInfo = object;
                 const ownedGoodType = (_a = permitOwnershipInfo.typeOfGood) === null || _a === void 0 ? void 0 : _a.typeOf;
                 if (ownedGoodType === factory.permit.PermitType.Permit) {
-                    const issuedThroughTypeOf = (_b = permitOwnershipInfo.typeOfGood.issuedThrough) === null || _b === void 0 ? void 0 : _b.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 ((_c = permitOwnershipInfo.typeOfGood.issuedThrough) === null || _c === void 0 ? void 0 : _c.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}`);
+                    // 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}`
+                    //     );
+                    // }
+                }
+                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: paymentMethodId,
+                        issuedThrough: { typeOf: ownedGoodType },
+                        typeOf: factory.permit.PermitType.Permit
+                    };
                 }
                 else if (ownedGoodType === factory.service.paymentService.PaymentServiceType.CreditCard) {
                     // CreditCard決済の場合、決済方法所有権を受け入れる(2025-11-11~)
-                    const paymentServiceId = (_d = permitOwnershipInfo.typeOfGood) === null || _d === void 0 ? void 0 : _d.id;
+                    const paymentServiceId = (_b = permitOwnershipInfo.typeOfGood) === null || _b === void 0 ? void 0 : _b.id;
                     const paymentMethodId = permitOwnershipInfo.typeOfGood.serviceOutput.paymentMethodId;
-                    if (typeof paymentMethodId !== 'string' || paymentMethodId === '') {
+                    if (typeof paymentServiceId !== 'string' || paymentServiceId === '') {
                         throw new factory.errors.Argument('programMembershipUsed', 'paymentServiceId required');
                     }
                     if (typeof paymentMethodId !== 'string' || paymentMethodId === '') {
@@ -91,7 +108,7 @@ function requestedProgramMembershipUsed2permit(params) {
                     };
                 }
                 else {
-                    throw new factory.errors.Argument('programMembershipUsed', 'ownershipInfo.typeOfGood.typeOf must be Permit');
+                    throw new factory.errors.Argument('programMembershipUsed', `ownershipInfo.typeOfGood.typeOf: ${ownedGoodType} invalid`);
                 }
             }
         }

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

@@ -8,6 +8,7 @@ import type { EventRepo, IMinimizedIndividualEvent } from '../../../../repo/even
 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';
@@ -29,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>;
@@ -42,6 +44,7 @@ declare function processStartReserve4chevre(params: {
     validateEventOfferPeriod: boolean;
     validateEvent: boolean;
     orderNumber: string;
+    instrument: factory.action.reserve.ITicketAsInstrument[];
 }, options: {
     /**
      * 最大n日前から予約可能
@@ -56,6 +59,7 @@ declare function processStartReserve4chevre(params: {
     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

@@ -8,6 +8,7 @@ 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';
@@ -36,6 +37,7 @@ interface IAuthorizeRepos {
     eventOffer: EventOfferRepo;
     eventSeries: EventSeriesRepo;
     issuer: IssuerRepo;
+    member: MemberRepo;
     memberProgram: MemberProgramRepo;
     stockHolder: StockHolderRepo;
     offer: OfferRepo;
@@ -78,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 };
     });
 }