@chevre/domain 24.0.0-alpha.27 → 24.0.0-alpha.29

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

@@ -1,10 +1,11 @@
 import { IndexDefinition, IndexOptions, Model, Schema, SchemaDefinition } from 'mongoose';
+import { IVirtuals } from '../virtuals';
 import * as factory from '../../../factory';
 type IDocType = Omit<factory.task.ITask<factory.taskName>, 'id'>;
-type IModel = Model<IDocType>;
+type IModel = Model<IDocType, {}, {}, IVirtuals>;
 type ISchemaDefinition = SchemaDefinition<IDocType>;
-type ISchema = Schema<IDocType, IModel, {}, {}, {}, {}, ISchemaDefinition, IDocType>;
+type ISchema = Schema<IDocType, IModel, {}, {}, IVirtuals, {}, ISchemaDefinition, IDocType>;
 declare const modelName = "Task";
 declare const indexes: [d: IndexDefinition, o: IndexOptions][];
 declare function createSchema(): ISchema;
-export { createSchema, IModel, indexes, modelName };
+export { createSchema, IDocType, IModel, indexes, modelName };

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

@@ -1,9 +1,10 @@
 import { IndexDefinition, IndexOptions, Model, Schema, SchemaDefinition } from 'mongoose';
+import { IVirtuals } from '../virtuals';
 type IDocType = any;
-type IModel = Model<IDocType>;
+type IModel = Model<IDocType, {}, {}, IVirtuals>;
 type ISchemaDefinition = SchemaDefinition<IDocType>;
-type ISchema = Schema<IDocType, IModel, {}, {}, {}, {}, ISchemaDefinition, IDocType>;
+type ISchema = Schema<IDocType, IModel, {}, {}, IVirtuals, {}, ISchemaDefinition, IDocType>;
 declare const modelName = "Telemetry";
 declare function createSchema(): ISchema;
 declare const indexes: [d: IndexDefinition, o: IndexOptions][];
-export { createSchema, IModel, indexes, modelName };
+export { createSchema, IDocType, IModel, indexes, modelName };

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

@@ -1,4 +1,5 @@
 import { IndexDefinition, IndexOptions, Model, Schema, SchemaDefinition } from 'mongoose';
