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

package/lib/chevre/repo/reservation.js

@@ -114,15 +114,19 @@ class ReservationRepo {
         const bulkWriteOps = [];
         if (Array.isArray(params.subReservation)) {
             params.subReservation.forEach((subReservation) => {
-                const { price: _discontinuePrice, reservedTicket, ...subReservationWithoutPrice } = subReservation;
-                const { ticketType, ...reservedTicketWithoutTicketType } = reservedTicket;
-                // 予約ドキュメントのticketTypeを最小化(2026-04-03~)
-                const savingReservedTicket = {
-                    ...reservedTicketWithoutTicketType,
-                    ticketType: {
-                        ...((typeof ticketType.id === 'string') && { id: ticketType.id })
-                    }
-                };
+                const { price: _discontinuePrice, reservedTicket, priceCurrency: _discontinuePriceCurrency, // discontinue priceCurrency
+                numSeats: _numSeats, // discontinue(2026-05-11~)
+                ...subReservationWithoutPrice } = subReservation;
+                const { ticketType: _ticketType, ...reservedTicketWithoutTicketType } = reservedTicket;
+                // discontinue ticketType(2026-05-09~)
+                const savingReservedTicket = reservedTicketWithoutTicketType;
+                // // 予約ドキュメントのticketTypeを最小化(2026-04-03~)
+                // const savingReservedTicket: ISavingReservedTicket = {
+                //     ...reservedTicketWithoutTicketType,
+                //     ticketType: {
+                //         ...((typeof ticketType.id === 'string') && { id: ticketType.id })
+                //     }
+                // };
                 // reservationFor最小化(2026-04-06~)
                 const { minimizedReservationFor } = (0, minimizeReservationFor_1.minimizeReservationFor)(params.reservationFor);
                 const setOnInsert = {
@@ -132,7 +136,7 @@ class ReservationRepo {
                     bookingTime: params.bookingTime,
                     checkedIn: false,
                     attended: false,
-                    issuedThrough: params.issuedThrough,
+                    // issuedThrough: params.issuedThrough, // discontinue issuedThrough
                     project: { id: params.project.id, typeOf: factory_1.factory.organizationType.Project },
                     reservationFor: minimizedReservationFor,
                     reservationNumber: params.reservationNumber,

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

@@ -59,23 +59,9 @@ export declare class RoleRepo {
     } & {
         __v: number;
     }) | null>;
-    addMember(params: Pick<IRole, 'member' | 'memberOf' | 'roleName'>): Promise<(import("mongoose").FlattenMaps<{
-        typeOf: import("@chevre/factory/lib/chevre/role").RoleType;
-        memberOf: {
-            typeOf: factory.organizationType.Corporation | factory.organizationType.Project;
-        };
-        member: {
-            typeOf: import("@chevre/factory/lib/chevre/role/organizationRole").IMemberType;
-        };
-        roleName: import("@chevre/factory/lib/chevre/role/organizationRole").RoleName;
-        permissions: string[];
-    }> & {
-        _id: import("mongoose").Types.ObjectId;
-    } & {
-        __v: number;
-    }) | null>;
     create(params: Pick<IRole, 'member' | 'memberOf' | 'permissions' | 'roleName'>): Promise<{
         id: string;
     }>;
+    deleteByRoleName(params: Pick<IRole, 'roleName'>): Promise<import("mongodb").DeleteResult>;
 }
 export {};

package/lib/chevre/repo/role.js

@@ -139,20 +139,6 @@ class RoleRepo {
             .lean()
             .exec();
     }
-    async addMember(params) {
-        const { roleName, member, memberOf } = params;
-        return this.roleModel.findOneAndUpdate({
-            roleName: { $eq: roleName },
-            'member.typeOf': { $ne: member.typeOf }
-        }, {
-            $set: { member, memberOf }
-        }, {
-            new: true,
-            projection: { _id: 1 }
-        })
-            .lean()
-            .exec();
-    }
     async create(params) {
         const { member, memberOf, permissions, roleName } = params;
         const creatingRole = {
@@ -167,5 +153,12 @@ class RoleRepo {
         const savedId = insertedId;
         return { id: savedId };
     }
+    async deleteByRoleName(params) {
+        const { roleName } = params;
+        return this.roleModel.deleteOne({
+            roleName: { $eq: roleName }
+        })
+            .exec();
+    }
 }
 exports.RoleRepo = RoleRepo;

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

@@ -136,11 +136,11 @@ export declare class TransactionRepo {
         result?: import("@chevre/factory/lib/chevre/transaction/placeOrder").IResult | undefined;
         startDate: Date;
         endDate?: Date | undefined;
-        agent: import("@chevre/factory/lib/chevre/transaction/placeOrder").IAgent;
         instrument?: import("@chevre/factory/lib/chevre/transaction/placeOrder").IInstrument | undefined;
-        potentialActions?: import("@chevre/factory/lib/chevre/transaction/placeOrder").IPotentialActions | undefined;
+        agent: import("@chevre/factory/lib/chevre/transaction/placeOrder").IAgent;
         status: factory.transactionStatusType;
         tasksExportAction?: import("@chevre/factory/lib/chevre/transaction").ITasksExportAction | undefined;
+        potentialActions?: import("@chevre/factory/lib/chevre/transaction/placeOrder").IPotentialActions | undefined;
     } & {
         _id: import("mongoose").Types.ObjectId;
     } & {
@@ -156,10 +156,10 @@ export declare class TransactionRepo {
         startDate: Date;
         endDate?: Date | undefined;
         agent: import("@chevre/factory/lib/chevre/transaction").IAgent;
-        potentialActions?: import("@chevre/factory/lib/chevre/transaction/returnOrder").IPotentialActions | undefined;
         recipient?: undefined;
         status: factory.transactionStatusType;
         tasksExportAction?: import("@chevre/factory/lib/chevre/transaction").ITasksExportAction | undefined;
+        potentialActions?: import("@chevre/factory/lib/chevre/transaction/returnOrder").IPotentialActions | undefined;
     } & {
         _id: import("mongoose").Types.ObjectId;
     } & {
@@ -174,11 +174,11 @@ export declare class TransactionRepo {
         result?: import("@chevre/factory/lib/chevre/transaction/placeOrder").IResult | undefined;
         startDate: Date;
         endDate?: Date | undefined;
-        agent: import("@chevre/factory/lib/chevre/transaction/placeOrder").IAgent;
         instrument?: import("@chevre/factory/lib/chevre/transaction/placeOrder").IInstrument | undefined;
-        potentialActions?: import("@chevre/factory/lib/chevre/transaction/placeOrder").IPotentialActions | undefined;
+        agent: import("@chevre/factory/lib/chevre/transaction/placeOrder").IAgent;
         status: factory.transactionStatusType;
         tasksExportAction?: import("@chevre/factory/lib/chevre/transaction").ITasksExportAction | undefined;
+        potentialActions?: import("@chevre/factory/lib/chevre/transaction/placeOrder").IPotentialActions | undefined;
     } & {
         _id: import("mongoose").Types.ObjectId;
     } & {
@@ -194,10 +194,10 @@ export declare class TransactionRepo {
         startDate: Date;
         endDate?: Date | undefined;
         agent: import("@chevre/factory/lib/chevre/transaction").IAgent;
-        potentialActions?: import("@chevre/factory/lib/chevre/transaction/returnOrder").IPotentialActions | undefined;
         recipient?: undefined;
         status: factory.transactionStatusType;
         tasksExportAction?: import("@chevre/factory/lib/chevre/transaction").ITasksExportAction | undefined;
+        potentialActions?: import("@chevre/factory/lib/chevre/transaction/returnOrder").IPotentialActions | undefined;
     } & {
         _id: import("mongoose").Types.ObjectId;
     } & {

package/lib/chevre/service/aggregation/event/aggregateOffers.js

@@ -125,48 +125,44 @@ function aggregateOfferByEvent(params) {
 function aggregateReservationByOffer(params) {
     return async (repos) => {
         let reservationCount4offer;
-        // let attendeeCount4offer: number | undefined;
-        // let checkInCount4offer: number | undefined;
         const reservationType = factory_1.factory.reservationType.EventReservation;
         const offerIdsWithSameCategory = params.availableOffers.filter(({ category }) => {
             return typeof category?.codeValue === 'string' && category.codeValue === params.offer.category?.codeValue;
         })
             .map(({ id }) => id);
         if (offerIdsWithSameCategory.length > 0) {
-            reservationCount4offer = await repos.reservation.count({
-                typeOf: reservationType,
-                reservationFor: { id: { $eq: params.event.id } },
-                reservationStatuses: [factory_1.factory.reservationStatusType.ReservationConfirmed],
-                // オファーカテゴリーごとに集計する(2024-11-10~)
-                // reservedTicket: { ticketType: { ids: [<string>params.offer.id] } }
-                reservedTicket: { ticketType: { ids: offerIdsWithSameCategory } }
-            });
-            // attendeeCount4offer = await repos.reservation.count({
+            // オファーIDによる集計を座席区分(オファーの適用座席区分を参照)による集計に変更(2026-05-05~)
+            // reservationCount4offer = await repos.reservation.count({
             //     typeOf: reservationType,
             //     reservationFor: { id: { $eq: params.event.id } },
             //     reservationStatuses: [factory.reservationStatusType.ReservationConfirmed],
-            //     // オファーカテゴリーごとに集計する(2024-11-10~)
-            //     // reservedTicket: { ticketType: { ids: [<string>params.offer.id] } },
-            //     reservedTicket: { ticketType: { ids: offerIdsWithSameCategory } },
-            //     attended: true
-            // });
-            // checkInCount4offer = await repos.reservation.count({
-            //     typeOf: reservationType,
-            //     reservationFor: { id: { $eq: params.event.id } },
-            //     reservationStatuses: [factory.reservationStatusType.ReservationConfirmed],
-            //     // オファーカテゴリーごとに集計する(2024-11-10~)
-            //     // reservedTicket: { ticketType: { ids: [<string>params.offer.id] } },
-            //     reservedTicket: { ticketType: { ids: offerIdsWithSameCategory } },
-            //     checkedIn: true
+            //     reservedTicket: { ticketType: { ids: offerIdsWithSameCategory } }
             // });
+            const aggregateSeatingType = params.offer.eligibleSeatingType?.at(0)?.codeValue;
+            if (typeof aggregateSeatingType === 'string') {
+                reservationCount4offer = await repos.reservation.count({
+                    typeOf: reservationType,
+                    reservationFor: { id: { $eq: params.event.id } },
+                    reservationStatuses: [factory_1.factory.reservationStatusType.ReservationConfirmed],
+                    reservedTicket: {
+                        ticketedSeat: {
+                            seatingType: { $in: [aggregateSeatingType] }
+                        }
+                    }
+                });
+                // console.log(
+                //     'aggregateReservationByOffer: reservationCount4offer:', reservationCount4offer,
+                //     'aggregateSeatingType:', aggregateSeatingType,
+                //     'offer.id:', params.offer.id,
+                //     'offer.category:', params.offer.category?.codeValue
+                // );
+            }
         }
         const { maximumAttendeeCapacity, remainingAttendeeCapacity } = await calculateCapacityByOffer(params)(repos);
         return {
             aggregateReservation: {
                 typeOf: 'AggregateReservation',
                 reservationCount: reservationCount4offer
-                // attendeeCount: attendeeCount4offer, // discontinue(2024-11-10~)
-                // checkInCount: checkInCount4offer // discontinue(2024-11-10~)
             },
             ...(typeof maximumAttendeeCapacity === 'number') ? { maximumAttendeeCapacity } : undefined,
             ...(typeof remainingAttendeeCapacity === 'number') ? { remainingAttendeeCapacity } : undefined

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

@@ -69,10 +69,11 @@ function createPotentialActions(params) {
     const reservationForByReserveTransaction = transaction.object.transaction?.object.reservationFor;
     if (reservationForByReserveTransaction !== undefined && typeof reservationNumber === 'string') {
         const cancelObject = {
-            reservationFor: {
-                typeOf: reservationForByReserveTransaction.typeOf,
-                id: String(reservationForByReserveTransaction.id)
-            },
+            // discontinue reservationFor(2026-05-09~)
+            // reservationFor: {
+            //     typeOf: reservationForByReserveTransaction.typeOf,
+            //     id: String(reservationForByReserveTransaction.id)
+            // },
             reservationNumber,
             // ReservationConfirmed->ReservationCancelledのみ処理されるように保証する
             reservationStatus: factory_1.factory.reservationStatusType.ReservationConfirmed,
@@ -100,13 +101,15 @@ function createPotentialActions(params) {
                     cancelObject = {
                         typeOf: reservation.typeOf,
                         id: reservation.id,
-                        issuedThrough: {
-                            typeOf: reservation.issuedThrough?.typeOf
-                        },
-                        reservationFor: {
-                            typeOf: reservation.reservationFor.typeOf,
-                            id: String(reservation.reservationFor.id)
-                        },
+                        // discontinue issuedThrough(2026-05-08~)
+                        // issuedThrough: {
+                        //     typeOf: reservation.issuedThrough?.typeOf
+                        // },
+                        // discontinue reservationFor(2026-05-09~)
+                        // reservationFor: {
+                        //     typeOf: reservation.reservationFor.typeOf,
+                        //     id: String(reservation.reservationFor.id)
+                        // },
                         reservationNumber: reservation.reservationNumber,
                         // ReservationConfirmed->ReservationCancelledのみ処理されるように保証する
                         reservationStatus: factory_1.factory.reservationStatusType.ReservationConfirmed

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

@@ -18,7 +18,7 @@ export declare function validateStartParams(params: IStartParams): (repos: {
     assetTransaction: AssetTransactionRepo;
 }) => Promise<{
     reserveTransaction: import("@chevre/factory/lib/chevre/assetTransaction/reserve").ITransaction | undefined;
-    reservations: (Pick<import("@chevre/factory/lib/chevre/reservation/event").IReservation, "id" | "typeOf" | "issuedThrough" | "reservationNumber"> & {
+    reservations: (Pick<import("@chevre/factory/lib/chevre/reservation/event").IReservation, "id" | "typeOf" | "reservationNumber"> & {
         reservationFor: Pick<factory.reservation.eventReservation.IReservationForMinimized, "id" | "typeOf">;
     })[] | undefined;
 }>;

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

@@ -43,7 +43,7 @@ function validateStartParams(params) {
                 const reservation = await repos.reservation.findReservationById({
                     id: params.object.reservation.id,
                     inclusion: [
-                        'issuedThrough', 'typeOf', 'reservationNumber', 'reservationFor.id', 'reservationFor.typeOf', 'provider', 'reservationStatus'
+                        'typeOf', 'reservationNumber', 'reservationFor.id', 'reservationFor.typeOf', 'provider', 'reservationStatus'
                     ]
                 });
                 // 販売者検証(2023-08-01~)

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

@@ -328,27 +328,17 @@ function createReservation(params) {
     const price4reservation = (0, price_1.createPrice)(params);
     if (params.reservationFor.typeOf === factory_1.factory.eventType.ScreeningEvent) {
         return {
-            // project: params.project, // 廃止(2024-04-08~)
             typeOf: factory_1.factory.reservationType.EventReservation,
             id: params.id,
             // reservationPackage保管に移行(2023-06-06~)
             // issuedThrough,
             additionalProperty: params.additionalProperty,
-            // bookingTime: params.reserveDate, // 廃止(2024-04-08~)
-            // modifiedTime: params.reserveDate, // 廃止(2024-04-08~)
             numSeats: 1,
             price: price4reservation,
             priceCurrency: factory_1.factory.priceCurrency.JPY,
-            // reservationNumber: params.reservationNumber, // 廃止(2024-04-08~)
             // statusは不要なので削除(2023-07-19~)
             // reservationStatus: factory.reservationStatusType.ReservationPending,
             reservedTicket: params.reservedTicket,
-            // underName: { // 廃止(2024-04-08~)
-            //     typeOf: params.agent.typeOf,
-            //     name: params.agent.name
-            // },
-            // checkedIn: false, // 廃止(2024-04-08~)
-            // attended: false, // 廃止(2024-04-08~)
             ...(typeof params.additionalTicketText === 'string') ? { additionalTicketText: params.additionalTicketText } : undefined,
             ...(Array.isArray(params.subReservation))
                 ? {
@@ -362,8 +352,6 @@ function createReservation(params) {
                     })
                 }
                 : undefined,
-            // reservationPackage保管に移行(2023-06-06~)
-            // ...(typeof params.broker?.typeOf === 'string') ? { broker: params.broker } : undefined,
             ...(typeof params.programMembershipUsed?.identifier === 'string')
                 ? { programMembershipUsed: params.programMembershipUsed }
                 : undefined

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

@@ -14,4 +14,4 @@ export declare function createPrice(params: {
     seatPriceComponent: factory.place.seat.IPriceComponent[];
     acceptedAddOns: IAcceptedAddOn[];
     appliesToMovieTicket?: factory.assetTransaction.reserve.IAcceptedAppliesToMovieTicket;
-}): factory.reservation.eventReservation.IPrice;
+}): factory.assetTransaction.reserve.IPrice;

package/lib/chevre/service/offer/any.d.ts

@@ -10,7 +10,9 @@ export declare function acceptOffer(params: {
     project: {
         id: string;
     };
-    acceptedOffers: factory.order.IAcceptedOffer[];
+    acceptedOffers: (factory.order.IAcceptedOffer & {
+        offeredThrough: factory.offer.IOfferedThrough;
+    })[];
 }): IAcceptOfferOperation<void>;
 export declare function voidAcceptedOffer(params: {
     /**

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

@@ -23,7 +23,7 @@ declare function createAuthorizeSeatReservationActionAttributes(params: {
     transaction: Pick<factory.transaction.ITransaction<factory.transactionType.PlaceOrder>, 'agent' | 'id' | 'project' | 'seller' | 'typeOf'>;
 }): factory.action.authorize.offer.eventService.IAttributes;
 declare function acceptedOffers2amount(params: {
-    acceptedOffers: IResultAcceptedOffer[];
+    acceptedOffers: Pick<IResultAcceptedOffer, 'priceSpecification' | 'id'>[];
 }): number;
 declare function acceptedOffers2authorizeResult(params: {
     acceptedOffers: factory.assetTransaction.reserve.IAcceptedTicketOfferWithoutDetail[];
@@ -34,6 +34,7 @@ declare function acceptedOffers2authorizeResult(params: {
 type IObjectSubReservation = factory.assetTransaction.reserve.IObjectSubReservation;
 export type IResultAcceptedOffer = factory.order.IAcceptedOffer & {
     itemOffered: factory.order.IReservation;
+    offeredThrough: factory.offer.IOfferedThrough;
 };
 declare function responseBody2acceptedOffers4result(params: {
     issuedThrough: factory.assetTransaction.reserve.IIssuedThrough;

package/lib/chevre/service/offer/event/authorize/factory.js

@@ -302,7 +302,6 @@ function responseBody2acceptedOffers4result(params) {
  * 注文データの予約を生成する
  */
 function createReservation(params) {
-    // const { itemOffered, event, reservationFor } = params;
     const { itemOffered } = params;
     const event = params.reservationFor;
     let reservationItem;
@@ -367,19 +366,17 @@ function createReservation(params) {
         if (params.issuedThrough.typeOf !== factory_1.factory.product.ProductType.EventService) {
             throw new factory_1.factory.errors.Argument('issuedThrough', `issuedThrough.typeOf must be ${factory_1.factory.product.ProductType.EventService}`);
         }
+        const { additionalProperty, additionalTicketText, programMembershipUsed } = itemOffered;
         reservationItem = {
             typeOf: itemOffered.typeOf,
-            additionalProperty: itemOffered.additionalProperty,
-            additionalTicketText: itemOffered.additionalTicketText,
             id: itemOffered.id,
             issuedThrough: params.issuedThrough,
             reservationNumber: params.reservationNumber,
             reservationFor,
             reservedTicket,
-            // 使用メンバーシップがあれば追加
-            ...(typeof itemOffered.programMembershipUsed?.typeOf === 'string')
-                ? { programMembershipUsed: itemOffered.programMembershipUsed }
-                : undefined
+            ...((Array.isArray(additionalProperty)) && { additionalProperty }),
+            ...((typeof additionalTicketText === 'string') && { additionalTicketText }),
+            ...((typeof programMembershipUsed?.typeOf === 'string') && { programMembershipUsed }) // 使用メンバーシップがあれば追加
         };
     }
     else {

package/lib/chevre/service/offer/eventServiceByCOA/authorize/factory.d.ts

@@ -23,6 +23,7 @@ export declare function offers2resultPrice(offers: IAcceptedOffer4COA[]): {
 };
 type IResultAcceptedOffer = Omit<factory.order.IAcceptedOffer, 'itemOffered'> & {
     itemOffered: factory.order.ICOAEventReservation;
+    offeredThrough: factory.offer.IOfferedThrough;
 };
 /**
  * COA仮予約結果から注文アイテムを生成する

package/lib/chevre/service/order/createAccountingReportIfNotExist.d.ts

@@ -1,7 +1,5 @@
 import { AccountingReportRepo } from '../../repo/accountingReport';
 import { factory } from '../../factory';
-export declare function createAccountingReportIfNotExist(params: Pick<factory.order.IOrder, 'id' | 'orderNumber' | 'project' | 'customer' | 'confirmationNumber' | 'paymentMethods' | 'orderedItem' | 'price' | 'priceCurrency' | 'seller' | 'broker' | 'typeOf' | 'orderDate'> & {
-    acceptedOffers: factory.order.IAcceptedOffer[];
-}): (repos: {
+export declare function createAccountingReportIfNotExist(params: Pick<factory.order.IOrder, 'id' | 'orderNumber' | 'project' | 'paymentMethods' | 'seller' | 'typeOf' | 'orderDate'> & {}): (repos: {
     accountingReport: AccountingReportRepo;
 }) => Promise<void>;

package/lib/chevre/service/order/createAccountingReportIfNotExist.js

@@ -19,84 +19,79 @@ function createAccountingReportIfNotExist(params) {
 }
 // 最適化(2023-06-30~)
 function createOrder4report(params) {
-    if (!Array.isArray(params.acceptedOffers)) {
-        throw new factory_1.factory.errors.ArgumentNull('order.acceptedOffers');
-    }
-    const numItems = params.acceptedOffers.length;
-    // 必要な属性についてDate型に変換(でないと検索クエリを効率的に使えない)
-    const acceptedOffers = (Array.isArray(params.acceptedOffers))
-        ? params.acceptedOffers.map((o) => {
-            if (o.itemOffered.typeOf === factory_1.factory.reservationType.EventReservation) {
-                let itemOffered = o.itemOffered;
-                const reservationFor = itemOffered.reservationFor;
-                itemOffered = {
-                    ...itemOffered,
-                    reservationFor: {
-                        ...reservationFor,
-                        ...(reservationFor.doorTime !== undefined)
-                            ? {
-                                doorTime: (0, moment_timezone_1.default)(reservationFor.doorTime)
-                                    .toDate()
-                            }
-                            : undefined,
-                        ...(reservationFor.endDate !== undefined)
-                            ? {
-                                endDate: (0, moment_timezone_1.default)(reservationFor.endDate)
-                                    .toDate()
-                            }
-                            : undefined,
-                        ...(reservationFor.startDate !== undefined)
-                            ? {
-                                startDate: (0, moment_timezone_1.default)(reservationFor.startDate)
-                                    .toDate()
-                            }
-                            : undefined
-                    }
-                };
-                return {
-                    ...o,
-                    itemOffered
-                };
-            }
-            else {
-                return o;
-            }
-        })
-        : [];
-    const customer = {
-        // ...createMaskedCustomer(params),
-        id: params.customer.id,
-        typeOf: params.customer.typeOf,
-        additionalProperty: (Array.isArray(params.customer.additionalProperty))
-            ? params.customer.additionalProperty
-            : [],
-        identifier: (Array.isArray(params.customer.identifier))
-            ? params.customer.identifier
-            : []
-    };
+    // if (!Array.isArray(params.acceptedOffers)) {
+    //     throw new factory.errors.ArgumentNull('order.acceptedOffers');
+    // }
+    // const numItems: number = params.acceptedOffers.length;
+    // // 必要な属性についてDate型に変換(でないと検索クエリを効率的に使えない)
+    // const acceptedOffers = (Array.isArray(params.acceptedOffers))
+    //     ? params.acceptedOffers.map((o) => {
+    //         if (o.itemOffered.typeOf === factory.reservationType.EventReservation) {
+    //             let itemOffered = o.itemOffered;
+    //             const reservationFor = itemOffered.reservationFor;
+    //             itemOffered = {
+    //                 ...itemOffered,
+    //                 reservationFor: {
+    //                     ...reservationFor,
+    //                     ...(reservationFor.doorTime !== undefined)
+    //                         ? {
+    //                             doorTime: moment(reservationFor.doorTime)
+    //                                 .toDate()
+    //                         }
+    //                         : undefined,
+    //                     ...(reservationFor.endDate !== undefined)
+    //                         ? {
+    //                             endDate: moment(reservationFor.endDate)
+    //                                 .toDate()
+    //                         }
+    //                         : undefined,
+    //                     ...(reservationFor.startDate !== undefined)
+    //                         ? {
+    //                             startDate: moment(reservationFor.startDate)
+    //                                 .toDate()
+    //                         }
+    //                         : undefined
+    //                 }
+    //             } as factory.order.IReservation;
+    //             return {
+    //                 ...o,
+    //                 itemOffered
+    //             };
+    //         } else {
+    //             return o;
+    //         }
+    //     })
+    //     : [];
+    // const customer: factory.report.accountingReport.IOptimizedCustomer = {
+    //     id: params.customer.id,
+    //     typeOf: params.customer.typeOf,
+    //     additionalProperty: (Array.isArray(params.customer.additionalProperty))
+    //         ? params.customer.additionalProperty
+    //         : [],
+    //     identifier: (Array.isArray(params.customer.identifier))
+    //         ? params.customer.identifier
+    //         : []
+    // };
     return {
-        // ...params,
-        confirmationNumber: params.confirmationNumber,
         id: params.id,
         orderNumber: params.orderNumber,
-        orderedItem: params.orderedItem,
-        paymentMethods: params.paymentMethods,
-        price: params.price,
-        priceCurrency: params.priceCurrency,
-        seller: params.seller,
+        paymentMethods: params.paymentMethods.map(({ paymentMethodId }) => ({ paymentMethodId })),
+        seller: {
+            id: params.seller.id,
+            name: params.seller.name,
+            typeOf: params.seller.typeOf
+        },
         typeOf: params.typeOf,
-        customer,
         orderDate: (0, moment_timezone_1.default)(params.orderDate)
             .toDate(),
-        acceptedOffers,
-        numItems,
-        ...(typeof params.broker?.typeOf === 'string') ? { broker: params.broker } : undefined
-        // ...(params.dateReturned !== null && params.dateReturned !== undefined)
-        //     ? {
-        //         dateReturned: moment(params.dateReturned)
-        //             .toDate()
-        //     }
-        //     : undefined
+        // confirmationNumber: params.confirmationNumber, // discontinue(2026-05-06~)
+        // price: params.price, // discontinue(2026-05-06~)
+        // priceCurrency: params.priceCurrency, // discontinue(2026-05-06~)
+        // customer, // discontinue(2026-05-06~)
+        // numItems, // discontinue(2026-05-06~)
+        // orderedItem: params.orderedItem, // discontinue(2026-05-06~)
+        // acceptedOffers, // discontinue(2026-05-06~)
+        // ...(typeof params.broker?.typeOf === 'string') ? { broker: params.broker } : undefined // discontinue(2026-05-06~)
     };
 }
 function createAccountingReport(params) {