@chevre/domain 22.10.0-alpha.6 → 22.10.0-alpha.8

package/example/src/chevre/eventOffer/adminEventOffers.ts

@@ -45,7 +45,8 @@ async function main() {
             },
             availableAtOrFrom: { id: 'xxx' },
             validFrom: new Date(),
-            validThrough: new Date()
+            validThrough: new Date(),
+            validForMemberTier: { identifier: 'xxx', typeOf: 'MemberProgramTier' }
         }
     });
     console.log('created.');

package/example/src/signPayload.ts

@@ -4,11 +4,11 @@ import * as jwt from 'jsonwebtoken';
 async function main(): Promise<void> {
     const payload = {
         member: {
-            identifier: '',
-            member: {
-                identifier: 'sampleRoleIdentifier12345',
-                endDate: '2025-05-12T07:00:00Z',
-                startDate: '2025-05-12T06:00:00Z'
+            memberOf: {
+                identifier: 'DefaultTier',
+                isTierOf: {
+                    identifier: 'DefaultMemberProgram'
+                }
             }
         }
     };

package/lib/chevre/repo/event.d.ts

@@ -124,7 +124,7 @@ export declare class EventRepo {
          * ドキュメント作成時には無視される
          */
         $unset?: IUnset<T>;
-        upsert?: boolean;
+        upsert: false;
     }): Promise<{
         id: string;
     }>;

package/lib/chevre/repo/event.js

@@ -525,14 +525,15 @@ class EventRepo {
                     savedEventId = id;
                 }
                 else {
-                    const upsert = params.upsert === true;
+                    // const upsert: boolean = params.upsert === true;
+                    const upsert = false; // always false(2025-05-15~)
                     doc = yield this.eventModel.findOneAndUpdate({
                         _id: { $eq: params.id },
                         typeOf: { $eq: typeOf }
                     }, Object.assign({ 
                         // 上書き禁止属性を除外(2022-08-24~)
                         $setOnInsert: Object.assign({ typeOf,
-                            project }, (identifier !== undefined) ? { identifier } : undefined), $set: updateFields }, (params.$unset !== undefined) ? { $unset: params.$unset } : undefined), { upsert, new: true, projection: { _id: 1 } })
+                            project }, (typeof identifier === 'string' && identifier !== '') ? { identifier } : undefined), $set: updateFields }, (params.$unset !== undefined) ? { $unset: params.$unset } : undefined), { upsert, new: true, projection: { _id: 1 } })
                         .lean()
                         .exec();
                     savedEventId = params.id;
@@ -567,7 +568,6 @@ class EventRepo {
                                     _id: p.id,
                                     typeOf: p.attributes.typeOf
                                 },
-                                // upsertの場合、createがありうるので属性を除外しない
                                 update: Object.assign({ $setOnInsert: Object.assign(Object.assign({ typeOf: p.attributes.typeOf, project: p.attributes.project }, (typeof p.attributes.identifier === 'string')
                                         ? { identifier: p.attributes.identifier } : undefined), (typeof p.attributes.remainingAttendeeCapacity === 'number')
                                         ? { remainingAttendeeCapacity: p.attributes.remainingAttendeeCapacity }
@@ -578,29 +578,6 @@ class EventRepo {
                     }
                     else if (p.attributes.typeOf === factory.eventType.ScreeningEventSeries) {
                         throw new factory.errors.Internal('typeOf: ScreeningEventSeries discontinued');
-                        // 上書き禁止属性を除外(2022-08-24~)
-                        // const { identifier, project, typeOf, ...updateFields } = p.attributes;
-                        // bulkWriteOps.push({
-                        //     updateOne: {
-                        //         filter: {
-                        //             _id: p.id,
-                        //             typeOf: p.attributes.typeOf
-                        //         },
-                        //         // upsertの場合、createがありうるので属性を除外しない
-                        //         update: {
-                        //             $setOnInsert: {
-                        //                 typeOf: p.attributes.typeOf,
-                        //                 project: p.attributes.project,
-                        //                 ...(typeof p.attributes.identifier === 'string')
-                        //                     ? { identifier: p.attributes.identifier } : undefined
-                        //             },
-                        //             $set: updateFields,
-                        //             // $unsetに対応(2022-08-31~)
-                        //             ...(p.$unset !== undefined) ? { $unset: p.$unset } : undefined
-                        //         },
-                        //         upsert
-                        //     }
-                        // });
                     }
                 });
             }
