@chevre/domain 20.2.0-alpha.4 → 20.2.0-alpha.40

package/lib/chevre/repo/trip.js

@@ -32,18 +32,46 @@ class MongoRepository {
     }
     // tslint:disable-next-line:cyclomatic-complexity max-func-body-length
     static CREATE_MONGO_CONDITIONS(conditions) {
-        var _a, _b, _c;
+        var _a, _b, _c, _d, _e, _f;
         const andConditions = [{ typeOf: { $eq: conditions.typeOf } }];
         const projectIdEq = (_b = (_a = conditions.project) === null || _a === void 0 ? void 0 : _a.id) === null || _b === void 0 ? void 0 : _b.$eq;
         if (typeof projectIdEq === 'string') {
-            andConditions.push({
-                'project.id': { $eq: projectIdEq }
-            });
+            andConditions.push({ 'project.id': { $eq: projectIdEq } });
         }
         const idIn = (_c = conditions.id) === null || _c === void 0 ? void 0 : _c.$in;
         if (Array.isArray(idIn)) {
+            andConditions.push({ _id: { $in: idIn } });
+        }
+        const identifierEq = (_d = conditions.identifier) === null || _d === void 0 ? void 0 : _d.$eq;
+        if (typeof identifierEq === 'string') {
+            andConditions.push({ identifier: { $eq: identifierEq } });
+        }
+        const nameRegex = (_e = conditions.name) === null || _e === void 0 ? void 0 : _e.$regex;
+        if (typeof nameRegex === 'string' && nameRegex.length > 0) {
+            andConditions.push({
+                $or: [
+                    {
+                        'name.ja': {
+                            $exists: true,
+                            $regex: new RegExp(nameRegex)
+                        }
+                    },
+                    {
+                        'name.en': {
+                            $exists: true,
+                            $regex: new RegExp(nameRegex)
+                        }
+                    }
+                ]
+            });
+        }
+        const additionalPropertyElemMatch = (_f = conditions.additionalProperty) === null || _f === void 0 ? void 0 : _f.$elemMatch;
+        if (additionalPropertyElemMatch !== undefined && additionalPropertyElemMatch !== null) {
             andConditions.push({
-                _id: { $in: idIn }
+                additionalProperty: {
+                    $exists: true,
+                    $elemMatch: additionalPropertyElemMatch
+                }
             });
         }
         return andConditions;
@@ -119,28 +147,6 @@ class MongoRepository {
                         if (p.attributes.typeOf === factory.tripType.BusTrip) {
                             // 上書き禁止属性を除外
                             const _a = p.attributes, { identifier, project, typeOf } = _a, updateFields = __rest(_a, ["identifier", "project", "typeOf"]);
-                            bulkWriteOps.push({
-                                updateOne: {
-                                    filter: {
-                                        _id: p.id,
-                                        typeOf: p.attributes.typeOf
-                                    },
-                                    // upsertの場合、createがありうるので属性を除外しない
-                                    update: Object.assign({ $setOnInsert: {
-                                            typeOf: p.attributes.typeOf,
-                                            project: p.attributes.project,
-                                            identifier: p.attributes.identifier
-                                            // ...(typeof p.attributes.remainingAttendeeCapacity === 'number')
-                                            //     ? { remainingAttendeeCapacity: p.attributes.remainingAttendeeCapacity }
-                                            //     : undefined
-                                        }, $set: updateFields }, (p.$unset !== undefined) ? { $unset: p.$unset } : undefined),
-                                    upsert
-                                }
-                            });
-                        }
-                        else if (p.attributes.typeOf === factory.tripType.BusTripSeries) {
-                            // 上書き禁止属性を除外
-                            const _b = p.attributes, { identifier, project, typeOf } = _b, updateFields = __rest(_b, ["identifier", "project", "typeOf"]);
                             bulkWriteOps.push({
                                 updateOne: {
                                     filter: {

package/lib/chevre/repository.d.ts

@@ -7,6 +7,7 @@ import { MongoRepository as AccountTitleRepo } from './repo/accountTitle';
 import { MongoRepository as AccountTransactionRepo } from './repo/accountTransaction';
 import { MongoRepository as ActionRepo } from './repo/action';
 import { MongoRepository as AdditionalPropertyRepo } from './repo/additionalProperty';
+import { MongoRepository as AggregationRepo } from './repo/aggregation';
 import { MongoRepository as AssetTransactionRepo } from './repo/assetTransaction';
 import { MongoRepository as CategoryCodeRepo } from './repo/categoryCode';
 import { MongoRepository as CodeRepo } from './repo/code';
@@ -69,6 +70,8 @@ export declare class Action extends ActionRepo {
  */
 export declare class AdditionalProperty extends AdditionalPropertyRepo {
 }
+export declare class Aggregation extends AggregationRepo {
+}
 export declare namespace action {
     class RegisterServiceInProgress extends RegisterServiceActionInProgress {
     }

package/lib/chevre/repository.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.rateLimit = exports.itemAvailability = exports.Trip = exports.TransactionNumber = exports.Transaction = exports.Telemetry = exports.Task = exports.ServiceOutputIdentifier = exports.ServiceOutput = exports.Seller = exports.Role = exports.Reservation = exports.Project = exports.Product = exports.PriceSpecification = exports.Place = exports.Permit = exports.Person = exports.paymentMethod = exports.OwnershipInfo = exports.OrderNumber = exports.Order = exports.OfferCatalog = exports.Offer = exports.MerchantReturnPolicy = exports.Member = exports.Event = exports.EmailMessage = exports.Customer = exports.CreativeWork = exports.ConfirmationNumber = exports.Code = exports.CategoryCode = exports.AssetTransaction = exports.action = exports.AdditionalProperty = exports.Action = exports.AccountTransaction = exports.AccountTitle = exports.AccountingReport = exports.Account = void 0;
+exports.rateLimit = exports.itemAvailability = exports.Trip = exports.TransactionNumber = exports.Transaction = exports.Telemetry = exports.Task = exports.ServiceOutputIdentifier = exports.ServiceOutput = exports.Seller = exports.Role = exports.Reservation = exports.Project = exports.Product = exports.PriceSpecification = exports.Place = exports.Permit = exports.Person = exports.paymentMethod = exports.OwnershipInfo = exports.OrderNumber = exports.Order = exports.OfferCatalog = exports.Offer = exports.MerchantReturnPolicy = exports.Member = exports.Event = exports.EmailMessage = exports.Customer = exports.CreativeWork = exports.ConfirmationNumber = exports.Code = exports.CategoryCode = exports.AssetTransaction = exports.action = exports.Aggregation = exports.AdditionalProperty = exports.Action = exports.AccountTransaction = exports.AccountTitle = exports.AccountingReport = exports.Account = void 0;
 // tslint:disable:max-classes-per-file completed-docs
 /**
  * リポジトリ
@@ -11,6 +11,7 @@ const accountTitle_1 = require("./repo/accountTitle");
 const accountTransaction_1 = require("./repo/accountTransaction");
 const action_1 = require("./repo/action");
 const additionalProperty_1 = require("./repo/additionalProperty");
+const aggregation_1 = require("./repo/aggregation");
 const assetTransaction_1 = require("./repo/assetTransaction");
 const categoryCode_1 = require("./repo/categoryCode");
 const code_1 = require("./repo/code");
@@ -80,6 +81,9 @@ exports.Action = Action;
 class AdditionalProperty extends additionalProperty_1.MongoRepository {
 }
 exports.AdditionalProperty = AdditionalProperty;
+class Aggregation extends aggregation_1.MongoRepository {
+}
+exports.Aggregation = Aggregation;
 var action;
 (function (action) {
     class RegisterServiceInProgress extends registerServiceInProgress_1.RedisRepository {

package/lib/chevre/service/aggregation/event/aggregateScreeningEvent.d.ts

@@ -26,5 +26,5 @@ export declare function aggregateScreeningEvent(params: {
     id: string;
 }): IAggregateScreeningEventOperation<void>;
 export declare function aggregateByEvent(params: {
-    event: factory.event.screeningEvent.IEvent;
+    event: factory.event.screeningEvent.IEvent | factory.event.event.IEvent;
 }): IAggregateScreeningEventOperation<void>;

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

@@ -15,6 +15,7 @@ exports.aggregateByEvent = exports.aggregateScreeningEvent = void 0;
  */
 const createDebug = require("debug");
 const moment = require("moment-timezone");
+const event_1 = require("../../../repo/event");
 const factory = require("../../../factory");
 const debug = createDebug('chevre-domain:service');
 /**
@@ -23,7 +24,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'; });
@@ -36,6 +39,7 @@ function aggregateScreeningEvent(params) {
                 .add(1, 'hour')
                 .add(-1, 'second')
                 .toDate();
+            // 取得属性最適化(2023-01-25~)
             aggregatingEvents = yield repos.event.search({
                 limit: 100,
                 page: 1,
@@ -45,7 +49,7 @@ function aggregateScreeningEvent(params) {
                 startFrom: startFrom,
                 startThrough: startThrough,
                 location: { branchCode: { $eq: event.location.branchCode } }
-            });
+            }, event_1.PROJECTION_MINIMIZED_EVENT);
             // ID指定されたイベントについてはEventScheduledでなくても集計したいので、集計対象を調整
             aggregatingEvents = aggregatingEvents.filter((e) => e.id !== event.id);
             aggregatingEvents = [event, ...aggregatingEvents];
@@ -59,22 +63,36 @@ function aggregateScreeningEvent(params) {
 exports.aggregateScreeningEvent = aggregateScreeningEvent;
 function aggregateByEvent(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
+        var _a;
         const now = new Date();
         // 集計対象イベント検索
         let event = params.event;
-        // 施設取得
-        const movieTheater = yield findLocation(params)(repos);
-        // 万が一施設が存在しなければ処理終了
-        if (movieTheater === undefined) {
-            return;
+        // 施設取得は冗長なので、ルーム検索に変更(2023-01-30~)
+        let movieTheaterId;
+        if (params.event.typeOf === factory.eventType.ScreeningEvent) {
+            movieTheaterId = params.event.superEvent.location.id;
         }
-        const screeningRoom = movieTheater.containsPlace.find((p) => p.branchCode === event.location.branchCode);
-        if (screeningRoom === undefined) {
-            // 基本的にありえないはずだが、万が一スクリーンが見つからなければcapacityは0のまま
-            // tslint:disable-next-line:no-console
-            console.error(new Error(`Screening room not found. branchCode: ${event.location.branchCode}`));
-            return;
+        else {
+            movieTheaterId = String((_a = params.event.offers) === null || _a === void 0 ? void 0 : _a.itemOffered.availableChannel.serviceLocation.containedInPlace.id);
         }
+        const screeningRoom = yield repos.place.findScreeningRoomsByBranchCode({
+            branchCode: { $eq: event.location.branchCode },
+            containedInPlace: { id: { $eq: movieTheaterId } }
+        });
+        // 施設取得
+        // const movieTheater = await findLocation(params)(repos);
+        // // 万が一施設が存在しなければ処理終了
+        // if (movieTheater === undefined) {
+        //     return;
+        // }
+        // const screeningRoom = <factory.place.screeningRoom.IPlace | undefined>
+        //     movieTheater.containsPlace.find((p) => p.branchCode === event.location.branchCode);
+        // if (screeningRoom === undefined) {
+        //     // 基本的にありえないはずだが、万が一スクリーンが見つからなければcapacityは0のまま
+        //     // tslint:disable-next-line:no-console
+        //     console.error(new Error(`Screening room not found. branchCode: ${event.location.branchCode}`));
+        //     return;
+        // }
         // 予約集計
         const { maximumAttendeeCapacity, remainingAttendeeCapacity, aggregateReservation } = yield aggregateReservationByEvent({
             aggregateDate: now,
@@ -89,13 +107,6 @@ function aggregateByEvent(params) {
             screeningRoom: screeningRoom
         })(repos);
         debug('offers aggregated', aggregateOffer);
-        // 入場ゲートごとの集計
-        // const aggregateEntranceGate = await aggregateEntranceGateByEvent({
-        //     aggregateDate: now,
-        //     event,
-        //     entranceGates: movieTheater.hasEntranceGate
-        // })(repos);
-        // debug('entrances aggregated', aggregateEntranceGate);
         // 値がundefinedの場合に更新しないように注意
         const update = {
             $set: Object.assign(Object.assign(Object.assign(Object.assign({ updatedAt: new Date(), // $setオブジェクトが空だとMongoエラーになるので
@@ -118,24 +129,33 @@ exports.aggregateByEvent = aggregateByEvent;
  * イベントロケーション取得
  * NotFoundエラーをハンドリングする
  */
-function findLocation(params) {
-    return (repos) => __awaiter(this, void 0, void 0, function* () {
-        let movieTheater;
-        try {
-            movieTheater = yield repos.place.findById({ id: params.event.superEvent.location.id });
-        }
-        catch (error) {
-            let throwsError = true;
-            if (error instanceof factory.errors.NotFound) {
-                throwsError = false;
-            }
-            if (throwsError) {
-                throw error;
-            }
-        }
-        return movieTheater;
-    });
-}
+// function findLocation(params: {
+//     event: factory.event.screeningEvent.IEvent | factory.event.event.IEvent;
+// }) {
+//     return async (repos: {
+//         place: PlaceRepo;
+//     }): Promise<factory.place.movieTheater.IPlace | undefined> => {
+//         let movieTheater: factory.place.movieTheater.IPlace | undefined;
+//         try {
+//             if (params.event.typeOf === factory.eventType.ScreeningEvent) {
+//                 movieTheater = await repos.place.findById({ id: params.event.superEvent.location.id });
+//             } else {
+//                 const movieTheaterId: string =
+//                     String(params.event.offers?.itemOffered.availableChannel.serviceLocation.containedInPlace.id);
+//                 movieTheater = await repos.place.findById({ id: movieTheaterId });
+//             }
+//         } catch (error) {
+//             let throwsError = true;
+//             if (error instanceof factory.errors.NotFound) {
+//                 throwsError = false;
+//             }
+//             if (throwsError) {
+//                 throw error;
+//             }
+//         }
+//         return movieTheater;
+//     };
+// }
 /**
  * 集計後アクション
  */
@@ -189,20 +209,13 @@ function findOffers(params) {
                 const eventService = yield repos.product.findById({ id: eventOffers.itemOffered.id });
                 if (typeof ((_b = eventService.hasOfferCatalog) === null || _b === void 0 ? void 0 : _b.id) === 'string') {
                     availableOffers = yield repos.offer.findOffersByOfferCatalogId({
-                        offerCatalog: { id: eventService.hasOfferCatalog.id }
+                        offerCatalog: { id: eventService.hasOfferCatalog.id },
+                        sort: false // ソート不要(2023-01-27~)
                     });
                 }
             }
             else {
-                // hasOfferCatalog参照廃止(2022-09-02~)
                 throw new factory.errors.NotFound('event.offers.itemOffered.id');
-                // if (typeof params.event.hasOfferCatalog?.id === 'string') {
-                //     availableOffers = await repos.offer.findOffersByOfferCatalogId({
-                //         offerCatalog: {
-                //             id: params.event.hasOfferCatalog.id
-                //         }
-                //     });
-                // }
             }
         }
         catch (error) {
@@ -223,22 +236,29 @@ function aggregateReservationByOffer(params) {
         let reservationCount4offer;
         let attendeeCount4offer;
         let checkInCount4offer;
+        let reservationType = factory.reservationType.EventReservation;
+        if (params.event.typeOf === factory.eventType.Event) {
+            reservationType = factory.reservationType.BusReservation;
+        }
         reservationCount4offer = yield repos.reservation.count({
-            typeOf: factory.reservationType.EventReservation,
-            reservationFor: { ids: [params.event.id] },
+            typeOf: reservationType,
+            // reservationFor: { ids: [params.event.id] },
+            reservationFor: { id: { $eq: params.event.id } },
             reservationStatuses: [factory.reservationStatusType.ReservationConfirmed],
             reservedTicket: { ticketType: { ids: [params.offer.id] } }
         });
         attendeeCount4offer = yield repos.reservation.count({
-            typeOf: factory.reservationType.EventReservation,
-            reservationFor: { ids: [params.event.id] },
+            typeOf: reservationType,
+            // reservationFor: { ids: [params.event.id] },
+            reservationFor: { id: { $eq: params.event.id } },
             reservationStatuses: [factory.reservationStatusType.ReservationConfirmed],
             reservedTicket: { ticketType: { ids: [params.offer.id] } },
             attended: true
         });
         checkInCount4offer = yield repos.reservation.count({
-            typeOf: factory.reservationType.EventReservation,
-            reservationFor: { ids: [params.event.id] },
+            typeOf: reservationType,
+            // reservationFor: { ids: [params.event.id] },
+            reservationFor: { id: { $eq: params.event.id } },
             reservationStatuses: [factory.reservationStatusType.ReservationConfirmed],
             reservedTicket: { ticketType: { ids: [params.offer.id] } },
             checkedIn: true
@@ -390,9 +410,14 @@ function aggregateReservationByEvent(params) {
         let attendeeCount;
         let checkInCount;
         let reservationCount;
+        let reservationType = factory.reservationType.EventReservation;
+        if (params.event.typeOf === factory.eventType.Event) {
+            reservationType = factory.reservationType.BusReservation;
+        }
         reservationCount = yield repos.reservation.count({
-            typeOf: factory.reservationType.EventReservation,
-            reservationFor: { ids: [params.event.id] },
+            typeOf: reservationType,
+            // reservationFor: { ids: [params.event.id] },
+            reservationFor: { id: { $eq: params.event.id } },
             reservationStatuses: [factory.reservationStatusType.ReservationConfirmed]
         });
         // maximumAttendeeCapacityを決定
@@ -421,14 +446,16 @@ function aggregateReservationByEvent(params) {
             }
         }
         attendeeCount = yield repos.reservation.count({
-            typeOf: factory.reservationType.EventReservation,
-            reservationFor: { ids: [params.event.id] },
+            typeOf: reservationType,
+            // reservationFor: { ids: [params.event.id] },
+            reservationFor: { id: { $eq: params.event.id } },
             // reservationStatuses: [factory.reservationStatusType.ReservationConfirmed],
             attended: true
         });
         checkInCount = yield repos.reservation.count({
-            typeOf: factory.reservationType.EventReservation,
-            reservationFor: { ids: [params.event.id] },
+            typeOf: reservationType,
+            // reservationFor: { ids: [params.event.id] },
+            reservationFor: { id: { $eq: params.event.id } },
             // reservationStatuses: [factory.reservationStatusType.ReservationConfirmed],
             checkedIn: true
         });

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);
         // 入場ゲートごとの集計
@@ -90,18 +92,13 @@ function findOffers(params) {
                 const eventService = yield repos.product.findById({ id: eventOffers.itemOffered.id });
                 if (typeof ((_b = eventService.hasOfferCatalog) === null || _b === void 0 ? void 0 : _b.id) === 'string') {
                     availableOffers = yield repos.offer.findOffersByOfferCatalogId({
-                        offerCatalog: { id: eventService.hasOfferCatalog.id }
+                        offerCatalog: { id: eventService.hasOfferCatalog.id },
+                        sort: false // ソート不要(2023-01-27~)
                     });
                 }
             }
             else {
-                // hasOfferCatalog参照廃止(2022-09-02~)
                 throw new factory.errors.NotFound('event.offers.itemOffered.id');
-                // if (typeof params.event.hasOfferCatalog?.id === 'string') {
-                //     availableOffers = await repos.offer.findOffersByOfferCatalogId({
-                //         offerCatalog: { id: params.event.hasOfferCatalog.id }
-                //     });
-                // }
             }
         }
         catch (error) {

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

@@ -0,0 +1,93 @@
+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>;
+/**
+ * 注文取引集計
+ */
+declare function aggregatePlaceOrder(params: {
+    aggregationDays: number;
+    excludedProjectId?: string;
+    clientIds?: string[];
+}): (repos: {
+    agregation: AggregationRepo;
+    transaction: TransactionRepo;
+}) => Promise<void>;
+/**
+ * 興行オファー承認アクション集計
+ */
+declare function aggregateAuthorizeEventServiceOfferAction(params: {
+    aggregationDays: number;
+    excludedProjectId?: string;
+}): (repos: {
+    agregation: AggregationRepo;
+    action: ActionRepo;
+}) => Promise<void>;
+/**
+ * 決済承認アクション集計
+ */
+declare function aggregateAuthorizePaymentAction(params: {
+    aggregationDays: number;
+    excludedProjectId?: string;
+}): (repos: {
+    agregation: AggregationRepo;
+    action: ActionRepo;
+}) => Promise<void>;
+declare function aggregateAuthorizeOrderAction(params: {
+    aggregationDays: number;
+    excludedProjectId?: string;
+}): (repos: {
+    agregation: AggregationRepo;
+    action: ActionRepo;
+}) => Promise<void>;
+/**
+ * 使用アクション集計
+ */
+declare function aggregateUseAction(params: {
+    aggregationDays: number;
+    excludedProjectId?: string;
+}): (repos: {
+    agregation: AggregationRepo;
+    action: ActionRepo;
+}) => Promise<void>;
+declare function aggregateCheckMovieTicketAction(params: {
+    aggregationDays: number;
+    excludedProjectId?: string;
+}): (repos: {
+    agregation: AggregationRepo;
+    action: ActionRepo;
+}) => Promise<void>;
+declare function aggregatePayTransaction(params: {
+    aggregationDays: number;
+    excludedProjectId?: string;
+}): (repos: {
+    agregation: AggregationRepo;
+    assetTransaction: AssetTransactionRepo;
+}) => Promise<void>;
+/**
+ * 予約集計
+ */
+declare function aggregateReserveTransaction(params: {
+    aggregationDays: number;
+    excludedProjectId?: string;
+}): (repos: {
+    agregation: AggregationRepo;
+    assetTransaction: AssetTransactionRepo;
+}) => Promise<void>;
+declare function aggregateTask(params: {
+    aggregationDays: number;
+    excludedProjectId?: string;
+}): (repos: {
+    agregation: AggregationRepo;
+    task: TasKRepo;
+}) => Promise<void>;
+export { aggregateAuthorizeEventServiceOfferAction, aggregateAuthorizeOrderAction, aggregateAuthorizePaymentAction, aggregateCheckMovieTicketAction, aggregateEvent, aggregatePayTransaction, aggregatePlaceOrder, aggregateReserveTransaction, aggregateTask, aggregateUseAction };