+import { IVirtuals } from '../virtuals';
 import * as factory from '../../../factory';
 export interface ITicketIssuedBy {
     id: string;
@@ -19,10 +20,10 @@ export interface ITicket {
     issuedBy: ITicketIssuedBy;
 }
 type IDocType = Omit<ITicket, 'id'>;
-type IModel = Model<IDocType>;
+type IModel = Model<IDocType, {}, {}, IVirtuals>;
 type ISchemaDefinition = SchemaDefinition<IDocType>;
-type ISchema = Schema<IDocType, IModel, {}, {}, {}, {}, ISchemaDefinition, IDocType>;
+type ISchema = Schema<IDocType, IModel, {}, {}, IVirtuals, {}, ISchemaDefinition, IDocType>;
 declare const modelName = "Ticket";
 declare const indexes: [d: IndexDefinition, o: IndexOptions][];
 declare function createSchema(): ISchema;
-export { createSchema, IModel, indexes, modelName };
+export { createSchema, IDocType, IModel, indexes, modelName };

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

@@ -1,10 +1,14 @@
 import { IndexDefinition, IndexOptions, Model, Schema, SchemaDefinition } from 'mongoose';
+import { IVirtuals } from '../virtuals';
 import * as factory from '../../../factory';
-type IDocType = factory.transaction.ITransaction<factory.transactionType>;
-type IModel = Model<IDocType>;
+type IPlaceOrder = Omit<factory.transaction.placeOrder.ITransaction, 'id'>;
+type IReturnOrder = Omit<factory.transaction.returnOrder.ITransaction, 'id'>;
+type IMoneyTransfer = Omit<factory.transaction.moneyTransfer.ITransaction, 'id'>;
+type IDocType = IPlaceOrder | IReturnOrder | IMoneyTransfer;
+type IModel = Model<IDocType, {}, {}, IVirtuals>;
 type ISchemaDefinition = SchemaDefinition<IDocType>;
-type ISchema = Schema<IDocType, IModel, {}, {}, {}, {}, ISchemaDefinition, IDocType>;
+type ISchema = Schema<IDocType, IModel, {}, {}, IVirtuals, {}, ISchemaDefinition, IDocType>;
 declare const modelName = "Transaction";
 declare const indexes: [d: IndexDefinition, o: IndexOptions][];
 declare function createSchema(): ISchema;
-export { createSchema, IModel, indexes, modelName };
+export { createSchema, IDocType, IModel, indexes, modelName };

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

@@ -1,4 +1,5 @@
 import { Model, Schema, SchemaDefinition } from 'mongoose';
+import { IVirtuals } from '../virtuals';
 import * as factory from '../../../factory';
 declare enum DataCatalogIdentifier {
     confirmationNumber = "confirmationNumber",
@@ -31,9 +32,9 @@ interface IDataFeed {
     };
 }
 type IDocType = IDataFeed;
-type IModel = Model<IDocType>;
+type IModel = Model<IDocType, {}, {}, IVirtuals>;
 type ISchemaDefinition = SchemaDefinition<IDocType>;
-type ISchema = Schema<IDocType, IModel, {}, {}, {}, {}, ISchemaDefinition, IDocType>;
+type ISchema = Schema<IDocType, IModel, {}, {}, IVirtuals, {}, ISchemaDefinition, IDocType>;
 declare const modelName = "TransactionNumber";
 declare function createSchema(): ISchema;
 export { createSchema, IDocType, IModel, modelName, DataCatalogIdentifier };

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

@@ -1,10 +1,11 @@
 import { IndexDefinition, IndexOptions, Model, Schema, SchemaDefinition } from 'mongoose';
+import { IVirtuals } from '../virtuals';
 import * as factory from '../../../factory';
 type IDocType = Omit<factory.trip.ITrip<factory.tripType>, 'id'>;
-type IModel = Model<IDocType>;
+type IModel = Model<IDocType, {}, {}, IVirtuals>;
 type ISchemaDefinition = SchemaDefinition<IDocType>;
-type ISchema = Schema<IDocType, IModel, {}, {}, {}, {}, ISchemaDefinition, IDocType>;
+type ISchema = Schema<IDocType, IModel, {}, {}, IVirtuals, {}, ISchemaDefinition, IDocType>;
 declare const modelName = "Trip";
 declare const indexes: [d: IndexDefinition, o: IndexOptions][];
 declare function createSchema(): ISchema;
-export { createSchema, IModel, indexes, modelName };
+export { createSchema, IDocType, IModel, indexes, modelName };

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

@@ -1,10 +1,11 @@
 import { IndexDefinition, IndexOptions, Model, Schema, SchemaDefinition } from 'mongoose';
+import { IVirtuals } from '../virtuals';
 import * as factory from '../../../factory';
 type IDocType = Omit<factory.creativeWork.certification.webSite.ICertification, 'id'>;
-type IModel = Model<IDocType>;
+type IModel = Model<IDocType, {}, {}, IVirtuals>;
 type ISchemaDefinition = SchemaDefinition<IDocType>;
-type ISchema = Schema<IDocType, IModel, {}, {}, {}, {}, ISchemaDefinition, IDocType>;
+type ISchema = Schema<IDocType, IModel, {}, {}, IVirtuals, {}, ISchemaDefinition, IDocType>;
 declare const modelName = "WebSite";
 declare const indexes: [d: IndexDefinition, o: IndexOptions][];
 declare function createSchema(): ISchema;
-export { createSchema, IModel, indexes, modelName };
+export { createSchema, IDocType, IModel, indexes, modelName };

package/lib/chevre/repo/mongoose/virtuals.d.ts

@@ -0,0 +1,3 @@
+export interface IVirtuals {
+    id: string;
+}

package/lib/chevre/repo/mongoose/virtuals.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

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

@@ -4,7 +4,7 @@ import * as factory from '../factory';
 type IUnset = {
     [key in keyof Pick<IDocType, 'color' | 'image'>]?: 1;
 };
-type IKeyOfProjection = keyof IDocType;
+type IKeyOfProjection = keyof IDocType | 'id';
 /**
  * 決済カード区分リポジトリ
  */
@@ -35,6 +35,7 @@ export declare class MovieTicketTypeRepo {
         id?: string;
         attributes: IDocType & {
             $unset?: IUnset;
+            id?: string;
         };
     }): Promise<{
         id: string;

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

@@ -1,5 +1,5 @@
 import type { BulkWriteResult } from 'mongodb';
-import type { Connection, Document, FilterQuery } from 'mongoose';
+import type { Connection, FilterQuery } from 'mongoose';
 import * as factory from '../factory';
 import { IDocType } from './mongoose/schemas/offerCatalog';
 export type IAggregatedOfferCatalog = Pick<factory.offerCatalog.IOfferCatalog, 'id' | 'name' | 'description' | 'project' | 'typeOf' | 'identifier' | 'itemOffered' | 'additionalProperty'> & {
@@ -169,19 +169,23 @@ export declare class OfferCatalogRepo {
             id: string;
         };
     }): Promise<void>;
