@chevre/domain 21.2.0-alpha.105 → 21.2.0-alpha.107

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

@@ -22,6 +22,19 @@ async function main() {
 
     let result: { aggregationCount: number; aggregateDuration: string };
 
+    result = await chevre.service.aggregation.system.aggregateCancelReservationAction({
+        aggregateDurationUnit: 'hours',
+        // aggregateDurationUnit: 'days',
+        aggregationCount: AGGREGATE_DAYS * ONE_DAY_IN_HOURS,
+        // aggregationCount: AGGREGATE_DAYS,
+        excludedProjectId: EXCLUDED_PROJECT_ID
+    })({
+        agregation: aggregationRepo,
+        action: actionRepo
+    });
+    console.log('aggregateCancelReservationAction processed.', result);
+    return;
+
     result = await chevre.service.aggregation.system.aggregateReserveAction({
         aggregateDurationUnit: 'hours',
         // aggregateDurationUnit: 'days',

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

@@ -180,6 +180,15 @@ export declare class MongoRepository {
         startThrough: Date;
         typeOf: factory.actionType;
     }): Promise<IAggregateAction>;
+    aggregateCancelReservationAction(params: {
+        project?: {
+            id?: {
+                $ne?: string;
+            };
+        };
+        startFrom: Date;
+        startThrough: Date;
+    }): Promise<IAggregateAction>;
     /**
      * アクションタイプによる汎用的な集計
      */

package/lib/chevre/repo/action.js

@@ -801,6 +801,32 @@ class MongoRepository {
             return { statuses };
         });
     }
+    aggregateCancelReservationAction(params) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const statuses = yield Promise.all([
+                factory.actionStatusType.CompletedActionStatus,
+                factory.actionStatusType.CanceledActionStatus,
+                factory.actionStatusType.FailedActionStatus
+            ].map((actionStatus) => __awaiter(this, void 0, void 0, function* () {
+                var _a, _b;
+                const matchConditions = Object.assign({ startDate: {
+                        $gte: params.startFrom,
+                        $lte: params.startThrough
+                    }, typeOf: { $eq: factory.actionType.CancelAction }, actionStatus: { $eq: actionStatus }, 'object.typeOf': {
+                        $exists: true,
+                        $in: [
+                            factory.reservationType.BusReservation,
+                            factory.reservationType.EventReservation,
+                            factory.reservationType.ReservationPackage
+                        ]
+                    } }, (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, actionStatus });
+            })));
+            return { statuses };
+        });
+    }
     /**
      * アクションタイプによる汎用的な集計
      */

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

