@chevre/domain 24.1.0-alpha.3 → 24.1.0-alpha.30

package/lib/chevre/repo/assetTransaction/reserve.js

@@ -12,54 +12,6 @@ class ReserveTransactionRepo {
     constructor(connection) {
         this.transactionModel = connection.model(assetTransaction_1.modelName, (0, assetTransaction_1.createSchema)());
     }
-    // /**
-    //  * 予約取引から予約を検索する
-    //  */
-    // public async findSubReservationsByReservationNumber(
-    //     params: {
-    //         reservationNumber: string;
-    //     }
-    // ): Promise<ISubReservationAsFindResult[]> {
-    //     const aggregate = this.transactionModel.aggregate<ISubReservationAsFindResult>([
-    //         {
-    //             $match: {
-    //                 typeOf: { $eq: factory.assetTransactionType.Reserve },
-    //                 transactionNumber: { $eq: params.reservationNumber }
-    //             }
-    //         },
-    //         {
-    //             $unwind: {
-    //                 path: '$object.subReservation'
-    //                 // includeArrayIndex: 'elementIndex'
-    //             }
-    //         },
-    //         // {
-    //         //     $match: {
-    //         //         typeOf: { $eq: factory.assetTransactionType.Reserve },
-    //         //         transactionNumber: { $eq: params.reservationNumber }
-    //         //     }
-    //         // },
-    //         {
-    //             $project: {
-    //                 _id: 0,
-    //                 id: '$object.subReservation.id',
-    //                 price: '$object.subReservation.price',
-    //                 underName: '$object.underName',
-    //                 reservedTicket: {
-    //                     ticketType: '$object.subReservation.reservedTicket.ticketType',
-    //                 }
-    //             }
-    //         }
-    //     ]);
-    //     // if (typeof filter.limit === 'number' && filter.limit > 0) {
-    //     //     const page: number = (typeof filter.page === 'number' && filter.page > 0) ? filter.page : 1;
-    //     //     aggregate.limit(filter.limit * page)
-    //     //         .skip(filter.limit * (page - 1));
-    //     // }
-    //     return aggregate
-    //         .option({ maxTimeMS: MONGO_MAX_TIME_MS })
-    //         .exec();
-    // }
     /**
      * 予約取引から予約を検索する
      * limitはしない
@@ -91,12 +43,14 @@ class ReserveTransactionRepo {
                 $project: {
                     _id: 0,
                     id: '$object.subReservation.id',
-                    price: '$object.subReservation.price',
                     underName: '$object.underName',
                     reservationFor: '$object.reservationFor',
                     reservedTicket: {
                         ticketType: '$object.subReservation.reservedTicket.ticketType',
-                    }
+                    },
+                    // numSeats: '$object.subReservation.numSeats',
+                    // price: '$object.subReservation.price',
+                    // issuedThrough: '$object.issuedThrough',
                 }
             }
         ]);

package/lib/chevre/repo/event.js

@@ -798,22 +798,26 @@ class EventRepo {
             .sort({ startDate: factory_1.factory.sortType.Descending })
             .cursor();
     }
-    // public async addAvailableAtOrFrom(params: {
+    // /**
+    //  * アプリケーションオファー廃止用のメソッド
+    //  */
+    // public async removeAvailableAtOrFrom(params: {
     //     id: string;
     //     offers: {
     //         seller: {
-    //             makesOffer: factory.event.screeningEvent.ISellerMakesOffer;
+    //             makesOffer: Pick<factory.event.screeningEvent.ISellerMakesOffer, 'availableAtOrFrom'>;
     //         };
     //     };
-    // }): Promise<void> {
-    //     await this.eventModel.updateOne(
+    // }) {
+    //     return this.eventModel.updateOne(
     //         { _id: { $eq: params.id } },
     //         {
-    //             $push: {
-    //                 'offers.seller.makesOffer': params.offers.seller.makesOffer
+    //             $pull: {
+    //                 'offers.seller.makesOffer': {
+    //                     'availableAtOrFrom.id': { $eq: params.offers.seller.makesOffer.availableAtOrFrom.id }
+    //                 }
     //             }
-    //         },
-    //         { includeResultMetadata: true }
+    //         }
     //     )
     //         .exec();
     // }

package/lib/chevre/repo/factory/acceptedOffer/reserveTransaction2itemOffered.d.ts

@@ -0,0 +1,7 @@
+import { factory } from '../../../factory';
+type IAcceptedOfferByReserveTransaction = Pick<factory.order.IOptimizedAcceptedOffer, 'itemOffered' | 'priceSpecification'>;
+/**
+ * 予約取引を注文のitemOfferedへ変換する
+ */
+declare function reserveTransaction2itemOffered(params: Pick<factory.assetTransaction.reserve.ITransaction, 'object'>): IAcceptedOfferByReserveTransaction[];
+export { IAcceptedOfferByReserveTransaction, reserveTransaction2itemOffered };

package/lib/chevre/repo/factory/acceptedOffer/reserveTransaction2itemOffered.js

@@ -0,0 +1,74 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.reserveTransaction2itemOffered = reserveTransaction2itemOffered;
+function createReservationFor(reservationFor) {
+    const { superEvent, ...reservationForWithoutSuperEvent } = reservationFor;
+    const { workPerformed, ...superEventWithoutMovie } = superEvent;
+    const workPerformedInOrder = {
+        typeOf: workPerformed.typeOf,
+        id: workPerformed.id,
+        identifier: workPerformed.identifier,
+        name: workPerformed.name,
+        ...((typeof workPerformed.duration === 'string') && { duration: workPerformed.duration })
+    };
+    const superEventInOrder = {
+        ...superEventWithoutMovie,
+        workPerformed: workPerformedInOrder
+    };
+    return {
+        ...reservationForWithoutSuperEvent,
+        superEvent: superEventInOrder
+    };
+}
+function createReservedTicket(reservedTicket) {
+    const { issuedBy: _issuedBy, dateIssued: _dateIssued, dateUsed: _dateUsed, ticketToken: _ticketToken, ticketType, ticketNumber: _ticketNumber, ...reservedTicket4order } = reservedTicket;
+    const ticketTypeInOrder = {
+        typeOf: ticketType.typeOf,
+        id: ticketType.id,
+        identifier: ticketType.identifier,
+        name: ticketType.name,
+        ...((ticketType.description !== undefined) && { description: ticketType.description }),
+        ...((ticketType.additionalProperty !== undefined) && { additionalProperty: ticketType.additionalProperty }),
+    };
+    return {
+        ...reservedTicket4order,
+        ticketType: ticketTypeInOrder
+    };
+}
+/**
+ * 予約取引を注文のitemOfferedへ変換する
+ */
+function reserveTransaction2itemOffered(params) {
+    const { object } = params;
+    // subReservationは配列のはず
+    if (!Array.isArray(object.subReservation)) {
+        return [];
+    }
+    // reservationForは存在するはず
+    if (object.reservationFor === undefined) {
+        return [];
+    }
+    const { reservationNumber, issuedThrough } = object;
+    // イベントを注文用に生成
+    const reservationFor = createReservationFor(object.reservationFor);
+    return object.subReservation.map((subReservationReserveTransaction) => {
+        const { additionalProperty, additionalTicketText, id, programMembershipUsed, typeOf, price } = subReservationReserveTransaction;
+        // チケットを注文用に生成
+        const reservedTicket = createReservedTicket(subReservationReserveTransaction.reservedTicket);
+        const reservationByReserveTransaction = {
+            additionalProperty,
+            id,
+            typeOf,
+            reservedTicket,
+            reservationNumber,
+            issuedThrough,
+            reservationFor,
+            ...((typeof additionalTicketText === 'string') && { additionalTicketText }),
+            ...((typeof programMembershipUsed?.identifier === 'string') && { programMembershipUsed }),
+        };
+        return {
+            itemOffered: reservationByReserveTransaction,
+            ...((price !== undefined) && { priceSpecification: price })
+        };
+    });
+}

package/lib/chevre/repo/factory/reservation/createMongoConditions.js

@@ -390,47 +390,21 @@ function CREATE_MONGO_CONDITIONS(params) {
     }
     /* istanbul ignore else */
     if (params.reservedTicket !== undefined) {
-        /* istanbul ignore else */
-        if (params.reservedTicket.ticketType !== undefined) {
-            /* istanbul ignore else */
-            if (Array.isArray(params.reservedTicket.ticketType.ids)) {
-                andConditions.push({
-                    'reservedTicket.ticketType.id': {
-                        $exists: true,
-                        $in: params.reservedTicket.ticketType.ids
-                    }
-                });
-            }
-            // 単価オファーカテゴリーでの検索は廃止(2026-04-02~)
-            // /* istanbul ignore else */
-            // if (params.reservedTicket.ticketType.category !== undefined) {
-            //     /* istanbul ignore else */
-            //     if (Array.isArray(params.reservedTicket.ticketType.category.ids)) {
-            //         andConditions.push(
-            //             {
-            //                 'reservedTicket.ticketType.category.id': {
-            //                     $exists: true,
-            //                     $in: params.reservedTicket.ticketType.category.ids
-            //                 }
-            //             }
-            //         );
-            //     }
-            //     /* istanbul ignore else */
-            //     if (params.reservedTicket.ticketType.category.codeValue !== undefined
-            //         && params.reservedTicket.ticketType.category !== null) {
-            //         if (Array.isArray(params.reservedTicket.ticketType.category.codeValue.$in)) {
-            //             andConditions.push(
-            //                 {
-            //                     'reservedTicket.ticketType.category.codeValue': {
-            //                         $exists: true,
-            //                         $in: params.reservedTicket.ticketType.category.codeValue.$in
-            //                     }
-            //                 }
-            //             );
-            //         }
-            //     }
-            // }
-        }
+        // discontinue ticketType(2026-05-06~)
+        // /* istanbul ignore else */
+        // if (params.reservedTicket.ticketType !== undefined) {
+        //     /* istanbul ignore else */
+        //     if (Array.isArray(params.reservedTicket.ticketType.ids)) {
+        //         andConditions.push(
+        //             {
+        //                 'reservedTicket.ticketType.id': {
+        //                     $exists: true,
+        //                     $in: params.reservedTicket.ticketType.ids
+        //                 }
+        //             }
+        //         );
+        //     }
+        // }
         /* istanbul ignore else */
         if (params.reservedTicket.ticketedSeat !== undefined) {
             /* istanbul ignore else */
@@ -481,41 +455,41 @@ function CREATE_MONGO_CONDITIONS(params) {
             }
         });
     }
