@chevre/domain 22.2.0-alpha.11 → 22.2.0-alpha.13

package/example/src/chevre/playAroundTicket.ts

@@ -14,7 +14,7 @@ async function main() {
     await mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: false });
 
     const ticketRepo = await chevre.repository.Ticket.createInstance(mongoose.connection);
-    const tickets = await ticketRepo.search(
+    const tickets = await ticketRepo.projectFields(
         {
             limit: 1,
             page: 1,
@@ -23,7 +23,8 @@ async function main() {
                 id: { $eq: project.id }
             },
             ticketToken: { $eq: TICKET_TOKEN }
-        }
+        },
+        []
     );
     console.log('tickets:', tickets);
     console.log(tickets.length, 'tickets found');

package/example/src/chevre/{projectReservationFields.ts → projectFields.ts}

@@ -8,22 +8,19 @@ const project = { id: String(process.env.PROJECT_ID) };
 async function main() {
     await mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: false });
 
-    const reservationRepo = await chevre.repository.Reservation.createInstance(mongoose.connection);
+    const ticketRepo = await chevre.repository.Ticket.createInstance(mongoose.connection);
 
-    const reservations = await reservationRepo.projectFields<chevre.factory.reservationType.EventReservation>(
+    const docs = await ticketRepo.projectFields(
         {
-            limit: 1,
+            limit: 10,
             page: 1,
-            typeOf: chevre.factory.reservationType.EventReservation,
             project: { id: { $eq: project.id } }
         },
-        {
-            id: 1
-        }
+        []
     );
     // tslint:disable-next-line:no-null-keyword
-    console.dir(reservations, { depth: null });
-    console.log(reservations.length, 'reservations found');
+    console.dir(docs, { depth: null });
+    console.log(docs.length, 'docs found');
 }
 
 main()

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

