@chevre/domain 22.14.0-alpha.8 → 23.0.0-alpha.0

package/lib/chevre/repository.d.ts

@@ -34,7 +34,6 @@ import type { MerchantReturnPolicyRepo } from './repo/merchantReturnPolicy';
 import type { MessageRepo } from './repo/message';
 import type { NoteRepo } from './repo/note';
 import type { NoteAboutOrderRepo } from './repo/noteAboutOrder';
-import type { EventOfferRepo } from './repo/offer/event';
 import type { OfferRepo } from './repo/offer/unitPriceInCatalog';
 import type { OfferCatalogRepo } from './repo/offerCatalog';
 import type { OfferCatalogItemRepo } from './repo/offerCatalogItem';
@@ -180,10 +179,6 @@ 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.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.Product = exports.PriceSpecification = exports.PotentialAction = exports.place = exports.Permit = void 0;
+exports.Permit = 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.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.Product = exports.PriceSpecification = exports.PotentialAction = exports.place = void 0;
 var AcceptedOffer;
 (function (AcceptedOffer) {
     let repo;
@@ -310,19 +310,6 @@ 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/offer/event'))).EventOfferRepo;
-            }
-            return new repo(...params);
-        });
-    }
-    EventOffer.createInstance = createInstance;
-})(EventOffer || (exports.EventOffer = EventOffer = {}));
 var EventSellerMakesOffer;
 (function (EventSellerMakesOffer) {
     let repo;

package/lib/chevre/service/aggregation/event/aggregateOffers.d.ts

@@ -24,6 +24,6 @@ type IAggregateOffersOperation<T> = (repos: {
  */
 declare function aggregateOffers(params: {
     id: string;
-    typeOf: factory.eventType.ScreeningEvent | factory.eventType.Event;
+    typeOf: factory.eventType.ScreeningEvent;
 }): IAggregateOffersOperation<void>;
 export { aggregateOffers };

package/lib/chevre/service/aggregation/event/aggregateOffers.js

@@ -43,7 +43,6 @@ function aggregateOffers(params) {
 }
 function aggregateOffersByEvent(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
-        var _a;
         const now = new Date();
         const event = params.event;
         // 施設取得は冗長なので、ルーム検索に変更(2023-01-30~)
@@ -52,7 +51,7 @@ function aggregateOffersByEvent(params) {
             movieTheaterId = params.event.superEvent.location.id;
         }
         else {
-            movieTheaterId = String((_a = params.event.offers) === null || _a === void 0 ? void 0 : _a.itemOffered.availableChannel.serviceLocation.containedInPlace.id);
+            throw new factory.errors.NotImplemented(`typeOf: ${params.event.typeOf}`);
         }
         const screeningRoom = yield repos.screeningRoom.findScreeningRoomsByBranchCode({
             project: { id: event.project.id },
@@ -123,10 +122,7 @@ function aggregateReservationByOffer(params) {
         let reservationCount4offer;
         // let attendeeCount4offer: number | undefined;
         // let checkInCount4offer: number | undefined;
-        let reservationType = factory.reservationType.EventReservation;
-        if (params.event.typeOf === factory.eventType.Event) {
-            reservationType = factory.reservationType.BusReservation;
-        }
+        const reservationType = factory.reservationType.EventReservation;
         const offerIdsWithSameCategory = params.availableOffers.filter(({ category }) => {
             var _a;
             return typeof (category === null || category === void 0 ? void 0 : category.codeValue) === 'string' && category.codeValue === ((_a = params.offer.category) === null || _a === void 0 ? void 0 : _a.codeValue);

package/lib/chevre/service/aggregation/event/aggregateScreeningEvent.js

@@ -56,19 +56,7 @@ function aggregateScreeningEvent(params) {
                     .add(1, 'hour')
                     .add(-1, 'second')
                     .toDate();
-                if (event.typeOf === factory.eventType.Event) {
-                    aggregatingEvents = yield repos.event.projectEventFields({
-                        limit: 100,
-                        page: 1,
-                        project: { id: { $eq: event.project.id } },
-                        typeOf: event.typeOf,
-                        eventStatuses: [factory.eventStatusType.EventScheduled],
-                        startFrom: startFrom,
-                        startThrough: startThrough,
-                        location: { branchCode: { $eq: event.location.branchCode } }
-                    }, ['location', 'project', 'startDate', 'typeOf', 'superEvent.location.id', 'offers.itemOffered', 'maximumPhysicalAttendeeCapacity']);
-                }
-                else if (event.typeOf === factory.eventType.ScreeningEvent) {
+                if (event.typeOf === factory.eventType.ScreeningEvent) {
                     aggregatingEvents = yield repos.event.projectEventFields({
                         limit: 100,
                         page: 1,
@@ -95,7 +83,6 @@ function aggregateByEvent(params, options) {
     return (repos
     // settings: Settings
     ) => __awaiter(this, void 0, void 0, function* () {
-        var _a;
         const now = new Date();
         const event = params.event;
         // 施設取得は冗長なので、ルーム検索に変更(2023-01-30~)
@@ -104,7 +91,7 @@ function aggregateByEvent(params, options) {
             movieTheaterId = params.event.superEvent.location.id;
         }
         else {
-            movieTheaterId = String((_a = params.event.offers) === null || _a === void 0 ? void 0 : _a.itemOffered.availableChannel.serviceLocation.containedInPlace.id);
+            throw new factory.errors.NotImplemented(`typeOf: ${params.event.typeOf}`);
         }
         const screeningRoom = yield repos.screeningRoom.findScreeningRoomsByBranchCode({
             project: { id: event.project.id },
@@ -224,10 +211,7 @@ function aggregateReservationByEvent(params) {
         let attendeeCount;
         let checkInCount;
         let reservationCount;
-        let reservationType = factory.reservationType.EventReservation;
-        if (params.event.typeOf === factory.eventType.Event) {
-            reservationType = factory.reservationType.BusReservation;
-        }
+        const reservationType = factory.reservationType.EventReservation;
         reservationCount = yield repos.reservation.count({
             typeOf: reservationType,
             reservationFor: { id: { $eq: params.event.id } },

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

@@ -5,14 +5,13 @@ import type { OfferRepo } from '../../../../repo/offer/unitPriceInCatalog';
 import type { OfferCatalogRepo } from '../../../../repo/offerCatalog';
 import type { PaymentServiceRepo } from '../../../../repo/paymentService';
 import type { ProductRepo } from '../../../../repo/product';
-import type { ProductOfferRepo } from '../../../../repo/productOffer';
 type IObjectSubReservation = factory.assetTransaction.reserve.IObjectSubReservation;
 declare function createSubReservations(params: {
     acceptedOffers: factory.assetTransaction.reserve.IAcceptedTicketOfferWithoutDetail[];
     ticketOffers: factory.product.ITicketOffer[];
     availableOffers: factory.unitPriceOffer.IUnitPriceOffer[];
     now: Date;
-    event: IMinimizedIndividualEvent<factory.eventType.Event | factory.eventType.ScreeningEvent>;
+    event: IMinimizedIndividualEvent;
     availableSeatOffers: factory.place.seat.IPlaceWithOffer[];
     reservationNumber: string;
     availableAtOrFrom?: {
@@ -25,6 +24,5 @@ declare function createSubReservations(params: {
     offerCatalog: OfferCatalogRepo;
     paymentService: PaymentServiceRepo;
     product: ProductRepo;
-    productOffer: ProductOfferRepo;
 }) => Promise<IObjectSubReservation[]>;
 export { createSubReservations };

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

@@ -42,7 +42,7 @@ declare function createReservation(params: {
         typeOf: factory.organizationType.Project;
     };
     id: string;
-    reservationFor: IMinimizedIndividualEvent<factory.eventType.ScreeningEvent> | IMinimizedIndividualEvent<factory.eventType.Event>;
+    reservationFor: IMinimizedIndividualEvent;
     reservedTicket: IReservedTicket;
     additionalProperty?: factory.propertyValue.IPropertyValue<string>[];
     additionalTicketText?: string;

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

@@ -13,7 +13,7 @@ declare function createStartParams(params: factory.assetTransaction.reserve.ISta
         id: string;
     };
     reservationNumber: string;
-    event: IMinimizedIndividualEvent<factory.eventType.Event | factory.eventType.ScreeningEvent>;
+    event: IMinimizedIndividualEvent;
     acceptedOffers4transactionObject: factory.assetTransaction.reserve.IAcceptedOffer4object[];
     objectSubReservations: IObjectSubReservation[];
     instrument: factory.assetTransaction.reserve.IInstrument[];

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

@@ -25,18 +25,13 @@ function createStartParams(params) {
     };
 }
 function createReservationFor(params, useOptimizeReservation) {
-    var _a, _b;
     if (params.typeOf === factory.eventType.ScreeningEvent) {
         return Object.assign({ endDate: params.endDate, id: params.id, location: params.location, name: params.name, startDate: params.startDate, superEvent: optimizeReservationSuperEvent(params, useOptimizeReservation), typeOf: params.typeOf }, (params.doorTime instanceof Date)
             ? { doorTime: params.doorTime }
             : undefined);
     }
     else {
-        const tripByEvent = (_b = (_a = params.offers) === null || _a === void 0 ? void 0 : _a.itemOffered.serviceOutput) === null || _b === void 0 ? void 0 : _b.reservationFor;
-        if (typeof (tripByEvent === null || tripByEvent === void 0 ? void 0 : tripByEvent.typeOf) !== 'string') {
-            throw new factory.errors.NotFound('event.offers.itemOffered.serviceOutput?.reservationFor');
-        }
-        return Object.assign(Object.assign({}, tripByEvent), { arrivalTime: params.endDate, id: params.id, name: params.name, departureTime: params.startDate });
+        throw new factory.errors.NotImplemented(`typeOf: ${params.typeOf}`);
     }
 }
 function optimizeReservationSuperEvent(params, useOptimizeReservation) {

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

@@ -6,7 +6,6 @@ import type { EventRepo } from '../../../repo/event';
 import type { EventSeriesRepo } from '../../../repo/eventSeries';
 import type { IssuerRepo } from '../../../repo/issuer';
 import type { MemberProgramRepo } from '../../../repo/memberProgram';
-import type { EventOfferRepo } from '../../../repo/offer/event';
 import type { OfferRepo } from '../../../repo/offer/unitPriceInCatalog';
 import type { OfferCatalogRepo } from '../../../repo/offerCatalog';
 import type { OfferCatalogItemRepo } from '../../../repo/offerCatalogItem';
@@ -24,7 +23,6 @@ interface IStartOperationRepos {
     advanceBookingRequirement: AdvanceBookingRequirementRepo;
     stockHolder: StockHolderRepo;
     event: EventRepo;
-    eventOffer: EventOfferRepo;
     eventSeries: EventSeriesRepo;
     issuer: IssuerRepo;
     memberProgram: MemberProgramRepo;

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

@@ -47,9 +47,9 @@ function start(params, options) {
             now,
             store: { id: (_a = params.availableAtOrFrom) === null || _a === void 0 ? void 0 : _a.id }
         })({
-            eventOffer: repos.eventOffer,
             issuer: repos.issuer,
-            memberProgram: repos.memberProgram
+            memberProgram: repos.memberProgram,
+            productOffer: repos.productOffer
         });
         // objectに必要な情報をそろえる
         const { acceptedOffers4transactionObject, objectSubReservations } = yield createObjectAttributes({
@@ -117,10 +117,10 @@ function createObjectAttributes(params, options) {
         const { event, now } = params;
         const reservationNumber = params.transaction.transactionNumber;
         const acceptedOffers = (Array.isArray(params.object.acceptedOffer)) ? params.object.acceptedOffer : [];
-        if (event.typeOf !== factory.eventType.ScreeningEvent && event.typeOf !== factory.eventType.Event) {
+        if (event.typeOf !== factory.eventType.ScreeningEvent) {
             throw new factory.errors.Argument('object.reservationFor.id', `invalid event type ${event.typeOf}`);
         }
-        if (event.typeOf === factory.eventType.ScreeningEvent || event.typeOf === factory.eventType.Event) {
+        if (event.typeOf === factory.eventType.ScreeningEvent) {
             validateEvent({ now, event }, options);
         }
         // 受け入れたオファーIDだけ取得する(2023-01-26~)

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

@@ -2,10 +2,10 @@ import * as factory from '../../../factory';
 import { IMinimizedIndividualEvent } from '../../../factory/event';
 import type { IssuerRepo } from '../../../repo/issuer';
 import type { MemberProgramRepo } from '../../../repo/memberProgram';
-import type { EventOfferRepo } from '../../../repo/offer/event';
+import type { ProductOfferRepo } from '../../../repo/productOffer';
 declare function validateStartRequest(params: {
     object: factory.assetTransaction.reserve.IObjectWithoutDetail;
-    event: Pick<IMinimizedIndividualEvent<factory.eventType.Event | factory.eventType.ScreeningEvent>, 'offers' | 'id' | 'project'>;
+    event: Pick<IMinimizedIndividualEvent, 'offers' | 'id' | 'project'>;
     validateEventOfferPeriod?: boolean;
     validateEvent?: boolean;
     now: Date;
@@ -16,8 +16,8 @@ declare function validateStartRequest(params: {
         id?: string;
     };
 }): (repos: {
-    eventOffer: EventOfferRepo;
     issuer: IssuerRepo;
     memberProgram: MemberProgramRepo;
+    productOffer: ProductOfferRepo;
 }) => Promise<void>;
 export { validateStartRequest };

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

@@ -13,7 +13,6 @@ exports.validateStartRequest = validateStartRequest;
 const jwt = require("jsonwebtoken");
 const moment = require("moment");
 const factory = require("../../../factory");
-const ROLE_DATE_FORMAT = 'YYYY-MM-DDTHH:mm:ssZ';
 function verifyOfferedByToken(params) {
     return __awaiter(this, void 0, void 0, function* () {
         let result;
@@ -55,9 +54,9 @@ function validateStartRequest(params) {
             if (typeof ((_a = params.store) === null || _a === void 0 ? void 0 : _a.id) !== 'string') {
                 throw new factory.errors.NotFound('store.id');
             }
-            const validForMemberTierToken = (_c = (_b = params.object.reservationFor) === null || _b === void 0 ? void 0 : _b.offers) === null || _c === void 0 ? void 0 : _c.validForMemberTier;
+            const tokenizedMemberProgramTier = (_c = (_b = params.object.reservationFor) === null || _b === void 0 ? void 0 : _b.offers) === null || _c === void 0 ? void 0 : _c.validForMemberTier;
             yield validateEventOfferPeriod(Object.assign({ event,
-                now, availableAt: { id: params.store.id } }, (typeof validForMemberTierToken === 'string') ? { validForMemberTierToken } : undefined))(repos);
+                now, availableAt: { id: params.store.id } }, (typeof (tokenizedMemberProgramTier === null || tokenizedMemberProgramTier === void 0 ? void 0 : tokenizedMemberProgramTier.token) === 'string') ? { tokenizedMemberProgramTier } : undefined))(repos);
         }
         if (params.validateEvent === true) {
             validateEvent({ event, object: params.object });
@@ -67,7 +66,7 @@ function validateStartRequest(params) {
 function validateMemberTier(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         var _a, _b, _c, _d, _e;
-        const { acceptedDate, event, availableAt, verifiedValidForMemberTier, memberProgramIdentifierMustBe } = params;
+        const { acceptedDate, event, verifiedValidForMemberTier, memberProgramIdentifierMustBe, aggregateOfferIdentifier } = 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') {
@@ -79,28 +78,41 @@ function validateMemberTier(params) {
         if (memberProgramIdentifier !== memberProgramIdentifierMustBe) {
             throw new factory.errors.Argument('reservationFor.offers.validForMemberTier', 'member program not matched');
         }
-        // イベントオファーを検索して有効期間検証
-        const eventOfferForMemberTier = (yield repos.eventOffer.projectFields({
+        const sellerId = event.offers.seller.id;
+        if (typeof sellerId !== 'string' || sellerId === '') {
+            throw new factory.errors.NotFound('event.offers.seller.id');
+        }
+        // 有効なプロダクトオファーを検証
+        const productOfferForMemberTier = (yield repos.productOffer.findProductOffers({
             limit: 1,
             page: 1,
             project: { id: { $eq: event.project.id } },
-            availableAtOrFrom: { id: { $eq: availableAt.id } },
-            itemOffered: { id: { $eq: event.id } },
-            validForMemberTier: { identifier: { $eq: tierIdentifier } }
-        }, ['validFrom', 'validThrough'])).shift();
-        if (eventOfferForMemberTier === undefined) {
-            throw new factory.errors.NotFound(factory.offerType.Offer, 'event offer for member tier not found');
-        }
-        let validThroughMoment;
-        let validFromMoment;
-        validThroughMoment = moment(eventOfferForMemberTier.validThrough, ROLE_DATE_FORMAT, true);
-        validFromMoment = moment(eventOfferForMemberTier.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}`);
+            // availableAtOrFrom: { id: { $eq: availableAt.id } },
+            itemOffered: { identifier: { $eq: aggregateOfferIdentifier } }, // オファーコレクションコード
+            validForMemberTier: { identifier: { $eq: tierIdentifier } },
+            validFrom: { $lte: acceptedDate.toDate() },
+            validThrough: { $gte: acceptedDate.toDate() },
+            offeredBy: { id: { $eq: sellerId } } // オファー提供者も検証する
+        }, ['identifier'])).shift();
+        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}`
+        //     );
+        // }
     });
 }
 /**
@@ -109,18 +121,18 @@ function validateMemberTier(params) {
 function validateEventOfferPeriod(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         var _a, _b;
-        const { event, availableAt, validForMemberTierToken } = params;
+        const { event, availableAt, tokenizedMemberProgramTier } = params;
         const acceptedDate = moment(params.now);
         const eventOffers = event.offers;
         // アプリケーションごとの設定を参照する(2022-11-19~)
         const makesOfferOnApplication = eventOffers === null || eventOffers === void 0 ? void 0 : eventOffers.seller.makesOffer.find((offer) => {
             var _a, _b;
             // support non-array(2024-10-11~)
-            return (Array.isArray(offer.availableAtOrFrom) && ((_a = offer.availableAtOrFrom.at(0)) === null || _a === void 0 ? void 0 : _a.id) === params.availableAt.id)
-                || (!Array.isArray(offer.availableAtOrFrom) && ((_b = offer.availableAtOrFrom) === null || _b === void 0 ? void 0 : _b.id) === params.availableAt.id);
+            return (Array.isArray(offer.availableAtOrFrom) && ((_a = offer.availableAtOrFrom.at(0)) === null || _a === void 0 ? void 0 : _a.id) === availableAt.id)
+                || (!Array.isArray(offer.availableAtOrFrom) && ((_b = offer.availableAtOrFrom) === null || _b === void 0 ? void 0 : _b.id) === availableAt.id);
         });
         if (makesOfferOnApplication === undefined) {
-            throw new factory.errors.Argument('reservationFor.id', `seller makes no available offer at ${params.availableAt.id}`);
+            throw new factory.errors.Argument('reservationFor.id', `seller makes no available offer at ${availableAt.id}`);
         }
         const validFrom = makesOfferOnApplication.validFrom;
         const validThrough = makesOfferOnApplication.validThrough;
@@ -136,11 +148,24 @@ function validateEventOfferPeriod(params) {
                 throw new factory.errors.Argument('reservationFor.id', `Offer of ${params.event.id} is valid through ${validThrough}`);
             }
         }
+        // 有効メンバープログラムティアが存在する場合
         // support validForMemberTier(2025-05-14~)
-        const memberProgramIdentifierMustBe = (_b = (_a = makesOfferOnApplication.validForMemberTier) === null || _a === void 0 ? void 0 : _a.isTierOf) === null || _b === void 0 ? void 0 : _b.identifier;
-        if (typeof memberProgramIdentifierMustBe === 'string') {
+        const validForMemberTierExists = ((_a = makesOfferOnApplication.validForMemberTier) === null || _a === void 0 ? void 0 : _a.typeOf) === 'MemberProgramTier';
+        if (validForMemberTierExists) {
+            const validForMemberTierToken = tokenizedMemberProgramTier === null || tokenizedMemberProgramTier === void 0 ? void 0 : tokenizedMemberProgramTier.token;
+            const memberProgramIdentifierMustBe = (_b = tokenizedMemberProgramTier === null || tokenizedMemberProgramTier === void 0 ? void 0 : tokenizedMemberProgramTier.isTierOf) === null || _b === void 0 ? void 0 : _b.identifier;
+            // ティアトークンが必須
             if (typeof validForMemberTierToken !== 'string' || validForMemberTierToken === '') {
-                throw new factory.errors.ArgumentNull('reservationFor.offers.validForMemberTier');
+                throw new factory.errors.ArgumentNull('reservationFor.offers.validForMemberTier.token');
+            }
+            // メンバープログラムコード指定が必須
+            if (typeof memberProgramIdentifierMustBe !== 'string' || memberProgramIdentifierMustBe === '') {
+                throw new factory.errors.ArgumentNull('reservationFor.offers.validForMemberTier.isTierOf.identifier');
+            }
+            // 有効メンバープログラムティアが存在する場合、オファーコレクションコードが必須
+            const aggregateOfferIdentifier = eventOffers.identifier;
+            if (typeof aggregateOfferIdentifier !== 'string' || aggregateOfferIdentifier === '') {
+                throw new factory.errors.NotFound('makesOfferOnApplication.identifier');
             }
             // トークン検証
             const memberProgram = (yield repos.memberProgram.projectMemberPrograms({
@@ -150,7 +175,7 @@ function validateEventOfferPeriod(params) {
                 identifier: { $eq: memberProgramIdentifierMustBe }
             })).shift();
             if (memberProgram === undefined) {
-                throw new factory.errors.NotFound('MemberProgram');
+                throw new factory.errors.NotFound('MemberProgram', `MemberProgram '${memberProgramIdentifierMustBe}' not found`);
             }
             const issuer = yield repos.issuer.findByIdentifier({
                 project: { id: params.event.project.id },
@@ -165,8 +190,8 @@ function validateEventOfferPeriod(params) {
                 token: validForMemberTierToken
             });
             yield validateMemberTier({
-                event, availableAt, acceptedDate, verifiedValidForMemberTier,
-                memberProgramIdentifierMustBe
+                event, acceptedDate, verifiedValidForMemberTier,
+                memberProgramIdentifierMustBe, aggregateOfferIdentifier
             })(repos);
         }
     });

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

@@ -8,7 +8,7 @@ declare function createReserveTransactionStartParams(params: {
     event: {
         id: string;
         offers?: {
-            validForMemberTier?: string;
+            validForMemberTier?: factory.assetTransaction.reserve.ITokenizedMemberProgramTier;
         };
     };
     broker?: factory.reservation.IBroker<factory.reservationType>;
@@ -16,7 +16,7 @@ declare function createReserveTransactionStartParams(params: {
     transactionNumber: string;
 }): factory.assetTransaction.reserve.IStartParamsWithoutDetail;
 declare function createAuthorizeSeatReservationActionAttributes(params: {
-    event: Pick<IMinimizedIndividualEvent<factory.eventType.ScreeningEvent>, 'id'>;
+    event: Pick<IMinimizedIndividualEvent, 'id'>;
     instrument: {
         /**
          * 予約取引番号

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

@@ -48,8 +48,8 @@ function createReserveTransactionStartParams(params) {
         //     }
         // ]
     };
-    const validForMemberTierToken = (_b = params.event.offers) === null || _b === void 0 ? void 0 : _b.validForMemberTier;
-    const object = Object.assign({ acceptedOffer: acceptedTicketOffersWithoutDetail, reservationFor: Object.assign({ id: params.event.id }, (typeof validForMemberTierToken === 'string') ? { offers: { validForMemberTier: validForMemberTierToken } } : undefined) }, (params.broker !== undefined) ? { broker: params.broker } : undefined);
+    const validForMemberTier = (_b = params.event.offers) === null || _b === void 0 ? void 0 : _b.validForMemberTier;
+    const object = Object.assign({ acceptedOffer: acceptedTicketOffersWithoutDetail, reservationFor: Object.assign({ id: params.event.id }, (typeof (validForMemberTier === null || validForMemberTier === void 0 ? void 0 : validForMemberTier.token) === 'string') ? { offers: { validForMemberTier } } : undefined) }, (params.broker !== undefined) ? { broker: params.broker } : undefined);
     return {
         project: { typeOf: factory.organizationType.Project, id: params.project.id },
         typeOf: factory.assetTransactionType.Reserve,

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

@@ -8,7 +8,6 @@ import type { EventRepo, IMinimizedIndividualEvent } from '../../../../repo/even
 import { EventSeriesRepo } from '../../../../repo/eventSeries';
 import type { IssuerRepo } from '../../../../repo/issuer';
 import type { MemberProgramRepo } from '../../../../repo/memberProgram';
-import type { EventOfferRepo } from '../../../../repo/offer/event';
 import type { OfferRepo } from '../../../../repo/offer/unitPriceInCatalog';
 import type { OfferCatalogRepo } from '../../../../repo/offerCatalog';
 import type { OfferCatalogItemRepo } from '../../../../repo/offerCatalogItem';
@@ -26,9 +25,9 @@ import type { TicketRepo } from '../../../../repo/ticket';
 import { IResultAcceptedOffer } from './factory';
 declare function processStartReserve4chevre(params: {
     acceptedOffers: factory.assetTransaction.reserve.IAcceptedTicketOfferWithoutDetail[];
-    event: Pick<IMinimizedIndividualEvent<factory.eventType.ScreeningEvent>, 'id'> & {
+    event: Pick<IMinimizedIndividualEvent, 'id'> & {
         offers?: {
-            validForMemberTier?: string;
+            validForMemberTier?: factory.assetTransaction.reserve.ITokenizedMemberProgramTier;
         };
     };
     broker?: factory.reservation.IBroker<factory.reservationType>;
@@ -53,7 +52,6 @@ declare function processStartReserve4chevre(params: {
     authorization: AuthorizationRepo;
     stockHolder: StockHolderRepo;
     event: EventRepo;
-    eventOffer: EventOfferRepo;
     eventSeries: EventSeriesRepo;
     issuer: IssuerRepo;
     memberProgram: MemberProgramRepo;

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

@@ -20,13 +20,13 @@ function processStartReserve4chevre(params, options) {
     //     jwt: JWTCredentials;
     // }
     ) => __awaiter(this, void 0, void 0, function* () {
-        var _a;
+        var _a, _b;
         const { event, transaction, transactionNumber } = params;
         let acceptedOffers4result = [];
         // 予約取引開始
         const startParams = (0, factory_1.createReserveTransactionStartParams)(Object.assign({ project: transaction.project, 
             // object: <IObjectWithDetail>action.object,
-            acceptedOffers: params.acceptedOffers, event: Object.assign({ id: event.id }, (typeof ((_a = event.offers) === null || _a === void 0 ? void 0 : _a.validForMemberTier) === 'string')
+            acceptedOffers: params.acceptedOffers, event: Object.assign({ id: event.id }, (typeof ((_b = (_a = event.offers) === null || _a === void 0 ? void 0 : _a.validForMemberTier) === null || _b === void 0 ? void 0 : _b.token) === 'string')
                 ? { offers: { validForMemberTier: event.offers.validForMemberTier } }
                 : undefined), transaction,
             transactionNumber }, (params.broker !== undefined) ? { broker: params.broker } : undefined));

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

@@ -8,7 +8,6 @@ import type { EventRepo } from '../../../repo/event';
 import { EventSeriesRepo } from '../../../repo/eventSeries';
 import type { IssuerRepo } from '../../../repo/issuer';
 import type { MemberProgramRepo } from '../../../repo/memberProgram';
-import type { EventOfferRepo } from '../../../repo/offer/event';
 import type { OfferRepo } from '../../../repo/offer/unitPriceInCatalog';
 import type { OfferCatalogRepo } from '../../../repo/offerCatalog';
 import type { OfferCatalogItemRepo } from '../../../repo/offerCatalogItem';
@@ -33,7 +32,6 @@ interface IAuthorizeRepos {
     assetTransaction: AssetTransactionRepo;
     authorization: AuthorizationRepo;
     event: EventRepo;
-    eventOffer: EventOfferRepo;
     eventSeries: EventSeriesRepo;
     issuer: IssuerRepo;
     memberProgram: MemberProgramRepo;

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

@@ -99,8 +99,8 @@ function validateCreateRequest(params) {
             throw new factory.errors.ArgumentNull('object.reservationFor.id');
         }
         // support validForMemberTier(2025-05-14~)
-        const validForMemberTierToken = (_c = params.object.reservationFor.offers) === null || _c === void 0 ? void 0 : _c.validForMemberTier;
-        const event = Object.assign({ id: params.object.reservationFor.id, typeOf: factory.eventType.ScreeningEvent }, (typeof validForMemberTierToken === 'string') ? { offers: { validForMemberTier: validForMemberTierToken } } : undefined);
+        const validForMemberTier = (_c = params.object.reservationFor.offers) === null || _c === void 0 ? void 0 : _c.validForMemberTier;
+        const event = Object.assign({ id: params.object.reservationFor.id, typeOf: factory.eventType.ScreeningEvent }, (typeof (validForMemberTier === null || validForMemberTier === void 0 ? void 0 : validForMemberTier.token) === 'string') ? { offers: { validForMemberTier } } : undefined);
         return { transaction, event };
     });
 }

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

@@ -2,7 +2,7 @@ import type { IMinimizedIndividualEvent } from '../../../repo/event';
 import type { OfferRateLimitRepo } from '../../../repo/rateLimit/offer';
 import * as factory from '../../../factory';
 declare function checkAvailability(params: {
-    event: Pick<IMinimizedIndividualEvent<factory.eventType.Event | factory.eventType.ScreeningEvent>, 'startDate' | 'project'>;
+    event: Pick<IMinimizedIndividualEvent, 'startDate' | 'project'>;
     unitPriceOffer: factory.unitPriceOffer.IUnitPriceOffer;
 }): (repos: {
     offerRateLimit: OfferRateLimitRepo;

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

@@ -31,7 +31,7 @@ declare function searchEventTicketOffers(params: {
      */
     event: {
         id: string;
-        typeOf: factory.eventType.Event | factory.eventType.ScreeningEvent;
+        typeOf: factory.eventType.ScreeningEvent;
     };
     /**
      * どのアプリケーションに対して

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

@@ -33,7 +33,7 @@ declare function searchOffersByIds(params: {
      */
     event: {
         id: string;
-        typeOf: factory.eventType.Event | factory.eventType.ScreeningEvent;
+        typeOf: factory.eventType.ScreeningEvent;
     };
     /**
      * どのアプリケーションに対して

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

@@ -32,7 +32,7 @@ export declare function responseBody2acceptedOffers4result(params: {
     };
     responseBody: IResponseBody;
     acceptedOffer: IAcceptedOffer4COA[];
-    event: Pick<IMinimizedIndividualEvent<factory.eventType.ScreeningEvent>, 'coaInfo' | 'doorTime' | 'endDate' | 'id' | 'location' | 'startDate' | 'superEvent' | 'typeOf' | 'identifier' | 'name'>;
+    event: Pick<IMinimizedIndividualEvent, 'coaInfo' | 'doorTime' | 'endDate' | 'id' | 'location' | 'startDate' | 'superEvent' | 'typeOf' | 'identifier' | 'name'>;
     seller: Pick<factory.transaction.placeOrder.ISeller, 'typeOf' | 'name'>;
     bookingTime: Date;
     totalPrice: number;

package/lib/chevre/service/offer/onEventChanged.js

@@ -52,7 +52,7 @@ function onEventChanged(params) {
                     // no op
                 }
             }
-            if (params.typeOf === factory.eventType.Event || params.typeOf === factory.eventType.ScreeningEvent) {
+            if (params.typeOf === factory.eventType.ScreeningEvent) {
                 if (repos.pendingReservation !== undefined) {
                     // sync pendingReservations.expires(2025-05-08~)
                     yield syncEventEndDate2pendingReservations({
@@ -105,24 +105,7 @@ function createInformTasks(params, setting) {
         let events4inform;
         // const informEvents = settings.onEventChanged.informEvent;
         const informEvents = (_a = setting === null || setting === void 0 ? void 0 : setting.onResourceUpdated) === null || _a === void 0 ? void 0 : _a.informResource;
-        if (params.typeOf === factory.eventType.Event) {
-            const eventsFromDB = yield repos.event.projectEventFields({
-                id: { $in: params.ids },
-                typeOf: params.typeOf
-            }, [
-                'project', 'organizer', 'typeOf', 'name', 'doorTime', 'endDate',
-                'eventStatus', 'location', 'startDate', 'additionalProperty'
-            ] // inclusion(2024-07-30~)
-            );
-            // 最適化(2024-03-26~)
-            events4inform = eventsFromDB.map(({ project, organizer, typeOf, name, doorTime, endDate, eventStatus, location, startDate, id, additionalProperty }) => {
-                return {
-                    project, organizer, typeOf, name, doorTime, endDate,
-                    eventStatus, location, startDate, id, additionalProperty
-                };
-            });
-        }
-        else if (params.typeOf === factory.eventType.ScreeningEvent) {
+        if (params.typeOf === factory.eventType.ScreeningEvent) {
             const screeningEvents4inform = yield repos.event.projectEventFields({
                 id: { $in: params.ids },
                 typeOf: params.typeOf