@chevre/domain 28.0.0-alpha.4 → 28.0.0-alpha.41

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

@@ -0,0 +1,67 @@
+import type { Connection, FilterQuery, mongo } from 'mongoose';
+import { factory } from '../factory';
+type IUnset = {
+    [key in keyof factory.eventSeries.IEvent]?: 1;
+};
+/**
+ * 施設コンテンツ管理リポジトリ
+ */
+export declare class AdminEventSeriesRepo {
+    private readonly eventSeriesModel;
+    constructor(connection: Connection);
+    /**
+     * 施設+コンテンツ+バージョンをキーにして冪等置換
+     */
+    upsertByVersion(params: {
+        $set: factory.eventSeries.IAttributes;
+        $unset?: IUnset;
+    }[], options: {
+        /**
+         * falseの場合setOnInsertのみ
+         * trueの場合setOnInsert+setのみ
+         */
+        upsert: boolean;
+    }): Promise<{
+        bulkWriteResult?: mongo.BulkWriteResult;
+        modifiedEvents: {
+            id: string;
+        }[];
+    }>;
+    /**
+     * sskts施設コンテンツ保管
+     */
+    upsertManyEventSeriesById4sskts(params: {
+        id: string;
+        attributes: factory.eventSeries.IAttributes;
+    }[]): Promise<void>;
+    deleteEventSeriesById(params: {
+        project: {
+            id: string;
+        };
+        id: string;
+    }): Promise<void>;
+    getCursor(conditions: FilterQuery<any>, projection: any): import("mongoose").Cursor<import("mongoose").Document<unknown, Record<string, never>, factory.eventSeries.IAttributes & {
+        _id: string;
+    }, import("./mongoose/virtuals").IVirtuals, {}> & factory.eventSeries.IAttributes & {
+        _id: string;
+    } & Required<{
+        _id: string;
+    }> & {
+        __v: number;
+    }, import("mongoose").QueryOptions<factory.eventSeries.IAttributes & {
+        _id: string;
+    }>, (import("mongoose").Document<unknown, Record<string, never>, factory.eventSeries.IAttributes & {
+        _id: string;
+    }, import("./mongoose/virtuals").IVirtuals, {}> & factory.eventSeries.IAttributes & {
+        _id: string;
+    } & Required<{
+        _id: string;
+    }> & {
+        __v: number;
+    }) | null>;
+    unsetUnnecessaryFields(params: {
+        filter: FilterQuery<factory.eventSeries.IEvent>;
+        $unset: IUnset;
+    }): Promise<import("mongoose").UpdateWriteOpResult>;
+}
+export {};

package/lib/chevre/repo/adminEventSeries.js