-    const brokerIdentifierAll = params.broker?.identifier?.$all;
-    if (Array.isArray(brokerIdentifierAll)) {
-        andConditions.push({
-            'broker.identifier': {
-                $exists: true,
-                $all: brokerIdentifierAll
-            }
-        });
-    }
-    const brokerIdentifierIn = params.broker?.identifier?.$in;
-    if (Array.isArray(brokerIdentifierIn)) {
-        andConditions.push({
-            'broker.identifier': {
-                $exists: true,
-                $in: brokerIdentifierIn
-            }
-        });
-    }
-    const brokerIdentifierNin = params.broker?.identifier?.$nin;
-    if (Array.isArray(brokerIdentifierNin)) {
-        andConditions.push({
-            'broker.identifier': {
-                $nin: brokerIdentifierNin
-            }
-        });
-    }
-    const brokerIdentifierElemMatch = params.broker?.identifier?.$elemMatch;
-    if (brokerIdentifierElemMatch !== undefined && brokerIdentifierElemMatch !== null) {
-        andConditions.push({
-            'broker.identifier': {
-                $exists: true,
-                $elemMatch: brokerIdentifierElemMatch
-            }
-        });
-    }
+    // const brokerIdentifierAll = params.broker?.identifier?.$all;
+    // if (Array.isArray(brokerIdentifierAll)) {
+    //     andConditions.push({
+    //         'broker.identifier': {
+    //             $exists: true,
+    //             $all: brokerIdentifierAll
+    //         }
+    //     });
+    // }
+    // const brokerIdentifierIn = params.broker?.identifier?.$in;
+    // if (Array.isArray(brokerIdentifierIn)) {
+    //     andConditions.push({
+    //         'broker.identifier': {
+    //             $exists: true,
+    //             $in: brokerIdentifierIn
+    //         }
+    //     });
+    // }
+    // const brokerIdentifierNin = params.broker?.identifier?.$nin;
+    // if (Array.isArray(brokerIdentifierNin)) {
+    //     andConditions.push({
+    //         'broker.identifier': {
+    //             $nin: brokerIdentifierNin
+    //         }
+    //     });
+    // }
+    // const brokerIdentifierElemMatch = params.broker?.identifier?.$elemMatch;
+    // if (brokerIdentifierElemMatch !== undefined && brokerIdentifierElemMatch !== null) {
+    //     andConditions.push({
+    //         'broker.identifier': {
+    //             $exists: true,
+    //             $elemMatch: brokerIdentifierElemMatch
+    //         }
+    //     });
+    // }
     /* istanbul ignore else */
     if (params.underName !== undefined) {
         /* istanbul ignore else */
@@ -632,49 +606,49 @@ function CREATE_MONGO_CONDITIONS(params) {
                 });
             }
         }
