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

package/lib/chevre/repo/action/inform.d.ts

@@ -1,4 +1,5 @@
-import { Connection, FilterQuery } from 'mongoose';
+import { Connection } from 'mongoose';
+import type { FilterQuery } from '../mongoose/types';
 import { factory } from '../../factory';
 import { IDocType } from '../mongoose/schemas/action/inform';
 import { DedicatedActionProcessRepo } from './dedicatedAction/dedicatedActionProcess';

package/lib/chevre/repo/action/update.d.ts

@@ -1,4 +1,5 @@
-import { Connection, FilterQuery } from 'mongoose';
+import { Connection } from 'mongoose';
+import type { FilterQuery } from '../mongoose/types';
 import { factory } from '../../factory';
 import { IDocType } from '../mongoose/schemas/action/update';
 import { DedicatedActionProcessRepo } from './dedicatedAction/dedicatedActionProcess';

package/lib/chevre/repo/action/use.d.ts

@@ -1,4 +1,5 @@
-import { Connection, FilterQuery } from 'mongoose';
+import { Connection } from 'mongoose';
+import type { FilterQuery } from '../mongoose/types';
 import { factory } from '../../factory';
 import { IDocType } from '../mongoose/schemas/action/use';
 import { DedicatedActionProcessRepo } from './dedicatedAction/dedicatedActionProcess';

package/lib/chevre/repo/additionalProperty.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/additionalProperty';
 type IKeyOfProjection = keyof factory.additionalProperty.IAdditionalProperty;
 /**
  * 追加特性リポジトリ
@@ -7,7 +9,7 @@ type IKeyOfProjection = keyof factory.additionalProperty.IAdditionalProperty;
 export declare class AdditionalPropertyRepo {
     private readonly additionalPropertyModel;
     constructor(connection: Connection);
-    static CREATE_MONGO_CONDITIONS(params: factory.additionalProperty.ISearchConditions): FilterQuery<factory.additionalProperty.IAdditionalProperty>[];
+    static CREATE_MONGO_CONDITIONS(params: factory.additionalProperty.ISearchConditions): FilterQuery<IDocType>[];
     /**
      * 検索
      */

package/lib/chevre/repo/additionalProperty.js

