@chevre/domain 24.1.0-alpha.12 → 24.1.0-alpha.14

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

@@ -36,7 +36,6 @@ export declare class AcceptedOfferRepo {
     searchAcceptedOffersByOrderNumber(filter: {
         limit?: number;
         page?: number;
-        $slice?: [number, number];
         orderNumber: {
             $eq: string;
         };
@@ -53,9 +52,6 @@ export declare class AcceptedOfferRepo {
                 id?: {
                     $eq?: string;
                 };
-                typeOf?: {
-                    $in?: factory.order.IItemOffered['typeOf'][];
-                };
                 reservationFor?: {
                     id?: {
                         $in?: string[];

package/lib/chevre/repo/acceptedOffer.js

@@ -53,14 +53,14 @@ class AcceptedOfferRepo {
     }
     async aggreateOwnershipInfosByOrder(filter) {
         const aggregate = this.orderModel.aggregate([
+            { $match: { orderNumber: { $eq: filter.orderNumber.$eq } } },
+            { $match: { typeOf: { $eq: factory_1.factory.order.OrderType.Order } } },
             {
                 $unwind: {
                     path: '$acceptedOffers',
                     includeArrayIndex: 'acceptedOfferIndex'
                 }
             },
-            { $match: { orderNumber: { $eq: filter.orderNumber.$eq } } },
-            { $match: { typeOf: { $eq: factory_1.factory.order.OrderType.Order } } },
             {
                 $project: {
                     _id: 0,
@@ -82,21 +82,32 @@ class AcceptedOfferRepo {
      * 注文オファーを展開して検索する
      */
     async searchAcceptedOffersByOrderNumber(filter, inclusion) {
-        const matchStages = [
+        /**
+         * unwind前に1ドキュメントを特定するためのstage
+         */
+        const matchStagesOneDocument = [
             { $match: { orderNumber: { $eq: filter.orderNumber.$eq } } },
             { $match: { 'project.id': { $eq: filter.project.id.$eq } } },
             { $match: { typeOf: { $eq: factory_1.factory.order.OrderType.Order } } }
         ];
+        /**
+         * unwind後にオファー内容で絞るstage
+         */
+        const matchStages = [
+        // { $match: { orderNumber: { $eq: filter.orderNumber.$eq } } }, // matchStagesOneDocumentへ移行(2026-05-12~)
+        // { $match: { 'project.id': { $eq: filter.project.id.$eq } } }, // matchStagesOneDocumentへ移行(2026-05-12~)
+        // { $match: { typeOf: { $eq: factory.order.OrderType.Order } } } // matchStagesOneDocumentへ移行(2026-05-12~)
+        ];
         const itemOfferedIdEq = filter.acceptedOffers?.itemOffered?.id?.$eq;
         if (typeof itemOfferedIdEq === 'string') {
             matchStages.push({ $match: { 'acceptedOffers.itemOffered.id': { $exists: true, $eq: itemOfferedIdEq } } });
         }
-        const itemOfferedTypeOfIn = filter.acceptedOffers?.itemOffered?.typeOf?.$in;
-        if (Array.isArray(itemOfferedTypeOfIn)) {
-            matchStages.push({
-                $match: { 'acceptedOffers.itemOffered.typeOf': { $exists: true, $in: itemOfferedTypeOfIn } }
-            });
-        }
+        // const itemOfferedTypeOfIn = filter.acceptedOffers?.itemOffered?.typeOf?.$in;
+        // if (Array.isArray(itemOfferedTypeOfIn)) {
+        //     matchStages.push({
+        //         $match: { 'acceptedOffers.itemOffered.typeOf': { $exists: true, $in: itemOfferedTypeOfIn } }
+        //     });
+        // }
         const resevationForIdIn = filter.acceptedOffers?.itemOffered?.reservationFor?.id?.$in;
         if (Array.isArray(resevationForIdIn)) {
             matchStages.push({
@@ -114,9 +125,7 @@ class AcceptedOfferRepo {
             });
         }
         const aggregate = this.orderModel.aggregate([
-            // if (typeof params.sort?.orderDate === 'number') {
-            //     aggregate.sort({ orderDate: params.sort.orderDate });
-            // }
+            ...matchStagesOneDocument,
             {
                 $unwind: {
                     path: '$acceptedOffers'
@@ -148,8 +157,11 @@ class AcceptedOfferRepo {
         }
         if (typeof filter.limit === 'number' && filter.limit > 0) {
             const page = (typeof filter.page === 'number' && filter.page > 0) ? filter.page : 1;
-            aggregate.limit(filter.limit * page)
-                .skip(filter.limit * (page - 1));
+            // support skip -> limit(2026-05-12~)
+            // aggregate.limit(filter.limit * page)
+            //     .skip(filter.limit * (page - 1));
+            aggregate.skip(filter.limit * (page - 1))
+                .limit(filter.limit);
         }
         return aggregate
             .option({ maxTimeMS: settings_1.MONGO_MAX_TIME_MS })

package/lib/chevre/repo/assetTransaction/reserve.d.ts

@@ -1,6 +1,7 @@
 import type { Connection } from 'mongoose';
 import { factory } from '../../factory';
 type ISubReservationAsFindResult = Pick<factory.reservation.eventReservation.IReservation, 'underName' | 'id'> & {
+    numSeats?: number;
     price?: factory.reservation.eventReservation.IPrice;
     reservedTicket?: Pick<factory.reservation.eventReservation.IReservedTicket, 'ticketType'>;
     reservationFor?: factory.assetTransaction.reserve.IReservationFor;

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

@@ -91,6 +91,7 @@ class ReserveTransactionRepo {
                 $project: {
                     _id: 0,
                     id: '$object.subReservation.id',
+                    numSeats: '$object.subReservation.numSeats',
                     price: '$object.subReservation.price',
                     underName: '$object.underName',
                     reservationFor: '$object.reservationFor',

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

@@ -25,7 +25,6 @@ const schemaDefinition = {
     bookingTime: Date,
     broker: mongoose_1.SchemaTypes.Mixed,
     modifiedTime: Date,
-    numSeats: Number,
     previousReservationStatus: String,
     programMembershipUsed: mongoose_1.SchemaTypes.Mixed,
     reservationFor: mongoose_1.SchemaTypes.Mixed,
@@ -43,7 +42,9 @@ const schemaDefinition = {
     checkedIn: { type: Boolean, default: false },
     attended: { type: Boolean, default: false },
     additionalProperty: mongoose_1.SchemaTypes.Mixed,
+    // 以下廃止予定
     // bookingAgent: SchemaTypes.Mixed,
+    numSeats: Number,
     price: mongoose_1.SchemaTypes.Mixed,
     priceCurrency: String,
     issuedThrough: mongoose_1.SchemaTypes.Mixed

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

@@ -20,7 +20,7 @@ export type ICreatingReservation = Omit<factory.reservation.eventReservation.IRe
 /**
  * 廃止予定の予約属性
  */
-export type IDeprecatedField = 'price' | 'underName' | 'priceCurrency' | 'issuedThrough';
+export type IDeprecatedField = 'price' | 'underName' | 'priceCurrency' | 'issuedThrough' | 'numSeats';
 export type IKeyOfProjection = Exclude<keyof factory.reservation.eventReservation.IReservation, IDeprecatedField> | 'reservedTicket.dateUsed' | 'reservationFor.id' | 'reservationFor.typeOf';
 export type IAttendedReservation = Pick<factory.reservation.eventReservation.IReservation, 'id' | 'typeOf' | 'project' | 'modifiedTime'> & {
     reservationFor: Pick<factory.reservation.eventReservation.IReservationForMinimized, 'id' | 'typeOf'>;
@@ -43,6 +43,10 @@ export type IReservationAsFindResult = Omit<factory.reservation.eventReservation
      * discontinue(2026-05-10~)
      */
     issuedThrough?: never;
+    /**
+     * discontinue(2026-05-11~)
+     */
+    numSeats?: never;
 };
 /**
  * 予約リポジトリ

package/lib/chevre/repo/reservation.js

@@ -115,6 +115,7 @@ class ReservationRepo {
         if (Array.isArray(params.subReservation)) {
             params.subReservation.forEach((subReservation) => {
                 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~)

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/order/deleteOrder.js

@@ -94,7 +94,7 @@ function deleteReservationsByOrder(order) {
             orderNumber: { $eq: order.orderNumber },
             project: { id: { $eq: order.project.id } },
             acceptedOffers: {
-                itemOffered: { typeOf: { $in: [factory_2.factory.reservationType.EventReservation] } }
+            // itemOffered: { typeOf: { $in: [factory.reservationType.EventReservation] } }
             }
         });
         const reservationIds = acceptedOffers.map((o) => String(o.itemOffered.id));

package/lib/chevre/service/reserve/findReservations.d.ts

@@ -5,13 +5,14 @@ import type { IDeprecatedField, IKeyOfProjection, ReservationRepo } from '../../
  * 予約検索レスポンスとしての予約
  * 予約ドキュメントに予約取引の情報を補完する
  */
-type IReservationAsFindResult = Omit<factory.reservation.eventReservation.IReservation, 'price' | 'priceCurrency' | 'underName' | 'reservedTicket' | 'reservationFor' | 'issuedThrough'> & {
+type IReservationAsFindResult = Omit<factory.reservation.eventReservation.IReservation, 'price' | 'priceCurrency' | 'underName' | 'reservedTicket' | 'reservationFor' | 'issuedThrough' | 'numSeats'> & {
     price?: factory.reservation.eventReservation.IPrice;
     priceCurrency?: factory.priceCurrency.JPY;
     underName?: factory.assetTransaction.reserve.IUnderName;
     reservedTicket?: factory.assetTransaction.reserve.IObjectSubReservation['reservedTicket'];
     reservationFor?: factory.assetTransaction.reserve.IReservationFor;
     issuedThrough?: factory.assetTransaction.reserve.IIssuedThrough;
+    numSeats?: number;
 };
 /**
  * 予約を検索する

package/lib/chevre/service/reserve/findReservations.js

@@ -25,6 +25,7 @@ function findReservations(params, options) {
             const requireReservedTicket = Object.keys(inclusion).includes('reservedTicket');
             const requireReservationFor = Object.keys(inclusion).includes('reservationFor');
             const requireIssuedThrough = Object.keys(inclusion).includes('issuedThrough');
+            const requireNumSeats = Object.keys(inclusion).includes('numSeats');
             const reservationIds = rawReservations.map(({ id }) => id);
             const subReservations = await repos.assetTransaction.reserve.findSubReservationsById({
                 ids: reservationIds
@@ -38,6 +39,7 @@ function findReservations(params, options) {
                 const ticketTypeByTransaction = subReservationByTransaction?.reservedTicket?.ticketType;
                 const reservationForByTransaction = subReservationByTransaction?.reservationFor;
                 const issuedThroughByTransaction = subReservationByTransaction?.issuedThrough;
+                const numSeatsByTransaction = subReservationByTransaction?.numSeats;
                 // 予約ドキュメントを最適化し始めたため、もう等しくない(2026-04-06~)
                 // // 予約取引から参照した属性と全く等しいはず
                 // if (requirePrice) {
@@ -53,7 +55,7 @@ function findReservations(params, options) {
                 //         console.error('reservationForMatched: false!!!', reservation.id);
                 //     }
                 // }
-                const { reservationFor: _reservationFor, issuedThrough: _issuedThrough, priceCurrency: _priceCurrency, reservedTicket, ...rawReservation4result } = reservation;
+                const { reservationFor: _reservationFor, issuedThrough: _issuedThrough, priceCurrency: _priceCurrency, numSeats: _numSeats, reservedTicket, ...rawReservation4result } = reservation;
                 return {
                     ...rawReservation4result, // 予約ドキュメントはそのまま返す
                     ...(requirePrice && priceByTransaction !== undefined) ? { price: priceByTransaction } : undefined, // priceがあれば上書き
@@ -73,6 +75,9 @@ function findReservations(params, options) {
                     ...(requireIssuedThrough && issuedThroughByTransaction !== undefined)
                         ? { issuedThrough: issuedThroughByTransaction }
                         : undefined, // issuedThroughがあれば上書き(2026-05-09~)
+                    ...(requireNumSeats && numSeatsByTransaction !== undefined)
+                        ? { numSeats: numSeatsByTransaction }
+                        : undefined, // issuedThroughがあれば上書き(2026-05-09~)
                 };
             });
         }

package/lib/chevre/service/reserve/potentialActions/onReservationConfirmed.js

@@ -98,22 +98,14 @@ function onReservationConfirmed(confirmedReservations, reserveAction) {
                 }
             }
             const subReservations4inform = confirmedReservations.map((r) => {
-                const { additionalProperty, additionalTicketText, 
-                // attended, checkedIn,
-                id, modifiedTime, 
-                // numSeats,
-                price, programMembershipUsed, reservedTicket, subReservation, typeOf } = r;
+                const { additionalProperty, additionalTicketText, id, modifiedTime, price, programMembershipUsed, reservedTicket, subReservation, typeOf } = r;
                 return {
-                    // bookingTime, // discontinue(2024-10-27~)
                     id,
                     typeOf,
                     reservedTicket,
                     ...(Array.isArray(additionalProperty)) ? { additionalProperty } : undefined,
                     ...(typeof additionalTicketText === 'string') ? { additionalTicketText } : undefined,
-                    // ...(typeof attended === 'boolean') ? { attended } : undefined, // discontinue(2024-10-27~)
-                    // ...(typeof checkedIn === 'boolean') ? { checkedIn } : undefined, // discontinue(2024-10-27~)
                     ...(modifiedTime instanceof Date) ? { modifiedTime } : undefined,
-                    // ...(typeof numSeats === 'number') ? { numSeats } : undefined, // discontinue(2024-10-27~)
                     ...(price !== undefined) ? { price } : undefined,
                     ...(programMembershipUsed !== undefined) ? { programMembershipUsed } : undefined,
                     ...(Array.isArray(subReservation)) ? { subReservation } : undefined

package/lib/chevre/service/reserve/searchByOrder.js

@@ -11,14 +11,18 @@ function searchByOrder(params) {
             page: params.page,
             project: { id: { $eq: params.project.id } },
             orderNumber: { $eq: params.orderNumber },
-            acceptedOffers: { itemOffered: { typeOf: { $in: [reservationType] } } }
+            acceptedOffers: {
+                itemOffered: {
+                // typeOf: { $in: [reservationType] }
+                }
+            }
         }, ['itemOffered']);
         const reservationIds = acceptedOffers.map((offer) => {
             if (offer.itemOffered.typeOf === reservationType) {
                 return offer.itemOffered.id;
             }
             else {
-                // 検索条件にreservationTypeを含めているので、ありえないケース
+                // EventReservationしか存在しないので、ありえないケース
                 throw new factory_1.factory.errors.Internal(`unexpected itemOffered.typeOf ${offer.itemOffered.typeOf}`);
             }
         });

package/lib/chevre/service/task/payment/payByTask.js

@@ -71,7 +71,7 @@ function fixOrderAsPurpose(params, transaction) {
                 project: { id: { $eq: transaction.project.id } },
                 acceptedOffers: {
                     itemOffered: {
-                        typeOf: { $in: [factory_1.factory.reservationType.EventReservation] },
+                        // typeOf: { $in: [factory.reservationType.EventReservation] }, // EventReservationしか存在しないので不要(2026-05-12~)
                         // movieTicketsに結合されたイベントID,座席コードで絞る
                         reservationFor: { id: { $in: [reservationForId] } },
                         reservedTicket: { ticketedSeat: { seatNumber: { $in: seatNumbers } } }

package/package.json

@@ -11,7 +11,7 @@
   "dependencies": {
     "@aws-sdk/client-cognito-identity-provider": "3.600.0",
     "@aws-sdk/credential-providers": "3.600.0",
-    "@chevre/factory": "8.1.0-alpha.6",
+    "@chevre/factory": "8.1.0-alpha.7",
     "@motionpicture/coa-service": "10.0.0",
     "@motionpicture/gmo-service": "6.1.0-alpha.0",
     "@sendgrid/client": "8.1.4",
@@ -91,5 +91,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build"
   },
-  "version": "24.1.0-alpha.12"
+  "version": "24.1.0-alpha.14"
 }