@@ -0,0 +1,178 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.AdminEventSeriesRepo = void 0;
+const factory_1 = require("../factory");
+const eventSeries_1 = require("./mongoose/schemas/eventSeries");
+/**
+ * 施設コンテンツ管理リポジトリ
+ */
+class AdminEventSeriesRepo {
+    eventSeriesModel;
+    constructor(connection) {
+        this.eventSeriesModel = connection.model(eventSeries_1.modelName, (0, eventSeries_1.createSchema)());
+    }
+    /**
+     * 施設+コンテンツ+バージョンをキーにして冪等置換
+     */
+    async upsertByVersion(params, options) {
+        const { upsert } = options;
+        const { default: uniqid } = await import('uniqid');
+        const bulkWriteOps = [];
+        const queryFilters = [];
+        if (Array.isArray(params)) {
+            params.forEach(({ $set, $unset }) => {
+                const version = $set.workPerformed.version;
+                if (typeof version !== 'string' || version.length === 0) {
+                    throw new factory_1.factory.errors.ArgumentNull('workPerformed.version');
+                }
+                // リソースのユニークネスを保証するfilter
+                const filter = {
+                    'project.id': { $eq: $set.project.id },
+                    'location.branchCode': { $exists: true, $eq: $set.location.branchCode },
+                    'workPerformed.identifier': { $exists: true, $eq: $set.workPerformed.identifier },
+                    'workPerformed.version': { $exists: true, $eq: version }
+                };
+                queryFilters.push({
+                    'project.id': { $eq: $set.project.id },
+                    'location.branchCode': { $exists: true, $eq: $set.location.branchCode },
+                    'workPerformed.identifier': { $exists: true, $eq: $set.workPerformed.identifier },
+                    'workPerformed.version': { $exists: true, $eq: version }
+                });
+                const { identifier, project, typeOf, ...setFields } = $set; // eslint-disable-line @typescript-eslint/no-unused-vars
+                const setOnInsert = {
+                    project,
+                    typeOf,
+                    _id: uniqid()
+                };
+                let updateOne;
+                if (upsert === true) {
+                    updateOne = {
+                        filter,
+                        update: {
+                            $setOnInsert: setOnInsert,
+                            $set: setFields,
+                            ...($unset !== undefined) ? { $unset } : undefined
+                        },
+                        upsert: true
+                    };
+                }
+                else {
+                    updateOne = {
+                        filter,
+                        update: {
+                            $setOnInsert: {
+                                ...setOnInsert,
+                                ...setFields
+                            }
+                        },
+                        upsert: true
+                    };
+                }
+                bulkWriteOps.push({ updateOne });
+            });
+        }
+        if (bulkWriteOps.length > 0) {
+            const bulkWriteResult = await this.eventSeriesModel.bulkWrite(bulkWriteOps, { ordered: false });
+            // upsert:falseの場合、upsertedIdsのみmodifiedEventsとして返せばよい(2026-01-27~)
+            if (!upsert) {
+                // BulkWriteResult -> upsertedIds: { '0': '7iri6p4m54k0r3g' }
+                return {
+                    bulkWriteResult,
+                    modifiedEvents: Object.values(bulkWriteResult.upsertedIds)
+                        .map((id) => ({ id: String(id) }))
+                };
+            }
+            else {
+                // modifiedの場合upsertedIdsに含まれないので、idを検索する
+                const modifiedEvents = await this.eventSeriesModel.find({ $or: queryFilters }, { _id: 1 })
+                    .exec();
+                return { bulkWriteResult, modifiedEvents };
+            }
+        }
+        return { modifiedEvents: [] };
+    }
+    /**
+     * sskts施設コンテンツ保管
+     */
+    async upsertManyEventSeriesById4sskts(params) {
+        const bulkWriteOps = [];
+        if (Array.isArray(params)) {
+            params.forEach((p) => {
+                // 上書き禁止属性を除外(2022-08-24~)
+                const { identifier, project, typeOf, ...updateFields } = p.attributes; // eslint-disable-line @typescript-eslint/no-unused-vars
+                bulkWriteOps.push({
+                    updateOne: {
+                        filter: { _id: { $eq: p.id } },
+                        update: {
+                            $setOnInsert: {
+                                typeOf: factory_1.factory.eventType.ScreeningEventSeries,
+                                project: p.attributes.project,
+                                ...(typeof p.attributes.identifier === 'string')
+                                    ? { identifier: p.attributes.identifier } : undefined
+                            },
+                            $set: updateFields
+                            // $unsetに対応(2022-08-31~)
+                            // ...(p.$unset !== undefined) ? { $unset: p.$unset } : undefined
+                        },
+                        upsert: true
+                    }
+                });
+            });
+        }
+        if (bulkWriteOps.length > 0) {
+            await this.eventSeriesModel.bulkWrite(bulkWriteOps, { ordered: false });
+        }
+    }
+    async deleteEventSeriesById(params) {
+        await this.eventSeriesModel.findOneAndDelete({
+            _id: { $eq: params.id },
+            'project.id': { $eq: params.project.id }
+        }, { projection: { _id: 1 } })
+            .exec();
+    }
+    // /**
+    //  * 既存施設コンテンツの最大バージョンを集計する
+    //  */
+    // public async aggregateMaxVersion(params: {
+    //     project: { id: { $eq: string } };
+    //     workPerformed: { identifier: { $eq: string } };
+    //     location: { branchCode: { $in: string[] } };
+    // }): Promise<{ maxVersion: string }> {
+    //     const aggregations = await this.eventSeriesModel.aggregate<{ maxVersion: number }>([
+    //         {
+    //             $match: {
+    //                 'project.id': { $eq: params.project.id.$eq },
+    //                 'workPerformed.identifier': { $exists: true, $eq: params.workPerformed.identifier.$eq },
+    //                 'workPerformed.version': { $exists: true },
+    //                 'location.branchCode': { $exists: true, $in: params.location.branchCode.$in }
+    //             }
+    //         },
+    //         {
+    //             $project: {
+    //                 // workPerformed: '$workPerformed',
+    //                 version: { $toLong: '$workPerformed.version' } // support YYYYMMDDHHmmss
+    //             }
+    //         },
+    //         {
+    //             $group: {
+    //                 _id: null,
+    //                 maxVersion: { $max: '$version' }
+    //             }
+    //         }
+    //     ])
+    //         .exec();
+    //     const firstMaxVersion = aggregations.at(0)?.maxVersion;
+    //     const maxVersion: string = (typeof firstMaxVersion === 'number') ? String(firstMaxVersion) : '0';
+    //     return { maxVersion };
+    // }
+    getCursor(conditions, projection) {
+        return this.eventSeriesModel.find(conditions, projection)
+            .sort({ startDate: factory_1.factory.sortType.Descending })
+            .cursor();
+    }
+    async unsetUnnecessaryFields(params) {
+        return this.eventSeriesModel.updateMany(params.filter, { $unset: params.$unset }, { timestamps: false })
+            .exec();
+    }
+}
+exports.AdminEventSeriesRepo = AdminEventSeriesRepo;

