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

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

@@ -99,6 +99,7 @@ async function main() {
             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),
+            eventOffer: await chevre.repository.EventOffer.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),

package/example/src/chevre/authorizeEventServiceOffer.ts

@@ -54,6 +54,7 @@ async function main() {
             assetTransaction: await chevre.repository.AssetTransaction.createInstance(mongoose.connection),
             authorization: await chevre.repository.Authorization.createInstance(mongoose.connection),
             event: await chevre.repository.Event.createInstance(mongoose.connection),
+            eventOffer: await chevre.repository.EventOffer.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),

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

@@ -0,0 +1,52 @@
+import type { BulkWriteResult, DeleteResult } from 'mongodb';
+import { Connection, FilterQuery } from 'mongoose';
+import * as factory from '../factory';
+import { IDocType } from './mongoose/schemas/eventOffer';
+type IUnset = {
+    [key in keyof IDocType]?: 1;
+};
+type IDocWithId = IDocType & {
+    id: string;
+};
+type IKeyOfProjection = keyof IDocType;
+/**
+ * イベントオファーリポジトリ
+ */
+export declare class EventOfferRepo {
+    private readonly eventOfferModel;
+    constructor(connection: Connection);
+    static CREATE_MONGO_CONDITIONS(params: factory.eventOffer.ISearchConditions): FilterQuery<IDocType>[];
+    findEventOffers(params: factory.eventOffer.ISearchConditions, inclusion: IKeyOfProjection[]): Promise<IDocWithId[]>;
+    /**
+     * オファーコードとイベントIDをキーにして冪等置換
+     */
+    upsertEventOffersByIdentifier(params: {
+        $set: Pick<IDocType, 'identifier' | 'itemOffered' | 'offeredBy' | 'seller' | 'project' | 'typeOf' | 'validFrom' | 'validThrough'> & {
+            id?: never;
+        };
+        $unset: IUnset;
+    }[], options: {
+        /**
+         * falseの場合setOnInsertのみ
+         * trueの場合setのみ
+         */
+        update: boolean;
+    }): Promise<{
+        bulkWriteResult: BulkWriteResult;
+        modifiedProductOffers: {
+            id: string;
+        }[];
+    } | void>;
+    /**
+     * 販売者の提供するイベントオファーを削除する
+     */
+    deleteEventOffersBySeller(params: {
+        project: {
+            id: string;
+        };
+        seller: {
+            id: string;
+        };
+    }): Promise<DeleteResult>;
+}
+export {};

package/lib/chevre/repo/eventOffer.js

