@chevre/domain 23.1.0-alpha.1 → 23.1.0-alpha.11

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

@@ -0,0 +1,102 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.modelName = exports.indexes = void 0;
+exports.createSchema = createSchema;
+const mongoose_1 = require("mongoose");
+const settings_1 = require("../../../settings");
+const writeConcern_1 = require("../writeConcern");
+const modelName = 'EventOffer';
+exports.modelName = modelName;
+const schemaDefinition = {
+    project: { type: mongoose_1.SchemaTypes.Mixed, required: true },
+    seller: { type: mongoose_1.SchemaTypes.Mixed, required: true },
+    typeOf: { type: String, required: true },
+    identifier: { type: String, required: true },
+    itemOffered: { type: mongoose_1.SchemaTypes.Mixed, required: true },
+    validFrom: { type: Date, required: true },
+    validThrough: { type: Date, required: true },
+    availableAtOrFrom: { type: mongoose_1.SchemaTypes.Mixed, required: true },
+    offeredBy: { type: mongoose_1.SchemaTypes.Mixed, required: false }
+    // availability: { type: String, required: true }
+};
+const schemaOptions = {
+    autoIndex: settings_1.MONGO_AUTO_INDEX,
+    autoCreate: false,
+    collection: 'eventOffers',
+    id: true,
+    read: settings_1.MONGO_READ_PREFERENCE,
+    writeConcern: writeConcern_1.writeConcern,
+    strict: true,
+    strictQuery: false,
+    timestamps: false,
+    versionKey: false,
+    toJSON: {
+        getters: false,
+        virtuals: false,
+        minimize: false,
+        versionKey: false
+    },
+    toObject: {
+        getters: false,
+        virtuals: true,
+        minimize: false,
+        versionKey: false
+    }
+};
+const indexes = [
+    [
+        { 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;
+/**
+ * 拡張イベントオファースキーマ
+ */
+let schema;
+function createSchema() {
+    if (schema === undefined) {
+        schema = new mongoose_1.Schema(schemaDefinition, schemaOptions);
+        if (settings_1.MONGO_AUTO_INDEX) {
+            indexes.forEach((indexParams) => {
+                schema === null || schema === void 0 ? void 0 : schema.index(...indexParams);
+            });
+        }
+    }
+    return schema;
+}

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/repository.d.ts

@@ -23,6 +23,7 @@ import type { CustomerRepo } from './repo/customer';
 import type { CustomerTypeRepo } from './repo/customerType';
 import type { EmailMessageRepo } from './repo/emailMessage';
 import type { EventRepo } from './repo/event';
+import type { EventOfferRepo } from './repo/eventOffer';
 import type { EventSellerMakesOfferRepo } from './repo/eventSellerMakesOffer';
 import type { EventSeriesRepo } from './repo/eventSeries';
 import type { IdentityRepo } from './repo/identity';
@@ -181,6 +182,10 @@ export type Event = EventRepo;
 export declare namespace Event {
     function createInstance(...params: ConstructorParameters<typeof EventRepo>): Promise<EventRepo>;
 }
+export type EventOffer = EventOfferRepo;
+export declare namespace EventOffer {
+    function createInstance(...params: ConstructorParameters<typeof EventOfferRepo>): Promise<EventOfferRepo>;
+}
 export type EventSellerMakesOffer = EventSellerMakesOfferRepo;
 export declare namespace EventSellerMakesOffer {
     function createInstance(...params: ConstructorParameters<typeof EventSellerMakesOfferRepo>): Promise<EventSellerMakesOfferRepo>;

package/lib/chevre/repository.js

@@ -9,8 +9,8 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Person = exports.paymentMethod = exports.PendingReservation = exports.PaymentServiceProvider = exports.PaymentServiceChannel = exports.PaymentService = exports.Passport = exports.OwnershipInfo = exports.OrderNumber = exports.OrderInTransaction = exports.Order = exports.Offer = exports.OfferItemCondition = exports.OfferCatalogItem = exports.OfferCatalog = exports.NoteAboutOrder = exports.Note = exports.MovieTicketType = exports.Message = exports.MerchantReturnPolicy = exports.MemberProgram = exports.Member = exports.Issuer = exports.IdentityProvider = exports.Identity = exports.EventSeries = exports.EventSellerMakesOffer = exports.Event = exports.EmailMessage = exports.CustomerType = exports.Customer = exports.Credentials = exports.CreativeWork = exports.ConfirmationNumber = exports.Comment = exports.Authorization = exports.CategoryCode = exports.AssetTransaction = exports.Aggregation = exports.AggregateReservation = exports.AggregateOrder = exports.AggregateOffer = exports.AdvanceBookingRequirement = exports.AdditionalProperty = exports.Action = exports.AccountTransaction = exports.AccountTitle = exports.AccountingReport = exports.Account = exports.AcceptedOffer = void 0;
-exports.WebSite = exports.rateLimit = exports.Trip = exports.TransactionProcess = exports.TransactionNumber = exports.Transaction = exports.Ticket = exports.Telemetry = exports.Task = exports.StockHolder = exports.setting = exports.Setting = exports.ServiceOutputIdentifier = exports.ServiceOutput = exports.ServiceAvailableHour = exports.SellerReturnPolicy = exports.SellerPaymentAccepted = exports.SellerMakesOffer = exports.Seller = exports.Schedule = exports.Role = exports.ReserveInterface = exports.Reservation = exports.ProjectMakesOffer = exports.Project = exports.ProductOffer = exports.ProductModel = exports.ProductHasOfferCatalog = exports.Product = exports.PriceSpecification = exports.PotentialAction = exports.place = exports.Permit = void 0;
+exports.paymentMethod = exports.PendingReservation = exports.PaymentServiceProvider = exports.PaymentServiceChannel = exports.PaymentService = exports.Passport = exports.OwnershipInfo = exports.OrderNumber = exports.OrderInTransaction = exports.Order = exports.Offer = exports.OfferItemCondition = exports.OfferCatalogItem = exports.OfferCatalog = exports.NoteAboutOrder = exports.Note = exports.MovieTicketType = exports.Message = exports.MerchantReturnPolicy = exports.MemberProgram = exports.Member = exports.Issuer = exports.IdentityProvider = exports.Identity = exports.EventSeries = exports.EventSellerMakesOffer = exports.EventOffer = exports.Event = exports.EmailMessage = exports.CustomerType = exports.Customer = exports.Credentials = exports.CreativeWork = exports.ConfirmationNumber = exports.Comment = exports.Authorization = exports.CategoryCode = exports.AssetTransaction = exports.Aggregation = exports.AggregateReservation = exports.AggregateOrder = exports.AggregateOffer = exports.AdvanceBookingRequirement = exports.AdditionalProperty = exports.Action = exports.AccountTransaction = exports.AccountTitle = exports.AccountingReport = exports.Account = exports.AcceptedOffer = void 0;
+exports.WebSite = exports.rateLimit = exports.Trip = exports.TransactionProcess = exports.TransactionNumber = exports.Transaction = exports.Ticket = exports.Telemetry = exports.Task = exports.StockHolder = exports.setting = exports.Setting = exports.ServiceOutputIdentifier = exports.ServiceOutput = exports.ServiceAvailableHour = exports.SellerReturnPolicy = exports.SellerPaymentAccepted = exports.SellerMakesOffer = exports.Seller = exports.Schedule = exports.Role = exports.ReserveInterface = exports.Reservation = exports.ProjectMakesOffer = exports.Project = exports.ProductOffer = exports.ProductModel = exports.ProductHasOfferCatalog = exports.Product = exports.PriceSpecification = exports.PotentialAction = exports.place = exports.Permit = exports.Person = void 0;
 var AcceptedOffer;
 (function (AcceptedOffer) {
     let repo;
@@ -310,6 +310,19 @@ var Event;
     }
     Event.createInstance = createInstance;
 })(Event || (exports.Event = Event = {}));
+var EventOffer;
+(function (EventOffer) {
+    let repo;
+    function createInstance(...params) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (repo === undefined) {
+                repo = (yield Promise.resolve().then(() => require('./repo/eventOffer'))).EventOfferRepo;
+            }
+            return new repo(...params);
+        });
+    }
+    EventOffer.createInstance = createInstance;
+})(EventOffer || (exports.EventOffer = EventOffer = {}));
 var EventSellerMakesOffer;
 (function (EventSellerMakesOffer) {
     let repo;

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

@@ -2,9 +2,12 @@ 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';
 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';
@@ -19,12 +22,16 @@ 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;
     eventSeries: EventSeriesRepo;
     issuer: IssuerRepo;
+    member: MemberRepo;
     memberProgram: MemberProgramRepo;
     offer: OfferRepo;
     offerCatalog: OfferCatalogRepo;
@@ -38,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,15 +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

@@ -0,0 +1,22 @@
+import * as factory from '../../../../factory';
+import { IMinimizedIndividualEvent } from '../../../../factory/event';
+import type { EventOfferRepo } from '../../../../repo/eventOffer';
+import type { MemberRepo } from '../../../../repo/member';
+/**
+ * リクエストから拡張イベントオファーを決定する
+ */
+declare function fixExtendedEventOffer(params: {
+    event: Pick<IMinimizedIndividualEvent, 'offers' | 'id' | 'project' | 'identifier'>;
+    now: Date;
+    availableAt: {
+        /**
+         * 販売アプリケーションID
+         */
+        id: string;
+    };
+    acceptedEventOffer?: factory.authorization.IOfferAsObject;
+}): (repos: {
+    eventOffer: EventOfferRepo;
+    member: MemberRepo;
+}) => Promise<Pick<factory.eventOffer.IEventOffer, "identifier" | "itemOffered" | "typeOf" | "offeredBy" | "validFrom" | "validThrough" | "id">>;
+export { fixExtendedEventOffer };

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

@@ -0,0 +1,63 @@
+"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.fixExtendedEventOffer = fixExtendedEventOffer;
+const moment = require("moment");
+const factory = require("../../../../factory");
+/**
+ * リクエストから拡張イベントオファーを決定する
+ */
+function fixExtendedEventOffer(params) {
+    return (repos) => __awaiter(this, void 0, void 0, function* () {
+        var _a;
+        const { event, availableAt } = params;
+        const acceptedDate = moment(params.now);
+        // リクエストによるオファーコード指定が必須
+        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({
+            project: { id: event.project.id },
+            limit: 1,
+            page: 1,
+            member: {
+                id: { $eq: availableAt.id }
+            }
+        })).shift();
+        if (existingCustomerMember === undefined) {
+            throw new factory.errors.NotFound(`Member: ${availableAt.id}`);
+        }
+        // tslint:disable-next-line:no-console
+        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}`);
+        }
+        // アプリケーションコードで利用可能な拡張オファーを検索
+        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 } }, // 対象イベント
+            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(`valid eventOffer: ${eventOfferIdMustBe}`);
+        }
+        return existingEventOffer;
+    });
+}

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

@@ -7,8 +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;
-    makesOfferOnApplication: factory.event.screeningEvent.ISellerMakesOffer;
+    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;
         }
@@ -50,31 +50,31 @@ function verifyOfferToken(params) {
 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, makesOfferOnApplication } = params;
+        var _a;
+        const { event, acceptedDate, verifiedOffer, eventOffer, numAcceptedOffers } = params;
         // イベント識別子一致検証
         const itemOfferedIdentifier = verifiedOffer.itemOffered.identifier;
         if (typeof itemOfferedIdentifier !== 'string' || itemOfferedIdentifier === '') {
-            throw new factory.errors.Argument('reservationFor.offers.token', 'itemOffered.identifier must be string');
+            throw new factory.errors.Argument('ticketedOffer.token', 'itemOffered.identifier must be string');
         }
         const itemOfferedIdentifierMustBe = event.identifier;
         if (typeof itemOfferedIdentifierMustBe !== 'string') {
             throw new factory.errors.NotFound('identifier', 'the event must have an identifier');
         }
         if (itemOfferedIdentifier !== itemOfferedIdentifierMustBe) {
-            throw new factory.errors.Argument('reservationFor.offers.token', 'itemOffered.identifier not matched');
+            throw new factory.errors.Argument('ticketedOffer.token', 'itemOffered.identifier 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 = makesOfferOnApplication.identifier;
+        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;
         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`);
@@ -114,26 +114,26 @@ function validateOfferToken(params) {
  */
 function validateIssuedOfferIfExists(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
-        var _a, _b, _c, _d, _e;
-        const { event, makesOfferOnApplication } = params;
+        var _a, _b, _c;
+        const { event, eventOffer, numAcceptedOffers } = params;
         const acceptedDate = moment(params.now);
-        const offerTokenIssuer = (_a = makesOfferOnApplication.offeredBy) === null || _a === void 0 ? void 0 : _a.identifier;
+        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;
-            if (typeof offerIdentifierMustBe !== 'string' || offerIdentifierMustBe === '') {
-                throw new factory.errors.ArgumentNull('object.reservationFor.offers.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 offerIdMustBe !== 'string' || offerIdMustBe === '') {
+                throw new factory.errors.NotFound('ticketedOffer.id');
             }
             if (typeof offerToken !== 'string' || offerToken === '') {
                 throw new factory.errors.ArgumentNull('object.reservationFor.offers.token');
             }
-            if (typeof makesOfferOnApplication.identifier !== 'string' || makesOfferOnApplication.identifier === '') {
-                throw new factory.errors.NotFound('seller.makesOffer.identifier');
+            if (typeof eventOffer.identifier !== 'string' || eventOffer.identifier === '') {
+                throw new factory.errors.NotFound('eventOffer.identifier');
             }
-            // アプリケーションオファーコード一致検証
-            if (makesOfferOnApplication.identifier !== offerIdentifierMustBe) {
-                throw new factory.errors.Argument('object.reservationFor.offers.identifier', 'offers.identifier not matched');
+            // イベントオファーID一致検証
+            if (eventOffer.id !== offerIdMustBe) {
+                throw new factory.errors.Argument('object.reservationFor.offers.identifier', 'eventOffer.identifier not matched');
             }
             const issuer = yield repos.issuer.findByIdentifier({
                 project: { id: event.project.id },
@@ -151,8 +151,8 @@ function validateIssuedOfferIfExists(params) {
                 event,
                 acceptedDate,
                 verifiedOffer,
-                makesOfferOnApplication,
-                object: params.object
+                eventOffer,
+                numAcceptedOffers
             })();
         }
     });

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

@@ -6,8 +6,8 @@ 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: {
     issuer: IssuerRepo;
     memberProgram: MemberProgramRepo;

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;

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 };