-    getCursor(conditions: any, projection: any): import("mongoose").Cursor<Document<unknown, {}, IDocType> & factory.offerCatalog.IOfferCatalog & {
+    getCursor(conditions: any, projection: any): import("mongoose").Cursor<import("mongoose").Document<unknown, {}, IDocType, import("./mongoose/virtuals").IVirtuals, {}> & Omit<Omit<factory.offerCatalog.IOfferCatalog, "id"> & {
         _id: string;
         alternateName?: any;
         dateSynced?: Date;
     } & Required<{
         _id: string;
-    }>, import("mongoose").QueryOptions<Document<unknown, {}, IDocType> & factory.offerCatalog.IOfferCatalog & {
+    }> & {
+        __v: number;
+    }, "id"> & import("./mongoose/virtuals").IVirtuals, import("mongoose").QueryOptions<IDocType>, (import("mongoose").Document<unknown, {}, IDocType, import("./mongoose/virtuals").IVirtuals, {}> & Omit<Omit<factory.offerCatalog.IOfferCatalog, "id"> & {
         _id: string;
         alternateName?: any;
         dateSynced?: Date;
     } & Required<{
         _id: string;
-    }>>>;
+    }> & {
+        __v: number;
+    }, "id"> & import("./mongoose/virtuals").IVirtuals) | null>;
     unsetUnnecessaryFields(params: {
         filter: FilterQuery<factory.offerCatalog.IOfferCatalog>;
         $unset: any;

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

@@ -1,5 +1,6 @@
 import type { Connection, FilterQuery } from 'mongoose';
 import * as factory from '../factory';
+import { IDocType } from './mongoose/schemas/order';
 type IOrderWithoutAcceptedOffers = factory.order.IOrder;
 type IKeyOfProjection = Extract<keyof IOrderWithoutAcceptedOffers, 'broker' | 'confirmationNumber' | 'customer' | 'dateReturned' | 'identifier' | 'name' | 'orderDate' | 'orderNumber' | 'orderStatus' | 'orderedItem' | 'paymentMethods' | 'previousOrderStatus' | 'price' | 'priceCurrency' | 'project' | 'returner' | 'seller' | 'typeOf' | 'url'> | 'paymentMethods.accountId' | 'paymentMethods.name' | 'paymentMethods.paymentMethod' | 'paymentMethods.paymentMethodId' | 'paymentMethods.totalPaymentDue' | 'paymentMethods.additionalProperty' | 'paymentMethods.issuedThrough' | 'customer.id' | 'customer.typeOf';
 export type IReturnedOrder = Pick<IOrderWithoutAcceptedOffers, 'project' | 'typeOf' | 'orderNumber' | 'dateReturned' | 'id' | 'customer' | 'returner' | 'seller' | 'price' | 'priceCurrency' | 'orderDate'> & {
@@ -142,19 +143,19 @@ export declare class OrderRepo {
     }): Promise<(IOrderWithoutAcceptedOffers & {
         id: string;
     })[]>;
-    getCursor(conditions: any, projection: any): import("mongoose").Cursor<import("mongoose").Document<unknown, {}, Omit<factory.order.IOrder, "id"> & {
-        acceptedOffers?: factory.order.IAcceptedOffer<factory.order.IItemOffered>[];
-    }> & Omit<factory.order.IOrder, "id"> & {
+    getCursor(conditions: any, projection: any): import("mongoose").Cursor<import("mongoose").Document<unknown, {}, IDocType, import("./mongoose/virtuals").IVirtuals, {}> & Omit<Omit<factory.order.IOrder, "id"> & {
         acceptedOffers?: factory.order.IAcceptedOffer<factory.order.IItemOffered>[];
     } & {
         _id: import("mongoose").Types.ObjectId;
-    }, import("mongoose").QueryOptions<import("mongoose").Document<unknown, {}, Omit<factory.order.IOrder, "id"> & {
-        acceptedOffers?: factory.order.IAcceptedOffer<factory.order.IItemOffered>[];
-    }> & Omit<factory.order.IOrder, "id"> & {
+    } & {
+        __v: number;
+    }, "id"> & import("./mongoose/virtuals").IVirtuals, import("mongoose").QueryOptions<IDocType>, (import("mongoose").Document<unknown, {}, IDocType, import("./mongoose/virtuals").IVirtuals, {}> & Omit<Omit<factory.order.IOrder, "id"> & {
         acceptedOffers?: factory.order.IAcceptedOffer<factory.order.IItemOffered>[];
     } & {
         _id: import("mongoose").Types.ObjectId;
-    }>>;
+    } & {
+        __v: number;
+    }, "id"> & import("./mongoose/virtuals").IVirtuals) | null>;
     unsetUnnecessaryFields(params: {
         filter: FilterQuery<factory.order.IOrder>;
         $unset: any;

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

@@ -1,4 +1,5 @@
 import type { Connection } from 'mongoose';
+import { IDocType } from './mongoose/schemas/ownershipInfo';
 import * as factory from '../factory';
 export type IOwnershipInfoWithId = factory.ownershipInfo.IOwnershipInfo<factory.ownershipInfo.IGood> & {
     id: string;
@@ -73,19 +74,19 @@ export declare class OwnershipInfoRepo {
             $lt: Date;
         };
     }): Promise<void>;
-    getCursor(conditions: any, projection: any): import("mongoose").Cursor<import("mongoose").Document<unknown, {}, factory.ownershipInfo.IOwnershipInfo<factory.ownershipInfo.IGood> & {
-        _id: string;
-    }> & factory.ownershipInfo.IOwnershipInfo<factory.ownershipInfo.IGood> & {
+    getCursor(conditions: any, projection: any): import("mongoose").Cursor<import("mongoose").Document<unknown, {}, IDocType, import("./mongoose/virtuals").IVirtuals, {}> & Omit<Omit<factory.ownershipInfo.IOwnershipInfo<factory.ownershipInfo.IGood>, "id"> & {
         _id: string;
     } & Required<{
         _id: string;
-    }>, import("mongoose").QueryOptions<import("mongoose").Document<unknown, {}, factory.ownershipInfo.IOwnershipInfo<factory.ownershipInfo.IGood> & {
-        _id: string;
-    }> & factory.ownershipInfo.IOwnershipInfo<factory.ownershipInfo.IGood> & {
+    }> & {
+        __v: number;
+    }, "id"> & import("./mongoose/virtuals").IVirtuals, import("mongoose").QueryOptions<IDocType>, (import("mongoose").Document<unknown, {}, IDocType, import("./mongoose/virtuals").IVirtuals, {}> & Omit<Omit<factory.ownershipInfo.IOwnershipInfo<factory.ownershipInfo.IGood>, "id"> & {
         _id: string;
     } & Required<{
         _id: string;
-    }>>>;
+    }> & {
+        __v: number;
+    }, "id"> & import("./mongoose/virtuals").IVirtuals) | null>;
     /**
      * 所有者を追加する
      */

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

@@ -73,19 +73,6 @@ export declare class PaymentServiceRepo {
         filter: any;
         $unset: any;
     }): Promise<import("mongoose").UpdateWriteOpResult>;
-    getCursor(conditions: any, projection: any): import("mongoose").Cursor<import("mongoose").Document<unknown, {}, Omit<import("@chevre/factory/lib/service/paymentService").IService, "id"> & {
-        provider?: factory.service.paymentService.IProvider[];
-    }> & Omit<import("@chevre/factory/lib/service/paymentService").IService, "id"> & {
-        provider?: factory.service.paymentService.IProvider[];
-    } & {
-        _id: import("mongoose").Types.ObjectId;
-    }, import("mongoose").QueryOptions<import("mongoose").Document<unknown, {}, Omit<import("@chevre/factory/lib/service/paymentService").IService, "id"> & {
-        provider?: factory.service.paymentService.IProvider[];
-    }> & Omit<import("@chevre/factory/lib/service/paymentService").IService, "id"> & {
-        provider?: factory.service.paymentService.IProvider[];
-    } & {
-        _id: import("mongoose").Types.ObjectId;
-    }>>;
     getModel(): IModel;
 }
 export {};

package/lib/chevre/repo/paymentService.js

@@ -443,11 +443,11 @@ class PaymentServiceRepo {
         return this.paymentServiceModel.updateMany(params.filter, { $unset: params.$unset }, { timestamps: false })
             .exec();
     }
-    getCursor(conditions, projection) {
-        return this.paymentServiceModel.find(conditions, projection)
-            .sort({ productID: factory.sortType.Ascending })
-            .cursor();
-    }
+    // public getCursor(conditions: any, projection: any) {
+    //     return this.paymentServiceModel.find(conditions, projection)
+    //         .sort({ productID: factory.sortType.Ascending })
+    //         .cursor();
+    // }
     getModel() {
         return this.paymentServiceModel;
     }

package/lib/chevre/repo/pendingReservation.js

@@ -40,7 +40,6 @@ class PendingReservationRepo {
     // private readonly aggregateReservationModel: IModel;
     pendingReservationModel;
     constructor(connection) {
-        // this.aggregateReservationModel = connection.model(modelName, createSchema());
         this.pendingReservationModel = connection.model(pendingReservation_1.modelName, (0, pendingReservation_1.createSchema)());
     }
     static CREATE_FILTER_QUERY(params) {

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

@@ -95,15 +95,19 @@ export declare class MovieTheaterRepo {
             id: string;
         };
     }): Promise<void>;
-    getCursor(conditions: FilterQuery<any>, projection: any): import("mongoose").Cursor<import("mongoose").Document<unknown, {}, IDocType> & Omit<import("@chevre/factory/lib/place/movieTheater").IPlace, "id"> & {
+    getCursor(conditions: FilterQuery<any>, projection: any): import("mongoose").Cursor<import("mongoose").Document<unknown, {}, IDocType, import("../mongoose/virtuals").IVirtuals, {}> & Omit<Omit<import("@chevre/factory/lib/place/movieTheater").IPlace, "id"> & {
         hasPOS?: factory.place.movieTheater.IPOS[];
     } & {
         _id: import("mongoose").Types.ObjectId;
-    }, import("mongoose").QueryOptions<import("mongoose").Document<unknown, {}, IDocType> & Omit<import("@chevre/factory/lib/place/movieTheater").IPlace, "id"> & {
+    } & {
+        __v: number;
+    }, "id"> & import("../mongoose/virtuals").IVirtuals, import("mongoose").QueryOptions<IDocType>, (import("mongoose").Document<unknown, {}, IDocType, import("../mongoose/virtuals").IVirtuals, {}> & Omit<Omit<import("@chevre/factory/lib/place/movieTheater").IPlace, "id"> & {
         hasPOS?: factory.place.movieTheater.IPOS[];
     } & {
         _id: import("mongoose").Types.ObjectId;
-    }>>;
+    } & {
+        __v: number;
+    }, "id"> & import("../mongoose/virtuals").IVirtuals) | null>;
     unsetUnnecessaryFields(params: {
         filter: any;
         $unset: any;

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

@@ -124,7 +124,7 @@ export declare class ScreeningRoomRepo {
             id: string;
         };
     }): Promise<void>;
-    getCursor(conditions: FilterQuery<any>, projection: any): import("mongoose").Cursor<import("mongoose").Document<unknown, {}, IDocType> & Omit<import("@chevre/factory/lib/place/screeningRoom").IPlace, "containsPlace"> & {
+    getCursor(conditions: FilterQuery<any>, projection: any): import("mongoose").Cursor<import("mongoose").Document<unknown, {}, IDocType, import("../mongoose/virtuals").IVirtuals, {}> & Omit<Omit<import("@chevre/factory/lib/place/screeningRoom").IPlace, "containsPlace"> & {
         description?: any;
         openingHoursSpecification?: any;
         smokingAllowed?: boolean;
@@ -133,7 +133,9 @@ export declare class ScreeningRoomRepo {
         })[];
     } & {
         _id: import("mongoose").Types.ObjectId;
-    }, import("mongoose").QueryOptions<import("mongoose").Document<unknown, {}, IDocType> & Omit<import("@chevre/factory/lib/place/screeningRoom").IPlace, "containsPlace"> & {
+    } & {
+        __v: number;
+    }, "id"> & import("../mongoose/virtuals").IVirtuals, import("mongoose").QueryOptions<IDocType>, (import("mongoose").Document<unknown, {}, IDocType, import("../mongoose/virtuals").IVirtuals, {}> & Omit<Omit<import("@chevre/factory/lib/place/screeningRoom").IPlace, "containsPlace"> & {
         description?: any;
         openingHoursSpecification?: any;
         smokingAllowed?: boolean;
@@ -142,6 +144,8 @@ export declare class ScreeningRoomRepo {
         })[];
     } & {
         _id: import("mongoose").Types.ObjectId;
-    }>>;
+    } & {
+        __v: number;
+    }, "id"> & import("../mongoose/virtuals").IVirtuals) | null>;
 }
 export {};

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