@@ -627,7 +604,7 @@ class EventRepo {
             // upsertの場合、createがありうるので属性を除外しない
             {
                 $setOnInsert: Object.assign({ _id: id, typeOf,
-                    project }, (identifier !== undefined) ? { identifier } : undefined),
+                    project }, (typeof identifier === 'string' && identifier !== '') ? { identifier } : undefined),
                 $set: updateFields
             }, { upsert: true, new: true, projection: { _id: 1 } })
                 .lean()

package/lib/chevre/repo/mongoose/schemas/offer/event.d.ts

@@ -1,39 +1,10 @@
 import { IndexDefinition, IndexOptions, Model, Schema, SchemaDefinition } from 'mongoose';
 import * as factory from '../../../../factory';
-interface IMemberProgramTier {
-    isTierOf: {
-        /**
-         * メンバープログラムコード
-         */
-        identifier: string;
-    };
-}
-interface IOfferAvailableAtOrFrom {
-    id: string;
-}
-type ISellerMakesOffer = Pick<factory.event.screeningEvent.ISellerMakesOffer, 'typeOf' | 'validFrom' | 'validThrough'> & {
-    availableAtOrFrom: IOfferAvailableAtOrFrom;
-};
-export interface IDocType extends ISellerMakesOffer {
-    project: {
-        id: string;
-        typeOf: factory.organizationType.Project;
-    };
-    seller: {
-        id: string;
-        typeOf: factory.organizationType.Organization;
-    };
-    itemOffered: {
-        id: string;
-        typeOf: factory.eventType.ScreeningEvent;
-    };
-    identifier: string;
-    validForMemberTier?: IMemberProgramTier;
-}
+type IDocType = factory.eventOffer.IEventOfferForMemberTier;
 type IModel = Model<IDocType>;
 type ISchemaDefinition = SchemaDefinition<IDocType>;
 type ISchema = Schema<IDocType, IModel, {}, {}, {}, {}, ISchemaDefinition, IDocType>;
 declare const modelName = "Offer.Event";
 declare const indexes: [d: IndexDefinition, o: IndexOptions][];
 declare function createSchema(): ISchema;
-export { createSchema, IModel, indexes, modelName };
+export { createSchema, IDocType, IModel, indexes, modelName };

package/lib/chevre/repo/mongoose/schemas/offer/event.js

@@ -3,8 +3,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.modelName = exports.indexes = void 0;
 exports.createSchema = createSchema;
 const mongoose_1 = require("mongoose");
-const writeConcern_1 = require("../../writeConcern");
 const settings_1 = require("../../../../settings");
