@chevre/domain 23.1.0-alpha.8 → 23.1.0

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

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

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

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

package/lib/chevre/repo/note.js

@@ -192,8 +192,10 @@ class NoteRepo {
                     })
                         .lean()
                         .exec();
-                    // tslint:disable-next-line:no-console
-                    console.log('NoteRepo.upsertNotesByIdentifier:', params.length, 'params ->', modifyingNotes.length, 'modifyingNotes found.', JSON.stringify(modifyingNotes));
+                    // console.log(
+                    //     'NoteRepo.upsertNotesByIdentifier:',
+                    //     params.length, 'params ->', modifyingNotes.length, 'modifyingNotes found.', JSON.stringify(modifyingNotes)
+                    // );
                     if (modifyingNotes.length !== bulkWriteOps.length) {
                         throw new factory.errors.NotFound(factory.creativeWorkType.NoteDigitalDocument);
                     }

package/lib/chevre/repo/pendingReservation.js

@@ -286,34 +286,38 @@ class PendingReservationRepo {
             });
         });
     }
-    // public async searchHolders2(params: {
+    // public async findSubReservationsByEvent(params: {
+    //     limit: number;
+    //     page: number;
     //     project: { id: string };
     //     eventId: string;
-    //     startDate: Date;
-    //     hasTicketedSeat: boolean;
-    //     offers: IOffer[];
-    // }): Promise<IGetHolderResult[]> {
-    //     const { eventId, offers, hasTicketedSeat } = params;
-    //     const reservationIdentifiers = offers.map((offer) => PendingReservationRepo.offer2identifier(offer, hasTicketedSeat));
+    // }): Promise<{
+    //     // reservationNumber: string;
+    //     identifier: string;
+    // }[]> {
+    //     const { limit, page, eventId } = params;
     //     const aggregate = this.pendingReservationModel.aggregate<{
-    //         // reservationNumber: string;
     //         identifier: string;
     //     }>([
-    //         // unwind,matchの順序
-    //         // unwind->matchでは遅い？
-    //         // match->limit->unwind->matchにする
     //         {
-    //             $unwind: {
-    //                 path: '$subReservation'
+    //             $match: {
+    //                 'reservationFor.id': { $eq: eventId },
+    //                 'subReservation.identifier': { $exists: true }
     //             }
     //         },
+    //         // { $sort: { bookingTime: factory.sortType.Descending } },
     //         {
-    //             $match: {
-    //                 'reservationFor.id': { $eq: eventId },
-    //                 'subReservation.identifier': { $exists: true, $in: reservationIdentifiers }
+    //             $unwind: {
+    //                 path: '$subReservation'
     //             }
     //         },
-    //         { $limit: reservationIdentifiers.length },
+    //         { $sort: { 'subReservation.identifier': factory.sortType.Ascending } },
+    //         // {
+    //         //     $match: {
+    //         //         // セクションで絞ってみる
+    //         //         'subReservation.identifier': { $regex: new RegExp('^Default:') }
+    //         //     }
+    //         // },
     //         {
     //             $project: {
     //                 _id: 0,
