@chevre/domain 22.5.0-alpha.8 → 22.5.0

package/lib/chevre/repo/event.js

@@ -26,37 +26,14 @@ const EventFactory = require("../factory/event");
 const event_1 = require("./mongoose/schemas/event");
 const errorHandler_1 = require("../errorHandler");
 const settings_1 = require("../settings");
-// export const keyOfMinimizedScreeningEvent: IKeyOfProjection<factory.eventType.ScreeningEvent>[] = [
-//     'project', 'organizer', '_id', 'typeOf',
-//     // 'additionalProperty', // discontinue(2024-07-20~)
-//     'name',
-//     'doorTime', 'endDate', 'eventStatus', 'location', 'startDate', 'superEvent', 'offers', 'coaInfo', 'identifier'
-// ];
-// export const keyOfMinimizedEvent: IKeyOfProjection<factory.eventType.Event>[] = [
-//     'project', 'organizer', '_id', 'typeOf',
-//     // 'additionalProperty', // discontinue(2024-07-20~)
-//     'name',
-//     'doorTime', 'endDate', 'eventStatus', 'location', 'startDate', 'offers', 'identifier'
-// ];
-// const PROJECTION_MINIMIZED_EVENT: {
-//     [key in (IKeyOfProjection<factory.eventType.ScreeningEvent> | IKeyOfProjection<factory.eventType.Event>)]?: 1
-// } = {
-//     project: 1,
-//     organizer: 1,
-//     _id: 1,
-//     typeOf: 1,
-//     // additionalProperty: 1, // discontinue(2024-07-20~)
-//     name: 1,
-//     doorTime: 1,
-//     endDate: 1,
-//     eventStatus: 1,
-//     location: 1,
-//     startDate: 1,
-//     superEvent: 1,
-//     offers: 1,
-//     coaInfo: 1,
-//     identifier: 1
-// };
+const AVAILABLE_PUBLIC_PROJECT_FIELDS = [
+    'additionalProperty', 'aggregateReservation', 'attendeeCount', 'checkInCount', 'coaInfo',
+    // 'description',
+    'doorTime', 'endDate', 'eventStatus', 'identifier', 'location',
+    'maximumAttendeeCapacity', 'name',
+    // 'offers',
+    'organizer', 'project', 'remainingAttendeeCapacity', 'startDate', 'superEvent', 'typeOf'
+];
 /**
  * イベントリポジトリ
  */
@@ -410,8 +387,10 @@ class EventRepo {
      * 施設コンテンツとルームは1つに限定
      * 存在すれば、特定の属性のみ更新する
      */
+    // tslint:disable-next-line:max-func-body-length
     upsertManyByAdditionalProperty(params) {
         return __awaiter(this, void 0, void 0, function* () {
+            const { updateOffersSeller } = params.options;
             const uniqid = yield Promise.resolve().then(() => require('uniqid'));
             const bulkWriteOps = [];
             const additionalProperties = [];
@@ -429,7 +408,7 @@ class EventRepo {
                     additionalProperties.push({ name: additionalPropertyFilter.name, value: additionalPropertyValue });
                     const { coaInfo, // ←適用しない
                     maximumAttendeeCapacity, remainingAttendeeCapacity, checkInCount, attendeeCount, aggregateReservation, // ←適用しない
-                    eventStatus, superEvent } = creatingEventParams, setOnInsertFields = __rest(creatingEventParams, ["coaInfo", "maximumAttendeeCapacity", "remainingAttendeeCapacity", "checkInCount", "attendeeCount", "aggregateReservation", "eventStatus", "superEvent"]);
+                    eventStatus, superEvent, offers } = creatingEventParams, setOnInsertFields = __rest(creatingEventParams, ["coaInfo", "maximumAttendeeCapacity", "remainingAttendeeCapacity", "checkInCount", "attendeeCount", "aggregateReservation", "eventStatus", "superEvent", "offers"]);
                     if (superEvent.id !== eventSeries.id) {
                         throw new factory.errors.Argument('superEvent.id', 'superEvent.id not matched');
                     }
@@ -447,17 +426,23 @@ class EventRepo {
                         },
                         'superEvent.id': { $exists: true, $eq: superEvent.id } // add superEvent.id(2024-09-15~)
                     };
-                    const setOnInsert = Object.assign(Object.assign({}, setOnInsertFields), { _id: uniqid() });
+                    let setOnInsert;
+                    if (updateOffersSeller) {
+                        setOnInsert = Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({}, setOnInsertFields), { 'offers.typeOf': offers.typeOf, 'offers.eligibleQuantity': offers.eligibleQuantity, 'offers.itemOffered': offers.itemOffered }), (offers.offeredThrough !== undefined) ? { 'offers.offeredThrough': offers.offeredThrough } : undefined), (offers.unacceptedPaymentMethod !== undefined)
+                            ? { 'offers.unacceptedPaymentMethod': offers.unacceptedPaymentMethod }
+                            : undefined), { _id: uniqid() });
+                    }
+                    else {
+                        setOnInsert = Object.assign(Object.assign({}, setOnInsertFields), { offers, _id: uniqid() });
+                    }
                     bulkWriteOps.push({
                         updateOne: {
                             filter,
                             update: {
                                 $setOnInsert: setOnInsert,
                                 // 変更可能な属性のみ上書き
-                                $set: {
-                                    eventStatus,
-                                    superEvent // add superEvent(2024-09-15~)
-                                }
+                                $set: Object.assign({ eventStatus,
+                                    superEvent }, (updateOffersSeller) ? { 'offers.seller': offers.seller } : undefined)
                             },
                             upsert: true
                         }
@@ -681,6 +666,119 @@ class EventRepo {
                 .exec();
         });
     }
