@chevre/domain 24.0.0-alpha.46 → 24.0.0-alpha.48

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

@@ -1,7 +1,7 @@
 import { IndexDefinition, IndexOptions, Model, Schema, SchemaDefinition } from 'mongoose';
 import { IVirtuals } from '../virtuals';
 import * as factory from '../../../factory';
-type IDocType = (Omit<factory.reservation.IReservation<factory.reservationType.EventReservation>, 'id'>) & {
+type IDocType = (Omit<factory.reservation.eventReservation.IReservation, 'id'>) & {
     _id: string;
     bookingAgent?: any;
     previousReservationStatus?: factory.reservationStatusType;

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

@@ -1,5 +1,5 @@
 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 {
@@ -7,15 +7,24 @@ export interface IUpdatePartiallyParams {
 }
 export type ICancelResult = UpdateWriteOpResult;
 export type ICheckedInResult = UpdateWriteOpResult;
-export type ICreatingReservation<T extends factory.reservationType> = 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.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'>;
+    /**
+     * 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, 'price' | 'underName'> & {
+export type IReservationAsFindResult = Omit<factory.reservation.eventReservation.IReservation, IDeprecatedField> & {
     /**
      * 実データとしてはまだ存在しているが型から廃止(2026-03-26~)
      */
@@ -31,20 +40,18 @@ export type IReservationAsFindResult = Omit<factory.reservation.eventReservation
 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/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>;
     /**
      * 予約検索
-     * TODO reimplement
      */
     findReservations(params: factory.reservation.eventReservation.ISearchConditions, inclusion?: Partial<Record<IKeyOfProjection, 1>>): Promise<IReservationAsFindResult[]>;
-    projectFieldsById<T extends factory.reservationType>(params: {
+    findReservationById(params: {
         id: string;
-        inclusion?: IKeyOfProjection[];
-    }): Promise<factory.reservation.IReservation<T>>;
+        inclusion: IKeyOfProjection[];
+    }): Promise<IReservationAsFindResult>;
     confirmManyIfNotExist(params: {
         bookingTime: Date;
         project: {
@@ -55,13 +62,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>;
+        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;
@@ -154,4 +161,3 @@ export declare class ReservationRepo {
         $unset: any;
     }): Promise<UpdateWriteOpResult>;
 }
-export {};