@chevre/domain 20.2.0-alpha.26 → 20.2.0-alpha.28

package/example/src/chevre/aggregation/aggregateSystem.ts

@@ -12,37 +12,47 @@ async function main() {
     await mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: false });
 
     const aggregationRepo = new chevre.repository.Aggregation(mongoose.connection);
+    const eventRepo = new chevre.repository.Event(mongoose.connection);
     const transactionRepo = new chevre.repository.Transaction(mongoose.connection);
     const assetTransactionRepo = new chevre.repository.AssetTransaction(mongoose.connection);
     const actionRepo = new chevre.repository.Action(mongoose.connection);
     const taskRepo = new chevre.repository.Task(mongoose.connection);
 
     await aggregationRepo.aggregationModel.deleteMany({
-        typeOf: { $in: ['AggregateOrder', 'AggregateReservation', 'AggregatePay', 'AggregateReserve'] }
+        typeOf: { $in: ['AggregateOrder', 'AggregateReservation'] }
     })
         .exec();
-    await chevre.service.aggregation.system.aggregateReserveTransaction({
+
+    await chevre.service.aggregation.system.aggregateEvent({
         aggregationDays: AGGREGATE_DAYS,
         excludedProjectId: EXCLUDED_PROJECT_ID
     })({
         agregation: aggregationRepo,
-        assetTransaction: assetTransactionRepo
+        event: eventRepo
     });
 
-    await chevre.service.aggregation.system.aggregatePayTransaction({
+    await chevre.service.aggregation.system.aggregateTask({
+        aggregationDays: AGGREGATE_DAYS,
+        excludedProjectId: EXCLUDED_PROJECT_ID
+    })({
+        agregation: aggregationRepo,
+        task: taskRepo
+    });
+
+    await chevre.service.aggregation.system.aggregateReserveTransaction({
         aggregationDays: AGGREGATE_DAYS,
         excludedProjectId: EXCLUDED_PROJECT_ID
     })({
         agregation: aggregationRepo,
         assetTransaction: assetTransactionRepo
     });
-    // return;
-    await chevre.service.aggregation.system.aggregateTask({
+
+    await chevre.service.aggregation.system.aggregatePayTransaction({
         aggregationDays: AGGREGATE_DAYS,
         excludedProjectId: EXCLUDED_PROJECT_ID
     })({
         agregation: aggregationRepo,
-        task: taskRepo
+        assetTransaction: assetTransactionRepo
     });
 
     await chevre.service.aggregation.system.aggregatePlaceOrder({

package/example/src/chevre/migrateProjectSubscription.ts

@@ -0,0 +1,51 @@
+// tslint:disable:no-console
+// import * as moment from 'moment';
+import * as mongoose from 'mongoose';
+
+import { chevre } from '../../../lib/index';
+
+// tslint:disable-next-line:max-func-body-length
+async function main() {
+    await mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: false });
+
+    const projectRepo = new chevre.repository.Project(mongoose.connection);
+
+    const cursor = projectRepo.getCursor(
+        {
+        },
+        {
+            // _id: 1,
+        }
+    );
+    console.log('projects found');
+
+    let i = 0;
+    let updateCount = 0;
+    // tslint:disable-next-line:max-func-body-length
+    await cursor.eachAsync(async (doc) => {
+        i += 1;
+        const project: chevre.factory.project.IProject = doc.toObject();
+
+        const useEventServiceAsProduct = project.subscription?.useEventServiceAsProduct;
+        const alreadyMigrated = useEventServiceAsProduct === true;
+
+        if (alreadyMigrated) {
+            console.log('already migrated.', project.id, i);
+        } else {
+            console.log(
+                'updating product...', project.id, i);
+            await projectRepo.findByIdAndIUpdate({
+                id: project.id,
+                subscription: { useEventServiceAsProduct: true }
+            });
+            updateCount += 1;
+            console.log('updated...', project.id, i);
+        }
+    });
+    console.log(i, 'projects checked');
+    console.log(updateCount, 'projects updated');
+}
+
+main()
+    .then()
+    .catch(console.error);

package/lib/chevre/factory/event.d.ts

@@ -0,0 +1,2 @@
+import * as factory from '../factory';
+export declare type IMinimizedIndividualEvent<T extends factory.eventType.ScreeningEvent | factory.eventType.Event> = T extends factory.eventType.ScreeningEvent ? Pick<factory.event.IEvent<T>, 'project' | 'id' | 'typeOf' | 'additionalProperty' | 'name' | 'doorTime' | 'endDate' | 'eventStatus' | 'location' | 'startDate' | 'superEvent' | 'offers' | 'coaInfo' | 'identifier'> : T extends factory.eventType.Event ? Pick<factory.event.IEvent<T>, 'project' | 'id' | 'typeOf' | 'additionalProperty' | 'name' | 'doorTime' | 'endDate' | 'eventStatus' | 'location' | 'startDate' | 'offers'> : never;

package/lib/chevre/factory/event.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

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

@@ -1,11 +1,12 @@
 import { Connection, Model } from 'mongoose';
 import * as factory from '../factory';
 export declare enum AggregationType {
-    AggregatePlaceOrder = "AggregatePlaceOrder",
     AggregateAuthorizeEventServiceOfferAction = "AggregateAuthorizeEventServiceOfferAction",
     AggregateAuthorizeOrderAction = "AggregateAuthorizeOrderAction",
     AggregateAuthorizePaymentAction = "AggregateAuthorizePaymentAction",
+    AggregateEvent = "AggregateEvent",
     AggregatePay = "AggregatePay",
+    AggregatePlaceOrder = "AggregatePlaceOrder",
     AggregateReserve = "AggregateReserve",
     AggregateTask = "AggregateTask",
     AggregateUseAction = "AggregateUseAction"

package/lib/chevre/repo/aggregation.js

@@ -24,11 +24,12 @@ exports.MongoRepository = exports.AggregationType = void 0;
 const aggregation_1 = require("./mongoose/model/aggregation");
 var AggregationType;
 (function (AggregationType) {
-    AggregationType["AggregatePlaceOrder"] = "AggregatePlaceOrder";
     AggregationType["AggregateAuthorizeEventServiceOfferAction"] = "AggregateAuthorizeEventServiceOfferAction";
     AggregationType["AggregateAuthorizeOrderAction"] = "AggregateAuthorizeOrderAction";
     AggregationType["AggregateAuthorizePaymentAction"] = "AggregateAuthorizePaymentAction";
+    AggregationType["AggregateEvent"] = "AggregateEvent";
     AggregationType["AggregatePay"] = "AggregatePay";
+    AggregationType["AggregatePlaceOrder"] = "AggregatePlaceOrder";
     AggregationType["AggregateReserve"] = "AggregateReserve";
     AggregationType["AggregateTask"] = "AggregateTask";
     AggregationType["AggregateUseAction"] = "AggregateUseAction";

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

@@ -1,5 +1,6 @@
 import { Connection } from 'mongoose';
 import * as factory from '../factory';
+import * as EventFactory from '../factory/event';
 export interface IAttributes4patchUpdate<T extends factory.eventType> {
     typeOf: T;
     eventStatus?: factory.eventStatusType;
@@ -30,6 +31,28 @@ export interface IUpdateAggregateUseActionsParams {
     };
 }
 export declare type ISearchConditions<T extends factory.eventType> = factory.event.ISearchConditions<T>;
+interface IAggregationByStatus {
+    eventCount: number;
+    reservationCount: number;
+    avgOfferCount: number;
+    maximumAttendeeCapacity: number;
+    remainingAttendeeCapacity: number;
+    avgRemainingCapacityRate: number;
+    maxRemainingCapacityRate: number;
+    minRemainingCapacityRate: number;
+    percentilesRemainingCapacityRate: {
+        name: string;
+        value: number;
+    }[];
+}
+interface IStatus {
+    status: factory.eventStatusType;
+    aggregation: IAggregationByStatus;
+}
+export interface IAggregateEvent {
+    statuses: IStatus[];
+}
+export import IMinimizedIndividualEvent = EventFactory.IMinimizedIndividualEvent;
 /**
  * イベントリポジトリ
  */
@@ -83,6 +106,9 @@ export declare class MongoRepository {
     }, projection?: {
         [key: string]: number;
     }): Promise<factory.event.IEvent<T>>;
+    findMinimizedIndividualEventById<T extends factory.eventType.ScreeningEvent | factory.eventType.Event>(params: {
+        id: string;
+    }): Promise<IMinimizedIndividualEvent<T>>;
     /**
      * イベントをキャンセルする
      */
@@ -108,4 +134,16 @@ export declare class MongoRepository {
     deleteUnnecessaryProjectAttributesById(params: {
         id: string;
     }): Promise<void>;
+    aggregateEvent(params: {
+        project?: {
+            id?: {
+                $ne?: string;
+            };
+        };
+        startFrom: Date;
+        startThrough: Date;
+        typeOf: factory.eventType;
+    }): Promise<IAggregateEvent>;
+    private agggregateByStatus;
 }
+export {};

package/lib/chevre/repo/event.js

@@ -614,9 +614,31 @@ class MongoRepository {
     }
     findById(params, projection) {
         return __awaiter(this, void 0, void 0, function* () {
-            const doc = yield this.eventModel.findOne({
-                _id: params.id
-            }, Object.assign({ __v: 0, createdAt: 0, updatedAt: 0 }, projection))
+            const doc = yield this.eventModel.findOne({ _id: params.id }, Object.assign({ __v: 0, createdAt: 0, updatedAt: 0 }, projection))
+                .exec();
+            if (doc === null) {
+                throw new factory.errors.NotFound(this.eventModel.modelName);
+            }
+            return doc.toObject();
+        });
+    }
+    findMinimizedIndividualEventById(params) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const doc = yield this.eventModel.findOne({ _id: params.id }, {
+                project: 1,
+                _id: 1,
+                typeOf: 1,
+                name: 1,
+                doorTime: 1,
+                endDate: 1,
+                eventStatus: 1,
+                location: 1,
+                startDate: 1,
+                superEvent: 1,
+                offers: 1,
+                coaInfo: 1,
+                identifier: 1
+            })
                 .exec();
             if (doc === null) {
                 throw new factory.errors.NotFound(this.eventModel.modelName);
@@ -687,5 +709,213 @@ class MongoRepository {
                 .exec();
         });
     }
+    aggregateEvent(params) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const statuses = yield Promise.all([
+                factory.eventStatusType.EventScheduled,
+                factory.eventStatusType.EventCancelled,
+                factory.eventStatusType.EventPostponed
+            ].map((eventStatus) => __awaiter(this, void 0, void 0, function* () {
+                var _a, _b;
+                const matchConditions = Object.assign({ startDate: {
+                        $gte: params.startFrom,
+                        $lte: params.startThrough
+                    }, typeOf: { $eq: params.typeOf }, eventStatus: { $eq: eventStatus } }, (typeof ((_b = (_a = params.project) === null || _a === void 0 ? void 0 : _a.id) === null || _b === void 0 ? void 0 : _b.$ne) === 'string')
+                    ? { 'project.id': { $ne: params.project.id.$ne } }
+                    : undefined);
+                return this.agggregateByStatus({ matchConditions, status: eventStatus });
+            })));
+            return { statuses };
+        });
+    }
+    // tslint:disable-next-line:max-func-body-length
+    agggregateByStatus(params) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const matchConditions = params.matchConditions;
+            const eventStatus = params.status;
+            const aggregations = yield this.eventModel.aggregate([
+                {
+                    $match: matchConditions
+                },
+                {
+                    $project: {
+                        remainingCapacityRate: {
+                            $cond: {
+                                if: {
+                                    $and: [
+                                        { $isNumber: '$maximumAttendeeCapacity' },
+                                        { $isNumber: '$remainingAttendeeCapacity' }
+                                    ]
+                                },
+                                then: {
+                                    $cond: {
+                                        if: { $gt: ['$maximumAttendeeCapacity', 0] },
+                                        then: {
+                                            $multiply: [
+                                                { $divide: ['$remainingAttendeeCapacity', '$maximumAttendeeCapacity'] },
+                                                // tslint:disable-next-line:no-magic-numbers
+                                                100
+                                            ]
+                                        },
+                                        else: 0
+                                    }
+                                },
+                                else: 0
+                            }
+                        },
+                        eventStatus: '$eventStatus',
+                        startDate: '$startDate',
+                        endDate: '$endDate',
+                        typeOf: '$typeOf',
+                        maximumAttendeeCapacity: {
+                            $cond: {
+                                if: { $isNumber: '$maximumAttendeeCapacity' },
+                                then: '$maximumAttendeeCapacity',
+                                else: 0
+                            }
+                        },
+                        remainingAttendeeCapacity: {
+                            $cond: {
+                                if: { $isNumber: '$remainingAttendeeCapacity' },
+                                then: '$remainingAttendeeCapacity',
+                                else: 0
+                            }
+                        },
+                        reservationCount: {
+                            $cond: {
+                                if: { $isNumber: '$aggregateReservation.reservationCount' },
+                                then: '$aggregateReservation.reservationCount',
+                                else: 0
+                            }
+                        },
+                        offerCount: {
+                            $cond: {
+                                if: { $isNumber: '$aggregateOffer.offerCount' },
+                                then: '$aggregateOffer.offerCount',
+                                else: 0
+                            }
+                        }
+                    }
+                },
+                {
+                    $group: {
+                        _id: '$typeOf',
+                        eventCount: { $sum: 1 },
+                        reservationCount: { $sum: '$reservationCount' },
+                        avgOfferCount: { $avg: '$offerCount' },
+                        maximumAttendeeCapacity: { $sum: '$maximumAttendeeCapacity' },
+                        remainingAttendeeCapacity: { $sum: '$remainingAttendeeCapacity' },
+                        avgRemainingCapacityRate: { $avg: '$remainingCapacityRate' },
+                        maxRemainingCapacityRate: { $max: '$remainingCapacityRate' },
+                        minRemainingCapacityRate: { $min: '$remainingCapacityRate' }
+                    }
+                },
+                {
+                    $project: {
+                        _id: 0,
+                        eventCount: '$eventCount',
+                        reservationCount: '$reservationCount',
+                        avgOfferCount: '$avgOfferCount',
+                        maximumAttendeeCapacity: '$maximumAttendeeCapacity',
+                        remainingAttendeeCapacity: '$remainingAttendeeCapacity',
+                        avgRemainingCapacityRate: '$avgRemainingCapacityRate',
+                        maxRemainingCapacityRate: '$maxRemainingCapacityRate',
+                        minRemainingCapacityRate: '$minRemainingCapacityRate'
+                    }
+                }
+            ])
+                .exec();
+            // tslint:disable-next-line:no-magic-numbers
+            const percents = [50, 95, 99];
+            if (aggregations.length === 0) {
+                return {
+                    status: eventStatus,
+                    aggregation: {
+                        eventCount: 0,
+                        reservationCount: 0,
+                        avgOfferCount: 0,
+                        maximumAttendeeCapacity: 0,
+                        remainingAttendeeCapacity: 0,
+                        avgRemainingCapacityRate: 0,
+                        maxRemainingCapacityRate: 0,
+                        minRemainingCapacityRate: 0,
+                        percentilesRemainingCapacityRate: percents.map((percent) => {
+                            return {
+                                name: String(percent),
+                                value: 0
+                            };
+                        })
+                    }
+                };
+            }
+            const ranks4percentile = percents.map((percentile) => {
+                return {
+                    percentile,
+                    // tslint:disable-next-line:no-magic-numbers
+                    rank: Math.floor(aggregations[0].eventCount * percentile / 100)
+                };
+            });
+            const aggregations2 = yield this.eventModel.aggregate([
+                {
+                    $match: matchConditions
+                },
+                {
+                    $project: {
+                        remainingCapacityRate: {
+                            $cond: {
+                                if: {
+                                    $and: [
+                                        { $isNumber: '$maximumAttendeeCapacity' },
+                                        { $isNumber: '$remainingAttendeeCapacity' }
+                                    ]
+                                },
+                                then: {
+                                    $cond: {
+                                        if: { $gt: ['$maximumAttendeeCapacity', 0] },
+                                        then: {
+                                            $multiply: [
+                                                { $divide: ['$remainingAttendeeCapacity', '$maximumAttendeeCapacity'] },
+                                                // tslint:disable-next-line:no-magic-numbers
+                                                100
+                                            ]
+                                        },
+                                        else: 0
+                                    }
+                                },
+                                else: 0
+                            }
+                        },
+                        eventStatus: '$eventStatus',
+                        startDate: '$startDate',
+                        endDate: '$endDate',
+                        typeOf: '$typeOf'
+                    }
+                },
+                { $sort: { remainingCapacityRate: 1 } },
+                {
+                    $group: {
+                        _id: '$typeOf',
+                        remainingCapacityRates: { $push: '$remainingCapacityRate' }
+                    }
+                },
+                {
+                    $project: {
+                        _id: 0,
+                        percentilesRemainingCapacityRate: ranks4percentile.map((rank) => {
+                            return {
+                                name: String(rank.percentile),
+                                value: { $arrayElemAt: ['$remainingCapacityRates', rank.rank] }
+                            };
+                        })
+                    }
+                }
+            ])
+                .exec();
+            return {
+                status: eventStatus,
+                aggregation: Object.assign(Object.assign({}, aggregations[0]), aggregations2[0])
+            };
+        });
+    }
 }
 exports.MongoRepository = MongoRepository;

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