+    /**
+     * apiで公開属性を検索する(2024-10-13~)
+     */
+    aggregatePublicFields(params, inclusion, options) {
+        var _a, _b;
+        return __awaiter(this, void 0, void 0, function* () {
+            const { includeOffers, includeSellerMakesOffer, sellerMakesOfferAvailableAtIn } = options;
+            const conditions = EventRepo.CREATE_MONGO_CONDITIONS(params);
+            let projection;
+            let positiveProjectionFields;
+            if (Array.isArray(inclusion) && inclusion.length > 0) {
+                positiveProjectionFields = inclusion.filter((key) => AVAILABLE_PUBLIC_PROJECT_FIELDS.includes(key));
+                projection = Object.assign({ _id: 0, id: { $toString: '$_id' } }, Object.fromEntries(positiveProjectionFields.map((key) => ([key, 1]))));
+                if (includeOffers) {
+                    projection = Object.assign(Object.assign(Object.assign({}, projection), { 'offers.typeOf': 1, 
+                        // 'offers.availabilityEnds': 1,
+                        // 'offers.availabilityStarts': 1,
+                        'offers.eligibleQuantity': 1, 'offers.itemOffered': 1, 'offers.offeredThrough': 1, 
+                        // 'offers.validFrom': 1,
+                        // 'offers.validThrough': 1,
+                        'offers.unacceptedPaymentMethod': 1, 'offers.seller.typeOf': 1, 'offers.seller.id': 1, 'offers.seller.name': 1 }), (includeSellerMakesOffer)
+                        ? Object.assign({}, (Array.isArray(sellerMakesOfferAvailableAtIn))
+                            ? {
+                                'offers.seller.makesOffer': {
+                                    $filter: {
+                                        input: '$offers.seller.makesOffer',
+                                        as: 'sellerMakesOffer',
+                                        cond: { $in: ['$$sellerMakesOffer.availableAtOrFrom.id', sellerMakesOfferAvailableAtIn] }
+                                    }
+                                }
+                            }
+                            : { 'offers.seller.makesOffer': 1 }) : undefined);
+                }
+            }
+            else {
+                // discontinue(2024-07-24~)
+                throw new factory.errors.ArgumentNull('inclusion', 'inclusion must be specified');
+            }
+            const aggregate = this.eventModel.aggregate([
+                { $match: { $and: conditions } },
+                ...(((_a = params.sort) === null || _a === void 0 ? void 0 : _a.startDate) !== undefined)
+                    ? [{ $sort: { startDate: params.sort.startDate } }]
+                    : [],
+                { $project: projection }
+            ]);
+            if (typeof params.limit === 'number' && params.limit > 0) {
+                const page = (typeof params.page === 'number' && params.page > 0) ? params.page : 1;
+                aggregate.limit(params.limit * page)
+                    .skip(params.limit * (page - 1));
+            }
+            // tslint:disable-next-line:no-single-line-block-comment
+            /* istanbul ignore else */
+            if (((_b = params.sort) === null || _b === void 0 ? void 0 : _b.startDate) !== undefined) {
+                aggregate.sort({ startDate: params.sort.startDate });
+            }
+            return aggregate
+                .option({ maxTimeMS: settings_1.MONGO_MAX_TIME_MS })
+                .exec();
+        });
+    }
+    // public async aggregateFields<T extends AvailableEventType>(
+    //     params: ISearchConditions<T>,
+    //     inclusion: IKeyOfProjection<T>[],
+    //     makesOffer?: { $filter: { availableAtOrFrom: { id: { $in: string[] } } } }
+    // ): Promise<Omit<factory.event.IEvent<T>, 'aggregateEntranceGate' | 'aggregateOffer'>[]> {
+    //     const conditions = EventRepo.CREATE_MONGO_CONDITIONS<T>(params);
+    //     const makesOfferAvailableAtOrFromIdIn = makesOffer?.$filter.availableAtOrFrom.id.$in;
+    //     let projection: ProjectionType<factory.event.IEvent<T>> = {};
+    //     const positiveProjectionFields: IKeyOfProjection<T>[] = (Array.isArray(inclusion))
+    //         ? inclusion.filter((key) => key !== 'id' && key !== '_id')
+    //         : [];
+    //     if (Array.isArray(inclusion) && inclusion.length > 0) {
+    //         projection = {
+    //             _id: 0,
+    //             id: { $toString: '$_id' },
+    //             ...(Array.isArray(makesOfferAvailableAtOrFromIdIn))
+    //                 ? {
+    //                     offerByClient: {
+    //                         $filter: {
+    //                             input: '$offers.seller.makesOffer',
+    //                             as: 'item',
+    //                             // cond: { $in: [makesOfferAvailableAtOrFromIdIn, '$$item.availableAtOrFrom.id'] }
+    //                             // cond: { $eq: [$arrayElemAt: [ "'$$item.availableAtOrFrom.$.id'", 0 ], ] }
+    //                             cond: { $in: ['$$item.availableAtOrFrom', makesOfferAvailableAtOrFromIdIn.map((id) => ([{ id }]))] }
+    //                         }
+    //                     }
+    //                 }
+    //                 : undefined,
+    //             ...Object.fromEntries<1>(positiveProjectionFields.map((key) => ([key, 1])))
+    //         };
+    //     } else {
+    //         // discontinue(2024-07-24~)
+    //         throw new factory.errors.ArgumentNull('inclusion', 'inclusion must be specified');
+    //     }
+    //     const aggregate = this.eventModel.aggregate<Omit<factory.event.IEvent<T>, 'aggregateEntranceGate' | 'aggregateOffer'>>([
+    //         { $match: { $and: conditions } },
+    //         // { $sort: { _id: factory.sortType.Ascending } },
+    //         { $project: projection }
+    //     ]);
+    //     if (typeof params.limit === 'number' && params.limit > 0) {
+    //         const page: number = (typeof params.page === 'number' && params.page > 0) ? params.page : 1;
+    //         aggregate.limit(params.limit * page)
+    //             .skip(params.limit * (page - 1));
+    //     }
+    //     // tslint:disable-next-line:no-single-line-block-comment
+    //     /* istanbul ignore else */
+    //     if (params.sort?.startDate !== undefined) {
+    //         aggregate.sort({ startDate: params.sort.startDate });
+    //     }
+    //     return aggregate
+    //         .option({ maxTimeMS: MONGO_MAX_TIME_MS })
+    //         .exec();
+    // }
     /**
      * IDのみで検索する
      * projectionなし

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

@@ -0,0 +1,54 @@
+import type { Connection } from 'mongoose';
+import * as factory from '../factory';
+type IAggregateMakesOfferResult = Pick<factory.event.screeningEvent.ISellerMakesOffer, 'availabilityEnds' | 'availabilityStarts' | 'validFrom' | 'validThrough'> & {
+    itemOffered: {
+        serviceOutput: {
+            reservationFor: {
+                /**
+                 * イベントID
+                 */
+                id: string;
+            };
+        };
+    };
+};
+/**
+ * イベントの販売者makesOfferリポジトリ
+ */
+export declare class EventSellerMakesOfferRepo {
+    private readonly eventModel;
+    constructor(connection: Connection);
+    /**
+     * 指定クライアントのオファーを集計する(2024-10-09~)
+     */
+    aggregateMakesOffer(conditions: {
+        limit?: number;
+        page?: number;
+        project: {
+            id: {
+                $eq: string;
+            };
+        };
+        /**
+         * アプリケーション(指定必須)
+         */
+        availableAtOrFrom: {
+            id: {
+                $eq: string;
+            };
+        };
+        itemOffered: {
+            serviceOutput: {
+                reservationFor: {
+                    /**
+                     * イベントID
+                     */
+                    id: {
+                        $in?: string[];
+                    };
+                };
+            };
+        };
+    }): Promise<IAggregateMakesOfferResult[]>;
+}
+export {};

