@chevre/domain 20.2.0-alpha.3 → 20.2.0-alpha.31

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

@@ -0,0 +1,47 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.schema = exports.modelName = void 0;
+const mongoose = require("mongoose");
+const modelName = 'Aggregation';
+exports.modelName = modelName;
+const writeConcern = { j: true, w: 'majority', wtimeout: 10000 };
+/**
+ * 集計スキーマ
+ */
+const schema = new mongoose.Schema({}, {
+    collection: 'aggregations',
+    id: true,
+    read: 'primaryPreferred',
+    writeConcern: writeConcern,
+    strict: false,
+    useNestedStrict: true,
+    timestamps: {
+        createdAt: 'createdAt',
+        updatedAt: 'updatedAt'
+    },
+    toJSON: {
+        getters: false,
+        virtuals: false,
+        minimize: false,
+        versionKey: false
+    },
+    toObject: {
+        getters: false,
+        virtuals: true,
+        minimize: false,
+        versionKey: false
+    }
+});
+exports.schema = schema;
+schema.index({ createdAt: 1 }, { name: 'searchByCreatedAt' });
+schema.index({ updatedAt: 1 }, { name: 'searchByUpdatedAt' });
+mongoose.model(modelName, schema)
+    .on('index', 
+// tslint:disable-next-line:no-single-line-block-comment
+/* istanbul ignore next */
+(error) => {
+    if (error !== undefined) {
+        // tslint:disable-next-line:no-console
+        console.error(error);
+    }
+});

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