@@ -89,21 +89,20 @@ class AdditionalPropertyRepo {
     }
     async save(params) {
         let savedId;
-        let doc;
         if (typeof params.id !== 'string') {
             const { id, ...createParams } = params.attributes; // eslint-disable-line @typescript-eslint/no-unused-vars
-            doc = await this.additionalPropertyModel.create(createParams);
-            savedId = doc.id;
+            const createdDoc = await this.additionalPropertyModel.create(createParams);
+            savedId = createdDoc.id;
         }
         else {
             const { id, codeValue, inCodeSet, project, typeOf, ...updateFields } = params.attributes; // eslint-disable-line @typescript-eslint/no-unused-vars
-            doc = await this.additionalPropertyModel.findOneAndUpdate({ _id: { $eq: params.id } }, updateFields, { upsert: false, new: true, projection: { _id: 1 } })
+            const doc = await this.additionalPropertyModel.findOneAndUpdate({ _id: { $eq: params.id } }, updateFields, { upsert: false, new: true, projection: { _id: 1 } })
                 .exec();
+            if (doc === null) {
+                throw new factory_1.factory.errors.NotFound(this.additionalPropertyModel.modelName);
+            }
             savedId = params.id;
         }
-        if (doc === null) {
-            throw new factory_1.factory.errors.NotFound(this.additionalPropertyModel.modelName);
-        }
         return { id: savedId };
     }
     /**

package/lib/chevre/repo/adminAction.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 type { IDocType } from './mongoose/schemas/action';
 import { IKeyOfProjection, IAction, IActionRecipe, ActionProcessRepo } from './action/anyAction/actionProcess';
@@ -87,7 +88,7 @@ export declare class AdminActionRepo extends ActionProcessRepo<IAction<Startable
         __v: number;
     }) | null>;
     unsetUnnecessaryFields(params: {
-        filter: FilterQuery<factory.action.IAction<factory.action.IAttributes<factory.actionType, any, any>>>;
+        filter: FilterQuery<IDocType>;
         $unset: any;
     }): Promise<import("mongoose").UpdateWriteOpResult>;
 }

package/lib/chevre/repo/adminAssetTransaction.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/assetTransaction';
 import { factory } from '../factory';
 type AvailableAssetTransactionType = factory.assetTransactionType.CancelReservation | factory.assetTransactionType.Pay | factory.assetTransactionType.Refund | factory.assetTransactionType.Reserve;
@@ -8,7 +9,7 @@ type AvailableAssetTransactionType = factory.assetTransactionType.CancelReservat
 export declare class AdminAssetTransactionRepo {
     private readonly transactionModel;
     constructor(connection: Connection);
-    static CREATE_MONGO_CONDITIONS(params: factory.assetTransaction.ISearchConditions<factory.assetTransactionType>): FilterQuery<import("@chevre/factory/lib/chevre/assetTransaction/cancelReservation").ITransaction | import("@chevre/factory/lib/chevre/assetTransaction/pay").ITransaction | import("@chevre/factory/lib/chevre/assetTransaction/refund").ITransaction | import("@chevre/factory/lib/chevre/assetTransaction/reserve").ITransaction>[];
+    static CREATE_MONGO_CONDITIONS(params: factory.assetTransaction.ISearchConditions<factory.assetTransactionType>): FilterQuery<IDocType>[];
     countPotentiallyExportTasks(params: {
         endDate: {
             $lt: Date;

package/lib/chevre/repo/adminAsyncAction.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/asyncAction';
 import type { IExecutableTask } from '../taskSettings';
@@ -11,7 +12,7 @@ type IFindParams = Pick<factory.task.ISearchConditions, 'id' | 'name' | 'project
 export declare class AdminAsyncActionRepo {
     private readonly asyncActionModel;
     constructor(connection: Connection);
-    static CREATE_MONGO_CONDITIONS(params: Pick<IFindParams, 'id' | 'name' | 'project' | 'runsFrom' | 'runsThrough' | 'status'>): FilterQuery<import("@chevre/factory/lib/chevre/task").ITask | import("@chevre/factory/lib/chevre/task/confirmPayTransaction").ITask | import("@chevre/factory/lib/chevre/task/confirmReserveTransaction").ITask | import("@chevre/factory/lib/chevre/task/createAccountingReport").ITask | import("@chevre/factory/lib/chevre/task/onAssetTransactionStatusChanged").ITask | import("@chevre/factory/lib/chevre/task/onAuthorizationCreated").ITask | import("@chevre/factory/lib/chevre/task/onEventChanged").ITask | import("@chevre/factory/lib/chevre/task/onResourceDeleted").ITask | import("@chevre/factory/lib/chevre/task/onResourceUpdated").ITask | import("@chevre/factory/lib/chevre/task/onOrderPaymentCompleted").ITask | import("@chevre/factory/lib/chevre/task/placeOrder").ITask | import("@chevre/factory/lib/chevre/task/returnOrder").ITask | import("@chevre/factory/lib/chevre/task/returnPayTransaction").ITask | import("@chevre/factory/lib/chevre/task/returnReserveTransaction").ITask | import("@chevre/factory/lib/chevre/task/sendEmailMessage").ITask | import("@chevre/factory/lib/chevre/task/sendOrder").ITask | import("@chevre/factory/lib/chevre/task/triggerWebhook").ITask | import("@chevre/factory/lib/chevre/task/useReservation").ITask | import("@chevre/factory/lib/chevre/task/voidPayTransaction").ITask>[];
+    static CREATE_MONGO_CONDITIONS(params: Pick<IFindParams, 'id' | 'name' | 'project' | 'runsFrom' | 'runsThrough' | 'status'>): FilterQuery<IDocType>[];
     findAsyncActions(params: IFindParams, inclusion: IKeyOfProjection[]): Promise<(IDocType & {
         id: string;
     })[]>;

package/lib/chevre/repo/adminCheckMovieTicketAction.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/action/checkMovieTicket';
 type IAction = IDocType & {

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

@@ -1,5 +1,7 @@
-import { Connection, FilterQuery, mongo } from 'mongoose';
+import { Connection, mongo } from 'mongoose';
+import type { FilterQuery } from './mongoose/types';
 import { factory } from '../factory';
+import { IDocType } from './mongoose/schemas/event';
 export interface IAttributes4patchUpdate {
     typeOf: factory.eventType.ScreeningEvent;
     eventStatus?: factory.eventStatusType;
@@ -223,7 +225,7 @@ export declare class AdminEventRepo {
         __v: number;
     }) | null>;
     unsetUnnecessaryFields(params: {
-        filter: FilterQuery<factory.event.screeningEvent.IEvent>;
+        filter: FilterQuery<IDocType>;
         $unset: IUnset;
     }): Promise<import("mongoose").UpdateWriteOpResult>;
 }

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

@@ -1,5 +1,7 @@
-import type { Connection, FilterQuery, mongo } from 'mongoose';
+import type { Connection, mongo } from 'mongoose';
+import type { FilterQuery } from './mongoose/types';
 import { factory } from '../factory';
+import { IDocType } from './mongoose/schemas/eventSeries';
 type IUnset = {
     [key in keyof factory.eventSeries.IEvent]?: 1;
 };
@@ -60,7 +62,7 @@ export declare class AdminEventSeriesRepo {
         __v: number;
     }) | null>;
     unsetUnnecessaryFields(params: {
-        filter: FilterQuery<factory.eventSeries.IEvent>;
+        filter: FilterQuery<IDocType>;
         $unset: IUnset;
     }): Promise<import("mongoose").UpdateWriteOpResult>;
 }

package/lib/chevre/repo/adminPaymentServiceChannel.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/paymentServiceChannel';
 export type ISavingChannel = Pick<factory.serviceChannel.IServiceChannel, 'credentials' | 'project' | 'providesService' | 'serviceUrl' | 'typeOf'> & {

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

@@ -1,5 +1,6 @@
-import type { Connection, FilterQuery } from 'mongoose';
-import { IReservationPackage, ISubReservation } from './mongoose/schemas/pendingReservation';
+import type { Connection } from 'mongoose';
+import type { FilterQuery } from './mongoose/types';
+import { IDocType, IReservationPackage, ISubReservation } from './mongoose/schemas/pendingReservation';
 interface ISearchConditions {
     limit?: number;
     page?: number;
@@ -37,7 +38,7 @@ type IProjectSubReservationResult = Pick<ISubReservation, 'identifier'> & {
 export declare class AdminPendingReservationRepo {
     private readonly pendingReservationModel;
     constructor(connection: Connection);
-    static CREATE_FILTER_QUERY(params: ISearchConditions): FilterQuery<IReservationPackage>[];
+    static CREATE_FILTER_QUERY(params: ISearchConditions): FilterQuery<IDocType>[];
     findPendingReservations(params: ISearchConditions): Promise<IProjectFieldResult[]>;
     projectSubReservationByReservationNumber(params: {
         project: {

package/lib/chevre/repo/adminScheduledTask.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/scheduledTasks';
 type IKeyOfProjection = keyof IDocType;
@@ -9,7 +10,7 @@ type IFindParams = Pick<factory.task.ISearchConditions, 'id' | 'name' | 'project
 export declare class AdminScheduledTaskRepo {
     private readonly scheduledTaskModel;
     constructor(connection: Connection);
-    static CREATE_MONGO_CONDITIONS(params: Pick<IFindParams, 'id' | 'name' | 'project' | 'runsFrom' | 'runsThrough' | 'status'>): FilterQuery<import("@chevre/factory/lib/chevre/task").ITask | import("@chevre/factory/lib/chevre/task/confirmPayTransaction").ITask | import("@chevre/factory/lib/chevre/task/confirmReserveTransaction").ITask | import("@chevre/factory/lib/chevre/task/createAccountingReport").ITask | import("@chevre/factory/lib/chevre/task/onAssetTransactionStatusChanged").ITask | import("@chevre/factory/lib/chevre/task/onAuthorizationCreated").ITask | import("@chevre/factory/lib/chevre/task/onEventChanged").ITask | import("@chevre/factory/lib/chevre/task/onResourceDeleted").ITask | import("@chevre/factory/lib/chevre/task/onResourceUpdated").ITask | import("@chevre/factory/lib/chevre/task/onOrderPaymentCompleted").ITask | import("@chevre/factory/lib/chevre/task/placeOrder").ITask | import("@chevre/factory/lib/chevre/task/returnOrder").ITask | import("@chevre/factory/lib/chevre/task/returnPayTransaction").ITask | import("@chevre/factory/lib/chevre/task/returnReserveTransaction").ITask | import("@chevre/factory/lib/chevre/task/sendEmailMessage").ITask | import("@chevre/factory/lib/chevre/task/sendOrder").ITask | import("@chevre/factory/lib/chevre/task/triggerWebhook").ITask | import("@chevre/factory/lib/chevre/task/useReservation").ITask | import("@chevre/factory/lib/chevre/task/voidPayTransaction").ITask>[];
+    static CREATE_MONGO_CONDITIONS(params: Pick<IFindParams, 'id' | 'name' | 'project' | 'runsFrom' | 'runsThrough' | 'status'>): FilterQuery<IDocType>[];
     /**
      * 検索する
      */

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

