@chevre/domain 22.1.0-alpha.9 → 22.1.0

package/example/src/chevre/attendIfNotAttended.ts

@@ -10,11 +10,20 @@ async function main() {
 
     const reservation = await reservationRepo.attendIfNotAttended(
         {
-            id: '864318975593476-0',
+            id: '948926445022844-0',
             now: new Date()
         }
     );
-    console.log('event found', reservation);
+    console.log('reservation found', reservation);
+
+    // await reservationRepo.cancel(
+    //     {
+    //         id: '948926445022844-0',
+    //         previousReservationStatus: chevre.factory.reservationStatusType.ReservationConfirmed,
+    //         modifiedTime: new Date()
+    //     }
+    // );
+    // console.log('reservation canceled');
 }
 
 main()

package/example/src/chevre/projectReservationFields.ts

@@ -0,0 +1,31 @@
+// tslint:disable:no-console
+import * as mongoose from 'mongoose';
+
+import { chevre } from '../../../lib/index';
+
+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 reservations = await reservationRepo.projectFields<chevre.factory.reservationType.EventReservation>(
+        {
+            limit: 1,
+            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');
+}
+
+main()
+    .then()
+    .catch(console.error);

package/example/src/chevre/projectReservationFieldsById.ts

@@ -0,0 +1,24 @@
+// tslint:disable:no-console
+import * as mongoose from 'mongoose';
+
+import { chevre } from '../../../lib/index';
+
+// 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 result = await reservationRepo.projectFieldsById(
+        {
+            id: '948926445022844-0',
+            inclusion: ['reservationStatus', 'reservationFor.id']
+        }
+    );
+    // tslint:disable-next-line:no-null-keyword
+    console.dir(result, { depth: null });
+}
+
+main()
+    .then(console.log)
+    .catch(console.error);

package/example/src/chevre/unsetUnnecessaryFields.ts

@@ -6,11 +6,51 @@ import { chevre } from '../../../lib/index';
 async function main() {
     await mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: false });
 
-    const priceSpecificationRepo = await chevre.repository.PriceSpecification.createInstance(mongoose.connection);
+    const accountingReportRepo = await chevre.repository.AccountingReport.createInstance(mongoose.connection);
+    const aggregateReservationRepo = await chevre.repository.AggregateReservation.createInstance(mongoose.connection);
+    const reservationRepo = await chevre.repository.Reservation.createInstance(mongoose.connection);
+    const projectRepo = await chevre.repository.Project.createInstance(mongoose.connection);
 
-    const updateResult = await priceSpecificationRepo.unsetUnnecessaryFields({
+    let updateResult: any;
+    updateResult = await accountingReportRepo.unsetUnnecessaryFields({
         filter: {
-            typeOf: { $exists: true }
+            _id: { $exists: true }
+        },
+        $unset: {
+            createdAt: 1,
+            updatedAt: 1,
+            __v: 1
+        }
+    });
+    console.log(updateResult);
+
+    updateResult = await aggregateReservationRepo.unsetUnnecessaryFields({
+        filter: {
+            _id: { $exists: true }
+        },
+        $unset: {
+            createdAt: 1,
+            updatedAt: 1,
+            __v: 1
+        }
+    });
+    console.log(updateResult);
+
+    updateResult = await projectRepo.unsetUnnecessaryFields({
+        filter: {
+            _id: { $exists: true }
+        },
+        $unset: {
+            createdAt: 1,
+            updatedAt: 1,
+            __v: 1
+        }
+    });
+    console.log(updateResult);
+
+    updateResult = await reservationRepo.unsetUnnecessaryFields({
+        filter: {
+            _id: { $exists: true }
         },
         $unset: {
             createdAt: 1,
@@ -22,5 +62,7 @@ async function main() {
 }
 
 main()
-    .then()
+    .then(() => {
+        console.log('success!');
+    })
     .catch(console.error);

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

@@ -53,5 +53,9 @@ export declare class AccountingReportRepo {
             id?: string;
         };
     }): Promise<any[]>;
+    unsetUnnecessaryFields(params: {
+        filter: any;
+        $unset: any;
+    }): Promise<import("mongodb").UpdateResult>;
 }
 export {};

package/lib/chevre/repo/accountingReport.js

@@ -203,5 +203,11 @@ class AccountingReportRepo {
                 .exec();
         });
     }
+    unsetUnnecessaryFields(params) {
+        return __awaiter(this, void 0, void 0, function* () {
+            return this.accountingReportModel.updateMany(params.filter, { $unset: params.$unset }, { timestamps: false })
+                .exec();
+        });
+    }
 }
 exports.AccountingReportRepo = AccountingReportRepo;

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

@@ -64,5 +64,9 @@ export declare class AggregateReservationRepo {
      * 予約集計を保管する
      */
     save(filter: Pick<IAggregateReservation, 'project' | 'reservationFor'>, update: IUpdateAggregateReservationParams): Promise<void>;
+    unsetUnnecessaryFields(params: {
+        filter: any;
+        $unset: any;
+    }): Promise<import("mongodb").UpdateResult>;
 }
 export {};