package/lib/chevre/repo/{paymentServiceChannel.d.ts → adminPaymentServiceChannel.d.ts}

@@ -1,30 +1,32 @@
 import type { Connection, FilterQuery } from 'mongoose';
 import { factory } from '../factory';
+import { IDocType } from './mongoose/schemas/paymentServiceChannel';
 export type ISavingChannel = Pick<factory.serviceChannel.IServiceChannel, 'credentials' | 'project' | 'providesService' | 'serviceUrl' | 'typeOf'> & {
     id?: never;
 };
-interface IUnset {
-    $unset?: Record<string, 1>;
-}
 type IServiceChannelWithId = factory.serviceChannel.IServiceChannel & {
     id: string;
 };
-type IKeyOfProjection = keyof factory.serviceChannel.IServiceChannel;
+type IKeyOfProjection = keyof IDocType;
 /**
- * 決済サービスチャネルリポジトリ
+ * 決済サービスチャネル管理リポジトリ
  */
-export declare class PaymentServiceChannelRepo {
+export declare class AdminPaymentServiceChannelRepo {
     private readonly paymentServiceChannelModel;
     constructor(connection: Connection);
-    static CREATE_MONGO_CONDITIONS(params: factory.serviceChannel.ISearchConditions): FilterQuery<factory.serviceChannel.IServiceChannel>[];
-    save(params: {
+    static CREATE_MONGO_CONDITIONS(params: factory.serviceChannel.ISearchConditions): FilterQuery<IDocType>[];
+    /**
+     * 決済サービスチャネル保管
+     * 編集の場合、credentialsのみ変更可能
+     */
+    savePaymentServiceChannel(params: {
         id?: string;
-        attributes: ISavingChannel & IUnset;
+        attributes: ISavingChannel;
     }): Promise<{
         id: string;
     }>;
-    projectFields(conditions: factory.serviceChannel.ISearchConditions, inclusion: IKeyOfProjection[]): Promise<IServiceChannelWithId[]>;
-    deleteById(params: {
+    findPaymentServiceChannels(conditions: factory.serviceChannel.ISearchConditions, inclusion: IKeyOfProjection[]): Promise<IServiceChannelWithId[]>;
+    deletePaymentServiceChannelById(params: {
         id: string;
         project: {
             id: string;

package/lib/chevre/repo/{paymentServiceChannel.js → adminPaymentServiceChannel.js}

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.PaymentServiceChannelRepo = void 0;
+exports.AdminPaymentServiceChannelRepo = void 0;
 const factory_1 = require("../factory");
 const settings_1 = require("../settings");
 const paymentServiceChannel_1 = require("./mongoose/schemas/paymentServiceChannel");
@@ -10,12 +10,11 @@ const AVAILABLE_PROJECT_FIELDS = [
     'credentials',
     'providesService',
     'serviceUrl',
-    'typeOf'
 ];
 /**
- * 決済サービスチャネルリポジトリ
+ * 決済サービスチャネル管理リポジトリ
  */
-class PaymentServiceChannelRepo {
+class AdminPaymentServiceChannelRepo {
     paymentServiceChannelModel;
     constructor(connection) {
         this.paymentServiceChannelModel = connection.model(paymentServiceChannel_1.modelName, (0, paymentServiceChannel_1.createSchema)());
@@ -44,29 +43,31 @@ class PaymentServiceChannelRepo {
         }
         return andConditions;
     }
-    async save(params) {
-        let doc;
+    /**
+     * 決済サービスチャネル保管
+     * 編集の場合、credentialsのみ変更可能
+     */
+    async savePaymentServiceChannel(params) {
         let savedId;
         const savingId = params.id;
         if (typeof savingId === 'string') {
             if (savingId === '') {
                 throw new factory_1.factory.errors.ArgumentNull('id');
             }
-            const { id, serviceUrl, providesService, project, typeOf, $unset, ...updateFields } = params.attributes; // eslint-disable-line @typescript-eslint/no-unused-vars
+            const { credentials, project } = params.attributes;
             const filter = {
                 _id: { $eq: savingId },
                 'project.id': { $eq: project.id }
             };
             const update = {
-                $set: updateFields,
-                ...($unset !== undefined && $unset !== null) ? { $unset } : undefined
+                $set: { credentials },
             };
             const options = {
                 upsert: false,
                 new: true,
-                projection: { _id: 1, id: { $toString: '$_id' } }
+                projection: { _id: 0, id: { $toString: '$_id' } }
             };
-            doc = await this.paymentServiceChannelModel.findOneAndUpdate(filter, update, options)
+            const doc = await this.paymentServiceChannelModel.findOneAndUpdate(filter, update, options)
                 .lean()
                 .exec();
             if (doc === null) {
@@ -75,8 +76,8 @@ class PaymentServiceChannelRepo {
             savedId = savingId;
         }
         else {
-            const { $unset, id, ...createParams } = params.attributes; // eslint-disable-line @typescript-eslint/no-unused-vars
-            const result = await this.paymentServiceChannelModel.insertMany(createParams, { rawResult: true });
+            const { credentials, project, providesService, serviceUrl, typeOf } = params.attributes;
+            const result = await this.paymentServiceChannelModel.insertMany({ credentials, project, providesService, serviceUrl, typeOf }, { rawResult: true });
             const insertedId = result.insertedIds?.[0]?.toHexString();
             if (typeof insertedId !== 'string') {
                 throw new factory_1.factory.errors.Internal(`not saved unexpectedly. result:${JSON.stringify(result)}`);
@@ -85,8 +86,8 @@ class PaymentServiceChannelRepo {
         }
         return { id: savedId };
     }
-    async projectFields(conditions, inclusion) {
-        const andConditions = PaymentServiceChannelRepo.CREATE_MONGO_CONDITIONS(conditions);
+    async findPaymentServiceChannels(conditions, inclusion) {
+        const andConditions = AdminPaymentServiceChannelRepo.CREATE_MONGO_CONDITIONS(conditions);
         let positiveProjectionFields = AVAILABLE_PROJECT_FIELDS;
         if (Array.isArray(inclusion) && inclusion.length > 0) {
             positiveProjectionFields = inclusion.filter((key) => AVAILABLE_PROJECT_FIELDS.includes(key));
@@ -109,11 +110,11 @@ class PaymentServiceChannelRepo {
             .lean()
             .exec();
     }
-    async deleteById(params) {
-        await this.paymentServiceChannelModel.findOneAndDelete({
+    async deletePaymentServiceChannelById(params) {
+        await this.paymentServiceChannelModel.deleteOne({
             _id: { $eq: params.id },
             'project.id': { $eq: params.project.id }
-        }, { projection: { _id: 1 } })
+        })
             .exec();
     }
     async unsetUnnecessaryFields(params) {
@@ -121,4 +122,4 @@ class PaymentServiceChannelRepo {
             .exec();
     }
 }
-exports.PaymentServiceChannelRepo = PaymentServiceChannelRepo;
+exports.AdminPaymentServiceChannelRepo = AdminPaymentServiceChannelRepo;

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

@@ -33,13 +33,13 @@ 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, "project" | "name" | "identifier" | "description" | "data" | "status" | "runsAt" | "dateAborted" | "executionResults" | "executor" | "lastTriedAt" | "remainingNumberOfTries" | "numberOfTried"> & {
+    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"> & {
         expires?: never;
     } & {
         _id: import("mongoose").Types.ObjectId;
     } & {
         __v: number;
-    }, import("mongoose").QueryOptions<IDocType>, (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, "project" | "name" | "identifier" | "description" | "data" | "status" | "runsAt" | "dateAborted" | "executionResults" | "executor" | "lastTriedAt" | "remainingNumberOfTries" | "numberOfTried"> & {
+    }, import("mongoose").QueryOptions<IDocType>, (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;

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

@@ -52,83 +52,73 @@ export declare class AdminTransactionRepo {
     }): Promise<import("mongoose").UpdateWriteOpResult>;
     getCursor(conditions: any, projection: any, sort?: factory.sortType): import("mongoose").Cursor<import("mongoose").Document<unknown, Record<string, never>, {
         object: import("@chevre/factory/lib/chevre/transaction/placeOrder").IObject;
-        error?: any;
+        endDate?: Date | undefined;
+        startDate: Date;
+        typeOf: factory.transactionType.PlaceOrder;
         project: import("@chevre/factory/lib/chevre/transaction").IProject;
         seller: import("@chevre/factory/lib/chevre/transaction/placeOrder").ISeller;
-        typeOf: factory.transactionType.PlaceOrder;
         expires: Date;
         result?: import("@chevre/factory/lib/chevre/transaction/placeOrder").IResult | undefined;
-        startDate: Date;
-        endDate?: Date | undefined;
         instrument?: import("@chevre/factory/lib/chevre/transaction/placeOrder").IInstrument | undefined;
         agent: import("@chevre/factory/lib/chevre/transaction/placeOrder").IAgent;
         status: factory.transactionStatusType;
-        tasksExportAction?: import("@chevre/factory/lib/chevre/transaction").ITasksExportAction | undefined;
-        potentialActions?: undefined;
+        tasksExportAction?: import("@chevre/factory/lib/chevre/transaction/placeOrder").ITasksExportAction | undefined;
     }, import("./mongoose/virtuals").IVirtuals, {}> & {
         object: import("@chevre/factory/lib/chevre/transaction/placeOrder").IObject;
-        error?: any;
+        endDate?: Date | undefined;
+        startDate: Date;
+        typeOf: factory.transactionType.PlaceOrder;
         project: import("@chevre/factory/lib/chevre/transaction").IProject;
         seller: import("@chevre/factory/lib/chevre/transaction/placeOrder").ISeller;
-        typeOf: factory.transactionType.PlaceOrder;
         expires: Date;
         result?: import("@chevre/factory/lib/chevre/transaction/placeOrder").IResult | undefined;
-        startDate: Date;
-        endDate?: Date | undefined;
         instrument?: import("@chevre/factory/lib/chevre/transaction/placeOrder").IInstrument | undefined;
         agent: import("@chevre/factory/lib/chevre/transaction/placeOrder").IAgent;
         status: factory.transactionStatusType;
-        tasksExportAction?: import("@chevre/factory/lib/chevre/transaction").ITasksExportAction | undefined;
-        potentialActions?: undefined;
+        tasksExportAction?: import("@chevre/factory/lib/chevre/transaction/placeOrder").ITasksExportAction | undefined;
     } & {
         _id: import("mongoose").Types.ObjectId;
     } & {
         __v: number;
     }, import("mongoose").QueryOptions<{
         object: import("@chevre/factory/lib/chevre/transaction/placeOrder").IObject;
-        error?: any;
+        endDate?: Date | undefined;
+        startDate: Date;
+        typeOf: factory.transactionType.PlaceOrder;
         project: import("@chevre/factory/lib/chevre/transaction").IProject;
         seller: import("@chevre/factory/lib/chevre/transaction/placeOrder").ISeller;
-        typeOf: factory.transactionType.PlaceOrder;
         expires: Date;
         result?: import("@chevre/factory/lib/chevre/transaction/placeOrder").IResult | undefined;
-        startDate: Date;
-        endDate?: Date | undefined;
         instrument?: import("@chevre/factory/lib/chevre/transaction/placeOrder").IInstrument | undefined;
         agent: import("@chevre/factory/lib/chevre/transaction/placeOrder").IAgent;
         status: factory.transactionStatusType;
-        tasksExportAction?: import("@chevre/factory/lib/chevre/transaction").ITasksExportAction | undefined;
-        potentialActions?: undefined;
+        tasksExportAction?: import("@chevre/factory/lib/chevre/transaction/placeOrder").ITasksExportAction | undefined;
     }>, (import("mongoose").Document<unknown, Record<string, never>, {
         object: import("@chevre/factory/lib/chevre/transaction/placeOrder").IObject;
-        error?: any;
+        endDate?: Date | undefined;
+        startDate: Date;
+        typeOf: factory.transactionType.PlaceOrder;
         project: import("@chevre/factory/lib/chevre/transaction").IProject;
         seller: import("@chevre/factory/lib/chevre/transaction/placeOrder").ISeller;
-        typeOf: factory.transactionType.PlaceOrder;
         expires: Date;
         result?: import("@chevre/factory/lib/chevre/transaction/placeOrder").IResult | undefined;
-        startDate: Date;
-        endDate?: Date | undefined;
         instrument?: import("@chevre/factory/lib/chevre/transaction/placeOrder").IInstrument | undefined;
         agent: import("@chevre/factory/lib/chevre/transaction/placeOrder").IAgent;
         status: factory.transactionStatusType;
-        tasksExportAction?: import("@chevre/factory/lib/chevre/transaction").ITasksExportAction | undefined;
-        potentialActions?: undefined;
+        tasksExportAction?: import("@chevre/factory/lib/chevre/transaction/placeOrder").ITasksExportAction | undefined;
     }, import("./mongoose/virtuals").IVirtuals, {}> & {
         object: import("@chevre/factory/lib/chevre/transaction/placeOrder").IObject;
-        error?: any;
+        endDate?: Date | undefined;
+        startDate: Date;
+        typeOf: factory.transactionType.PlaceOrder;
         project: import("@chevre/factory/lib/chevre/transaction").IProject;
         seller: import("@chevre/factory/lib/chevre/transaction/placeOrder").ISeller;
-        typeOf: factory.transactionType.PlaceOrder;
         expires: Date;
         result?: import("@chevre/factory/lib/chevre/transaction/placeOrder").IResult | undefined;
-        startDate: Date;
-        endDate?: Date | undefined;
         instrument?: import("@chevre/factory/lib/chevre/transaction/placeOrder").IInstrument | undefined;
         agent: import("@chevre/factory/lib/chevre/transaction/placeOrder").IAgent;
         status: factory.transactionStatusType;
-        tasksExportAction?: import("@chevre/factory/lib/chevre/transaction").ITasksExportAction | undefined;
-        potentialActions?: undefined;
+        tasksExportAction?: import("@chevre/factory/lib/chevre/transaction/placeOrder").ITasksExportAction | undefined;
     } & {
         _id: import("mongoose").Types.ObjectId;
     } & {

package/lib/chevre/repo/aggregateEvent.js

@@ -22,7 +22,6 @@ class AggregateEventRepo {
                     $gte: params.startFrom,
                     $lte: params.startThrough
                 },
-                typeOf: { $eq: params.typeOf },
                 eventStatus: { $eq: eventStatus },
                 ...(typeof params.project?.id?.$ne === 'string')
                     ? { 'project.id': { $ne: params.project.id.$ne } }

package/lib/chevre/repo/categoryCode.js

@@ -17,28 +17,7 @@ class CategoryCodeRepo {
         this.categoryCodeModel = connection.model(categoryCode_1.modelName, (0, categoryCode_1.createSchema)());
     }
     static CREATE_MONGO_CONDITIONS(params) {
-        // const excludeMovieTicketType = true;
         const andConditions = [];
-        // 決済カード区分をmovieTicketTypesへ移行済なので、excludeMovieTicketTypeオプションは不要(2025-11-07~)
-        // if (excludeMovieTicketType) {
-        //     andConditions.push({
-        //         'inCodeSet.identifier': {
-        //             $in: [
-        //                 factory.categoryCode.CategorySetIdentifier.ContentRatingType,
-        //                 factory.categoryCode.CategorySetIdentifier.CurrencyType,
-        //                 factory.categoryCode.CategorySetIdentifier.CustomerType,
-        //                 factory.categoryCode.CategorySetIdentifier.DistributorType,
-        //                 factory.categoryCode.CategorySetIdentifier.MembershipType,
-        //                 factory.categoryCode.CategorySetIdentifier.OfferCategoryType,
-        //                 factory.categoryCode.CategorySetIdentifier.PaymentMethodType,
-        //                 factory.categoryCode.CategorySetIdentifier.SeatingType,
-        //                 factory.categoryCode.CategorySetIdentifier.ServiceType,
-        //                 factory.categoryCode.CategorySetIdentifier.SoundFormatType,
-        //                 factory.categoryCode.CategorySetIdentifier.VideoFormatType
-        //             ]
-        //         }
-        //     });
-        // }
         /* istanbul ignore else */
         if (params.project !== undefined && params.project !== null) {
             if (params.project.id !== undefined && params.project.id !== null) {

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

@@ -1,7 +1,7 @@
 import { Connection, FilterQuery } from 'mongoose';
 import { factory } from '../factory';
 import * as EventFactory from '../factory/event';
-export type ISearchConditions = factory.event.screeningEvent.ISearchConditions;
+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';
 type IKeyOfProjection4publicFields = Exclude<keyof factory.event.screeningEvent.IEvent, 'id' | 'offers'>;
@@ -60,7 +60,7 @@ export declare class EventRepo {
     /**
      * COAイベントキャンセル時に使用
      */
-    searchEventIds(params: Pick<ISearchConditions, 'project' | 'typeOf' | 'superEvent' | 'startFrom' | 'startThrough'>): Promise<string[]>;
+    searchEventIds(params: Pick<ISearchConditions, 'project' | 'superEvent' | 'startFrom' | 'startThrough'>): Promise<string[]>;
     /**
      * 特定イベントから指定フィールドのみ取得する
      * イベント IDは必ず返ります