@@ -1,5 +1,6 @@
 import { Connection, FilterQuery, QueryOptions } from 'mongoose';
 import * as factory from '../factory';
+import { IDocType } from './mongoose/schemas/potentialAction';
 export type ISavingPotentialAction = Pick<factory.potentialAction.IPotentialAction, 'target' | 'project' | 'typeOf' | 'identifier'> & {
     id?: never;
 };
@@ -23,34 +24,14 @@ export declare class PotentialActionRepo {
         id: string;
     }>;
     projectFields(conditions: factory.potentialAction.ISearchConditions, inclusion: IKeyOfProjection[]): Promise<factory.potentialAction.IPotentialAction[]>;
-    getCursor(conditions: any, projection: any): import("mongoose").Cursor<import("mongoose").Document<unknown, {}, {
-        project: Pick<factory.project.IProject, "id" | "typeOf">;
-        identifier: string;
-        typeOf: factory.actionType.InformAction;
-        recipient: factory.potentialAction.IInformRecipient;
-        target: factory.entryPoint.IEntryPoint;
-    }> & {
-        project: Pick<factory.project.IProject, "id" | "typeOf">;
-        identifier: string;
-        typeOf: factory.actionType.InformAction;
-        recipient: factory.potentialAction.IInformRecipient;
-        target: factory.entryPoint.IEntryPoint;
-    } & {
+    getCursor(conditions: any, projection: any): import("mongoose").Cursor<import("mongoose").Document<unknown, {}, IDocType, import("./mongoose/virtuals").IVirtuals, {}> & Omit<IDocType & {
         _id: import("mongoose").Types.ObjectId;
-    }, QueryOptions<import("mongoose").Document<unknown, {}, {
-        project: Pick<factory.project.IProject, "id" | "typeOf">;
-        identifier: string;
-        typeOf: factory.actionType.InformAction;
-        recipient: factory.potentialAction.IInformRecipient;
-        target: factory.entryPoint.IEntryPoint;
-    }> & {
-        project: Pick<factory.project.IProject, "id" | "typeOf">;
-        identifier: string;
-        typeOf: factory.actionType.InformAction;
-        recipient: factory.potentialAction.IInformRecipient;
-        target: factory.entryPoint.IEntryPoint;
     } & {
+        __v: number;
+    }, "id"> & import("./mongoose/virtuals").IVirtuals, QueryOptions<IDocType>, (import("mongoose").Document<unknown, {}, IDocType, import("./mongoose/virtuals").IVirtuals, {}> & Omit<IDocType & {
         _id: import("mongoose").Types.ObjectId;
-    }>>;
+    } & {
+        __v: number;
+    }, "id"> & import("./mongoose/virtuals").IVirtuals) | null>;
 }
 export {};

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

