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

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

@@ -1,6 +1,7 @@
-import { Connection, FilterQuery, Types, mongo } from 'mongoose';
+import { Connection, Types } from 'mongoose';
+import type { FilterQuery } from './mongoose/types';
 import { factory } from '../factory';
-import { IDocType } from './mongoose/schemas/creativeWork';
+import { IModel, IDocType } from './mongoose/schemas/creativeWork';
 type IKeyOfProjection = keyof factory.creativeWork.movie.ICreativeWork;
 /**
  * コンテンツリポジトリ
@@ -8,7 +9,7 @@ type IKeyOfProjection = keyof factory.creativeWork.movie.ICreativeWork;
 export declare class CreativeWorkRepo {
     private readonly creativeWorkModel;
     constructor(connection: Connection);
-    static CREATE_MONGO_CONDITIONS(params: factory.creativeWork.movie.ISearchConditions): FilterQuery<import("@chevre/factory/lib/chevre/creativeWork/movie").ICreativeWork>[];
+    static CREATE_MONGO_CONDITIONS(params: factory.creativeWork.movie.ISearchConditions): FilterQuery<IDocType>[];
     /**
      * コンテンツを保管する
      */
@@ -31,7 +32,7 @@ export declare class CreativeWorkRepo {
             [key in keyof factory.creativeWork.movie.ICreativeWork]?: 1;
         };
     }[]): Promise<{
-        bulkWriteResult?: mongo.BulkWriteResult;
+        bulkWriteResult?: Awaited<ReturnType<IModel['bulkWrite']>>;
     }>;
     /**
      * コンテンツを検索する
@@ -48,7 +49,7 @@ export declare class CreativeWorkRepo {
             id: string;
         };
     }): Promise<void>;
-    getCursor(conditions: FilterQuery<factory.creativeWork.movie.ICreativeWork>, projection: any): import("mongoose").Cursor<import("mongoose").Document<unknown, Record<string, never>, IDocType, import("./mongoose/virtuals").IVirtuals, {}> & Omit<import("@chevre/factory/lib/chevre/creativeWork/movie").ICreativeWork, "id"> & {
+    getCursor(conditions: FilterQuery<IDocType>, projection: any): import("mongoose").Cursor<import("mongoose").Document<unknown, Record<string, never>, IDocType, import("./mongoose/virtuals").IVirtuals, {}> & Omit<import("@chevre/factory/lib/chevre/creativeWork/movie").ICreativeWork, "id"> & {
         description?: string;
     } & {
         _id: Types.ObjectId;
@@ -62,7 +63,7 @@ export declare class CreativeWorkRepo {
         __v: number;
     }) | null>;
     unsetUnnecessaryFields(params: {
-        filter: FilterQuery<factory.creativeWork.movie.ICreativeWork>;
+        filter: FilterQuery<IDocType>;
         $unset: any;
     }): Promise<import("mongoose").UpdateWriteOpResult>;
 }

package/lib/chevre/repo/creativeWork.js

@@ -116,25 +116,24 @@ class CreativeWorkRepo {
      */
     async saveMovie(params) {
         let savedId;
-        let doc;
         if (typeof params.id !== 'string' || params.id === '') {
             const { $unset, id, ...createParams } = params; // eslint-disable-line @typescript-eslint/no-unused-vars
-            doc = await this.creativeWorkModel.create(createParams);
-            savedId = doc.id;
+            const createdDoc = await this.creativeWorkModel.create(createParams);
+            savedId = createdDoc.id;
         }
         else {
             // 上書き禁止属性を除外
             const { id, identifier, project, typeOf, $unset, ...setFields } = params; // eslint-disable-line @typescript-eslint/no-unused-vars
-            doc = await this.creativeWorkModel.findOneAndUpdate({ _id: { $eq: params.id } }, {
+            const doc = await this.creativeWorkModel.findOneAndUpdate({ _id: { $eq: params.id } }, {
                 $set: setFields,
                 ...($unset !== undefined) ? { $unset } : undefined
             }, { upsert: false, new: true, projection: { _id: 1 } })
                 .exec();
+            if (doc === null) {
+                throw new factory_1.factory.errors.NotFound(this.creativeWorkModel.modelName);
+            }
             savedId = params.id;
         }
-        if (doc === null) {
-            throw new factory_1.factory.errors.NotFound(this.creativeWorkModel.modelName);
-        }
         return { id: savedId };
     }
     /**
@@ -197,7 +196,7 @@ class CreativeWorkRepo {
                 //         project,
                 //         identifier
                 //     };
-                //     const updateFilter: UpdateFilter<factory.creativeWork.movie.ICreativeWork> = {
+                //     const updateFilter: UpdateOneModel<IDocType>['update'] = {
                 //         $setOnInsert: setOnInsert,
                 //         // 変更可能な属性のみ上書き
                 //         $set: {
@@ -211,7 +210,7 @@ class CreativeWorkRepo {
                 //             ...(Array.isArray(additionalProperty)) ? { additionalProperty } : []
                 //         }
                 //     };
-                //     const updateOne: UpdateOneModel<factory.creativeWork.movie.ICreativeWork> = {
+                //     const updateOne: UpdateOneModel<IDocType> = {
                 //         filter,
                 //         update: updateFilter,
                 //         upsert: true

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

@@ -1,4 +1,5 @@
-import type { Connection, FilterQuery } from 'mongoose';
+import type { Connection } from 'mongoose';
+import type { FilterQuery } from './mongoose/types';
 import { IDocType } from './mongoose/schemas/customer';
 import { factory } from '../factory';
 type IUnset = {
@@ -11,7 +12,7 @@ type IKeyOfProjection = keyof factory.customer.ICustomer;
 export declare class CustomerRepo {
     private readonly customerModel;
     constructor(connection: Connection);
-    static CREATE_MONGO_CONDITIONS(params: factory.customer.ISearchConditions): FilterQuery<factory.customer.ICustomer>[];
+    static CREATE_MONGO_CONDITIONS(params: factory.customer.ISearchConditions): FilterQuery<IDocType>[];
     save(params: {
         id?: string;
         attributes: Omit<factory.customer.ICustomer, 'id'> & {

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

@@ -1,5 +1,6 @@
-import type { Connection, FilterQuery, mongo } from 'mongoose';
-import { ICustomerType } from './mongoose/schemas/customerType';
+import type { Connection } from 'mongoose';
+import type { FilterQuery } from './mongoose/types';
+import { ICustomerType, IModel, IDocType } from './mongoose/schemas/customerType';
 import { factory } from '../factory';
 type IKeyOfProjection = keyof ICustomerType;
 /**
@@ -8,7 +9,7 @@ type IKeyOfProjection = keyof ICustomerType;
 export declare class CustomerTypeRepo {
     private readonly customerTypeModel;
     constructor(connection: Connection);
-    static CREATE_MONGO_CONDITIONS(params: factory.categoryCode.ISearchConditions): FilterQuery<ICustomerType>[];
+    static CREATE_MONGO_CONDITIONS(params: factory.categoryCode.ISearchConditions): FilterQuery<IDocType>[];
     /**
      * 検索
      */
@@ -16,6 +17,6 @@ export declare class CustomerTypeRepo {
     saveManyByCodeValue(params: {
         attributes: ICustomerType;
         upsert?: boolean;
-    }[]): Promise<mongo.BulkWriteResult | undefined>;
+    }[]): Promise<Awaited<ReturnType<IModel['bulkWrite']>> | undefined>;
 }
 export {};

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