+const writeConcern_1 = require("../../writeConcern");
 const modelName = 'Offer.Event';
 exports.modelName = modelName;
 const schemaDefinition = {
@@ -44,9 +44,12 @@ const schemaOptions = {
 };
 const indexes = [
     [
-        { 'project.id': 1, identifier: 1 },
         {
-            name: 'uniqueIdentifier',
+            'itemOffered.id': 1,
+            identifier: 1
+        },
+        {
+            name: 'uniqueByItemOfferedAndIdentifier',
             unique: true
         }
     ],

package/lib/chevre/repo/offer/event.d.ts

@@ -1,40 +1,7 @@
 import { Connection, FilterQuery } from 'mongoose';
 import * as factory from '../../factory';
 import { IDocType } from '../mongoose/schemas/offer/event';
-interface ISearchConditions {
-    limit?: number;
-    page?: number;
-    sort?: {
-        validFrom?: factory.sortType;
-    };
-    project?: {
-        id?: {
-            $eq?: string;
-        };
-    };
-    seller?: {
-        id?: {
-            $eq?: string;
-        };
-    };
-    id?: {
-        $eq?: string;
-        $in?: string[];
-    };
-    identifier?: {
-        $eq?: string;
-    };
-    itemOffered?: {
-        id?: {
-            $eq?: string;
-        };
-    };
-    availableAtOrFrom?: {
-        id?: {
-            $eq?: string;
-        };
-    };
-}
+type ISearchConditions = factory.eventOffer.ISearchConditions;
 export type ISavingOffer = Pick<IDocType, 'availableAtOrFrom' | 'identifier' | 'itemOffered' | 'project' | 'seller' | 'typeOf' | 'validForMemberTier' | 'validFrom' | 'validThrough'> & {
     id?: never;
 };

package/lib/chevre/repo/offer/event.js

@@ -33,7 +33,7 @@ class EventOfferRepo {
     }
     // tslint:disable-next-line:max-func-body-length
     static CREATE_FILTER_QUERY(params) {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o;
         const andConditions = [];
         const projectIdEq = (_b = (_a = params.project) === null || _a === void 0 ? void 0 : _a.id) === null || _b === void 0 ? void 0 : _b.$eq;
         if (typeof projectIdEq === 'string') {
@@ -63,6 +63,10 @@ class EventOfferRepo {
         if (typeof availableAtOrFromIdEq === 'string') {
             andConditions.push({ 'availableAtOrFrom.id': { $eq: availableAtOrFromIdEq } });
         }
+        const validForMemberTierIdentifierEq = (_o = (_m = params.validForMemberTier) === null || _m === void 0 ? void 0 : _m.identifier) === null || _o === void 0 ? void 0 : _o.$eq;
+        if (typeof validForMemberTierIdentifierEq === 'string') {
+            andConditions.push({ 'validForMemberTier.identifier': { $exists: true, $eq: validForMemberTierIdentifierEq } });
+        }
         return andConditions;
     }
     save(params) {

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

@@ -5,6 +5,8 @@ import type { AssetTransactionRepo } from '../../../repo/assetTransaction';
 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';
@@ -22,8 +24,10 @@ interface IStartOperationRepos {
     advanceBookingRequirement: AdvanceBookingRequirementRepo;
     stockHolder: StockHolderRepo;
     event: EventRepo;
+    eventOffer: EventOfferRepo;
     eventSeries: EventSeriesRepo;
     issuer: IssuerRepo;
+    memberProgram: MemberProgramRepo;
     offer: OfferRepo;
     offerCatalog: OfferCatalogRepo;
     offerCatalogItem: OfferCatalogItemRepo;

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

@@ -46,7 +46,11 @@ function start(params, options) {
             validateEvent: params.validateEvent,
             now,
             store: { id: (_a = params.availableAtOrFrom) === null || _a === void 0 ? void 0 : _a.id }
-        })({ issuer: repos.issuer });
+        })({
+            eventOffer: repos.eventOffer,
+            issuer: repos.issuer,
+            memberProgram: repos.memberProgram
+        });
         // objectに必要な情報をそろえる
         const { acceptedOffers4transactionObject, objectSubReservations } = yield createObjectAttributes({
             // reservationFor: startParams.object.reservationFor,

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

@@ -1,6 +1,8 @@
 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';
 declare function validateStartRequest(params: {
     object: factory.assetTransaction.reserve.IObjectWithoutDetail;
     event: Pick<IMinimizedIndividualEvent<factory.eventType.Event | factory.eventType.ScreeningEvent>, 'offers' | 'id' | 'project'>;
@@ -14,6 +16,8 @@ declare function validateStartRequest(params: {
         id?: string;
     };
 }): (repos: {
+    eventOffer: EventOfferRepo;
     issuer: IssuerRepo;
+    memberProgram: MemberProgramRepo;
 }) => Promise<void>;
 export { validateStartRequest };

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

@@ -55,56 +55,53 @@ 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 offeredByToken = (_c = (_b = params.object.reservationFor) === null || _b === void 0 ? void 0 : _b.offers) === null || _c === void 0 ? void 0 : _c.offeredBy;
+            const validForMemberTierToken = (_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 offeredByToken === 'string') ? { offeredByToken } : undefined))(repos);
+                now, availableAt: { id: params.store.id } }, (typeof validForMemberTierToken === 'string') ? { validForMemberTierToken } : undefined))(repos);
         }
         if (params.validateEvent === true) {
             validateEvent({ event, object: params.object });
         }
     });
 }