package/lib/chevre/repo/eventSellerMakesOffer.js

@@ -0,0 +1,73 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.EventSellerMakesOfferRepo = void 0;
+const factory = require("../factory");
+const settings_1 = require("../settings");
+const event_1 = require("./mongoose/schemas/event");
+/**
+ * イベントの販売者makesOfferリポジトリ
+ */
+class EventSellerMakesOfferRepo {
+    constructor(connection) {
+        this.eventModel = connection.model(event_1.modelName, (0, event_1.createSchema)());
+    }
+    /**
+     * 指定クライアントのオファーを集計する(2024-10-09~)
+     */
+    aggregateMakesOffer(conditions) {
+        var _a;
+        return __awaiter(this, void 0, void 0, function* () {
+            const { availableAtOrFrom } = conditions;
+            if (typeof ((_a = availableAtOrFrom === null || availableAtOrFrom === void 0 ? void 0 : availableAtOrFrom.id) === null || _a === void 0 ? void 0 : _a.$eq) !== 'string' || availableAtOrFrom.id.$eq === '') {
+                throw new factory.errors.ArgumentNull('availableAtOrFrom.id.$eq');
+            }
+            const matchStages = [
+                { $match: { 'project.id': { $eq: conditions.project.id.$eq } } },
+                { $match: { 'offers.seller.makesOffer.availableAtOrFrom.id': { $exists: true, $eq: availableAtOrFrom.id.$eq } } }
+            ];
+            const reservationForIdIn = conditions.itemOffered.serviceOutput.reservationFor.id.$in;
+            if (Array.isArray(reservationForIdIn)) {
+                matchStages.push({ $match: { _id: { $in: reservationForIdIn } } });
+            }
+            const aggregate = this.eventModel.aggregate([
+                { $unwind: '$offers.seller.makesOffer' },
+                ...matchStages,
+                { $sort: { _id: factory.sortType.Ascending } },
+                {
+                    $project: {
+                        _id: 0,
+                        availabilityEnds: '$offers.seller.makesOffer.availabilityEnds',
+                        availabilityStarts: '$offers.seller.makesOffer.availabilityStarts',
+                        validFrom: '$offers.seller.makesOffer.validFrom',
+                        validThrough: '$offers.seller.makesOffer.validThrough',
+                        itemOffered: {
+                            serviceOutput: {
+                                reservationFor: {
+                                    id: { $toString: '$_id' }
+                                }
+                            }
+                        }
+                    }
+                }
+            ]);
+            if (typeof conditions.limit === 'number' && conditions.limit > 0) {
+                const page = (typeof conditions.page === 'number' && conditions.page > 0) ? conditions.page : 1;
+                aggregate.limit(conditions.limit * page)
+                    .skip(conditions.limit * (page - 1));
+            }
+            return aggregate
+                .option({ maxTimeMS: settings_1.MONGO_MAX_TIME_MS })
+                .exec();
+        });
+    }
+}
+exports.EventSellerMakesOfferRepo = EventSellerMakesOfferRepo;

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

