@chevre/domain 24.1.0-alpha.17 → 24.1.0-alpha.19

package/lib/chevre/repo/accountingReport.js

@@ -48,30 +48,6 @@ class AccountingReportRepo {
                 $match: { 'mainEntity.orderDate': { $lte: orderDateLte } }
             });
         }
-        // discontinue(2026-05-01~)
-        // const reservationForStartDateGte = params.order?.acceptedOffers?.itemOffered?.reservationFor?.startDate?.$gte;
-        // if (reservationForStartDateGte instanceof Date) {
-        //     matchStages.push({
-        //         $match: {
-        //             'mainEntity.acceptedOffers.itemOffered.reservationFor.startDate': {
-        //                 $exists: true,
-        //                 $gte: reservationForStartDateGte
-        //             }
-        //         }
-        //     });
-        // }
-        // discontinue(2026-05-01~)
-        // const reservationForStartDateLte = params.order?.acceptedOffers?.itemOffered?.reservationFor?.startDate?.$lte;
-        // if (reservationForStartDateLte instanceof Date) {
-        //     matchStages.push({
-        //         $match: {
-        //             'mainEntity.acceptedOffers.itemOffered.reservationFor.startDate': {
-        //                 $exists: true,
-        //                 $lte: reservationForStartDateLte
-        //             }
-        //         }
-        //     });
-        // }
         return matchStages;
     }
     async syncMainEntity(params) {
@@ -138,15 +114,14 @@ class AccountingReportRepo {
     }
     async findAccountingReports(params) {
         const { limit, page } = params;
-        const unwindAcceptedOffers = params.$unwindAcceptedOffers === '1';
         const matchStages = AccountingReportRepo.CREATE_MONGO_CONDITIONS(params);
         const aggregate = this.accountingReportModel.aggregate([
+            ...matchStages,
             // pipelineの順序に注意
             // @see https://docs.mongodb.com/manual/reference/operator/aggregation/sort/
             { $sort: { 'mainEntity.orderDate': factory_1.factory.sortType.Descending } },
             { $unwind: '$hasPart' },
-            ...(unwindAcceptedOffers) ? [{ $unwind: '$mainEntity.acceptedOffers' }] : [],
-            ...matchStages,
+            // hasPart内に対する検索条件は存在しないため、unwind後のmatchは不要
             {
                 $project: {
                     _id: 0,
@@ -158,11 +133,8 @@ class AccountingReportRepo {
             }
         ]);
         return aggregate
-            // .limit(limit * page)
-            // .skip(limit * (page - 1))
             .skip(limit * (page - 1))
             .limit(limit)
-            // .setOptions({ maxTimeMS: 10000 })
             .exec();
     }
     async unsetUnnecessaryFields(params) {

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

@@ -2,7 +2,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;
+    price?: factory.assetTransaction.reserve.IPrice;
     reservedTicket?: Pick<factory.reservation.eventReservation.IReservedTicket, 'ticketType'>;
     reservationFor?: factory.assetTransaction.reserve.IReservationFor;
     issuedThrough?: factory.assetTransaction.reserve.IIssuedThrough;

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

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

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

@@ -0,0 +1,71 @@
+"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,
+        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, } = 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 reservationByReserveTransaction;
+    });
+}

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

@@ -8,19 +8,10 @@ const settings_1 = require("../../../settings");
 const modelName = 'Reservation';
 exports.modelName = modelName;
 const schemaDefinition = {
-    project: {
-        type: mongoose_1.SchemaTypes.Mixed,
-        required: true
-    },
-    provider: {
-        type: mongoose_1.SchemaTypes.Mixed,
-        required: true
-    },
+    project: { type: mongoose_1.SchemaTypes.Mixed, required: true },
+    provider: { type: mongoose_1.SchemaTypes.Mixed, required: true },
     _id: String,
-    typeOf: {
-        type: String,
-        required: true
-    },
+    typeOf: { type: String, required: true },
     additionalTicketText: String,
     bookingTime: Date,
     broker: mongoose_1.SchemaTypes.Mixed,
@@ -28,14 +19,8 @@ const schemaDefinition = {
     previousReservationStatus: String,
     programMembershipUsed: mongoose_1.SchemaTypes.Mixed,
     reservationFor: mongoose_1.SchemaTypes.Mixed,
-    reservationNumber: {
-        type: String,
-        required: true
-    },
-    reservationStatus: {
-        type: String,
-        required: true
-    },
+    reservationNumber: { type: String, required: true },
+    reservationStatus: { type: String, required: true },
     reservedTicket: mongoose_1.SchemaTypes.Mixed,
     subReservation: mongoose_1.SchemaTypes.Mixed,
     underName: mongoose_1.SchemaTypes.Mixed,
@@ -44,10 +29,10 @@ const schemaDefinition = {
     additionalProperty: mongoose_1.SchemaTypes.Mixed,
     // 以下廃止予定
     // bookingAgent: SchemaTypes.Mixed,
-    numSeats: Number,
-    price: mongoose_1.SchemaTypes.Mixed,
-    priceCurrency: String,
-    issuedThrough: mongoose_1.SchemaTypes.Mixed
+    // numSeats: Number, // discontinue(2026-05-13~)
+    // price: SchemaTypes.Mixed, // discontinue(2026-05-13~)
+    // priceCurrency: String, // discontinue(2026-05-13~)
+    // issuedThrough: SchemaTypes.Mixed // discontinue(2026-05-13~)
 };
 const schemaOptions = {
     autoIndex: settings_1.MONGO_AUTO_INDEX,

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/reserve/findByCode.d.ts

@@ -5,7 +5,7 @@ import type { OrderRepo } from '../../repo/order';
 import type { ReservationRepo } from '../../repo/reservation';
 type IReservationResult = Pick<factory.reservation.eventReservation.IReservation, 'id' | 'additionalTicketText' | 'checkedIn' | 'reservationStatus'> & {
     reservedTicket: {
-        ticketType: Pick<factory.reservation.eventReservation.ITicketType, 'identifier'> & {
+        ticketType: Pick<factory.assetTransaction.reserve.ITicketType, 'identifier'> & {
             name: {
                 ja?: string;
             };

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

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

package/lib/chevre/service/reserve/potentialActions/onReservationConfirmed.d.ts

@@ -6,10 +6,10 @@ import { AuthorizationRepo } from '../../../repo/authorization';
 import type { SettingRepo } from '../../../repo/setting';
 import type { TaskRepo } from '../../../repo/task';
 export type IConfirmedReservation = Omit<factory.reservation.eventReservation.IReservation, 'price' | 'underName' | 'reservedTicket' | 'reservationFor' | 'issuedThrough'> & {
-    price?: factory.reservation.eventReservation.IPrice;
+    price?: factory.assetTransaction.reserve.IPrice;
     underName?: Pick<factory.reservation.IUnderName, 'id' | 'typeOf'>;
     reservedTicket: Omit<factory.assetTransaction.reserve.ISubReservationReservedTicket, 'ticketType'> & {
-        ticketType: factory.reservation.eventReservation.ITicketType;
+        ticketType: factory.assetTransaction.reserve.ITicketType;
     };
     reservationFor: factory.assetTransaction.reserve.IReservationFor;
     issuedThrough: factory.assetTransaction.reserve.IIssuedThrough;

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.7",
+    "@chevre/factory": "8.1.0",
     "@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.17"
+  "version": "24.1.0-alpha.19"
 }