@@ -30,12 +30,13 @@ const schema = new mongoose.Schema({
     startDate: Date,
     workPerformed: mongoose.SchemaTypes.Mixed,
     superEvent: mongoose.SchemaTypes.Mixed,
-    videoFormat: [mongoose.SchemaTypes.Mixed],
-    soundFormat: [mongoose.SchemaTypes.Mixed],
+    videoFormat: mongoose.SchemaTypes.Mixed,
+    soundFormat: mongoose.SchemaTypes.Mixed,
     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/mongoose/model/telemetry.js

@@ -5,41 +5,17 @@ const mongoose = require("mongoose");
 const modelName = 'Telemetry';
 exports.modelName = modelName;
 const writeConcern = { j: true, w: 'majority', wtimeout: 10000 };
-const purposeSchema = new mongoose.Schema({
-    typeOf: String
-}, {
-    id: false,
-    _id: false,
-    strict: false
-});
-const objectSchema = new mongoose.Schema({
-    measuredAt: Date
-}, {
-    id: false,
-    _id: false,
-    strict: false
-});
-const resultSchema = new mongoose.Schema({}, {
-    id: false,
-    _id: false,
-    strict: false
-});
-const errorSchema = new mongoose.Schema({}, {
-    id: false,
-    _id: false,
-    strict: false
-});
 /**
  * 測定スキーマ
  */
 const schema = new mongoose.Schema({
     project: mongoose.SchemaTypes.Mixed,
-    result: resultSchema,
-    error: errorSchema,
-    object: objectSchema,
+    result: mongoose.SchemaTypes.Mixed,
+    error: mongoose.SchemaTypes.Mixed,
+    object: mongoose.SchemaTypes.Mixed,
     startDate: Date,
     endDate: Date,
-    purpose: purposeSchema
+    purpose: mongoose.SchemaTypes.Mixed
 }, {
     collection: 'telemetries',
     id: true,

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

@@ -7,6 +7,7 @@ declare type IScreeningRoomSectionWithoutContainsPlace = Omit<factory.place.scre
 export declare class MongoRepository {
     private readonly placeModel;
     constructor(connection: Connection);
+    static CREATE_BUS_STOP_MONGO_CONDITIONS(params: factory.place.busStop.ISearchConditions): any[];
     static CREATE_MOVIE_THEATER_MONGO_CONDITIONS(params: factory.place.movieTheater.ISearchConditions): any[];
     /**
      * 施設を保管する
@@ -19,7 +20,6 @@ export declare class MongoRepository {
         };
         branchCode: string;
     }): Promise<factory.place.movieTheater.IPlace>;
-    countMovieTheaters(params: factory.place.movieTheater.ISearchConditions): Promise<number>;
     /**
      * 施設検索
      */
@@ -114,6 +114,20 @@ export declare class MongoRepository {
             id: string;
         };
     }): Promise<void>;
+    saveBusStop(params: factory.place.busStop.IPlace): Promise<factory.place.busStop.IPlace>;
+    findBusStopByBranchCode(params: {
+        project: {
+            id: string;
+        };
+        branchCode: string;
+    }): Promise<factory.place.movieTheater.IPlace>;
+    searchBusStops(params: factory.place.busStop.ISearchConditions): Promise<factory.place.busStop.IPlace[]>;
+    findBusStopById(params: {
+        id: string;
+    }, projection?: any): Promise<factory.place.busStop.IPlace>;
+    deleteBusStopById(params: {
+        id: string;
+    }): Promise<void>;
     getCursor(conditions: any, projection: any): import("mongoose").QueryCursor<any>;
 }
 export {};

package/lib/chevre/repo/place.js

@@ -32,6 +32,82 @@ class MongoRepository {
         this.placeModel = connection.model(place_1.modelName);
     }
     // tslint:disable-next-line:max-func-body-length
+    static CREATE_BUS_STOP_MONGO_CONDITIONS(params) {
+        var _a, _b, _c, _d, _e, _f, _g, _h;
+        const andConditions = [{ typeOf: { $eq: factory.placeType.BusStop } }];
+        const projectIdEq = (_b = (_a = params.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 } });
+        }
+        const branchCodeEq = (_c = params.branchCode) === null || _c === void 0 ? void 0 : _c.$eq;
+        if (typeof branchCodeEq === 'string') {
+            andConditions.push({
+                branchCode: {
+                    $exists: true,
+                    $eq: branchCodeEq
+                }
+            });
+        }
+        const branchCodeRegex = (_d = params.branchCode) === null || _d === void 0 ? void 0 : _d.$regex;
+        if (typeof branchCodeRegex === 'string' && branchCodeRegex.length > 0) {
+            andConditions.push({
+                branchCode: {
+                    $exists: true,
+                    $regex: new RegExp(branchCodeRegex)
+                }
+            });
+        }
+        const branchCodeIn = (_e = params.branchCode) === null || _e === void 0 ? void 0 : _e.$in;
+        if (Array.isArray(branchCodeIn)) {
+            andConditions.push({
+                branchCode: {
+                    $exists: true,
+                    $in: branchCodeIn
+                }
+            });
+        }
+        // tslint:disable-next-line:no-single-line-block-comment
+        /* istanbul ignore else */
+        const idEq = (_f = params.id) === null || _f === void 0 ? void 0 : _f.$eq;
+        if (typeof idEq === 'string') {
+            andConditions.push({
+                _id: {
+                    $eq: idEq
+                }
+            });
+        }
+        const idIn = (_g = params.id) === null || _g === void 0 ? void 0 : _g.$in;
+        if (Array.isArray(idIn)) {
+            andConditions.push({
+                _id: {
+                    $in: idIn
+                }
+            });
+        }
+        const nameRegex = (_h = params.name) === null || _h === void 0 ? void 0 : _h.$regex;
+        // tslint:disable-next-line:no-single-line-block-comment
+        /* istanbul ignore else */
+        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)
+                        }
+                    }
+                ]
+            });
+        }
+        return andConditions;
+    }
+    // tslint:disable-next-line:max-func-body-length
     static CREATE_MOVIE_THEATER_MONGO_CONDITIONS(params) {
         var _a, _b, _c, _d, _e, _f, _g, _h, _j;
         // MongoDB検索条件
@@ -171,6 +247,7 @@ class MongoRepository {
     findMovieTheaterByBranchCode(params) {
         return __awaiter(this, void 0, void 0, function* () {
             return this.placeModel.findOne({
+                typeOf: { $eq: factory.placeType.MovieTheater },
                 'project.id': { $eq: params.project.id },
                 branchCode: { $eq: params.branchCode }
             })
@@ -183,14 +260,12 @@ class MongoRepository {
             });
         });
     }
-    countMovieTheaters(params) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const conditions = MongoRepository.CREATE_MOVIE_THEATER_MONGO_CONDITIONS(params);
-            return this.placeModel.countDocuments((conditions.length > 0) ? { $and: conditions } : {})
-                .setOptions({ maxTimeMS: 10000 })
-                .exec();
-        });
-    }
+    // public async countMovieTheaters(params: factory.place.movieTheater.ISearchConditions): Promise<number> {
+    //     const conditions = MongoRepository.CREATE_MOVIE_THEATER_MONGO_CONDITIONS(params);
+    //     return this.placeModel.countDocuments((conditions.length > 0) ? { $and: conditions } : {})
+    //         .setOptions({ maxTimeMS: 10000 })
+    //         .exec();
+    // }
     /**
      * 施設検索
      */
