@chevre/domain 24.0.0-alpha.9 → 24.0.0

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

@@ -1,5 +1,5 @@
 import type { Connection } from 'mongoose';
-import * as factory from '../factory';
+import { factory } from '../factory';
 import { IDocType } from './mongoose/schemas/priceSpecification';
 /**
  * 価格仕様リポジトリ
@@ -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, Record<string, never>, IDocType, import("./mongoose/virtuals").IVirtuals, {}> & (({
+        project?: Pick<factory.project.IProject, "id" | "typeOf"> | undefined;
+        name?: (string | import("@chevre/factory/lib/chevre/multilingualString").IMultilingualString) | undefined;
+        price: number;
+        priceCurrency: factory.priceCurrency;
+        typeOf: factory.priceSpecificationType.CategoryCodeChargeSpecification;
+        valueAddedTaxIncluded: boolean;
+        accounting?: never | undefined;
+        appliesToCategoryCode: import("@chevre/factory/lib/chevre/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/chevre/multilingualString").IMultilingualString) | undefined;
+        price: number;
+        priceCurrency: factory.priceCurrency;
+        typeOf: factory.priceSpecificationType.MovieTicketTypeChargeSpecification;
+        valueAddedTaxIncluded: boolean;
+        accounting?: never | undefined;
+        appliesToMovieTicket: import("@chevre/factory/lib/chevre/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;
+    })), import("mongoose").QueryOptions<IDocType>, (import("mongoose").Document<unknown, Record<string, never>, IDocType, import("./mongoose/virtuals").IVirtuals, {}> & (({
+        project?: Pick<factory.project.IProject, "id" | "typeOf"> | undefined;
+        name?: (string | import("@chevre/factory/lib/chevre/multilingualString").IMultilingualString) | undefined;
+        price: number;
+        priceCurrency: factory.priceCurrency;
+        typeOf: factory.priceSpecificationType.CategoryCodeChargeSpecification;
+        valueAddedTaxIncluded: boolean;
+        accounting?: never | undefined;
+        appliesToCategoryCode: import("@chevre/factory/lib/chevre/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/chevre/multilingualString").IMultilingualString) | undefined;
+        price: number;
+        priceCurrency: factory.priceCurrency;
+        typeOf: factory.priceSpecificationType.MovieTicketTypeChargeSpecification;
+        valueAddedTaxIncluded: boolean;
+        accounting?: never | undefined;
+        appliesToMovieTicket: import("@chevre/factory/lib/chevre/priceSpecification/movieTicketTypeChargeSpecification").IAppliesToMovieTicket;
+        appliesToVideoFormat: string;
+    } & {
         validFrom?: Date;
         validThrough?: Date;
     } & {
         _id: import("mongoose").Types.ObjectId;
-    }))>>;
-    reIndex(): Promise<import("bson").Document>;
+    } & {
+        __v: number;
+    }))) | null>;
     unsetUnnecessaryFields(params: {
         filter: any;
         $unset: any;

package/lib/chevre/repo/priceSpecification.js

@@ -1,30 +1,7 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PriceSpecificationRepo = void 0;
-const factory = __importStar(require("../factory"));
+const factory_1 = require("../factory");
 const priceSpecification_1 = require("./mongoose/schemas/priceSpecification");
 const settings_1 = require("../settings");
 /**
@@ -36,7 +13,7 @@ class PriceSpecificationRepo {
         this.priceSpecificationModel = connection.model(priceSpecification_1.modelName, (0, priceSpecification_1.createSchema)());
     }
     static CREATE_MONGO_CONDITIONS(params) {
-        const andConditions = [];
+        const andConditions = []; // eslint-disable-line @typescript-eslint/no-explicit-any
         const projectIdEq = params.project?.id?.$eq;
         if (typeof projectIdEq === 'string') {
             andConditions.push({ 'project.id': { $eq: projectIdEq } });
@@ -215,29 +192,31 @@ class PriceSpecificationRepo {
             .lean() // lean(2024-08-06~)
             .exec();
         if (doc === null) {
-            throw new factory.errors.NotFound(this.priceSpecificationModel.modelName);
+            throw new factory_1.factory.errors.NotFound(this.priceSpecificationModel.modelName);
         }
         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 { $unset, id, ...creatingDoc } = params.attributes; // eslint-disable-line @typescript-eslint/no-unused-vars
+            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 { $unset, id, project, typeOf, ...updateFields } = params.attributes; // eslint-disable-line @typescript-eslint/no-unused-vars
+            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_1.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 };
     }
     /**
      * 削除する
@@ -257,15 +236,9 @@ class PriceSpecificationRepo {
     }
     getCursor(conditions, projection) {
         return this.priceSpecificationModel.find(conditions, projection)
-            .sort({ price: factory.sortType.Ascending })
+            .sort({ price: factory_1.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 { factory } from '../factory';
+import { IDocType, IDocTypeAsProduct } from './mongoose/schemas/product';
 type IKeyOfProjection = keyof factory.product.IProduct | 'hasOfferCatalog.id';
 /**
  * プロダクト検索条件
@@ -48,9 +48,7 @@ export declare class ProductRepo {
         $set: factory.product.IProduct & {
             offers?: never;
         };
-        $unset: {
-            [key in IUnsetKey]?: 1;
-        };
+        $unset: Partial<Record<IUnsetKey, 1>>;
         /**
          * 指定プロジェクトの指定プロダクトタイプが存在しなければ作成する
          */