package/lib/chevre/repo/aggregateReservation.js

@@ -141,5 +141,11 @@ class AggregateReservationRepo {
             }
         });
     }
+    unsetUnnecessaryFields(params) {
+        return __awaiter(this, void 0, void 0, function* () {
+            return this.aggregateReservationModel.updateMany(params.filter, { $unset: params.$unset }, { timestamps: false })
+                .exec();
+        });
+    }
 }
 exports.AggregateReservationRepo = AggregateReservationRepo;

package/lib/chevre/repo/mongoose/schemas/aggregateReservation.js

@@ -12,6 +12,9 @@ const schemaDefinition = {
     reservationFor: { type: mongoose_1.SchemaTypes.Mixed, required: true },
     aggregateEntranceGate: mongoose_1.SchemaTypes.Mixed,
     aggregateOffer: mongoose_1.SchemaTypes.Mixed
+    // createdAt: SchemaTypes.Mixed,
+    // updatedAt: SchemaTypes.Mixed,
+    // __v: SchemaTypes.Mixed
 };
 const schemaOptions = {
     autoIndex: settings_1.MONGO_AUTO_INDEX,

package/lib/chevre/repo/mongoose/schemas/project.js

@@ -20,6 +20,9 @@ const schemaDefinition = {
         type: String,
         required: true
     }
+    // createdAt: SchemaTypes.Mixed,
+    // updatedAt: SchemaTypes.Mixed,
+    // __v: SchemaTypes.Mixed
 };
 const schemaOptions = {
     autoIndex: settings_1.MONGO_AUTO_INDEX,

package/lib/chevre/repo/mongoose/schemas/reservation.js

@@ -50,6 +50,9 @@ const schemaDefinition = {
     attended: { type: Boolean, default: false },
     additionalProperty: mongoose_1.SchemaTypes.Mixed,
     issuedThrough: mongoose_1.SchemaTypes.Mixed
+    // createdAt: SchemaTypes.Mixed,
+    // updatedAt: SchemaTypes.Mixed,
+    // __v: SchemaTypes.Mixed
 };
 const schemaOptions = {
     autoIndex: settings_1.MONGO_AUTO_INDEX,

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

@@ -69,5 +69,9 @@ export declare class ProjectRepo {
         id: string;
     }): Promise<void>;
     getCursor(conditions: FilterQuery<factory.project.IProject>, projection: any): import("mongoose").Cursor<any, import("mongoose").QueryOptions<any>>;
+    unsetUnnecessaryFields(params: {
+        filter: any;
+        $unset: any;
+    }): Promise<import("mongodb").UpdateResult>;
 }
 export {};

package/lib/chevre/repo/project.js

@@ -164,5 +164,11 @@ class ProjectRepo {
             .sort({ _id: factory.sortType.Ascending })
             .cursor();
     }
+    unsetUnnecessaryFields(params) {
+        return __awaiter(this, void 0, void 0, function* () {
+            return this.projectModel.updateMany(params.filter, { $unset: params.$unset }, { timestamps: false })
+                .exec();
+        });
+    }
 }
 exports.ProjectRepo = ProjectRepo;

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

@@ -34,7 +34,11 @@ export type ICreatingReservation<T extends factory.reservationType> = T extends
 } : T extends factory.reservationType.EventReservation ? (factory.reservation.eventReservation.IReservation) & {
     _id: string;
 } : never;
-type IKeyOfProjection = keyof factory.reservation.IReservation<factory.reservationType.BusReservation | factory.reservationType.EventReservation> | '_id';
+type IKeyOfProjection = keyof factory.reservation.IReservation<factory.reservationType.BusReservation | factory.reservationType.EventReservation> | 'reservedTicket.dateUsed' | 'reservationFor.id' | 'reservationFor.typeOf';
+export type IAttendedReservation = Pick<factory.reservation.IReservation<factory.reservationType.EventReservation>, 'id' | 'typeOf' | 'project' | 'modifiedTime'> & {
+    reservationFor: Pick<factory.reservation.IReservationFor<factory.reservationType.EventReservation>, 'id' | 'typeOf'>;
+    reservedTicket: Pick<factory.reservation.ITicket, 'dateUsed'>;
+};
 /**
  * 予約リポジトリ
  */