@@ -224,7 +299,10 @@ class MongoRepository {
      */
     findById(params, projection) {
         return __awaiter(this, void 0, void 0, function* () {
-            const doc = yield this.placeModel.findOne({ _id: params.id }, Object.assign({ __v: 0, createdAt: 0, updatedAt: 0 }, projection))
+            const doc = yield this.placeModel.findOne({
+                typeOf: { $eq: factory.placeType.MovieTheater },
+                _id: { $eq: params.id }
+            }, Object.assign({ __v: 0, createdAt: 0, updatedAt: 0 }, projection))
                 .exec();
             if (doc === null) {
                 throw new factory.errors.NotFound(this.placeModel.modelName);
@@ -235,7 +313,8 @@ class MongoRepository {
     deleteMovieTheaterById(params) {
         return __awaiter(this, void 0, void 0, function* () {
             yield this.placeModel.findOneAndDelete({
-                _id: params.id
+                typeOf: { $eq: factory.placeType.MovieTheater },
+                _id: { $eq: params.id }
             })
                 .exec()
                 .then((doc) => {
@@ -1066,6 +1145,92 @@ class MongoRepository {
                 .exec();
         });
     }
+    saveBusStop(params) {
+        return __awaiter(this, void 0, void 0, function* () {
+            let doc;
+            if (typeof params.id !== 'string' || params.id.length === 0) {
+                doc = yield this.placeModel.create(params);
+            }
+            else {
+                // 上書き禁止属性を除外(2022-08-24~)
+                const { id, branchCode, project, typeOf } = params, updateFields = __rest(params, ["id", "branchCode", "project", "typeOf"]);
+                doc = yield this.placeModel.findOneAndUpdate({ _id: params.id }, updateFields, { upsert: false, new: true })
+                    .exec();
+            }
+            if (doc === null) {
+                throw new factory.errors.NotFound(this.placeModel.modelName);
+            }
+            return doc.toObject();
+        });
+    }
+    findBusStopByBranchCode(params) {
+        return __awaiter(this, void 0, void 0, function* () {
+            return this.placeModel.findOne({
+                typeOf: { $eq: factory.placeType.BusStop },
+                'project.id': { $eq: params.project.id },
+                branchCode: { $eq: params.branchCode }
+            })
+                .exec()
+                .then((doc) => {
+                if (doc === null) {
+                    throw new factory.errors.NotFound(`${factory.placeType.BusStop} ${params.branchCode}`);
+                }
+                return doc.toObject();
+            });
+        });
+    }
+    searchBusStops(params) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const conditions = MongoRepository.CREATE_BUS_STOP_MONGO_CONDITIONS(params);
+            // containsPlaceを含めるとデータサイズが大きくなるので、検索結果には含めない
+            const query = this.placeModel.find((conditions.length > 0) ? { $and: conditions } : {}, {
+                __v: 0,
+                createdAt: 0,
+                updatedAt: 0,
+                containsPlace: 0
+            });
+            if (typeof params.limit === 'number') {
+                const page = (typeof params.page === 'number') ? params.page : 1;
+                query.limit(params.limit)
+                    .skip(params.limit * (page - 1));
+            }
+            // tslint:disable-next-line:no-single-line-block-comment
+            /* istanbul ignore else */
+            if (params.sort !== undefined) {
+                query.sort(params.sort);
+            }
+            return query.setOptions({ maxTimeMS: 10000 })
+                .exec()
+                .then((docs) => docs.map((doc) => doc.toObject()));
+        });
+    }
+    findBusStopById(params, projection) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const doc = yield this.placeModel.findOne({
+                typeOf: { $eq: factory.placeType.BusStop },
+                _id: { $eq: params.id }
+            }, Object.assign({ __v: 0, createdAt: 0, updatedAt: 0 }, projection))
+                .exec();
+            if (doc === null) {
+                throw new factory.errors.NotFound(this.placeModel.modelName);
+            }
+            return doc.toObject();
+        });
+    }
+    deleteBusStopById(params) {
+        return __awaiter(this, void 0, void 0, function* () {
+            yield this.placeModel.findOneAndDelete({
+                typeOf: { $eq: factory.placeType.BusStop },
+                _id: { $eq: params.id }
+            })
+                .exec()
+                .then((doc) => {
+                if (doc === null) {
+                    throw new factory.errors.NotFound(this.placeModel.modelName);
+                }
+            });
+        });
+    }
     getCursor(conditions, projection) {
         return this.placeModel.find(conditions, projection)
             .sort({ branchCode: factory.sortType.Ascending })

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

@@ -52,4 +52,5 @@ export declare class MongoRepository {
             id: string;
         };
     }): Promise<void>;
+    getCursor(conditions: any, projection: any): import("mongoose").QueryCursor<any>;
 }

package/lib/chevre/repo/product.js

@@ -251,5 +251,10 @@ class MongoRepository {
                 .exec();
         });
     }
+    getCursor(conditions, projection) {
+        return this.productModel.find(conditions, projection)
+            .sort({ productID: factory.sortType.Ascending })
+            .cursor();
+    }
 }
 exports.MongoRepository = MongoRepository;

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/repo/reservation.d.ts

@@ -30,12 +30,6 @@ export declare class MongoRepository {
     /**
      * 予約確定
      */
-    confirm<T extends factory.reservationType>(params: {
-        id: string;
-        previousReservationStatus: factory.reservationStatusType;
-        underName?: factory.reservation.IUnderName<T>;
-        reservedTicket?: factory.reservation.ITicket;
-    }): Promise<factory.reservation.IReservation<T>>;
     confirmByReservationNumber(params: {
         reservationNumber: string;
         previousReservationStatus: factory.reservationStatusType;