@chevre/domain 24.0.0-alpha.9 → 24.0.0

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

@@ -1,5 +1,6 @@
 import type { Connection, FilterQuery } from 'mongoose';
-import * as factory from '../factory';
+import { IDocType } from './mongoose/schemas/project';
+import { 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/project.js

@@ -1,31 +1,8 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ProjectRepo = void 0;
 const project_1 = require("./mongoose/schemas/project");
-const factory = __importStar(require("../factory"));
+const factory_1 = require("../factory");
 const settings_1 = require("../settings");
 const AVAILABLE_PROJECT_FIELDS = [
     // 'aggregateReservation',
@@ -73,7 +50,7 @@ class ProjectRepo {
             id: { $eq: params.id }
         }, params.inclusion)).shift();
         if (project === undefined) {
-            throw new factory.errors.NotFound(this.projectModel.modelName);
+            throw new factory_1.factory.errors.NotFound(this.projectModel.modelName);
         }
         return project;
     }
@@ -82,7 +59,7 @@ class ProjectRepo {
             .lean()
             .exec();
         if (doc === null) {
-            throw new factory.errors.NotFound(this.projectModel.modelName);
+            throw new factory_1.factory.errors.NotFound(this.projectModel.modelName);
         }
         return doc;
     }
@@ -97,7 +74,7 @@ class ProjectRepo {
         }
         else {
             // discontinue(2024-10-09~)
-            throw new factory.errors.ArgumentNull('inclusion', 'inclusion must be specified');
+            throw new factory_1.factory.errors.ArgumentNull('inclusion', 'inclusion must be specified');
         }
         const projection = {
             _id: 0,
@@ -120,16 +97,16 @@ class ProjectRepo {
     async createById(params) {
         const { id, ...createParams } = params;
         if (typeof id !== 'string' || id === '') {
-            throw new factory.errors.ArgumentNull('id');
+            throw new factory_1.factory.errors.ArgumentNull('id');
         }
         const result = await this.projectModel.insertMany({
             ...createParams,
-            typeOf: factory.organizationType.Project,
+            typeOf: factory_1.factory.organizationType.Project,
             _id: id
         }, { rawResult: true });
         const insertedId = result.insertedIds?.[0];
         if (typeof insertedId !== 'string') {
-            throw new factory.errors.Internal(`project not saved unexpectedly. result:${JSON.stringify(result)}`);
+            throw new factory_1.factory.errors.Internal(`project not saved unexpectedly. result:${JSON.stringify(result)}`);
         }
         return { id: insertedId };
     }
@@ -207,7 +184,7 @@ class ProjectRepo {
     }
     getCursor(conditions, projection) {
         return this.projectModel.find(conditions, projection)
-            .sort({ _id: factory.sortType.Ascending })
+            .sort({ _id: factory_1.factory.sortType.Ascending })
             .cursor();
     }
     async unsetUnnecessaryFields(params) {

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

@@ -1,5 +1,5 @@
 import { Connection } from 'mongoose';
-import * as factory from '../factory';
+import { factory } from '../factory';
 type IMakesOffer = Pick<factory.project.IMakesOffer, 'eligibleCustomerType' | 'typeOf' | 'validForMemberTier'> & {
     availableAtOrFrom: Pick<factory.offer.IAvailableAtOrFrom, 'id'>;
 };

package/lib/chevre/repo/projectMakesOffer.js

@@ -1,31 +1,8 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ProjectMakesOfferRepo = void 0;
 const project_1 = require("./mongoose/schemas/project");
-const factory = __importStar(require("../factory"));
+const factory_1 = require("../factory");
 const settings_1 = require("../settings");
 /**
  * プロジェクト提供オファーリポジトリ
@@ -77,10 +54,10 @@ class ProjectMakesOfferRepo {
         }, { _id: 1 })
             .exec();
         if (doc === null) {
-            throw new factory.errors.NotFound(factory.organizationType.Project);
+            throw new factory_1.factory.errors.NotFound(factory_1.factory.organizationType.Project);
         }
         const creatingMakesOffer = {
-            typeOf: factory.offerType.Offer,
+            typeOf: factory_1.factory.offerType.Offer,
             // availableAtOrFrom: [{ id: params.availableAtOrFrom.id }]
             availableAtOrFrom: { id: params.availableAtOrFrom.id } // support non-array(2024-10-22~)
         };
@@ -94,12 +71,12 @@ class ProjectMakesOfferRepo {
         })
             .exec();
         if (doc === null) {
-            throw new factory.errors.AlreadyInUse('makesOffer', ['availableAtOrFrom.id']);
+            throw new factory_1.factory.errors.AlreadyInUse('makesOffer', ['availableAtOrFrom.id']);
         }
     }
     async updateOne(params) {
         const updatingMakesOffer = {
-            typeOf: factory.offerType.Offer,
+            typeOf: factory_1.factory.offerType.Offer,
             availableAtOrFrom: { id: params.availableAtOrFrom.id }, // support non-array(2024-10-22~)
             ...(Array.isArray(params.eligibleCustomerType))
                 ? {
@@ -125,7 +102,7 @@ class ProjectMakesOfferRepo {
         })
             .exec();
         if (doc === null) {
-            throw new factory.errors.NotFound(factory.offerType.Offer);
+            throw new factory_1.factory.errors.NotFound(factory_1.factory.offerType.Offer);
         }
     }
     async deleteOne(params) {
@@ -139,7 +116,7 @@ class ProjectMakesOfferRepo {
         })
             .exec();
         if (doc === null) {
-            throw new factory.errors.NotFound(factory.organizationType.Project);
+            throw new factory_1.factory.errors.NotFound(factory_1.factory.organizationType.Project);
         }
     }
 }

package/lib/chevre/repo/rateLimit/offer.d.ts

@@ -1,5 +1,5 @@
 import { RedisClientType } from 'redis';
-import * as factory from '../../factory';
+import { factory } from '../../factory';
 /**
  * レート制限キーインターフェース
  */

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

@@ -1,34 +1,11 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.OfferRateLimitRepo = void 0;
 const moment_1 = __importDefault(require("moment"));
-const factory = __importStar(require("../../factory"));
+const factory_1 = require("../../factory");
 const concurrentLock_1 = require("../concurrentLock");
 /**
  * オファーレート制限リポジトリ
@@ -64,14 +41,14 @@ class OfferRateLimitRepo {
         // reimplement using concurrentLockRepo(2025-05-27~)
         try {
             await this.concurrentLockRepo.lock({
-                project: { id: params.project.id, typeOf: factory.organizationType.Project },
+                project: { id: params.project.id, typeOf: factory_1.factory.organizationType.Project },
                 about: { identifier: key, typeOf: 'Thing' },
                 expires,
                 audience: { identifier: value, typeOf: 'Audience' }
             });
         }
-        catch (error) {
-            throw new factory.errors.RateLimitExceeded('Offer');
+        catch (_error) {
+            throw new factory_1.factory.errors.RateLimitExceeded('Offer');
         }
         // const multi = this.redisClient.multi();
         // multi.setNX(key, value)

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

@@ -1,20 +1,42 @@
 import type { BulkWriteResult } from 'mongodb';
-import type { Connection, FilterQuery, UpdateWriteOpResult } from 'mongoose';
-import * as factory from '../factory';
+import type { Connection, UpdateWriteOpResult } from 'mongoose';
+import { IDocType } from './mongoose/schemas/reservation';
+import { 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'>) & {
+type ISavingReservedTicket = Omit<factory.assetTransaction.reserve.ISubReservationReservedTicket, 'ticketType'> & {
+    ticketType: {
+        id?: string;
+    };
+};
+/**
+ * ドキュメントとして保管する予約
+ */
+export type ICreatingReservation = Omit<factory.reservation.eventReservation.IReservation, 'id' | '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'>;
+    reservedTicket: ISavingReservedTicket;
+};
+/**
+ * 廃止予定の予約属性
+ */
+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.IReservationForMinimized, '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 +44,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 +66,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,39 +143,23 @@ 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/chevre/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/chevre/reservation/event").IReservation, "id"> & {
         _id: string;
         bookingAgent?: any;
         previousReservationStatus?: factory.reservationStatusType;
     } & Required<{
         _id: string;
-    }>))>>;
+    }> & {
+        __v: number;
+    }) | null>;
     unsetUnnecessaryFields(params: {
         filter: any;
         $unset: any;