@chevre/domain 28.2.0-alpha.2 → 28.2.0-alpha.4

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

@@ -1,5 +1,7 @@
-import type { Connection, FilterQuery, mongo } from 'mongoose';
+import type { Connection } from 'mongoose';
+import type { FilterQuery } from './mongoose/types';
 import { factory } from '../factory';
+import { IModel, IDocType } from './mongoose/schemas/note';
 type INoteAboutOrder = factory.creativeWork.noteDigitalDocument.INoteAboutOrder;
 type IKeyOfProjection = keyof INoteAboutOrder;
 /**
@@ -8,7 +10,7 @@ type IKeyOfProjection = keyof INoteAboutOrder;
 export declare class NoteAboutOrderRepo {
     private readonly noteModel;
     constructor(connection: Connection);
-    static CREATE_MONGO_CONDITIONS(params: factory.creativeWork.noteDigitalDocument.ISearchConditions): FilterQuery<import("@chevre/factory/lib/chevre/creativeWork/noteDigitalDocument").INoteAboutOrder>[];
+    static CREATE_MONGO_CONDITIONS(params: factory.creativeWork.noteDigitalDocument.ISearchConditions): FilterQuery<IDocType>[];
     /**
      * 検索
      */
@@ -20,13 +22,13 @@ export declare class NoteAboutOrderRepo {
      */
     upsertOrderNoteByIdentifier(params: Pick<INoteAboutOrder, 'about' | 'creator' | 'identifier' | 'project' | 'provider' | 'text' | 'version'>[], options: {
         overwrite: boolean;
-    }): Promise<mongo.BulkWriteResult | undefined>;
+    }): Promise<Awaited<ReturnType<IModel['bulkWrite']>> | undefined>;
     updateById(params: {
         id: string;
         attributes: Pick<INoteAboutOrder, 'text' | 'editor'>;
     }): Promise<void>;
     unsetUnnecessaryFields(params: {
-        filter: FilterQuery<factory.creativeWork.noteDigitalDocument.INoteAboutOrder>;
+        filter: FilterQuery<IDocType>;
         $unset: any;
     }): Promise<import("mongoose").UpdateWriteOpResult>;
 }

package/lib/chevre/repo/noteAboutOrder.js

@@ -174,7 +174,7 @@ class NoteAboutOrderRepo {
             throw new factory_1.factory.errors.NotFound(this.noteModel.modelName);
         }
     }
-    // public getCursor(conditions: FilterQuery<factory.creativeWork.noteDigitalDocument.INoteAboutOrder>, projection: any) {
+    // public getCursor(conditions: FilterQuery<IDocType>, projection: any) {
     //     return this.noteModel.find(
     //         {
     //             ...conditions,

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

@@ -1,6 +1,7 @@
-import type { Connection, FilterQuery, mongo } from 'mongoose';
+import type { Connection } from 'mongoose';
+import type { FilterQuery } from './mongoose/types';
 import { factory } from '../factory';
