@chevre/domain 23.1.0-alpha.8 → 23.1.0-alpha.9

package/example/src/chevre/assetTransaction/processReserve.ts

@@ -76,8 +76,8 @@ async function main() {
                 reservationFor: {
                     id: EVENT_ID,
                     offers: {
-                        token: OFFER_TOKEN,
-                        identifier: 'LegacyReservation'
+                        // token: OFFER_TOKEN,
+                        // identifier: 'LegacyReservation'
                     }
                 }
             },
@@ -88,7 +88,9 @@ async function main() {
             validateEvent: false,
             validateEventOfferPeriod: true,
             validateAppliesToMovieTicket: true,
-            instrument: [],
+            instrument: [
+                ...(typeof OFFER_TOKEN === 'string') ? [{ ticketToken: OFFER_TOKEN, typeOf: <'Ticket'>'Ticket' }] : []
+            ],
             availableAtOrFrom: { id: APPLICATION_ID }
             // stockHoldUntilDaysAfterEventEnd: STOCK_HOLD_UNTIL_DAYS_AFTER_EVENT_END
         },
@@ -96,6 +98,7 @@ async function main() {
     )(
         {
             advanceBookingRequirement: await chevre.repository.AdvanceBookingRequirement.createInstance(mongoose.connection),
+            authorization: await chevre.repository.Authorization.createInstance(mongoose.connection),
             project: await chevre.repository.Project.createInstance(mongoose.connection),
             stockHolder: await chevre.repository.StockHolder.createInstance({ connection: mongoose.connection }),
             event: await chevre.repository.Event.createInstance(mongoose.connection),
@@ -115,6 +118,7 @@ async function main() {
             seat: await chevre.repository.place.Seat.createInstance(mongoose.connection),
             setting: await chevre.repository.Setting.createInstance(mongoose.connection),
             task: await chevre.repository.Task.createInstance(mongoose.connection),
+            ticket: await chevre.repository.Ticket.createInstance(mongoose.connection),
             assetTransaction: await chevre.repository.AssetTransaction.createInstance(mongoose.connection)
         },
         new chevre.settings.Settings({

package/example/src/chevre/authorizeEventServiceOffer.ts

@@ -29,10 +29,10 @@ async function main() {
                 reservationFor: {
                     id: 'bmcvkft63',
                     offers: {
-                        validForMemberTier: {
-                            token: 'xx',
-                            isTierOf: { identifier: 'DefaultMemberProgram' }
-                        }
+                        // validForMemberTier: {
+                        //     token: 'xx',
+                        //     isTierOf: { identifier: 'DefaultMemberProgram' }
+                        // }
                     }
 
                 }
@@ -41,7 +41,8 @@ async function main() {
             transaction: { id: 'xxx' },
             validateEventOfferPeriod: true,
             validateEvent: false,
-            store: { id: 'xxx' }
+            store: { id: 'xxx' },
+            instrument: []
         },
         {
             noOfferSpecified: true,

package/example/src/chevre/member/migrateMemberIdentifier.ts

@@ -53,35 +53,40 @@ async function main() {
         i += 1;
         const iamMember: chevre.factory.iam.IMember = doc.toObject();
 
-        const identifierExists = typeof (<any>iamMember.member).identifier === 'string';
+        const applicationIdentifier = iamMember.member.identifier;
+        const updatingIdentifier = identifierMap.find(({ id }) => id === iamMember.member.id)?.identifier;
+        if (typeof updatingIdentifier !== 'string') {
+            throw new Error(`map not found. ${iamMember.member.name}`);
+        }
+        const identifierExists = typeof applicationIdentifier === 'string';
 
         if (identifierExists) {
+            if (applicationIdentifier !== updatingIdentifier) {
+                throw new Error(`unexpected application identifier. ${iamMember.member.name}`);
+            }
+
             console.log(
                 'identifier exists',
                 iamMember.project.id,
                 iamMember.member.name,
-                (<any>iamMember.member).identifier
+                applicationIdentifier
             );
         } else {
-            const updatingIdentifier = identifierMap.find(({ id }) => id === iamMember.member.id)?.identifier;
-            if (typeof updatingIdentifier !== 'string') {
-                throw new Error(`map not found. ${iamMember.member.name}`);
-            }
             console.log(
                 'migrating identifier...',
                 iamMember.project.id,
                 iamMember.member.name,
                 updatingIdentifier
             );
-            // await memberRepo.updateByMemberId({
-            //     project: { id: iamMember.project.id },
-            //     member: {
-            //         id: iamMember.member.id,
-            //         memberOf: iamMember.member.memberOf,
-            //         identifier: updatingIdentifier
-            //     },
-            //     $unset: {}
-            // });
+            await memberRepo.updateByMemberId({
+                project: { id: iamMember.project.id },
+                member: {
+                    id: iamMember.member.id,
+                    memberOf: iamMember.member.memberOf,
+                    identifier: updatingIdentifier
+                },
+                $unset: {}
+            });
             updated += 1;
         }
     });

package/example/src/chevre/reIndex.ts

@@ -11,8 +11,8 @@ mongoose.Model.on('index', (...args) => {
 async function main() {
     await mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: false });
 
-    await chevre.repository.CategoryCode.createInstance(mongoose.connection);
-    // await chevre.repository.MovieTicketType.createInstance(mongoose.connection);
+    await chevre.repository.EventOffer.createInstance(mongoose.connection);
+    await chevre.repository.Member.createInstance(mongoose.connection);
     console.log('success!');
 }
 

package/lib/chevre/repo/mongoose/schemas/eventOffer.js

@@ -44,41 +44,45 @@ const schemaOptions = {
     }
 };
 const indexes = [
-// [
-//     { validFrom: 1 },
-//     { name: 'validFrom' }
-// ],
-// [
-//     {
-//         'project.id': 1,
-//         'itemOffered.id': 1,
-//         identifier: 1
-//     },
-//     {
-//         name: 'uniqueByItemOfferedAndIdentifier',
-//         unique: true
-//     }
-// ],
-// [
-//     { 'project.id': 1, validFrom: 1 },
-//     { name: 'projectId' }
-// ],
-// [
-//     { identifier: 1, validFrom: 1 },
-//     { name: 'identifier' }
-// ],
-// [
-//     { 'itemOffered.id': 1, validFrom: 1 },
-//     { name: 'itemOfferedId' }
-// ],
-// [
-//     { 'seller.id': 1, validFrom: 1 },
-//     { name: 'sellerId' }
-// ],
-// [
-//     { validThrough: 1, validFrom: 1 },
-//     { name: 'validThrough' }
-// ]
+    [
+        { validFrom: 1 },
+        { name: 'validFrom' }
+    ],
+    [
+        { validThrough: 1, validFrom: 1 },
+        { name: 'validThrough' }
+    ],
+    [
+        {
+            'project.id': 1,
+            'itemOffered.id': 1,
+            identifier: 1
+        },
+        {
+            name: 'uniqueByItemOfferedAndIdentifier',
+            unique: true
+        }
+    ],
+    [
+        { 'project.id': 1, validFrom: 1 },
+        { name: 'projectId' }
+    ],
+    [
+        { 'seller.id': 1, validFrom: 1 },
+        { name: 'sellerId' }
+    ],
+    [
+        { identifier: 1, validFrom: 1 },
+        { name: 'identifier' }
+    ],
+    [
+        { 'itemOffered.id': 1, validFrom: 1 },
+        { name: 'itemOfferedId' }
+    ],
+    [
+        { 'availableAtOrFrom.identifier': 1, validFrom: 1 },
+        { name: 'availableAtOrFrom' }
+    ]
 ];
 exports.indexes = indexes;
 /**

package/lib/chevre/repo/mongoose/schemas/member.js

@@ -61,6 +61,16 @@ const indexes = [
             }
         }
     ],
+    [
+        { 'project.id': 1, 'member.identifier': 1 }, // アプリケーションコード追加(2025-11-17~)
+        {
+            name: 'uniqueByMemberIdentifier',
+            unique: true,
+            partialFilterExpression: {
+                'member.identifier': { $exists: true }
+            }
+        }
+    ],
     [
         { 'project.id': 1, 'member.id': 1, 'member.memberOf.id': 1 },
         {

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

@@ -2,6 +2,7 @@ import * as factory from '../../../factory';
 import { Settings } from '../../../settings';
 import type { AdvanceBookingRequirementRepo } from '../../../repo/advanceBookingRequirement';
 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 type { EventSeriesRepo } from '../../../repo/eventSeries';
@@ -21,8 +22,10 @@ import type { OfferRateLimitRepo } from '../../../repo/rateLimit/offer';
 import type { SettingRepo } from '../../../repo/setting';
 import type { StockHolderRepo } from '../../../repo/stockHolder';
 import type { TaskRepo } from '../../../repo/task';
+import type { TicketRepo } from '../../../repo/ticket';
 interface IStartOperationRepos {
     advanceBookingRequirement: AdvanceBookingRequirementRepo;
+    authorization: AuthorizationRepo;
     stockHolder: StockHolderRepo;
     event: EventRepo;
     eventOffer: EventOfferRepo;
@@ -42,6 +45,7 @@ interface IStartOperationRepos {
     seat: SeatRepo;
     setting: SettingRepo;
     task: TaskRepo;
+    ticket: TicketRepo;
     assetTransaction: AssetTransactionRepo;
 }
 type IStartOperation<T> = (repos: IStartOperationRepos, settings: Settings) => Promise<T>;

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

@@ -41,17 +41,20 @@ function start(params, options) {
         // validationを承認アクション開始前から移行(2023-01-27~)
         yield (0, validateStartRequest_1.validateStartRequest)({
             object: params.object,
+            instrument: params.instrument,
             event,
             validateEventOfferPeriod: params.validateEventOfferPeriod,
             validateEvent: params.validateEvent,
             now,
             store: { id: (_a = params.availableAtOrFrom) === null || _a === void 0 ? void 0 : _a.id }
         })({
+            authorization: repos.authorization,
             eventOffer: repos.eventOffer,
             issuer: repos.issuer,
             member: repos.member,
             memberProgram: repos.memberProgram,
-            productOffer: repos.productOffer
+            productOffer: repos.productOffer,
+            ticket: repos.ticket
         });
         // objectに必要な情報をそろえる
         const { acceptedOffers4transactionObject, objectSubReservations } = yield createObjectAttributes({

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

@@ -15,6 +15,7 @@ declare function fixExtendedEventOffer(params: {
         id: string;
     };
     object: factory.assetTransaction.reserve.IObjectWithoutDetail;
+    acceptedEventOffer?: factory.authorization.IOfferAsObject;
 }): (repos: {
     eventOffer: EventOfferRepo;
     member: MemberRepo;

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

@@ -17,11 +17,11 @@ const factory = require("../../../../factory");
  */
 function fixExtendedEventOffer(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
-        var _a, _b;
+        var _a;
         const { event, availableAt } = params;
         const acceptedDate = moment(params.now);
         // リクエストによるオファーコード指定が必須
-        const eventOfferIdentifierMustBe = (_b = (_a = params.object.reservationFor) === null || _a === void 0 ? void 0 : _a.offers) === null || _b === void 0 ? void 0 : _b.identifier;
+        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');
         }

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

@@ -9,6 +9,7 @@ declare function validateIssuedOfferIfExists(params: {
     now: Date;
     object: factory.assetTransaction.reserve.IObjectWithoutDetail;
     eventOffer: Pick<factory.eventOffer.IEventOffer, 'identifier' | 'itemOffered' | 'offeredBy' | 'validFrom' | 'validThrough'>;
+    acceptedEventOffer?: factory.authorization.IOfferAsObject;
 }): (repos: {
     issuer: IssuerRepo;
 }) => Promise<void>;

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

@@ -114,14 +114,14 @@ function validateOfferToken(params) {
  */
 function validateIssuedOfferIfExists(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
-        var _a, _b, _c, _d, _e;
+        var _a, _b, _c;
         const { event, eventOffer } = 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 = (_c = (_b = params.object.reservationFor) === null || _b === void 0 ? void 0 : _b.offers) === null || _c === void 0 ? void 0 : _c.identifier;
-            const offerToken = (_e = (_d = params.object.reservationFor) === null || _d === void 0 ? void 0 : _d.offers) === null || _e === void 0 ? void 0 : _e.token;
+            const offerIdentifierMustBe = (_b = params.acceptedEventOffer) === null || _b === void 0 ? void 0 : _b.identifier;
+            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');
             }

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

@@ -8,6 +8,7 @@ declare function validateMemberTierIfExists(params: {
     now: Date;
     object: factory.assetTransaction.reserve.IObjectWithoutDetail;
     makesOfferOnApplication: factory.event.screeningEvent.ISellerMakesOffer;
+    acceptedEventOffer?: factory.authorization.IOfferAsObject;
 }): (repos: {
     issuer: IssuerRepo;
     memberProgram: MemberProgramRepo;

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

@@ -101,7 +101,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,9 +109,9 @@ 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');

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,64 @@
+"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) {
+                // 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');
+                //     }
+                // }
+                acceptedEventOffer = authorizedObject;
+            }
+            else {
+                throw new factory.errors.Argument('ticketToken', 'must be Offer');
+            }
+        }
+        return { acceptedEventOffer };
+    });
+}

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

@@ -1,12 +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'>;
     /**
      * アプリケーションごとのオファーを検証するかどうか
@@ -21,10 +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

@@ -15,6 +15,7 @@ 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;
@@ -24,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) {
@@ -41,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~)
@@ -76,7 +86,8 @@ function validateApplicationOffer(params) {
                 event,
                 now: params.now,
                 object: params.object,
-                eventOffer: existingEventOffer
+                eventOffer: existingEventOffer,
+                acceptedEventOffer
             })(repos);
         }
         else {
@@ -86,7 +97,8 @@ function validateApplicationOffer(params) {
                 event,
                 now: params.now,
                 object: params.object,
-                makesOfferOnApplication
+                makesOfferOnApplication,
+                acceptedEventOffer
             })(repos);
         }
     });

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

@@ -7,10 +7,6 @@ declare function createReserveTransactionStartParams(params: {
     acceptedOffers: factory.assetTransaction.reserve.IAcceptedTicketOfferWithoutDetail[];
     event: {
         id: string;
-        offers?: {
-            validForMemberTier?: factory.assetTransaction.reserve.ITokenizedMemberProgramTier;
-            identifier?: string;
-        };
     };
     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, _c;
+    var _a;
     const { transaction, transactionNumber } = params;
     const { seller } = transaction;
     const acceptedTicketOffersWithoutDetail = (Array.isArray(params.acceptedOffers))
@@ -48,11 +48,8 @@ function createReserveTransactionStartParams(params) {
         //     }
         // ]
     };
-    const validForMemberTier = (_b = params.event.offers) === null || _b === void 0 ? void 0 : _b.validForMemberTier;
-    const eventOfferIdentifier = (_c = params.event.offers) === null || _c === void 0 ? void 0 : _c.identifier;
     const object = Object.assign({ acceptedOffer: acceptedTicketOffersWithoutDetail, reservationFor: {
-            id: params.event.id,
-            offers: Object.assign(Object.assign({}, (typeof (validForMemberTier === null || validForMemberTier === void 0 ? void 0 : validForMemberTier.token) === 'string') ? { validForMemberTier } : undefined), (typeof eventOfferIdentifier === 'string') ? { identifier: eventOfferIdentifier } : undefined)
+            id: params.event.id
         } }, (params.broker !== undefined) ? { broker: params.broker } : undefined);
     return {
         project: { typeOf: factory.organizationType.Project, id: params.project.id },

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

@@ -44,6 +44,7 @@ declare function processStartReserve4chevre(params: {
     validateEventOfferPeriod: boolean;
     validateEvent: boolean;
     orderNumber: string;
+    instrument: factory.action.reserve.ITicketAsInstrument[];
 }, options: {
     /**
      * 最大n日前から予約可能

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

@@ -20,19 +20,13 @@ function processStartReserve4chevre(params, options) {
     //     jwt: JWTCredentials;
     // }
     ) => __awaiter(this, void 0, void 0, function* () {
-        var _a, _b, _c;
         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: {
-                id: event.id,
-                offers: Object.assign(Object.assign({}, (typeof ((_b = (_a = event.offers) === null || _a === void 0 ? void 0 : _a.validForMemberTier) === null || _b === void 0 ? void 0 : _b.token) === 'string')
-                    ? { validForMemberTier: event.offers.validForMemberTier }
-                    : undefined), (typeof ((_c = event.offers) === null || _c === void 0 ? void 0 : _c.identifier) === 'string')
-                    ? { identifier: event.offers.identifier }
-                    : undefined)
+                id: event.id
             }, transaction,
             transactionNumber }, (params.broker !== undefined) ? { broker: params.broker } : undefined));
         const startParamObject = yield validateObjectWithoutDetail(startParams, { id: params.transaction.id })(repos);
@@ -40,6 +34,7 @@ function processStartReserve4chevre(params, options) {
             // 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

@@ -80,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, _d;
+        var _a, _b;
         const transaction = yield repos.transaction.projectFieldsInProgressById({
             typeOf: factory.transactionType.PlaceOrder,
             id: params.transaction.id
@@ -98,13 +98,13 @@ 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 eventOfferIdentifier = (_d = params.object.reservationFor.offers) === null || _d === void 0 ? void 0 : _d.identifier;
         const event = {
             id: params.object.reservationFor.id,
-            typeOf: factory.eventType.ScreeningEvent, // ひとまずfix(2024-07-17~)
-            offers: Object.assign(Object.assign({}, (typeof (validForMemberTier === null || validForMemberTier === void 0 ? void 0 : validForMemberTier.token) === 'string') ? { validForMemberTier } : undefined), (typeof eventOfferIdentifier === 'string') ? { identifier: eventOfferIdentifier } : undefined)
+            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/package.json

@@ -11,8 +11,8 @@
   "dependencies": {
     "@aws-sdk/client-cognito-identity-provider": "3.600.0",
     "@aws-sdk/credential-providers": "3.600.0",
-    "@chevre/factory": "5.2.0-alpha.11",
-    "@cinerino/sdk": "12.7.0-alpha.4",
+    "@chevre/factory": "5.2.0-alpha.12",
+    "@cinerino/sdk": "12.8.0-alpha.2",
     "@motionpicture/coa-service": "9.6.0",
     "@motionpicture/gmo-service": "5.4.0-alpha.1",
     "@sendgrid/client": "8.1.4",
@@ -115,5 +115,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build && npm test && npm run doc"
   },
-  "version": "23.1.0-alpha.8"
+  "version": "23.1.0-alpha.9"
 }