@chevre/domain 23.0.0-alpha.14 → 23.0.0-alpha.17

package/example/src/chevre/assetTransaction/processReserve.ts

@@ -6,8 +6,16 @@ import * as redis from 'redis';
 import { chevre } from '../../../../lib/index';
 
 const project = { id: String(process.env.PROJECT_ID) };
+const { EVENT_ID, OFFER_ID, APPLICATION_ID, OFFER_TOKEN } = process.env;
 
+// tslint:disable-next-line:max-func-body-length
 async function main() {
+    if (typeof EVENT_ID !== 'string'
+        || typeof OFFER_ID !== 'string'
+        || typeof APPLICATION_ID !== 'string') {
+        throw new Error('environment variables required');
+    }
+
     const redisClient = redis.createClient<redis.RedisDefaultModules, Record<string, never>, Record<string, never>>({
         socket: {
             port: Number(<string>process.env.REDIS_PORT),
@@ -21,59 +29,113 @@ async function main() {
     const transactionNumberRepo = await chevre.repository.TransactionNumber.createInstance({
         connection: mongoose.connection
     });
-    const assetTransactionRepo = await chevre.repository.AssetTransaction.createInstance(mongoose.connection);
-
     const { transactionNumber } = await transactionNumberRepo.publishByTimestamp({ startDate: new Date() });
     const provider: chevre.factory.reservation.IProvider = {
         id: '59d20831e53ebc2b4e774466',
         typeOf: chevre.factory.organizationType.Corporation
     };
-    const reserveTransaction = await assetTransactionRepo.start<chevre.factory.assetTransactionType.Reserve>({
-        project: { id: project.id, typeOf: chevre.factory.organizationType.Project },
-        typeOf: chevre.factory.assetTransactionType.Reserve,
-        transactionNumber,
-        agent: { ...provider, name: 'sample agent name' },
-        object: {
-            provider,
-            reservationNumber: transactionNumber,
-            reservationStatus: chevre.factory.reservationStatusType.ReservationPending,
-            disablePendingReservations: true,
-            useHoldStockByTransactionNumber: true,
-            typeOf: chevre.factory.reservationType.ReservationPackage
-        },
-        expires: moment()
-            .add(1, 'minute')
-            .toDate()
-    });
-    let cancelResult = await assetTransactionRepo.cancel<chevre.factory.assetTransactionType.Reserve>({
-        typeOf: reserveTransaction.typeOf,
-        id: reserveTransaction.id
-    });
-    console.log('cancelResult:', cancelResult);
-    cancelResult = await assetTransactionRepo.cancel<chevre.factory.assetTransactionType.Reserve>({
-        typeOf: reserveTransaction.typeOf,
-        id: reserveTransaction.id
-    });
-    console.log('cancelResult:', cancelResult);
 
-    let transaction = await assetTransactionRepo.findById<chevre.factory.assetTransactionType.Reserve>(
+    const { transaction } = await (await chevre.service.assetTransaction.createService()).reserve.start(
         {
+            project: { id: project.id, typeOf: chevre.factory.organizationType.Project },
             typeOf: chevre.factory.assetTransactionType.Reserve,
-            id: reserveTransaction.id
+            transactionNumber,
+            agent: { ...provider, name: 'sample agent name' },
+            object: {
+                acceptedOffer: [{
+                    /**
+                     * オファーID
+                     */
+                    id: OFFER_ID,
+                    /**
+                     * アイテム情報
+                     * 予約の詳細指定など
+                     */
+                    itemOffered: {
+                        serviceOutput: {
+                            typeOf: chevre.factory.reservationType.EventReservation,
+                            reservedTicket: {
+                                /**
+                                 * チケット識別子
+                                 * 指定された場合、決済カードの対象チケット識別子と関連付けされます
+                                 * /^[0-9a-zA-Z]{8,16}$/
+                                 */
+                                // identifier?: string;
+                                // issuedBy?: ReservationFactory.IUnderName;
+                                typeOf: 'Ticket',
+                                ticketedSeat: {
+                                    typeOf: chevre.factory.placeType.Seat,
+                                    seatNumber: 'A-01',
+                                    seatRow: '',
+                                    seatSection: 'Default'
+                                }
+                            }
+                        }
+                    }
+                }],
+                reservationFor: {
+                    id: EVENT_ID,
+                    offers: {
+                        token: OFFER_TOKEN,
+                        identifier: 'LegacyReservation'
+                    }
+                }
+            },
+            expires: moment()
+                // tslint:disable-next-line:no-magic-numbers
+                .add(5, 'seconds')
+                .toDate(),
+            validateEvent: false,
+            validateEventOfferPeriod: true,
+            validateAppliesToMovieTicket: true,
+            instrument: [],
+            availableAtOrFrom: { id: APPLICATION_ID }
+            // stockHoldUntilDaysAfterEventEnd: STOCK_HOLD_UNTIL_DAYS_AFTER_EVENT_END
         },
-        ['status', 'transactionNumber', 'project', 'typeOf']
-    );
-    console.log('transaction:', transaction);
-
-    transaction = await assetTransactionRepo.findByTransactionNumber<chevre.factory.assetTransactionType.Reserve>(
+        { maxReservationGracePeriodInDays: 93 }
+    )(
         {
-            typeOf: chevre.factory.assetTransactionType.Reserve,
-            transactionNumber
+            advanceBookingRequirement: await chevre.repository.AdvanceBookingRequirement.createInstance(mongoose.connection),
+            project: await chevre.repository.Project.createInstance(mongoose.connection),
+            stockHolder: await chevre.repository.StockHolder.createInstance({ connection: mongoose.connection }),
+            event: await chevre.repository.Event.createInstance(mongoose.connection),
+            eventSeries: await chevre.repository.EventSeries.createInstance(mongoose.connection),
+            issuer: await chevre.repository.Issuer.createInstance(mongoose.connection),
+            memberProgram: await chevre.repository.MemberProgram.createInstance(mongoose.connection),
+            offer: await chevre.repository.Offer.createInstance(mongoose.connection),
+            offerCatalog: await chevre.repository.OfferCatalog.createInstance(mongoose.connection),
+            offerCatalogItem: await chevre.repository.OfferCatalogItem.createInstance(mongoose.connection),
+            offerRateLimit: await chevre.repository.rateLimit.Offer.createInstance(redisClient),
+            paymentService: await chevre.repository.PaymentService.createInstance(mongoose.connection),
+            priceSpecification: await chevre.repository.PriceSpecification.createInstance(mongoose.connection),
+            product: await chevre.repository.Product.createInstance(mongoose.connection),
+            productOffer: await chevre.repository.ProductOffer.createInstance(mongoose.connection),
+            seat: await chevre.repository.place.Seat.createInstance(mongoose.connection),
+            setting: await chevre.repository.Setting.createInstance(mongoose.connection),
+            task: await chevre.repository.Task.createInstance(mongoose.connection),
+            assetTransaction: await chevre.repository.AssetTransaction.createInstance(mongoose.connection)
         },
-        ['status']
+        new chevre.settings.Settings({
+            abortedTasksWithoutReport: [],
+            numTryConfirmReserveTransaction: 10,
+            deliverOrderLimit: 1,
+            coa: { timeout: 20000 },
+            gmo: {
+                timeout: 5000,
+                timeoutBackground: 5000,
+                useFetch: true
+            },
+            movieticketReserve: {
+                timeout: 5000,
+                timeoutCheck: 5000,
+                minIntervalBetweenPayAndRefund: 1,
+                credentialsExpireInSeconds: 300
+            },
+            // useAssetTransactionSyncProcessing: process.env.USE_ASSET_TRANSACTION_SYNC_PROCESSING === '1',
+            useExperimentalFeature: false
+        })
     );
     console.log('transaction:', transaction);
-
 }
 
 main()

package/example/src/chevre/roles/removeConsolePermissionIfExists.ts

@@ -9,7 +9,7 @@ async function main() {
     const roleRepo = await chevre.repository.Role.createInstance(mongoose.connection);
 
     const permissions = [
-        'eventOffers.*'
+        'products.read'
     ];
     for (const permission of permissions) {
         const roles = await roleRepo.projectFields(

package/example/src/chevre/roles/removePermissionIfExists.ts

@@ -9,12 +9,7 @@ async function main() {
     const roleRepo = await chevre.repository.Role.createInstance(mongoose.connection);
 
     const permissions = [
-        'tokens',
-        'authorizations.create',
-        'permits.read',
-        'tasks.read',
-        'transactionNumbers.write',
-        'chevre.admin'
+        'admin.sellers.productOffers.*'
     ];
     for (const permission of permissions) {
         const roles = await roleRepo.projectFields(

package/example/src/signPayload.ts

@@ -3,13 +3,18 @@ import * as jwt from 'jsonwebtoken';
 
 async function main(): Promise<void> {
     const payload = {
-        member: {
-            memberOf: {
-                identifier: 'bronze',
-                isTierOf: {
-                    identifier: 'DefaultMemberProgram'
-                }
-            }
+        /**
+         * アプリケーションオファーコード
+         */
+        identifier: 'LegacyReservation',
+        validFrom: '2025-10-20T00:00:00Z',
+        validThrough: '2025-10-25T00:00:00Z',
+        eligibleQuantity: { maxValue: 1 },
+        itemOffered: {
+            /**
+             * イベント識別子
+             */
+            identifier: '251025001001010900'
         }
     };
 

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

@@ -1,9 +1,23 @@
 import { AnyExpression, Connection, FilterQuery, Types } from 'mongoose';
 import * as factory from '../factory';
-type IKeyOfProjection = keyof factory.categoryCode.ICategoryCode;
 type IUnset = {
     [key in keyof Pick<factory.categoryCode.ICategoryCode, 'additionalProperty' | 'color' | 'image' | 'paymentMethod'>]?: 1;
 };
+type CategorySetIdentifierExceptMovieTicketType = Exclude<factory.categoryCode.CategorySetIdentifier, factory.categoryCode.CategorySetIdentifier.MovieTicketType>;
+type ICategoryCodeExceptMovieTicketType = Pick<factory.categoryCode.ICategoryCode, 'additionalProperty' | 'codeValue' | 'color' | 'id' | 'image' | 'name' | 'project' | 'typeOf'> & {
+    inCodeSet: {
+        typeOf: 'CategoryCodeSet';
+        identifier: CategorySetIdentifierExceptMovieTicketType;
+    };
+};
+type IMovieTicketType = Pick<factory.categoryCode.ICategoryCode, 'additionalProperty' | 'codeValue' | 'color' | 'id' | 'image' | 'name' | 'project' | 'typeOf' | 'paymentMethod'> & {
+    inCodeSet: {
+        typeOf: 'CategoryCodeSet';
+        identifier: factory.categoryCode.CategorySetIdentifier.MovieTicketType;
+    };
+};
+type IKeyOfProjection = keyof factory.categoryCode.ICategoryCode;
+type IKeyOfProjectionExceptMovieTicketType = keyof ICategoryCodeExceptMovieTicketType;
 /**
  * 区分リポジトリ
  */
@@ -17,19 +31,44 @@ export declare class CategoryCodeRepo {
         [field: string]: AnyExpression;
     };
     /**
-     * 集計検索(publicな属性検索が目的)
+     * 区分集計検索(publicな属性検索が目的)
      */
-    searchByAggregate(conditions: factory.categoryCode.ISearchConditions, inclusion: IKeyOfProjection[]): Promise<factory.categoryCode.ICategoryCode[]>;
+    findCategoryCodesByAggregate(conditions: factory.categoryCode.ISearchConditions, inclusion: IKeyOfProjectionExceptMovieTicketType[]): Promise<(ICategoryCodeExceptMovieTicketType & {
+        id: string;
+    })[]>;
     /**
-     * 検索
+     * 区分検索
      */
-    projectFields(params: factory.categoryCode.ISearchConditions, 
+    projectCategoryCodeFields(params: Omit<factory.categoryCode.ISearchConditions, 'inCodeSet' | 'paymentMethod'> & {
+        inCodeSet?: {
+            identifier?: {
+                $eq?: CategorySetIdentifierExceptMovieTicketType;
+                $in?: CategorySetIdentifierExceptMovieTicketType[];
+            };
+        };
+    }, 
     /**
      * 空の場合無効
      */
     inclusion: IKeyOfProjection[], options?: {
         excludeMovieTicketType?: boolean;
-    }): Promise<(factory.categoryCode.ICategoryCode & {
+    }): Promise<(ICategoryCodeExceptMovieTicketType & {
+        id: string;
+    })[]>;
+    /**
+     * 決済カード区分検索
+     */
+    projectMovieTicketTypeFields(params: Omit<factory.categoryCode.ISearchConditions, 'inCodeSet'> & {
+        inCodeSet?: {
+            identifier?: {
+                $eq?: factory.categoryCode.CategorySetIdentifier.MovieTicketType;
+            };
+        };
+    }, 
+    /**
+     * 空の場合無効
+     */
+    inclusion: IKeyOfProjection[]): Promise<(IMovieTicketType & {
         id: string;
     })[]>;
     save(params: {

package/lib/chevre/repo/categoryCode.js

@@ -192,9 +192,9 @@ class CategoryCodeRepo {
         return projectStage;
     }
     /**
-     * 集計検索(publicな属性検索が目的)
+     * 区分集計検索(publicな属性検索が目的)
      */
-    searchByAggregate(conditions, inclusion) {
+    findCategoryCodesByAggregate(conditions, inclusion) {
         return __awaiter(this, void 0, void 0, function* () {
             var _a;
             const matchStages = CategoryCodeRepo.CREATE_MONGO_CONDITIONS(conditions)
@@ -208,8 +208,6 @@ class CategoryCodeRepo {
                     : [],
                 { $project: projectStage }
             ]);
-            // tslint:disable-next-line:no-single-line-block-comment
-            /* istanbul ignore else */
             if (typeof conditions.limit === 'number' && conditions.limit > 0) {
                 const page = (typeof conditions.page === 'number' && conditions.page > 0) ? conditions.page : 1;
                 aggregate.limit(conditions.limit * page)
@@ -219,9 +217,9 @@ class CategoryCodeRepo {
         });
     }
     /**
-     * 検索
+     * 区分検索
      */
-    projectFields(params, 
+    projectCategoryCodeFields(params, 
     /**
      * 空の場合無効
      */
@@ -249,6 +247,37 @@ class CategoryCodeRepo {
                 .exec();
         });
     }
+    /**
+     * 決済カード区分検索
+     */
+    projectMovieTicketTypeFields(params, 
+    /**
+     * 空の場合無効
+     */
+    inclusion) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const conditions = CategoryCodeRepo.CREATE_MONGO_CONDITIONS(params);
+            let positiveProjectionFields = AVAILABLE_PROJECT_FIELDS;
+            if (Array.isArray(inclusion) && inclusion.length > 0) {
+                positiveProjectionFields = inclusion.filter((key) => AVAILABLE_PROJECT_FIELDS.includes(key));
+            }
+            const projection = Object.assign({ _id: 0, id: { $toString: '$_id' } }, Object.fromEntries(positiveProjectionFields.map((key) => ([key, 1]))));
+            const query = this.categoryCodeModel.find((conditions.length > 0) ? { $and: conditions } : {}, projection);
+            if (typeof params.limit === 'number' && params.limit > 0) {
+                const page = (typeof params.page === 'number' && params.page > 0) ? params.page : 1;
+                query.limit(params.limit)
+                    .skip(params.limit * (page - 1));
+            }
+            // tslint:disable-next-line:no-single-line-block-comment
+            /* istanbul ignore else */
+            if (params.sort !== undefined) {
+                query.sort(params.sort);
+            }
+            return query.setOptions({ maxTimeMS: settings_1.MONGO_MAX_TIME_MS })
+                .lean() // 2024-08-19~
+                .exec();
+        });
+    }
     save(params) {
         return __awaiter(this, void 0, void 0, function* () {
             let savedId;

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

@@ -100,9 +100,9 @@ function fixEvent(params) {
             // additionalProperty, // discontinue(2024-07-20~)
             'name', 'doorTime', 'endDate', 'eventStatus',
             'location', 'startDate', 'superEvent',
-            'offers', 'maximumPhysicalAttendeeCapacity'
+            'offers', 'maximumPhysicalAttendeeCapacity',
+            'identifier' // support identifier(2025-10-24~)
             // 'coaInfo', // discontinue(2024-07-24~)
-            // 'identifier' // discontinue(2024-07-24~)
         ]);
         const offeredThroughIdentifier = (_b = event.offers.offeredThrough) === null || _b === void 0 ? void 0 : _b.identifier;
         if (offeredThroughIdentifier === factory.service.webAPI.Identifier.COA) {

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

@@ -0,0 +1,15 @@
+import * as factory from '../../../../factory';
+import { IMinimizedIndividualEvent } from '../../../../factory/event';
+import type { IssuerRepo } from '../../../../repo/issuer';
+/**
+ * オファートークン検証(2025-10-21~)
+ */
+declare function validateIssuedOfferIfExists(params: {
+    event: Pick<IMinimizedIndividualEvent, 'offers' | 'id' | 'project' | 'identifier'>;
+    now: Date;
+    object: factory.assetTransaction.reserve.IObjectWithoutDetail;
+    makesOfferOnApplication: factory.event.screeningEvent.ISellerMakesOffer;
+}): (repos: {
+    issuer: IssuerRepo;
+}) => Promise<void>;
+export { validateIssuedOfferIfExists };

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/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 } }
         }, []);

package/lib/chevre/service/task/onResourceUpdated/syncCategoryCode.js

@@ -29,7 +29,7 @@ function syncCategoryCode(params) {
         }
         else {
             for (const categoryCodeId of params.ids) {
-                const syncingCategoryCode = (yield repos.categoryCode.projectFields({
+                const syncingCategoryCode = (yield repos.categoryCode.projectCategoryCodeFields({
                     limit: 1,
                     page: 1,
                     project: { id: { $eq: params.project.id } },

package/lib/chevre/service/task/onResourceUpdated.js

@@ -348,7 +348,7 @@ function createInformCategoryCodeTasks(params, setting) {
     // settings: Settings
     ) => __awaiter(this, void 0, void 0, function* () {
         var _a;
-        const categoryCodes4inform = yield repos.categoryCode.projectFields({
+        const categoryCodes4inform = yield repos.categoryCode.projectCategoryCodeFields({
             id: { $in: params.ids },
             // ひとまずDistributorTypeのみ
             inCodeSet: { identifier: { $eq: factory.categoryCode.CategorySetIdentifier.DistributorType } }

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": "5.1.0-alpha.3",
-    "@cinerino/sdk": "12.5.0-alpha.9",
+    "@chevre/factory": "5.1.0-alpha.6",
+    "@cinerino/sdk": "12.6.0-alpha.2",
     "@motionpicture/coa-service": "9.6.0",
     "@motionpicture/gmo-service": "5.4.0-alpha.1",
     "@sendgrid/client": "8.1.4",
@@ -115,5 +115,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build && npm test && npm run doc"
   },
-  "version": "23.0.0-alpha.14"
+  "version": "23.0.0-alpha.17"
 }

package/example/src/chevre/categoryCode/findCategoryCodes.ts

@@ -1,29 +0,0 @@
-// tslint:disable:no-console
-import * as mongoose from 'mongoose';
-
-import { chevre } from '../../../../lib/index';
-
-const project = { id: String(process.env.PROJECT_ID) };
-
-async function main() {
-    await mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: false });
-
-    const categoryCodeRepo = await chevre.repository.CategoryCode.createInstance(mongoose.connection);
-
-    const categoryCodes = await categoryCodeRepo.projectFields(
-        {
-            limit: 100,
-            page: 1,
-            project: { id: { $eq: project.id } },
-            inCodeSet: { identifier: { $eq: chevre.factory.categoryCode.CategorySetIdentifier.MovieTicketType } }
-        },
-        [],
-        { excludeMovieTicketType: false }
-    );
-    // tslint:disable-next-line:no-null-keyword
-    console.dir(categoryCodes.map(({ inCodeSet }) => inCodeSet.identifier), { depth: null });
-}
-
-main()
-    .then()
-    .catch(console.error);

package/example/src/chevre/searchCategoryCodesByAggregate.ts

@@ -1,31 +0,0 @@
-// tslint:disable:no-console
-import * as mongoose from 'mongoose';
-
-import { chevre } from '../../../lib/index';
-
-// const project = { id: String(process.env.PROJECT_ID) };
-
-async function main() {
-    await mongoose.connect(<string>process.env.MONGOLAB_URI);
-
-    const categoryCodeRepo = await chevre.repository.CategoryCode.createInstance(mongoose.connection);
-
-    const categoryCodes = await categoryCodeRepo.searchByAggregate(
-        {
-            limit: 100,
-            page: 1,
-            sort: { codeValue: chevre.factory.sortType.Ascending }
-            // id: { $eq: 'xxx' }
-            // project: { id: { $eq: project.id } }
-            // paymentAccepted: { paymentMethodType: { $eq: 'Cash' } },
-            // hasMerchantReturnPolicy: { applicablePaymentMethod: {} }
-        },
-        ['id']
-    );
-    console.log('categoryCodes found', categoryCodes[0]);
-    console.log(categoryCodes.length, 'categoryCodes found');
-}
-
-main()
-    .then()
-    .catch(console.error);