-import { IDocType } from './mongoose/schemas/offerCatalog';
+import { IDocType, IModel } from './mongoose/schemas/offerCatalog';
 export type IAggregatedOfferCatalog = Pick<factory.offerCatalog.IOfferCatalog, 'id' | 'name' | 'description' | 'project' | 'typeOf' | 'identifier' | 'itemOffered'> & {
     numberOfItems?: number;
     itemListElementTypeOf: factory.offerType.Offer | 'OfferCatalog';
@@ -48,7 +49,7 @@ export declare class OfferCatalogRepo {
          */
         itemListElementType: factory.offerCatalog.IItemListElement['typeOf'];
     }): Promise<{
-        bulkWriteResult?: mongo.BulkWriteResult;
+        bulkWriteResult?: Awaited<ReturnType<IModel['bulkWrite']>>;
         modifiedCatalogs?: {
             id: string;
         }[];
@@ -184,7 +185,7 @@ export declare class OfferCatalogRepo {
         __v: number;
     }) | null>;
     unsetUnnecessaryFields(params: {
-        filter: FilterQuery<factory.offerCatalog.IOfferCatalog>;
+        filter: FilterQuery<IDocType>;
         $unset: any;
     }): Promise<import("mongoose").UpdateWriteOpResult>;
     aggregateItemList(params: {

package/lib/chevre/repo/offerCatalog.js

@@ -126,27 +126,26 @@ class OfferCatalogRepo {
     }
     async save(params) {
         let savedId;
-        let doc;
         if (typeof params.id !== 'string' || params.id === '') {
             const { default: uniqid } = await import('uniqid');
             const newId = uniqid();
             const { id, $unset, ...creatingDoc } = params; // eslint-disable-line @typescript-eslint/no-unused-vars
-            doc = await this.offerCatalogModel.create({ ...creatingDoc, _id: newId });
+            await this.offerCatalogModel.create({ ...creatingDoc, _id: newId });
             savedId = newId;
         }
         else {
             // 上書き禁止属性を除外
             const { id, identifier, itemOffered, project, typeOf, $unset, ...updateFields } = params; // eslint-disable-line @typescript-eslint/no-unused-vars
-            doc = await this.offerCatalogModel.findOneAndUpdate({ _id: { $eq: params.id } }, {
+            const doc = await this.offerCatalogModel.findOneAndUpdate({ _id: { $eq: params.id } }, {
                 $set: updateFields,
                 ...(params.$unset !== undefined) ? { $unset: params.$unset } : undefined
             }, { upsert: false, new: true, projection: { _id: 1 } })
                 .exec();
+            if (doc === null) {
+                throw new factory_1.factory.errors.NotFound(this.offerCatalogModel.modelName);
+            }
             savedId = id;
         }
-        if (doc === null) {
-            throw new factory_1.factory.errors.NotFound(this.offerCatalogModel.modelName);
-        }
         return { id: savedId };
     }
     /**
@@ -169,6 +168,9 @@ class OfferCatalogRepo {
         })
             .lean()
             .exec();
+        if (doc === null) {
+            throw new factory_1.factory.errors.NotFound('OfferCatalog');
+        }
         return { id: doc.id };
     }
     /**

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

@@ -1,6 +1,7 @@
-import { Connection, FilterQuery, mongo } from 'mongoose';
+import { Connection } from 'mongoose';
+import type { FilterQuery } from './mongoose/types';
 import { factory } from '../factory';
-import { IDocType } from './mongoose/schemas/offerCatalogItem';
+import { IDocType, IModel } from './mongoose/schemas/offerCatalogItem';
 type IOfferCatalogItem = Pick<factory.offerCatalog.IOfferCatalog, 'description' | 'identifier' | 'itemListElement' | 'itemOffered' | 'name' | 'project' | 'relatedOffer' | 'typeOf' | 'id'>;
 export type IAggregatedOfferCatalog = Pick<factory.offerCatalog.IOfferCatalog, 'id' | 'name' | 'description' | 'project' | 'typeOf' | 'identifier' | 'itemOffered' | 'relatedOffer'> & {
     numberOfItems?: number;
@@ -43,7 +44,7 @@ export declare class OfferCatalogItemRepo {
          */
         productType: factory.product.ProductType;
     }): Promise<{
-        bulkWriteResult?: mongo.BulkWriteResult;
+        bulkWriteResult?: Awaited<ReturnType<IModel['bulkWrite']>>;
         modifiedCatalogs?: {
             id: string;
         }[];

package/lib/chevre/repo/offerCatalogItem.js

@@ -101,23 +101,25 @@ class OfferCatalogItemRepo {
         return andConditions;
     }
     async save(params) {
-        let doc;
+        let savedId;
         if (typeof params.id !== 'string' || params.id.length === 0) {
             const { id, $unset, ...creatingDoc } = params; // eslint-disable-line @typescript-eslint/no-unused-vars
-            doc = await this.offerCatalogItemModel.create(creatingDoc);
+            const createdDoc = await this.offerCatalogItemModel.create(creatingDoc);
+            savedId = createdDoc.id;
         }
         else {
             const { id, identifier, project, typeOf, $unset, ...updateFields } = params; // eslint-disable-line @typescript-eslint/no-unused-vars
-            doc = await this.offerCatalogItemModel.findOneAndUpdate({ _id: { $eq: params.id } }, {
+            const doc = await this.offerCatalogItemModel.findOneAndUpdate({ _id: { $eq: params.id } }, {
                 $set: updateFields,
                 ...(params.$unset !== undefined) ? { $unset: params.$unset } : undefined
             }, { upsert: false, new: true, projection: { _id: 1 } })
                 .exec();
+            if (doc === null) {
+                throw new factory_1.factory.errors.NotFound(this.offerCatalogItemModel.modelName);
+            }
+            savedId = params.id;
         }
-        if (doc === null) {
-            throw new factory_1.factory.errors.NotFound(this.offerCatalogItemModel.modelName);
-        }
-        return { id: doc.id };
+        return { id: savedId };
     }
     /**
      * プロジェクトとコードから冪等保管

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

@@ -9,7 +9,7 @@ export declare class OfferItemConditionRepo {
     constructor(connection: Connection);
     static CREATE_MONGO_CONDITIONS(params: factory.offerItemCondition.ISearchConditions): any[];
     projectFields(params: factory.offerItemCondition.ISearchConditions, inclusion: IKeyOfProjection[]): Promise<factory.offerItemCondition.IOfferItemCondition[]>;
-    save(params: factory.offerItemCondition.IOfferItemCondition): Promise<{
+    saveOfferItemCondition(params: factory.offerItemCondition.IOfferItemCondition): Promise<{
         id: string;
     }>;
     deleteById(params: {

package/lib/chevre/repo/offerItemCondition.js

@@ -76,23 +76,22 @@ class OfferItemConditionRepo {
             .lean() // lean(2024-09-24~)
             .exec();
     }
-    async save(params) {
+    async saveOfferItemCondition(params) {
         let savedId;
-        let doc;
         if (typeof params.id !== 'string' || params.id === '') {
             const { id, ...creatingParams } = params; // eslint-disable-line @typescript-eslint/no-unused-vars
-            doc = await this.offerItemConditionModel.create(creatingParams);
-            savedId = doc.id;
+            const createdDoc = await this.offerItemConditionModel.create(creatingParams);
+            savedId = createdDoc.id;
         }
         else {
             const { id, identifier, project, typeOf, ...updateFields } = params; // eslint-disable-line @typescript-eslint/no-unused-vars
-            doc = await this.offerItemConditionModel.findOneAndUpdate({ _id: { $eq: id } }, updateFields, { upsert: false, new: true, projection: { _id: 1 } })
+            const doc = await this.offerItemConditionModel.findOneAndUpdate({ _id: { $eq: id } }, updateFields, { upsert: false, new: true, projection: { _id: 1 } })
                 .exec();
+            if (doc === null) {
+                throw new factory_1.factory.errors.NotFound(this.offerItemConditionModel.modelName);
+            }
             savedId = id;
         }
-        if (doc === null) {
-            throw new factory_1.factory.errors.NotFound(this.offerItemConditionModel.modelName);
-        }
         return { id: savedId };
     }
     async deleteById(params) {

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

@@ -1,4 +1,5 @@
-import type { Connection, FilterQuery } from 'mongoose';
+import type { Connection } from 'mongoose';
+import type { FilterQuery } from './mongoose/types';
 import { factory } from '../factory';
 import { IDocType } from './mongoose/schemas/order';
 type IOrderWithoutAcceptedOffers = factory.order.IOrder;
@@ -33,7 +34,7 @@ type ISearchConditions = Pick<factory.order.ISearchConditions, 'acceptedOffers'
 export declare class OrderRepo {
     private readonly orderModel;
     constructor(connection: Connection);
-    static CREATE_MONGO_CONDITIONS(params: ISearchConditions): FilterQuery<factory.order.IOrder>[];
+    static CREATE_MONGO_CONDITIONS(params: ISearchConditions): FilterQuery<IDocType>[];
     /**
      * 注文ステータスを変更する
      */
@@ -132,7 +133,7 @@ export declare class OrderRepo {
     }): Promise<(IOrderWithoutAcceptedOffers & {
         id: string;
     })[]>;
-    getCursor(conditions: any, projection: any): import("mongoose").Cursor<import("mongoose").Document<unknown, Record<string, never>, IDocType, import("./mongoose/virtuals").IVirtuals, {}> & Omit<factory.order.IOrder, "id"> & {
+    getCursor(conditions: any, projection: any): import("mongoose").Cursor<import("mongoose").Document<unknown, Record<string, never>, IDocType, import("./mongoose/virtuals").IVirtuals, {}> & ((Omit<factory.order.IOrder, "id"> & {
         acceptedOffers?: import("./mongoose/schemas/order").IAcceptedOfferInDoc[];
         identifier?: string;
         paymentMethodId?: string;
@@ -140,17 +141,37 @@ export declare class OrderRepo {
         _id: import("mongoose").Types.ObjectId;
     } & {
         __v: number;
-    }, import("mongoose").QueryOptions<IDocType>, (import("mongoose").Document<unknown, Record<string, never>, IDocType, import("./mongoose/virtuals").IVirtuals, {}> & Omit<factory.order.IOrder, "id"> & {
+    }) | (Omit<Omit<factory.order.IOrder, "id"> & {
         acceptedOffers?: import("./mongoose/schemas/order").IAcceptedOfferInDoc[];
         identifier?: string;
         paymentMethodId?: string;
+    }, "typeOf"> & {
+        typeOf: factory.transactionType.PlaceOrder;
     } & {
         _id: import("mongoose").Types.ObjectId;
     } & {
         __v: number;
-    }) | null>;
+    })), import("mongoose").QueryOptions<IDocType>, (import("mongoose").Document<unknown, Record<string, never>, IDocType, import("./mongoose/virtuals").IVirtuals, {}> & ((Omit<factory.order.IOrder, "id"> & {
+        acceptedOffers?: import("./mongoose/schemas/order").IAcceptedOfferInDoc[];
+        identifier?: string;
+        paymentMethodId?: string;
+    } & {
+        _id: import("mongoose").Types.ObjectId;
+    } & {
+        __v: number;
+    }) | (Omit<Omit<factory.order.IOrder, "id"> & {
+        acceptedOffers?: import("./mongoose/schemas/order").IAcceptedOfferInDoc[];
+        identifier?: string;
+        paymentMethodId?: string;
+    }, "typeOf"> & {
+        typeOf: factory.transactionType.PlaceOrder;
+    } & {
+        _id: import("mongoose").Types.ObjectId;
+    } & {
+        __v: number;
+    }))) | null>;
     unsetUnnecessaryFields(params: {
-        filter: FilterQuery<factory.order.IOrder>;
+        filter: FilterQuery<IDocType>;
         $unset: any;
         arrayFilters?: any[];
     }): Promise<import("mongoose").UpdateWriteOpResult>;

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

@@ -1,6 +1,7 @@
-import type { Connection, FilterQuery } from 'mongoose';
+import type { Connection } from 'mongoose';
+import type { FilterQuery } from './mongoose/types';
 import { factory } from '../factory';
-import { IModel } from './mongoose/schemas/paymentService';
+import { IModel, IDocType } from './mongoose/schemas/paymentService';
 type IUnsetKey = keyof Pick<factory.service.paymentService.IService, 'additionalProperty' | 'availableChannel' | 'serviceOutput' | 'serviceType'>;
 type IKeyOfProjection4paymentService = keyof factory.service.paymentService.IService;
 /**
@@ -14,7 +15,7 @@ export declare class PaymentServiceRepo {
     private readonly paymentServiceModel;
     private readonly paymentServiceChannelModel;
     constructor(connection: Connection);
-    static CREATE_MONGO_CONDITIONS(params: ISearchConditions4paymentService): FilterQuery<import("@chevre/factory/lib/chevre/service/paymentService").IService>[];
+    static CREATE_MONGO_CONDITIONS(params: ISearchConditions4paymentService): FilterQuery<IDocType>[];
     /**
      * 決済サービスを保管する
      */

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

@@ -1,4 +1,6 @@
-import { Connection, FilterQuery } from 'mongoose';
+import { Connection } from 'mongoose';
+import type { FilterQuery } from './mongoose/types';
+import { IDocType } from './mongoose/schemas/paymentService';
 import { factory } from '../factory';
 type IAvailablePaymentServiceType = factory.service.paymentService.PaymentServiceType.CreditCard | factory.service.paymentService.PaymentServiceType.MovieTicket;
 export type IPublicPaymentServiceByProvider = Pick<factory.service.paymentService.IService, 'name' | 'description' | 'typeOf' | 'id' | 'productID' | 'serviceType' | 'serviceOutput' | 'additionalProperty'> & {
@@ -77,7 +79,7 @@ export declare class PaymentServiceProviderRepo {
         };
     }): Promise<import("mongoose").UpdateWriteOpResult>;
     unsetUnnecessaryFields(params: {
-        filter: FilterQuery<factory.service.paymentService.IService>;
+        filter: FilterQuery<IDocType>;
         $unset: any;
     }): Promise<import("mongoose").UpdateWriteOpResult>;
 }

package/lib/chevre/repo/paymentServiceProvider.js

@@ -125,13 +125,13 @@ class PaymentServiceProviderRepo {
     }
     async create(params) {
         // 決済サービス存在確認
-        let doc = await this.paymentServiceModel.findOne({
+        const existingDoc = await this.paymentServiceModel.findOne({
             typeOf: { $eq: params.providesPaymentService.typeOf },
             'project.id': { $eq: params.project.id },
             _id: { $eq: params.providesPaymentService.id }
         }, { _id: 1, typeOf: 1 })
             .exec();
-        if (doc === null) {
+        if (existingDoc === null) {
             throw new factory_1.factory.errors.NotFound(params.providesPaymentService.typeOf);
         }
         const creatingProvider = {
@@ -141,7 +141,7 @@ class PaymentServiceProviderRepo {
             // name: params.name,
             typeOf: params.typeOf
         };
-        doc = await this.paymentServiceModel.findOneAndUpdate({
+        const doc = await this.paymentServiceModel.findOneAndUpdate({
             typeOf: { $eq: params.providesPaymentService.typeOf },
             'project.id': { $eq: params.project.id },
             _id: { $eq: params.providesPaymentService.id },

package/lib/chevre/repo/place/entranceGate.d.ts

@@ -1,5 +1,6 @@
-import { Connection, mongo } from 'mongoose';
+import { Connection } from 'mongoose';
 import { factory } from '../../factory';
+import { IModel } from '../mongoose/schemas/civicStructure';
 /**
  * ゲートを操作する組織
  */
@@ -36,12 +37,12 @@ export declare class EntranceGateRepo {
     addEntranceGatesByIdentifierIfNotExist(params: {
         $set: ICreatingEntranceGate;
     }[], options: IUpdateOptions): Promise<{
-        bulkWriteResult?: mongo.BulkWriteResult;
+        bulkWriteResult?: Awaited<ReturnType<IModel['bulkWrite']>>;
     }>;
     updateEntranceGatesByIdentifier(params: {
         $set: ICreatingEntranceGate;
     }[], options: IUpdateOptions): Promise<{
-        bulkWriteResult?: mongo.BulkWriteResult;
+        bulkWriteResult?: Awaited<ReturnType<IModel['bulkWrite']>>;
     }>;
     deleteEntranceGatesByIdentifier(params: {
         /**
@@ -49,7 +50,7 @@ export declare class EntranceGateRepo {
          */
         identifier: string;
     }[], options: IUpdateOptions): Promise<{
-        bulkWriteResult?: mongo.BulkWriteResult;
+        bulkWriteResult?: Awaited<ReturnType<IModel['bulkWrite']>>;
     }>;
     private createMatchStages;
 }

package/lib/chevre/repo/place/movieTheater.d.ts

@@ -1,6 +1,7 @@
-import type { Connection, FilterQuery, mongo } from 'mongoose';
+import type { Connection } from 'mongoose';
+import type { FilterQuery } from '../mongoose/types';
 import { factory } from '../../factory';
-import { IDocType } from '../mongoose/schemas/civicStructure';
+import { IDocType, IModel } from '../mongoose/schemas/civicStructure';
 export type IScreeningRoomFoundByBranchCode = Pick<factory.place.screeningRoom.IPlace, 'typeOf' | 'branchCode' | 'name' | 'containsPlace' | 'seatCount' | 'parentOrganization'>;
 export type IMovieTheaterIncludingScreeningRooms = Pick<factory.place.movieTheater.IPlace, 'additionalProperty' | 'branchCode' | 'kanaName' | 'name' | 'offers' | 'parentOrganization' | 'project' | 'telephone' | 'typeOf'> & {
     containsPlace: factory.place.screeningRoom.IPlace[];
@@ -28,7 +29,7 @@ interface IUpsertOptions {
 export declare class MovieTheaterRepo {
     private readonly civicStructureModel;
     constructor(connection: Connection);
-    static CREATE_MOVIE_THEATER_MONGO_CONDITIONS(params: factory.place.movieTheater.ISearchConditions): FilterQuery<import("@chevre/factory/lib/chevre/place/movieTheater").IPlace>[];
+    static CREATE_MOVIE_THEATER_MONGO_CONDITIONS(params: factory.place.movieTheater.ISearchConditions): FilterQuery<IDocType>[];
     /**
      * 施設を保管する
      */
@@ -48,7 +49,7 @@ export declare class MovieTheaterRepo {
             [key in keyof IUpsertingMovieTheater]?: 1;
         };
     }[], options: IUpsertOptions): Promise<{
-        bulkWriteResult?: mongo.BulkWriteResult;
+        bulkWriteResult?: Awaited<ReturnType<IModel['bulkWrite']>>;
         /**
          * 追加あるいは編集された施設
          */
@@ -85,7 +86,7 @@ export declare class MovieTheaterRepo {
              */
             id: string;
         };
-    }): Promise<mongo.DeleteResult>;
+    }): Promise<import("mongodb").DeleteResult>;
     /**
      * プロジェクトに属する施設を全削除
      */
@@ -94,7 +95,7 @@ export declare class MovieTheaterRepo {
             id: string;
         };
     }): Promise<void>;
-    getCursor(conditions: FilterQuery<any>, projection: any): import("mongoose").Cursor<import("mongoose").Document<unknown, Record<string, never>, IDocType, import("../mongoose/virtuals").IVirtuals, {}> & Omit<import("@chevre/factory/lib/chevre/place/movieTheater").IPlace, "id"> & {
+    getCursor(conditions: FilterQuery<IDocType>, projection: any): import("mongoose").Cursor<import("mongoose").Document<unknown, Record<string, never>, IDocType, import("../mongoose/virtuals").IVirtuals, {}> & Omit<import("@chevre/factory/lib/chevre/place/movieTheater").IPlace, "id"> & {
         hasPOS?: factory.place.movieTheater.IPOS[];
         hasEntranceGate?: factory.place.movieTheater.IEntranceGate[];
     } & {

package/lib/chevre/repo/place/movieTheater.js

@@ -80,14 +80,13 @@ class MovieTheaterRepo {
      */
     async saveMovieTheater(params) {
         let savedId;
-        let doc;
         if (params.id === '') {
             const { 
             // 入場ゲートを保管しない(2026-01-11~)
             id, hasEntranceGate, // eslint-disable-line @typescript-eslint/no-unused-vars
             ...creatingParams } = params; // omit id(2024-09-12~)
-            doc = await this.civicStructureModel.create(creatingParams);
-            savedId = doc.id;
+            const createdDoc = await this.civicStructureModel.create(creatingParams);
+            savedId = createdDoc.id;
         }
         else {
             // 上書き禁止属性を除外(2022-08-24~)
@@ -95,13 +94,13 @@ class MovieTheaterRepo {
             // 入場ゲートを保管しない(2026-01-11~)
             id, branchCode, project, typeOf, hasEntranceGate, // eslint-disable-line @typescript-eslint/no-unused-vars
             ...updateFields } = params;
-            doc = await this.civicStructureModel.findOneAndUpdate({ _id: { $eq: params.id } }, updateFields, { upsert: false, new: true, projection: { _id: 1 } })
+            const doc = await this.civicStructureModel.findOneAndUpdate({ _id: { $eq: params.id } }, updateFields, { upsert: false, new: true, projection: { _id: 1 } })
                 .exec();
+            if (doc === null) {
+                throw new factory_1.factory.errors.NotFound(this.civicStructureModel.modelName);
+            }
             savedId = params.id;
         }
-        if (doc === null) {
-            throw new factory_1.factory.errors.NotFound(this.civicStructureModel.modelName);
-        }
         return { id: savedId };
     }
     async saveMovieTheaterByBranchCode4coa(params) {

package/lib/chevre/repo/place/screeningRoom.d.ts

@@ -1,6 +1,7 @@
-import type { Connection, FilterQuery, PipelineStage, mongo } from 'mongoose';
+import type { Connection, PipelineStage } from 'mongoose';
+import type { FilterQuery } from '../mongoose/types';
 import { factory } from '../../factory';
-import { IDocType } from '../mongoose/schemas/place';
+import { IDocType, IModel } from '../mongoose/schemas/place';
 export type IScreeningRoomFoundByBranchCode = Pick<factory.place.screeningRoom.IPlace, 'typeOf' | 'branchCode' | 'name' | 'containsPlace' | 'seatCount' | 'parentOrganization'>;
 type IMatchStage = PipelineStage.Match;
 type IUpsertingRoom = Pick<factory.place.screeningRoom.IPlace, 'additionalProperty' | 'address' | 'branchCode' | 'name' | 'openSeatingAllowed'>;
@@ -65,7 +66,7 @@ export declare class ScreeningRoomRepo {
             [key in keyof IUpsertingRoom]?: 1;
         };
     }[], options: IUpsertOptions): Promise<{
-        bulkWriteResult?: mongo.BulkWriteResult;
+        bulkWriteResult?: Awaited<ReturnType<IModel['bulkWrite']>>;
     }>;
     deleteRoomByBranchCode(screeningRoom: {
         /**
@@ -83,7 +84,7 @@ export declare class ScreeningRoomRepo {
              */
             id: string;
         };
-    }): Promise<mongo.DeleteResult>;
+    }): Promise<import("mongodb").DeleteResult>;
     /**
      * ルーム検索
      * sectionCount,seatCountのprojectが可能
@@ -136,7 +137,7 @@ export declare class ScreeningRoomRepo {
              */
             id: string;
         };
-    }): Promise<mongo.DeleteResult>;
+    }): Promise<import("mongodb").DeleteResult>;
     /**
      * プロジェクトに属するルームを全削除
      */
@@ -145,7 +146,7 @@ export declare class ScreeningRoomRepo {
             id: string;
         };
     }): Promise<void>;
