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

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

@@ -54,5 +54,11 @@ export declare class AggregateReservationRepo {
         filter: any;
         $unset: any;
     }): Promise<import("mongoose").UpdateWriteOpResult>;
+    /**
+     * イベント開始日時が指定以前の集計を削除する
+     */
+    deleteManyByEventStartDate(params: {
+        reservationForStartDateLte: Date;
+    }): Promise<import("mongodb").DeleteResult>;
 }
 export {};

package/lib/chevre/repo/aggregateReservation.js

@@ -132,5 +132,14 @@ class AggregateReservationRepo {
         return this.aggregateReservationModel.updateMany(params.filter, { $unset: params.$unset }, { timestamps: false })
             .exec();
     }
+    /**
+     * イベント開始日時が指定以前の集計を削除する
+     */
+    async deleteManyByEventStartDate(params) {
+        return this.aggregateReservationModel.deleteMany({
+            'reservationFor.startDate': { $lte: params.reservationForStartDateLte }
+        })
+            .exec();
+    }
 }
 exports.AggregateReservationRepo = AggregateReservationRepo;

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 */

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

@@ -125,48 +125,39 @@ 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/reserve/useReservation.d.ts

@@ -20,7 +20,7 @@ export declare function useReservation(params: {
          */
         id: string;
     };
-    instrument?: Pick<factory.action.consume.use.reservation.ITicketAsInstrument, 'ticketToken'> | factory.action.consume.use.reservation.IInstrument[];
+    instrument?: factory.action.consume.use.reservation.IInstrument[];
     location?: {
         identifier?: string;
     };

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

@@ -16,7 +16,6 @@ function useReservation(params) {
     return async (repos) => {
         const reservationId = params.object.id;
         let ticketToken;
-        // const ticketToken = params?.instrument?.ticketToken;
         if (Array.isArray(params.instrument)) {
             for (const eachInstrument of params.instrument) {
                 if (eachInstrument.typeOf === 'Ticket' && typeof eachInstrument.ticketToken === 'string') {
@@ -24,9 +23,8 @@ function useReservation(params) {
                     break;
                 }
             }
-        }
-        else {
-            ticketToken = params?.instrument?.ticketToken;
+            // } else {
+            //     ticketToken = params?.instrument?.ticketToken;
         }
         // if (params.verifyToken === true) {} // タスク作成前に検証済なので検証不要
         // confirmReservationが間に合わない可能性を考慮する(2023-06-01~)
@@ -34,36 +32,34 @@ function useReservation(params) {
         // 予約検索
         const reservation = await repos.reservation.findReservationById({
             id: reservationId,
-            inclusion: ['issuedThrough', 'project', 'reservationFor', 'reservationNumber', 'reservedTicket', 'typeOf']
+            inclusion: [
+                // 'issuedThrough',
+                // 'reservedTicket',
+                'project', 'reservationFor', 'reservationNumber', 'typeOf'
+            ]
         });
-        if (typeof reservation.issuedThrough.id !== 'string') {
-            // COA予約では予約使用アクションを想定していないので、興行idは必ず存在するはず
-            throw new factory_1.factory.errors.Internal('reservation.issuedThrough.id must be string');
-        }
-        const { reservedTicket } = reservation;
-        // optimize(2024-05-07~)
+        // if (typeof reservation.issuedThrough.id !== 'string') {
+        //     // COA予約では予約使用アクションを想定していないので、興行idは必ず存在するはず
+        //     throw new factory.errors.Internal('reservation.issuedThrough.id must be string');
+        // }
+        // const { reservedTicket } = reservation;
+        // optimize(2026-05-06~)
         const reservationAsObject = {
             id: reservation.id,
             reservationNumber: reservation.reservationNumber,
             typeOf: reservation.typeOf,
-            issuedThrough: { id: reservation.issuedThrough.id, typeOf: reservation.issuedThrough.typeOf },
             reservationFor: { id: reservation.reservationFor.id, typeOf: reservation.reservationFor.typeOf },
-            reservedTicket: {
-                typeOf: reservedTicket.typeOf,
-                // discontinue ticketType(2026-03-25~)
-                // ticketType: {
-                //     identifier: reservedTicket.ticketType.identifier,
-                //     typeOf: reservedTicket.ticketType.typeOf,
-                //     ...(typeof reservedTicket.ticketType.id === 'string') ? { id: reservedTicket.ticketType.id } : undefined
-                // },
-                ...(typeof reservedTicket.identifier === 'string') ? { identifier: reservedTicket.identifier } : undefined,
-                ...(typeof reservedTicket.ticketedSeat?.typeOf === 'string') ? { ticketedSeat: reservedTicket.ticketedSeat } : undefined
-            }
+            // discontinue issuedThrough,reservedTicket(2026-05-06~)
+            // issuedThrough: { id: reservation.issuedThrough.id, typeOf: reservation.issuedThrough.typeOf },
+            // reservedTicket: {
+            //     typeOf: reservedTicket.typeOf,
+            //     ...(typeof reservedTicket.identifier === 'string') ? { identifier: reservedTicket.identifier } : undefined,
+            //     ...(typeof reservedTicket.ticketedSeat?.typeOf === 'string') ? { ticketedSeat: reservedTicket.ticketedSeat } : undefined
+            // }
         };
         // extend instrument to array(2025-02-18~)
         const instrument = [
             {
-                // ...(typeof token === 'string') ? { token } : undefined, // discontinue token(2024-10-03~)
                 ...(typeof ticketToken === 'string') ? { ticketToken } : undefined,
                 typeOf: 'Ticket'
             },

package/lib/chevre/service/task/useReservation.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.call = call;
+const factory_1 = require("../../factory");
 const action_1 = require("../../repo/action");
 const assetTransaction_1 = require("../../repo/assetTransaction");
 const authorization_1 = require("../../repo/authorization");
@@ -20,16 +21,16 @@ function call(data) {
             instrument = data.instrument;
         }
         else {
-            if (data.instrument?.typeOf === 'Ticket') {
-                instrument = [data.instrument];
-            }
+            throw new factory_1.factory.errors.NotImplemented('instrument as object discontinued');
+            // if (data.instrument?.typeOf === 'Ticket') {
+            //     instrument = [data.instrument];
+            // }
         }
         await (0, useReservation_1.useReservation)({
             project: data.project,
             agent: data.agent,
             object: data.object,
             instrument,
-            // ...(typeof data.instrument?.typeOf === 'string') ? { instrument: data.instrument } : undefined,
             ...(typeof data.location?.typeOf === 'string') ? { location: data.location } : undefined
         })({
             action: new action_1.ActionRepo(connection),
@@ -39,8 +40,6 @@ function call(data) {
             reservation: new reservation_1.ReservationRepo(connection),
             setting: new setting_1.SettingRepo(connection),
             task: new task_1.TaskRepo(connection)
-        }
-        // settings
-        );
+        });
     };
 }

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.0",
+    "@chevre/factory": "8.1.0-alpha.1",
     "@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.2"
+  "version": "24.1.0-alpha.4"
 }