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

package/lib/chevre/repo/accountingReport.js

@@ -4,7 +4,6 @@ exports.AccountingReportRepo = void 0;
 const errorHandler_1 = require("../errorHandler");
 const factory_1 = require("../factory");
 const accountingReport_1 = require("./mongoose/schemas/accountingReport");
-const DEFAULT_SEARCH_LIMIT = 100;
 /**
  * 経理レポートリポジトリ
  */
@@ -49,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) {
@@ -137,18 +112,16 @@ class AccountingReportRepo {
             throw new factory_1.factory.errors.NotFound(this.accountingReportModel.modelName);
         }
     }
-    async search(params) {
-        const limit = (typeof params.limit === 'number') ? Math.min(params.limit, DEFAULT_SEARCH_LIMIT) : DEFAULT_SEARCH_LIMIT;
-        const page = (typeof params.page === 'number') ? Math.max(params.page, 1) : 1;
-        const unwindAcceptedOffers = params.$unwindAcceptedOffers === '1';
+    async findAccountingReports(params) {
+        const { limit, page } = params;
         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,
@@ -159,10 +132,9 @@ class AccountingReportRepo {
                 }
             }
         ]);
-        return aggregate.allowDiskUse(true)
-            .limit(limit * page)
+        return aggregate
             .skip(limit * (page - 1))
-            // .setOptions({ maxTimeMS: 10000 })
+            .limit(limit)
             .exec();
     }
     async unsetUnnecessaryFields(params) {

package/lib/chevre/repo/action/actionProcess.d.ts

@@ -30,7 +30,7 @@ export type IRecipeAsActionAttributes<T extends factory.recipe.RecipeCategory> =
 export type IMinimizedPurchaseNumberAuthResult = Pick<factory.action.check.paymentMethod.movieTicket.IPurchaseNumberAuthResult, 'mkknmiNumSum' | 'resultInfo' | 'ykknmiNumSum'> & {
     knyknrNoInfoOut: Omit<factory.action.check.paymentMethod.movieTicket.IPurchaseNumberInfo, 'ykknInfo' | 'mkknInfo'>[] | null;
 };
-export type IKeyOfProjection = keyof IAction<factory.actionType> | keyof IAction<factory.actionType.AuthorizeAction> | keyof IAction<factory.actionType.MoneyTransfer> | keyof IAction<factory.actionType.ReplaceAction> | 'identifier';
+export type IKeyOfProjection = keyof IAction<factory.actionType> | keyof IAction<factory.actionType.AuthorizeAction> | keyof IAction<factory.actionType.ReplaceAction> | 'identifier';
 export declare const AVAILABLE_PROJECT_FIELDS: IKeyOfProjection[];
 /**
  * アクション状態管理リポジトリ

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

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

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.d.ts

@@ -1,3 +1,3 @@
 import type { FilterQuery } from 'mongoose';
 import { factory } from '../../../factory';
-export declare function CREATE_MONGO_CONDITIONS(params: factory.reservation.eventReservation.ISearchConditions): FilterQuery<import("@chevre/factory/lib/chevre/reservation/event").IReservation>[];
+export declare function createMongoConditions(params: factory.reservation.eventReservation.ISearchConditions): FilterQuery<import("@chevre/factory/lib/chevre/reservation/event").IReservation>[];