@@ -12,9 +12,6 @@ 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/assetTransaction.js

@@ -7,9 +7,6 @@ const settings_1 = require("../../../settings");
 const modelName = 'AssetTransaction';
 exports.modelName = modelName;
 const schemaDefinition = {
-    // __v: SchemaTypes.Mixed,
-    // createdAt: SchemaTypes.Mixed,
-    // updatedAt: SchemaTypes.Mixed,
     project: { type: mongoose_1.SchemaTypes.Mixed, required: true },
     status: { type: String, required: true },
     typeOf: { type: String, required: true },

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

@@ -22,9 +22,6 @@ const schemaDefinition = {
     inCodeSet: mongoose_1.SchemaTypes.Mixed,
     name: mongoose_1.SchemaTypes.Mixed,
     paymentMethod: 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/creativeWork.js

@@ -28,9 +28,6 @@ const schemaDefinition = {
     contentRating: String,
     offers: mongoose_1.SchemaTypes.Mixed,
     additionalProperty: 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/customer.js

@@ -19,9 +19,6 @@ const schemaDefinition = {
     },
     url: String,
     telephone: String
-    // createdAt: SchemaTypes.Mixed,
-    // updatedAt: SchemaTypes.Mixed,
-    // __v: SchemaTypes.Mixed
 };
 const schemaOptions = {
     autoIndex: settings_1.MONGO_AUTO_INDEX,

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

@@ -165,60 +165,6 @@ const indexes = [
         { endDate: 1, startDate: 1 },
         { name: 'searchByEndDate' }
     ],
-    [
-        { 'hasOfferCatalog.id': 1, startDate: 1 },
-        {
-            name: 'searchByHasOfferCatalog',
-            partialFilterExpression: {
-                'hasOfferCatalog.id': { $exists: true }
-            }
-        }
-    ],
-    [
-        { 'offers.availabilityEnds': 1, startDate: 1 },
-        {
-            name: 'searchByOffersAvailabilityEnds-v2',
-            partialFilterExpression: {
-                'offers.availabilityEnds': { $exists: true }
-            }
-        }
-    ],
-    [
-        { 'offers.availabilityStarts': 1, startDate: 1 },
-        {
-            name: 'searchByOffersAvailabilityStarts-v2',
-            partialFilterExpression: {
-                'offers.availabilityStarts': { $exists: true }
-            }
-        }
-    ],
-    [
-        { 'offers.validThrough': 1, startDate: 1 },
-        {
-            name: 'searchByOffersValidThrough-v2',
-            partialFilterExpression: {
-                'offers.validThrough': { $exists: true }
-            }
-        }
-    ],
-    [
-        { 'offers.validFrom': 1, startDate: 1 },
-        {
-            name: 'searchByOffersValidFrom-v2',
-            partialFilterExpression: {
-                'offers.validFrom': { $exists: true }
-            }
-        }
-    ],
-    [
-        { 'offers.id': 1, startDate: 1 },
-        {
-            name: 'searchByOffersId-v2',
-            partialFilterExpression: {
-                'offers.id': { $exists: true }
-            }
-        }
-    ],
     [
         {
             'offers.itemOffered.serviceOutput.reservedTicket.ticketedSeat.typeOf': 1,
@@ -264,6 +210,15 @@ const indexes = [
             }
         }
     ],
+    [
+        { 'offers.seller.makesOffer.availableAtOrFrom.id': 1, startDate: 1 },
+        {
+            name: 'sellerMakesOfferAvailableAtOrFromId',
+            partialFilterExpression: {
+                'offers.seller.makesOffer.availableAtOrFrom.id': { $exists: true }
+            }
+        }
+    ],
     [
         { 'name.ja': 1, startDate: 1 },
         {

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

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

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

@@ -22,9 +22,6 @@ const schemaDefinition = {
     ownedFrom: Date,
     ownedThrough: Date,
     typeOfGood: mongoose_1.SchemaTypes.Mixed
-    // __v: SchemaTypes.Mixed,
-    // createdAt: SchemaTypes.Mixed,
-    // updatedAt: SchemaTypes.Mixed
 };
 const schemaOptions = {
     autoIndex: settings_1.MONGO_AUTO_INDEX,

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

@@ -17,9 +17,6 @@ const schemaDefinition = {
     provider: [mongoose_1.SchemaTypes.Mixed],
     serviceOutput: mongoose_1.SchemaTypes.Mixed,
     serviceType: mongoose_1.SchemaTypes.Mixed
-    // __v: SchemaTypes.Mixed,
-    // createdAt: SchemaTypes.Mixed,
-    // updatedAt: SchemaTypes.Mixed
 };
 const schemaOptions = {
     autoIndex: settings_1.MONGO_AUTO_INDEX,

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

@@ -20,9 +20,6 @@ const schemaDefinition = {
     appliesToCategoryCode: mongoose_1.SchemaTypes.Mixed,
     appliesToMovieTicket: mongoose_1.SchemaTypes.Mixed,
     appliesToVideoFormat: String
-    // createdAt: SchemaTypes.Mixed,
-    // updatedAt: SchemaTypes.Mixed,
-    // __v: SchemaTypes.Mixed
 };
 const schemaOptions = {
     autoIndex: settings_1.MONGO_AUTO_INDEX,

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

@@ -12,9 +12,6 @@ const schemaDefinition = {
     category: mongoose_1.SchemaTypes.Mixed,
     name: mongoose_1.SchemaTypes.Mixed,
     offers: 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,9 +20,6 @@ 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,9 +50,6 @@ 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/mongoose/schemas/seller.js

@@ -22,9 +22,6 @@ const schemaDefinition = {
     },
     url: String,
     telephone: String
-    // createdAt: SchemaTypes.Mixed,
-    // updatedAt: SchemaTypes.Mixed,
-    // __v: SchemaTypes.Mixed
 };
 const schemaOptions = {
     autoIndex: settings_1.MONGO_AUTO_INDEX,

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

@@ -12,9 +12,6 @@ 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/paymentService.d.ts

@@ -76,7 +76,7 @@ export declare class PaymentServiceRepo {
         };
         typeOf: factory.service.paymentService.PaymentServiceType.CreditCard | factory.service.paymentService.PaymentServiceType.MovieTicket;
         id: string;
-    }): Promise<factory.product.IAvailableChannel>;
+    }): Promise<factory.service.paymentService.IAvailableChannel>;
     unsetUnnecessaryFields(params: {
         filter: any;
         $unset: any;

package/lib/chevre/repo/paymentService.js

@@ -240,25 +240,6 @@ class PaymentServiceRepo {
                 }
             }
             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;

package/lib/chevre/repo/place/movieTheater.js

@@ -173,34 +173,10 @@ class MovieTheaterRepo {
      * 施設検索
      * redefine(2024-09-18~)
      */
-    projectFields(params, inclusion
-    // exclusion: IKeyOfProjection[]
-    ) {
+    projectFields(params, inclusion) {
         var _a;
         return __awaiter(this, void 0, void 0, function* () {
             const conditions = MovieTheaterRepo.CREATE_MOVIE_THEATER_MONGO_CONDITIONS(params);
-            // let projection: { [key: string]: number } = {};
-            // if (Array.isArray(inclusion) && inclusion.length > 0) {
-            //     inclusion.forEach((field) => {
-            //         if (String(field) !== 'containsPlace' && String(field) !== 'hasPOS') { // 除外(2023-10-26~)
-            //             projection[field] = 1;
-            //         }
-            //     });
-            // } else {
-            //     projection = {
-            //         __v: 0,
-            //         createdAt: 0,
-            //         updatedAt: 0,
-            //         // containsPlaceを含めるとデータサイズが大きくなるので、検索結果には含めない
-            //         containsPlace: 0,
-            //         hasPOS: 0 // 除外(2023-10-26~)
-            //     };
-            //     if (Array.isArray(exclusion) && exclusion.length > 0) {
-            //         exclusion.forEach((field) => {
-            //             projection[field] = 0;
-            //         });
-            //     }
-            // }
             let positiveProjectionFields = AVAILABLE_PROJECT_FIELDS;
             if (Array.isArray(inclusion) && inclusion.length > 0) {
                 positiveProjectionFields = inclusion.filter((key) => AVAILABLE_PROJECT_FIELDS.includes(key));