@chevre/domain 24.0.0-alpha.4 → 24.0.0-alpha.40

package/lib/chevre/repo/orderNumber.js

@@ -34,11 +34,6 @@ const setting_1 = require("./mongoose/schemas/setting");
 const transactionNumber_2 = require("./mongoose/schemas/transactionNumber");
 const transactionNumberCounter_1 = require("./transactionNumberCounter");
 const ORDER_NUMBER_SEPARATOR = '-';
-const defaultVersioningForceProjects = [
-    'HMX',
-    'SMT',
-    'KOJ'
-];
 /**
  * 注文番号リポジトリ
  */
@@ -59,16 +54,23 @@ class OrderNumberRepo {
     //     return orderNumber;
     // }
     /**
-     * タイムスタンプから発行する
+     * 注文日時から新しい注文番号を発行する
+     * グローバルユニークである前提
      */
-    async publishByTimestamp(params) {
-        const { fpeSecret, version, validFrom, versioningForceProjects, versioningExceptionProjects } = await this.findSetting();
+    async issueOrderNumber(params) {
+        const { fpeSecret, version, validFrom
+        // versioningForceProjects
+        // versioningExceptionProjects
+         } = await this.findSetting();
         const timestamp = (0, moment_timezone_1.default)(params.orderDate)
             .valueOf()
             .toString();
+        // const projectPrefix = params.project.alternateName
+        //     .toUpperCase();
         const projectPrefix = params.project.alternateName
-            .toUpperCase();
-        const dataFeedIdentifier = `${projectPrefix}:${timestamp}`;
+            .toUpperCase().at(0);
+        // const dataFeedIdentifier = `${projectPrefix}:${timestamp}`;
+        const dataFeedIdentifier = timestamp; // reconsider increment scope(2026-02-21~)
         const dataFeedExpires = (0, moment_timezone_1.default)(params.orderDate)
             .add(1, 'minute') // ミリ秒でカウントしていくので、注文日時後1分で十分
             .toDate();
@@ -78,18 +80,12 @@ class OrderNumberRepo {
             expires: dataFeedExpires
         });
         let orderNumber;
-        let useVersioning = (validFrom instanceof Date && (0, moment_timezone_1.default)(validFrom)
-            .isSameOrBefore(params.orderDate))
-            // versioningForceProjectsであれば強制的にversioning(2026-02-05~)
-            || versioningForceProjects.includes(projectPrefix);
-        // versioningExceptionProjectsであれば強制的にversioning不使用(2026-02-10~)
-        if (versioningExceptionProjects.includes(projectPrefix)) {
-            useVersioning = false;
-        }
+        const useVersioning = (validFrom instanceof Date && (0, moment_timezone_1.default)(validFrom)
+            .isSameOrBefore(params.orderDate));
         if (typeof fpeSecret === 'string' && typeof version === 'string' && useVersioning) {
             const transactionFactory = new transactionNumber_1.TransactionNumberFactory({ fpeSecret, version });
             orderNumber = transactionFactory.generate(timestamp, incrReply);
-            orderNumber = `${projectPrefix.at(0)}${orderNumber}`; // 桁数をversion0に合わせるためにエイリアスの1文字目のみを採用
+            orderNumber = `${projectPrefix}${orderNumber}`; // 桁数をversion0に合わせるためにエイリアスの1文字目のみを採用
             orderNumber = `${[
                 orderNumber.slice(0, 4),
                 orderNumber.slice(4, 11),
@@ -138,11 +134,11 @@ class OrderNumberRepo {
             .exec();
         if (setting === null || setting.orderNumber === undefined) {
             return {
-                versioningForceProjects: [],
-                versioningExceptionProjects: []
+            // versioningForceProjects: []
+            // versioningExceptionProjects: []
             };
         }
-        const { fpeSecret, version, validFrom, versioningForceProjects, versioningExceptionProjects } = setting.orderNumber;
+        const { fpeSecret, version, validFrom } = setting.orderNumber;
         if (typeof fpeSecret !== 'string' || fpeSecret === '') {
             throw new factory.errors.NotFound('setting.orderNumber.secret');
         }
@@ -153,12 +149,11 @@ class OrderNumberRepo {
             throw new factory.errors.NotFound('setting.orderNumber.validFrom must be Date');
         }
         return {
-            fpeSecret, version, validFrom,
-            versioningForceProjects: [
-                ...(Array.isArray(versioningForceProjects)) ? versioningForceProjects : [],
-                ...defaultVersioningForceProjects
-            ],
-            versioningExceptionProjects: (Array.isArray(versioningExceptionProjects)) ? versioningExceptionProjects : []
+            fpeSecret, version, validFrom
+            // versioningForceProjects: [
+            //     ...(Array.isArray(versioningForceProjects)) ? versioningForceProjects : []
+            // ]
+            // versioningExceptionProjects: (Array.isArray(versioningExceptionProjects)) ? versioningExceptionProjects : []
         };
     }
 }

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;
@@ -70,22 +71,28 @@ export declare class OwnershipInfoRepo {
         };
         identifiers: string[];
         ownedThrough: {
-            $lt: Date;
+            $lte: 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> & {
+    /**
+     * 所有期限切れの所有権を削除する
+     */
+    deleteExpiredOwnershipInfos(params: {
+        ownedThroughLte: Date;
+    }): Promise<void>;
+    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/ownershipInfo.js

@@ -422,8 +422,18 @@ class OwnershipInfoRepo {
         await this.ownershipInfoModel.deleteMany({
             'project.id': { $eq: params.project.id },
             identifier: { $in: params.identifiers },
-            // 所有期限切れのもの(ownedThroughの存在しないものは削除してはいけない)
-            ownedThrough: { $exists: true, $lt: params.ownedThrough.$lt }
+            // 所有期限切れのもの(ownedThroughは必ず存在する)
+            ownedThrough: { $lte: params.ownedThrough.$lte }
+        })
+            .exec();
+    }
+    /**
+     * 所有期限切れの所有権を削除する
+     */
+    async deleteExpiredOwnershipInfos(params) {
+        await this.ownershipInfoModel.deleteMany({
+            // 所有期限切れのもの(ownedThroughは必ず存在する)
+            ownedThrough: { $lte: params.ownedThroughLte }
         })
             .exec();
     }
@@ -440,14 +450,7 @@ class OwnershipInfoRepo {
             throw new factory.errors.ArgumentNull('ownedBy.id');
         }
         let newOwner;
-        if (params.ownedBy.typeOf === factory.organizationType.Organization) {
-            newOwner = {
-                id: params.ownedBy.id,
-                typeOf: params.ownedBy.typeOf
-            };
-        }
-        else if (params.ownedBy.typeOf === factory.personType.Person
-            || params.ownedBy.typeOf === factory.creativeWorkType.WebApplication) {
+        if (params.ownedBy.typeOf === factory.personType.Person) {
             newOwner = {
                 id: params.ownedBy.id,
                 typeOf: params.ownedBy.typeOf

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

@@ -20,7 +20,7 @@ interface IOptions {
     secret: string;
     passportValidator?: IPassportValidator;
 }
-type IStartParams = (factory.transaction.placeOrder.IStartParamsWithoutDetail | factory.transaction.moneyTransfer.IStartParamsWithoutDetail) & {};
+type IStartParams = (factory.transaction.placeOrder.IStartParamsWithoutDetail) & {};
 /**
  * 取引許可証リポジトリ
  */

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/hasPOS.js

@@ -109,7 +109,7 @@ class HasPOSRepo {
         if (doc === null) {
             throw new factory.errors.AlreadyInUse('hasPOS', ['id']);
         }
-        return doc.toObject();
+        return doc.toObject({ virtuals: true });
     }
     async updateByBranchCode(params) {
         const doc = await this.civicStructureModel.findOneAndUpdate({
@@ -133,7 +133,7 @@ class HasPOSRepo {
         if (doc === null) {
             throw new factory.errors.NotFound('hasPOS');
         }
-        return doc.toObject();
+        return doc.toObject({ virtuals: true });
     }
     async deleteByBranchCode(params) {
         const doc = await this.civicStructureModel.findOneAndUpdate({
@@ -149,7 +149,7 @@ class HasPOSRepo {
         if (doc === null) {
             throw new factory.errors.NotFound('hasPOS');
         }
-        return doc.toObject();
+        return doc.toObject({ virtuals: true });
     }
 }
 exports.HasPOSRepo = HasPOSRepo;

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/place/seat.d.ts

@@ -47,8 +47,8 @@ export declare class SeatRepo {
     addSeatsByBranchCodeIfNotExist(params: {
         $set: ICreatingSeat;
     }[], options: IUpdateOptions): Promise<{
-        bulkWriteResult: BulkWriteResult;
-    } | void>;
+        bulkWriteResult?: BulkWriteResult;
+    }>;
     /**
      * コードをキーにして冪等編集
      */
@@ -58,8 +58,8 @@ export declare class SeatRepo {
             [key in keyof ICreatingSeat]?: 1;
         };
     }[], options: IUpdateOptions): Promise<{
-        bulkWriteResult: BulkWriteResult;
-    } | void>;
+        bulkWriteResult?: BulkWriteResult;
+    }>;
     updateSeatByBranchCode(seat: ICreatingSeat, $unset: any, options: IUpdateOptions): Promise<IUpdateSeatResult>;
     searchSeats(params: factory.place.seat.ISearchConditions): Promise<factory.place.seat.IPlace[]>;
     projectSeatsByScreeningRoom(params: Pick<factory.place.seat.ISearchConditions, '$projection' | 'additionalProperty' | 'branchCode' | 'seatingType' | 'name' | 'limit' | 'page'> & {
@@ -161,8 +161,8 @@ export declare class SeatRepo {
          */
         branchCode: string;
     }[], options: IUpdateOptions): Promise<{
-        bulkWriteResult: BulkWriteResult;
-    } | void>;
+        bulkWriteResult?: BulkWriteResult;
+    }>;
     deleteSeatByBranchCode(seat: {
         /**
          * 座席コード

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

@@ -356,6 +356,7 @@ class SeatRepo {
             const bulkWriteResult = await this.placeModel.bulkWrite(bulkWriteOps, { ordered: false });
             return { bulkWriteResult };
         }
+        return {};
     }
     /**
      * コードをキーにして冪等編集
@@ -432,6 +433,7 @@ class SeatRepo {
             const bulkWriteResult = await this.placeModel.bulkWrite(bulkWriteOps, { ordered: false });
             return { bulkWriteResult };
         }
+        return {};
     }
     async updateSeatByBranchCode(seat, $unset, options) {
         const { project, parentOrganization, movieTheaterCode, roomCode, sectionCode } = options;
@@ -788,6 +790,7 @@ class SeatRepo {
             const bulkWriteResult = await this.placeModel.bulkWrite(bulkWriteOps, { ordered: false });
             return { bulkWriteResult };
         }
+        return {};
     }
     async deleteSeatByBranchCode(seat, options) {
         const { project, parentOrganization, movieTheaterCode, roomCode, sectionCode } = options;

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';
 /**
  * プロダクト検索条件
@@ -69,11 +69,11 @@ export declare class ProductRepo {
             [key in IUnsetKey]?: 1;
         };
     }[]): Promise<{
-        bulkWriteResult: BulkWriteResult;
-        modifiedProducts: {
+        bulkWriteResult?: BulkWriteResult;
+        modifiedProducts?: {
             id: string;
         }[];
-    } | void>;
+    }>;
     /**
      * プロダクトIDからavailableChannelを取得する
      */
@@ -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;

package/lib/chevre/repo/product.js

@@ -338,6 +338,7 @@ class ProductRepo {
                 .exec();
             return { bulkWriteResult, modifiedProducts };
         }
+        return {};
     }
     /**
      * プロダクトIDからavailableChannelを取得する