-        /* istanbul ignore else */
-        if (params.underName.identifier !== undefined) {
-            if (Array.isArray(params.underName.identifier.$all)) {
-                andConditions.push({
-                    'underName.identifier': {
-                        $exists: true,
-                        $all: params.underName.identifier.$all
-                    }
-                });
-            }
-            if (Array.isArray(params.underName.identifier.$in)) {
-                andConditions.push({
-                    'underName.identifier': {
-                        $exists: true,
-                        $in: params.underName.identifier.$in
-                    }
-                });
-            }
-            if (Array.isArray(params.underName.identifier.$nin)) {
-                andConditions.push({
-                    'underName.identifier': {
-                        $nin: params.underName.identifier.$nin
-                    }
-                });
-            }
-            if (params.underName.identifier.$elemMatch !== undefined) {
-                andConditions.push({
-                    'underName.identifier': {
-                        $exists: true,
-                        $elemMatch: params.underName.identifier.$elemMatch
-                    }
-                });
-            }
-        }
-        /* istanbul ignore else */
-        if (Array.isArray(params.underName.identifiers)) {
-            andConditions.push({
-                'underName.identifier': {
-                    $exists: true,
-                    $in: params.underName.identifiers
-                }
-            });
-        }
+        // /* istanbul ignore else */
+        // if (params.underName.identifier !== undefined) {
+        //     if (Array.isArray(params.underName.identifier.$all)) {
+        //         andConditions.push({
+        //             'underName.identifier': {
+        //                 $exists: true,
+        //                 $all: params.underName.identifier.$all
+        //             }
+        //         });
+        //     }
+        //     if (Array.isArray(params.underName.identifier.$in)) {
+        //         andConditions.push({
+        //             'underName.identifier': {
+        //                 $exists: true,
+        //                 $in: params.underName.identifier.$in
+        //             }
+        //         });
+        //     }
+        //     if (Array.isArray(params.underName.identifier.$nin)) {
+        //         andConditions.push({
+        //             'underName.identifier': {
+        //                 $nin: params.underName.identifier.$nin
+        //             }
+        //         });
+        //     }
+        //     if (params.underName.identifier.$elemMatch !== undefined) {
+        //         andConditions.push({
+        //             'underName.identifier': {
+        //                 $exists: true,
+        //                 $elemMatch: params.underName.identifier.$elemMatch
+        //             }
+        //         });
+        //     }
+        // }
+        // /* istanbul ignore else */
+        // if (Array.isArray(params.underName.identifiers)) {
+        //     andConditions.push({
+        //         'underName.identifier': {
+        //             $exists: true,
+        //             $in: params.underName.identifiers
+        //         }
+        //     });
+        // }
     }
     /* istanbul ignore else */
     if (typeof params.attended === 'boolean') {
@@ -688,66 +662,67 @@ function CREATE_MONGO_CONDITIONS(params) {
             checkedIn: params.checkedIn
         });
     }