@@ -35,7 +35,8 @@ const schema = new mongoose.Schema({
     subtitleLanguage: mongoose.SchemaTypes.Mixed,
     dubLanguage: mongoose.SchemaTypes.Mixed,
     kanaName: String,
-    hasOfferCatalog: mongoose.SchemaTypes.Mixed,
+    // 不要なので廃止(2023-01-23~)
+    // hasOfferCatalog: mongoose.SchemaTypes.Mixed,
     offers: mongoose.SchemaTypes.Mixed,
     maximumAttendeeCapacity: { type: Number },
     remainingAttendeeCapacity: { type: Number },

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

@@ -10,6 +10,12 @@ const writeConcern = { j: true, w: 'majority', wtimeout: 10000 };
  */
 const schema = new mongoose.Schema({
     _id: String,
+    aggregateReservation: mongoose.SchemaTypes.Mixed,
+    alternateName: String,
+    logo: String,
+    name: String,
+    settings: mongoose.SchemaTypes.Mixed,
+    subscription: mongoose.SchemaTypes.Mixed,
     typeOf: {
         type: String,
         required: true
@@ -19,7 +25,7 @@ const schema = new mongoose.Schema({
     id: true,
     read: 'primaryPreferred',
     writeConcern: writeConcern,
-    strict: false,
+    strict: true,
     useNestedStrict: true,
     timestamps: {
         createdAt: 'createdAt',

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

@@ -10,7 +10,6 @@ export declare class MongoRepository {
     findById(conditions: {
         id: string;
     }, projection?: any): Promise<factory.project.IProject>;
-    count(params: factory.project.ISearchConditions): Promise<number>;
     /**
      * プロジェクト検索
      */
@@ -24,6 +23,9 @@ export declare class MongoRepository {
         settings?: {
             sendgridApiKey?: string;
         };
+        subscription?: {
+            useEventServiceAsProduct?: boolean;
+        };
     }): Promise<void>;
     updateAggregateReservation(params: {
         id: string;
@@ -32,4 +34,5 @@ export declare class MongoRepository {
     deleteById(params: {
         id: string;
     }): Promise<void>;
+    getCursor(conditions: any, projection: any): import("mongoose").QueryCursor<any>;
 }

package/lib/chevre/repo/project.js

@@ -61,14 +61,6 @@ class MongoRepository {
             return doc.toObject();
         });
     }
-    count(params) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const conditions = MongoRepository.CREATE_MONGO_CONDITIONS(params);
-            return this.projectModel.countDocuments((conditions.length > 0) ? { $and: conditions } : {})
-                .setOptions({ maxTimeMS: 10000 })
-                .exec();
-        });
-    }
     /**
      * プロジェクト検索
      */
@@ -98,12 +90,14 @@ class MongoRepository {
         });
     }
     findByIdAndIUpdate(params) {
-        var _a;
+        var _a, _b;
         return __awaiter(this, void 0, void 0, function* () {
-            yield this.projectModel.findOneAndUpdate({ _id: params.id }, Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({ updatedAt: new Date() }, (typeof params.alternateName === 'string' && params.alternateName.length > 0)
+            yield this.projectModel.findOneAndUpdate({ _id: params.id }, Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({ updatedAt: new Date() }, (typeof params.alternateName === 'string' && params.alternateName.length > 0)
                 ? { alternateName: params.alternateName }
                 : undefined), (typeof params.name === 'string' && params.name.length > 0) ? { name: params.name } : undefined), (typeof params.logo === 'string' && params.logo.length > 0) ? { logo: params.logo } : undefined), (typeof ((_a = params.settings) === null || _a === void 0 ? void 0 : _a.sendgridApiKey) === 'string')
                 ? { 'settings.sendgridApiKey': params.settings.sendgridApiKey }
+                : undefined), (typeof ((_b = params.subscription) === null || _b === void 0 ? void 0 : _b.useEventServiceAsProduct) === 'boolean')
+                ? { 'subscription.useEventServiceAsProduct': params.subscription.useEventServiceAsProduct }
                 : undefined), { 
                 // ↓customerUserPoolは廃止
                 $unset: {
@@ -131,5 +125,10 @@ class MongoRepository {
                 .exec();
         });
     }
+    getCursor(conditions, projection) {
+        return this.projectModel.find(conditions, projection)
+            .sort({ _id: factory.sortType.Ascending })
+            .cursor();
+    }
 }
 exports.MongoRepository = MongoRepository;

package/lib/chevre/service/aggregation/event/aggregateScreeningEvent.js

@@ -23,7 +23,9 @@ const debug = createDebug('chevre-domain:service');
 function aggregateScreeningEvent(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         // 集計対象イベント検索
-        const event = yield repos.event.findById(params);
+        // イベント取得属性最適化(2023-01-23~)
+        // const event = await repos.event.findById<factory.eventType.ScreeningEvent | factory.eventType.Event>(params);
+        const event = yield repos.event.findMinimizedIndividualEventById(params);
         let aggregatingEvents = [event];
         const availableOffers = yield findOffers({ event })(repos);
         const offerRateLimitExists = availableOffers.some((o) => { var _a; return typeof ((_a = o.validRateLimit) === null || _a === void 0 ? void 0 : _a.scope) === 'string'; });

package/lib/chevre/service/aggregation/event/aggregateUseActionsOnEvent.js

@@ -20,7 +20,9 @@ function aggregateUseActionsOnEvent(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         const now = new Date();
         // 集計対象イベント検索
-        const event = yield repos.event.findById(params);
+        // イベント取得属性最適化(2023-01-23~)
+        // const event = await repos.event.findById<factory.eventType.ScreeningEvent>(params);
+        const event = yield repos.event.findMinimizedIndividualEventById(params);
         // 入場ゲート検索
         const entranceGates = yield findEntranceGates({ event })(repos);
         // 入場ゲートごとの集計

package/lib/chevre/service/aggregation/system.d.ts

@@ -1,8 +1,16 @@
 import { MongoRepository as ActionRepo } from '../../repo/action';
 import { MongoRepository as AggregationRepo } from '../../repo/aggregation';
 import { MongoRepository as AssetTransactionRepo } from '../../repo/assetTransaction';
+import { MongoRepository as EventRepo } from '../../repo/event';
 import { MongoRepository as TasKRepo } from '../../repo/task';
 import { MongoRepository as TransactionRepo } from '../../repo/transaction';
+declare function aggregateEvent(params: {
+    aggregationDays: number;
+    excludedProjectId?: string;
+}): (repos: {
+    agregation: AggregationRepo;
+    event: EventRepo;
+}) => Promise<void>;
 /**
  * 注文取引集計
  */
@@ -75,4 +83,4 @@ declare function aggregateTask(params: {
     agregation: AggregationRepo;
     task: TasKRepo;
 }) => Promise<void>;
-export { aggregateAuthorizeEventServiceOfferAction, aggregateAuthorizeOrderAction, aggregateAuthorizePaymentAction, aggregatePayTransaction, aggregatePlaceOrder, aggregateReserveTransaction, aggregateTask, aggregateUseAction };
+export { aggregateAuthorizeEventServiceOfferAction, aggregateAuthorizeOrderAction, aggregateAuthorizePaymentAction, aggregateEvent, aggregatePayTransaction, aggregatePlaceOrder, aggregateReserveTransaction, aggregateTask, aggregateUseAction };

package/lib/chevre/service/aggregation/system.js

@@ -9,12 +9,45 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.aggregateUseAction = exports.aggregateTask = exports.aggregateReserveTransaction = exports.aggregatePlaceOrder = exports.aggregatePayTransaction = exports.aggregateAuthorizePaymentAction = exports.aggregateAuthorizeOrderAction = exports.aggregateAuthorizeEventServiceOfferAction = void 0;
+exports.aggregateUseAction = exports.aggregateTask = exports.aggregateReserveTransaction = exports.aggregatePlaceOrder = exports.aggregatePayTransaction = exports.aggregateEvent = exports.aggregateAuthorizePaymentAction = exports.aggregateAuthorizeOrderAction = exports.aggregateAuthorizeEventServiceOfferAction = void 0;
 const createDebug = require("debug");
 const moment = require("moment-timezone");
 const factory = require("../../factory");
 const aggregation_1 = require("../../repo/aggregation");
 const debug = createDebug('chevre-domain:service:aggregation:system');
+function aggregateEvent(params) {
+    return (repos) => __awaiter(this, void 0, void 0, function* () {
+        var _a;
+        const aggregateDate = new Date();
+        const aggregateDuration = moment.duration(1, 'days')
+            .toISOString();
+        let i = -1;
+        while (i < params.aggregationDays) {
+            i += 1;
+            const startFrom = moment()
+                .utc()
+                // .tz('Asia/Tokyo')
+                .add(-i, 'days')
+                .startOf('day')
+                .toDate();
+            const startThrough = moment()
+                .utc()
+                // .tz('Asia/Tokyo')
+                .add(-i, 'days')
+                .endOf('day')
+                .toDate();
+            const aggregateResult = yield repos.event.aggregateEvent({
+                project: { id: { $ne: params.excludedProjectId } },
+                startFrom,
+                startThrough,
+                typeOf: factory.eventType.ScreeningEvent
+            });
+            debug('aggregateEvent:result', aggregateResult, (_a = aggregateResult.statuses[0]) === null || _a === void 0 ? void 0 : _a.aggregation.percentilesRemainingCapacityRate, startFrom);
+            yield repos.agregation.saveAggregation(Object.assign({ typeOf: aggregation_1.AggregationType.AggregateEvent, project: { id: '*', typeOf: factory.organizationType.Project }, aggregateDuration, aggregateStart: startFrom, aggregateDate }, aggregateResult));
+        }
+    });
+}
+exports.aggregateEvent = aggregateEvent;
 /**
  * 注文取引集計
  */

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

@@ -38,7 +38,11 @@ function validateMovieTicket(params, paymentServiceId) {
             throw new factory.errors.ArgumentNull('object.paymentMethod.typeOf');
         }
         // イベント情報取得
-        const screeningEvent = yield repos.event.findById({
+        // イベント取得属性最適化(2023-01-23~)
+        // const screeningEvent = await repos.event.findById<factory.eventType.ScreeningEvent>({
+        //     id: eventIds[0]
+        // });
+        const screeningEvent = yield repos.event.findMinimizedIndividualEventById({
             id: eventIds[0]
         });
         // 販売者からムビチケ決済情報取得

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

@@ -72,11 +72,16 @@ function addReservations(params) {
             throw new factory.errors.ArgumentNull('object.reservationFor.id');
         }
         const acceptedOffers = (Array.isArray(params.object.acceptedOffer)) ? params.object.acceptedOffer : [];
-        const event = yield repos.event.findById({ id: params.object.reservationFor.id }, {
-            // 予約データに不要な属性は取得しない
-            aggregateReservation: 0, aggregateOffer: 0, attendeeCount: 0,
-            checkInCount: 0, maximumAttendeeCapacity: 0, remainingAttendeeCapacity: 0
-        });
+        // イベント取得属性最適化(2023-01-23~)
+        const event = yield repos.event.findMinimizedIndividualEventById({ id: params.object.reservationFor.id });
+        // const event = await repos.event.findById(
+        //     { id: params.object.reservationFor.id },
+        //     {
+        //         // 予約データに不要な属性は取得しない
+        //         aggregateReservation: 0, aggregateOffer: 0, attendeeCount: 0,
+        //         checkInCount: 0, maximumAttendeeCapacity: 0, remainingAttendeeCapacity: 0
+        //     }
+        // );
         if (event.typeOf !== factory.eventType.ScreeningEvent && event.typeOf !== factory.eventType.Event) {
             throw new factory.errors.Argument('object.reservationFor.id', `invalid event type ${event.typeOf}`);
         }

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

@@ -124,7 +124,11 @@ function validateCreateRequest(params) {
         if (typeof ((_a = params.object.reservationFor) === null || _a === void 0 ? void 0 : _a.id) !== 'string' || params.object.reservationFor.id.length === 0) {
             throw new factory.errors.ArgumentNull('object.reservationFor.id');
         }
-        const event = yield repos.event.findById({ id: params.object.reservationFor.id });
+        // イベント取得属性最適化(2023-01-23~)
+        // const event = await repos.event.findById<factory.eventType.ScreeningEvent>({ id: params.object.reservationFor.id });
+        const event = yield repos.event.findMinimizedIndividualEventById({
+            id: params.object.reservationFor.id
+        });
         let offeredThrough = (_b = event.offers) === null || _b === void 0 ? void 0 : _b.offeredThrough;
         if (offeredThrough === undefined) {
             offeredThrough = { typeOf: 'WebAPI', identifier: factory.service.webAPI.Identifier.Chevre };

package/lib/chevre/service/offer/event/factory.d.ts

@@ -1,5 +1,6 @@
 import * as COA from '@motionpicture/coa-service';
 import * as factory from '../../../factory';
+import { IMinimizedIndividualEvent } from '../../../factory/event';
 export declare type IReservationFor = factory.reservation.IReservationFor<factory.reservationType.EventReservation>;
 export declare type IUnitPriceSpecification = factory.priceSpecification.IPriceSpecification<factory.priceSpecificationType.UnitPriceSpecification>;
 export declare type IObjectWithoutDetail = factory.action.authorize.offer.seatReservation.IObjectWithoutDetail4chevre;
@@ -14,7 +15,7 @@ export declare function createReserveTransactionStartParams(params: {
 }): factory.assetTransaction.reserve.IStartParamsWithoutDetail;
 export declare function createAuthorizeSeatReservationActionAttributes(params: {
     acceptedOffers: factory.action.authorize.offer.seatReservation.IAcceptedOffer4chevre[];
-    event: factory.event.IEvent<factory.eventType.ScreeningEvent>;
+    event: IMinimizedIndividualEvent<factory.eventType.ScreeningEvent>;
     pendingTransaction?: factory.action.authorize.offer.seatReservation.IPendingTransaction | undefined;
     transaction: factory.transaction.ITransaction<factory.transactionType.PlaceOrder>;
     broker?: factory.reservation.IBroker<factory.reservationType.EventReservation>;
@@ -25,7 +26,7 @@ export declare function acceptedOffers2amount(params: {
 declare type IResultAcceptedOffer = factory.action.authorize.offer.seatReservation.IResultAcceptedOffer;
 export declare function responseBody2acceptedOffers4result(params: {
     responseBody: factory.assetTransaction.reserve.ITransaction;
-    event: factory.event.IEvent<factory.eventType.ScreeningEvent>;
+    event: IMinimizedIndividualEvent<factory.eventType.ScreeningEvent>;
     project: {
         id: string;
         typeOf: factory.organizationType.Project;

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

@@ -20,7 +20,8 @@ function searchTransportationEventTicketOffers(params) {
     // tslint:disable-next-line:max-func-body-length
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         var _a, _b, _c;
-        const screeningEvent = yield repos.event.findById({ id: params.eventId });
+        // const screeningEvent = await repos.event.findById<factory.eventType.Event>({ id: params.eventId });
+        const screeningEvent = yield repos.event.findMinimizedIndividualEventById({ id: params.eventId });
         const soundFormatTypes = [];
         const videoFormatTypes = [];
         let availableOffers = [];
@@ -126,7 +127,9 @@ function searchScreeningEventTicketOffers(params) {
     // tslint:disable-next-line:max-func-body-length
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         var _a, _b, _c;
-        const screeningEvent = yield repos.event.findById({ id: params.eventId });
+        // イベント取得属性最適化(2023-01-23~)
+        // const screeningEvent = await repos.event.findById<factory.eventType.ScreeningEvent>({ id: params.eventId });
+        const screeningEvent = yield repos.event.findMinimizedIndividualEventById({ id: params.eventId });
         const superEvent = yield repos.event.findById({ id: screeningEvent.superEvent.id });
         const soundFormatTypes = (Array.isArray(superEvent.soundFormat)) ? superEvent.soundFormat.map((f) => f.typeOf) : [];
         const videoFormatTypes = (Array.isArray(superEvent.videoFormat)) ? superEvent.videoFormat.map((f) => f.typeOf) : [];
@@ -349,7 +352,11 @@ function searchEventTicketOffers(params) {
         var _a;
         const now = moment();
         let event;
-        event = yield repos.event.findById({ id: params.event.id });
+        // イベント取得属性最適化(2023-01-23~)
+        // event = await repos.event.findById<factory.eventType.ScreeningEvent | factory.eventType.Event>({ id: params.event.id });
+        event = yield repos.event.findMinimizedIndividualEventById({
+            id: params.event.id
+        });
         let offers;
         const eventOffers = event.offers;
         if (eventOffers === undefined) {

package/lib/chevre/service/offer/eventServiceByCOA/factory.d.ts

@@ -1,4 +1,5 @@
 import * as factory from '../../../factory';
+import { IMinimizedIndividualEvent } from '../../../factory/event';
 export import WebAPIIdentifier = factory.service.webAPI.Identifier;
 export declare function createAuthorizeSeatReservationActionAttributes(params: {
     acceptedOffers: factory.action.authorize.offer.seatReservation.IAcceptedOffer<factory.service.webAPI.Identifier.COA>[];
@@ -19,7 +20,7 @@ declare type IResultAcceptedOffer = factory.action.authorize.offer.seatReservati
 export declare function responseBody2acceptedOffers4result(params: {
     responseBody: factory.action.authorize.offer.seatReservation.IResponseBody<factory.service.webAPI.Identifier.COA>;
     object: factory.action.authorize.offer.seatReservation.IObject<factory.service.webAPI.Identifier.COA>;
-    event: factory.event.IEvent<factory.eventType.ScreeningEvent>;
+    event: IMinimizedIndividualEvent<factory.eventType.ScreeningEvent>;
     seller: factory.transaction.placeOrder.ISeller;
     bookingTime: Date;
     totalPrice: number;

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

@@ -27,7 +27,11 @@ function authorize(params) {
         if (transaction.agent.id !== params.agent.id) {
             throw new factory.errors.Forbidden('Transaction not yours');
         }
-        const screeningEvent = yield repos.event.findById({ id: params.object.event.id });
+        // イベント取得属性最適化(2023-01-23~)
+        // const screeningEvent = await repos.event.findById<factory.eventType.ScreeningEvent>({ id: params.object.event.id });
+        const screeningEvent = yield repos.event.findMinimizedIndividualEventById({
+            id: params.object.event.id
+        });
         // 必ず定義されている前提
         // const coaInfo = <factory.event.screeningEvent.ICOAInfo>screeningEvent.coaInfo;
         // const acceptedOffersWithoutDetails = await createAcceptedOffersWithoutDetails({
@@ -158,7 +162,11 @@ function changeOffers(params) {
             throw new factory.errors.Argument('Transaction', 'Action not found in the transaction');
         }
         validate4changeOffer({ action: authorizeAction, object: params.object });
-        const screeningEvent = yield repos.event.findById({ id: params.object.event.id });
+        // イベント取得属性最適化(2023-01-23~)
+        // const screeningEvent = await repos.event.findById<factory.eventType.ScreeningEvent>({ id: params.object.event.id });
+        const screeningEvent = yield repos.event.findMinimizedIndividualEventById({
+            id: params.object.event.id
+        });
         // COA仮予約後にリクエストが来る前提
         const acceptedOffer = params.object.acceptedOffer;
         // 座席区分加算料金などを補完

package/lib/chevre/service/offer.js

@@ -69,7 +69,11 @@ function searchEventSeatOffers(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         var _a, _b, _c, _d, _e, _f, _g, _h, _j;
         let offers = [];
-        const event = yield repos.event.findById({
+        // イベント取得属性最適化(2023-01-23~)
+        // const event = await repos.event.findById<factory.eventType.ScreeningEvent | factory.eventType.Event>({
+        //     id: params.event.id
+        // });
+        const event = yield repos.event.findMinimizedIndividualEventById({
             id: params.event.id
         });
         // 座席指定利用可能かどうか
@@ -139,7 +143,11 @@ function searchEventSeatOffersWithPaging(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
         let offers = [];
-        const event = yield repos.event.findById({
+        // イベント取得属性最適化(2023-01-23~)
+        // const event = await repos.event.findById<factory.eventType.ScreeningEvent | factory.eventType.Event>({
+        //     id: params.event.id
+        // });
+        const event = yield repos.event.findMinimizedIndividualEventById({
             id: params.event.id
         });
         // 座席指定利用可能かどうか

package/lib/chevre/service/payment/movieTicket.d.ts

@@ -1,6 +1,6 @@
 import { MongoRepository as AccountingReportRepo } from '../../repo/accountingReport';
 import { MongoRepository as ActionRepo } from '../../repo/action';
-import { MongoRepository as EventRepo } from '../../repo/event';
+import { IMinimizedIndividualEvent, MongoRepository as EventRepo } from '../../repo/event';
 import { MongoRepository as ProductRepo } from '../../repo/product';
 import { MongoRepository as ProjectRepo } from '../../repo/project';
 import { MongoRepository as SellerRepo } from '../../repo/seller';
@@ -50,7 +50,7 @@ declare function checkMovieTicket(params: factory.action.check.paymentMethod.mov
 declare function checkByIdentifier(params: {
     movieTickets: IMovieTicket[];
     seller: factory.seller.ISeller;
-    screeningEvent: factory.event.IEvent<factory.eventType.ScreeningEvent>;
+    screeningEvent: IMinimizedIndividualEvent<factory.eventType.ScreeningEvent>;
     paymentServiceId: string;
 }): (repos: {
     product: ProductRepo;

package/lib/chevre/service/payment/movieTicket.js

@@ -53,7 +53,11 @@ function checkMovieTicket(params) {
             }
             // イベント情報取得
             let screeningEvent;
-            screeningEvent = yield repos.event.findById({
+            // イベント取得属性最適化(2023-01-23~)
+            // screeningEvent = await repos.event.findById<factory.eventType.ScreeningEvent>({
+            //     id: eventIds[0]
+            // });
+            screeningEvent = yield repos.event.findMinimizedIndividualEventById({
                 id: eventIds[0]
             });
             // ショップ情報取得
@@ -432,7 +436,9 @@ function payActionParams2seatInfoSyncIn(params) {
         if (eventIds.length !== 1) {
             throw new factory.errors.Argument('movieTickets', 'Number of events must be 1');
         }
-        const event = yield repos.event.findById({ id: eventIds[0] });
+        // イベント取得属性最適化(2023-01-23~)
+        // const event = await repos.event.findById<factory.eventType.ScreeningEvent>({ id: eventIds[0] });
+        const event = yield repos.event.findMinimizedIndividualEventById({ id: eventIds[0] });
         const seller = yield repos.seller.findById({ id: String((_d = params.recipient) === null || _d === void 0 ? void 0 : _d.id) });
         // 全購入管理番号のMovieTicketをマージ
         const movieTickets = params.object.reduce((a, b) => [...a, ...(Array.isArray(b.movieTickets)) ? b.movieTickets : []], []);

package/package.json

@@ -120,5 +120,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build && npm test && npm run doc"
   },
-  "version": "20.2.0-alpha.26"
+  "version": "20.2.0-alpha.28"
 }

package/example/src/chevre/migratePaymentServicePaymentUrlExpiresInSeconds.ts

@@ -1,77 +0,0 @@
-// tslint:disable:no-console
-// import * as moment from 'moment';
-import * as mongoose from 'mongoose';
-
-import { chevre } from '../../../lib/index';
-
-// const project = { id: String(process.env.PROJECT_ID) };
-const EXCLUDED_PROJECT_ID = process.env.EXCLUDED_PROJECT_ID;
-
-// tslint:disable-next-line:max-func-body-length
-async function main() {
-    await mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: false });
-
-    const productRepo = new chevre.repository.Product(mongoose.connection);
-
-    const cursor = productRepo.getCursor(
-        {
-            // 'project.id': { $eq: project.id },
-            'project.id': { $ne: EXCLUDED_PROJECT_ID },
-            typeOf: { $eq: chevre.factory.service.paymentService.PaymentServiceType.CreditCard }
-        },
-        {
-            // _id: 1,
-        }
-    );
-    console.log('products found');
-
-    let i = 0;
-    let updateCount = 0;
-    // tslint:disable-next-line:max-func-body-length
-    await cursor.eachAsync(async (doc) => {
-        i += 1;
-        const paymentService: chevre.factory.service.paymentService.IService = doc.toObject();
-
-        const hasPaymentUrlExpiresInseconds = paymentService.provider?.some((provider) => {
-            return typeof (<any>provider).credentials?.paymentUrlExpiresInSeconds === 'number';
-        });
-
-        if (!hasPaymentUrlExpiresInseconds) {
-            console.log(
-                'no expiresInSeconds', paymentService.project.id, paymentService.id, paymentService.productID, i);
-
-            return;
-        }
-
-        const alreadyMigrated = paymentService.provider?.filter((provider) => {
-            return typeof (<any>provider).credentials?.paymentUrlExpiresInSeconds === 'number';
-        })
-            .every((provider) => {
-                return typeof provider.credentials?.paymentUrl?.expiresInSeconds === 'number';
-            });
-
-        if (alreadyMigrated) {
-            console.log(
-                'already exist...', paymentService.project.id, paymentService.id, paymentService.productID, i);
-        } else {
-            console.log(
-                'updating product...', paymentService.project.id, paymentService.id, paymentService.productID, i);
-            // await eventRepo.updatePartiallyById({
-            //     id: event.id,
-            //     attributes: <any>{
-            //         typeOf: event.typeOf,
-            //         'offers.itemOffered.availableChannel': newAvailableChannel
-            //     }
-            // });
-            updateCount += 1;
-            console.log(
-                'updated...', paymentService.project.id, paymentService.id, paymentService.productID, i);
-        }
-    });
-    console.log(i, 'products checked');
-    console.log(updateCount, 'products updated');
-}
-
-main()
-    .then()
-    .catch(console.error);