@@ -0,0 +1,185 @@
+"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.EventOfferRepo = void 0;
+const factory = require("../factory");
+const settings_1 = require("../settings");
+const eventOffer_1 = require("./mongoose/schemas/eventOffer");
+const AVAILABLE_PROJECT_FIELDS = [
+    'identifier',
+    'project',
+    'itemOffered',
+    'offeredBy',
+    'typeOf',
+    'validFrom',
+    'validThrough',
+    'availableAtOrFrom',
+    'seller'
+];
+/**
+ * イベントオファーリポジトリ
+ */
+class EventOfferRepo {
+    constructor(connection) {
+        this.eventOfferModel = connection.model(eventOffer_1.modelName, (0, eventOffer_1.createSchema)());
+    }
+    static CREATE_MONGO_CONDITIONS(params) {
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q;
+        const andConditions = [];
+        const idEq = (_a = params.id) === null || _a === void 0 ? void 0 : _a.$eq;
+        if (typeof idEq === 'string') {
+            andConditions.push({ _id: { $eq: idEq } });
+        }
+        const projectIdEq = (_c = (_b = params.project) === null || _b === void 0 ? void 0 : _b.id) === null || _c === void 0 ? void 0 : _c.$eq;
+        if (typeof projectIdEq === 'string') {
+            andConditions.push({ 'project.id': { $eq: projectIdEq } });
+        }
+        const identifierEq = (_d = params.identifier) === null || _d === void 0 ? void 0 : _d.$eq;
+        if (typeof identifierEq === 'string') {
+            andConditions.push({ identifier: { $eq: identifierEq } });
+        }
+        const identifierIn = (_e = params.identifier) === null || _e === void 0 ? void 0 : _e.$in;
+        if (Array.isArray(identifierIn)) {
+            andConditions.push({ identifier: { $in: identifierIn } });
+        }
+        const itemOfferedIdEq = (_g = (_f = params.itemOffered) === null || _f === void 0 ? void 0 : _f.id) === null || _g === void 0 ? void 0 : _g.$eq;
+        if (typeof itemOfferedIdEq === 'string') {
+            andConditions.push({ 'itemOffered.id': { $eq: itemOfferedIdEq } });
+        }
+        const itemOfferedIdIn = (_j = (_h = params.itemOffered) === null || _h === void 0 ? void 0 : _h.id) === null || _j === void 0 ? void 0 : _j.$in;
+        if (Array.isArray(itemOfferedIdIn)) {
+            andConditions.push({ 'itemOffered.id': { $in: itemOfferedIdIn } });
+        }
+        const offeredByIdEq = (_l = (_k = params.offeredBy) === null || _k === void 0 ? void 0 : _k.id) === null || _l === void 0 ? void 0 : _l.$eq;
+        if (typeof offeredByIdEq === 'string') {
+            andConditions.push({ 'offeredBy.id': { $exists: true, $eq: offeredByIdEq } });
+        }
+        const sellerByIdEq = (_o = (_m = params.seller) === null || _m === void 0 ? void 0 : _m.id) === null || _o === void 0 ? void 0 : _o.$eq;
+        if (typeof sellerByIdEq === 'string') {
+            andConditions.push({ 'seller.id': { $eq: sellerByIdEq } });
+        }
+        const validFromLte = (_p = params.validFrom) === null || _p === void 0 ? void 0 : _p.$lte;
+        if (validFromLte instanceof Date) {
+            andConditions.push({ validFrom: { $lte: validFromLte } });
+        }
+        const validThroughGte = (_q = params.validThrough) === null || _q === void 0 ? void 0 : _q.$gte;
+        if (validThroughGte instanceof Date) {
+            andConditions.push({ validThrough: { $gte: validThroughGte } });
+        }
+        return andConditions;
+    }
+    findEventOffers(params, inclusion) {
+        return __awaiter(this, void 0, void 0, function* () {
+            var _a;
+            const conditions = EventOfferRepo.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));
+            }
+            else {
+                throw new factory.errors.ArgumentNull('inclusion', 'inclusion must be specified');
+            }
+            const projection = Object.assign({ _id: 0, id: { $toString: '$_id' } }, Object.fromEntries(positiveProjectionFields.map((key) => ([key, 1]))));
+            const query = this.eventOfferModel.find((conditions.length > 0) ? { $and: conditions } : {}, projection);
+            if (typeof ((_a = params.sort) === null || _a === void 0 ? void 0 : _a.validFrom) === 'number') {
+                query.sort({ validFrom: params.sort.validFrom });
+            }
+            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));
+            }
+            return query.setOptions({ maxTimeMS: settings_1.MONGO_MAX_TIME_MS })
+                .lean()
+                .exec();
+        });
+    }
+    /**
+     * オファーコードとイベントIDをキーにして冪等置換
+     */
+    upsertEventOffersByIdentifier(params, options) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const { update } = options;
+            const bulkWriteOps = [];
+            const queryFilters = [];
+            if (Array.isArray(params)) {
+                params.forEach(({ $set, $unset }) => {
+                    const { identifier, itemOffered, offeredBy, seller, project, validFrom, validThrough } = $set;
+                    if (typeof identifier !== 'string' || identifier === '') {
+                        throw new factory.errors.ArgumentNull('identifier');
+                    }
+                    if (typeof itemOffered.id !== 'string' || itemOffered.id === '') {
+                        throw new factory.errors.ArgumentNull('itemOffered.id');
+                    }
+                    // リソースのユニークネスを保証するfilter
+                    const filter = {
+                        'project.id': { $eq: project.id },
+                        'itemOffered.id': { $eq: itemOffered.id },
+                        identifier: { $eq: identifier }
+                    };
+                    queryFilters.push({
+                        'project.id': { $eq: project.id },
+                        'itemOffered.id': { $eq: itemOffered.id },
+                        identifier: { $eq: identifier }
+                    });
+                    if (update === true) {
+                        const setFields = Object.assign({ validFrom,
+                            validThrough }, (typeof (offeredBy === null || offeredBy === void 0 ? void 0 : offeredBy.identifier) === 'string') ? { offeredBy } : undefined);
+                        const updateFilter = Object.assign({ $set: setFields }, ($unset !== undefined) ? { $unset } : undefined);
+                        const updateOne = {
+                            filter,
+                            update: updateFilter,
+                            upsert: false
+                        };
+                        bulkWriteOps.push({ updateOne });
+                    }
+                    else {
+                        const setOnInsert = Object.assign({ itemOffered, identifier, project, seller, typeOf: factory.offerType.Offer, validFrom,
+                            validThrough }, (typeof (offeredBy === null || offeredBy === void 0 ? void 0 : offeredBy.identifier) === 'string') ? { offeredBy } : undefined);
+                        const updateFilter = {
+                            $setOnInsert: setOnInsert
+                        };
+                        const updateOne = {
+                            filter,
+                            update: updateFilter,
+                            upsert: true
+                        };
+                        bulkWriteOps.push({ updateOne });
+                    }
+                });
+            }
+            if (bulkWriteOps.length > 0) {
+                const bulkWriteResult = yield this.eventOfferModel.bulkWrite(bulkWriteOps, { ordered: false });
+                // modifiedの場合upsertedIdsに含まれないので、idを検索する
+                const modifiedProductOffers = yield this.eventOfferModel.find({ $or: queryFilters }, {
+                    _id: 0,
+                    id: { $toString: '$_id' }
+                })
+                    .lean()
+                    .exec();
+                return { bulkWriteResult, modifiedProductOffers };
+            }
+        });
+    }
+    /**
+     * 販売者の提供するイベントオファーを削除する
+     */
+    deleteEventOffersBySeller(params) {
+        return __awaiter(this, void 0, void 0, function* () {
+            return this.eventOfferModel.deleteMany({
+                'project.id': { $eq: params.project.id },
+                'seller.id': { $eq: params.seller.id }
+            })
+                .exec();
+        });
+    }
+}
+exports.EventOfferRepo = EventOfferRepo;

package/lib/chevre/repo/mongoose/schemas/eventOffer.d.ts

@@ -0,0 +1,10 @@
+import { IndexDefinition, IndexOptions, Model, Schema, SchemaDefinition } from 'mongoose';
+import * as factory from '../../../factory';
+type IDocType = factory.eventOffer.IEventOffer;
+type IModel = Model<IDocType>;
+type ISchemaDefinition = SchemaDefinition<IDocType>;
+type ISchema = Schema<IDocType, IModel, {}, {}, {}, {}, ISchemaDefinition, IDocType>;
+declare const modelName = "EventOffer";
+declare const indexes: [d: IndexDefinition, o: IndexOptions][];
+declare function createSchema(): ISchema;
+export { createSchema, IDocType, IModel, indexes, modelName };

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

@@ -0,0 +1,98 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.modelName = exports.indexes = void 0;
+exports.createSchema = createSchema;
+const mongoose_1 = require("mongoose");
+const settings_1 = require("../../../settings");
+const writeConcern_1 = require("../writeConcern");
+const modelName = 'EventOffer';
+exports.modelName = modelName;
+const schemaDefinition = {
+    project: { type: mongoose_1.SchemaTypes.Mixed, required: true },
+    seller: { type: mongoose_1.SchemaTypes.Mixed, required: true },
+    typeOf: { type: String, required: true },
+    identifier: { type: String, required: true },
+    itemOffered: { type: mongoose_1.SchemaTypes.Mixed, required: true },
+    validFrom: { type: Date, required: true },
+    validThrough: { type: Date, required: true },
+    availableAtOrFrom: { type: mongoose_1.SchemaTypes.Mixed, required: true },
+    offeredBy: { type: mongoose_1.SchemaTypes.Mixed, required: false }
+    // availability: { type: String, required: true }
+};
+const schemaOptions = {
+    autoIndex: settings_1.MONGO_AUTO_INDEX,
+    autoCreate: false,
+    collection: 'eventOffers',
+    id: true,
+    read: settings_1.MONGO_READ_PREFERENCE,
+    writeConcern: writeConcern_1.writeConcern,
+    strict: true,
+    strictQuery: false,
+    timestamps: false,
+    versionKey: false,
+    toJSON: {
+        getters: false,
+        virtuals: false,
+        minimize: false,
+        versionKey: false
+    },
+    toObject: {
+        getters: false,
+        virtuals: true,
+        minimize: false,
+        versionKey: false
+    }
+};
+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' }
+// ]
+];
+exports.indexes = indexes;
+/**
+ * 拡張イベントオファースキーマ
+ */
+let schema;
+function createSchema() {
+    if (schema === undefined) {
+        schema = new mongoose_1.Schema(schemaDefinition, schemaOptions);
+        if (settings_1.MONGO_AUTO_INDEX) {
+            indexes.forEach((indexParams) => {
+                schema === null || schema === void 0 ? void 0 : schema.index(...indexParams);
+            });
+        }
+    }
+    return schema;
+}