@@ -4,6 +4,7 @@ export declare enum AggregationType {
     AggregateAuthorizeEventServiceOfferAction = "AggregateAuthorizeEventServiceOfferAction",
     AggregateAuthorizeOrderAction = "AggregateAuthorizeOrderAction",
     AggregateAuthorizePaymentAction = "AggregateAuthorizePaymentAction",
+    AggregateCancelReservationAction = "AggregateCancelReservationAction",
     AggregateCheckMovieTicketAction = "AggregateCheckMovieTicketAction",
     AggregateEvent = "AggregateEvent",
     AggregateOrderAction = "AggregateOrderAction",

package/lib/chevre/repo/aggregation.js

@@ -27,6 +27,7 @@ var AggregationType;
     AggregationType["AggregateAuthorizeEventServiceOfferAction"] = "AggregateAuthorizeEventServiceOfferAction";
     AggregationType["AggregateAuthorizeOrderAction"] = "AggregateAuthorizeOrderAction";
     AggregationType["AggregateAuthorizePaymentAction"] = "AggregateAuthorizePaymentAction";
+    AggregationType["AggregateCancelReservationAction"] = "AggregateCancelReservationAction";
     AggregationType["AggregateCheckMovieTicketAction"] = "AggregateCheckMovieTicketAction";
     AggregationType["AggregateEvent"] = "AggregateEvent";
     AggregationType["AggregateOrderAction"] = "AggregateOrderAction";

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

@@ -112,6 +112,20 @@ declare function aggregateOrderAction(params: {
     aggregationCount: number;
     aggregateDuration: string;
 }>;
+/**
+ * 予約取消アクション集計
+ */
+declare function aggregateCancelReservationAction(params: {
+    aggregateDurationUnit: AggregateDurationUnit;
+    aggregationCount: number;
+    excludedProjectId?: string;
+}): (repos: {
+    agregation: AggregationRepo;
+    action: ActionRepo;
+}) => Promise<{
+    aggregationCount: number;
+    aggregateDuration: string;
+}>;
 declare function aggregateCheckMovieTicketAction(params: {
     aggregateDurationUnit: AggregateDurationUnit;
     aggregationCount: number;
@@ -170,4 +184,4 @@ declare function aggregateTask(params: {
     aggregationCount: number;
     aggregateDuration: string;
 }>;
-export { aggregateAuthorizeEventServiceOfferAction, aggregateAuthorizeOrderAction, aggregateAuthorizePaymentAction, aggregateCheckMovieTicketAction, aggregateEvent, aggregateOrderAction, aggregatePayMovieTicketAction, aggregatePayTransaction, aggregatePlaceOrder, aggregateReserveAction, aggregateReserveTransaction, aggregateTask, aggregateUseAction };
+export { aggregateAuthorizeEventServiceOfferAction, aggregateAuthorizeOrderAction, aggregateAuthorizePaymentAction, aggregateCancelReservationAction, aggregateCheckMovieTicketAction, aggregateEvent, aggregateOrderAction, aggregatePayMovieTicketAction, aggregatePayTransaction, aggregatePlaceOrder, aggregateReserveAction, aggregateReserveTransaction, aggregateTask, aggregateUseAction };

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

@@ -9,7 +9,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.aggregateUseAction = exports.aggregateTask = exports.aggregateReserveTransaction = exports.aggregateReserveAction = exports.aggregatePlaceOrder = exports.aggregatePayTransaction = exports.aggregatePayMovieTicketAction = exports.aggregateOrderAction = exports.aggregateEvent = exports.aggregateCheckMovieTicketAction = exports.aggregateAuthorizePaymentAction = exports.aggregateAuthorizeOrderAction = exports.aggregateAuthorizeEventServiceOfferAction = void 0;
+exports.aggregateUseAction = exports.aggregateTask = exports.aggregateReserveTransaction = exports.aggregateReserveAction = exports.aggregatePlaceOrder = exports.aggregatePayTransaction = exports.aggregatePayMovieTicketAction = exports.aggregateOrderAction = exports.aggregateEvent = exports.aggregateCheckMovieTicketAction = exports.aggregateCancelReservationAction = exports.aggregateAuthorizePaymentAction = exports.aggregateAuthorizeOrderAction = exports.aggregateAuthorizeEventServiceOfferAction = void 0;
 const createDebug = require("debug");
 const moment = require("moment-timezone");
 const factory = require("../../factory");
@@ -322,6 +322,42 @@ function aggregateOrderAction(params) {
     });
 }
 exports.aggregateOrderAction = aggregateOrderAction;
+/**
+ * 予約取消アクション集計
+ */
+function aggregateCancelReservationAction(params) {
+    return (repos) => __awaiter(this, void 0, void 0, function* () {
+        var _a;
+        const aggregateDate = new Date();
+        const aggregateDuration = moment.duration(1, params.aggregateDurationUnit)
+            .toISOString();
+        let i = -1;
+        while (i < params.aggregationCount) {
+            i += 1;
+            const startFrom = moment(aggregateDate)
+                .utc()
+                // .tz('Asia/Tokyo')
+                .add(-i, params.aggregateDurationUnit)
+                .startOf(params.aggregateDurationUnit)
+                .toDate();
+            const startThrough = moment(aggregateDate)
+                .utc()
+                // .tz('Asia/Tokyo')
+                .add(-i, params.aggregateDurationUnit)
+                .endOf(params.aggregateDurationUnit)
+                .toDate();
+            const aggregateResult = yield repos.action.aggregateCancelReservationAction({
+                project: { id: { $ne: params.excludedProjectId } },
+                startFrom,
+                startThrough
+            });
+            debug('aggregateCancelReservationAction:result', aggregateResult, (_a = aggregateResult.statuses[0]) === null || _a === void 0 ? void 0 : _a.aggregation.percentilesDuration, startFrom);
+            yield repos.agregation.saveAggregation(Object.assign({ typeOf: aggregation_1.AggregationType.AggregateCancelReservationAction, project: { id: '*', typeOf: factory.organizationType.Project }, aggregateDuration, aggregateStart: startFrom, aggregateDate }, aggregateResult));
+        }
+        return { aggregationCount: i, aggregateDuration };
+    });
+}
+exports.aggregateCancelReservationAction = aggregateCancelReservationAction;
 function aggregateCheckMovieTicketAction(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         var _a;

package/lib/chevre/service/event.js

@@ -586,7 +586,10 @@ function createScreeningEventSeriesFromCOA(params) {
         endDate: endDate,
         startDate: startDate,
         coaInfo,
-        offers: Object.assign({ project: { typeOf: params.project.typeOf, id: params.project.id }, typeOf: factory.offerType.Offer, priceCurrency: factory.priceCurrency.JPY }, (Array.isArray(unacceptedPaymentMethod)) ? { unacceptedPaymentMethod: unacceptedPaymentMethod } : undefined),
+        offers: Object.assign({ 
+            // 不要なので廃止(2023-06-09~)
+            // project: { typeOf: params.project.typeOf, id: params.project.id },
+            typeOf: factory.offerType.Offer, priceCurrency: factory.priceCurrency.JPY }, (Array.isArray(unacceptedPaymentMethod)) ? { unacceptedPaymentMethod: unacceptedPaymentMethod } : undefined),
         additionalProperty
     };
 }

package/package.json

@@ -9,8 +9,8 @@
     }
   ],
   "dependencies": {
-    "@chevre/factory": "4.313.0-alpha.30",
-    "@cinerino/sdk": "3.157.0-alpha.9",
+    "@chevre/factory": "4.313.0-alpha.31",
+    "@cinerino/sdk": "3.157.0-alpha.11",
     "@motionpicture/coa-service": "9.2.0",
     "@motionpicture/gmo-service": "5.2.0",
     "@sendgrid/mail": "6.4.0",
@@ -117,5 +117,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build && npm test && npm run doc"
   },
-  "version": "21.2.0-alpha.105"
+  "version": "21.2.0-alpha.107"
 }

