@chevre/domain 23.0.0-alpha.8 → 23.0.0

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

@@ -0,0 +1,159 @@
+"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.validateIssuedOfferIfExists = validateIssuedOfferIfExists;
+const jwt = require("jsonwebtoken");
+const moment = require("moment");
+const factory = require("../../../../factory");
+const NUM_ACCEPTED_OFFERS_MAX_VALUE = 50;
+function verifyOfferToken(params) {
+    return __awaiter(this, void 0, void 0, function* () {
+        let result;
+        const { issuer, secret, token } = params;
+        try {
+            result = yield new Promise((resolve, reject) => {
+                jwt.verify(token, secret, {
+                    algorithms: ['HS256'],
+                    issuer
+                    // ...(Array.isArray(params.audience)) ? { audience: params.audience } : undefined
+                }, (err, decoded) => {
+                    if (err instanceof Error) {
+                        reject(err);
+                    }
+                    else {
+                        resolve(decoded);
+                    }
+                });
+            });
+        }
+        catch (error) {
+            // JWTエラーをハンドリング
+            if (error instanceof jwt.TokenExpiredError) {
+                throw new factory.errors.Argument('reservationFor.offers.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 error;
+        }
+        return result;
+    });
+}
+const OFFER_TOKEN_DATE_FORMAT = 'YYYY-MM-DDTHH:mm:ssZ';
+function validateOfferToken(params) {
+    return () => __awaiter(this, void 0, void 0, function* () {
+        var _a, _b;
+        const { event, acceptedDate, verifiedOffer, makesOfferOnApplication } = params;
+        // イベント識別子一致検証
+        const itemOfferedIdentifier = verifiedOffer.itemOffered.identifier;
+        if (typeof itemOfferedIdentifier !== 'string' || itemOfferedIdentifier === '') {
+            throw new factory.errors.Argument('reservationFor.offers.token', 'itemOffered.identifier must be string');
+        }
+        const itemOfferedIdentifierMustBe = event.identifier;
+        if (typeof itemOfferedIdentifierMustBe !== 'string') {
+            throw new factory.errors.NotFound('identifier', 'the event must have an identifier');
+        }
+        if (itemOfferedIdentifier !== itemOfferedIdentifierMustBe) {
+            throw new factory.errors.Argument('reservationFor.offers.token', 'itemOffered.identifier not matched');
+        }
+        // アプリケーションオファーコード一致検証
+        const applicationOfferIdentifier = verifiedOffer.identifier;
+        if (typeof applicationOfferIdentifier !== 'string' || applicationOfferIdentifier === '') {
+            throw new factory.errors.Argument('reservationFor.offers.token', 'identifier must be string');
+        }
+        const applicationOfferIdentifierMustBe = makesOfferOnApplication.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');
+        }
+        // 有効期間検証
+        let validThroughMoment;
+        let validFromMoment;
+        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');
+        }
+        if (!validFromMoment.isValid()) {
+            throw new factory.errors.Argument('reservationFor.offers.token', 'invalid validFrom');
+        }
+        if (acceptedDate.isBefore(validFromMoment)) {
+            throw new factory.errors.Argument('reservationFor.offers.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}`);
+        }
+        // maxValueを検証
+        const maxValue = (_a = verifiedOffer === null || verifiedOffer === void 0 ? void 0 : verifiedOffer.eligibleQuantity) === null || _a === void 0 ? void 0 : _a.maxValue;
+        if (typeof maxValue !== 'number') {
+            throw new factory.errors.Argument('reservationFor.offers.token', 'eligibleQuantity.maxValue must be number');
+        }
+        if (maxValue > NUM_ACCEPTED_OFFERS_MAX_VALUE) {
+            throw new factory.errors.Argument('reservationFor.offers.token', `eligibleQuantity.maxValue must be <= ${NUM_ACCEPTED_OFFERS_MAX_VALUE}`);
+        }
+        const numAcceptedOffers = (_b = params.object.acceptedOffer) === null || _b === void 0 ? void 0 : _b.length;
+        if (typeof numAcceptedOffers === 'number' && numAcceptedOffers > 0) {
+            if (numAcceptedOffers > maxValue) {
+                throw new factory.errors.Argument('reservationFor.id', `Maximum number of offers exceeded`);
+            }
+        }
+    });
+}
+/**
+ * オファートークン検証(2025-10-21~)
+ */
+function validateIssuedOfferIfExists(params) {
+    return (repos) => __awaiter(this, void 0, void 0, function* () {
+        var _a, _b, _c, _d, _e;
+        const { event, makesOfferOnApplication } = params;
+        const acceptedDate = moment(params.now);
+        const offerTokenIssuer = (_a = makesOfferOnApplication.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');
+            }
+            if (typeof offerToken !== 'string' || offerToken === '') {
+                throw new factory.errors.ArgumentNull('object.reservationFor.offers.token');
+            }
+            if (typeof makesOfferOnApplication.identifier !== 'string' || makesOfferOnApplication.identifier === '') {
+                throw new factory.errors.NotFound('seller.makesOffer.identifier');
+            }
+            // アプリケーションオファーコード一致検証
+            if (makesOfferOnApplication.identifier !== offerIdentifierMustBe) {
+                throw new factory.errors.Argument('object.reservationFor.offers.identifier', 'offers.identifier not matched');
+            }
+            const issuer = yield repos.issuer.findByIdentifier({
+                project: { id: event.project.id },
+                identifier: offerTokenIssuer
+            });
+            if (typeof issuer.tokenSecret !== 'string' || issuer.tokenSecret === '') {
+                throw new factory.errors.NotFound('issuer.tokenSecret');
+            }
+            const verifiedOffer = yield verifyOfferToken({
+                secret: issuer.tokenSecret,
+                issuer: issuer.url,
+                token: offerToken
+            });
+            yield validateOfferToken({
+                event,
+                acceptedDate,
+                verifiedOffer,
+                makesOfferOnApplication,
+                object: params.object
+            })();
+        }
+    });
+}

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