package/lib/chevre/repository.d.ts

@@ -23,6 +23,7 @@ import type { CustomerRepo } from './repo/customer';
 import type { CustomerTypeRepo } from './repo/customerType';
 import type { EmailMessageRepo } from './repo/emailMessage';
 import type { EventRepo } from './repo/event';
+import type { EventOfferRepo } from './repo/eventOffer';
 import type { EventSellerMakesOfferRepo } from './repo/eventSellerMakesOffer';
 import type { EventSeriesRepo } from './repo/eventSeries';
 import type { IdentityRepo } from './repo/identity';
@@ -181,6 +182,10 @@ export type Event = EventRepo;
 export declare namespace Event {
     function createInstance(...params: ConstructorParameters<typeof EventRepo>): Promise<EventRepo>;
 }
+export type EventOffer = EventOfferRepo;
+export declare namespace EventOffer {
+    function createInstance(...params: ConstructorParameters<typeof EventOfferRepo>): Promise<EventOfferRepo>;
+}
 export type EventSellerMakesOffer = EventSellerMakesOfferRepo;
 export declare namespace EventSellerMakesOffer {
     function createInstance(...params: ConstructorParameters<typeof EventSellerMakesOfferRepo>): Promise<EventSellerMakesOfferRepo>;

package/lib/chevre/repository.js

@@ -9,8 +9,8 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Person = exports.paymentMethod = exports.PendingReservation = exports.PaymentServiceProvider = exports.PaymentServiceChannel = exports.PaymentService = exports.Passport = exports.OwnershipInfo = exports.OrderNumber = exports.OrderInTransaction = exports.Order = exports.Offer = exports.OfferItemCondition = exports.OfferCatalogItem = exports.OfferCatalog = exports.NoteAboutOrder = exports.Note = exports.MovieTicketType = exports.Message = exports.MerchantReturnPolicy = exports.MemberProgram = exports.Member = exports.Issuer = exports.IdentityProvider = exports.Identity = exports.EventSeries = exports.EventSellerMakesOffer = exports.Event = exports.EmailMessage = exports.CustomerType = exports.Customer = exports.Credentials = exports.CreativeWork = exports.ConfirmationNumber = exports.Comment = exports.Authorization = exports.CategoryCode = exports.AssetTransaction = exports.Aggregation = exports.AggregateReservation = exports.AggregateOrder = exports.AggregateOffer = exports.AdvanceBookingRequirement = exports.AdditionalProperty = exports.Action = exports.AccountTransaction = exports.AccountTitle = exports.AccountingReport = exports.Account = exports.AcceptedOffer = void 0;
-exports.WebSite = exports.rateLimit = exports.Trip = exports.TransactionProcess = exports.TransactionNumber = exports.Transaction = exports.Ticket = exports.Telemetry = exports.Task = exports.StockHolder = exports.setting = exports.Setting = exports.ServiceOutputIdentifier = exports.ServiceOutput = exports.ServiceAvailableHour = exports.SellerReturnPolicy = exports.SellerPaymentAccepted = exports.SellerMakesOffer = exports.Seller = exports.Schedule = exports.Role = exports.ReserveInterface = exports.Reservation = exports.ProjectMakesOffer = exports.Project = exports.ProductOffer = exports.ProductModel = exports.ProductHasOfferCatalog = exports.Product = exports.PriceSpecification = exports.PotentialAction = exports.place = exports.Permit = void 0;
+exports.paymentMethod = exports.PendingReservation = exports.PaymentServiceProvider = exports.PaymentServiceChannel = exports.PaymentService = exports.Passport = exports.OwnershipInfo = exports.OrderNumber = exports.OrderInTransaction = exports.Order = exports.Offer = exports.OfferItemCondition = exports.OfferCatalogItem = exports.OfferCatalog = exports.NoteAboutOrder = exports.Note = exports.MovieTicketType = exports.Message = exports.MerchantReturnPolicy = exports.MemberProgram = exports.Member = exports.Issuer = exports.IdentityProvider = exports.Identity = exports.EventSeries = exports.EventSellerMakesOffer = exports.EventOffer = exports.Event = exports.EmailMessage = exports.CustomerType = exports.Customer = exports.Credentials = exports.CreativeWork = exports.ConfirmationNumber = exports.Comment = exports.Authorization = exports.CategoryCode = exports.AssetTransaction = exports.Aggregation = exports.AggregateReservation = exports.AggregateOrder = exports.AggregateOffer = exports.AdvanceBookingRequirement = exports.AdditionalProperty = exports.Action = exports.AccountTransaction = exports.AccountTitle = exports.AccountingReport = exports.Account = exports.AcceptedOffer = void 0;
+exports.WebSite = exports.rateLimit = exports.Trip = exports.TransactionProcess = exports.TransactionNumber = exports.Transaction = exports.Ticket = exports.Telemetry = exports.Task = exports.StockHolder = exports.setting = exports.Setting = exports.ServiceOutputIdentifier = exports.ServiceOutput = exports.ServiceAvailableHour = exports.SellerReturnPolicy = exports.SellerPaymentAccepted = exports.SellerMakesOffer = exports.Seller = exports.Schedule = exports.Role = exports.ReserveInterface = exports.Reservation = exports.ProjectMakesOffer = exports.Project = exports.ProductOffer = exports.ProductModel = exports.ProductHasOfferCatalog = exports.Product = exports.PriceSpecification = exports.PotentialAction = exports.place = exports.Permit = exports.Person = void 0;
 var AcceptedOffer;
 (function (AcceptedOffer) {
     let repo;
@@ -310,6 +310,19 @@ var Event;
     }
     Event.createInstance = createInstance;
 })(Event || (exports.Event = Event = {}));