@@ -1,4 +1,5 @@
-import type { Connection, FilterQuery } from 'mongoose';
+import type { Connection } from 'mongoose';
+import type { FilterQuery } from './mongoose/types';
 import { IDocType } from './mongoose/schemas/emailMessages';
 import { factory } from '../factory';
 export type IEmailMessage = IDocType & {
@@ -39,7 +40,9 @@ export declare class EmailMessageRepo {
     private readonly emailMessageModel;
     constructor(connection: Connection);
     static CREATE_MONGO_CONDITIONS(params: ISearchConditions): FilterQuery<IDocType>[];
-    save(params: IEmailMessage): Promise<any>;
+    saveEmailMessage(params: IEmailMessage): Promise<{
+        id: string;
+    }>;
     findEmailMessages(params: ISearchConditions, inclusion: IKeyOfProjection[]): Promise<IEmailMessage[]>;
     deleteById(params: {
         id: string;

package/lib/chevre/repo/emailMessage.js

@@ -43,21 +43,23 @@ class EmailMessageRepo {
         }
         return andConditions;
     }
-    async save(params) {
-        let doc;
+    async saveEmailMessage(params) {
+        let savedId;
         if (typeof params.id !== 'string') {
-            doc = await this.emailMessageModel.create(params);
+            const createdDoc = await this.emailMessageModel.create(params);
+            savedId = createdDoc.id;
         }
         else {
             // 上書き禁止属性を除外(2022-08-24~)
             const { id: _id, identifier: _identifier, project: _project, typeOf: _typeOf, ...updateFields } = params;
-            doc = await this.emailMessageModel.findOneAndUpdate({ _id: params.id }, updateFields, { upsert: false, new: true })
+            const doc = await this.emailMessageModel.findOneAndUpdate({ _id: params.id }, updateFields, { upsert: false, new: true })
                 .exec();
+            if (doc === null) {
+                throw new factory_1.factory.errors.NotFound(this.emailMessageModel.modelName);
+            }
+            savedId = params.id;
         }
-        if (doc === null) {
-            throw new factory_1.factory.errors.NotFound(this.emailMessageModel.modelName);
-        }
-        return doc.toObject();
+        return { id: savedId };
     }
     async findEmailMessages(params, inclusion) {
         const conditions = EmailMessageRepo.CREATE_MONGO_CONDITIONS(params);

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

@@ -1,6 +1,8 @@
-import { Connection, FilterQuery } from 'mongoose';
+import { Connection } from 'mongoose';
+import type { FilterQuery } from './mongoose/types';
 import { factory } from '../factory';
 import * as EventFactory from '../factory/event';
+import { IDocType } from './mongoose/schemas/event';
 export type ISearchConditions = Pick<factory.event.screeningEvent.ISearchConditions, 'additionalProperty' | 'endFrom' | 'endThrough' | 'eventStatuses' | 'id' | 'identifiers' | 'inSessionFrom' | 'inSessionThrough' | 'limit' | 'location' | 'offers' | 'organizer' | 'page' | 'project' | 'sort' | 'startFrom' | 'startThrough' | 'superEvent'> & {};
 export import IMinimizedIndividualEvent = EventFactory.IMinimizedIndividualEvent;
 type IKeyOfProjection = Exclude<keyof factory.event.screeningEvent.IEvent, 'id'> | 'aggregateOffer' | 'superEvent.location.id' | 'offers.itemOffered' | 'offers.itemOffered.id' | 'offers.typeOf';
@@ -16,7 +18,7 @@ type IKeyOfProjection4minimizedEvent = Exclude<keyof IMinimizedIndividualEvent,
 export declare class EventRepo {
     private readonly eventModel;
     constructor(connection: Connection);
-    static CREATE_MONGO_CONDITIONS(conditions: ISearchConditions): FilterQuery<factory.event.screeningEvent.IEvent>[];
+    static CREATE_MONGO_CONDITIONS(conditions: ISearchConditions): FilterQuery<IDocType>[];
     /**
      * イベントを検索する(inclusion projection)
      */

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

@@ -1,6 +1,7 @@
-import type { Connection, FilterQuery, mongo } from 'mongoose';
+import type { Connection } from 'mongoose';
+import type { FilterQuery } from './mongoose/types';
 import { factory } from '../factory';
-import { IDocType } from './mongoose/schemas/eventOffer';
+import { IDocType, IModel } from './mongoose/schemas/eventOffer';
 type IUnset = {
     [key in keyof IDocType]?: 1;
 };
@@ -31,7 +32,7 @@ export declare class EventOfferRepo {
          */
         update: boolean;
     }): Promise<{
-        bulkWriteResult?: mongo.BulkWriteResult;
+        bulkWriteResult?: Awaited<ReturnType<IModel['bulkWrite']>>;
         modifiedProductOffers?: {
             id: string;
         }[];
@@ -46,7 +47,7 @@ export declare class EventOfferRepo {
         seller: {
             id: string;
         };
-    }): Promise<mongo.DeleteResult>;
+    }): Promise<Awaited<ReturnType<IModel['deleteMany']>>>;
     /**
      * 有効期間を過ぎたイベントオファーを削除する
      */
@@ -54,6 +55,6 @@ export declare class EventOfferRepo {
         validThrough: {
             $lte: Date;
         };
-    }): Promise<mongo.DeleteResult>;
+    }): Promise<import("mongodb").DeleteResult>;
 }
 export {};

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