@@ -0,0 +1,16 @@
+import * as factory from '../../../../factory';
+import { IMinimizedIndividualEvent } from '../../../../factory/event';
+import type { IssuerRepo } from '../../../../repo/issuer';
+import type { MemberProgramRepo } from '../../../../repo/memberProgram';
+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;
+}): (repos: {
+    issuer: IssuerRepo;
+    memberProgram: MemberProgramRepo;
+    productOffer: ProductOfferRepo;
+}) => Promise<void>;
+export { validateMemberTierIfExists };

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

@@ -0,0 +1,184 @@
+"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.validateMemberTierIfExists = validateMemberTierIfExists;
+const jwt = require("jsonwebtoken");
+const moment = require("moment");
+const factory = require("../../../../factory");
+function validateMemberTier(params) {
+    return (repos) => __awaiter(this, void 0, void 0, function* () {
+        var _a, _b, _c, _d, _e;
+        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') {
+            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 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: { 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}`
+        //     );
+        // }
+    });
+}
+function verifyMemberTierToken(params) {
+    return __awaiter(this, void 0, void 0, function* () {
+        let result;
+        const { issuer, secret, token } = params;
+        try {
+            result = yield new Promise((resolve, reject) => {
+                jwt.verify(token, secret, {
+                    algorithms: ['HS256'],
+                    issuer
+                    // ...(Array.isArray(params.audience)) ? { audience: params.audience } : undefined
+                }, (err, decoded) => {
+                    if (err instanceof Error) {
+                        reject(err);
+                    }
+                    else {
+                        resolve(decoded);
+                    }
+                });
+            });
+        }
+        catch (error) {
+            // JWTエラーをハンドリング
+            if (error instanceof jwt.TokenExpiredError) {
+                throw new factory.errors.Argument('reservationFor.offers.validForMemberTier', `invalid token. [${error.message} expiredAt:${error.expiredAt}]`);
+            }
+            else if (error instanceof jwt.JsonWebTokenError) {
+                throw new factory.errors.Argument('reservationFor.offers.validForMemberTier', `invalid token. [${error.message}]`);
+            }
+            throw error;
+        }
+        return result;
+    });
+}
+function validateMemberTierIfExists(params) {
+    // tslint:disable-next-line:cyclomatic-complexity max-func-body-length
+    return (repos) => __awaiter(this, void 0, void 0, function* () {
+        var _a, _b, _c, _d;
+        const { event, makesOfferOnApplication } = params;
+        const acceptedDate = moment(params.now);
+        const eventOffers = event.offers;
+        // 有効メンバープログラムティアが存在する場合
+        // support validForMemberTier(2025-05-14~)
+        const validForMemberTierExists = ((_a = makesOfferOnApplication.validForMemberTier) === null || _a === void 0 ? void 0 : _a.typeOf) === 'MemberProgramTier';
+        if (validForMemberTierExists) {
+            const tokenizedMemberProgramTier = (_c = (_b = params.object.reservationFor) === null || _b === void 0 ? void 0 : _b.offers) === null || _c === void 0 ? void 0 : _c.validForMemberTier;
+            const validForMemberTierToken = tokenizedMemberProgramTier === null || tokenizedMemberProgramTier === void 0 ? void 0 : tokenizedMemberProgramTier.token;
+            const memberProgramIdentifierMustBe = (_d = tokenizedMemberProgramTier === null || tokenizedMemberProgramTier === void 0 ? void 0 : tokenizedMemberProgramTier.isTierOf) === null || _d === void 0 ? void 0 : _d.identifier;
+            // ティアトークンが必須
+            if (typeof validForMemberTierToken !== 'string' || validForMemberTierToken === '') {
+                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({
+                limit: 1,
+                page: 1,
+                project: { id: { $eq: params.event.project.id } },
+                identifier: { $eq: memberProgramIdentifierMustBe }
+            })).shift();
+            if (memberProgram === undefined) {
+                throw new factory.errors.NotFound('MemberProgram', `MemberProgram '${memberProgramIdentifierMustBe}' not found`);
+            }
+            const issuer = yield repos.issuer.findByIdentifier({
+                project: { id: params.event.project.id },
+                identifier: memberProgram.hostingOrganization.identifier
+            });
+            if (typeof issuer.tokenSecret !== 'string' || issuer.tokenSecret === '') {
+                throw new factory.errors.NotFound('issuer.tokenSecret');
+            }
+            const verifiedValidForMemberTier = yield verifyMemberTierToken({
+                secret: issuer.tokenSecret,
+                issuer: issuer.url,
+                token: validForMemberTierToken
+            });
+            yield validateMemberTier({
+                event, acceptedDate, verifiedValidForMemberTier,
+                memberProgramIdentifierMustBe, aggregateOfferIdentifier
+            })(repos);
+        }
+        // tslint:disable-next-line:no-suspicious-comment
+        // TODO オファートークン検証(2025-10-21~)
+        // const offerTokenIssuer = makesOfferOnApplication.issuedBy?.identifier;
+        // const offerTokenRequired = typeof offerTokenIssuer === 'string';
+        // if (offerTokenRequired) {
+        //     const offerToken = params.object.reservationFor?.offers?.token;
+        //     if (typeof offerToken !== 'string' || offerToken === '') {
+        //         throw new factory.errors.ArgumentNull('object.reservationFor.offers.token');
+        //     }
+        //     const issuer = await repos.issuer.findByIdentifier({
+        //         project: { id: params.event.project.id },
+        //         identifier: offerTokenIssuer
+        //     });
+        //     if (typeof issuer.tokenSecret !== 'string' || issuer.tokenSecret === '') {
+        //         throw new factory.errors.NotFound('issuer.tokenSecret');
+        //     }
+        //     const verifiedOffer = await verifyOfferToken({
+        //         secret: issuer.tokenSecret,
+        //         issuer: issuer.url,
+        //         token: offerToken
+        //     });
+        //     await validateOfferToken({
+        //         acceptedDate,
+        //         verifiedOffer,
+        //         makesOfferOnApplication,
+        //         object: params.object
+        //     })();
+        // }
+    });
+}

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

@@ -5,7 +5,10 @@ import type { MemberProgramRepo } from '../../../repo/memberProgram';
 import type { ProductOfferRepo } from '../../../repo/productOffer';
 declare function validateStartRequest(params: {
     object: factory.assetTransaction.reserve.IObjectWithoutDetail;
-    event: Pick<IMinimizedIndividualEvent, 'offers' | 'id' | 'project'>;
+    event: Pick<IMinimizedIndividualEvent, 'offers' | 'id' | 'project' | 'identifier'>;
+    /**
+     * アプリケーションごとのオファーを検証するかどうか
+     */
     validateEventOfferPeriod?: boolean;
     validateEvent?: boolean;
     now: Date;

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

@@ -10,119 +10,37 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.validateStartRequest = validateStartRequest;
-const jwt = require("jsonwebtoken");
 const moment = require("moment");
 const factory = require("../../../factory");
-function verifyOfferedByToken(params) {
-    return __awaiter(this, void 0, void 0, function* () {
-        let result;
-        const { issuer, secret, token } = params;
-        try {
-            result = yield new Promise((resolve, reject) => {
-                jwt.verify(token, secret, {
-                    algorithms: ['HS256'],
-                    issuer
-                    // ...(Array.isArray(params.audience)) ? { audience: params.audience } : undefined
-                }, (err, decoded) => {
-                    if (err instanceof Error) {
-                        reject(err);
-                    }
-                    else {
-                        resolve(decoded);
-                    }
-                });
-            });
-        }
-        catch (error) {
-            // JWTエラーをハンドリング
-            if (error instanceof jwt.TokenExpiredError) {
-                throw new factory.errors.Argument('memberOfToken', `invalid token. [${error.message} expiredAt:${error.expiredAt}]`);
-            }
-            else if (error instanceof jwt.JsonWebTokenError) {
-                throw new factory.errors.Argument('memberOfToken', `invalid token. [${error.message}]`);
-            }
-            throw error;
-        }
-        return result;
-    });
-}
+const validateIssuedOfferIfExists_1 = require("./validateStartRequest/validateIssuedOfferIfExists");
+const validateMemberTierIfExists_1 = require("./validateStartRequest/validateMemberTierIfExists");
 function validateStartRequest(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
-        var _a, _b, _c;
+        var _a;
         const now = params.now;
         const event = params.event;
         if (params.validateEventOfferPeriod === true) {
             if (typeof ((_a = params.store) === null || _a === void 0 ? void 0 : _a.id) !== 'string') {
                 throw new factory.errors.NotFound('store.id');
             }
-            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 (tokenizedMemberProgramTier === null || tokenizedMemberProgramTier === void 0 ? void 0 : tokenizedMemberProgramTier.token) === 'string') ? { tokenizedMemberProgramTier } : undefined))(repos);
+            yield validateApplicationOffer({
+                event,
+                now,
+                availableAt: { id: params.store.id },
+                object: params.object
+            })(repos);
         }
         if (params.validateEvent === true) {
             validateEvent({ event, object: params.object });
         }
     });
 }
-function validateMemberTier(params) {
-    return (repos) => __awaiter(this, void 0, void 0, function* () {
-        var _a, _b, _c, _d, _e;
-        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') {
-            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 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: { 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}`
-        //     );
-        // }
-    });
-}
 /**
- * イベントのオファー有効期間を検証する
+ * アプリケーションごとのオファーを検証する
  */
