@chevre/domain 22.1.0-alpha.10 → 22.1.0-alpha.11

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/unsetUnnecessaryFields.ts

@@ -14,7 +14,7 @@ async function main() {
     let updateResult: any;
     updateResult = await accountingReportRepo.unsetUnnecessaryFields({
         filter: {
-            typeOf: { $exists: true }
+            _id: { $exists: true }
         },
         $unset: {
             createdAt: 1,
@@ -26,7 +26,7 @@ async function main() {
 
     updateResult = await aggregateReservationRepo.unsetUnnecessaryFields({
         filter: {
-            typeOf: { $exists: true }
+            _id: { $exists: true }
         },
         $unset: {
             createdAt: 1,
@@ -38,7 +38,7 @@ async function main() {
 
     updateResult = await projectRepo.unsetUnnecessaryFields({
         filter: {
-            typeOf: { $exists: true }
+            _id: { $exists: true }
         },
         $unset: {
             createdAt: 1,
@@ -50,7 +50,7 @@ async function main() {
 
     updateResult = await reservationRepo.unsetUnnecessaryFields({
         filter: {
-            typeOf: { $exists: true }
+            _id: { $exists: true }
         },
         $unset: {
             createdAt: 1,
@@ -62,5 +62,7 @@ async function main() {
 }
 
 main()
-    .then()
+    .then(() => {
+        console.log('success!');
+    })
     .catch(console.error);

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

@@ -34,7 +34,7 @@ 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' | 'reservedTicket.dateUsed' | 'reservationFor.id' | 'reservationFor.typeOf';
+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'>;
@@ -52,9 +52,10 @@ 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>[]>;
     projectFieldsById<T extends factory.reservationType>(params: {
         id: string;
@@ -150,7 +151,6 @@ 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;

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)
@@ -828,10 +864,39 @@ class ReservationRepo {
                 query.sort({ modifiedTime: params.sort.modifiedTime });
             }
             return query.setOptions({ maxTimeMS: settings_1.MONGO_MAX_TIME_MS })
-                .exec()
-                .then((docs) => docs.map((doc) => doc.toObject()));
+                .lean()
+                .exec();
         });
     }
+    // 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;
@@ -843,7 +908,7 @@ class ReservationRepo {
                     id: { $toString: '$_id' }
                 };
                 params.inclusion.forEach((field) => {
-                    if (field !== '_id' && field !== 'id') {
+                    if (String(field) !== '_id' && field !== 'id') {
                         projection[field] = 1;
                     }
                 });
@@ -1159,18 +1224,16 @@ 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 })

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

@@ -288,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;

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/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/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

@@ -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.10"
+  "version": "22.1.0-alpha.11"
 }

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);