@@ -322,64 +326,17 @@ class PendingReservationRepo {
     //             }
     //         }
     //     ]);
-    //     const docs = await aggregate
-    //         .option({ maxTimeMS: MONGO_MAX_TIME_MS })
-    //         .exec();
-    //     debug('searchHolders: aggregated.', docs, docs.length, 'docs');
-    //     // reservationNumberを正確に返す必要はなく、存在しているかどうかだけ分かればよい(stringを返せばよい)
-    //     return reservationIdentifiers.map((reservationIdentifier) => {
-    //         const doc = docs.find(({ identifier }) => identifier === reservationIdentifier);
-    //         // tslint:disable-next-line:no-null-keyword
-    //         // return (doc !== undefined) ? doc.reservationNumber : null;
-    //         // tslint:disable-next-line:no-null-keyword
-    //         return (doc !== undefined) ? doc.identifier : null;
-    //     });
-    // }
-    // public async searchHoldersByDistinct(params: {
-    //     project: { id: string };
-    //     eventId: string;
-    //     startDate: Date;
-    //     hasTicketedSeat: boolean;
-    //     offers: IOffer[];
-    // }) {
-    //     const { eventId, offers, hasTicketedSeat } = params;
-    //     const reservationIdentifiers = offers.map((offer) => PendingReservationRepo.offer2identifier(offer, hasTicketedSeat));
-    //     const doc = await this.pendingReservationModel.distinct(
-    //         'subReservation.identifier',
-    //         {
-    //             'reservationFor.id': { $eq: eventId },
-    //             'subReservation.identifier': { $exists: true, $in: reservationIdentifiers }
-    //         }
-    //     )
-    //         .setOptions({ maxTimeMS: MONGO_MAX_TIME_MS })
-    //         .exec();
-    //     debug('searchHolders: distinct.', doc);
-    //     return doc;
-    // }
-    // public async getSize(params: Omit<IUnlockKey, 'holder' | 'offer'>) {
-    //     const { eventId } = params;
-    //     const aggregate = this.aggregateReservationModel.aggregate([
-    //         {
-    //             $match: {
-    //                 'reservationFor.id': { $eq: eventId }
-    //             }
-    //         },
-    //         {
-    //             $project: {
-    //                 typeOf: 1,
-    //                 objectSize: { $bsonSize: '$$ROOT' }
-    //             }
-    //         }
-    //     ]);
+    //     if (typeof limit === 'number' && limit > 0) {
+    //         const pageMustBePositive: number = (typeof page === 'number' && page > 0) ? page : 1;
+    //         aggregate.skip(limit * (pageMustBePositive - 1))
+    //             .limit(limit);
+    //     } else {
+    //         throw new factory.errors.Argument('limit', 'must be number > 0');
+    //     }
     //     return aggregate
     //         .option({ maxTimeMS: MONGO_MAX_TIME_MS })
     //         .exec();
     // }
-    // public getCursor(conditions: FilterQuery<any>, projection: any) {
-    //     return this.aggregateReservationModel.find(conditions, projection)
-    //         .sort({ bookingTime: factory.sortType.Ascending })
-    //         .cursor();
-    // }
     docExists(params) {
         return __awaiter(this, void 0, void 0, function* () {
             const { eventId } = params;

package/lib/chevre/repo/place/seat.d.ts

@@ -79,6 +79,30 @@ export declare class SeatRepo {
             };
         };
     }): Promise<factory.place.seat.IPlace[]>;
+    /**
+     * セクション指定の座席検索として再定義(2025-12-06~)
+     */
+    findSeatsBySection(params: {
+        limit: number;
+        page: number;
+        projectId: string;
+        /**
+         * 販売者ID
+         */
+        sellerId: string;
+        /**
+         * 施設コード
+         */
+        movieTheaterCode: string;
+        /**
+         * ルームコード
+         */
+        roomCode: string;
+        /**
+         * セクションコード
+         */
+        sectionCode: string;
+    }, options: Pick<factory.place.seat.ISearchConditions, 'branchCode' | 'seatingType'>): Promise<Pick<factory.place.seat.IPlace, 'additionalProperty' | 'branchCode' | 'maximumAttendeeCapacity' | 'name' | 'seatingType'>[]>;
     /**
      * 座席区分集計検索
      */

package/lib/chevre/repo/place/seat.js

@@ -39,30 +39,29 @@ class SeatRepo {
         const includeSectionName = params['containedInPlace.name'] !== 0;
         const includeSectionTypeOf = params['containedInPlace.typeOf'] !== 0;
         const includeScreeningRooms = params['containedInPlace.containedInPlace'] !== 0;
-        const projectStage = {
-            _id: 0,
-            typeOf: '$containsPlace.containsPlace.typeOf',
-            branchCode: '$containsPlace.containsPlace.branchCode',
-            name: '$containsPlace.containsPlace.name',
-            seatingType: '$containsPlace.containsPlace.seatingType',
-            maximumAttendeeCapacity: '$containsPlace.containsPlace.maximumAttendeeCapacity', // add maximumAttendeeCapacity(2024-04-02~)
-            containedInPlace: Object.assign(Object.assign(Object.assign(Object.assign({}, (includeSectionBranchCode) ? { branchCode: '$containsPlace.branchCode' } : undefined), (includeSectionName) ? { name: '$containsPlace.name' } : undefined), (includeSectionTypeOf) ? { typeOf: '$containsPlace.typeOf' } : undefined), (includeScreeningRooms)
-                ? {
-                    containedInPlace: {
-                        typeOf: '$typeOf',
-                        branchCode: '$branchCode',
-                        name: '$name',
+        /**
+         * containedInPlaceについて何かしたprojectするかどうか
+         */
+        const includeContaindInPlace = includeSectionBranchCode || includeSectionName || includeSectionTypeOf || includeScreeningRooms;
+        const projectStage = Object.assign(Object.assign({ _id: 0, typeOf: '$containsPlace.containsPlace.typeOf', branchCode: '$containsPlace.containsPlace.branchCode', name: '$containsPlace.containsPlace.name', seatingType: '$containsPlace.containsPlace.seatingType', maximumAttendeeCapacity: '$containsPlace.containsPlace.maximumAttendeeCapacity' }, (includeContaindInPlace)
+            ? {
+                containedInPlace: Object.assign(Object.assign(Object.assign(Object.assign({}, (includeSectionBranchCode) ? { branchCode: '$containsPlace.branchCode' } : undefined), (includeSectionName) ? { name: '$containsPlace.name' } : undefined), (includeSectionTypeOf) ? { typeOf: '$containsPlace.typeOf' } : undefined), (includeScreeningRooms)
+                    ? {
                         containedInPlace: {
-                            id: '$containedInPlace.id',
-                            typeOf: '$containedInPlace.typeOf',
-                            branchCode: '$containedInPlace.branchCode',
-                            name: '$containedInPlace.name'
+                            typeOf: '$typeOf',
+                            branchCode: '$branchCode',
+                            name: '$name',
+                            containedInPlace: {
+                                id: '$containedInPlace.id',
+                                typeOf: '$containedInPlace.typeOf',
+                                branchCode: '$containedInPlace.branchCode',
+                                name: '$containedInPlace.name'
+                            }
                         }
                     }
-                }
-                : undefined),
-            additionalProperty: '$containsPlace.containsPlace.additionalProperty'
-        };
+                    : undefined)
+            }
+            : undefined), { additionalProperty: '$containsPlace.containsPlace.additionalProperty' });
         Object.keys(params)
             .forEach((field) => {
             if (typeof projectStage[field] === 'string') {
@@ -445,6 +444,89 @@ class SeatRepo {
                 .exec();
         });
     }
+    /**
+     * セクション指定の座席検索として再定義(2025-12-06~)
+     */
+    findSeatsBySection(params, options) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const { limit, page, projectId, sellerId, movieTheaterCode, roomCode, sectionCode } = params;
+            // まずルーム検索
+            const screeningRoomDoc = yield this.placeModel.findOne({
+                typeOf: { $eq: factory.placeType.ScreeningRoom },
+                'project.id': { $eq: projectId },
+                'parentOrganization.id': { $exists: true, $eq: sellerId },
+                'containedInPlace.branchCode': { $exists: true, $eq: movieTheaterCode },
+                branchCode: { $eq: roomCode }
+            }, { _id: 1 })
+                .lean()
+                .exec();
+            // console.log('screeningRoomDoc:', screeningRoomDoc);
+            if (screeningRoomDoc === null) {
+                return [];
+            }
+            const matchStageBeforeUnwind = {
+                $match: { _id: { $eq: screeningRoomDoc._id } }
+            };
+            const matchStages = SeatRepo.CREATE_MATCH_STAGES(Object.assign(Object.assign({}, options), { containedInPlace: {
+                    branchCode: { $eq: sectionCode },
+                    containedInPlace: {
+                        containedInPlace: {}
+                    }
+                } }), { filterTypeOf: false });
+            const pageMustBeOne = (typeof page === 'number' && page > 0) ? page : 1;
+            let skipStage;
+            let limitStage;
+            if (typeof limit === 'number' && limit > 0) {
+                skipStage = { $skip: limit * (pageMustBeOne - 1) };
+                limitStage = { $limit: limit };
+            }
+            else {
+                throw new factory.errors.Argument('limit', 'must be number > 0');
+            }
+            const pipeline = [
+                // uniwind前はドキュメントの_id指定
+                matchStageBeforeUnwind,
+                {
+                    $unwind: {
+                        path: '$containsPlace'
+                        // includeArrayIndex: 'sectionIndex'
+                    }
+                },
+                {
+                    $unwind: {
+                        path: '$containsPlace.containsPlace'
+                        // includeArrayIndex: 'seatIndex'
+                    }
+                },
+                ...matchStages,
+                {
+                    $project: {
+                        _id: 0,
+                        branchCode: '$containsPlace.containsPlace.branchCode',
+                        name: '$containsPlace.containsPlace.name',
+                        seatingType: '$containsPlace.containsPlace.seatingType',
+                        maximumAttendeeCapacity: '$containsPlace.containsPlace.maximumAttendeeCapacity',
+                        additionalProperty: '$containsPlace.containsPlace.additionalProperty'
+                    }
+                },
+                // {
+                //     $sort: {
+                //         // branchCode: factory.sortType.Ascending
+                //     }
+                // },
+                skipStage,
+                limitStage
+            ];
+            // console.log(pipeline);
+            return this.placeModel.aggregate(pipeline)
+                .option({
+                maxTimeMS: settings_1.MONGO_MAX_TIME_MS
+                // explain: true,
+                // hint: 'searchSeatsSort'
+            })
+                .exec();
+        });
+    }
     /**
      * 座席区分集計検索
      */

package/lib/chevre/repo/place/section.d.ts

@@ -37,6 +37,26 @@ export declare class SectionRepo {
         };
     }, $unset: any): Promise<IUpdateSectionResult>;
     searchScreeningRoomSections(searchConditions: factory.place.screeningRoomSection.ISearchConditions): Promise<IScreeningRoomSectionWithoutContainsPlace[]>;