-    /* istanbul ignore else */
-    if (params.additionalProperty !== undefined) {
-        if (Array.isArray(params.additionalProperty.$all)) {
-            andConditions.push({
-                additionalProperty: {
-                    $exists: true,
-                    $all: params.additionalProperty.$all
-                }
-            });
-        }
-        if (Array.isArray(params.additionalProperty.$in)) {
-            andConditions.push({
-                additionalProperty: {
-                    $exists: true,
-                    $in: params.additionalProperty.$in
-                }
-            });
-        }
-        if (Array.isArray(params.additionalProperty.$nin)) {
-            andConditions.push({
-                additionalProperty: {
-                    $nin: params.additionalProperty.$nin
-                }
-            });
-        }
-        if (params.additionalProperty.$elemMatch !== undefined) {
-            andConditions.push({
-                additionalProperty: {
-                    $exists: true,
-                    $elemMatch: params.additionalProperty.$elemMatch
-                }
-            });
-        }
-    }
-    const programMembershipUsedIdentifierEq = params.programMembershipUsed?.identifier?.$eq;
-    if (typeof programMembershipUsedIdentifierEq === 'string') {
-        andConditions.push({
-            'programMembershipUsed.identifier': {
-                $exists: true,
-                $eq: programMembershipUsedIdentifierEq
-            }
-        });
-    }
-    const programMembershipUsedIssuedThroughServiceTypeCodeValueEq = params.programMembershipUsed?.issuedThrough?.serviceType?.codeValue?.$eq;
-    if (typeof programMembershipUsedIssuedThroughServiceTypeCodeValueEq === 'string') {
-        andConditions.push({
-            'programMembershipUsed.issuedThrough.serviceType.codeValue': {
-                $exists: true,
-                $eq: programMembershipUsedIssuedThroughServiceTypeCodeValueEq
-            }
-        });
-    }
-    const appliesToMovieTicketIdentifierEq = params.price?.priceComponent?.appliesToMovieTicket?.identifier?.$eq;
-    if (typeof appliesToMovieTicketIdentifierEq === 'string') {
-        andConditions.push({
-            'price.priceComponent.appliesToMovieTicket.identifier': {
-                $exists: true,
-                $eq: appliesToMovieTicketIdentifierEq
-            }
-        });
-    }
+    // /* istanbul ignore else */
+    // if (params.additionalProperty !== undefined) {
+    //     if (Array.isArray(params.additionalProperty.$all)) {
+    //         andConditions.push({
+    //             additionalProperty: {
+    //                 $exists: true,
+    //                 $all: params.additionalProperty.$all
+    //             }
+    //         });
+    //     }
+    //     if (Array.isArray(params.additionalProperty.$in)) {
+    //         andConditions.push({
+    //             additionalProperty: {
+    //                 $exists: true,
+    //                 $in: params.additionalProperty.$in
+    //             }
+    //         });
+    //     }
+    //     if (Array.isArray(params.additionalProperty.$nin)) {
+    //         andConditions.push({
+    //             additionalProperty: {
+    //                 $nin: params.additionalProperty.$nin
+    //             }
+    //         });
+    //     }
+    //     if (params.additionalProperty.$elemMatch !== undefined) {
+    //         andConditions.push({
+    //             additionalProperty: {
+    //                 $exists: true,
+    //                 $elemMatch: params.additionalProperty.$elemMatch
+    //             }
+    //         });
+    //     }
+    // }
+    // const programMembershipUsedIdentifierEq = params.programMembershipUsed?.identifier?.$eq;
+    // if (typeof programMembershipUsedIdentifierEq === 'string') {
+    //     andConditions.push({
+    //         'programMembershipUsed.identifier': {
+    //             $exists: true,
+    //             $eq: programMembershipUsedIdentifierEq
+    //         }
+    //     });
+    // }
+    // const programMembershipUsedIssuedThroughServiceTypeCodeValueEq =
+    //     params.programMembershipUsed?.issuedThrough?.serviceType?.codeValue?.$eq;
+    // if (typeof programMembershipUsedIssuedThroughServiceTypeCodeValueEq === 'string') {
+    //     andConditions.push({
+    //         'programMembershipUsed.issuedThrough.serviceType.codeValue': {
+    //             $exists: true,
+    //             $eq: programMembershipUsedIssuedThroughServiceTypeCodeValueEq
+    //         }
+    //     });
+    // }
+    // const appliesToMovieTicketIdentifierEq = params.price?.priceComponent?.appliesToMovieTicket?.identifier?.$eq;
+    // if (typeof appliesToMovieTicketIdentifierEq === 'string') {
+    //     andConditions.push({
+    //         'price.priceComponent.appliesToMovieTicket.identifier': {
+    //             $exists: true,
+    //             $eq: appliesToMovieTicketIdentifierEq
+    //         }
+    //     });
+    // }
     return andConditions;
 }

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