+var EventOffer;
+(function (EventOffer) {
+    let repo;
+    function createInstance(...params) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (repo === undefined) {
+                repo = (yield Promise.resolve().then(() => require('./repo/eventOffer'))).EventOfferRepo;
+            }
+            return new repo(...params);
+        });
+    }
+    EventOffer.createInstance = createInstance;
+})(EventOffer || (exports.EventOffer = EventOffer = {}));
 var EventSellerMakesOffer;
 (function (EventSellerMakesOffer) {
     let repo;

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

@@ -3,6 +3,7 @@ import { Settings } from '../../../settings';
 import type { AdvanceBookingRequirementRepo } from '../../../repo/advanceBookingRequirement';
 import type { AssetTransactionRepo } from '../../../repo/assetTransaction';
 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 { MemberProgramRepo } from '../../../repo/memberProgram';
@@ -23,6 +24,7 @@ interface IStartOperationRepos {
     advanceBookingRequirement: AdvanceBookingRequirementRepo;
     stockHolder: StockHolderRepo;
     event: EventRepo;
+    eventOffer: EventOfferRepo;
     eventSeries: EventSeriesRepo;
     issuer: IssuerRepo;
     memberProgram: MemberProgramRepo;

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

@@ -47,6 +47,7 @@ function start(params, options) {
             now,
             store: { id: (_a = params.availableAtOrFrom) === null || _a === void 0 ? void 0 : _a.id }
         })({
+            eventOffer: repos.eventOffer,
             issuer: repos.issuer,
             memberProgram: repos.memberProgram,
             productOffer: repos.productOffer

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

@@ -8,7 +8,7 @@ declare function validateIssuedOfferIfExists(params: {
     event: Pick<IMinimizedIndividualEvent, 'offers' | 'id' | 'project' | 'identifier'>;
     now: Date;
     object: factory.assetTransaction.reserve.IObjectWithoutDetail;
-    makesOfferOnApplication: factory.event.screeningEvent.ISellerMakesOffer;
+    eventOffer: Pick<factory.eventOffer.IEventOffer, 'identifier' | 'itemOffered' | 'offeredBy' | 'validFrom' | 'validThrough'>;
 }): (repos: {
     issuer: IssuerRepo;
 }) => Promise<void>;

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

@@ -51,7 +51,7 @@ 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 { event, acceptedDate, verifiedOffer, eventOffer } = params;
         // イベント識別子一致検証
         const itemOfferedIdentifier = verifiedOffer.itemOffered.identifier;
         if (typeof itemOfferedIdentifier !== 'string' || itemOfferedIdentifier === '') {
@@ -69,7 +69,7 @@ function validateOfferToken(params) {
         if (typeof applicationOfferIdentifier !== 'string' || applicationOfferIdentifier === '') {
             throw new factory.errors.Argument('reservationFor.offers.token', 'identifier must be string');
         }
-        const applicationOfferIdentifierMustBe = makesOfferOnApplication.identifier;
+        const applicationOfferIdentifierMustBe = eventOffer.identifier;
         if (typeof applicationOfferIdentifierMustBe !== 'string') {
             throw new factory.errors.NotFound('makesOffer.identifier');
         }
@@ -115,9 +115,9 @@ function validateOfferToken(params) {
 function validateIssuedOfferIfExists(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         var _a, _b, _c, _d, _e;
-        const { event, makesOfferOnApplication } = params;
+        const { event, eventOffer } = params;
         const acceptedDate = moment(params.now);
-        const offerTokenIssuer = (_a = makesOfferOnApplication.offeredBy) === null || _a === void 0 ? void 0 : _a.identifier;
+        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;
@@ -128,12 +128,12 @@ function validateIssuedOfferIfExists(params) {
             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 (typeof eventOffer.identifier !== 'string' || eventOffer.identifier === '') {
+                throw new factory.errors.NotFound('eventOffer.identifier');
             }
             // アプリケーションオファーコード一致検証
-            if (makesOfferOnApplication.identifier !== offerIdentifierMustBe) {
-                throw new factory.errors.Argument('object.reservationFor.offers.identifier', 'offers.identifier not matched');
+            if (eventOffer.identifier !== offerIdentifierMustBe) {
+                throw new factory.errors.Argument('object.reservationFor.offers.identifier', 'eventOffer.identifier not matched');
             }
             const issuer = yield repos.issuer.findByIdentifier({
                 project: { id: event.project.id },
@@ -151,7 +151,7 @@ function validateIssuedOfferIfExists(params) {
                 event,
                 acceptedDate,
                 verifiedOffer,
-                makesOfferOnApplication,
+                eventOffer,
                 object: params.object
             })();
         }

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

@@ -1,5 +1,6 @@
 import * as factory from '../../../factory';
 import { IMinimizedIndividualEvent } from '../../../factory/event';
+import type { EventOfferRepo } from '../../../repo/eventOffer';
 import type { IssuerRepo } from '../../../repo/issuer';
 import type { MemberProgramRepo } from '../../../repo/memberProgram';
 import type { ProductOfferRepo } from '../../../repo/productOffer';
@@ -19,6 +20,7 @@ declare function validateStartRequest(params: {
         id?: string;
     };
 }): (repos: {
+    eventOffer: EventOfferRepo;
     issuer: IssuerRepo;
     memberProgram: MemberProgramRepo;
     productOffer: ProductOfferRepo;

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

@@ -40,6 +40,7 @@ function validateStartRequest(params) {
  */
 function validateApplicationOffer(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
+        var _a, _b;
         const { event, availableAt } = params;
         const acceptedDate = moment(params.now);
         const eventOffers = event.offers;
@@ -67,20 +68,43 @@ function validateApplicationOffer(params) {
                 throw new factory.errors.Argument('reservationFor.id', `Offer of ${params.event.id} is valid through ${validThrough}`);
             }
         }
-        // 有効メンバープログラムティアが存在する場合
-        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);
+        // support extensibleEventOffer(2025-11-11~)
+        if (eventOffers.typeOf === factory.offerType.AggregateOffer) {
+            // リクエストによるオファーコード指定が必須
+            const eventOfferIdentifierMustBe = (_b = (_a = params.object.reservationFor) === null || _a === void 0 ? void 0 : _a.offers) === null || _b === void 0 ? void 0 : _b.identifier;
+            if (typeof eventOfferIdentifierMustBe !== 'string' || eventOfferIdentifierMustBe === '') {
+                throw new factory.errors.ArgumentNull('reservationFor.offers.identifier');
+            }
+            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 } }, // 対象イベント
+                identifier: { $eq: eventOfferIdentifierMustBe } // オファーコード
+            }, ['identifier', 'itemOffered', 'offeredBy', 'typeOf', 'validFrom', 'validThrough'])).shift();
+            if (existingEventOffer === undefined) {
+                throw new factory.errors.NotFound(`eventOffer: ${eventOfferIdentifierMustBe}`);
+            }
+            // 拡張可能なオファー設定の場合のみ、オファートークンを検証する(2025-11-11~)
+            yield (0, validateIssuedOfferIfExists_1.validateIssuedOfferIfExists)({
+                event,
+                now: params.now,
+                object: params.object,
+                eventOffer: existingEventOffer
+            })(repos);
+        }
+        else {
+            // 拡張可能なオファーに場合に、有効メンバープログラムティア設定は存在しない前提
+            // 有効メンバープログラムティアが存在する場合
+            yield (0, validateMemberTierIfExists_1.validateMemberTierIfExists)({
+                event,
+                now: params.now,
+                object: params.object,
+                makesOfferOnApplication
+            })(repos);
+        }
     });
 }
 /**

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

@@ -16,50 +16,13 @@ const factory = require("../../../../../factory");
  */
 function requestedProgramMembershipUsed2permit(params) {
     // tslint:disable-next-line:cyclomatic-complexity max-func-body-length
-    return (repos
-    // credentials: {
-    //     jwt: JWTCredentials;
-    // }
-    ) => __awaiter(this, void 0, void 0, function* () {
-        var _a, _b;
+    return (repos) => __awaiter(this, void 0, void 0, function* () {
+        var _a, _b, _c, _d;
         let programMembershipUsedAsPermit;
         const { programMembershipUsed, placeOrder } = params;
         // discontinue token as fromLocation(ticketTokenへ移行するべき)(2024-12-18~)
         if (typeof programMembershipUsed === 'string') {
             throw new factory.errors.NotImplemented('programMembershipUsed as string not implemented');
-            // トークン化されたメンバーシップがリクエストされた場合、実メンバーシップ情報へ変換する
-            // const { authorizedObject } = await CodeService.verifyToken({
-            //     project: { id: params.project.id },
-            //     agent: { id: params.project.id, typeOf: factory.organizationType.Project },
-            //     token: String(programMembershipUsed)
-            // })(repos);
-            // const permitOwnershipInfo = authorizedObject;
-            // if (Array.isArray(permitOwnershipInfo)) {
-            //     throw new factory.errors.NotImplemented('programMembershipUsed as an array not implemented');
-            // }
-            // if (permitOwnershipInfo.typeOf !== 'OwnershipInfo') {
-            //     throw new factory.errors.Argument('programMembershipUsed', 'must be OwnershipInfo');
-            // }
-            // const typeOfGood = permitOwnershipInfo.typeOfGood;
-            // if (typeOfGood.typeOf !== factory.permit.PermitType.Permit) {
-            //     throw new factory.errors.Argument('programMembershipUsed', 'must be Permit');
-            // }
-            // const issuedThroughTypeOf = typeOfGood.issuedThrough?.typeOf;
-            // if (issuedThroughTypeOf !== factory.product.ProductType.MembershipService) {
-            //     throw new factory.errors.Argument('programMembershipUsed', 'must be issued through MembershipService');
-            // }
-            // if (typeof typeOfGood.issuedThrough?.id !== 'string') {
-            //     throw new factory.errors.NotFound('itemOffered.serviceOutput.programMembershipUsed.issuedThrough.id');
-            // }
-            // if (issuedThroughTypeOf === factory.product.ProductType.MembershipService) {
-            //     programMembershipUsedAsPermit = {
-            //         identifier: typeOfGood.identifier,
-            //         issuedThrough: { id: typeOfGood.issuedThrough.id, typeOf: issuedThroughTypeOf },
-            //         typeOf: factory.permit.PermitType.Permit
-            //     };
-            // } else {
-            //     throw new factory.errors.Argument('programMembershipUsed', `invalid issuedThrough.typeOf: ${issuedThroughTypeOf}`);
-            // }
         }
         else if ((programMembershipUsed === null || programMembershipUsed === void 0 ? void 0 : programMembershipUsed.typeOf) === 'Ticket') {
             const { ticketToken } = programMembershipUsed;
@@ -81,47 +44,54 @@ function requestedProgramMembershipUsed2permit(params) {
                 if (object.typeOf !== 'OwnershipInfo') {
                     throw new factory.errors.Argument('programMembershipUsed', 'invalid authorization');
                 }
-                // const ownershipInfoId = object.id;
-                // const permitOwnershipInfo = (await repos.ownershipInfo.search({
-                //     limit: 1,
-                //     page: 1,
-                //     project: { id: { $eq: params.project.id } },
-                //     ids: [ownershipInfoId],
-                //     ownedFrom: now,
-                //     ownedThrough: now
-                // })).shift();
-                // if (permitOwnershipInfo === undefined) {
-                //     throw new factory.errors.NotFound('OwnershipInfo');
-                // }
                 // audience検証
                 if ((audience === null || audience === void 0 ? void 0 : audience.typeOf) !== factory.transactionType.PlaceOrder || audience.id !== placeOrder.id) {
                     throw new factory.errors.Argument('programMembershipUsed', 'audience not matched with placeOrder');
                 }
                 const permitOwnershipInfo = object;
-                if (permitOwnershipInfo.typeOfGood.typeOf !== factory.permit.PermitType.Permit) {
-                    throw new factory.errors.Argument('programMembershipUsed', 'ownershipInfo.typeOfGood.typeOf must be Permit');
-                }
-                const issuedThroughTypeOf = (_a = permitOwnershipInfo.typeOfGood.issuedThrough) === null || _a === void 0 ? void 0 : _a.typeOf;
-                if (issuedThroughTypeOf === factory.service.paymentService.PaymentServiceType.FaceToFace) {
-                    programMembershipUsedAsPermit = {
-                        identifier: permitOwnershipInfo.typeOfGood.identifier,
-                        issuedThrough: { typeOf: issuedThroughTypeOf },
-                        typeOf: factory.permit.PermitType.Permit
-                    };
+                const ownedGoodType = (_a = permitOwnershipInfo.typeOfGood) === null || _a === void 0 ? void 0 : _a.typeOf;
+                if (ownedGoodType === factory.permit.PermitType.Permit) {
+                    const issuedThroughTypeOf = (_b = permitOwnershipInfo.typeOfGood.issuedThrough) === null || _b === void 0 ? void 0 : _b.typeOf;
+                    if (issuedThroughTypeOf === factory.service.paymentService.PaymentServiceType.FaceToFace) {
+                        programMembershipUsedAsPermit = {
+                            identifier: permitOwnershipInfo.typeOfGood.identifier,
+                            issuedThrough: { typeOf: issuedThroughTypeOf },
+                            typeOf: factory.permit.PermitType.Permit
+                        };
+                    }
+                    else if (issuedThroughTypeOf === factory.product.ProductType.MembershipService
+                        || issuedThroughTypeOf === factory.service.paymentService.PaymentServiceType.CreditCard) {
+                        if (typeof ((_c = permitOwnershipInfo.typeOfGood.issuedThrough) === null || _c === void 0 ? void 0 : _c.id) !== 'string') {
+                            throw new factory.errors.Argument('programMembershipUsed', 'ownershipInfo.typeOfGood.issuedThrough.id undefined');
+                        }
+                        programMembershipUsedAsPermit = {
+                            identifier: permitOwnershipInfo.typeOfGood.identifier,
+                            issuedThrough: { id: permitOwnershipInfo.typeOfGood.issuedThrough.id, typeOf: issuedThroughTypeOf },
+                            typeOf: factory.permit.PermitType.Permit
+                        };
+                    }
+                    else {
+                        throw new factory.errors.Argument('programMembershipUsed', `invalid issuedThrough.typeOf: ${issuedThroughTypeOf}`);
+                    }
                 }
-                else if (issuedThroughTypeOf === factory.product.ProductType.MembershipService
-                    || issuedThroughTypeOf === factory.service.paymentService.PaymentServiceType.CreditCard) {
-                    if (typeof ((_b = permitOwnershipInfo.typeOfGood.issuedThrough) === null || _b === void 0 ? void 0 : _b.id) !== 'string') {
-                        throw new factory.errors.Argument('programMembershipUsed', 'ownershipInfo.typeOfGood.issuedThrough.id undefined');
+                else if (ownedGoodType === factory.service.paymentService.PaymentServiceType.CreditCard) {
+                    // CreditCard決済の場合、決済方法所有権を受け入れる(2025-11-11~)
+                    const paymentServiceId = (_d = permitOwnershipInfo.typeOfGood) === null || _d === void 0 ? void 0 : _d.id;
+                    const paymentMethodId = permitOwnershipInfo.typeOfGood.serviceOutput.paymentMethodId;
+                    if (typeof paymentMethodId !== 'string' || paymentMethodId === '') {
+                        throw new factory.errors.Argument('programMembershipUsed', 'paymentServiceId required');
+                    }
+                    if (typeof paymentMethodId !== 'string' || paymentMethodId === '') {
+                        throw new factory.errors.Argument('programMembershipUsed', 'paymentMethodId required');
                     }
                     programMembershipUsedAsPermit = {
-                        identifier: permitOwnershipInfo.typeOfGood.identifier,
-                        issuedThrough: { id: permitOwnershipInfo.typeOfGood.issuedThrough.id, typeOf: issuedThroughTypeOf },
+                        identifier: paymentMethodId,
+                        issuedThrough: { id: paymentServiceId, typeOf: ownedGoodType },
                         typeOf: factory.permit.PermitType.Permit
                     };
                 }
                 else {
-                    throw new factory.errors.Argument('programMembershipUsed', `invalid issuedThrough.typeOf: ${issuedThroughTypeOf}`);
+                    throw new factory.errors.Argument('programMembershipUsed', 'ownershipInfo.typeOfGood.typeOf must be Permit');
                 }
             }
         }

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

@@ -5,6 +5,7 @@ import type { AdvanceBookingRequirementRepo } from '../../../../repo/advanceBook
 import type { AssetTransactionRepo } from '../../../../repo/assetTransaction';
 import type { AuthorizationRepo } from '../../../../repo/authorization';
 import type { EventRepo, IMinimizedIndividualEvent } from '../../../../repo/event';
+import type { EventOfferRepo } from '../../../../repo/eventOffer';
 import { EventSeriesRepo } from '../../../../repo/eventSeries';
 import type { IssuerRepo } from '../../../../repo/issuer';
 import type { MemberProgramRepo } from '../../../../repo/memberProgram';
@@ -52,6 +53,7 @@ declare function processStartReserve4chevre(params: {
     authorization: AuthorizationRepo;
     stockHolder: StockHolderRepo;
     event: EventRepo;
+    eventOffer: EventOfferRepo;
     eventSeries: EventSeriesRepo;
     issuer: IssuerRepo;
     memberProgram: MemberProgramRepo;

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

@@ -5,6 +5,7 @@ import type { AdvanceBookingRequirementRepo } from '../../../repo/advanceBooking
 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 { EventSeriesRepo } from '../../../repo/eventSeries';
 import type { IssuerRepo } from '../../../repo/issuer';
 import type { MemberProgramRepo } from '../../../repo/memberProgram';
@@ -32,6 +33,7 @@ interface IAuthorizeRepos {
     assetTransaction: AssetTransactionRepo;
     authorization: AuthorizationRepo;
     event: EventRepo;
+    eventOffer: EventOfferRepo;
     eventSeries: EventSeriesRepo;
     issuer: IssuerRepo;
     memberProgram: MemberProgramRepo;

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

@@ -116,29 +116,45 @@ function createInformTasks(params, setting) {
             );
             // 最適化(2024-03-22~)
             events4inform = screeningEvents4inform.map(({ project, organizer, typeOf, name, doorTime, endDate, eventStatus, location, startDate, superEvent, offers, id, additionalProperty, identifier }) => {
-                var _a;
-                const eventOfferAsNotification = (((_a = offers.offeredThrough) === null || _a === void 0 ? void 0 : _a.identifier) === factory.service.webAPI.Identifier.COA)
-                    ? {
+                var _a, _b;
+                const sellerMakesOffersAsNotification = (Array.isArray((_a = offers.seller) === null || _a === void 0 ? void 0 : _a.makesOffer))
+                    ? offers.seller.makesOffer.map((eventSellerMakesOffer) => {
+                        return Object.assign({ availabilityEnds: eventSellerMakesOffer.availabilityEnds, availabilityStarts: eventSellerMakesOffer.availabilityStarts, validFrom: eventSellerMakesOffer.validFrom, validThrough: eventSellerMakesOffer.validThrough, availableAtOrFrom: [eventSellerMakesOffer.availableAtOrFrom] }, (typeof eventSellerMakesOffer.identifier === 'string')
+                            ? { identifier: eventSellerMakesOffer.identifier }
+                            : undefined // support notify identifier(2025-11-01~)
+                        );
+                    })
+                    : [];
+                let eventOfferAsNotification;
+                if (((_b = offers.offeredThrough) === null || _b === void 0 ? void 0 : _b.identifier) === factory.service.webAPI.Identifier.COA) {
+                    eventOfferAsNotification = {
                         typeOf: offers.typeOf,
                         itemOffered: offers.itemOffered
-                    }
-                    : {
+                    };
+                }
+                else if (offers.typeOf === factory.offerType.AggregateOffer) {
+                    eventOfferAsNotification = {
+                        typeOf: offers.typeOf,
+                        itemOffered: offers.itemOffered,
+                        seller: {
+                            id: offers.seller.id,
+                            typeOf: offers.seller.typeOf,
+                            makesOffer: sellerMakesOffersAsNotification
+                        }
+                    };
+                }
+                else {
+                    eventOfferAsNotification = {
                         typeOf: offers.typeOf,
                         itemOffered: offers.itemOffered,
                         seller: {
                             id: offers.seller.id,
                             typeOf: offers.seller.typeOf,
                             // makesOfferを追加(2024-03-26~)
-                            makesOffer: (Array.isArray(offers.seller.makesOffer))
-                                ? offers.seller.makesOffer.map((eventSellerMakesOffer) => {
-                                    return Object.assign({ availabilityEnds: eventSellerMakesOffer.availabilityEnds, availabilityStarts: eventSellerMakesOffer.availabilityStarts, validFrom: eventSellerMakesOffer.validFrom, validThrough: eventSellerMakesOffer.validThrough, availableAtOrFrom: [eventSellerMakesOffer.availableAtOrFrom] }, (typeof eventSellerMakesOffer.identifier === 'string')
-                                        ? { identifier: eventSellerMakesOffer.identifier }
-                                        : undefined // support notify identifier(2025-11-01~)
-                                    );
-                                })
-                                : []
+                            makesOffer: sellerMakesOffersAsNotification
                         }
                     };
+                }
                 return Object.assign({ project, organizer, typeOf, name, doorTime, endDate,
                     eventStatus, location, startDate, superEvent, id, additionalProperty, offers: eventOfferAsNotification }, (typeof identifier === 'string') ? { identifier } : undefined // support notify identifier(2025-11-01~)
                 );

package/lib/chevre/service/payment/any/authorize/fixTransactionNumber.d.ts

@@ -5,7 +5,6 @@ import type { TicketRepo } from '../../../../repo/ticket';
 import type { ITransactionInProgress, TransactionRepo } from '../../../../repo/transaction';
 import type { TransactionNumberRepo } from '../../../../repo/transactionNumber';
 import * as PayTransactionService from '../../../assetTransaction/pay';
-import { IPermitOrInvoice } from '../verifyTicketTokenAsNeeded';
 interface IFixTransactionNumberRepos {
     action: ActionRepo;
     authorization: AuthorizationRepo;
@@ -28,7 +27,7 @@ declare function fixTransactionNumber(params: {
     transactionNumber: string;
     pendingPaymentAgencyTransaction?: PayTransactionService.IPaymentAgencyTransaction;
     creditCard?: factory.action.authorize.paymentMethod.any.ICreditCard;
-    permitOrInvoice?: IPermitOrInvoice;
+    permitOrInvoice?: never;
     id?: never;
 } | {
     /**

package/lib/chevre/service/payment/any/authorize/fixTransactionNumber.js

@@ -81,6 +81,8 @@ function fixTransactionNumber(params) {
             const publishTransactionNumberResult = yield repos.transactionNumber.publishByTimestamp({ startDate: new Date() });
             transactionNumber = publishTransactionNumberResult.transactionNumber;
         }
-        return Object.assign(Object.assign(Object.assign({ transactionNumber }, (pendingPaymentAgencyTransaction !== undefined) ? { pendingPaymentAgencyTransaction } : undefined), (creditCard !== undefined) ? { creditCard } : undefined), (permitOrInvoice !== undefined) ? { permitOrInvoice } : undefined);
+        return Object.assign(Object.assign({ transactionNumber }, (pendingPaymentAgencyTransaction !== undefined) ? { pendingPaymentAgencyTransaction } : undefined), (creditCard !== undefined) ? { creditCard } : undefined
+        // ...(permitOrInvoice !== undefined) ? { permitOrInvoice } : undefined
+        );
     });
 }

package/lib/chevre/service/payment/any/factory.d.ts

@@ -34,7 +34,6 @@ export declare function createMovieTicket(params: factory.action.trade.pay.IMovi
 export declare function createAuthorizeResult(params: {
     object: factory.action.authorize.paymentMethod.any.IObjectIncludingPaymentMethodDetails;
     payTransaction: Pick<factory.assetTransaction.pay.ITransaction, 'object'>;
-    permit?: Pick<factory.ownershipInfo.IPermitAsGood, 'identifier'>;
 }): factory.action.authorize.paymentMethod.any.IResult;
 /**
  * 通知対象としてのアクションを最適化

package/lib/chevre/service/payment/any/verifyTicketTokenAsNeeded.js

@@ -45,24 +45,40 @@ function verifyTicketTokenAsNeeded(params) {
                     }
                     if (authorizedObject.typeOf === 'OwnershipInfo') {
                         const { typeOfGood } = authorizedObject;
-                        if (((_b = typeOfGood.issuedThrough) === null || _b === void 0 ? void 0 : _b.typeOf) !== paymentServiceType) {
-                            throw new factory.errors.Argument('ticketToken', 'paymentServiceType not matched');
+                        if (typeOfGood.typeOf === factory.permit.PermitType.Permit || typeOfGood.typeOf === 'Invoice') {
+                            if (((_b = typeOfGood.issuedThrough) === null || _b === void 0 ? void 0 : _b.typeOf) !== paymentServiceType) {
+                                throw new factory.errors.Argument('ticketToken', 'paymentServiceType not matched');
+                            }
+                            // FaceToFace以外の場合、発行サービスIDを検証
+                            if (typeOfGood.issuedThrough.typeOf !== factory.service.paymentService.PaymentServiceType.FaceToFace) {
+                                if (typeOfGood.issuedThrough.id !== issuedThrough.id) {
+                                    throw new factory.errors.Argument('ticketToken', 'issuedThrough.id not matched');
+                                }
+                            }
+                            if (typeOfGood.typeOf === factory.permit.PermitType.Permit) {
+                                permitOrInvoice = { identifier: typeOfGood.identifier, typeOf: factory.permit.PermitType.Permit };
+                            }
+                            else if (typeOfGood.typeOf === 'Invoice') {
+                                //  support paymentServiceType.MovieTicket(2024-11-23~)
+                                permitOrInvoice = { paymentMethodId: typeOfGood.paymentMethodId, typeOf: 'Invoice' };
+                            }
+                            else {
+                                throw new factory.errors.Argument('ticketToken', 'must be Permit or Invoice');
+                            }
                         }
-                        // FaceToFace以外の場合、発行サービスIDを検証
-                        if (typeOfGood.issuedThrough.typeOf !== factory.service.paymentService.PaymentServiceType.FaceToFace) {
-                            if (typeOfGood.issuedThrough.id !== issuedThrough.id) {
+                        else if (typeOfGood.typeOf === factory.service.paymentService.PaymentServiceType.CreditCard
+                            || typeOfGood.typeOf === factory.service.paymentService.PaymentServiceType.MovieTicket) {
+                            // 決済方法所有権を受け入れる(2025-11-11~)
+                            if (typeOfGood.typeOf !== paymentServiceType) {
+                                throw new factory.errors.Argument('ticketToken', 'paymentServiceType not matched');
+                            }
+                            if (typeOfGood.id !== issuedThrough.id) {
                                 throw new factory.errors.Argument('ticketToken', 'issuedThrough.id not matched');
                             }
-                        }
-                        if (typeOfGood.typeOf === factory.permit.PermitType.Permit) {
-                            permitOrInvoice = { identifier: typeOfGood.identifier, typeOf: factory.permit.PermitType.Permit };
-                        }
-                        else if (typeOfGood.typeOf === 'Invoice') {
-                            //  support paymentServiceType.MovieTicket(2024-11-23~)
-                            permitOrInvoice = { paymentMethodId: typeOfGood.paymentMethodId, typeOf: 'Invoice' };
+                            permitOrInvoice = { paymentMethodId: typeOfGood.serviceOutput.paymentMethodId, typeOf: 'Invoice' };
                         }
                         else {
-                            throw new factory.errors.Argument('ticketToken', 'must be Permit or Invoice');
+                            throw new factory.errors.Argument('ticketToken', `invalid typeOfGood.typeOf ${typeOfGood.typeOf}`);
                         }
                     }
                     else {

package/lib/chevre/service/payment/any.js

@@ -439,7 +439,7 @@ function authorize(params) {
         if (typeof fixTransactionNumberResult.id === 'string') {
             return { id: fixTransactionNumberResult.id };
         }
-        const { transactionNumber, pendingPaymentAgencyTransaction, creditCard, permitOrInvoice } = fixTransactionNumberResult;
+        const { transactionNumber, pendingPaymentAgencyTransaction, creditCard } = fixTransactionNumberResult;
         // let transactionNumber: string | undefined;
         // let pendingPaymentAgencyTransaction: PayTransactionService.IPaymentAgencyTransaction | undefined;
         // let creditCard: factory.action.authorize.paymentMethod.any.ICreditCard | undefined = params.object.creditCard;
@@ -568,7 +568,11 @@ function authorize(params) {
                 throw error;
             }
         }
-        const result = (0, factory_1.createAuthorizeResult)(Object.assign({ payTransaction, object: authorizeObjectIncludingPaymentMethodDetails }, ((permitOrInvoice === null || permitOrInvoice === void 0 ? void 0 : permitOrInvoice.typeOf) === factory.permit.PermitType.Permit) ? { permit: permitOrInvoice } : undefined));
+        const result = (0, factory_1.createAuthorizeResult)({
+            payTransaction,
+            object: authorizeObjectIncludingPaymentMethodDetails
+            // ...(permitOrInvoice?.typeOf === factory.permit.PermitType.Permit) ? { permit: permitOrInvoice } : undefined
+        });
         yield repos.action.completeWithVoid({ typeOf: action.typeOf, id: action.id, result: result });
         return { id: action.id };
     });

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.2.0-alpha.5",
-    "@cinerino/sdk": "12.7.0-alpha.1",
+    "@chevre/factory": "5.2.0-alpha.7",
+    "@cinerino/sdk": "12.7.0-alpha.3",
     "@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.1.0-alpha.0"
+  "version": "23.1.0-alpha.2"
 }