@chevre/domain 23.1.0-alpha.9 → 23.1.0

package/lib/chevre/service/assetTransaction/pay.d.ts

@@ -10,6 +10,7 @@ import type { ActionRepo } from '../../repo/action';
 import type { AssetTransactionRepo } from '../../repo/assetTransaction';
 import type { CredentialsRepo } from '../../repo/credentials';
 import type { EventRepo } from '../../repo/event';
+import type { EventSeriesRepo } from '../../repo/eventSeries';
 import type { OrderRepo } from '../../repo/order';
 import type { PaymentServiceRepo } from '../../repo/paymentService';
 import type { PaymentServiceProviderRepo } from '../../repo/paymentServiceProvider';
@@ -24,6 +25,7 @@ export interface IStartOperationRepos {
     action: ActionRepo;
     credentials: CredentialsRepo;
     event: EventRepo;
+    eventSeries: EventSeriesRepo;
     paymentAccepted: SellerPaymentAcceptedRepo;
     paymentService: PaymentServiceRepo;
     paymentServiceProvider: PaymentServiceProviderRepo;
@@ -61,6 +63,8 @@ export type ICheckOperation<T> = (repos: {
 }, settings: Settings) => Promise<T>;
 export type IPublishPaymentUrlOperation<T> = (repos: {
     action: ActionRepo;
+    event: EventRepo;
+    eventSeries: EventSeriesRepo;
     paymentAccepted: SellerPaymentAcceptedRepo;
     paymentService: PaymentServiceRepo;
     paymentServiceProvider: PaymentServiceProviderRepo;
@@ -78,6 +82,7 @@ export declare function publishPaymentUrl(params: Pick<factory.assetTransaction.
      * add identifier for an unique index(2025-02-25~)
      */
     identifier?: string;
+    instrument: factory.action.accept.pay.IInstrument[];
 }, options: {
     purposeAsTransaction: {
         id: string;
@@ -104,7 +109,7 @@ export import IPaymentAgencyTransaction = CreditCardPayment.IPaymentAgencyTransa
  * 取引開始
  */
 export declare function start(params: factory.assetTransaction.pay.IStartParamsWithoutDetail & {
-    instrument: factory.action.trade.pay.IInstrument[];
+    instrument: factory.action.trade.pay.IPlaceOrderRelatedInstrument[];
 }, options: {
     pendingPaymentAgencyTransaction?: CreditCardPayment.IPaymentAgencyTransaction;
     /**

package/lib/chevre/service/assetTransaction/pay.js

@@ -24,6 +24,7 @@ const PaymentCardPayment = require("../payment/paymentCard");
 const fixInformAction_1 = require("./fixInformAction");
 const validation_1 = require("./pay/account/validation");
 const factory_1 = require("./pay/factory");
+const validateAcceptedPaymentMethodIfNeeded_1 = require("./pay/validateAcceptedPaymentMethodIfNeeded");
 function publishPaymentUrlResult2recipe(params) {
     const { project, result } = params;
     return {
@@ -76,6 +77,8 @@ function publishPaymentUrl(params, options) {
             throw new factory.errors.ArgumentNull('transactionNumber');
         }
         yield validateSeller(params)(repos);
+        // リソースの対応決済方法検証(2025-12-02~)
+        yield (0, validateAcceptedPaymentMethodIfNeeded_1.validateAcceptedPaymentMethodIfNeeded)(params)(repos);
         // 決済サービス確認
         const paymentServiceId = getPaymentServiceId(params);
         // 決済受入アクション生成(2024-03-28~)
@@ -84,7 +87,7 @@ function publishPaymentUrl(params, options) {
                 object: params.object,
                 transactionNumber,
                 typeOf: params.typeOf
-            }, purpose: { typeOf: factory.transactionType.PlaceOrder, id: options.purposeAsTransaction.id } }, (typeof taskId === 'string')
+            }, purpose: { typeOf: factory.transactionType.PlaceOrder, id: options.purposeAsTransaction.id }, instrument: (Array.isArray(params.instrument)) ? params.instrument : [] }, (typeof taskId === 'string')
             ? { sameAs: { id: taskId, typeOf: 'Task' } } // タスク関連付け(2024-05-22~)
             : undefined), (typeof ((_d = params.location) === null || _d === void 0 ? void 0 : _d.typeOf) === 'string')
             ? { location: params.location }
@@ -186,6 +189,8 @@ function start(params, options) {
             throw new factory.errors.ArgumentNull('transactionNumber');
         }
         yield validateSeller(params)(repos);
+        // リソースの対応決済方法検証(2025-12-02~)
+        yield (0, validateAcceptedPaymentMethodIfNeeded_1.validateAcceptedPaymentMethodIfNeeded)(params)(repos);
         // 決済サービス確認
         const paymentServiceType = (_b = params.object) === null || _b === void 0 ? void 0 : _b.typeOf;
         const paymentService = yield fixPaymentService(params)(repos);

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

@@ -14,10 +14,9 @@ declare function fixExtendedEventOffer(params: {
          */
         id: string;
     };
-    object: factory.assetTransaction.reserve.IObjectWithoutDetail;
     acceptedEventOffer?: factory.authorization.IOfferAsObject;
 }): (repos: {
     eventOffer: EventOfferRepo;
     member: MemberRepo;
-}) => Promise<Pick<factory.eventOffer.IEventOffer, "identifier" | "itemOffered" | "typeOf" | "offeredBy" | "validFrom" | "validThrough">>;
+}) => Promise<Pick<factory.eventOffer.IEventOffer, "identifier" | "itemOffered" | "typeOf" | "offeredBy" | "validFrom" | "validThrough" | "id">>;
 export { fixExtendedEventOffer };

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

@@ -21,9 +21,9 @@ function fixExtendedEventOffer(params) {
         const { event, availableAt } = params;
         const acceptedDate = moment(params.now);
         // リクエストによるオファーコード指定が必須
-        const eventOfferIdentifierMustBe = (_a = params.acceptedEventOffer) === null || _a === void 0 ? void 0 : _a.identifier;
-        if (typeof eventOfferIdentifierMustBe !== 'string' || eventOfferIdentifierMustBe === '') {
-            throw new factory.errors.ArgumentNull('reservationFor.offers.identifier');
+        const eventOfferIdMustBe = (_a = params.acceptedEventOffer) === null || _a === void 0 ? void 0 : _a.id;
+        if (typeof eventOfferIdMustBe !== 'string' || eventOfferIdMustBe === '') {
+            throw new factory.errors.ArgumentNull('ticket as instrument');
         }
         // アプリケーションIDからアプリケーションコードを参照
         const existingCustomerMember = (yield repos.member.searchCustomerMembers({
@@ -37,8 +37,7 @@ function fixExtendedEventOffer(params) {
         if (existingCustomerMember === undefined) {
             throw new factory.errors.NotFound(`Member: ${availableAt.id}`);
         }
-        // tslint:disable-next-line:no-console
-        console.log('existingCustomerMember found:', JSON.stringify(existingCustomerMember));
+        // console.log('existingCustomerMember found:', JSON.stringify(existingCustomerMember));
         const applicationIdentifier = existingCustomerMember.member.identifier;
         if (typeof applicationIdentifier !== 'string') {
             throw new factory.errors.NotFound(`member.identifier of ${availableAt.id}`);
@@ -51,11 +50,12 @@ function fixExtendedEventOffer(params) {
             validFrom: { $lte: acceptedDate.toDate() },
             validThrough: { $gte: acceptedDate.toDate() },
             itemOffered: { id: { $eq: event.id } }, // 対象イベント
-            identifier: { $eq: eventOfferIdentifierMustBe }, // オファーコード
+            id: { $eq: eventOfferIdMustBe }, // オファーID
+            // identifier: { $eq: eventOfferIdentifierMustBe }, // オファーコード
             availableAtOrFrom: { identifier: { $eq: applicationIdentifier } } // アプリケーションコード
         }, ['identifier', 'itemOffered', 'offeredBy', 'typeOf', 'validFrom', 'validThrough'])).shift();
         if (existingEventOffer === undefined) {
-            throw new factory.errors.NotFound(`eventOffer: ${eventOfferIdentifierMustBe}`);
+            throw new factory.errors.NotFound(`valid eventOffer: ${eventOfferIdMustBe}`);
         }
         return existingEventOffer;
     });

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

@@ -7,9 +7,13 @@ import type { IssuerRepo } from '../../../../repo/issuer';
 declare function validateIssuedOfferIfExists(params: {
     event: Pick<IMinimizedIndividualEvent, 'offers' | 'id' | 'project' | 'identifier'>;
     now: Date;
-    object: factory.assetTransaction.reserve.IObjectWithoutDetail;
-    eventOffer: Pick<factory.eventOffer.IEventOffer, 'identifier' | 'itemOffered' | 'offeredBy' | 'validFrom' | 'validThrough'>;
+    eventOffer: Pick<factory.eventOffer.IEventOffer, 'identifier' | 'itemOffered' | 'offeredBy' | 'validFrom' | 'validThrough' | 'id'>;
     acceptedEventOffer?: factory.authorization.IOfferAsObject;
+    /**
+     * オファー承認時の予約数
+     * 0であれば特に何も検証されない
+     */
+    numAcceptedOffers: number;
 }): (repos: {
     issuer: IssuerRepo;
 }) => Promise<void>;

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

@@ -37,10 +37,10 @@ function verifyOfferToken(params) {
         catch (error) {
             // JWTエラーをハンドリング
             if (error instanceof jwt.TokenExpiredError) {
-                throw new factory.errors.Argument('reservationFor.offers.token', `invalid token. [${error.message} expiredAt:${error.expiredAt}]`);
+                throw new factory.errors.Argument('ticketedOffer.token', `invalid token. [${error.message} expiredAt:${error.expiredAt}]`);
             }
             else if (error instanceof jwt.JsonWebTokenError) {
-                throw new factory.errors.Argument('reservationFor.offers.token', `invalid token. [${error.message}]`);
+                throw new factory.errors.Argument('ticketedOffer.token', `invalid token. [${error.message}]`);
             }
             throw error;
         }
@@ -51,30 +51,30 @@ const OFFER_TOKEN_DATE_FORMAT = 'YYYY-MM-DDTHH:mm:ssZ';
 function validateOfferToken(params) {
     return () => __awaiter(this, void 0, void 0, function* () {
         var _a, _b;
-        const { event, acceptedDate, verifiedOffer, eventOffer } = params;
-        // イベント識別子一致検証
-        const itemOfferedIdentifier = verifiedOffer.itemOffered.identifier;
-        if (typeof itemOfferedIdentifier !== 'string' || itemOfferedIdentifier === '') {
-            throw new factory.errors.Argument('reservationFor.offers.token', 'itemOffered.identifier must be string');
+        const { event, acceptedDate, verifiedOffer, eventOffer, numAcceptedOffers } = params;
+        // イベントID一致検証
+        const itemOfferedId = (_a = verifiedOffer.itemOffered) === null || _a === void 0 ? void 0 : _a.id;
+        if (typeof itemOfferedId !== 'string' || itemOfferedId === '') {
+            throw new factory.errors.Argument('ticketedOffer.token', 'itemOffered.id must be string');
         }
-        const itemOfferedIdentifierMustBe = event.identifier;
-        if (typeof itemOfferedIdentifierMustBe !== 'string') {
-            throw new factory.errors.NotFound('identifier', 'the event must have an identifier');
+        const itemOfferedIdMustBe = event.id;
+        if (typeof itemOfferedIdMustBe !== 'string') {
+            throw new factory.errors.NotFound('event.id', 'the event must have an ID');
         }
-        if (itemOfferedIdentifier !== itemOfferedIdentifierMustBe) {
-            throw new factory.errors.Argument('reservationFor.offers.token', 'itemOffered.identifier not matched');
+        if (itemOfferedId !== itemOfferedIdMustBe) {
+            throw new factory.errors.Argument('ticketedOffer.token', 'itemOffered.id not matched');
         }
-        // アプリケーションオファーコード一致検証
+        // オファーコード一致検証
         const applicationOfferIdentifier = verifiedOffer.identifier;
         if (typeof applicationOfferIdentifier !== 'string' || applicationOfferIdentifier === '') {
-            throw new factory.errors.Argument('reservationFor.offers.token', 'identifier must be string');
+            throw new factory.errors.Argument('ticketedOffer.token', 'identifier must be string');
         }
         const applicationOfferIdentifierMustBe = eventOffer.identifier;
         if (typeof applicationOfferIdentifierMustBe !== 'string') {
             throw new factory.errors.NotFound('makesOffer.identifier');
         }
         if (applicationOfferIdentifier !== applicationOfferIdentifierMustBe) {
-            throw new factory.errors.Argument('reservationFor.offers.token', 'identifier not matched');
+            throw new factory.errors.Argument('ticketedOffer.token', 'identifier not matched');
         }
         // 有効期間検証
         let validThroughMoment;
@@ -82,26 +82,26 @@ function validateOfferToken(params) {
         validThroughMoment = moment(verifiedOffer.validThrough, OFFER_TOKEN_DATE_FORMAT, true);
         validFromMoment = moment(verifiedOffer.validFrom, OFFER_TOKEN_DATE_FORMAT, true);
         if (!validThroughMoment.isValid()) {
-            throw new factory.errors.Argument('reservationFor.offers.token', 'invalid validThrough');
+            throw new factory.errors.Argument('ticketedOffer.token', 'invalid validThrough');
         }
         if (!validFromMoment.isValid()) {
-            throw new factory.errors.Argument('reservationFor.offers.token', 'invalid validFrom');
+            throw new factory.errors.Argument('ticketedOffer.token', 'invalid validFrom');
         }
         if (acceptedDate.isBefore(validFromMoment)) {
-            throw new factory.errors.Argument('reservationFor.offers.token', `the offer id valid from ${validFromMoment}`);
+            throw new factory.errors.Argument('ticketedOffer.token', `the offer id valid from ${validFromMoment}`);
         }
         if (acceptedDate.isAfter(validThroughMoment)) {
-            throw new factory.errors.Argument('reservationFor.offers.token', `the offer id valid through ${validThroughMoment}`);
+            throw new factory.errors.Argument('ticketedOffer.token', `the offer id valid through ${validThroughMoment}`);
         }
         // maxValueを検証
-        const maxValue = (_a = verifiedOffer === null || verifiedOffer === void 0 ? void 0 : verifiedOffer.eligibleQuantity) === null || _a === void 0 ? void 0 : _a.maxValue;
+        const maxValue = (_b = verifiedOffer === null || verifiedOffer === void 0 ? void 0 : verifiedOffer.eligibleQuantity) === null || _b === void 0 ? void 0 : _b.maxValue;
         if (typeof maxValue !== 'number') {
-            throw new factory.errors.Argument('reservationFor.offers.token', 'eligibleQuantity.maxValue must be number');
+            throw new factory.errors.Argument('ticketedOffer.token', 'eligibleQuantity.maxValue must be number');
         }
         if (maxValue > NUM_ACCEPTED_OFFERS_MAX_VALUE) {
-            throw new factory.errors.Argument('reservationFor.offers.token', `eligibleQuantity.maxValue must be <= ${NUM_ACCEPTED_OFFERS_MAX_VALUE}`);
+            throw new factory.errors.Argument('ticketedOffer.token', `eligibleQuantity.maxValue must be <= ${NUM_ACCEPTED_OFFERS_MAX_VALUE}`);
         }
-        const numAcceptedOffers = (_b = params.object.acceptedOffer) === null || _b === void 0 ? void 0 : _b.length;
+        // const numAcceptedOffers = params.object.acceptedOffer?.length;
         if (typeof numAcceptedOffers === 'number' && numAcceptedOffers > 0) {
             if (numAcceptedOffers > maxValue) {
                 throw new factory.errors.Argument('reservationFor.id', `Maximum number of offers exceeded`);
@@ -115,15 +115,15 @@ function validateOfferToken(params) {
 function validateIssuedOfferIfExists(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         var _a, _b, _c;
-        const { event, eventOffer } = params;
+        const { event, eventOffer, numAcceptedOffers } = params;
         const acceptedDate = moment(params.now);
         const offerTokenIssuer = (_a = eventOffer.offeredBy) === null || _a === void 0 ? void 0 : _a.identifier;
         const offerTokenRequired = typeof offerTokenIssuer === 'string';
         if (offerTokenRequired) {
-            const offerIdentifierMustBe = (_b = params.acceptedEventOffer) === null || _b === void 0 ? void 0 : _b.identifier;
+            const offerIdMustBe = (_b = params.acceptedEventOffer) === null || _b === void 0 ? void 0 : _b.id;
             const offerToken = (_c = params.acceptedEventOffer) === null || _c === void 0 ? void 0 : _c.token;
-            if (typeof offerIdentifierMustBe !== 'string' || offerIdentifierMustBe === '') {
-                throw new factory.errors.ArgumentNull('object.reservationFor.offers.identifier');
+            if (typeof offerIdMustBe !== 'string' || offerIdMustBe === '') {
+                throw new factory.errors.NotFound('ticketedOffer.id');
             }
             if (typeof offerToken !== 'string' || offerToken === '') {
                 throw new factory.errors.ArgumentNull('object.reservationFor.offers.token');
@@ -131,8 +131,8 @@ function validateIssuedOfferIfExists(params) {
             if (typeof eventOffer.identifier !== 'string' || eventOffer.identifier === '') {
                 throw new factory.errors.NotFound('eventOffer.identifier');
             }
-            // アプリケーションオファーコード一致検証
-            if (eventOffer.identifier !== offerIdentifierMustBe) {
+            // イベントオファーID一致検証
+            if (eventOffer.id !== offerIdMustBe) {
                 throw new factory.errors.Argument('object.reservationFor.offers.identifier', 'eventOffer.identifier not matched');
             }
             const issuer = yield repos.issuer.findByIdentifier({
@@ -152,7 +152,7 @@ function validateIssuedOfferIfExists(params) {
                 acceptedDate,
                 verifiedOffer,
                 eventOffer,
-                object: params.object
+                numAcceptedOffers
             })();
         }
     });

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

@@ -6,7 +6,6 @@ import type { ProductOfferRepo } from '../../../../repo/productOffer';
 declare function validateMemberTierIfExists(params: {
     event: Pick<IMinimizedIndividualEvent, 'offers' | 'id' | 'project'>;
     now: Date;
-    object: factory.assetTransaction.reserve.IObjectWithoutDetail;
     makesOfferOnApplication: factory.event.screeningEvent.ISellerMakesOffer;
     acceptedEventOffer?: factory.authorization.IOfferAsObject;
 }): (repos: {

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;
         }
@@ -114,11 +98,11 @@ function validateMemberTierIfExists(params) {
             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.js

@@ -25,7 +25,7 @@ function verifyTicketTokenAsNeeded(params) {
             if (typeof placeOrderIdByInstrument !== 'string' || placeOrderIdByInstrument === '') {
                 throw new factory.errors.NotFound('instrument as placeOrder');
             }
-            const ticket = (yield repos.ticket.projectFields({
+            const ticket = (yield repos.ticket.findTickets({
                 limit: 1,
                 page: 1,
                 project: { id: { $eq: event.project.id } },
@@ -46,13 +46,11 @@ function verifyTicketTokenAsNeeded(params) {
                 throw new factory.errors.Argument('ticketToken', 'audience not matched with placeOrder');
             }
             if (authorizedObject.typeOf === factory.offerType.Offer) {
-                // tslint:disable-next-line:no-suspicious-comment
-                // TODO イベントIDを検証
-                // if (typeOfGood.typeOf !== factory.service.paymentService.PaymentServiceType.FaceToFace) {
-                //     if (typeOfGood.id !== issuedThrough.id) {
-                //         throw new factory.errors.Argument('ticketToken', 'issuedThrough.id not matched');
-                //     }
-                // }
+                // イベント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 {

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

@@ -32,4 +32,32 @@ declare function validateStartRequest(params: {
     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,6 +10,7 @@ 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");
@@ -33,12 +34,12 @@ function validateStartRequest(params) {
                 object: params.object,
                 instrument: params.instrument
             })(repos);
-            yield validateApplicationOffer({
+            yield validEventOfferByApplicationExists({
                 event,
                 now,
                 availableAt: { id: params.store.id },
-                object: params.object,
-                acceptedEventOffer
+                acceptedEventOffer,
+                numAcceptedOffers: (Array.isArray(params.object.acceptedOffer)) ? params.object.acceptedOffer.length : 0
             })(repos);
         }
         if (params.validateEvent === true) {
@@ -47,11 +48,11 @@ function validateStartRequest(params) {
     });
 }
 /**
- * アプリケーションごとのオファーを検証する
+ * アプリケーションに対して有効なイベントオファーが存在するかどうかを検証する
  */
-function validateApplicationOffer(params) {
+function validEventOfferByApplicationExists(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
-        const { event, availableAt, acceptedEventOffer } = params;
+        const { event, availableAt, acceptedEventOffer, numAcceptedOffers } = params;
         const acceptedDate = moment(params.now);
         const eventOffers = event.offers;
         // アプリケーションごとの設定を参照する(2022-11-19~)
@@ -85,9 +86,9 @@ function validateApplicationOffer(params) {
             yield (0, validateIssuedOfferIfExists_1.validateIssuedOfferIfExists)({
                 event,
                 now: params.now,
-                object: params.object,
                 eventOffer: existingEventOffer,
-                acceptedEventOffer
+                acceptedEventOffer,
+                numAcceptedOffers
             })(repos);
         }
         else {
@@ -96,7 +97,6 @@ function validateApplicationOffer(params) {
             yield (0, validateMemberTierIfExists_1.validateMemberTierIfExists)({
                 event,
                 now: params.now,
-                object: params.object,
                 makesOfferOnApplication,
                 acceptedEventOffer
             })(repos);

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

@@ -27,7 +27,7 @@ function requestedProgramMembershipUsed2permit(params) {
         else if ((programMembershipUsed === null || programMembershipUsed === void 0 ? void 0 : programMembershipUsed.typeOf) === 'Ticket') {
             const { ticketToken } = programMembershipUsed;
             if (typeof ticketToken === 'string') {
-                const ticket = (yield repos.ticket.projectFields({
+                const ticket = (yield repos.ticket.findTickets({
                     limit: 1,
                     page: 1,
                     project: { id: { $eq: params.project.id } },

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

@@ -0,0 +1,48 @@
+import * as factory from '../../../factory';
+import type { ActionRepo } from '../../../repo/action';
+import type { AuthorizationRepo } from '../../../repo/authorization';
+import type { EventRepo } from '../../../repo/event';
+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';
+import type { TransactionRepo } from '../../../repo/transaction';
+declare function issueEventOfferTicket(params: {
+    now: Date;
+    audience: Pick<factory.action.authorize.offer.eventService.IPurpose, 'id'>;
+    /**
+     * イベントID
+     */
+    eventId: string;
+    /**
+     * 拡張イベントオファーID
+     */
+    eventOfferId?: string;
+    ticketedOffer?: Pick<factory.authorization.IOfferAsObject, 'token' | 'validForMemberTier'>;
+    author: Pick<factory.authorization.IAuthor, 'id' | 'typeOf'>;
+    project: {
+        id: string;
+    };
+    instrument: {
+        /**
+         * アプリケーションID
+         */
+        id: string;
+    };
+}): (repos: {
+    action: ActionRepo;
+    authorization: AuthorizationRepo;
+    event: EventRepo;
+    eventOffer: EventOfferRepo;
+    issuer: IssuerRepo;
+    member: MemberRepo;
+    memberProgram: MemberProgramRepo;
+    productOffer: ProductOfferRepo;
+    ticket: TicketRepo;
+    transaction: TransactionRepo;
+}) => Promise<{
+    ticketToken: string;
+}>;
+export { issueEventOfferTicket };