@@ -66,48 +66,48 @@ const indexes = [
             }
         }
     ],
-    [
-        { 'mainEntity.orderStatus': 1, 'mainEntity.orderDate': -1 },
-        {
-            name: 'searchByOrderStatus'
-        }
-    ],
-    [
-        { 'mainEntity.confirmationNumber': 1, 'mainEntity.orderDate': -1 },
-        {
-            name: 'searchByConfirmationNumber',
-            partialFilterExpression: {
-                'mainEntity.confirmationNumber': { $exists: true }
-            }
-        }
-    ],
-    [
-        { 'mainEntity.customer.id': 1, 'mainEntity.orderDate': -1 },
-        {
-            name: 'searchByCustomerId',
-            partialFilterExpression: {
-                'mainEntity.customer.id': { $exists: true }
-            }
-        }
-    ],
-    [
-        { 'mainEntity.paymentMethods.accountId': 1, 'mainEntity.orderDate': -1 },
-        {
-            name: 'searchByPaymentMethodsAccountId',
-            partialFilterExpression: {
-                'mainEntity.paymentMethods.accountId': { $exists: true }
-            }
-        }
-    ],
-    [
-        { 'mainEntity.paymentMethods.typeOf': 1, 'mainEntity.orderDate': -1 },
-        {
-            name: 'searchByPaymentMethodTypeOf',
-            partialFilterExpression: {
-                'mainEntity.paymentMethods.typeOf': { $exists: true }
-            }
-        }
-    ],
+    // [
+    //     { 'mainEntity.orderStatus': 1, 'mainEntity.orderDate': -1 },
+    //     {
+    //         name: 'searchByOrderStatus'
+    //     }
+    // ],
+    // [
+    //     { 'mainEntity.confirmationNumber': 1, 'mainEntity.orderDate': -1 },
+    //     {
+    //         name: 'searchByConfirmationNumber',
+    //         partialFilterExpression: {
+    //             'mainEntity.confirmationNumber': { $exists: true }
+    //         }
+    //     }
+    // ],
+    // [
+    //     { 'mainEntity.customer.id': 1, 'mainEntity.orderDate': -1 },
+    //     {
+    //         name: 'searchByCustomerId',
+    //         partialFilterExpression: {
+    //             'mainEntity.customer.id': { $exists: true }
+    //         }
+    //     }
+    // ],
+    // [
+    //     { 'mainEntity.paymentMethods.accountId': 1, 'mainEntity.orderDate': -1 },
+    //     {
+    //         name: 'searchByPaymentMethodsAccountId',
+    //         partialFilterExpression: {
+    //             'mainEntity.paymentMethods.accountId': { $exists: true }
+    //         }
+    //     }
+    // ],
+    // [
+    //     { 'mainEntity.paymentMethods.typeOf': 1, 'mainEntity.orderDate': -1 },
+    //     {
+    //         name: 'searchByPaymentMethodTypeOf',
+    //         partialFilterExpression: {
+    //             'mainEntity.paymentMethods.typeOf': { $exists: true }
+    //         }
+    //     }
+    // ],
     [
         { 'mainEntity.paymentMethods.paymentMethodId': 1, 'mainEntity.orderDate': -1 },
         {