package/example/src/chevre/createManyEventsIfNotExist.ts

@@ -1,208 +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 filterName: string = 'eventIdentifier';
-
-// tslint:disable-next-line:max-func-body-length
-async function main() {
-    await mongoose.connect(<string>process.env.MONGOLAB_URI);
-
-    const eventRepo = new chevre.repository.Event(mongoose.connection);
-
-    const result = await eventRepo.createManyIfNotExist<chevre.factory.eventType.ScreeningEvent>([
-        {
-            attributes: {
-                additionalProperty: [{
-                    name: filterName,
-                    value: '20230201143000-03'
-                }],
-                project: {
-                    id: PROJECT_ID,
-                    typeOf: chevre.factory.organizationType.Project
-                },
-                typeOf: chevre.factory.eventType.ScreeningEvent,
-                doorTime: moment('2023-02-01T05:00:00.000Z')
-                    .toDate(),
-                startDate: moment('2023-02-01T05:00:00.000Z')
-                    .toDate(),
-                endDate: moment('2023-02-01T06:00:00.000Z')
-                    .toDate(),
-                // workPerformed: {
-                //     typeOf: chevre.factory.creativeWorkType.Movie,
-                //     identifier: '1622100',
-                //     id: '5bfb841d5a78d7948369980a',
-                //     name: {
-                //         en: 'Pet',
-                //         ja: 'ペット'
-                //     },
-                //     duration: 'PT2H3M'
-                // },
-                location: {
-                    typeOf: chevre.factory.placeType.ScreeningRoom,
-                    branchCode: '10',
-                    name: {
-                        ja: 'シネマ1',
-                        en: 'CINEMA1'
-                    },
-                    address: {
-                        ja: '7階',
-                        en: '7F'
-                    }
-                },
-                superEvent: {
-                    typeOf: chevre.factory.eventType.ScreeningEventSeries,
-                    project: {
-                        typeOf: chevre.factory.organizationType.Project,
-                        id: 'cinerino'
-                    },
-                    id: '7k9ayl8hc',
-                    videoFormat: [
-                        {
-                            typeOf: '2D',
-                            name: '2D'
-                        }
-                    ],
-                    soundFormat: [],
-                    workPerformed: {
-                        typeOf: chevre.factory.creativeWorkType.Movie,
-                        identifier: '1622100',
-                        id: '5bfb841d5a78d7948369980a',
-                        name: {
-                            en: 'Pet',
-                            ja: 'ペット'
-                        },
-                        duration: 'PT2H3M'
-                    },
-                    location: {
-                        typeOf: chevre.factory.placeType.MovieTheater,
-                        id: '5bfb841d5a78d7948369979a',
-                        branchCode: '118',
-                        name: {
-                            ja: 'シネモーション赤坂 ',
-                            en: 'CineMotion Akasaka'
-                        },
-                        kanaName: 'シネモーションアカサカ'
-                    },
-                    kanaName: 'ペットカナタイトル',
-                    name: {
-                        en: 'PetPetPetPet',
-                        ja: 'ペット'
-                    },
-                    additionalProperty: [
-                        {
-                            name: 'sortNumber',
-                            value: '99'
-                        }
-                    ],
-                    startDate: moment('2020-03-31T15:00:00.000Z')
-                        .toDate(),
-                    endDate: moment('2034-12-01T15:00:00.000Z')
-                        .toDate(),
-                    description: {
-                        en: 'english description',
-                        ja: 'ムビチケ検証用のイベントです。'
-                    },
-                    headline: {
-                        en: 'headlineheadlineheadlineheadlineheadlineheadlineheadline',
-                        ja: 'サブタイトルkanaName'
-                    },
-                    subtitleLanguage: {
-                        typeOf: 'Language',
-                        name: 'Japanese'
-                    }
-                },
-                name: {
-                    en: 'PetPetPetPet',
-                    ja: 'ペット'
-                },
-                eventStatus: chevre.factory.eventStatusType.EventScheduled,
-                offers: {
-                    typeOf: chevre.factory.offerType.Offer,
-                    priceCurrency: chevre.factory.priceCurrency.JPY,
-                    availabilityEnds: moment('2023-02-01T01:20:00.000Z')
-                        .toDate(),
-                    availabilityStarts: moment('2023-01-30T15:00:00.000Z')
-                        .toDate(),
-                    eligibleQuantity: {
-                        typeOf: 'QuantitativeValue',
-                        unitCode: chevre.factory.unitCode.C62,
-                        maxValue: 6,
-                        value: 1
-                    },
-                    itemOffered: {
-                        id: '6308580bdef565000a9aa1fd',
-                        name: {
-                            ja: '通常興行カタログ'
-                        },
-                        serviceOutput: {
-                            typeOf: chevre.factory.reservationType.EventReservation,
-                            reservedTicket: {
-                                typeOf: 'Ticket',
-                                ticketedSeat: {
-                                    typeOf: chevre.factory.placeType.Seat
-                                }
-                            }
-                        },
-                        typeOf: chevre.factory.product.ProductType.EventService,
-                        availableChannel: {
-                            typeOf: 'ServiceChannel',
-                            serviceLocation: {
-                                typeOf: chevre.factory.placeType.ScreeningRoom,
-                                branchCode: '10',
-                                name: {
-                                    ja: 'シネマ1',
-                                    en: 'CINEMA1'
-                                },
-                                containedInPlace: {
-                                    typeOf: chevre.factory.placeType.MovieTheater,
-                                    id: '5bfb841d5a78d7948369979a',
-                                    branchCode: '118',
-                                    name: {
-                                        ja: 'シネモーション赤坂 ',
-                                        en: 'CineMotion Akasaka'
-                                    }
-                                }
-                            }
-                        },
-                        serviceType: {
-                            codeValue: '0001',
-                            id: '5e3361d01dc1ef1a20dd8737',
-                            inCodeSet: {
-                                typeOf: 'CategoryCodeSet',
-                                identifier: chevre.factory.categoryCode.CategorySetIdentifier.ServiceType
-                            },
-                            typeOf: 'CategoryCode'
-                        }
-                    },
-                    validFrom: moment('2023-01-29T15:00:00.000Z')
-                        .toDate(),
-                    validThrough: moment('2023-02-01T01:20:00.000Z')
-                        .toDate(),
-                    seller: {
-                        typeOf: chevre.factory.organizationType.Corporation,
-                        id: '59d20831e53ebc2b4e774466',
-                        name: {
-                            ja: 'シネモーション赤坂',
-                            en: 'CineMotion Akasaka'
-                        },
-                        makesOffer: []
-                    }
-                }
-            },
-            filter: { name: filterName }
-        }
-    ]);
-    console.log(result);
-    console.log('upsertedIds:', (Array.isArray(result?.getUpsertedIds()))
-        ? result?.getUpsertedIds()
-            .map((u: any) => u._id)
-        : []);
-}
-
-main()
-    .then(console.log)
-    .catch(console.error);