@@ -1,4 +1,5 @@
-import type { AnyKeys, Connection, FilterQuery, ProjectionType } from 'mongoose';
+import type { AnyKeys, Connection, ProjectionType } from 'mongoose';
+import type { FilterQuery } from './mongoose/types';
 import { factory } from '../factory';
 import { IDocType } from './mongoose/schemas/task';
 type IKeyOfProjection = keyof factory.task.ITask<factory.taskName>;
@@ -13,7 +14,7 @@ type IFindParams = factory.task.ISearchConditions & {
 export declare class AdminTaskRepo {
     private readonly taskModel;
     constructor(connection: Connection);
-    static CREATE_MONGO_CONDITIONS(params: IFindParams): FilterQuery<import("@chevre/factory/lib/chevre/task").ITask | import("@chevre/factory/lib/chevre/task/confirmPayTransaction").ITask | import("@chevre/factory/lib/chevre/task/confirmReserveTransaction").ITask | import("@chevre/factory/lib/chevre/task/createAccountingReport").ITask | import("@chevre/factory/lib/chevre/task/onAssetTransactionStatusChanged").ITask | import("@chevre/factory/lib/chevre/task/onAuthorizationCreated").ITask | import("@chevre/factory/lib/chevre/task/onEventChanged").ITask | import("@chevre/factory/lib/chevre/task/onResourceDeleted").ITask | import("@chevre/factory/lib/chevre/task/onResourceUpdated").ITask | import("@chevre/factory/lib/chevre/task/onOrderPaymentCompleted").ITask | import("@chevre/factory/lib/chevre/task/placeOrder").ITask | import("@chevre/factory/lib/chevre/task/returnOrder").ITask | import("@chevre/factory/lib/chevre/task/returnPayTransaction").ITask | import("@chevre/factory/lib/chevre/task/returnReserveTransaction").ITask | import("@chevre/factory/lib/chevre/task/sendEmailMessage").ITask | import("@chevre/factory/lib/chevre/task/sendOrder").ITask | import("@chevre/factory/lib/chevre/task/triggerWebhook").ITask | import("@chevre/factory/lib/chevre/task/useReservation").ITask | import("@chevre/factory/lib/chevre/task/voidPayTransaction").ITask>[];
+    static CREATE_MONGO_CONDITIONS(params: IFindParams): FilterQuery<IDocType>[];
     countTasks(params: IFindParams): Promise<{
         count: number;
     }>;
@@ -33,7 +34,7 @@ export declare class AdminTaskRepo {
     }): Promise<{
         count: number;
     }>;
-    getCursor(conditions: FilterQuery<factory.task.ITask<factory.taskName>>, projection: ProjectionType<factory.task.ITask<factory.taskName>>): import("mongoose").Cursor<import("mongoose").Document<unknown, Record<string, never>, IDocType, import("./mongoose/virtuals").IVirtuals, {}> & Pick<import("@chevre/factory/lib/chevre/task").ITask | import("@chevre/factory/lib/chevre/task/confirmPayTransaction").ITask | import("@chevre/factory/lib/chevre/task/confirmReserveTransaction").ITask | import("@chevre/factory/lib/chevre/task/createAccountingReport").ITask | import("@chevre/factory/lib/chevre/task/onAssetTransactionStatusChanged").ITask | import("@chevre/factory/lib/chevre/task/onAuthorizationCreated").ITask | import("@chevre/factory/lib/chevre/task/onEventChanged").ITask | import("@chevre/factory/lib/chevre/task/onResourceDeleted").ITask | import("@chevre/factory/lib/chevre/task/onResourceUpdated").ITask | import("@chevre/factory/lib/chevre/task/onOrderPaymentCompleted").ITask | import("@chevre/factory/lib/chevre/task/placeOrder").ITask | import("@chevre/factory/lib/chevre/task/returnOrder").ITask | import("@chevre/factory/lib/chevre/task/returnPayTransaction").ITask | import("@chevre/factory/lib/chevre/task/returnReserveTransaction").ITask | import("@chevre/factory/lib/chevre/task/sendEmailMessage").ITask | import("@chevre/factory/lib/chevre/task/sendOrder").ITask | import("@chevre/factory/lib/chevre/task/triggerWebhook").ITask | import("@chevre/factory/lib/chevre/task/useReservation").ITask | import("@chevre/factory/lib/chevre/task/voidPayTransaction").ITask, "identifier" | "name" | "description" | "project" | "data" | "status" | "runsAt" | "dateAborted" | "executionResults" | "executor" | "lastTriedAt" | "remainingNumberOfTries" | "numberOfTried"> & {
+    getCursor(conditions: FilterQuery<IDocType>, projection: ProjectionType<factory.task.ITask<factory.taskName>>): import("mongoose").Cursor<import("mongoose").Document<unknown, Record<string, never>, IDocType, import("./mongoose/virtuals").IVirtuals, {}> & Pick<import("@chevre/factory/lib/chevre/task").ITask | import("@chevre/factory/lib/chevre/task/confirmPayTransaction").ITask | import("@chevre/factory/lib/chevre/task/confirmReserveTransaction").ITask | import("@chevre/factory/lib/chevre/task/createAccountingReport").ITask | import("@chevre/factory/lib/chevre/task/onAssetTransactionStatusChanged").ITask | import("@chevre/factory/lib/chevre/task/onAuthorizationCreated").ITask | import("@chevre/factory/lib/chevre/task/onEventChanged").ITask | import("@chevre/factory/lib/chevre/task/onResourceDeleted").ITask | import("@chevre/factory/lib/chevre/task/onResourceUpdated").ITask | import("@chevre/factory/lib/chevre/task/onOrderPaymentCompleted").ITask | import("@chevre/factory/lib/chevre/task/placeOrder").ITask | import("@chevre/factory/lib/chevre/task/returnOrder").ITask | import("@chevre/factory/lib/chevre/task/returnPayTransaction").ITask | import("@chevre/factory/lib/chevre/task/returnReserveTransaction").ITask | import("@chevre/factory/lib/chevre/task/sendEmailMessage").ITask | import("@chevre/factory/lib/chevre/task/sendOrder").ITask | import("@chevre/factory/lib/chevre/task/triggerWebhook").ITask | import("@chevre/factory/lib/chevre/task/useReservation").ITask | import("@chevre/factory/lib/chevre/task/voidPayTransaction").ITask, "identifier" | "name" | "description" | "project" | "data" | "status" | "runsAt" | "dateAborted" | "executionResults" | "executor" | "lastTriedAt" | "remainingNumberOfTries" | "numberOfTried"> & {
         expires?: never;
     } & {
         _id: import("mongoose").Types.ObjectId;
@@ -47,7 +48,7 @@ export declare class AdminTaskRepo {
         __v: number;
     }) | null>;
     unsetUnnecessaryFields(params: {
-        filter: FilterQuery<factory.task.ITask<factory.taskName>>;
+        filter: FilterQuery<IDocType>;
         $unset: AnyKeys<factory.task.ITask<factory.taskName>>;
     }): Promise<import("mongoose").UpdateWriteOpResult>;
 }

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

@@ -1,6 +1,7 @@
-import { AnyExpression, Connection, Document, FilterQuery, PipelineStage, mongo } from 'mongoose';
+import { AnyExpression, Connection, Document, PipelineStage, mongo } from 'mongoose';
+import type { FilterQuery } from './mongoose/types';
 import { factory } from '../factory';
-import { IDocType as IAggregateOfferDocType } from './mongoose/schemas/aggregateOffer';
+import { IDocType } from './mongoose/schemas/aggregateOffer';
 type IMatchStage = PipelineStage.Match;
 type KeyOfUnitPriceOffer = keyof factory.unitPriceOffer.IUnitPriceOffer;
 type IProjection = Partial<Record<KeyOfUnitPriceOffer, 0 | 1>>;
@@ -54,17 +55,17 @@ export declare class AggregateOfferRepo {
         };
         id: string;
     }): Promise<void>;