@@ -48,14 +52,14 @@ export declare class ReservationRepo {
     count<T extends factory.reservationType>(params: factory.reservation.ISearchConditions<T>): Promise<number>;
     /**
      * 予約検索
+     * migrate from search(2024-08-08~)
      */
-    search<T extends factory.reservationType>(params: factory.reservation.ISearchConditions<T>, projection?: {
-        [key in IKeyOfProjection]?: 0 | 1;
+    projectFields<T extends factory.reservationType>(params: factory.reservation.ISearchConditions<T>, inclusion?: {
+        [key in IKeyOfProjection]?: 1;
     }): Promise<factory.reservation.IReservation<factory.reservationType.EventReservation>[]>;
-    findById<T extends factory.reservationType>(params: {
+    projectFieldsById<T extends factory.reservationType>(params: {
         id: string;
         inclusion?: IKeyOfProjection[];
-        exclusion?: IKeyOfProjection[];
     }): Promise<factory.reservation.IReservation<T>>;
     confirmManyIfNotExist(params: {
         bookingTime: Date;
@@ -73,11 +77,11 @@ export declare class ReservationRepo {
     /**
      * 予約取消
      */
-    cancel<T extends factory.reservationType>(params: {
+    cancelById<T extends factory.reservationType>(params: {
         id: string;
         previousReservationStatus?: factory.reservationStatusType;
         modifiedTime: Date;
-    }): Promise<factory.reservation.IReservation<T>>;
+    }): Promise<void>;
     /**
      * 予約取消
      */
@@ -113,7 +117,7 @@ export declare class ReservationRepo {
          * modifiedTime
          */
         now: Date;
-    }): Promise<factory.reservation.IReservation<factory.reservationType>>;
+    }): Promise<IAttendedReservation>;
     /**
      * 予約部分更新
      */
@@ -147,7 +151,10 @@ export declare class ReservationRepo {
             $in: string[];
         };
     }): Promise<string[]>;
-    deleteReservedTicketUnderName(): Promise<import("mongodb").UpdateResult>;
     getCursor(conditions: any, projection: any): import("mongoose").Cursor<any, import("mongoose").QueryOptions<any>>;
+    unsetUnnecessaryFields(params: {
+        filter: any;
+        $unset: any;
+    }): Promise<import("mongodb").UpdateResult>;
 }
 export {};

package/lib/chevre/repo/reservation.js

@@ -805,18 +805,54 @@ class ReservationRepo {
     }
     /**
      * 予約検索
+     * migrate from search(2024-08-08~)
      */
-    search(params, projection) {
+    projectFields(params, inclusion) {
         var _a;
         return __awaiter(this, void 0, void 0, function* () {
             const conditions = ReservationRepo.CREATE_MONGO_CONDITIONS(params);
-            const query = this.reservationModel.find((conditions.length > 0) ? { $and: conditions } : {}, (projection !== undefined && projection !== null)
-                ? projection
-                : {
-                    __v: 0,
-                    createdAt: 0,
-                    updatedAt: 0
-                });
+            let projection = {};
+            if (inclusion !== undefined && inclusion !== null) {
+                projection = {
+                    _id: 0,
+                    id: { $toString: '$_id' }
+                };
+                for (const [field, value] of Object.entries(inclusion)) {
+                    // 厳密に1を指定されたフィールドのみprojectionに追加
+                    if (value === 1 && field !== '_id' && field !== 'id') {
+                        projection[field] = 1;
+                    }
+                }
+            }
+            else {
+                projection = {
+                    _id: 0,
+                    id: { $toString: '$_id' },
+                    project: 1,
+                    provider: 1,
+                    typeOf: 1,
+                    additionalTicketText: 1,
+                    bookingTime: 1,
+                    broker: 1,
+                    modifiedTime: 1,
+                    numSeats: 1,
+                    previousReservationStatus: 1,
+                    price: 1,
+                    priceCurrency: 1,
+                    programMembershipUsed: 1,
+                    reservationFor: 1,
+                    reservationNumber: 1,
+                    reservationStatus: 1,
+                    reservedTicket: 1,
+                    subReservation: 1,
+                    underName: 1,
+                    checkedIn: 1,
+                    attended: 1,
+                    additionalProperty: 1,
+                    issuedThrough: 1
+                };
+            }
+            const query = this.reservationModel.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)
@@ -824,40 +860,90 @@ class ReservationRepo {
             }
             // tslint:disable-next-line:no-single-line-block-comment
             /* istanbul ignore else */
-            if (((_a = params.sort) === null || _a === void 0 ? void 0 : _a.modifiedTime) !== undefined) {
-                query.sort({ modifiedTime: params.sort.modifiedTime });
+            if (((_a = params.sort) === null || _a === void 0 ? void 0 : _a.bookingTime) !== undefined) {
+                query.sort({ bookingTime: params.sort.bookingTime });
             }
             return query.setOptions({ maxTimeMS: settings_1.MONGO_MAX_TIME_MS })
-                .exec()
-                .then((docs) => docs.map((doc) => doc.toObject()));
+                .lean()
+                .exec();
         });
     }
-    findById(params) {
+    // public async search<T extends factory.reservationType>(
+    //     params: factory.reservation.ISearchConditions<T>,
+    //     projection?: { [key in IKeyOfProjection]?: 0 | 1 }
+    // ): Promise<factory.reservation.IReservation<factory.reservationType.EventReservation>[]> {
+    //     const conditions = ReservationRepo.CREATE_MONGO_CONDITIONS(params);
+    //     const query = this.reservationModel.find(
+    //         (conditions.length > 0) ? { $and: conditions } : {},
+    //         (projection !== undefined && projection !== null)
+    //             ? projection
+    //             : {
+    //                 __v: 0,
+    //                 createdAt: 0,
+    //                 updatedAt: 0
+    //             }
+    //     );
+    //     if (typeof params.limit === 'number' && params.limit > 0) {
+    //         const page: number = (typeof params.page === 'number' && params.page > 0) ? params.page : 1;
+    //         query.limit(params.limit)
+    //             .skip(params.limit * (page - 1));
+    //     }
+    //     // tslint:disable-next-line:no-single-line-block-comment
+    //     /* istanbul ignore else */
+    //     if (params.sort?.modifiedTime !== undefined) {
+    //         query.sort({ modifiedTime: params.sort.modifiedTime });
+    //     }
+    //     return query.setOptions({ maxTimeMS: MONGO_MAX_TIME_MS })
+    //         .exec()
+    //         .then((docs) => docs.map((doc) => doc.toObject()));
+    // }
+    projectFieldsById(params) {
         return __awaiter(this, void 0, void 0, function* () {
+            let useInclusionProjection = false;
             let projection = {};
             if (Array.isArray(params.inclusion) && params.inclusion.length > 0) {
+                useInclusionProjection = true;
+                projection = {
+                    _id: 0,
+                    id: { $toString: '$_id' }
+                };
                 params.inclusion.forEach((field) => {
-                    projection[field] = 1;
+                    if (String(field) !== '_id' && field !== 'id') {
+                        projection[field] = 1;
+                    }
                 });
             }
             else {
-                projection = {
-                    __v: 0,
-                    createdAt: 0,
-                    updatedAt: 0
-                };
-                if (Array.isArray(params.exclusion) && params.exclusion.length > 0) {
-                    params.exclusion.forEach((field) => {
-                        projection[field] = 0;
-                    });
+                // discontinue(2024-08-08~)
+                throw new factory.errors.ArgumentNull('inclusion', 'inclusion must be specified');
+                // projection = {
+                //     __v: 0,
+                //     createdAt: 0,
+                //     updatedAt: 0
+                // };
+                // if (Array.isArray(params.exclusion) && params.exclusion.length > 0) {
+                //     params.exclusion.forEach((field) => {
+                //         projection[field] = 0;
+                //     });
+                // }
+            }
+            if (useInclusionProjection) {
+                const doc = yield this.reservationModel.findById(params.id, projection)
+                    .lean() // 2024-08-08~
+                    .exec();
+                if (doc === null) {
+                    throw new factory.errors.NotFound(this.reservationModel.modelName);
                 }
+                return doc;
             }
-            const doc = yield this.reservationModel.findById(params.id, projection)
-                .exec();
-            if (doc === null) {
-                throw new factory.errors.NotFound(this.reservationModel.modelName);
+            else {
+                const doc = yield this.reservationModel.findById(params.id, projection)
+                    .exec();
+                if (doc === null) {
+                    throw new factory.errors.NotFound(this.reservationModel.modelName);
+                }
+                return doc.toObject();
             }
-            return doc.toObject();
         });
     }
     confirmManyIfNotExist(params) {
@@ -901,29 +987,33 @@ class ReservationRepo {
     /**
      * 予約取消
      */
-    cancel(params) {
+    cancelById(params) {
         return __awaiter(this, void 0, void 0, function* () {
-            const conditions = Object.assign({ _id: String(params.id) }, (typeof params.previousReservationStatus === 'string')
-                ? { reservationStatus: params.previousReservationStatus }
+            const conditions = Object.assign({ _id: { $eq: String(params.id) } }, (typeof params.previousReservationStatus === 'string')
+                ? { reservationStatus: { $eq: params.previousReservationStatus } }
                 : undefined);
-            const update = Object.assign(Object.assign({}, (typeof params.previousReservationStatus === 'string')
-                ? { previousReservationStatus: params.previousReservationStatus }
-                : undefined), { reservationStatus: factory.reservationStatusType.ReservationCancelled, modifiedTime: params.modifiedTime });
-            const doc = yield this.reservationModel.findOneAndUpdate(conditions, update, { new: true })
-                .select({ __v: 0, createdAt: 0, updatedAt: 0 })
+            const update = {
+                $set: Object.assign({ reservationStatus: factory.reservationStatusType.ReservationCancelled, modifiedTime: params.modifiedTime }, (typeof params.previousReservationStatus === 'string')
+                    ? { previousReservationStatus: params.previousReservationStatus }
+                    : undefined)
+            };
+            const doc = yield this.reservationModel.findOneAndUpdate(conditions, update, { new: true, projection: { _id: 1 } })
+                .lean() // 2024-08-07~
+                // .select({ __v: 0, createdAt: 0, updatedAt: 0 })
                 .exec();
             // NotFoundであれば状態確認
             if (doc === null) {
-                const reservation = yield this.findById({ id: String(params.id) });
-                if (reservation.reservationStatus === factory.reservationStatusType.ReservationCancelled) {
+                const { reservationStatus } = yield this.projectFieldsById({ id: String(params.id), inclusion: ['reservationStatus'] });
+                if (reservationStatus === factory.reservationStatusType.ReservationCancelled) {
                     // すでに取消済の場合
-                    return reservation;
+                    return;
+                    // return reservation;
                 }
                 else {
-                    throw new factory.errors.Argument('id', `Reservation ${reservation.id} already changed -> ${reservation.reservationStatus}`);
+                    throw new factory.errors.Argument('id', `Reservation ${params.id} already changed -> ${reservationStatus}`);
                 }
             }
-            return doc.toObject();
+            // return doc.toObject();
         });
     }
     /**
@@ -932,11 +1022,13 @@ class ReservationRepo {
     cancelByReservationNumber(params) {
         return __awaiter(this, void 0, void 0, function* () {
             const conditions = Object.assign({ reservationNumber: { $eq: String(params.reservationNumber) } }, (typeof params.previousReservationStatus === 'string')
-                ? { reservationStatus: params.previousReservationStatus }
+                ? { reservationStatus: { $eq: params.previousReservationStatus } }
                 : undefined);
-            const update = Object.assign(Object.assign({}, (typeof params.previousReservationStatus === 'string')
-                ? { previousReservationStatus: params.previousReservationStatus }
-                : undefined), { reservationStatus: factory.reservationStatusType.ReservationCancelled, modifiedTime: params.modifiedTime });
+            const update = {
+                $set: Object.assign({ reservationStatus: factory.reservationStatusType.ReservationCancelled, modifiedTime: params.modifiedTime }, (typeof params.previousReservationStatus === 'string')
+                    ? { previousReservationStatus: params.previousReservationStatus }
+                    : undefined)
+            };
             return this.reservationModel.updateMany(conditions, update)
                 .exec();
         });
@@ -1035,17 +1127,38 @@ class ReservationRepo {
                 _id: { $eq: params.id },
                 attended: { $eq: false }
             }, {
-                attended: true,
-                modifiedTime: params.now,
-                'reservedTicket.dateUsed': params.now
-            }, { new: true })
-                .select({ __v: 0, createdAt: 0, updatedAt: 0 })
+                $set: {
+                    attended: true,
+                    modifiedTime: params.now,
+                    'reservedTicket.dateUsed': params.now
+                }
+            }, {
+                new: true,
+                projection: {
+                    _id: 0,
+                    id: { $toString: '$_id' },
+                    typeOf: 1,
+                    project: 1,
+                    modifiedTime: 1,
+                    'reservedTicket.dateUsed': 1,
+                    'reservationFor.id': 1,
+                    'reservationFor.typeOf': 1
+                }
+            })
+                .lean() // 2024-08-08~
+                // .select({ __v: 0, createdAt: 0, updatedAt: 0 })
                 .exec();
             if (doc === null) {
-                return this.findById({ id: params.id });
+                return this.projectFieldsById({
+                    id: params.id,
+                    inclusion: [
+                        'typeOf', 'project', 'modifiedTime', 'reservedTicket.dateUsed', 'reservationFor.id', 'reservationFor.typeOf'
+                    ] // inclusion(2024-08-08~)
+                });
                 // throw new factory.errors.NotFound(this.reservationModel.modelName);
             }
-            return doc.toObject();
+            return doc;
+            // return doc.toObject();
         });
     }
     /**
@@ -1111,22 +1224,26 @@ class ReservationRepo {
                 .then((docs) => docs.map((doc) => doc._id.toString()));
         });
     }
-    deleteReservedTicketUnderName() {
-        return __awaiter(this, void 0, void 0, function* () {
-            const conditions = {
-                'reservedTicket.underName': { $exists: true }
-            };
-            const update = {
-                $unset: { 'reservedTicket.underName': 1 }
-            };
-            return this.reservationModel.updateMany(conditions, update)
-                .exec();
-        });
-    }
+    // public async deleteReservedTicketUnderName() {
+    //     const conditions = {
+    //         'reservedTicket.underName': { $exists: true }
+    //     };
+    //     const update = {
+    //         $unset: { 'reservedTicket.underName': 1 }
+    //     };
+    //     return this.reservationModel.updateMany(conditions, update)
+    //         .exec();
+    // }
     getCursor(conditions, projection) {
         return this.reservationModel.find(conditions, projection)
             .sort({ bookingTime: factory.sortType.Descending })
             .cursor();
     }
+    unsetUnnecessaryFields(params) {
+        return __awaiter(this, void 0, void 0, function* () {
+            return this.reservationModel.updateMany(params.filter, { $unset: params.$unset }, { timestamps: false })
+                .exec();
+        });
+    }
 }
 exports.ReservationRepo = ReservationRepo;

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

@@ -7,7 +7,9 @@ export declare function createStartParams(params: {
     project: factory.assetTransaction.IProject;
     transactionNumber: string;
     transaction?: factory.assetTransaction.ITransaction<factory.assetTransactionType.Reserve>;
-    reservations?: factory.reservation.IReservation<factory.reservationType.EventReservation>[];
+    reservations?: (Pick<factory.reservation.IReservation<factory.reservationType.EventReservation>, 'id' | 'issuedThrough' | 'typeOf' | 'reservationNumber'> & {
+        reservationFor: Pick<factory.reservation.IReservationFor<factory.reservationType.EventReservation>, 'id' | 'typeOf'>;
+    })[];
 }): factory.assetTransaction.IStartParams<factory.assetTransactionType.CancelReservation>;
 export declare function createPotentialActions(params: {
     transaction: factory.assetTransaction.ITransaction<factory.assetTransactionType.CancelReservation>;

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

@@ -50,8 +50,11 @@ function validateStartParams(params) {
         if (reserveTransaction === undefined) {
             // 予約存在確認
             if (typeof ((_c = params.object.reservation) === null || _c === void 0 ? void 0 : _c.id) === 'string') {
-                const reservation = yield repos.reservation.findById({
-                    id: params.object.reservation.id
+                const reservation = yield repos.reservation.projectFieldsById({
+                    id: params.object.reservation.id,
+                    inclusion: [
+                        'issuedThrough', 'typeOf', 'reservationNumber', 'reservationFor.id', 'reservationFor.typeOf', 'provider', 'reservationStatus'
+                    ]
                 });
                 // 販売者検証(2023-08-01~)
                 if (typeof sellerId === 'string') {

package/lib/chevre/service/reserve/cancelReservation.js

@@ -215,8 +215,9 @@ function cancelReservation(actionAttributesList) {
                         });
                     }
                     else {
-                        const reservation = yield repos.reservation.findById({
-                            id: actionAttributes.object.id
+                        const reservation = yield repos.reservation.projectFieldsById({
+                            id: actionAttributes.object.id,
+                            inclusion: ['reservationNumber', 'reservationStatus', 'project', 'reservedTicket', 'subReservation', 'reservationFor']
                         });
                         // 予約取引を検索
                         const reserveTransactions = yield repos.assetTransaction.search({
@@ -254,7 +255,7 @@ function cancelReservation(actionAttributesList) {
                             reservationFor: reservation.reservationFor
                         })(repos);
                         // 予約をキャンセル状態に変更する
-                        yield repos.reservation.cancel({
+                        yield repos.reservation.cancelById({
                             id: reservation.id,
                             previousReservationStatus: actionAttributes.object.reservationStatus,
                             modifiedTime: now
@@ -287,10 +288,10 @@ function cancelReservation(actionAttributesList) {
                     const reservationNumber = actionAttributes.object.reservationNumber;
                     if (typeof reservationNumber === 'string' && reservationNumber.length > 0) {
                         // 最新のconfirmedReservationsを検索
-                        canceledReservations = yield repos.reservation.search({
+                        canceledReservations = yield repos.reservation.projectFields({
                             reservationNumber: { $eq: reservationNumber },
                             typeOf: factory.reservationType.EventReservation
-                        });
+                        }, { project: 1, typeOf: 1, modifiedTime: 1, reservationNumber: 1 });
                         canceledReservations = canceledReservations.map((r) => {
                             // _idは不要であり、存在すると予期せぬ影響を及ぼす可能性がある
                             delete r._id;
@@ -299,8 +300,9 @@ function cancelReservation(actionAttributesList) {
                     }
                 }
                 else {
-                    const canceledReservation = yield repos.reservation.findById({
-                        id: actionAttributes.object.id
+                    const canceledReservation = yield repos.reservation.projectFieldsById({
+                        id: actionAttributes.object.id,
+                        inclusion: ['project', 'typeOf', 'modifiedTime', 'reservationNumber']
                     });
                     canceledReservations = [canceledReservation];
                 }

package/lib/chevre/service/reserve/confirmReservation.js

@@ -36,10 +36,13 @@ function confirmReservation(params) {
             const reservationNumber = params.potentialReserveAction.object.reservationNumber;
             if (typeof reservationNumber === 'string' && reservationNumber.length > 0) {
                 // 最新のconfirmedReservationsを検索
-                confirmedReservations = yield repos.reservation.search({
+                confirmedReservations = yield repos.reservation.projectFields({
                     reservationNumber: { $eq: reservationNumber },
                     typeOf: factory.reservationType.EventReservation
-                });
+                }
+                // project all fields
+                // {}
+                );
                 confirmedReservations = confirmedReservations.map((r) => {
                     // _idは不要であり、存在すると予期せぬ影響を及ぼす可能性がある
                     delete r._id;

package/lib/chevre/service/reserve/findByCode.js

@@ -41,10 +41,10 @@ function findByCode(params) {
             default:
                 throw new factory.errors.NotImplemented(`authorization object typeOf: ${authorization.object.typeOf} not implemented`);
         }
-        const reservationFromRepo = yield repos.reservation.findById({
+        const reservationFromRepo = yield repos.reservation.projectFieldsById({
             id: reservationId,
-            inclusion: ['id', 'additionalTicketText', 'reservationStatus', 'reservedTicket'],
-            exclusion: []
+            inclusion: ['additionalTicketText', 'reservationStatus', 'reservedTicket']
+            // exclusion: [] // discontinue(2024-08-08~)
         });
         const { id, additionalTicketText, reservationStatus, reservedTicket } = reservationFromRepo;
         const reservation = {

package/lib/chevre/service/reserve/potentialActions/onReservationCanceled.d.ts

@@ -4,13 +4,13 @@
 import * as factory from '../../../factory';
 import type { TaskRepo } from '../../../repo/task';
 import { Settings } from '../../../settings';
-type IEventReservation = factory.reservation.IReservation<factory.reservationType.EventReservation>;
-type IBusReservation = factory.reservation.IReservation<factory.reservationType.BusReservation>;
+export type ICanceledEventReservation = Pick<factory.reservation.IReservation<factory.reservationType.EventReservation>, 'project' | 'id' | 'typeOf' | 'modifiedTime' | 'reservationNumber'>;
+export type ICanceledBusReservation = Pick<factory.reservation.IReservation<factory.reservationType.BusReservation>, 'project' | 'id' | 'typeOf' | 'modifiedTime' | 'reservationNumber'>;
 export declare function onReservationCanceled(
 /**
  * ステータス変更された予約リスト
  */
-canceledReservations: IEventReservation[] | IBusReservation[], 
+canceledReservations: ICanceledEventReservation[] | ICanceledBusReservation[], 
 /**
  * 予約通知有無
  */
@@ -26,4 +26,3 @@ reservationFor: {
 }): (repos: {
     task: TaskRepo;
 }, settings: Settings) => Promise<void>;
-export {};

package/lib/chevre/service/reserve/potentialActions/onReservationUsed.d.ts

@@ -2,14 +2,13 @@
  * 予約使用時アクション
  */
 import * as factory from '../../../factory';
+import type { IAttendedReservation } from '../../../repo/reservation';
 import type { TaskRepo } from '../../../repo/task';
 import { Settings } from '../../../settings';
-type IEventReservation = factory.reservation.IReservation<factory.reservationType.EventReservation>;
 export type IUseReservationAction = factory.action.consume.use.reservation.IAction;
 /**
  * 予約使用
  */
-export declare function onReservationUsed(attendedReservation: IEventReservation): (repos: {
+export declare function onReservationUsed(attendedReservation: IAttendedReservation): (repos: {
     task: TaskRepo;
 }, settings: Settings) => Promise<void>;
-export {};

package/lib/chevre/service/reserve/searchByOrder.js

@@ -90,7 +90,7 @@ function searchByOrder(params) {
                     }
                     break;
                 default:
-                    reservations = yield repos.reservation.search({
+                    reservations = yield repos.reservation.projectFields({
                         project: { id: { $eq: params.project.id } },
                         typeOf: reservationType,
                         id: { $in: reservationIds }

package/lib/chevre/service/reserve/useReservation.js

@@ -30,9 +30,9 @@ function useReservation(params) {
         // confirmReservationが間に合わない可能性を考慮する(2023-06-01~)
         yield reserveIfNotYet({ object: params.object })(repos, settings);
         // 予約検索
-        const reservation = yield repos.reservation.findById({
+        const reservation = yield repos.reservation.projectFieldsById({
             id: reservationId,
-            inclusion: ['_id', 'issuedThrough', 'project', 'reservationFor', 'reservationNumber', 'reservedTicket', 'typeOf']
+            inclusion: ['issuedThrough', 'project', 'reservationFor', 'reservationNumber', 'reservedTicket', 'typeOf']
         });
         // UseActionを作成する
         // optimize(2024-05-07~)
@@ -60,7 +60,7 @@ function useReservation(params) {
         let attendedReservation;
         try {
             // 使用日時と同時更新(2023-01-30~)
-            attendedReservation = (yield repos.reservation.attendIfNotAttended({ id: reservationId, now }));
+            attendedReservation = yield repos.reservation.attendIfNotAttended({ id: reservationId, now });
         }
         catch (error) {
             try {

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

@@ -76,8 +76,11 @@ function onAuthorizationCreated(params) {
                         || ownershipInfo.typeOfGood.typeOf === factory.reservationType.BusReservation) {
                         const reservationId = String(ownershipInfo.typeOfGood.id);
                         reservationIds = [reservationId];
-                        const reservation = yield repos.reservation.findById({ id: reservationId });
-                        reservationForIds = [String(reservation.reservationFor.id)];
+                        const { reservationFor } = yield repos.reservation.projectFieldsById({
+                            id: reservationId,
+                            inclusion: ['reservationFor.id']
+                        });
+                        reservationForIds = [String(reservationFor.id)];
                     }
                 }
                 break;

package/lib/chevre/service/transaction/returnOrder/preStart.js

@@ -181,13 +181,13 @@ function checkUsedReservationExists(params) {
         }, 'acceptedOffers.itemOffered.reservationNumber');
         if (reservationNumbers.length > 0) {
             // 使用済の予約がひとつでもあれば不可
-            const existingUsedReservations = yield repos.reservation.search({
+            const existingUsedReservations = yield repos.reservation.projectFields({
                 limit: 1,
                 page: 1,
                 typeOf: factory.reservationType.EventReservation,
                 reservationNumber: { $in: reservationNumbers },
                 attended: true
-            }, { _id: 1 });
+            }, { id: 1 });
             if (existingUsedReservations.length > 0) {
                 usedReservationExists = true;
             }

package/package.json

@@ -9,8 +9,8 @@
     }
   ],
   "dependencies": {
-    "@chevre/factory": "4.379.0",
-    "@cinerino/sdk": "10.1.0",
+    "@chevre/factory": "4.380.0",
+    "@cinerino/sdk": "10.4.0",
     "@motionpicture/coa-service": "9.4.0",
     "@motionpicture/gmo-service": "5.3.0",
     "@sendgrid/mail": "6.4.0",
@@ -110,5 +110,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build && npm test && npm run doc"
   },
-  "version": "22.1.0-alpha.9"
+  "version": "22.1.0"
 }

package/example/src/chevre/projectOrderFields.ts

@@ -1,55 +0,0 @@
-// tslint:disable:no-console
-import * as mongoose from 'mongoose';
-
-import { chevre } from '../../../lib/index';
-
-const project = { id: String(process.env.PROJECT_ID) };
-
-mongoose.Model.on('index', (...args) => {
-    console.error('******** index event emitted. ********\n', args);
-});
-
-async function main() {
-    await mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: false });
-
-    const indexes = await mongoose.connection.db.collection('orders')
-        .indexes();
-    // console.log(indexes);
-    console.log(indexes.length, 'indexes found');
-
-    const orderRepo = await chevre.repository.Order.createInstance(mongoose.connection);
-
-    const orders = await orderRepo.projectFields(
-        {
-            limit: 3,
-            page: 1,
-            sort: { orderDate: -1 },
-            project: { id: { $eq: project.id } },
-            acceptedOffers: {
-                // itemOffered: {
-                //     reservedTicket: {
-                //         identifier: { $eq: 'bls2qevbb:Default:B-9' }
-                //     }
-                // }
-                // $size: 1
-                //     itemOffered: {
-                //         issuedThrough: { typeOf: { $eq: chevre.factory.product.ProductType.MembershipService } }
-                //     }
-            }
-        },
-        {
-            inclusion: [
-                'orderNumber', 'orderDate'
-                , 'paymentMethods.name'
-                // , 'confirmationNumber', 'identifier', 'orderDate', 'orderStatus', 'price', 'typeOf'
-            ]
-        }
-    );
-    // tslint:disable-next-line:no-null-keyword
-    console.dir(orders, { depth: null });
-    console.log(orders.length, 'orders found');
-}
-
-main()
-    .then()
-    .catch(console.error);

package/example/src/chevre/projectOrderFieldsById.ts

@@ -1,41 +0,0 @@
-// tslint:disable:no-console
-import * as mongoose from 'mongoose';
-
-import { chevre } from '../../../lib/index';
-
-const project = { id: String(process.env.PROJECT_ID) };
-
-mongoose.Model.on('index', (...args) => {
-    console.error('******** index event emitted. ********\n', args);
-});
-
-async function main() {
-    await mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: false });
-
-    const orderRepo = await chevre.repository.Order.createInstance(mongoose.connection);
-    const result = await orderRepo.projectFieldsById(
-        {
-            id: '66a04d962582d528b3ba6521',
-            inclusion: ['orderNumber']
-        }
-    );
-    // tslint:disable-next-line:no-null-keyword
-    console.dir(result, { depth: null });
-
-    const findByOrderNumberResult = await orderRepo.projectFieldsByOrderNumber(
-        {
-            orderNumber: 'CIN0-2152162-0949752',
-            project: { id: project.id },
-            inclusion: [
-                // 'orderNumber', 'orderStatus', 'typeOf',
-                'project'
-            ]
-        }
-    );
-    // tslint:disable-next-line:no-null-keyword
-    console.log(findByOrderNumberResult);
-}
-
-main()
-    .then(console.log)
-    .catch(console.error);