+    /**
+     * ルーム指定のセクション検索として再定義(2025-12-07~)
+     */
+    findSectionsByRoom(params: {
+        limit: number;
+        page: number;
+        projectId: string;
+        /**
+         * 販売者ID
+         */
+        sellerId: string;
+        /**
+         * 施設コード
+         */
+        movieTheaterCode: string;
+        /**
+         * ルームコード
+         */
+        roomCode: string;
+    }): Promise<Pick<IScreeningRoomSectionWithoutContainsPlace, 'additionalProperty' | 'branchCode' | 'name'>[]>;
     deleteScreeningRoomSection(screeningRoomSection: {
         project: {
             id: string;

package/lib/chevre/repo/place/section.js

@@ -248,6 +248,53 @@ class SectionRepo {
                 .exec();
         });
     }
+    /**
+     * ルーム指定のセクション検索として再定義(2025-12-07~)
+     */
+    findSectionsByRoom(params
+    // options: Pick<
+    //     factory.place.screeningRoomSection.ISearchConditions,
+    //     'branchCode'
+    // >
+    ) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const { limit, page, projectId, sellerId, movieTheaterCode, roomCode } = params;
+            const matchStageBeforeUnwind = {
+                $match: {
+                    'project.id': { $eq: projectId },
+                    'parentOrganization.id': { $exists: true, $eq: sellerId },
+                    'containedInPlace.branchCode': { $exists: true, $eq: movieTheaterCode }, // 施設コード
+                    branchCode: { $eq: roomCode } // ルームコード
+                }
+            };
+            const aggregate = this.placeModel.aggregate([
+                // uniwind前はドキュメントの_id指定
+                matchStageBeforeUnwind,
+                { $unwind: '$containsPlace' },
+                // ...matchStages,
+                {
+                    $project: {
+                        _id: 0,
+                        // typeOf: '$containsPlace.typeOf',
+                        branchCode: '$containsPlace.branchCode',
+                        name: '$containsPlace.name',
+                        additionalProperty: '$containsPlace.additionalProperty'
+                    }
+                }
+            ]);
+            if (typeof limit === 'number' && limit > 0) {
+                const pageMustBePositive = (typeof page === 'number' && page > 0) ? page : 1;
+                aggregate.skip(limit * (pageMustBePositive - 1))
+                    .limit(limit);
+            }
+            else {
+                throw new factory.errors.Argument('limit', 'must be number > 0');
+            }
+            return aggregate
+                .option({ maxTimeMS: settings_1.MONGO_MAX_TIME_MS })
+                .exec();
+        });
+    }
     deleteScreeningRoomSection(screeningRoomSection) {
         return __awaiter(this, void 0, void 0, function* () {
             var _a;

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

@@ -38,5 +38,11 @@ export declare class TicketRepo {
      * 承認コードからチケットを発行する
      */
     issueByTicketToken(params: IIssueParams): Promise<Pick<ITicket, 'id'>>;
-    projectFields(params: ISearchConditions, inclusion: IKeyOfProjection[]): Promise<ITicket[]>;
+    findTickets(params: ISearchConditions, inclusion: IKeyOfProjection[]): Promise<ITicket[]>;
+    /**
+     * 発行日時を一定期間過ぎたチケットを削除する
+     */
+    deleteTicketsByDateIssued(params: {
+        dateIssuedLt: Date;
+    }): Promise<void>;
 }

package/lib/chevre/repo/ticket.js

@@ -69,7 +69,7 @@ class TicketRepo {
             return { id: insertedId };
         });
     }
-    projectFields(params, inclusion) {
+    findTickets(params, inclusion) {
         return __awaiter(this, void 0, void 0, function* () {
             var _a;
             const conditions = TicketRepo.CREATE_MONGO_CONDITIONS(params);
@@ -92,5 +92,18 @@ class TicketRepo {
                 .exec();
         });
     }
+    /**
+     * 発行日時を一定期間過ぎたチケットを削除する
+     */
+    deleteTicketsByDateIssued(params) {
+        return __awaiter(this, void 0, void 0, function* () {
+            yield this.ticketModel.deleteMany({
+                dateIssued: {
+                    $lt: params.dateIssuedLt
+                }
+            })
+                .exec();
+        });
+    }
 }
 exports.TicketRepo = TicketRepo;

package/lib/chevre/repository.d.ts

@@ -2,6 +2,7 @@
  * リポジトリ
  */
 import type { AcceptedOfferRepo } from './repo/acceptedOffer';
+import type { AcceptedPaymentMethodRepo } from './repo/acceptedPaymentMethod';
 import type { AccountRepo } from './repo/account';
 import type { AccountingReportRepo } from './repo/accountingReport';
 import type { AccountTitleRepo } from './repo/accountTitle';
@@ -94,6 +95,10 @@ export type AcceptedOffer = AcceptedOfferRepo;
 export declare namespace AcceptedOffer {
     function createInstance(...params: ConstructorParameters<typeof AcceptedOfferRepo>): Promise<AcceptedOfferRepo>;
 }
+export type AcceptedPaymentMethod = AcceptedPaymentMethodRepo;
+export declare namespace AcceptedPaymentMethod {
+    function createInstance(...params: ConstructorParameters<typeof AcceptedPaymentMethodRepo>): Promise<AcceptedPaymentMethodRepo>;
+}
 export type Account = AccountRepo;
 export declare namespace Account {
     function createInstance(...params: ConstructorParameters<typeof AccountRepo>): Promise<AccountRepo>;

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.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;
+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.AcceptedPaymentMethod = 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 = exports.paymentMethod = void 0;
 var AcceptedOffer;
 (function (AcceptedOffer) {
     let repo;
@@ -24,6 +24,19 @@ var AcceptedOffer;
     }
     AcceptedOffer.createInstance = createInstance;
 })(AcceptedOffer || (exports.AcceptedOffer = AcceptedOffer = {}));
+var AcceptedPaymentMethod;
+(function (AcceptedPaymentMethod) {
+    let repo;
+    function createInstance(...params) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (repo === undefined) {
+                repo = (yield Promise.resolve().then(() => require('./repo/acceptedPaymentMethod'))).AcceptedPaymentMethodRepo;
+            }
+            return new repo(...params);
+        });
+    }
+    AcceptedPaymentMethod.createInstance = createInstance;
+})(AcceptedPaymentMethod || (exports.AcceptedPaymentMethod = AcceptedPaymentMethod = {}));
 var Account;
 (function (Account) {
     let repo;

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

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

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

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