@@ -13,13 +13,15 @@ export declare class PriceSpecificationRepo {
     findById<T extends factory.priceSpecificationType>(params: {
         id: string;
     }): Promise<factory.priceSpecification.IPriceSpecification<T>>;
-    save<T extends factory.priceSpecificationType>(params: {
+    save<T extends factory.priceSpecificationType.CategoryCodeChargeSpecification | factory.priceSpecificationType.MovieTicketTypeChargeSpecification>(params: {
         id?: string;
         attributes: factory.priceSpecification.IPriceSpecification<T> & {
             id?: never;
             $unset?: never;
         };
-    }): Promise<Pick<factory.priceSpecification.IPriceSpecification<T>, 'id'>>;
+    }): Promise<{
+        id: string;
+    }>;
     /**
      * 削除する
      */
@@ -34,48 +36,73 @@ export declare class PriceSpecificationRepo {
             id: string;
         };
     }): Promise<void>;
-    getCursor(conditions: any, projection: any): import("mongoose").Cursor<import("mongoose").Document<unknown, {}, IDocType> & ((import("@chevre/factory/lib/priceSpecification/categoryCodeChargeSpecification").IPriceSpecification & {
-        validFrom?: Date;
-        validThrough?: Date;
+    getCursor(conditions: any, projection: any): import("mongoose").Cursor<import("mongoose").Document<unknown, {}, IDocType, import("./mongoose/virtuals").IVirtuals, {}> & Omit<({
+        project?: Pick<factory.project.IProject, "id" | "typeOf"> | undefined;
+        name?: (string | import("@chevre/factory/lib/multilingualString").IMultilingualString) | undefined;
+        price: number;
+        priceCurrency: factory.priceCurrency;
+        typeOf: factory.priceSpecificationType.CategoryCodeChargeSpecification;
+        valueAddedTaxIncluded: boolean;
+        accounting?: never | undefined;
+        appliesToCategoryCode: import("@chevre/factory/lib/priceSpecification/categoryCodeChargeSpecification").IAppliesToCategoryCode[];
     } & {
-        _id: import("mongoose").Types.ObjectId;
-    }) | (import("@chevre/factory/lib/priceSpecification/movieTicketTypeChargeSpecification").IPriceSpecification & {
         validFrom?: Date;
         validThrough?: Date;
     } & {
         _id: import("mongoose").Types.ObjectId;
-    }) | (import("@chevre/factory/lib/priceSpecification/unitPriceSpecification").IPriceSpecification & {
-        validFrom?: Date;
-        validThrough?: Date;
     } & {
-        _id: import("mongoose").Types.ObjectId;
-    }) | (import("@chevre/factory/lib/priceSpecification").IPriceSpecification<factory.priceSpecificationType> & {
-        validFrom?: Date;
-        validThrough?: Date;
+        __v: number;
+    }) | ({
+        project?: Pick<factory.project.IProject, "id" | "typeOf"> | undefined;
+        name?: (string | import("@chevre/factory/lib/multilingualString").IMultilingualString) | undefined;
+        price: number;
+        priceCurrency: factory.priceCurrency;
+        typeOf: factory.priceSpecificationType.MovieTicketTypeChargeSpecification;
+        valueAddedTaxIncluded: boolean;
+        accounting?: never | undefined;
+        appliesToMovieTicket: import("@chevre/factory/lib/priceSpecification/movieTicketTypeChargeSpecification").IAppliesToMovieTicket;
+        appliesToVideoFormat: string;
     } & {
-        _id: import("mongoose").Types.ObjectId;
-    })), import("mongoose").QueryOptions<import("mongoose").Document<unknown, {}, IDocType> & ((import("@chevre/factory/lib/priceSpecification/categoryCodeChargeSpecification").IPriceSpecification & {
         validFrom?: Date;
         validThrough?: Date;
     } & {
         _id: import("mongoose").Types.ObjectId;
-    }) | (import("@chevre/factory/lib/priceSpecification/movieTicketTypeChargeSpecification").IPriceSpecification & {
-        validFrom?: Date;
-        validThrough?: Date;
     } & {
-        _id: import("mongoose").Types.ObjectId;
-    }) | (import("@chevre/factory/lib/priceSpecification/unitPriceSpecification").IPriceSpecification & {
+        __v: number;
+    }), "id"> & import("./mongoose/virtuals").IVirtuals, import("mongoose").QueryOptions<IDocType>, (import("mongoose").Document<unknown, {}, IDocType, import("./mongoose/virtuals").IVirtuals, {}> & Omit<({
+        project?: Pick<factory.project.IProject, "id" | "typeOf"> | undefined;
+        name?: (string | import("@chevre/factory/lib/multilingualString").IMultilingualString) | undefined;
+        price: number;
+        priceCurrency: factory.priceCurrency;
+        typeOf: factory.priceSpecificationType.CategoryCodeChargeSpecification;
+        valueAddedTaxIncluded: boolean;
+        accounting?: never | undefined;
+        appliesToCategoryCode: import("@chevre/factory/lib/priceSpecification/categoryCodeChargeSpecification").IAppliesToCategoryCode[];
+    } & {
         validFrom?: Date;
         validThrough?: Date;
     } & {
         _id: import("mongoose").Types.ObjectId;
-    }) | (import("@chevre/factory/lib/priceSpecification").IPriceSpecification<factory.priceSpecificationType> & {
+    } & {
+        __v: number;
+    }) | ({
+        project?: Pick<factory.project.IProject, "id" | "typeOf"> | undefined;
+        name?: (string | import("@chevre/factory/lib/multilingualString").IMultilingualString) | undefined;
+        price: number;
+        priceCurrency: factory.priceCurrency;
+        typeOf: factory.priceSpecificationType.MovieTicketTypeChargeSpecification;
+        valueAddedTaxIncluded: boolean;
+        accounting?: never | undefined;
+        appliesToMovieTicket: import("@chevre/factory/lib/priceSpecification/movieTicketTypeChargeSpecification").IAppliesToMovieTicket;
+        appliesToVideoFormat: string;
+    } & {
         validFrom?: Date;
         validThrough?: Date;
     } & {
         _id: import("mongoose").Types.ObjectId;
-    }))>>;
-    reIndex(): Promise<import("bson").Document>;
+    } & {
+        __v: number;
+    }), "id"> & import("./mongoose/virtuals").IVirtuals) | null>;
     unsetUnnecessaryFields(params: {
         filter: any;
         $unset: any;

package/lib/chevre/repo/priceSpecification.js

@@ -220,24 +220,26 @@ class PriceSpecificationRepo {
         return doc;
     }
     async save(params) {
-        let doc;
+        let savedId;
         if (typeof params.id !== 'string') {
             const { $unset, id, ...creatingDoc } = params.attributes;
-            doc = await this.priceSpecificationModel.create(creatingDoc);
+            const createdDoc = await this.priceSpecificationModel.create(creatingDoc);
+            savedId = createdDoc.id;
         }
         else {
             // 上書き禁止属性を除外(2022-08-24~)
             const { $unset, id, project, typeOf, ...updateFields } = params.attributes;
-            doc = await this.priceSpecificationModel.findOneAndUpdate({ _id: { $eq: params.id } }, {
+            const updatedDoc = await this.priceSpecificationModel.findOneAndUpdate({ _id: { $eq: params.id } }, {
                 $set: updateFields
             }, { upsert: false, new: true, projection: { _id: 1 } })
                 .lean() // lean(2024-08-06~)
                 .exec();
+            if (updatedDoc === null) {
+                throw new factory.errors.NotFound(this.priceSpecificationModel.modelName);
+            }
+            savedId = updatedDoc._id.toString();
         }
-        if (doc === null) {
-            throw new factory.errors.NotFound(this.priceSpecificationModel.modelName);
-        }
-        return { id: doc._id?.toString() };
+        return { id: savedId };
     }
     /**
      * 削除する
@@ -260,12 +262,6 @@ class PriceSpecificationRepo {
             .sort({ price: factory.sortType.Ascending })
             .cursor();
     }
-    async reIndex() {
-        // return this.priceSpecificationModel.collection.name;
-        return this.priceSpecificationModel.db.db.command({
-            reIndex: this.priceSpecificationModel.collection.name
-        });
-    }
     async unsetUnnecessaryFields(params) {
         return this.priceSpecificationModel.updateMany(params.filter, { $unset: params.$unset }, { timestamps: false })
             .exec();

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

@@ -1,7 +1,7 @@
 import type { BulkWriteResult } from 'mongodb';
 import { Connection, FilterQuery, Types } from 'mongoose';
 import * as factory from '../factory';
-import { IDocTypeAsProduct } from './mongoose/schemas/product';
+import { IDocType, IDocTypeAsProduct } from './mongoose/schemas/product';
 type IKeyOfProjection = keyof factory.product.IProduct | 'hasOfferCatalog.id';
 /**
  * プロダクト検索条件
@@ -103,11 +103,15 @@ export declare class ProductRepo {
             id: string;
         };
     }): Promise<void>;
-    getCursor(conditions: any, projection: any): import("mongoose").Cursor<import("mongoose").Document<unknown, {}, IDocTypeAsProduct & import("./mongoose/schemas/product").IDocTypeAsProductOffer> & IDocTypeAsProduct & import("./mongoose/schemas/product").IDocTypeAsProductOffer & {
+    getCursor(conditions: any, projection: any): import("mongoose").Cursor<import("mongoose").Document<unknown, {}, IDocType, import("./mongoose/virtuals").IVirtuals, {}> & Omit<IDocTypeAsProduct & import("./mongoose/schemas/product").IDocTypeAsProductOffer & {
         _id: Types.ObjectId;
-    }, import("mongoose").QueryOptions<import("mongoose").Document<unknown, {}, IDocTypeAsProduct & import("./mongoose/schemas/product").IDocTypeAsProductOffer> & IDocTypeAsProduct & import("./mongoose/schemas/product").IDocTypeAsProductOffer & {
+    } & {
+        __v: number;
+    }, "id"> & import("./mongoose/virtuals").IVirtuals, import("mongoose").QueryOptions<IDocType>, (import("mongoose").Document<unknown, {}, IDocType, import("./mongoose/virtuals").IVirtuals, {}> & Omit<IDocTypeAsProduct & import("./mongoose/schemas/product").IDocTypeAsProductOffer & {
         _id: Types.ObjectId;
-    }>>;
+    } & {
+        __v: number;
+    }, "id"> & import("./mongoose/virtuals").IVirtuals) | null>;
     unsetUnnecessaryFields(params: {
         filter: FilterQuery<factory.product.IProduct>;
         $unset: any;