@@ -1,5 +1,6 @@
-import type { Connection, mongo } from 'mongoose';
+import type { Connection } from 'mongoose';
 import { factory } from '../factory';
+import { IModel } from './mongoose/schemas/event';
 /**
  * イベントのアプリケーションオファーリポジトリ
  */
@@ -30,7 +31,7 @@ export declare class EventSellerMakesOfferRepo {
             };
         };
     }[]): Promise<{
-        bulkWriteResult?: mongo.BulkWriteResult;
+        bulkWriteResult?: Awaited<ReturnType<IModel['bulkWrite']>>;
         modifiedEvents?: {
             id: string;
         }[];

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

@@ -1,5 +1,7 @@
-import type { Connection, FilterQuery } from 'mongoose';
+import type { Connection } from 'mongoose';
+import type { FilterQuery } from './mongoose/types';
 import { factory } from '../factory';
+import { IDocType } from './mongoose/schemas/eventSeries';
 type ISearchConditions = Pick<factory.eventSeries.ISearchConditions, 'limit' | 'page' | 'sort' | 'additionalProperty' | 'endFrom' | 'endThrough' | 'id' | 'inSessionFrom' | 'inSessionThrough' | 'location' | 'name' | 'organizer' | 'project' | 'startFrom' | 'startThrough' | 'videoFormat' | 'workPerformed' | 'movieIdentifier' | 'movieVersion'>;
 type IKeyOfProjection = Exclude<keyof factory.eventSeries.IEvent, 'id' | 'videoFormat'>;
 /**
@@ -8,7 +10,7 @@ type IKeyOfProjection = Exclude<keyof factory.eventSeries.IEvent, 'id' | 'videoF
 export declare class EventSeriesRepo {
     private readonly eventSeriesModel;
     constructor(connection: Connection);
-    static CREATE_MONGO_CONDITIONS(conditions: ISearchConditions): FilterQuery<factory.eventSeries.IEvent>[];
+    static CREATE_MONGO_CONDITIONS(conditions: ISearchConditions): FilterQuery<IDocType>[];
     /**
      * イベントを検索する(inclusion projection)
      */

package/lib/chevre/repo/factory/action/createMongoConditions.d.ts

@@ -1,4 +1,4 @@
-import { FilterQuery } from 'mongoose';
+import type { FilterQuery } from '../../mongoose/types';
 import { factory } from '../../../factory';
 import { IDocType } from '../../mongoose/schemas/action';
 export type IFindAnyActionsParams = factory.action.ISearchConditions;

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

@@ -1,3 +1,4 @@
-import type { FilterQuery } from 'mongoose';
+import type { FilterQuery } from '../../mongoose/types';
+import { IDocType } from '../../mongoose/schemas/reservation';
 import { factory } from '../../../factory';
-export declare function createMongoConditions(params: factory.reservation.eventReservation.ISearchConditions): FilterQuery<import("@chevre/factory/lib/chevre/reservation/event").IReservation>[];
+export declare function createMongoConditions(params: factory.reservation.eventReservation.ISearchConditions): FilterQuery<IDocType>[];

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

@@ -1,4 +1,5 @@
-import { Connection, FilterQuery, QueryOptions } from 'mongoose';
+import { Connection, QueryOptions } from 'mongoose';
+import type { FilterQuery } from './mongoose/types';
 import { factory } from '../factory';
 import { IDocType } from './mongoose/schemas/identity';
 type ISavingSoftwareApplicationIdentity = Pick<factory.creativeWork.certification.softwareApplication.ICertification, 'about' | 'project' | 'typeOf'>;
@@ -22,7 +23,7 @@ type IKeyOfProjection = keyof factory.creativeWork.certification.webApplication.
 export declare class IdentityRepo {
     private readonly identityModel;
     constructor(connection: Connection);
-    static CREATE_FILTER_QUERY(params: factory.creativeWork.certification.webApplication.ISearchConditions): FilterQuery<factory.creativeWork.certification.webApplication.ICertification>[];
+    static CREATE_FILTER_QUERY(params: factory.creativeWork.certification.webApplication.ISearchConditions): FilterQuery<IDocType>[];
     saveIdentity(params: {
         id?: string;
         attributes: ISavingIdentity & IUnset;

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

@@ -1,4 +1,5 @@
-import { Connection, FilterQuery, QueryOptions } from 'mongoose';
+import { Connection, QueryOptions } from 'mongoose';
+import type { FilterQuery } from './mongoose/types';
 import { factory } from '../factory';
 import { IDocType } from './mongoose/schemas/identityProvider';
 export type ISavingIdentityProvider = Pick<factory.identityProvider.IIdentityProvider, 'identifier' | 'project' | 'typeOf'> & {
@@ -17,7 +18,7 @@ type IKeyOfProjection = keyof factory.identityProvider.IIdentityProvider;
 export declare class IdentityProviderRepo {
     private readonly identityProviderModel;
     constructor(connection: Connection);
-    static CREATE_FILTER_QUERY(params: factory.identityProvider.ISearchConditions): FilterQuery<factory.identityProvider.IIdentityProvider>[];
+    static CREATE_FILTER_QUERY(params: factory.identityProvider.ISearchConditions): FilterQuery<IDocType>[];
     save(params: {
         id?: string;
         attributes: ISavingIdentityProvider & IUnset;

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

@@ -1,4 +1,5 @@
-import type { Connection, FilterQuery } from 'mongoose';
+import type { Connection } from 'mongoose';
+import type { FilterQuery } from './mongoose/types';
 import { factory } from '../factory';
 import { IDocType } from './mongoose/schemas/issuer';
 type IIssuer = factory.issuer.IIssuer;
@@ -9,7 +10,7 @@ type ISearchConditions = factory.issuer.ISearchConditions;
 export declare class IssuerRepo {
     private readonly issuerModel;
     constructor(connection: Connection);
-    static CREATE_MONGO_CONDITIONS(params: ISearchConditions): FilterQuery<factory.issuer.IIssuer>[];
+    static CREATE_MONGO_CONDITIONS(params: ISearchConditions): FilterQuery<IDocType>[];
     saveIssuer(params: IIssuer): Promise<{
         id: string;
     }>;

package/lib/chevre/repo/issuer.js

@@ -34,21 +34,20 @@ class IssuerRepo {
     }
     async saveIssuer(params) {
         let savedId;
-        let doc;
         if (params.id === '') {
             const { id, ...creatingParams } = params; // eslint-disable-line @typescript-eslint/no-unused-vars
-            doc = await this.issuerModel.create(creatingParams);
-            savedId = doc.id;
+            const createdDoc = await this.issuerModel.create(creatingParams);
+            savedId = createdDoc.id;
         }
         else {
             const { id, identifier, project, ...updateFields } = params; // eslint-disable-line @typescript-eslint/no-unused-vars
-            doc = await this.issuerModel.findOneAndUpdate({ _id: { $eq: params.id } }, { $set: updateFields }, { upsert: false, new: true, projection: { _id: 1 } })
+            const doc = await this.issuerModel.findOneAndUpdate({ _id: { $eq: params.id } }, { $set: updateFields }, { upsert: false, new: true, projection: { _id: 1 } })
                 .exec();
+            if (doc === null) {
+                throw new factory_1.factory.errors.NotFound(this.issuerModel.modelName);
+            }
             savedId = params.id;
         }
-        if (doc === null) {
-            throw new factory_1.factory.errors.NotFound(this.issuerModel.modelName);
-        }
         return { id: savedId };
     }
     async renameIssuerIdentifier(params) {

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

@@ -1,6 +1,7 @@
-import type { Connection, FilterQuery } from 'mongoose';
+import type { Connection } from 'mongoose';
+import type { FilterQuery } from './mongoose/types';
 import { factory } from '../factory';
-import { IGlobalMember } from './mongoose/schemas/member/global';
+import { IGlobalMember, IDocType } from './mongoose/schemas/member/global';
 type IKeyOfProjection = keyof factory.iam.IMember;
 export type ICustomerMember = Pick<factory.iam.IMemberOfRole, 'hasRole' | 'id' | 'name' | 'memberOf'> & {
     /**
@@ -16,7 +17,7 @@ export declare class MemberRepo {
     private readonly globalMemberModel;
     private readonly memberModel;
     constructor(connection: Connection);
-    static CREATE_MONGO_CONDITIONS(params: factory.iam.ISearchConditions): FilterQuery<factory.iam.IMember>[];
+    static CREATE_MONGO_CONDITIONS(params: factory.iam.ISearchConditions): FilterQuery<IDocType>[];
     /**
      * プロジェクト指定で検索する
      */
@@ -74,7 +75,7 @@ export declare class MemberRepo {
                 };
             };
         };
-    }): Promise<string[]>;
+    }): Promise<factory.role.organizationRole.RoleName[]>;
     deleteByProject(params: {
         project: {
             id: string;
@@ -201,7 +202,7 @@ export declare class MemberRepo {
                 $eq: string;
             };
         };
-    }): Promise<string[]>;
+    }): Promise<factory.role.organizationRole.RoleName[]>;
     private projectFields;
 }
 export {};

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

@@ -1,4 +1,4 @@
-import type { Connection, Document } from 'mongoose';
+import type { Connection } from 'mongoose';
 import { factory } from '../factory';
 /**
  * 返品ポリシーリポジトリ
@@ -7,7 +7,9 @@ export declare class MerchantReturnPolicyRepo {
     private readonly merchantReturnPolicyModel;
     constructor(connection: Connection);
     static CREATE_MONGO_CONDITIONS(params: factory.unitPriceOffer.IOfferMerchantReturnPolicySearchConditions): any[];
-    save(params: factory.unitPriceOffer.IOfferMerchantReturnPolicy): Promise<any>;
+    saveMerchantReturnPolicy(params: factory.unitPriceOffer.IOfferMerchantReturnPolicy): Promise<{
+        id: string;
+    }>;
     findById(params: {
         id: string;
     }): Promise<factory.unitPriceOffer.IOfferMerchantReturnPolicy>;
@@ -20,7 +22,7 @@ export declare class MerchantReturnPolicyRepo {
             id: string;
         };
     }): Promise<void>;
-    getCursor(conditions: any, projection: any): import("mongoose").Cursor<Document<unknown, Record<string, never>, factory.unitPriceOffer.IOfferMerchantReturnPolicy, import("./mongoose/virtuals").IVirtuals, {}> & Pick<factory.merchantReturnPolicy.IMerchantReturnPolicy, "typeOf" | "customerRemorseReturnFees" | "customerRemorseReturnFeesMovieTicket"> & {
+    getCursor(conditions: any, projection: any): import("mongoose").Cursor<import("mongoose").Document<unknown, Record<string, never>, factory.unitPriceOffer.IOfferMerchantReturnPolicy, import("./mongoose/virtuals").IVirtuals, {}> & Pick<factory.merchantReturnPolicy.IMerchantReturnPolicy, "typeOf" | "customerRemorseReturnFees" | "customerRemorseReturnFeesMovieTicket"> & {
         customerRemorseReturnFees: factory.merchantReturnPolicy.ICustomerRemorseReturnFees;
         customerRemorseReturnFeesMovieTicket: factory.merchantReturnPolicy.ICustomerRemorseReturnFeesMovieTicket;
         project: Pick<factory.project.IProject, "id" | "typeOf">;
@@ -32,7 +34,7 @@ export declare class MerchantReturnPolicyRepo {
         _id: import("mongoose").Types.ObjectId;
     } & {
         __v: number;
-    }, import("mongoose").QueryOptions<factory.unitPriceOffer.IOfferMerchantReturnPolicy>, (Document<unknown, Record<string, never>, factory.unitPriceOffer.IOfferMerchantReturnPolicy, import("./mongoose/virtuals").IVirtuals, {}> & Pick<factory.merchantReturnPolicy.IMerchantReturnPolicy, "typeOf" | "customerRemorseReturnFees" | "customerRemorseReturnFeesMovieTicket"> & {
+    }, import("mongoose").QueryOptions<factory.unitPriceOffer.IOfferMerchantReturnPolicy>, (import("mongoose").Document<unknown, Record<string, never>, factory.unitPriceOffer.IOfferMerchantReturnPolicy, import("./mongoose/virtuals").IVirtuals, {}> & Pick<factory.merchantReturnPolicy.IMerchantReturnPolicy, "typeOf" | "customerRemorseReturnFees" | "customerRemorseReturnFeesMovieTicket"> & {
         customerRemorseReturnFees: factory.merchantReturnPolicy.ICustomerRemorseReturnFees;
         customerRemorseReturnFeesMovieTicket: factory.merchantReturnPolicy.ICustomerRemorseReturnFeesMovieTicket;
         project: Pick<factory.project.IProject, "id" | "typeOf">;

package/lib/chevre/repo/merchantReturnPolicy.js

@@ -72,22 +72,24 @@ class MerchantReturnPolicyRepo {
         }
         return andConditions;
     }
-    async save(params) {
-        let doc;
-        if (params.id === '') {
-            delete params.id;
-            doc = await this.merchantReturnPolicyModel.create(params);
+    async saveMerchantReturnPolicy(params) {
+        let savedId;
+        if (typeof params.id !== 'string' || params.id === '') {
+            const { id: _id, ...creatingDoc } = params;
+            const createdDoc = await this.merchantReturnPolicyModel.create(creatingDoc);
+            savedId = createdDoc.id;
         }
         else {
             // 上書き禁止属性を除外(2022-08-24~)
             const { id, identifier, project, typeOf, ...updateFields } = params; // eslint-disable-line @typescript-eslint/no-unused-vars
-            doc = await this.merchantReturnPolicyModel.findOneAndUpdate({ _id: params.id }, updateFields, { upsert: false, new: true })
+            const doc = await this.merchantReturnPolicyModel.findOneAndUpdate({ _id: params.id }, updateFields, { upsert: false, new: true })
                 .exec();
+            if (doc === null) {
+                throw new factory_1.factory.errors.NotFound(this.merchantReturnPolicyModel.modelName);
+            }
+            savedId = params.id;
         }
-        if (doc === null) {
-            throw new factory_1.factory.errors.NotFound(this.merchantReturnPolicyModel.modelName);
-        }
-        return doc.toObject();
+        return { id: savedId };
     }
     async findById(params) {
         const doc = await this.merchantReturnPolicyModel.findOne({ _id: params.id }, {

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

@@ -1,6 +1,7 @@
-import type { Connection, FilterQuery } from 'mongoose';
+import type { Connection } from 'mongoose';
+import type { FilterQuery } from './mongoose/types';
 import { factory } from '../factory';
-import { IEmailMessage } from './mongoose/schemas/message';
+import { IEmailMessage, IDocType } from './mongoose/schemas/message';
 type IFindByIdentifierResult = Pick<IEmailMessage, 'about' | 'identifier' | 'name' | 'sender' | 'text' | 'toRecipient' | 'typeOf'>;
 interface ISearchConditions {
     limit?: number;
@@ -39,7 +40,7 @@ type IKeyOfProjection = keyof IEmailMessage;
 export declare class MessageRepo {
     private readonly messageModel;
     constructor(connection: Connection);
-    static CREATE_MONGO_CONDITIONS(params: ISearchConditions): FilterQuery<IEmailMessage>[];
+    static CREATE_MONGO_CONDITIONS(params: ISearchConditions): FilterQuery<IDocType>[];
     /**
      * 検索
      */

package/lib/chevre/repo/message.js

@@ -120,9 +120,8 @@ class MessageRepo {
             $setOnInsert: setOnInsert,
             $set: setFields
         };
-        const options = { upsert: true };
         try {
-            await this.messageModel.updateOne(filter, updateFilter, options)
+            await this.messageModel.updateOne(filter, updateFilter, { upsert: true })
                 .exec();
         }
         catch (error) {

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

@@ -22,7 +22,7 @@ export type IMinimizedAcceptedOffer = Pick<factory.acceptedOffer.IOptimizedAccep
     name?: never;
 };
 export type IAcceptedOfferInDoc = IMinimizedAcceptedOffer | factory.acceptedOffer.ICOAAcceptedOffer;
-type IDocType = Omit<factory.order.IOrder, 'id'> & {
+type IDocTypeAsOrder = Omit<factory.order.IOrder, 'id'> & {
     acceptedOffers?: IAcceptedOfferInDoc[];
     /**
      * 注文取引IDとして再定義(2026-06-22~)
@@ -33,6 +33,10 @@ type IDocType = Omit<factory.order.IOrder, 'id'> & {
      */
     paymentMethodId?: string;
 };
+type IDocTypeAsPlaceOrder = Omit<IDocTypeAsOrder, 'typeOf'> & {
+    typeOf: factory.transactionType.PlaceOrder;
+};
+type IDocType = IDocTypeAsOrder | IDocTypeAsPlaceOrder;
 type IModel = Model<IDocType, Record<string, never>, Record<string, never>, IVirtuals>;
 type ISchemaDefinition = SchemaDefinition<IDocType>;
 type ISchema = Schema<IDocType, IModel, Record<string, never>, Record<string, never>, IVirtuals, Record<string, never>, ISchemaDefinition, IDocType>;

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

@@ -0,0 +1,2 @@
+import type { FilterQuery } from 'mongoose';
+export { FilterQuery };

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

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

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

@@ -1,4 +1,5 @@
-import { AnyExpression, Connection, FilterQuery } from 'mongoose';
+import { AnyExpression, Connection } from 'mongoose';
+import type { FilterQuery } from './mongoose/types';
 import { IDocType } from './mongoose/schemas/movieTicketTypes';
 import { factory } from '../factory';
 type IUnset = {

package/lib/chevre/repo/movieTicketType.js

@@ -178,7 +178,6 @@ class MovieTicketTypeRepo {
     }
     async saveMovieTicketType(params) {
         let savedId;
-        // let doc: HydratedDocument<{ _id: Types.ObjectId }> | null;
         if (typeof params.id !== 'string') {
             const { id, $unset, ...creatingDoc } = params.attributes; // eslint-disable-line @typescript-eslint/no-unused-vars
             const createResult = await this.categoryCodeModel.create(creatingDoc);
@@ -201,9 +200,6 @@ class MovieTicketTypeRepo {
             }
             savedId = params.id;
         }
-        // if (doc === null) {
-        //     throw new factory.errors.NotFound(this.categoryCodeModel.modelName);
-        // }
         return { id: savedId };
     }
     /**

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

@@ -1,5 +1,7 @@
-import type { Connection, FilterQuery, mongo } from 'mongoose';
+import type { Connection } from 'mongoose';
+import type { FilterQuery } from './mongoose/types';
 import { factory } from '../factory';
+import { IDocType, IModel } from './mongoose/schemas/note';
 type INoteDigitalDocument = factory.creativeWork.noteDigitalDocument.INoteDigitalDocument;
 type IKeyOfProjection = keyof INoteDigitalDocument;
 /**
@@ -8,7 +10,7 @@ type IKeyOfProjection = keyof INoteDigitalDocument;
 export declare class NoteRepo {
     private readonly noteModel;
     constructor(connection: Connection);
-    static CREATE_MONGO_CONDITIONS(params: factory.creativeWork.noteDigitalDocument.ISearchConditions): FilterQuery<import("@chevre/factory/lib/chevre/creativeWork/noteDigitalDocument").INoteDigitalDocument>[];
+    static CREATE_MONGO_CONDITIONS(params: factory.creativeWork.noteDigitalDocument.ISearchConditions): FilterQuery<IDocType>[];
     findNotes(params: factory.creativeWork.noteDigitalDocument.ISearchConditions, inclusion: IKeyOfProjection[]): Promise<(INoteDigitalDocument & {
         id: string;
     })[]>;
@@ -28,7 +30,7 @@ export declare class NoteRepo {
          */
         update: boolean;
     }): Promise<{
-        bulkWriteResult?: mongo.BulkWriteResult;
+        bulkWriteResult?: Awaited<ReturnType<IModel['bulkWrite']>>;
         modifiedNotes?: {
             id: string;
         }[];
@@ -41,7 +43,7 @@ export declare class NoteRepo {
             id: string;
             typeOf: factory.creativeWork.noteDigitalDocument.IAbout['typeOf'];
         };
-    }): Promise<mongo.DeleteResult>;
+    }): Promise<Awaited<ReturnType<IModel['deleteMany']>>>;
     unsetUnnecessaryFields(params: {
         filter: any;
         $unset: any;

package/lib/chevre/repo/note.js

@@ -235,9 +235,12 @@ class NoteRepo {
      * 主題リソースから全メモを削除する
      */
     async deleteNotesByAbout(params) {
+        if (typeof params.about.typeOf !== 'string' || params.about.typeOf === '') {
+            throw new factory_1.factory.errors.ArgumentNull('about.typeOf');
+        }
         return this.noteModel.deleteMany({
             'about.id': { $eq: String(params.about.id) },
-            'about.typeOf': { $eq: String(params.about.typeOf) }
+            'about.typeOf': { $eq: params.about.typeOf }
         })
             .exec();
     }