@chevre/domain 24.0.0-alpha.6 → 24.0.0-alpha.60

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

@@ -1,4 +1,5 @@
 import type { Connection, FilterQuery } from 'mongoose';
+import { IDocType } from './mongoose/schemas/project';
 import * as factory from '../factory';
 type IKeyOfProjection = keyof factory.project.IProject;
 /**
@@ -49,27 +50,23 @@ export declare class ProjectRepo {
     deleteById(params: {
         id: string;
     }): Promise<void>;
-    getCursor(conditions: FilterQuery<factory.project.IProject>, projection: any): import("mongoose").Cursor<import("mongoose").Document<unknown, {}, Omit<factory.project.IProject, "id"> & {
-        _id: string;
-        aggregateReservation?: any;
-        makesOffer?: factory.project.IMakesOffer[];
-    }> & Omit<factory.project.IProject, "id"> & {
+    getCursor(conditions: FilterQuery<factory.project.IProject>, projection: any): import("mongoose").Cursor<import("mongoose").Document<unknown, Record<string, never>, IDocType, import("./mongoose/virtuals").IVirtuals, {}> & Omit<factory.project.IProject, "id"> & {
         _id: string;
         aggregateReservation?: any;
         makesOffer?: factory.project.IMakesOffer[];
     } & Required<{
         _id: string;
-    }>, import("mongoose").QueryOptions<import("mongoose").Document<unknown, {}, Omit<factory.project.IProject, "id"> & {
-        _id: string;
-        aggregateReservation?: any;
-        makesOffer?: factory.project.IMakesOffer[];
-    }> & Omit<factory.project.IProject, "id"> & {
+    }> & {
+        __v: number;
+    }, import("mongoose").QueryOptions<IDocType>, (import("mongoose").Document<unknown, Record<string, never>, IDocType, import("./mongoose/virtuals").IVirtuals, {}> & Omit<factory.project.IProject, "id"> & {
         _id: string;
         aggregateReservation?: any;
         makesOffer?: factory.project.IMakesOffer[];
     } & Required<{
         _id: string;
-    }>>>;
+    }> & {
+        __v: number;
+    }) | null>;
     unsetUnnecessaryFields(params: {
         filter: any;
         $unset: any;

package/lib/chevre/repo/rateLimit/offer.js

@@ -70,7 +70,7 @@ class OfferRateLimitRepo {
                 audience: { identifier: value, typeOf: 'Audience' }
             });
         }
-        catch (error) {
+        catch (_error) {
             throw new factory.errors.RateLimitExceeded('Offer');
         }
         // const multi = this.redisClient.multi();

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

@@ -1,20 +1,41 @@
 import type { BulkWriteResult } from 'mongodb';
-import type { Connection, FilterQuery, UpdateWriteOpResult } from 'mongoose';
+import type { Connection, UpdateWriteOpResult } from 'mongoose';
+import { IDocType } from './mongoose/schemas/reservation';
 import * as factory from '../factory';
 export interface IUpdatePartiallyParams {
     additionalTicketText?: string;
 }
 export type ICancelResult = UpdateWriteOpResult;
 export type ICheckedInResult = UpdateWriteOpResult;
-export type ICreatingReservation<T extends factory.reservationType> = T extends factory.reservationType.BusReservation ? (Omit<factory.reservation.busReservation.IReservation, 'id'>) & {
-    _id: string;
-} : T extends factory.reservationType.EventReservation ? (Omit<factory.reservation.eventReservation.IReservation, 'id'>) & {
+/**
+ * ドキュメントとして保管する予約
+ */
+export type ICreatingReservation = Omit<factory.reservation.eventReservation.IReservation, 'id' | 'price' | 'reservedTicket'> & {
     _id: string;
-} : never;
-type IKeyOfProjection = keyof factory.reservation.IReservation<factory.reservationType.BusReservation | factory.reservationType.EventReservation> | 'reservedTicket.dateUsed' | 'reservationFor.id' | 'reservationFor.typeOf';
-export type IAttendedReservation = Pick<factory.reservation.IReservation<factory.reservationType.EventReservation>, 'id' | 'typeOf' | 'project' | 'modifiedTime'> & {
-    reservationFor: Pick<factory.reservation.IReservationFor<factory.reservationType.EventReservation>, 'id' | 'typeOf'>;
-    reservedTicket: Pick<factory.reservation.ITicket, 'dateUsed'>;
+    /**
+     * priceは廃止予定だが、互換性維持対応としてひとまず型を強制的に合わせる
+     */
+    price?: factory.reservation.eventReservation.IPrice;
+    reservedTicket: factory.assetTransaction.reserve.ISubReservationReservedTicket;
+};
+/**
+ * 廃止予定の予約属性
+ */
+export type IDeprecatedField = 'price' | 'underName';
+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.IReservationFor, 'id' | 'typeOf'>;
+    reservedTicket: Pick<factory.reservation.eventReservation.IReservedTicket, 'dateUsed'>;
+};
+export type IReservationAsFindResult = Omit<factory.reservation.eventReservation.IReservation, IDeprecatedField> & {
+    /**
+     * 実データとしてはまだ存在しているが型から廃止(2026-03-26~)
+     */
+    price?: never;
+    /**
+     * 実データとしてはまだ存在しているが型から廃止(2026-03-26~)
+     */
+    underName?: never;
 };
 /**
  * 予約リポジトリ
@@ -22,22 +43,18 @@ export type IAttendedReservation = Pick<factory.reservation.IReservation<factory
 export declare class ReservationRepo {
     private readonly reservationModel;
     constructor(connection: Connection);
-    static CREATE_MONGO_CONDITIONS(params: factory.reservation.ISearchConditions<factory.reservationType>): FilterQuery<import("@chevre/factory/lib/reservation/busReservation").IReservation | import("@chevre/factory/lib/reservation/event").IReservation | import("@chevre/factory/lib/reservation/reservationPackage").IReservation>[];
     /**
      * 汎用予約カウント
      */