@@ -45,7 +45,15 @@ export declare class CategoryCodeRepo {
     /**
      * 検索
      */
-    search(params: factory.categoryCode.ISearchConditions, inclusion: IKeyOfProjection[], exclusion: IKeyOfProjection[]): Promise<(factory.categoryCode.ICategoryCode & {
+    projectFields(params: factory.categoryCode.ISearchConditions, 
+    /**
+     * 空の場合無効
+     */
+    inclusion: IKeyOfProjection[], 
+    /**
+     * 空の場合無効
+     */
+    exclusion: IKeyOfProjection[]): Promise<(factory.categoryCode.ICategoryCode & {
         id: string;
     })[]>;
     save(params: {
@@ -53,7 +61,7 @@ export declare class CategoryCodeRepo {
         attributes: factory.categoryCode.ICategoryCode & {
             $unset?: IUnset;
         };
-    }): Promise<factory.categoryCode.ICategoryCode & {
+    }): Promise<{
         id: string;
     }>;
     saveManyByCodeValue(params: {

package/lib/chevre/repo/categoryCode.js

@@ -25,6 +25,9 @@ const mongoose_1 = require("mongoose");
 const categoryCode_1 = require("./mongoose/schemas/categoryCode");
 const factory = require("../factory");
 const settings_1 = require("../settings");
+const AVAILABLE_PROJECT_FIELDS = [
+    'additionalProperty', 'codeValue', 'color', 'image', 'inCodeSet', 'name', 'paymentMethod', 'project', 'typeOf'
+];
 /**
  * 区分リポジトリ
  */
@@ -208,27 +211,43 @@ class CategoryCodeRepo {
     /**
      * 検索
      */
-    search(params, inclusion, exclusion) {
+    projectFields(params, 
+    /**
+     * 空の場合無効
+     */
+    inclusion, 
+    /**
+     * 空の場合無効
+     */
+    exclusion) {
         return __awaiter(this, void 0, void 0, function* () {
             const conditions = CategoryCodeRepo.CREATE_MONGO_CONDITIONS(params);
-            let projection = {};
+            let positiveProjectionFields = AVAILABLE_PROJECT_FIELDS;
             if (Array.isArray(inclusion) && inclusion.length > 0) {
-                inclusion.forEach((field) => {
-                    projection[field] = 1;
-                });
+                positiveProjectionFields = inclusion.filter((key) => AVAILABLE_PROJECT_FIELDS.includes(key));
             }
             else {
-                projection = {
-                    __v: 0,
-                    createdAt: 0,
-                    updatedAt: 0
-                };
                 if (Array.isArray(exclusion) && exclusion.length > 0) {
-                    exclusion.forEach((field) => {
-                        projection[field] = 0;
-                    });
+                    positiveProjectionFields = positiveProjectionFields.filter((key) => !exclusion.includes(key));
                 }
             }
+            const projection = Object.assign({ _id: 0, id: { $toString: '$_id' } }, Object.fromEntries(positiveProjectionFields.map((key) => ([key, 1]))));
+            // if (Array.isArray(inclusion) && inclusion.length > 0) {
+            //     inclusion.forEach((field) => {
+            //         projection[field] = 1;
+            //     });
+            // } else {
+            //     projection = {
+            //         __v: 0,
+            //         createdAt: 0,
+            //         updatedAt: 0
+            //     };
+            //     if (Array.isArray(exclusion) && exclusion.length > 0) {
+            //         exclusion.forEach((field) => {
+            //             projection[field] = 0;
+            //         });
+            //     }
+            // }
             const query = this.categoryCodeModel.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;
@@ -241,27 +260,30 @@ class CategoryCodeRepo {
                 query.sort(params.sort);
             }
             return query.setOptions({ maxTimeMS: settings_1.MONGO_MAX_TIME_MS })
-                .exec()
-                .then((docs) => docs.map((doc) => doc.toObject()));
+                .lean() // 2024-08-19~
+                .exec();
         });
     }
     save(params) {
         return __awaiter(this, void 0, void 0, function* () {
+            let savedId;
             let doc;
             if (typeof params.id !== 'string') {
                 const _a = params.attributes, { id, $unset } = _a, creatingDoc = __rest(_a, ["id", "$unset"]);
-                doc = yield this.categoryCodeModel.create(creatingDoc);
+                doc = (yield this.categoryCodeModel.create(creatingDoc));
+                savedId = doc.id;
             }
             else {
                 // 上書き禁止属性を除外(2022-08-24~)
                 const _b = params.attributes, { id, codeValue, inCodeSet, project, typeOf, $unset } = _b, updateFields = __rest(_b, ["id", "codeValue", "inCodeSet", "project", "typeOf", "$unset"]);
-                doc = yield this.categoryCodeModel.findOneAndUpdate({ _id: { $eq: params.id } }, Object.assign({ $set: updateFields }, ($unset !== undefined) ? { $unset } : undefined), { upsert: false, new: true })
+                doc = yield this.categoryCodeModel.findOneAndUpdate({ _id: { $eq: params.id } }, Object.assign({ $set: updateFields }, ($unset !== undefined) ? { $unset } : undefined), { upsert: false, new: true, projection: { _id: 1 } })
                     .exec();
+                savedId = params.id;
             }
             if (doc === null) {
                 throw new factory.errors.NotFound(this.categoryCodeModel.modelName);
             }
-            return doc.toObject();
+            return { id: savedId };
         });
     }
     saveManyByCodeValue(params) {
@@ -302,7 +324,7 @@ class CategoryCodeRepo {
      */
     deleteById(params) {
         return __awaiter(this, void 0, void 0, function* () {
-            yield this.categoryCodeModel.findOneAndRemove({ _id: params.id })
+            yield this.categoryCodeModel.findOneAndRemove({ _id: { $eq: params.id } }, { projection: { _id: 1 } })
                 .exec();
         });
     }

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

@@ -46,7 +46,7 @@ export declare class OwnershipInfoRepo {
     /**
      * 所有権を検索する
      */
-    search(params: factory.ownershipInfo.ISearchConditions, projection?: any): Promise<IOwnershipInfoWithId[]>;
+    projectFields(params: factory.ownershipInfo.ISearchConditions, inclusion?: (keyof IOwnershipInfoWithId)[]): Promise<IOwnershipInfoWithId[]>;
     /**
      * 識別子から所有期限を変更する
      * 存在しない場合undefinedを返す
@@ -57,7 +57,7 @@ export declare class OwnershipInfoRepo {
         };
         identifier: string;
         ownedThrough: Date;
-    }): Promise<IOwnershipInfoWithId | undefined>;
+    }): Promise<Pick<IOwnershipInfoWithId, 'id' | 'identifier'> | undefined>;
     /**
      * 所有者の所有権を全て削除する
      */

package/lib/chevre/repo/ownershipInfo.js

@@ -270,7 +270,6 @@ class OwnershipInfoRepo {
                 throw new factory.errors.NotFound(this.ownershipInfoModel.modelName);
             }
             return { id: doc.id };
-            // return <IOwnershipInfo>doc.toObject();
         });
     }
     projectFieldsById(params, inclusion) {
@@ -300,17 +299,34 @@ class OwnershipInfoRepo {
                 throw new factory.errors.NotFound(this.ownershipInfoModel.modelName);
             }
             return doc;
-            // return doc.toObject();
         });
     }
     /**
      * 所有権を検索する
      */
-    search(params, projection) {
+    projectFields(params, inclusion) {
         var _a;
         return __awaiter(this, void 0, void 0, function* () {
             const conditions = OwnershipInfoRepo.CREATE_MONGO_CONDITIONS(params);
-            const query = this.ownershipInfoModel.find((conditions.length > 0) ? { $and: conditions } : {}, Object.assign({ __v: 0, createdAt: 0, updatedAt: 0 }, projection));
+            let projection = {
+                _id: 0,
+                id: { $toString: '$_id' },
+                project: 1,
+                typeOf: 1,
+                identifier: 1,
+                ownedBy: 1,
+                acquiredFrom: 1,
+                ownedFrom: 1,
+                ownedThrough: 1,
+                typeOfGood: 1
+            };
+            const positiveProjectionFields = (Array.isArray(inclusion))
+                ? inclusion.filter((key) => key !== 'id' && String(key) !== '_id')
+                : undefined;
+            if (Array.isArray(positiveProjectionFields)) {
+                projection = Object.assign({ _id: 0, id: { $toString: '$_id' } }, Object.fromEntries(positiveProjectionFields.map((key) => ([key, 1]))));
+            }
+            const query = this.ownershipInfoModel.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)
@@ -322,8 +338,8 @@ class OwnershipInfoRepo {
                 query.sort({ ownedFrom: params.sort.ownedFrom });
             }
             return query.setOptions({ maxTimeMS: settings_1.MONGO_MAX_TIME_MS })
-                .exec()
-                .then((docs) => docs.map((doc) => doc.toObject()));
+                .lean() // lean(2024-08-19~)
+                .exec();
         });
     }
     /**
@@ -335,8 +351,15 @@ class OwnershipInfoRepo {
             return this.ownershipInfoModel.findOneAndUpdate({
                 'project.id': { $eq: params.project.id },
                 identifier: { $eq: String(params.identifier) }
-            }, { ownedThrough: params.ownedThrough }, { new: true })
-                .select({ __v: 0, createdAt: 0, updatedAt: 0 })
+            }, { ownedThrough: params.ownedThrough }, {
+                new: true,
+                projection: {
+                    _id: 0,
+                    id: { $toString: '$_id' },
+                    identifier: 1
+                }
+            })
+                .lean()
                 .exec()
                 .then((doc) => {
                 // 存在しない場合も正常にハンドルする
@@ -344,7 +367,7 @@ class OwnershipInfoRepo {
                     return;
                 }
                 else {
-                    return doc.toObject();
+                    return doc;
                 }
             });
         });
@@ -431,7 +454,10 @@ class OwnershipInfoRepo {
                 };
             }
             if (newOwner !== undefined) {
-                const doc = yield this.ownershipInfoModel.findOneAndUpdate({ _id: { $eq: params.id } }, { $addToSet: { ownedBy: newOwner } }, { new: true })
+                const doc = yield this.ownershipInfoModel.findOneAndUpdate({ _id: { $eq: params.id } }, { $addToSet: { ownedBy: newOwner } }, {
+                    new: true,
+                    projection: { _id: 1 }
+                })
                     .exec();
                 if (doc === null) {
                     throw new factory.errors.NotFound(this.ownershipInfoModel.modelName);
@@ -447,7 +473,10 @@ class OwnershipInfoRepo {
             if (typeof params.ownedBy.id !== 'string' || params.ownedBy.id.length === 0) {
                 throw new factory.errors.ArgumentNull('ownedBy.id');
             }
-            const doc = yield this.ownershipInfoModel.findOneAndUpdate({ _id: { $eq: params.id } }, { $pull: { ownedBy: { id: params.ownedBy.id } } }, { new: true })
+            const doc = yield this.ownershipInfoModel.findOneAndUpdate({ _id: { $eq: params.id } }, { $pull: { ownedBy: { id: params.ownedBy.id } } }, {
+                new: true,
+                projection: { _id: 1 }
+            })
                 .exec();
             if (doc === null) {
                 throw new factory.errors.NotFound(this.ownershipInfoModel.modelName);

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

@@ -1,7 +1,7 @@
 import type { Connection, FilterQuery } from 'mongoose';
 import * as factory from '../factory';
 type IUnsetKey = keyof Pick<factory.service.paymentService.IService, 'additionalProperty' | 'availableChannel' | 'serviceOutput' | 'serviceType'>;
-type IKeyOfProjection4paymentService = keyof factory.service.paymentService.IService | '_id';
+type IKeyOfProjection4paymentService = keyof factory.service.paymentService.IService;
 /**
  * 決済サービス検索条件
  */
@@ -37,7 +37,7 @@ export declare class PaymentServiceRepo {
     /**
      * 決済サービスを検索する
      */
-    searchPaymentServices(conditions: ISearchConditions4paymentService, inclusion: IKeyOfProjection4paymentService[], exclusion: IKeyOfProjection4paymentService[]): Promise<(factory.service.paymentService.IService & {
+    projectFields(conditions: ISearchConditions4paymentService, inclusion: IKeyOfProjection4paymentService[], exclusion: IKeyOfProjection4paymentService[]): Promise<(factory.service.paymentService.IService & {
         id: string;
     })[]>;
     deletePaymentServiceById(params: {

package/lib/chevre/repo/paymentService.js

@@ -24,6 +24,17 @@ exports.PaymentServiceRepo = void 0;
 const factory = require("../factory");
 const settings_1 = require("../settings");
 const paymentService_1 = require("./mongoose/schemas/paymentService");
+const AVAILABLE_PROJECT_FIELDS = [
+    'project',
+    'typeOf',
+    'additionalProperty',
+    'availableChannel',
+    'description',
+    'name',
+    'productID',
+    'serviceOutput',
+    'serviceType'
+];
 /**
  * 決済サービスリポジトリ
  */
@@ -155,70 +166,94 @@ class PaymentServiceRepo {
      * 決済サービスを保管する
      */
     savePaymentService(params) {
+        var _a, _b;
         return __awaiter(this, void 0, void 0, function* () {
             let doc;
+            let savedId;
             if (typeof params.id === 'string') {
                 // 上書き禁止属性を除外
-                const _a = params.$set, { id, productID, project, typeOf, provider } = _a, setFields = __rest(_a, ["id", "productID", "project", "typeOf", "provider"]);
+                const _c = params.$set, { id, productID, project, typeOf, provider } = _c, setFields = __rest(_c, ["id", "productID", "project", "typeOf", "provider"]);
                 switch (typeOf) {
                     case factory.service.paymentService.PaymentServiceType.CreditCard:
                     case factory.service.paymentService.PaymentServiceType.MovieTicket:
                         doc = yield this.paymentServiceModel.findOneAndUpdate({
                             _id: { $eq: params.id },
                             typeOf: { $eq: typeOf }
-                        }, { $set: setFields }, { upsert: false, new: true, projection: { _id: 1 } })
+                        }, { $set: setFields }, { upsert: false, new: true, projection: { _id: 1, id: { $toString: '$_id' } } })
+                            .lean()
                             .exec();
+                        if (doc === null) {
+                            throw new factory.errors.NotFound(this.paymentServiceModel.modelName);
+                        }
                         break;
                     default:
                         throw new factory.errors.NotImplemented(`${typeOf} not implemented`);
                 }
+                savedId = params.id;
             }
             else {
-                const _b = params.$set, { id } = _b, createParams = __rest(_b, ["id"]);
+                const _d = params.$set, { id } = _d, createParams = __rest(_d, ["id"]);
                 if (params.createIfNotExist === true) {
                     doc = yield this.paymentServiceModel.findOneAndUpdate({
                         'project.id': { $eq: createParams.project.id },
                         typeOf: { $eq: createParams.typeOf }
-                    }, { $setOnInsert: createParams }, { new: true, upsert: true, projection: { _id: 1 } })
+                    }, { $setOnInsert: createParams }, { new: true, upsert: true, projection: { _id: 1, id: { $toString: '$_id' } } })
+                        .lean()
                         .exec();
+                    if (doc === null) {
+                        throw new factory.errors.NotFound(this.paymentServiceModel.modelName);
+                    }
+                    savedId = doc.id;
                 }
                 else {
-                    doc = yield this.paymentServiceModel.create(createParams);
+                    // doc = await this.paymentServiceModel.create(createParams);
+                    const result = yield this.paymentServiceModel.insertMany(createParams, { rawResult: true });
+                    const insertedId = (_b = (_a = result.insertedIds) === null || _a === void 0 ? void 0 : _a[0]) === null || _b === void 0 ? void 0 : _b.toHexString();
+                    if (typeof insertedId !== 'string') {
+                        throw new factory.errors.Internal(`paymentService not saved unexpectedly. result:${JSON.stringify(result)}`);
+                    }
+                    savedId = insertedId;
                 }
             }
-            if (doc === null) {
-                throw new factory.errors.NotFound(this.paymentServiceModel.modelName);
-            }
-            return doc.toObject();
+            return { id: savedId };
         });
     }
     /**
      * 決済サービスを検索する
      */
-    searchPaymentServices(conditions, inclusion, exclusion) {
+    projectFields(conditions, inclusion, exclusion) {
         var _a;
         return __awaiter(this, void 0, void 0, function* () {
             const andConditions = PaymentServiceRepo.CREATE_MONGO_CONDITIONS(conditions);
-            let projection = {};
+            let positiveProjectionFields = AVAILABLE_PROJECT_FIELDS;
             if (Array.isArray(inclusion) && inclusion.length > 0) {
-                inclusion.forEach((field) => {
-                    projection[field] = 1;
-                });
+                positiveProjectionFields = inclusion.filter((key) => AVAILABLE_PROJECT_FIELDS.includes(key));
             }
             else {
-                projection = {
-                    __v: 0,
-                    createdAt: 0,
-                    updatedAt: 0,
-                    offers: 0,
-                    provider: 0 // paymentServiceProviderRepoへの完全移行につき除外(2023-12-20~)
-                };
                 if (Array.isArray(exclusion) && exclusion.length > 0) {
-                    exclusion.forEach((field) => {
-                        projection[field] = 0;
-                    });
+                    positiveProjectionFields = positiveProjectionFields.filter((key) => !exclusion.includes(key));
                 }
             }
+            const projection = Object.assign({ _id: 0, id: { $toString: '$_id' } }, Object.fromEntries(positiveProjectionFields.map((key) => ([key, 1]))));
+            // let projection: { [key: string]: number } = {};
+            // if (Array.isArray(inclusion) && inclusion.length > 0) {
+            //     inclusion.forEach((field) => {
+            //         projection[field] = 1;
+            //     });
+            // } else {
+            //     projection = {
+            //         __v: 0,
+            //         createdAt: 0,
+            //         updatedAt: 0,
+            //         offers: 0,
+            //         provider: 0 // paymentServiceProviderRepoへの完全移行につき除外(2023-12-20~)
+            //     };
+            //     if (Array.isArray(exclusion) && exclusion.length > 0) {
+            //         exclusion.forEach((field) => {
+            //             projection[field] = 0;
+            //         });
+            //     }
+            // }
             const query = this.paymentServiceModel.find((andConditions.length > 0) ? { $and: andConditions } : {}, projection);
             if (typeof conditions.limit === 'number' && conditions.limit > 0) {
                 const page = (typeof conditions.page === 'number' && conditions.page > 0) ? conditions.page : 1;
@@ -231,13 +266,13 @@ class PaymentServiceRepo {
                 query.sort({ productID: conditions.sort.productID });
             }
             return query.setOptions({ maxTimeMS: settings_1.MONGO_MAX_TIME_MS })
-                .exec()
-                .then((docs) => docs.map((doc) => doc.toObject()));
+                .lean() // 2024-08-20~
+                .exec();
         });
     }
     deletePaymentServiceById(params) {
         return __awaiter(this, void 0, void 0, function* () {
-            yield this.paymentServiceModel.findOneAndDelete({ _id: params.id })
+            yield this.paymentServiceModel.findOneAndDelete({ _id: { $eq: params.id } }, { projection: { _id: 1 } })
                 .exec();
         });
     }
@@ -247,7 +282,7 @@ class PaymentServiceRepo {
     findAvailableChannel(params) {
         return __awaiter(this, void 0, void 0, function* () {
             let paymentService;
-            paymentService = (yield this.searchPaymentServices({
+            paymentService = (yield this.projectFields({
                 limit: 1,
                 page: 1,
                 project: { id: { $eq: params.project.id } },

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

@@ -4,7 +4,7 @@ export interface ITicketIssuedBy {
     id: string;
     typeOf: factory.organizationType.Corporation | factory.organizationType.Project;
 }
-interface ITicket {
+export interface ITicket {
     /**
      * チケットID(jti)
      */
@@ -42,6 +42,7 @@ interface ISearchConditions {
         $eq?: string;
     };
 }
+type IKeyOfProjection = keyof ITicket;
 /**
  * チケットリポジトリ
  */
@@ -53,6 +54,6 @@ export declare class TicketRepo {
      * 承認コードからチケットを発行する
      */
     issueByTicketToken(params: IIssueParams): Promise<Pick<ITicket, 'id'>>;
-    search(params: ISearchConditions): Promise<ITicket[]>;
+    projectFields(params: ISearchConditions, inclusion: IKeyOfProjection[]): Promise<ITicket[]>;
 }
 export {};

package/lib/chevre/repo/ticket.js

@@ -13,6 +13,13 @@ exports.TicketRepo = void 0;
 const factory = require("../factory");
 const settings_1 = require("../settings");
 const ticket_1 = require("./mongoose/schemas/ticket");
+const AVAILABLE_PROJECT_FIELDS = [
+    'project',
+    'typeOf',
+    'ticketToken',
+    'dateIssued',
+    'issuedBy'
+];
 /**
  * チケットリポジトリ
  */
@@ -41,6 +48,7 @@ class TicketRepo {
      * 承認コードからチケットを発行する
      */
     issueByTicketToken(params) {
+        var _a, _b;
         return __awaiter(this, void 0, void 0, function* () {
             const { ticketToken, project, issuedBy } = params;
             const ticketIssuedBy = (typeof (issuedBy === null || issuedBy === void 0 ? void 0 : issuedBy.id) === 'string' && issuedBy.typeOf === factory.organizationType.Corporation)
@@ -53,19 +61,24 @@ class TicketRepo {
                 ticketToken,
                 typeOf: 'Ticket'
             };
-            const doc = yield this.ticketModel.create(creatingTicket);
-            return { id: doc.id };
+            const result = yield this.ticketModel.insertMany(creatingTicket, { rawResult: true });
+            const insertedId = (_b = (_a = result.insertedIds) === null || _a === void 0 ? void 0 : _a[0]) === null || _b === void 0 ? void 0 : _b.toHexString();
+            if (typeof insertedId !== 'string') {
+                throw new factory.errors.Internal(`ticket not saved unexpectedly. result:${JSON.stringify(result)}`);
+            }
+            return { id: insertedId };
         });
     }
-    search(params) {
+    projectFields(params, inclusion) {
         var _a;
         return __awaiter(this, void 0, void 0, function* () {
             const conditions = TicketRepo.CREATE_MONGO_CONDITIONS(params);
-            const query = this.ticketModel.find((conditions.length > 0) ? { $and: conditions } : {}, {
-            // __v: 0,
-            // createdAt: 0,
-            // updatedAt: 0
-            });
+            let positiveProjectionFields = AVAILABLE_PROJECT_FIELDS;
+            if (Array.isArray(inclusion) && inclusion.length > 0) {
+                positiveProjectionFields = inclusion.filter((key) => AVAILABLE_PROJECT_FIELDS.includes(key));
+            }
+            const projection = Object.assign({ _id: 0, id: { $toString: '$_id' } }, Object.fromEntries(positiveProjectionFields.map((key) => ([key, 1]))));
+            const query = this.ticketModel.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)
@@ -75,8 +88,8 @@ class TicketRepo {
                 query.sort({ dateIssued: params.sort.dateIssued });
             }
             return query.setOptions({ maxTimeMS: settings_1.MONGO_MAX_TIME_MS })
-                .exec()
-                .then((docs) => docs.map((doc) => doc.toObject()));
+                .lean() // 2024-08-20~
+                .exec();
         });
     }
 }

package/lib/chevre/service/assetTransaction/pay/factory.d.ts

@@ -6,6 +6,6 @@ export declare function createStartParams(params: factory.assetTransaction.pay.I
     transactionNumber: string;
     paymentServiceType: factory.service.paymentService.PaymentServiceType;
     amount: number;
-    paymentService?: factory.service.paymentService.IService | factory.product.IProduct;
+    paymentService?: Pick<factory.service.paymentService.IService, 'availableChannel' | 'id' | 'serviceOutput' | 'serviceType'> | Pick<factory.product.IProduct, 'availableChannel' | 'id' | 'serviceOutput' | 'serviceType'>;
     location?: factory.action.trade.pay.ILocation;
 }): factory.assetTransaction.IStartParams<factory.assetTransactionType.Pay>;

package/lib/chevre/service/assetTransaction/pay.js

@@ -280,13 +280,13 @@ function fixPaymentService(params) {
                 }
                 break;
             default:
-                paymentService = (yield repos.paymentService.searchPaymentServices({
+                paymentService = (yield repos.paymentService.projectFields({
                     limit: 1,
                     page: 1,
                     project: { id: { $eq: params.project.id } },
                     typeOf: { $eq: paymentServiceType },
                     id: { $eq: getPaymentServiceId(params) }
-                }, [], [])).shift();
+                }, ['availableChannel', 'serviceOutput', 'serviceType'], [])).shift();
                 if (paymentService === undefined) {
                     throw new factory.errors.NotFound('PaymentService');
                 }

package/lib/chevre/service/assetTransaction/refund/factory.d.ts

@@ -6,5 +6,5 @@ export declare function createStartParams(params: factory.assetTransaction.refun
     transactionNumber: string;
     paymentServiceType: factory.service.paymentService.PaymentServiceType;
     payAction: factory.action.trade.pay.IAction;
-    paymentService?: factory.product.IProduct | factory.service.paymentService.IService;
+    paymentService?: factory.product.IProduct | Pick<factory.service.paymentService.IService, 'availableChannel' | 'id' | 'typeOf' | 'serviceOutput'>;
 }): factory.assetTransaction.IStartParams<factory.assetTransactionType.Refund>;

package/lib/chevre/service/assetTransaction/refund.js

@@ -98,13 +98,13 @@ function fixPaymentService(params) {
                 }
                 break;
             default:
-                paymentService = (yield repos.paymentService.searchPaymentServices({
+                paymentService = (yield repos.paymentService.projectFields({
                     limit: 1,
                     page: 1,
                     project: { id: { $eq: params.payAction.project.id } },
                     typeOf: { $eq: params.paymentServiceType },
                     id: { $eq: paymentServiceId }
-                }, [], [])).shift();
+                }, ['availableChannel', 'serviceOutput', 'typeOf'], [])).shift();
                 if (paymentService === undefined) {
                     throw new factory.errors.NotFound('PaymentService');
                 }

package/lib/chevre/service/assetTransaction/reserve/start/createSubReservations.js

@@ -309,12 +309,12 @@ function validateProgramMembershipUsed(params) {
                 if (typeof issuedThroughId !== 'string' || issuedThroughId === '') {
                     throw new factory.errors.ArgumentNull('acceptedOffer.itemOffered.serviceOutput.programMembershipUsed.issuedThrough.id');
                 }
-                permitIssuedThrough = (yield repos.paymentService.searchPaymentServices({
+                permitIssuedThrough = (yield repos.paymentService.projectFields({
                     limit: 1,
                     page: 1,
                     id: { $eq: issuedThroughId },
                     typeOf: { $eq: factory.service.paymentService.PaymentServiceType.CreditCard }
-                }, ['_id', 'typeOf', 'project', 'serviceType', 'serviceOutput'], [])).shift();
+                }, ['typeOf', 'project', 'serviceType', 'serviceOutput'], [])).shift();
                 if (permitIssuedThrough === undefined) {
                     throw new factory.errors.NotFound(factory.service.paymentService.PaymentServiceType.CreditCard);
                 }

package/lib/chevre/service/code.js

@@ -110,12 +110,12 @@ function payload2authorizeObject(params) {
             // }
             if (typeof payload.jti === 'string') {
                 // jtiに対応(2024-05-08~)
-                const ticket = (yield repos.ticket.search({
+                const ticket = (yield repos.ticket.projectFields({
                     limit: 1,
                     page: 1,
                     project: { id: { $eq: params.project.id } },
                     id: { $eq: payload.jti }
-                })).shift();
+                }, ['ticketToken'])).shift();
                 if (ticket === undefined) {
                     throw new factory.errors.NotFound('Ticket');
                 }

package/lib/chevre/service/event.js

@@ -236,7 +236,7 @@ function saveScreeningEventSeries(params) {
             kubunClass: '043'
         });
         debug('kubunNames found.');
-        const availablePaymentMethodTypes = yield repos.categoryCode.search({
+        const availablePaymentMethodTypes = yield repos.categoryCode.projectFields({
             project: { id: { $eq: params.project.id } },
             inCodeSet: { identifier: { $eq: factory.categoryCode.CategorySetIdentifier.PaymentMethodType } }
         }, ['additionalProperty', 'codeValue'], []);

package/lib/chevre/service/offer/event/authorize/processStartReserve4chevre/requestedProgramMembershipUsed2permit.js

@@ -60,12 +60,12 @@ function requestedProgramMembershipUsed2permit(params) {
         else if ((programMembershipUsed === null || programMembershipUsed === void 0 ? void 0 : programMembershipUsed.typeOf) === 'Ticket') {
             const { ticketToken } = programMembershipUsed;
             if (typeof ticketToken === 'string') {
-                const ticket = (yield repos.ticket.search({
+                const ticket = (yield repos.ticket.projectFields({
                     limit: 1,
                     page: 1,
                     project: { id: { $eq: params.project.id } },
                     ticketToken: { $eq: ticketToken }
-                })).shift();
+                }, ['ticketToken'])).shift();
                 if (ticket === undefined) {
                     throw new factory.errors.NotFound('Ticket');
                 }

package/lib/chevre/service/offer/event/importFromCOA.js

@@ -15,7 +15,7 @@ const factory_1 = require("./importFromCOA/factory");
 function importFromCOA(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         // 通貨区分検索
-        const currencyTypes = yield repos.categoryCode.search({
+        const currencyTypes = yield repos.categoryCode.projectFields({
             limit: 1,
             page: 1,
             project: { id: { $eq: params.project.id } },
@@ -23,7 +23,7 @@ function importFromCOA(params) {
         }, [], []);
         const defaultCurrencyType = currencyTypes.shift();
         // メンバーシップ区分検索
-        const membershipTypes = yield repos.categoryCode.search({
+        const membershipTypes = yield repos.categoryCode.projectFields({
             limit: 1,
             page: 1,
             project: { id: { $eq: params.project.id } },

package/lib/chevre/service/offer/eventServiceByCOA/authorize.js

@@ -53,15 +53,15 @@ function authorize(params) {
                 'superEvent', 'typeOf', 'identifier', 'name'
             ] // optimize(2024-07-18~)
             );
-            const availablePaymentMethodTypes = yield repos.categoryCode.search({
+            const availablePaymentMethodTypes = yield repos.categoryCode.projectFields({
                 project: { id: { $eq: transaction.project.id } },
                 inCodeSet: { identifier: { $eq: factory.categoryCode.CategorySetIdentifier.PaymentMethodType } }
             }, [], []);
-            const seatingTypes = yield repos.categoryCode.search({
+            const seatingTypes = yield repos.categoryCode.projectFields({
                 project: { id: { $eq: transaction.project.id } },
                 inCodeSet: { identifier: { $eq: factory.categoryCode.CategorySetIdentifier.SeatingType } }
             }, [], []);
-            const videoFormatTypes = yield repos.categoryCode.search({
+            const videoFormatTypes = yield repos.categoryCode.projectFields({
                 project: { id: { $eq: transaction.project.id } },
                 inCodeSet: { identifier: { $eq: factory.categoryCode.CategorySetIdentifier.VideoFormatType } }
             }, [], []);

package/lib/chevre/service/offer/eventServiceByCOA/changeOffers.js

@@ -77,15 +77,15 @@ function changeOffers(params) {
             'superEvent', 'typeOf', 'identifier', 'name'
         ] // optimize(2024-07-18~)
         );
-        const availablePaymentMethodTypes = yield repos.categoryCode.search({
+        const availablePaymentMethodTypes = yield repos.categoryCode.projectFields({
             project: { id: { $eq: transaction.project.id } },
             inCodeSet: { identifier: { $eq: factory.categoryCode.CategorySetIdentifier.PaymentMethodType } }
         }, [], []);
-        const seatingTypes = yield repos.categoryCode.search({
+        const seatingTypes = yield repos.categoryCode.projectFields({
             project: { id: { $eq: transaction.project.id } },
             inCodeSet: { identifier: { $eq: factory.categoryCode.CategorySetIdentifier.SeatingType } }
         }, [], []);
-        const videoFormatTypes = yield repos.categoryCode.search({
+        const videoFormatTypes = yield repos.categoryCode.projectFields({
             project: { id: { $eq: transaction.project.id } },
             inCodeSet: { identifier: { $eq: factory.categoryCode.CategorySetIdentifier.VideoFormatType } }
         }, [], []);

package/lib/chevre/service/offer/product.js

@@ -344,9 +344,7 @@ function checkIfRegistered(params) {
         // メンバーシップについては、登録済かどうか確認する
         if (params.product.typeOf === factory.product.ProductType.MembershipService) {
             // プロダクトによって発行されたPermitを所有していれば、登録済
-            const searchOwnershipInfosResult = yield repos.ownershipInfo.search({
-                // iss: params.iss,
-                // project: { id: { $eq: params.project.id } },
+            const searchOwnershipInfosResult = yield repos.ownershipInfo.projectFields({
                 limit: 1,
                 page: 1,
                 ownedBy: { id: params.agent.id },
@@ -359,7 +357,7 @@ function checkIfRegistered(params) {
                 },
                 ownedFrom: params.now,
                 ownedThrough: params.now
-            });
+            }, []);
             const ownershipInfos = searchOwnershipInfosResult;
             if (ownershipInfos.length > 0) {
                 // Already registered

package/lib/chevre/service/payment/any/verifyTicketTokenAsNeeded.js

@@ -23,12 +23,12 @@ function verifyTicketTokenAsNeeded(params) {
                 // トークン化されたメンバーシップがリクエストされた場合、実メンバーシップ情報へ変換する
                 if (typeof ticketToken === 'string' && ticketToken !== '') {
                     let authorizedObject;
-                    const ticket = (yield repos.ticket.search({
+                    const ticket = (yield repos.ticket.projectFields({
                         limit: 1,
                         page: 1,
                         project: { id: { $eq: project.id } },
                         ticketToken: { $eq: ticketToken }
-                    })).shift();
+                    }, ['ticketToken'])).shift();
                     if (ticket === undefined) {
                         throw new factory.errors.NotFound('Ticket');
                     }

package/lib/chevre/service/task/onResourceUpdated/syncCategoryCode.js

@@ -29,7 +29,7 @@ function syncCategoryCode(params) {
         }
         else {
             for (const categoryCodeId of params.ids) {
-                const syncingCategoryCode = (yield repos.categoryCode.search({
+                const syncingCategoryCode = (yield repos.categoryCode.projectFields({
                     limit: 1,
                     page: 1,
                     project: { id: { $eq: params.project.id } },

package/lib/chevre/service/task/onResourceUpdated.js

@@ -322,7 +322,7 @@ function createInformProductTasks(params) {
 }
 function createInformCategoryCodeTasks(params) {
     return (repos, settings) => __awaiter(this, void 0, void 0, function* () {
-        const categoryCodes4inform = yield repos.categoryCode.search({
+        const categoryCodes4inform = yield repos.categoryCode.projectFields({
             id: { $in: params.ids },
             // ひとまずDistributorTypeのみ
             inCodeSet: { identifier: { $eq: factory.categoryCode.CategorySetIdentifier.DistributorType } }

package/package.json

@@ -110,5 +110,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build && npm test && npm run doc"
   },
-  "version": "22.2.0-alpha.11"
+  "version": "22.2.0-alpha.13"
 }