-function validateEventOfferPeriod(params) {
+function validateApplicationOffer(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
-        var _a, _b;
-        const { event, availableAt, tokenizedMemberProgramTier } = params;
+        const { event, availableAt } = params;
         const acceptedDate = moment(params.now);
         const eventOffers = event.offers;
         // アプリケーションごとの設定を参照する(2022-11-19~)
@@ -150,51 +68,19 @@ function validateEventOfferPeriod(params) {
             }
         }
         // 有効メンバープログラムティアが存在する場合
-        // support validForMemberTier(2025-05-14~)
-        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.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({
-                limit: 1,
-                page: 1,
-                project: { id: { $eq: params.event.project.id } },
-                identifier: { $eq: memberProgramIdentifierMustBe }
-            })).shift();
-            if (memberProgram === undefined) {
-                throw new factory.errors.NotFound('MemberProgram', `MemberProgram '${memberProgramIdentifierMustBe}' not found`);
-            }
-            const issuer = yield repos.issuer.findByIdentifier({
-                project: { id: params.event.project.id },
-                identifier: memberProgram.hostingOrganization.identifier
-            });
-            if (typeof issuer.tokenSecret !== 'string' || issuer.tokenSecret === '') {
-                throw new factory.errors.NotFound('issuer.tokenSecret');
-            }
-            const verifiedValidForMemberTier = yield verifyOfferedByToken({
-                secret: issuer.tokenSecret,
-                issuer: issuer.url,
-                token: validForMemberTierToken
-            });
-            yield validateMemberTier({
-                event, acceptedDate, verifiedValidForMemberTier,
-                memberProgramIdentifierMustBe, aggregateOfferIdentifier
-            })(repos);
-        }
+        yield (0, validateMemberTierIfExists_1.validateMemberTierIfExists)({
+            event,
+            now: params.now,
+            object: params.object,
+            makesOfferOnApplication
+        })(repos);
+        // オファートークン検証(2025-10-21~)
+        yield (0, validateIssuedOfferIfExists_1.validateIssuedOfferIfExists)({
+            event,
+            now: params.now,
+            object: params.object,
+            makesOfferOnApplication
+        })(repos);
     });
 }
 /**

package/lib/chevre/service/event.js

@@ -239,7 +239,7 @@ function saveScreeningEventSeries(params) {
             kubunClass: '043'
         });
         debug('kubunNames found.');
-        const availablePaymentMethodTypes = yield repos.categoryCode.projectFields({
+        const availablePaymentMethodTypes = yield repos.categoryCode.projectCategoryCodeFields({
             project: { id: { $eq: params.project.id } },
             inCodeSet: { identifier: { $eq: factory.categoryCode.CategorySetIdentifier.PaymentMethodType } }
         }, ['additionalProperty', 'codeValue']);

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

@@ -117,7 +117,7 @@ function importCategoryCodesFromCOA(params) {
                     upsert: true
                 });
             });
-            yield repos.categoryCode.saveManyByCodeValue(saveParams);
+            yield repos.categoryCode.saveCategoryCodesByCodeValue(saveParams);
         }
         catch (error) {
             let throwsError = true;

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

@@ -53,15 +53,15 @@ function authorize(params) {
                 'superEvent', 'typeOf', 'identifier', 'name'
             ] // optimize(2024-07-18~)
             );
-            const availablePaymentMethodTypes = yield repos.categoryCode.projectFields({
+            const availablePaymentMethodTypes = yield repos.categoryCode.projectCategoryCodeFields({
                 project: { id: { $eq: transaction.project.id } },
                 inCodeSet: { identifier: { $eq: factory.categoryCode.CategorySetIdentifier.PaymentMethodType } }
             }, []);
-            const seatingTypes = yield repos.categoryCode.projectFields({
+            const seatingTypes = yield repos.categoryCode.projectCategoryCodeFields({
                 project: { id: { $eq: transaction.project.id } },
                 inCodeSet: { identifier: { $eq: factory.categoryCode.CategorySetIdentifier.SeatingType } }
             }, []);
-            const videoFormatTypes = yield repos.categoryCode.projectFields({
+            const videoFormatTypes = yield repos.categoryCode.projectCategoryCodeFields({
                 project: { id: { $eq: transaction.project.id } },
                 inCodeSet: { identifier: { $eq: factory.categoryCode.CategorySetIdentifier.VideoFormatType } }
             }, []);

package/lib/chevre/service/offer/eventServiceByCOA/changeOffers.js

@@ -79,15 +79,15 @@ function changeOffers(params) {
             'superEvent', 'typeOf', 'identifier', 'name'
         ] // optimize(2024-07-18~)
         );
-        const availablePaymentMethodTypes = yield repos.categoryCode.projectFields({
+        const availablePaymentMethodTypes = yield repos.categoryCode.projectCategoryCodeFields({
             project: { id: { $eq: transaction.project.id } },
             inCodeSet: { identifier: { $eq: factory.categoryCode.CategorySetIdentifier.PaymentMethodType } }
         }, []);
-        const seatingTypes = yield repos.categoryCode.projectFields({
+        const seatingTypes = yield repos.categoryCode.projectCategoryCodeFields({
             project: { id: { $eq: transaction.project.id } },
             inCodeSet: { identifier: { $eq: factory.categoryCode.CategorySetIdentifier.SeatingType } }
         }, []);
-        const videoFormatTypes = yield repos.categoryCode.projectFields({
+        const videoFormatTypes = yield repos.categoryCode.projectCategoryCodeFields({
             project: { id: { $eq: transaction.project.id } },
             inCodeSet: { identifier: { $eq: factory.categoryCode.CategorySetIdentifier.VideoFormatType } }
         }, []);