-    getCursor(conditions: any, projection: any): import("mongoose").Cursor<Document<unknown, Record<string, never>, IAggregateOfferDocType, import("./mongoose/virtuals").IVirtuals, {}> & IAggregateOfferDocType & Required<{
+    getCursor(conditions: any, projection: any): import("mongoose").Cursor<Document<unknown, Record<string, never>, IDocType, import("./mongoose/virtuals").IVirtuals, {}> & IDocType & Required<{
         _id: string;
     }> & {
         __v: number;
-    }, import("mongoose").QueryOptions<IAggregateOfferDocType>, (Document<unknown, Record<string, never>, IAggregateOfferDocType, import("./mongoose/virtuals").IVirtuals, {}> & IAggregateOfferDocType & Required<{
+    }, import("mongoose").QueryOptions<IDocType>, (Document<unknown, Record<string, never>, IDocType, import("./mongoose/virtuals").IVirtuals, {}> & IDocType & Required<{
         _id: string;
     }> & {
         __v: number;
     }) | null>;
     unsetUnnecessaryFields(params: {
-        filter: FilterQuery<factory.aggregateOffer.IAggregateOffer>;
+        filter: FilterQuery<IDocType>;
         $unset: any;
     }): Promise<import("mongoose").UpdateWriteOpResult>;
     save(params: factory.unitPriceOffer.IUnitPriceOffer & {}): Promise<{

package/lib/chevre/repo/aggregateOffer.js

@@ -574,7 +574,6 @@ class AggregateOfferRepo {
         const { productType } = options;
         const { default: uniqid } = await import('uniqid');
         const insertBulkWriteOps = [];
-        // const updateBulkWriteOps: AnyBulkWriteOperation<factory.aggregateOffer.IAggregateOffer>[] = [];
         const queryFilters = [];
         if (Array.isArray(params)) {
             params.forEach((p) => {

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

@@ -1,4 +1,6 @@
-import type { Connection, FilterQuery } from 'mongoose';
+import type { Connection } from 'mongoose';
+import type { FilterQuery } from './mongoose/types';
+import { IDocType } from './mongoose/schemas/assetTransaction';
 import { factory } from '../factory';
 type IKeyOfProjection<T extends factory.assetTransactionType> = keyof Pick<factory.assetTransaction.ITransaction<factory.assetTransactionType>, 'agent' | 'endDate' | 'expires' | 'project' | 'startDate' | 'status' | 'typeOf' | 'transactionNumber'> | Exclude<keyof factory.assetTransaction.ITransaction<T>, 'id'>;
 type AvailableAssetTransactionType = factory.assetTransactionType.CancelReservation | factory.assetTransactionType.Pay | factory.assetTransactionType.Refund | factory.assetTransactionType.Reserve;
@@ -9,7 +11,7 @@ type IFindParams<T extends factory.assetTransactionType> = T extends factory.ass
 export declare class AssetTransactionRepo {
     private readonly transactionModel;
     constructor(connection: Connection);
-    static CREATE_MONGO_CONDITIONS(params: IFindParams<factory.assetTransactionType>): FilterQuery<import("@chevre/factory/lib/chevre/assetTransaction/cancelReservation").ITransaction | import("@chevre/factory/lib/chevre/assetTransaction/pay").ITransaction | import("@chevre/factory/lib/chevre/assetTransaction/refund").ITransaction | import("@chevre/factory/lib/chevre/assetTransaction/reserve").ITransaction>[];
+    static CREATE_MONGO_CONDITIONS(params: IFindParams<factory.assetTransactionType>): FilterQuery<IDocType>[];
     /**
      * 取引を開始する
      */

package/lib/chevre/repo/authorization.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/authorization';
 type IFindValidOneResult = Pick<factory.authorization.IAuthorization, 'object' | 'typeOf' | 'audience' | 'issuedBy'> & {
     id: string;
 };
@@ -14,7 +16,7 @@ type IKeyOfProjection = keyof factory.authorization.IAuthorization;
 export declare class AuthorizationRepo {
     private readonly authorizationModel;
     constructor(connection: Connection);
-    static CREATE_MONGO_CONDITIONS(params: factory.authorization.ISearchConditions): FilterQuery<factory.authorization.IAuthorization>[];
+    static CREATE_MONGO_CONDITIONS(params: factory.authorization.ISearchConditions): FilterQuery<IDocType>[];
     /**
      * 承認を発行する
      * コードが自動生成されます
@@ -42,7 +44,7 @@ export declare class AuthorizationRepo {
         id: string;
     })[]>;
     unsetUnnecessaryFields(params: {
-        filter: FilterQuery<factory.authorization.IAuthorization>;
+        filter: FilterQuery<IDocType>;
         $unset: any;
     }): Promise<import("mongoose").UpdateWriteOpResult>;
     /**

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

@@ -1,4 +1,5 @@
-import { AnyExpression, Connection, FilterQuery, Types } from 'mongoose';
+import { AnyExpression, Connection, Types } from 'mongoose';
+import type { FilterQuery } from './mongoose/types';
 import { IDocType } from './mongoose/schemas/categoryCode';
 import { factory } from '../factory';
 type IUnset = {
@@ -14,7 +15,7 @@ type IKeyOfProjectionExceptMovieTicketType = keyof ICategoryCodeExceptMovieTicke
 export declare class CategoryCodeRepo {
     private readonly categoryCodeModel;
     constructor(connection: Connection);
-    static CREATE_MONGO_CONDITIONS(params: factory.categoryCode.ISearchConditions): FilterQuery<factory.categoryCode.ICategoryCode>[];
+    static CREATE_MONGO_CONDITIONS(params: factory.categoryCode.ISearchConditions): FilterQuery<IDocType>[];
     static CREATE_AGGREGATE_PROJECTION(inclusion: IKeyOfProjection[]): Record<string, AnyExpression>;
     /**
      * 区分集計検索(publicな属性検索が目的)
@@ -65,7 +66,7 @@ export declare class CategoryCodeRepo {
             id: string;
         };
     }): Promise<void>;
-    getCursor(conditions: FilterQuery<factory.categoryCode.ICategoryCode>, projection: any): import("mongoose").Cursor<import("mongoose").Document<unknown, Record<string, never>, IDocType, import("./mongoose/virtuals").IVirtuals, {}> & IDocType & {
+    getCursor(conditions: FilterQuery<IDocType>, projection: any): import("mongoose").Cursor<import("mongoose").Document<unknown, Record<string, never>, IDocType, import("./mongoose/virtuals").IVirtuals, {}> & IDocType & {
         _id: Types.ObjectId;
     } & {
         __v: number;
@@ -75,7 +76,7 @@ export declare class CategoryCodeRepo {
         __v: number;
     }) | null>;
     unsetUnnecessaryFields(params: {
-        filter: FilterQuery<factory.categoryCode.ICategoryCode>;
+        filter: FilterQuery<IDocType>;
         $unset: any;
     }): Promise<import("mongoose").UpdateWriteOpResult>;
 }

package/lib/chevre/repo/categoryCode.js

@@ -203,7 +203,6 @@ class CategoryCodeRepo {
     }
     async saveCategoryCode(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);

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

@@ -1,4 +1,5 @@
-import { Connection, FilterQuery, Types, mongo } from 'mongoose';
+import { Connection, Types, mongo } from 'mongoose';
+import type { FilterQuery } from './mongoose/types';
 import { factory } from '../factory';
 import { 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>[];
     /**
      * コンテンツを保管する
      */
@@ -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: UpdateFilter<IDocType> = {
                 //         $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, mongo } from 'mongoose';
+import type { FilterQuery } from './mongoose/types';
+import { ICustomerType, 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>[];
     /**
      * 検索
      */

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 & {

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,4 +1,5 @@
-import type { Connection, FilterQuery, mongo } from 'mongoose';
+import type { Connection, mongo } from 'mongoose';
+import type { FilterQuery } from './mongoose/types';
 import { factory } from '../factory';
 import { IDocType } from './mongoose/schemas/eventOffer';
 type IUnset = {

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;