-    getCursor(conditions: FilterQuery<any>, projection: any): import("mongoose").Cursor<import("mongoose").Document<unknown, Record<string, never>, IDocType, import("../mongoose/virtuals").IVirtuals, {}> & Omit<import("@chevre/factory/lib/chevre/place/screeningRoom").IPlace, "containsPlace"> & {
+    getCursor(conditions: FilterQuery<IDocType>, projection: any): import("mongoose").Cursor<import("mongoose").Document<unknown, Record<string, never>, IDocType, import("../mongoose/virtuals").IVirtuals, {}> & Omit<import("@chevre/factory/lib/chevre/place/screeningRoom").IPlace, "containsPlace"> & {
         description?: any;
         openingHoursSpecification?: any;
         smokingAllowed?: boolean;

package/lib/chevre/repo/place/seat.d.ts

@@ -1,5 +1,6 @@
-import type { AnyExpression, Connection, PipelineStage, mongo } from 'mongoose';
+import type { AnyExpression, Connection, PipelineStage } from 'mongoose';
 import { factory } from '../../factory';
+import { IModel } from '../mongoose/schemas/place';
 type IMatchStage = PipelineStage.Match;
 type ICreatingSeat = Pick<factory.place.seat.IPlace, 'additionalProperty' | 'branchCode' | 'name' | 'maximumAttendeeCapacity' | 'seatingType'>;
 interface IUpdateOptions {
@@ -44,7 +45,7 @@ export declare class SeatRepo {
     addSeatsByBranchCodeIfNotExist(params: {
         $set: ICreatingSeat;
     }[], options: IUpdateOptions): Promise<{
-        bulkWriteResult?: mongo.BulkWriteResult;
+        bulkWriteResult?: Awaited<ReturnType<IModel['bulkWrite']>>;
     }>;
     /**
      * コードをキーにして冪等編集
@@ -55,7 +56,7 @@ export declare class SeatRepo {
             [key in keyof ICreatingSeat]?: 1;
         };
     }[], options: IUpdateOptions): Promise<{
-        bulkWriteResult?: mongo.BulkWriteResult;
+        bulkWriteResult?: Awaited<ReturnType<IModel['bulkWrite']>>;
     }>;
     updateSeatByBranchCode(seat: ICreatingSeat, $unset: any, // eslint-disable-line @typescript-eslint/no-explicit-any
     options: IUpdateOptions): Promise<IUpdateSeatResult>;
@@ -165,7 +166,7 @@ export declare class SeatRepo {
          */
         branchCode: string;
     }[], options: IUpdateOptions): Promise<{
-        bulkWriteResult?: mongo.BulkWriteResult;
+        bulkWriteResult?: Awaited<ReturnType<IModel['bulkWrite']>>;
     }>;
     deleteSeatByBranchCode(seat: {
         /**

package/lib/chevre/repo/place/section.d.ts

@@ -1,5 +1,6 @@
-import type { Connection, PipelineStage, mongo } from 'mongoose';
+import type { Connection, PipelineStage } from 'mongoose';
 import { factory } from '../../factory';
+import { IModel } from '../mongoose/schemas/place';
 type IScreeningRoomSectionWithoutContainsPlace = Omit<factory.place.screeningRoomSection.IPlace, 'containsPlace'>;
 type ICreatingSection = Pick<factory.place.screeningRoomSection.IPlace, 'additionalProperty' | 'branchCode' | 'name'>;
 type IMatchStage = PipelineStage.Match;
@@ -56,7 +57,7 @@ export declare class SectionRepo {
     addSeatSectionsByBranchCodeIfNotExist(params: {
         $set: IUpsertingSeatSection;
     }[], options: IUpsertOptions): Promise<{
-        bulkWriteResult?: mongo.BulkWriteResult;
+        bulkWriteResult?: Awaited<ReturnType<IModel['bulkWrite']>>;
     }>;
     /**
      * コードをキーにして冪等編集
@@ -64,7 +65,7 @@ export declare class SectionRepo {
     updateSeatSectionsByBranchCode(params: {
         $set: IUpsertingSeatSection;
     }[], options: IUpsertOptions): Promise<{
-        bulkWriteResult?: mongo.BulkWriteResult;
+        bulkWriteResult?: Awaited<ReturnType<IModel['bulkWrite']>>;
     }>;
     migrateSectionIdentifier(screeningRoomSection: {
         project: {

package/lib/chevre/repo/place/section.js

@@ -338,7 +338,7 @@ class SectionRepo {
     //     if (!Array.isArray(containsPlace)) {
     //         throw new factory.errors.ArgumentNull('containsPlace');
     //     }
-    //     const doc = await this.placeModel.findOneAndUpdate<HydratedDocument<IUpdateSectionResult>>(
+    //     const doc = await this.placeModel.findOneAndUpdate(
     //         {
     //             typeOf: { $eq: factory.placeType.ScreeningRoom },
     //             'project.id': { $eq: project.id },

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

@@ -1,4 +1,5 @@
-import { Connection, FilterQuery, QueryOptions } from 'mongoose';
+import { Connection, QueryOptions } from 'mongoose';
+import type { FilterQuery } from './mongoose/types';
 import { factory } from '../factory';
 import { IDocType } from './mongoose/schemas/potentialAction';
 export type ISavingPotentialAction = Pick<factory.potentialAction.IPotentialAction, 'target' | 'project' | 'typeOf' | 'identifier'> & {
@@ -14,7 +15,7 @@ type IKeyOfProjection = keyof factory.potentialAction.IPotentialAction;
 export declare class PotentialActionRepo {
     private readonly potentialActionModel;
     constructor(connection: Connection);
-    static CREATE_FILTER_QUERY(params: factory.potentialAction.ISearchConditions): FilterQuery<factory.potentialAction.IPotentialInformAction>[];
+    static CREATE_FILTER_QUERY(params: factory.potentialAction.ISearchConditions): FilterQuery<IDocType>[];
     save(params: {
         id?: string;
         attributes: ISavingPotentialAction & IUnset;

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

@@ -13,9 +13,9 @@ export declare class PriceSpecificationRepo {
     findById<T extends factory.priceSpecificationType>(params: {
         id: string;
     }): Promise<factory.priceSpecification.IPriceSpecification<T>>;
-    save<T extends factory.priceSpecificationType.CategoryCodeChargeSpecification | factory.priceSpecificationType.MovieTicketTypeChargeSpecification>(params: {
+    savePriceSpec(params: {
         id?: string;
-        attributes: factory.priceSpecification.IPriceSpecification<T> & {
+        attributes: (Omit<factory.priceSpecification.IPriceSpecification<factory.priceSpecificationType.CategoryCodeChargeSpecification>, 'id'> | Omit<factory.priceSpecification.IPriceSpecification<factory.priceSpecificationType.MovieTicketTypeChargeSpecification>, 'id'>) & {
             id?: never;
             $unset?: never;
         };

package/lib/chevre/repo/priceSpecification.js

@@ -196,7 +196,7 @@ class PriceSpecificationRepo {
         }
         return doc;
     }
-    async save(params) {
+    async savePriceSpec(params) {
         let savedId;
         if (typeof params.id !== 'string') {
             const { $unset, id, ...creatingDoc } = params.attributes; // eslint-disable-line @typescript-eslint/no-unused-vars