@chevre/domain 23.1.0-alpha.2 → 23.1.0-alpha.21

package/lib/chevre/repo/member.js

@@ -30,7 +30,7 @@ class MemberRepo {
     }
     // tslint:disable-next-line:cyclomatic-complexity max-func-body-length
     static CREATE_MONGO_CONDITIONS(params) {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _0;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _0, _1, _2;
         const andConditions = [];
         const idEq = (_a = params.id) === null || _a === void 0 ? void 0 : _a.$eq;
         if (typeof idEq === 'string') {
@@ -64,7 +64,11 @@ class MemberRepo {
         if (Array.isArray(memberIdIn)) {
             andConditions.push({ 'member.id': { $in: memberIdIn } });
         }
-        const memberNameRegex = (_u = (_t = params.member) === null || _t === void 0 ? void 0 : _t.name) === null || _u === void 0 ? void 0 : _u.$regex;
+        const memberIdentifierEq = (_u = (_t = params.member) === null || _t === void 0 ? void 0 : _t.identifier) === null || _u === void 0 ? void 0 : _u.$eq;
+        if (typeof memberIdentifierEq === 'string') {
+            andConditions.push({ 'member.identifier': { $exists: true, $eq: memberIdentifierEq } });
+        }
+        const memberNameRegex = (_w = (_v = params.member) === null || _v === void 0 ? void 0 : _v.name) === null || _w === void 0 ? void 0 : _w.$regex;
         if (typeof memberNameRegex === 'string' && memberNameRegex.length > 0) {
             andConditions.push({
                 'member.name': {
@@ -73,7 +77,7 @@ class MemberRepo {
                 }
             });
         }
-        const memberHasRoleRoleNameEq = (_x = (_w = (_v = params.member) === null || _v === void 0 ? void 0 : _v.hasRole) === null || _w === void 0 ? void 0 : _w.roleName) === null || _x === void 0 ? void 0 : _x.$eq;
+        const memberHasRoleRoleNameEq = (_z = (_y = (_x = params.member) === null || _x === void 0 ? void 0 : _x.hasRole) === null || _y === void 0 ? void 0 : _y.roleName) === null || _z === void 0 ? void 0 : _z.$eq;
         if (typeof memberHasRoleRoleNameEq === 'string') {
             andConditions.push({
                 'member.hasRole.roleName': {
@@ -82,7 +86,7 @@ class MemberRepo {
                 }
             });
         }
-        const memberHasRoleRoleNameIn = (_0 = (_z = (_y = params.member) === null || _y === void 0 ? void 0 : _y.hasRole) === null || _z === void 0 ? void 0 : _z.roleName) === null || _0 === void 0 ? void 0 : _0.$in;
+        const memberHasRoleRoleNameIn = (_2 = (_1 = (_0 = params.member) === null || _0 === void 0 ? void 0 : _0.hasRole) === null || _1 === void 0 ? void 0 : _1.roleName) === null || _2 === void 0 ? void 0 : _2.$in;
         if (Array.isArray(memberHasRoleRoleNameIn)) {
             andConditions.push({
                 'member.hasRole.roleName': {
@@ -110,7 +114,7 @@ class MemberRepo {
      */
     searchCustomerMembers(params) {
         return __awaiter(this, void 0, void 0, function* () {
-            var _a, _b, _c, _d, _e, _f, _g;
+            var _a, _b, _c, _d, _e, _f, _g, _h, _j;
             if (typeof params.project.id !== 'string' || params.project.id === '') {
                 throw new factory.errors.ArgumentNull('project.id');
             }
@@ -128,7 +132,8 @@ class MemberRepo {
                         }
                     },
                     id: Object.assign(Object.assign({}, (typeof ((_b = (_a = params.member) === null || _a === void 0 ? void 0 : _a.id) === null || _b === void 0 ? void 0 : _b.$eq) === 'string') ? { $eq: params.member.id.$eq } : undefined), (Array.isArray((_d = (_c = params.member) === null || _c === void 0 ? void 0 : _c.id) === null || _d === void 0 ? void 0 : _d.$in)) ? { $in: params.member.id.$in } : undefined),
-                    name: Object.assign({}, (typeof ((_f = (_e = params.member) === null || _e === void 0 ? void 0 : _e.name) === null || _f === void 0 ? void 0 : _f.$regex) === 'string') ? { $regex: params.member.name.$regex } : undefined)
+                    identifier: Object.assign({}, (typeof ((_f = (_e = params.member) === null || _e === void 0 ? void 0 : _e.identifier) === null || _f === void 0 ? void 0 : _f.$eq) === 'string') ? { $eq: params.member.identifier.$eq } : undefined),
+                    name: Object.assign({}, (typeof ((_h = (_g = params.member) === null || _g === void 0 ? void 0 : _g.name) === null || _h === void 0 ? void 0 : _h.$regex) === 'string') ? { $regex: params.member.name.$regex } : undefined)
                 }
             });
             const projection = {
@@ -138,6 +143,7 @@ class MemberRepo {
                     // typeOf: 'WebApplication',
                     hasRole: '$member.hasRole',
                     id: '$member.id',
+                    identifier: '$member.identifier',
                     member: '$member.member',
                     memberOf: '$member.memberOf',
                     name: '$member.name'
@@ -154,7 +160,7 @@ class MemberRepo {
                 },
                 { $project: projection }
             ]);
-            if (typeof ((_g = params.sort) === null || _g === void 0 ? void 0 : _g['member.id']) === 'number') {
+            if (typeof ((_j = params.sort) === null || _j === void 0 ? void 0 : _j['member.id']) === 'number') {
                 aggregate.sort(params.sort);
             }
             if (typeof params.limit === 'number' && params.limit > 0) {
@@ -259,7 +265,7 @@ class MemberRepo {
                 'member.memberOf.id': { $eq: params.member.memberOf.id },
                 'member.memberOf.typeOf': { $eq: params.member.memberOf.typeOf }
             }, {
-                $set: Object.assign(Object.assign(Object.assign({}, (Array.isArray(params.member.hasRole)) ? { 'member.hasRole': params.member.hasRole } : undefined), (typeof params.member.image === 'string') ? { 'member.image': params.member.image } : undefined), (typeof params.member.name === 'string') ? { 'member.name': params.member.name } : undefined
+                $set: Object.assign(Object.assign(Object.assign(Object.assign({}, (Array.isArray(params.member.hasRole)) ? { 'member.hasRole': params.member.hasRole } : undefined), (typeof params.member.image === 'string') ? { 'member.image': params.member.image } : undefined), (typeof params.member.name === 'string') ? { 'member.name': params.member.name } : undefined), (typeof params.member.identifier === 'string') ? { 'member.identifier': params.member.identifier } : undefined
                 // discontinue(2025-01-14~)
                 // ...(Array.isArray(params.member.member)) ? { 'member.member': params.member.member } : undefined
                 ),

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

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

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

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

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

@@ -14,7 +14,7 @@ export declare function createStartParams(params: factory.assetTransaction.pay.I
          */
         id: string;
     }[];
-    instrument: factory.action.trade.pay.IInstrument[];
+    instrument: factory.action.trade.pay.IPlaceOrderRelatedInstrument[];
 }, options: {
     checkedAction: {
         id: string;

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

@@ -7,7 +7,7 @@ exports.createStartParams = createStartParams;
 const factory = require("../../../factory");
 // tslint:disable-next-line:cyclomatic-complexity max-func-body-length
 function createStartParams(params, options) {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _0;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _0, _1;
     const { instrument } = params;
     const paymentServiceId = (params.paymentService !== undefined)
         ? String(params.paymentService.id)
@@ -109,7 +109,12 @@ function createStartParams(params, options) {
         : undefined);
     const object = Object.assign({ accountId: (typeof accountId === 'string') ? accountId : '', paymentMethodId: params.transactionNumber, typeOf: params.paymentServiceType, id: paymentServiceId, 
         // onPaymentStatusChanged: { informPayment: params.informActions }, // discontinue(2025-02-09~)
-        paymentMethod }, (params.paymentServiceType === factory.service.paymentService.PaymentServiceType.MovieTicket)
+        paymentMethod, serviceOutput: (((_0 = params.object.serviceOutput) === null || _0 === void 0 ? void 0 : _0.typeOf) === 'Invoice') // support serviceOutput(2025-11-24~)
+            ? params.object.serviceOutput
+            : {
+                typeOf: 'Invoice',
+                referencesOrder: { typeOf: factory.order.OrderType.Order }
+            } }, (params.paymentServiceType === factory.service.paymentService.PaymentServiceType.MovieTicket)
         ? { checkedAction: { id: options.checkedAction.id } } // add checkedAction(2024-12-13~)
         : undefined);
     const potentialAction = [];
@@ -118,7 +123,7 @@ function createStartParams(params, options) {
             potentialAction.push({ id: informAction.id, typeOf: factory.actionType.InformAction });
         }
     });
-    return Object.assign(Object.assign({ project: { typeOf: factory.organizationType.Project, id: params.project.id }, transactionNumber: params.transactionNumber, typeOf: factory.assetTransactionType.Pay, agent: params.agent, recipient: params.recipient, object, expires: params.expires, instrument: (Array.isArray(instrument)) ? instrument : [] }, (typeof ((_0 = params.location) === null || _0 === void 0 ? void 0 : _0.typeOf) === 'string')
+    return Object.assign(Object.assign({ project: { typeOf: factory.organizationType.Project, id: params.project.id }, transactionNumber: params.transactionNumber, typeOf: factory.assetTransactionType.Pay, agent: params.agent, recipient: params.recipient, object, expires: params.expires, instrument: (Array.isArray(instrument)) ? instrument : [] }, (typeof ((_1 = params.location) === null || _1 === void 0 ? void 0 : _1.typeOf) === 'string')
         ? { location: params.location }
         : undefined), (potentialAction.length > 0) ? { potentialAction } : undefined // add potentialAction(2025-02-05~)
     );

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

@@ -78,6 +78,7 @@ export declare function publishPaymentUrl(params: Pick<factory.assetTransaction.
      * add identifier for an unique index(2025-02-25~)
      */
     identifier?: string;
+    instrument: factory.action.accept.pay.IInstrument[];
 }, options: {
     purposeAsTransaction: {
         id: string;
@@ -104,7 +105,7 @@ export import IPaymentAgencyTransaction = CreditCardPayment.IPaymentAgencyTransa
  * 取引開始
  */
 export declare function start(params: factory.assetTransaction.pay.IStartParamsWithoutDetail & {
-    instrument: factory.action.trade.pay.IInstrument[];
+    instrument: factory.action.trade.pay.IPlaceOrderRelatedInstrument[];
 }, options: {
     pendingPaymentAgencyTransaction?: CreditCardPayment.IPaymentAgencyTransaction;
     /**

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

@@ -84,7 +84,7 @@ function publishPaymentUrl(params, options) {
                 object: params.object,
                 transactionNumber,
                 typeOf: params.typeOf
-            }, purpose: { typeOf: factory.transactionType.PlaceOrder, id: options.purposeAsTransaction.id } }, (typeof taskId === 'string')
+            }, purpose: { typeOf: factory.transactionType.PlaceOrder, id: options.purposeAsTransaction.id }, instrument: (Array.isArray(params.instrument)) ? params.instrument : [] }, (typeof taskId === 'string')
             ? { sameAs: { id: taskId, typeOf: 'Task' } } // タスク関連付け(2024-05-22~)
             : undefined), (typeof ((_d = params.location) === null || _d === void 0 ? void 0 : _d.typeOf) === 'string')
             ? { location: params.location }

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

@@ -2,10 +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';
@@ -20,13 +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;
@@ -40,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,16 +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;
-    eventOffer: Pick<factory.eventOffer.IEventOffer, 'identifier' | 'itemOffered' | 'offeredBy' | 'validFrom' | 'validThrough'>;
+    eventOffer: Pick<factory.eventOffer.IEventOffer, 'identifier' | 'itemOffered' | 'offeredBy' | 'validFrom' | 'validThrough' | 'id'>;
+    acceptedEventOffer?: factory.authorization.IOfferAsObject;
+    /**
+     * オファー承認時の予約数
+     * 0であれば特に何も検証されない
+     */
+    numAcceptedOffers: number;
 }): (repos: {
     issuer: IssuerRepo;
 }) => Promise<void>;

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

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

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

@@ -6,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;