-function validateOfferedBy(params) {
-    var _a, _b, _c, _d, _e, _f;
-    const { roleIdentifierMustBe, acceptedDate, verifiedOfferedBy } = params;
-    const verifiedRoleIdentifier = (_b = (_a = verifiedOfferedBy.member) === null || _a === void 0 ? void 0 : _a.member) === null || _b === void 0 ? void 0 : _b.identifier;
-    const roleEndDateStr = (_d = (_c = verifiedOfferedBy.member) === null || _c === void 0 ? void 0 : _c.member) === null || _d === void 0 ? void 0 : _d.endDate;
-    const roleStartDateStr = (_f = (_e = verifiedOfferedBy.member) === null || _e === void 0 ? void 0 : _e.member) === null || _f === void 0 ? void 0 : _f.startDate;
-    if (typeof verifiedRoleIdentifier !== 'string') {
-        throw new factory.errors.Argument('reservationFor.offers.offeredBy', 'role identifier invalid');
-    }
-    if (typeof roleEndDateStr !== 'string') {
-        throw new factory.errors.Argument('reservationFor.offers.offeredBy', 'role endDate invalid');
-    }
-    if (typeof roleStartDateStr !== 'string') {
-        throw new factory.errors.Argument('reservationFor.offers.offeredBy', 'role startDate invalid');
-    }
-    // ロール検証
-    if (roleIdentifierMustBe !== verifiedRoleIdentifier) {
-        throw new factory.errors.Argument('reservationFor.offers.offeredBy', 'invalid role');
-    }
-    // ロール有効期間検証
-    let roleEndMoment;
-    let roleStartMoment;
-    try {
-        roleEndMoment = moment(roleEndDateStr, ROLE_DATE_FORMAT, true);
-        roleStartMoment = moment(roleStartDateStr, ROLE_DATE_FORMAT, true);
-    }
-    catch (error) {
-        throw error;
-    }
-    if (!roleEndMoment.isValid()) {
-        throw new factory.errors.Argument('reservationFor.offers.offeredBy', 'role.endDate invalid');
-    }
-    if (!roleStartMoment.isValid()) {
-        throw new factory.errors.Argument('reservationFor.offers.offeredBy', 'role.startDate invalid');
-    }
-    if (acceptedDate.isBefore(roleStartMoment)) {
-        throw new factory.errors.Argument('reservationFor.offers.offeredBy', `the specified role starts at ${roleEndDateStr}`);
-    }
-    if (acceptedDate.isAfter(roleEndMoment)) {
-        throw new factory.errors.Argument('reservationFor.offers.offeredBy', `the specified role ends at ${roleStartDateStr}`);
-    }
+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 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');
+        }
+        if (typeof memberProgramIdentifier !== 'string') {
+            throw new factory.errors.Argument('reservationFor.offers.validForMemberTier', 'member program must be string');
+        }
+        if (memberProgramIdentifier !== memberProgramIdentifierMustBe) {
+            throw new factory.errors.Argument('reservationFor.offers.validForMemberTier', 'member program not matched');
+        }
+        // イベントオファーを検索して有効期間検証
+        const eventOfferForMemberTier = (yield repos.eventOffer.projectFields({
+            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}`);
+        }
+    });
 }
 /**
  * イベントのオファー有効期間を検証する
@@ -112,9 +109,9 @@ function validateOfferedBy(params) {
 function validateEventOfferPeriod(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         var _a, _b;
+        const { event, availableAt, validForMemberTierToken } = params;
         const acceptedDate = moment(params.now);
-        const eventOffers = params.event.offers;
-        const { offeredByToken } = params;
+        const eventOffers = event.offers;
         // アプリケーションごとの設定を参照する(2022-11-19~)
         const makesOfferOnApplication = eventOffers === null || eventOffers === void 0 ? void 0 : eventOffers.seller.makesOffer.find((offer) => {
             var _a, _b;
@@ -139,30 +136,38 @@ function validateEventOfferPeriod(params) {
                 throw new factory.errors.Argument('reservationFor.id', `Offer of ${params.event.id} is valid through ${validThrough}`);
             }
         }
-        // support offeredBy(2025-05-11~)
-        const issuerIdentifier = (_a = makesOfferOnApplication.offeredBy) === null || _a === void 0 ? void 0 : _a.identifier;
-        const roleIdentifierMustBe = (_b = makesOfferOnApplication.offeredBy) === null || _b === void 0 ? void 0 : _b.member.identifier;
-        if (typeof issuerIdentifier === 'string') {
-            if (typeof roleIdentifierMustBe !== 'string') {
-                throw new factory.errors.Internal('offeredBy.member.identifier undefined');
-            }
-            if (typeof offeredByToken !== 'string' || offeredByToken === '') {
-                throw new factory.errors.ArgumentNull('reservationFor.offers.offeredBy');
+        // 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') {
+            if (typeof validForMemberTierToken !== 'string' || validForMemberTierToken === '') {
+                throw new factory.errors.ArgumentNull('reservationFor.offers.validForMemberTier');
             }
             // トークン検証
+            const memberProgram = (yield repos.memberProgram.search({
+                limit: 1,
+                page: 1,
+                project: { id: { $eq: params.event.project.id } },
+                identifier: { $eq: memberProgramIdentifierMustBe }
+            })).shift();
+            if (memberProgram === undefined) {
+                throw new factory.errors.NotFound('MemberProgram');
+            }
             const issuer = yield repos.issuer.findByIdentifier({
                 project: { id: params.event.project.id },
-                identifier: issuerIdentifier
+                identifier: memberProgram.hostingOrganization.identifier
             });
             if (typeof issuer.tokenSecret !== 'string' || issuer.tokenSecret === '') {
                 throw new factory.errors.NotFound('issuer.tokenSecret');
             }
-            const verifiedOfferedBy = yield verifyOfferedByToken({
+            const verifiedValidForMemberTier = yield verifyOfferedByToken({
                 secret: issuer.tokenSecret,
                 issuer: issuer.url,
-                token: offeredByToken
+                token: validForMemberTierToken
             });
-            validateOfferedBy({ roleIdentifierMustBe, acceptedDate, verifiedOfferedBy });
+            yield validateMemberTier({
+                event, availableAt, acceptedDate, verifiedValidForMemberTier,
+                memberProgramIdentifierMustBe
+            })(repos);
         }
     });
 }

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

@@ -8,7 +8,7 @@ declare function createReserveTransactionStartParams(params: {
     event: {
         id: string;
         offers?: {
-            offeredBy?: string;
+            validForMemberTier?: string;
         };
     };
     broker?: factory.reservation.IBroker<factory.reservationType>;

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

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

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

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

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

@@ -26,7 +26,9 @@ function processStartReserve4chevre(params, options) {
         // 予約取引開始
         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.offeredBy) === 'string') ? { offers: { offeredBy: event.offers.offeredBy } } : undefined), transaction,
+            acceptedOffers: params.acceptedOffers, event: Object.assign({ id: event.id }, (typeof ((_a = event.offers) === null || _a === void 0 ? void 0 : _a.validForMemberTier) === 'string')
+                ? { offers: { validForMemberTier: event.offers.validForMemberTier } }
+                : undefined), transaction,
             transactionNumber }, (params.broker !== undefined) ? { broker: params.broker } : undefined));
         const startParamObject = yield validateObjectWithoutDetail(startParams, { id: params.transaction.id })(repos);
         const startReserveTransactionResult = yield ReserveTransactionService.start(Object.assign(Object.assign({}, startParams), { object: startParamObject, 

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

@@ -7,6 +7,8 @@ import type { AuthorizationRepo } from '../../../repo/authorization';
 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';
@@ -31,8 +33,10 @@ interface IAuthorizeRepos {
     assetTransaction: AssetTransactionRepo;
     authorization: AuthorizationRepo;
     event: EventRepo;
+    eventOffer: EventOfferRepo;
     eventSeries: EventSeriesRepo;
     issuer: IssuerRepo;
+    memberProgram: MemberProgramRepo;
     stockHolder: StockHolderRepo;
     offer: OfferRepo;
     offerCatalog: OfferCatalogRepo;

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

@@ -98,8 +98,9 @@ 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');
         }
-        const offeredByToken = (_c = params.object.reservationFor.offers) === null || _c === void 0 ? void 0 : _c.offeredBy;
-        const event = Object.assign({ id: params.object.reservationFor.id, typeOf: factory.eventType.ScreeningEvent }, (typeof offeredByToken === 'string') ? { offers: { offeredBy: offeredByToken } } : undefined);
+        // 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);
         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": "4.394.0-alpha.1",
-    "@cinerino/sdk": "10.21.0-alpha.37",
+    "@chevre/factory": "4.394.0-alpha.3",
+    "@cinerino/sdk": "10.21.0-alpha.38",
     "@motionpicture/coa-service": "9.6.0",
     "@motionpicture/gmo-service": "5.3.0",
     "@sendgrid/client": "8.1.4",
@@ -113,5 +113,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build && npm test && npm run doc"
   },
-  "version": "22.10.0-alpha.6"
+  "version": "22.10.0-alpha.8"
 }