@@ -65,25 +63,13 @@ export declare class ProductRepo {
         $set: factory.product.IProduct & {
             offers?: never;
         };
-        $unset?: {
-            [key in IUnsetKey]?: 1;
-        };
+        $unset?: Partial<Record<IUnsetKey, 1>>;
     }[]): Promise<{
-        bulkWriteResult: BulkWriteResult;
-        modifiedProducts: {
+        bulkWriteResult?: BulkWriteResult;
+        modifiedProducts?: {
             id: string;
         }[];
-    } | void>;
-    /**
-     * プロダクトIDからavailableChannelを取得する
-     */
-    findAvailableChannel(params: {
-        project: {
-            id: string;
-        };
-        typeOf: factory.service.paymentService.PaymentServiceType.PaymentCard;
-        id: string;
-    }): Promise<factory.product.IAvailableChannel>;
+    }>;
     /**
      * 指定カタログの設定されたプロダクトを削除する
      */
@@ -103,11 +89,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, Record<string, never>, IDocType, import("./mongoose/virtuals").IVirtuals, {}> & 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;
+    }, import("mongoose").QueryOptions<IDocType>, (import("mongoose").Document<unknown, Record<string, never>, IDocType, import("./mongoose/virtuals").IVirtuals, {}> & IDocTypeAsProduct & import("./mongoose/schemas/product").IDocTypeAsProductOffer & {
         _id: Types.ObjectId;
-    }>>;
+    } & {
+        __v: number;
+    }) | null>;
     unsetUnnecessaryFields(params: {
         filter: FilterQuery<factory.product.IProduct>;
         $unset: any;

package/lib/chevre/repo/product.js

@@ -1,31 +1,8 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ProductRepo = void 0;
 const mongoose_1 = require("mongoose");
-const factory = __importStar(require("../factory"));
+const factory_1 = require("../factory");
 const settings_1 = require("../settings");
 const product_1 = require("./mongoose/schemas/product");
 const AVAILABLE_PROJECT_FIELDS = [
@@ -180,7 +157,7 @@ class ProductRepo {
             positiveProjectionFields = inclusion.filter((key) => AVAILABLE_PROJECT_FIELDS.includes(key));
         }
         else {
-            throw new factory.errors.ArgumentNull('inclusion', 'inclusion must be specified');
+            throw new factory_1.factory.errors.ArgumentNull('inclusion', 'inclusion must be specified');
         }
         const projection = {
             _id: 0,
@@ -239,13 +216,10 @@ class ProductRepo {
         let savedId;
         if (typeof params.id === 'string') {
             // 上書き禁止属性を除外
-            const { id, productID, project, typeOf, offers, ...setFields } = params.$set;
+            const { id, productID, project, typeOf, offers, ...setFields } = params.$set; // eslint-disable-line @typescript-eslint/no-unused-vars
             switch (typeOf) {
-                case factory.product.ProductType.EventService:
-                case factory.product.ProductType.MembershipService:
-                case factory.product.ProductType.PaymentCard:
-                case factory.product.ProductType.Product:
-                case factory.product.ProductType.Transportation:
+                case factory_1.factory.product.ProductType.EventService:
+                case factory_1.factory.product.ProductType.Product:
                     doc = await this.productModel.findOneAndUpdate({
                         _id: { $eq: params.id },
                         typeOf: { $eq: typeOf }
@@ -256,16 +230,16 @@ class ProductRepo {
                         .lean()
                         .exec();
                     if (doc === null) {
-                        throw new factory.errors.NotFound(this.productModel.modelName);
+                        throw new factory_1.factory.errors.NotFound(this.productModel.modelName);
                     }
                     break;
                 default:
-                    throw new factory.errors.NotImplemented(`${typeOf} not implemented`);
+                    throw new factory_1.factory.errors.NotImplemented(`${typeOf} not implemented`);
             }
             savedId = params.id;
         }
         else {
-            const { id, ...createParams } = params.$set;
+            const { id, ...createParams } = params.$set; // eslint-disable-line @typescript-eslint/no-unused-vars
             if (params.createIfNotExist === true) {
                 doc = await this.productModel.findOneAndUpdate({
                     'project.id': { $eq: createParams.project.id },
@@ -274,7 +248,7 @@ class ProductRepo {
                     .lean()
                     .exec();
                 if (doc === null) {
-                    throw new factory.errors.NotFound(this.productModel.modelName);
+                    throw new factory_1.factory.errors.NotFound(this.productModel.modelName);
                 }
                 savedId = doc.id;
             }
@@ -283,7 +257,7 @@ class ProductRepo {
                 const result = await this.productModel.insertMany(createParams, { rawResult: true });
                 const insertedId = result.insertedIds?.[0]?.toHexString();
                 if (typeof insertedId !== 'string') {
-                    throw new factory.errors.Internal(`product not saved unexpectedly. result:${JSON.stringify(result)}`);
+                    throw new factory_1.factory.errors.Internal(`product not saved unexpectedly. result:${JSON.stringify(result)}`);
                 }
                 savedId = insertedId;
             }
@@ -301,9 +275,9 @@ class ProductRepo {
         const queryFilters = [];
         if (Array.isArray(params)) {
             params.forEach(({ $set, $unset }) => {
-                const { id, productID, project, typeOf, offers, ...setFields } = $set;
+                const { id, productID, project, typeOf, offers, ...setFields } = $set; // eslint-disable-line @typescript-eslint/no-unused-vars
                 if (typeof productID !== 'string' || productID.length === 0) {
-                    throw new factory.errors.ArgumentNull('productID');
+                    throw new factory_1.factory.errors.ArgumentNull('productID');
                 }
                 // リソースのユニークネスを保証するfilter
                 const filter = {
@@ -338,29 +312,36 @@ class ProductRepo {
                 .exec();
             return { bulkWriteResult, modifiedProducts };
         }
+        return {};
     }
-    /**
-     * プロダクトIDからavailableChannelを取得する
-     */
-    async findAvailableChannel(params) {
-        const paymentService = (await this.projectFields({
-            limit: 1,
-            page: 1,
-            project: { id: { $eq: params.project.id } },
-            typeOf: { $eq: factory.product.ProductType.PaymentCard },
-            id: { $eq: params.id }
-        }, ['availableChannel']
-        // []
-        )).shift();
-        if (paymentService === undefined) {
-            throw new factory.errors.NotFound('PaymentService');
-        }
-        const availableChannel = paymentService.availableChannel;
-        if (availableChannel === undefined) {
-            throw new factory.errors.NotFound('paymentService.availableChannel');
-        }
-        return availableChannel;
-    }
+    // /**
+    //  * プロダクトIDからavailableChannelを取得する
+    //  */
+    // public async findAvailableChannel(params: {
+    //     project: { id: string };
+    //     typeOf: factory.service.paymentService.PaymentServiceType.PaymentCard;
+    //     id: string;
+    // }): Promise<factory.product.IAvailableChannel> {
+    //     const paymentService = (await this.projectFields(
+    //         {
+    //             limit: 1,
+    //             page: 1,
+    //             project: { id: { $eq: params.project.id } },
+    //             typeOf: { $eq: factory.product.ProductType.PaymentCard },
+    //             id: { $eq: params.id }
+    //         },
+    //         ['availableChannel']
+    //         // []
+    //     ) as Pick<factory.product.IProduct, 'availableChannel'>[]).shift();
+    //     if (paymentService === undefined) {
+    //         throw new factory.errors.NotFound('PaymentService');
+    //     }
+    //     const availableChannel = paymentService.availableChannel;
+    //     if (availableChannel === undefined) {
+    //         throw new factory.errors.NotFound('paymentService.availableChannel');
+    //     }
+    //     return availableChannel;
+    // }
     /**
      * 指定カタログの設定されたプロダクトを削除する
      */
@@ -385,7 +366,7 @@ class ProductRepo {
     }
     getCursor(conditions, projection) {
         return this.productModel.find(conditions, projection)
-            .sort({ productID: factory.sortType.Ascending })
+            .sort({ productID: factory_1.factory.sortType.Ascending })
             .cursor();
     }
     async unsetUnnecessaryFields(params) {
@@ -405,7 +386,7 @@ class ProductRepo {
             .lean()
             .exec();
         if (doc === null) {
-            throw new factory.errors.NotFound(this.productModel.modelName);
+            throw new factory_1.factory.errors.NotFound(this.productModel.modelName);
         }
     }
 }

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

@@ -1,5 +1,5 @@
 import { Connection } from 'mongoose';
-import * as factory from '../factory';
+import { factory } from '../factory';
 interface IOfferCatalogAsFindResult {
     /**
      * カタログID

package/lib/chevre/repo/productHasOfferCatalog.js

@@ -1,31 +1,8 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ProductHasOfferCatalogRepo = void 0;
 const mongoose_1 = require("mongoose");
-const factory = __importStar(require("../factory"));
+const factory_1 = require("../factory");
 const settings_1 = require("../settings");
 const product_1 = require("./mongoose/schemas/product");
 /**
@@ -57,7 +34,7 @@ class ProductHasOfferCatalogRepo {
                 }
             },
             ...matchStages,
-            { $sort: { productID: factory.sortType.Ascending } },
+            { $sort: { productID: factory_1.factory.sortType.Ascending } },
             {
                 $project: {
                     _id: 0,

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

@@ -1,5 +1,5 @@
 import type { Connection, FilterQuery } from 'mongoose';
-import * as factory from '../factory';
+import { factory } from '../factory';
 import { IProductModel } from './mongoose/schemas/productModel';
 type IKeyOfProjection = keyof IProductModel | '_id';
 type ISearchConditions = Pick<factory.product.ISearchConditions, 'id' | 'limit' | 'page' | 'project'> & {
@@ -33,7 +33,9 @@ export declare class ProductModelRepo {
          * idを指定すれば更新
          */
         id?: string;
-        $set: IProductModel;
+        $set: Omit<IProductModel, 'id'> & {
+            id?: never;
+        };
     }): Promise<{
         id: string;
     }>;

package/lib/chevre/repo/productModel.js

@@ -1,30 +1,7 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ProductModelRepo = void 0;
-const factory = __importStar(require("../factory"));
+const factory_1 = require("../factory");
 const settings_1 = require("../settings");
 const productModel_1 = require("./mongoose/schemas/productModel");
 /**
@@ -93,7 +70,7 @@ class ProductModelRepo {
         // }
         return query.setOptions({ maxTimeMS: settings_1.MONGO_MAX_TIME_MS })
             .exec()
-            .then((docs) => docs.map((doc) => doc.toObject()));
+            .then((docs) => docs.map((doc) => doc.toObject({ virtuals: true })));
     }
     async deleteById(params) {
         await this.productModelModel.findOneAndDelete({ _id: params.id })
@@ -103,31 +80,35 @@ class ProductModelRepo {
      * プロダクトを保管する
      */
     async save(params) {
-        let doc;
+        let savedId;
         if (typeof params.id === 'string') {
             // 上書き禁止属性を除外
-            const { category, id, project, typeOf, ...setFields } = params.$set;
-            doc = await this.productModelModel.findOneAndUpdate({ _id: { $eq: params.id } }, {
+            const { category, id, project, typeOf, ...setFields } = params.$set; // eslint-disable-line @typescript-eslint/no-unused-vars
+            const updatedDoc = await this.productModelModel.findOneAndUpdate({ _id: { $eq: params.id } }, {
                 $set: setFields
-                // $unset: params.$unset
             }, { upsert: false, new: true, projection: { _id: 1 } })
                 .exec();
+            if (updatedDoc === null) {
+                throw new factory_1.factory.errors.NotFound(this.productModelModel.modelName);
+            }
+            savedId = updatedDoc.id;
         }
         else {
-            const { id, ...createParams } = params.$set;
-            doc = await this.productModelModel.create(createParams);
+            const { id, ...createParams } = params.$set; // eslint-disable-line @typescript-eslint/no-unused-vars
+            const createdDoc = await this.productModelModel.create(createParams);
+            savedId = createdDoc.id;
         }
-        if (doc === null) {
-            throw new factory.errors.NotFound(this.productModelModel.modelName);
-        }
-        return doc.toObject();
+        // if (doc === null) {
+        //     throw new factory.errors.NotFound(this.productModelModel.modelName);
+        // }
+        return { id: savedId };
     }
     /**
      * 区分から同期する
      */
     async upsertByCategory(params) {
         const upsertingProductModel = {
-            project: { id: params.category.project.id, typeOf: factory.organizationType.Project },
+            project: { id: params.category.project.id, typeOf: factory_1.factory.organizationType.Project },
             typeOf: 'ProductModel',
             category: {
                 codeValue: params.category.codeValue,
@@ -136,10 +117,10 @@ class ProductModelRepo {
             },
             name: params.category.name,
             offers: [{
-                    typeOf: factory.offerType.Offer
+                    typeOf: factory_1.factory.offerType.Offer
                 }]
         };
-        const { id, project, typeOf, offers, category, ...setFields } = upsertingProductModel;
+        const { project, typeOf, offers, category, ...setFields } = upsertingProductModel;
         const doc = await this.productModelModel.findOneAndUpdate({
             'project.id': { $eq: upsertingProductModel.project.id },
             'category.id': { $exists: true, $eq: upsertingProductModel.category.id }
@@ -149,9 +130,9 @@ class ProductModelRepo {
         }, { new: true, upsert: true, projection: { _id: 1 } })
             .exec();
         if (doc === null) {
-            throw new factory.errors.NotFound(this.productModelModel.modelName);
+            throw new factory_1.factory.errors.NotFound(this.productModelModel.modelName);
         }
-        return doc.toObject();
+        return doc.toObject({ virtuals: true });
     }
     /**
      * 区分から削除する