@chevre/domain 28.0.0-alpha.8 → 28.0.0

package/lib/chevre/repo/adminEventSeries.js

@@ -130,37 +130,41 @@ class AdminEventSeriesRepo {
         }, { projection: { _id: 1 } })
             .exec();
     }
-    /**
-     * 既存施設コンテンツの最大バージョンを集計する
-     */
-    async aggregateMaxVersion(params) {
-        const aggregations = await this.eventSeriesModel.aggregate([
-            {
-                $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 = (typeof firstMaxVersion === 'number') ? String(firstMaxVersion) : '0';
-        return { maxVersion };
-    }
+    // /**
+    //  * 既存施設コンテンツの最大バージョンを集計する
+    //  */
+    // 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 })

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,26 +52,26 @@ 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;
+        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/placeOrder").ITasksExportAction | undefined;
     }, import("./mongoose/virtuals").IVirtuals, {}> & {
         object: import("@chevre/factory/lib/chevre/transaction/placeOrder").IObject;
+        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;
@@ -82,39 +82,39 @@ export declare class AdminTransactionRepo {
         __v: number;
     }, import("mongoose").QueryOptions<{
         object: import("@chevre/factory/lib/chevre/transaction/placeOrder").IObject;
+        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/placeOrder").ITasksExportAction | undefined;
     }>, (import("mongoose").Document<unknown, Record<string, never>, {
         object: import("@chevre/factory/lib/chevre/transaction/placeOrder").IObject;
+        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/placeOrder").ITasksExportAction | undefined;
     }, import("./mongoose/virtuals").IVirtuals, {}> & {
         object: import("@chevre/factory/lib/chevre/transaction/placeOrder").IObject;
+        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;

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

@@ -31,6 +31,7 @@ export interface ISearchConditions {
         };
     };
 }
+type IKeyOfProjection = keyof IDocType;
 /**
  * Eメールメッセージリポジトリ
  */
@@ -39,8 +40,9 @@ export declare class EmailMessageRepo {
     constructor(connection: Connection);
     static CREATE_MONGO_CONDITIONS(params: ISearchConditions): FilterQuery<IDocType>[];
     save(params: IEmailMessage): Promise<any>;
-    findEmailMessages(params: ISearchConditions): Promise<IEmailMessage[]>;
+    findEmailMessages(params: ISearchConditions, inclusion: IKeyOfProjection[]): Promise<IEmailMessage[]>;
     deleteById(params: {
         id: string;
     }): Promise<void>;
 }
+export {};

package/lib/chevre/repo/emailMessage.js

@@ -4,17 +4,15 @@ exports.EmailMessageRepo = void 0;
 const emailMessages_1 = require("./mongoose/schemas/emailMessages");
 const factory_1 = require("../factory");
 const settings_1 = require("../settings");
-const DEFAULT_PROJECTION = {
-    _id: 0,
-    id: { $toString: '$_id' },
-    project: 1,
-    typeOf: 1,
-    identifier: 1,
-    name: 1,
-    about: 1,
-    sender: 1,
-    text: 1,
-};
+const AVAILABLE_PROJECT_FIELDS = [
+    'project',
+    'typeOf',
+    'identifier',
+    'name',
+    'about',
+    'sender',
+    'text',
+];
 /**
  * Eメールメッセージリポジトリ
  */
@@ -61,9 +59,18 @@ class EmailMessageRepo {
         }
         return doc.toObject();
     }
-    async findEmailMessages(params) {
+    async findEmailMessages(params, inclusion) {
         const conditions = EmailMessageRepo.CREATE_MONGO_CONDITIONS(params);
-        const query = this.emailMessageModel.find({ $and: conditions }, DEFAULT_PROJECTION);
+        let positiveProjectionFields = AVAILABLE_PROJECT_FIELDS;
+        if (Array.isArray(inclusion)) {
+            positiveProjectionFields = inclusion.filter((key) => AVAILABLE_PROJECT_FIELDS.includes(key));
+        }
+        const projection = {
+            _id: 0,
+            id: { $toString: '$_id' },
+            ...Object.fromEntries(positiveProjectionFields.map((key) => ([key, 1])))
+        };
+        const query = this.emailMessageModel.find((conditions.length > 0) ? { $and: conditions } : {}, projection);
         if (typeof params.limit === 'number' && params.limit > 0) {
             const page = (typeof params.page === 'number' && params.page > 0) ? params.page : 1;
             query.limit(params.limit)

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

@@ -1,6 +1,6 @@
 import type { Connection, FilterQuery } from 'mongoose';
 import { factory } from '../factory';
-type ISearchConditions = factory.eventSeries.ISearchConditions;
+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'>;
 /**
  * 施設コンテンツリポジトリ
@@ -12,7 +12,7 @@ export declare class EventSeriesRepo {
     /**
      * イベントを検索する(inclusion projection)
      */
-    projectEventSeriesFields(params: ISearchConditions, inclusion: IKeyOfProjection[]): Promise<factory.eventSeries.IEvent[]>;
+    findEventSeries(params: ISearchConditions, inclusion: IKeyOfProjection[]): Promise<factory.eventSeries.IEvent[]>;
     deleteManyByOrganizerId(params: {
         project: {
             id: string;

package/lib/chevre/repo/eventSeries.js

@@ -127,18 +127,25 @@ class EventSeriesRepo {
                 });
             }
         }
-        const workPerformedIdentifierIn = conditions.workPerformed?.identifiers;
-        /* istanbul ignore else */
-        if (Array.isArray(workPerformedIdentifierIn)) {
-            andConditions.push({
-                'workPerformed.identifier': { $exists: true, $in: workPerformedIdentifierIn }
-            });
-        }
-        const workPerformedVersionEq = conditions.workPerformed?.version?.$eq;
+        // const workPerformedIdentifierIn = conditions.workPerformed?.identifiers;
+        // if (Array.isArray(workPerformedIdentifierIn)) {
+        //     andConditions.push({
+        //         'workPerformed.identifier': { $exists: true, $in: workPerformedIdentifierIn }
+        //     });
+        // }
+        // const workPerformedVersionEq = conditions.workPerformed?.version?.$eq;
+        // if (typeof workPerformedVersionEq === 'string') {
+        //     andConditions.push({
+        //         'workPerformed.version': { $exists: true, $eq: workPerformedVersionEq }
+        //     });
+        // }
+        const workPerformedIdentifierEq = conditions.movieIdentifier;
+        if (typeof workPerformedIdentifierEq === 'string') {
+            andConditions.push({ 'workPerformed.identifier': { $exists: true, $eq: workPerformedIdentifierEq } });
+        }
+        const workPerformedVersionEq = conditions.movieVersion;
         if (typeof workPerformedVersionEq === 'string') {
-            andConditions.push({
-                'workPerformed.version': { $exists: true, $eq: workPerformedVersionEq }
-            });
+            andConditions.push({ 'workPerformed.version': { $exists: true, $eq: workPerformedVersionEq } });
         }
         const videoFormatTypeOfEq = conditions.videoFormat?.typeOf?.$eq;
         if (typeof videoFormatTypeOfEq === 'string') {
@@ -153,7 +160,7 @@ class EventSeriesRepo {
     /**
      * イベントを検索する(inclusion projection)
      */
-    async projectEventSeriesFields(params, inclusion) {
+    async findEventSeries(params, inclusion) {
         const conditions = EventSeriesRepo.CREATE_MONGO_CONDITIONS(params);
         let projection;
         const positiveProjectionFields = (Array.isArray(inclusion))

package/lib/chevre/repo/factory/acceptedOffer/reserveTransaction2itemOffered.d.ts

@@ -1,5 +1,5 @@
 import { factory } from '../../../factory';
-type IAcceptedOfferByReserveTransaction = Pick<factory.order.IOptimizedAcceptedOffer, 'itemOffered' | 'priceSpecification' | 'name'>;
+type IAcceptedOfferByReserveTransaction = Pick<factory.acceptedOffer.IOptimizedAcceptedOffer, 'itemOffered' | 'priceSpecification' | 'name'>;
 /**
  * 予約取引を注文のitemOfferedへ変換する
  */

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

@@ -36,17 +36,13 @@ export declare class IssuerRepo {
         };
     }): Promise<void>;
     getCursor(conditions: any, projection: any): import("mongoose").Cursor<import("mongoose").Document<unknown, Record<string, never>, IDocType, import("./mongoose/virtuals").IVirtuals, {}> & Omit<factory.issuer.IIssuer, "id"> & {
-        hasMemberProgram?: (factory.issuer.IMemberProgram & {
-            hasTiers?: Pick<factory.issuer.IMemberProgramTier, "identifier" | "typeOf">[];
-        })[];
+        hasMemberProgram?: factory.issuer.IMemberProgram[];
     } & {
         _id: import("mongoose").Types.ObjectId;
     } & {
         __v: number;
     }, import("mongoose").QueryOptions<IDocType>, (import("mongoose").Document<unknown, Record<string, never>, IDocType, import("./mongoose/virtuals").IVirtuals, {}> & Omit<factory.issuer.IIssuer, "id"> & {
-        hasMemberProgram?: (factory.issuer.IMemberProgram & {
-            hasTiers?: Pick<factory.issuer.IMemberProgramTier, "identifier" | "typeOf">[];
-        })[];
+        hasMemberProgram?: factory.issuer.IMemberProgram[];
     } & {
         _id: import("mongoose").Types.ObjectId;
     } & {

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

@@ -1,22 +1,11 @@
 import { Connection } from 'mongoose';
 import { factory } from '../factory';
-type IMemberProgramTier = Pick<factory.issuer.IMemberProgramTier, 'identifier' | 'typeOf'>;
-type IMemberProgram = factory.issuer.IMemberProgram & {
-    hasTiers?: IMemberProgramTier[];
-};
+type IMemberProgram = factory.issuer.IMemberProgram;
 type IMemberProgramAsSearchResult = IMemberProgram & {
     hostingOrganization: {
         identifier: string;
     };
 };
-type IMemberProgramTierAsSearchResult = IMemberProgramTier & {
-    isTierOf: {
-        identifier: string;
-        hostingOrganization: {
-            identifier: string;
-        };
-    };
-};
 /**
  * メンバープログラムリポジトリ
  */
@@ -44,31 +33,6 @@ export declare class MemberProgramRepo {
             $in?: string[];
         };
     }): Promise<IMemberProgramAsSearchResult[]>;
-    /**
-     * tierを検索する
-     */
-    projectMemberProgramTiers(params: {
-        limit?: number;
-        page?: number;
-        project?: {
-            id?: {
-                $eq?: string;
-            };
-        };
-        isTierOf?: {
-            hostingOrganization?: {
-                id?: {
-                    $eq?: string;
-                };
-            };
-            identifier?: {
-                $eq?: string;
-            };
-        };
-        identifier?: {
-            $eq?: string;
-        };
-    }): Promise<IMemberProgramTierAsSearchResult[]>;
     create(params: {
         project: {
             id: string;
@@ -83,7 +47,6 @@ export declare class MemberProgramRepo {
             id: string;
         };
         identifier: string;
-        hasTiers?: Pick<factory.issuer.IMemberProgramTier, 'identifier'>[];
         hostingOrganization: {
             id: string;
         };