-    count<T extends factory.reservationType>(params: factory.reservation.ISearchConditions<T>): Promise<number>;
+    count(params: factory.reservation.eventReservation.ISearchConditions): Promise<number>;
     /**
      * 予約検索
-     * migrate from search(2024-08-08~)
      */
-    projectFields<T extends factory.reservationType>(params: factory.reservation.ISearchConditions<T>, inclusion?: {
-        [key in IKeyOfProjection]?: 1;
-    }): Promise<factory.reservation.IReservation<factory.reservationType.EventReservation>[]>;
-    projectFieldsById<T extends factory.reservationType>(params: {
+    findReservations(params: factory.reservation.eventReservation.ISearchConditions, inclusion?: Partial<Record<IKeyOfProjection, 1>>): Promise<IReservationAsFindResult[]>;
+    findReservationById(params: {
         id: string;
-        inclusion?: IKeyOfProjection[];
-    }): Promise<factory.reservation.IReservation<T>>;
+        inclusion: IKeyOfProjection[];
+    }): Promise<IReservationAsFindResult>;
     confirmManyIfNotExist(params: {
         bookingTime: Date;
         project: {
@@ -48,13 +65,13 @@ export declare class ReservationRepo {
         issuedThrough: factory.assetTransaction.reserve.IIssuedThrough;
         reservationFor: factory.assetTransaction.reserve.IReservationFor;
         reservationNumber: string;
-        underName?: factory.reservation.IUnderName<factory.reservationType.EventReservation>;
-        broker?: factory.reservation.IBroker<factory.reservationType>;
-    }): Promise<BulkWriteResult | void>;
+        underName?: factory.reservation.IUnderName;
+        broker?: factory.reservation.IBroker;
+    }): Promise<BulkWriteResult | undefined>;
     /**
      * 予約取消
      */
-    cancelById<T extends factory.reservationType>(params: {
+    cancelById(params: {
         id: string;
         previousReservationStatus?: factory.reservationStatusType;
         modifiedTime: Date;
@@ -125,42 +142,25 @@ export declare class ReservationRepo {
             $in: string[];
         };
     }): Promise<string[]>;
-    getCursor(conditions: any, projection: any): import("mongoose").Cursor<import("mongoose").Document<unknown, {}, (Omit<import("@chevre/factory/lib/reservation/busReservation").IReservation, "id"> | Omit<import("@chevre/factory/lib/reservation/event").IReservation, "id">) & {
-        _id: string;
-        bookingAgent?: any;
-        previousReservationStatus?: factory.reservationStatusType;
-    }> & ((Omit<import("@chevre/factory/lib/reservation/busReservation").IReservation, "id"> & {
-        _id: string;
-        bookingAgent?: any;
-        previousReservationStatus?: factory.reservationStatusType;
-    } & Required<{
-        _id: string;
-    }>) | (Omit<import("@chevre/factory/lib/reservation/event").IReservation, "id"> & {
-        _id: string;
-        bookingAgent?: any;
-        previousReservationStatus?: factory.reservationStatusType;
-    } & Required<{
-        _id: string;
-    }>)), import("mongoose").QueryOptions<import("mongoose").Document<unknown, {}, (Omit<import("@chevre/factory/lib/reservation/busReservation").IReservation, "id"> | Omit<import("@chevre/factory/lib/reservation/event").IReservation, "id">) & {
-        _id: string;
-        bookingAgent?: any;
-        previousReservationStatus?: factory.reservationStatusType;
-    }> & ((Omit<import("@chevre/factory/lib/reservation/busReservation").IReservation, "id"> & {
+    getCursor(conditions: any, projection: any): import("mongoose").Cursor<import("mongoose").Document<unknown, Record<string, never>, IDocType, import("./mongoose/virtuals").IVirtuals, {}> & Omit<import("@chevre/factory/lib/reservation/event").IReservation, "id"> & {
         _id: string;
         bookingAgent?: any;
         previousReservationStatus?: factory.reservationStatusType;
     } & Required<{
         _id: string;
-    }>) | (Omit<import("@chevre/factory/lib/reservation/event").IReservation, "id"> & {
+    }> & {
+        __v: number;
+    }, import("mongoose").QueryOptions<IDocType>, (import("mongoose").Document<unknown, Record<string, never>, IDocType, import("./mongoose/virtuals").IVirtuals, {}> & Omit<import("@chevre/factory/lib/reservation/event").IReservation, "id"> & {
         _id: string;
         bookingAgent?: any;
         previousReservationStatus?: factory.reservationStatusType;
     } & Required<{
         _id: string;
-    }>))>>;
+    }> & {
+        __v: number;
+    }) | null>;
     unsetUnnecessaryFields(params: {
         filter: any;
         $unset: any;
     }): Promise<UpdateWriteOpResult>;
 }
-export {};