@chevre/domain 21.2.0-alpha.1 → 21.2.0-alpha.11

package/lib/chevre/repo/offerCatalog.js

@@ -23,7 +23,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.MongoRepository = void 0;
 const uniqid = require("uniqid");
 const factory = require("../factory");
-const onIndexCreated_1 = require("./mongoose/onIndexCreated");
 const offerCatalog_1 = require("./mongoose/schemas/offerCatalog");
 /**
  * オファーカタログリポジトリ
@@ -31,9 +30,6 @@ const offerCatalog_1 = require("./mongoose/schemas/offerCatalog");
 class MongoRepository {
     constructor(connection) {
         this.offerCatalogModel = connection.model(offerCatalog_1.modelName, offerCatalog_1.schema);
-        if (connection.get('autoIndex') === true) {
-            this.offerCatalogModel.on(onIndexCreated_1.INDEX_EVENT, onIndexCreated_1.onIndexCreated);
-        }
     }
     // tslint:disable-next-line:max-func-body-length
     static CREATE_MONGO_CONDITIONS(params) {

package/lib/chevre/repo/order.js

@@ -11,7 +11,6 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MongoRepository = void 0;
 const factory = require("../factory");
-const onIndexCreated_1 = require("./mongoose/onIndexCreated");
 const order_1 = require("./mongoose/schemas/order");
 const errorHandler_1 = require("../errorHandler");
 const order_2 = require("../factory/order");
@@ -21,9 +20,6 @@ const order_2 = require("../factory/order");
 class MongoRepository {
     constructor(connection) {
         this.orderModel = connection.model(order_1.modelName, order_1.schema);
-        if (connection.get('autoIndex') === true) {
-            this.orderModel.on(onIndexCreated_1.INDEX_EVENT, onIndexCreated_1.onIndexCreated);
-        }
     }
     // tslint:disable-next-line:cyclomatic-complexity max-func-body-length
     static CREATE_MONGO_CONDITIONS(params) {

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

@@ -3,7 +3,6 @@ import { RedisClientType } from 'redis';
  * 注文番号リポジトリ
  */
 export declare class RedisRepository {
-    private static readonly REDIS_KEY_PREFIX_NEW;
     private static readonly REDIS_KEY_PREFIX;
     private readonly redisClient;
     constructor(redisClient: RedisClientType);

package/lib/chevre/repo/orderNumber.js

@@ -16,7 +16,6 @@ const util = require("util");
 // tslint:disable-next-line:no-require-imports no-var-requires
 const fpe = require('node-fpe');
 const factory = require("../factory");
-const settings_1 = require("../settings");
 const ORDER_NUMBER_SEPARATOR = '-';
 /**
  * 注文番号リポジトリ
@@ -26,15 +25,7 @@ class RedisRepository {
         this.redisClient = redisClient;
     }
     static createKey(params) {
-        const useNewKey = params.orderDate instanceof Date
-            && moment(params.orderDate)
-                .isSameOrAfter(settings_1.USE_NEW_ORDER_NUMBER_KEY_FROM);
-        if (useNewKey) {
-            return util.format('%s:%s:%s', RedisRepository.REDIS_KEY_PREFIX_NEW, params.projectPrefix, params.timestamp);
-        }
-        else {
-            return util.format('%s:%s:%s', RedisRepository.REDIS_KEY_PREFIX, params.projectPrefix, params.timestamp);
-        }
+        return util.format('%s:%s:%s', RedisRepository.REDIS_KEY_PREFIX, params.projectPrefix, params.timestamp);
     }
     /**
      * タイムスタンプから発行する
@@ -79,6 +70,5 @@ class RedisRepository {
         });
     }
 }
-RedisRepository.REDIS_KEY_PREFIX_NEW = 'orderNumber';
-RedisRepository.REDIS_KEY_PREFIX = 'cinerino:orderNumber';
+RedisRepository.REDIS_KEY_PREFIX = 'orderNumber';
 exports.RedisRepository = RedisRepository;

package/lib/chevre/repo/ownershipInfo.js

@@ -11,7 +11,6 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MongoRepository = void 0;
 const uuid = require("uuid");
-const onIndexCreated_1 = require("./mongoose/onIndexCreated");
 const ownershipInfo_1 = require("./mongoose/schemas/ownershipInfo");
 const errorHandler_1 = require("../errorHandler");
 const factory = require("../factory");
@@ -21,9 +20,6 @@ const factory = require("../factory");
 class MongoRepository {
     constructor(connection) {
         this.ownershipInfoModel = connection.model(ownershipInfo_1.modelName, ownershipInfo_1.schema);
-        if (connection.get('autoIndex') === true) {
-            this.ownershipInfoModel.on(onIndexCreated_1.INDEX_EVENT, onIndexCreated_1.onIndexCreated);
-        }
     }
     // tslint:disable-next-line:cyclomatic-complexity max-func-body-length
     static CREATE_MONGO_CONDITIONS(params) {

package/lib/chevre/repo/permit.js

@@ -10,7 +10,6 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MongoRepository = void 0;
-const onIndexCreated_1 = require("./mongoose/onIndexCreated");
 const serviceOutput_1 = require("./mongoose/schemas/serviceOutput");
 const factory = require("../factory");
 /**
@@ -19,9 +18,6 @@ const factory = require("../factory");
 class MongoRepository {
     constructor(connection) {
         this.serviceOutputModel = connection.model(serviceOutput_1.modelName, serviceOutput_1.schema);
-        if (connection.get('autoIndex') === true) {
-            this.serviceOutputModel.on(onIndexCreated_1.INDEX_EVENT, onIndexCreated_1.onIndexCreated);
-        }
     }
     findByIdentifier(params, projection) {
         var _a, _b;

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

@@ -48,7 +48,11 @@ export declare class MongoRepository {
     /**
      * 施設検索
      */
-    searchMovieTheaters(params: factory.place.movieTheater.ISearchConditions): Promise<factory.place.movieTheater.IPlaceWithoutScreeningRoom[]>;
+    searchMovieTheaters(params: factory.place.movieTheater.ISearchConditions & {
+        $projection?: {
+            [key: string]: 0;
+        };
+    }): Promise<factory.place.movieTheater.IPlaceWithoutScreeningRoom[]>;
     /**
      * 施設取得
      */

package/lib/chevre/repo/place.js

@@ -22,7 +22,6 @@ var __rest = (this && this.__rest) || function (s, e) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MongoRepository = void 0;
 const mongoose_1 = require("mongoose");
-const onIndexCreated_1 = require("./mongoose/onIndexCreated");
 const place_1 = require("./mongoose/schemas/place");
 const factory = require("../factory");
 /**
@@ -31,9 +30,6 @@ const factory = require("../factory");
 class MongoRepository {
     constructor(connection) {
         this.placeModel = connection.model(place_1.modelName, place_1.schema);
-        if (connection.get('autoIndex') === true) {
-            this.placeModel.on(onIndexCreated_1.INDEX_EVENT, onIndexCreated_1.onIndexCreated);
-        }
     }
     // tslint:disable-next-line:max-func-body-length
     static CREATE_BUS_STOP_MONGO_CONDITIONS(params) {
@@ -276,12 +272,7 @@ class MongoRepository {
         return __awaiter(this, void 0, void 0, function* () {
             const conditions = MongoRepository.CREATE_MOVIE_THEATER_MONGO_CONDITIONS(params);
             // containsPlaceを含めるとデータサイズが大きくなるので、検索結果には含めない
-            const query = this.placeModel.find((conditions.length > 0) ? { $and: conditions } : {}, {
-                __v: 0,
-                createdAt: 0,
-                updatedAt: 0,
-                containsPlace: 0
-            });
+            const query = this.placeModel.find((conditions.length > 0) ? { $and: conditions } : {}, Object.assign({ __v: 0, createdAt: 0, updatedAt: 0, containsPlace: 0 }, params.$projection));
             if (typeof params.limit === 'number' && params.limit > 0) {
                 const page = (typeof params.page === 'number' && params.page > 0) ? params.page : 1;
                 query.limit(params.limit)

package/lib/chevre/repo/priceSpecification.js

@@ -22,7 +22,6 @@ var __rest = (this && this.__rest) || function (s, e) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MongoRepository = void 0;
 const factory = require("../factory");
-const onIndexCreated_1 = require("./mongoose/onIndexCreated");
 const priceSpecification_1 = require("./mongoose/schemas/priceSpecification");
 /**
  * 価格仕様リポジトリ
@@ -30,9 +29,6 @@ const priceSpecification_1 = require("./mongoose/schemas/priceSpecification");
 class MongoRepository {
     constructor(connection) {
         this.priceSpecificationModel = connection.model(priceSpecification_1.modelName, priceSpecification_1.schema);
-        if (connection.get('autoIndex') === true) {
-            this.priceSpecificationModel.on(onIndexCreated_1.INDEX_EVENT, onIndexCreated_1.onIndexCreated);
-        }
     }
     // tslint:disable-next-line:cyclomatic-complexity max-func-body-length
     static CREATE_MONGO_CONDITIONS(params) {

package/lib/chevre/repo/product.js

@@ -21,7 +21,6 @@ var __rest = (this && this.__rest) || function (s, e) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MongoRepository = void 0;
-const onIndexCreated_1 = require("./mongoose/onIndexCreated");
 const product_1 = require("./mongoose/schemas/product");
 const factory = require("../factory");
 /**
@@ -30,9 +29,6 @@ const factory = require("../factory");
 class MongoRepository {
     constructor(connection) {
         this.productModel = connection.model(product_1.modelName, product_1.schema);
-        if (connection.get('autoIndex') === true) {
-            this.productModel.on(onIndexCreated_1.INDEX_EVENT, onIndexCreated_1.onIndexCreated);
-        }
     }
     // tslint:disable-next-line:max-func-body-length
     static CREATE_MONGO_CONDITIONS(params) {

package/lib/chevre/repo/project.js

@@ -10,7 +10,6 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MongoRepository = void 0;
-const onIndexCreated_1 = require("./mongoose/onIndexCreated");
 const project_1 = require("./mongoose/schemas/project");
 const factory = require("../factory");
 /**
@@ -19,9 +18,6 @@ const factory = require("../factory");
 class MongoRepository {
     constructor(connection) {
         this.projectModel = connection.model(project_1.modelName, project_1.schema);
-        if (connection.get('autoIndex') === true) {
-            this.projectModel.on(onIndexCreated_1.INDEX_EVENT, onIndexCreated_1.onIndexCreated);
-        }
     }
     static CREATE_MONGO_CONDITIONS(params) {
         // MongoDB検索条件

package/lib/chevre/repo/rateLimit/offer.d.ts

@@ -18,10 +18,11 @@ export interface IRateLimitKey {
  * オファーレート制限リポジトリ
  */
 export declare class RedisRepository {
-    static KEY_PREFIX: string;
+    private static readonly KEY_PREFIX_NEW;
+    private static readonly KEY_PREFIX;
     private readonly redisClient;
     constructor(redisClient: RedisClientType);
-    static CREATE_REDIS_KEY(ratelimitKey: IRateLimitKey): string;
+    private static createKey;
     /**
      * ロックする
      */

package/lib/chevre/repo/rateLimit/offer.js

@@ -10,10 +10,9 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.RedisRepository = void 0;
-const createDebug = require("debug");
 const moment = require("moment");
 const factory = require("../../factory");
-const debug = createDebug('chevre-domain:repo');
+const settings_1 = require("../../settings");
 /**
  * オファーレート制限リポジトリ
  */
@@ -21,11 +20,17 @@ class RedisRepository {
     constructor(redisClient) {
         this.redisClient = redisClient;
     }
-    static CREATE_REDIS_KEY(ratelimitKey) {
+    static createKey(ratelimitKey) {
         const dateNow = moment(ratelimitKey.reservationFor.startDate);
         const unitInSeconds = Number(ratelimitKey.reservedTicket.ticketType.validRateLimit.unitInSeconds.toString());
-        const validFrom = dateNow.unix() - dateNow.unix() % unitInSeconds;
-        return `${RedisRepository.KEY_PREFIX}:${ratelimitKey.reservedTicket.ticketType.validRateLimit.scope}:${validFrom.toString()}`;
+        const validFrom = dateNow.unix() - (dateNow.unix() % unitInSeconds);
+        const useNewKey = dateNow.isSameOrAfter(settings_1.USE_NEW_EVENT_AVAILABILITY_KEY_FROM);
+        if (useNewKey) {
+            return `${RedisRepository.KEY_PREFIX_NEW}:${ratelimitKey.reservedTicket.ticketType.validRateLimit.scope}:${validFrom.toString()}`;
+        }
+        else {
+            return `${RedisRepository.KEY_PREFIX}:${ratelimitKey.reservedTicket.ticketType.validRateLimit.scope}:${validFrom.toString()}`;
+        }
     }
     /**
      * ロックする
@@ -34,7 +39,7 @@ class RedisRepository {
         return __awaiter(this, void 0, void 0, function* () {
             const datasets = ratelimitKeys.map((ratelimitKey) => {
                 return {
-                    key: RedisRepository.CREATE_REDIS_KEY(ratelimitKey),
+                    key: RedisRepository.createKey(ratelimitKey),
                     value: ratelimitKey.reservationNumber,
                     ttl: moment(ratelimitKey.reservationFor.startDate)
                         .add(ratelimitKey.reservedTicket.ticketType.validRateLimit.unitInSeconds, 'seconds')
@@ -43,29 +48,24 @@ class RedisRepository {
             });
             let multi = this.redisClient.multi();
             datasets.forEach((dataset) => {
-                debug('setting if not exist...', dataset.key);
                 multi.setNX(dataset.key, dataset.value)
                     .expire(dataset.key, dataset.ttl);
             });
             const results = yield multi.exec();
             const lockedFields = [];
             results.forEach((r, index) => {
-                debug('r, index:', r, index);
                 // tslint:disable-next-line:no-magic-numbers
                 if (index % 2 === 0 && (r === 1 || r === true)) {
                     // tslint:disable-next-line:no-magic-numbers
                     lockedFields.push(datasets[index / 2].key);
                 }
             });
-            debug('locked fields:', lockedFields);
             const lockedAll = lockedFields.length === ratelimitKeys.length;
-            debug('lockedAll?', lockedAll);
             if (!lockedAll) {
                 if (lockedFields.length > 0) {
                     // 全てロックできなければロックできたものは解除
                     multi = this.redisClient.multi();
                     lockedFields.forEach((key) => {
-                        debug('deleting...', key);
                         multi.del(key);
                     });
                     yield multi.exec();
@@ -78,8 +78,7 @@ class RedisRepository {
         return __awaiter(this, void 0, void 0, function* () {
             const multi = this.redisClient.multi();
             ratelimitKeys.forEach((ratelimitKey) => {
-                const key = RedisRepository.CREATE_REDIS_KEY(ratelimitKey);
-                debug('deleting...', key);
+                const key = RedisRepository.createKey(ratelimitKey);
                 multi.del(key);
             });
             yield multi.exec();
@@ -87,10 +86,11 @@ class RedisRepository {
     }
     getHolder(ratelimitKey) {
         return __awaiter(this, void 0, void 0, function* () {
-            const key = RedisRepository.CREATE_REDIS_KEY(ratelimitKey);
+            const key = RedisRepository.createKey(ratelimitKey);
             return this.redisClient.get(key);
         });
     }
 }
+RedisRepository.KEY_PREFIX_NEW = 'rateLimit:offer';
 RedisRepository.KEY_PREFIX = 'chevre:rateLimit:offer';
 exports.RedisRepository = RedisRepository;

package/lib/chevre/repo/reservation.js

@@ -10,7 +10,6 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MongoRepository = void 0;
-const onIndexCreated_1 = require("./mongoose/onIndexCreated");
 const reservation_1 = require("./mongoose/schemas/reservation");
 const factory = require("../factory");
 /**
@@ -19,9 +18,6 @@ const factory = require("../factory");
 class MongoRepository {
     constructor(connection) {
         this.reservationModel = connection.model(reservation_1.modelName, reservation_1.schema);
-        if (connection.get('autoIndex') === true) {
-            this.reservationModel.on(onIndexCreated_1.INDEX_EVENT, onIndexCreated_1.onIndexCreated);
-        }
     }
     // tslint:disable-next-line:cyclomatic-complexity max-func-body-length
     static CREATE_MONGO_CONDITIONS(params) {

package/lib/chevre/repo/role.js

@@ -11,7 +11,6 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MongoRepository = exports.RoleType = void 0;
 const factory = require("../factory");
-const onIndexCreated_1 = require("./mongoose/onIndexCreated");
 const role_1 = require("./mongoose/schemas/role");
 var RoleType;
 (function (RoleType) {
@@ -23,9 +22,6 @@ var RoleType;
 class MongoRepository {
     constructor(connection) {
         this.roleModel = connection.model(role_1.modelName, role_1.schema);
-        if (connection.get('autoIndex') === true) {
-            this.roleModel.on(onIndexCreated_1.INDEX_EVENT, onIndexCreated_1.onIndexCreated);
-        }
     }
     static CREATE_MONGO_CONDITIONS(params) {
         var _a, _b, _c;

package/lib/chevre/repo/seller.js

@@ -21,7 +21,6 @@ var __rest = (this && this.__rest) || function (s, e) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MongoRepository = void 0;
-const onIndexCreated_1 = require("./mongoose/onIndexCreated");
 const seller_1 = require("./mongoose/schemas/seller");
 const factory = require("../factory");
 /**
@@ -30,9 +29,6 @@ const factory = require("../factory");
 class MongoRepository {
     constructor(connection) {
         this.organizationModel = connection.model(seller_1.modelName, seller_1.schema);
-        if (connection.get('autoIndex') === true) {
-            this.organizationModel.on(onIndexCreated_1.INDEX_EVENT, onIndexCreated_1.onIndexCreated);
-        }
     }
     // tslint:disable-next-line:max-func-body-length
     static CREATE_MONGO_CONDITIONS(params) {

package/lib/chevre/repo/serviceOutput.js

@@ -10,7 +10,6 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MongoRepository = void 0;
-const onIndexCreated_1 = require("./mongoose/onIndexCreated");
 const serviceOutput_1 = require("./mongoose/schemas/serviceOutput");
 const factory = require("../factory");
 /**
@@ -19,9 +18,6 @@ const factory = require("../factory");
 class MongoRepository {
     constructor(connection) {
         this.serviceOutputModel = connection.model(serviceOutput_1.modelName, serviceOutput_1.schema);
-        if (connection.get('autoIndex') === true) {
-            this.serviceOutputModel.on(onIndexCreated_1.INDEX_EVENT, onIndexCreated_1.onIndexCreated);
-        }
     }
     // tslint:disable-next-line:max-func-body-length
     static CREATE_MONGO_CONDITIONS(params) {

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

@@ -3,9 +3,10 @@ import { RedisClientType } from 'redis';
  * サービスアウトプット識別子リポジトリ
  */
 export declare class RedisRepository {
-    static REDIS_KEY_PREFIX: string;
+    private static readonly REDIS_KEY_PREFIX;
     private readonly redisClient;
     constructor(redisClient: RedisClientType);
+    private static createKey;
     /**
      * タイムスタンプから発行する
      */

package/lib/chevre/repo/serviceOutputIdentifier.js

@@ -23,6 +23,9 @@ class RedisRepository {
     constructor(redisClient) {
         this.redisClient = redisClient;
     }
+    static createKey(params) {
+        return util.format('%s:%s', RedisRepository.REDIS_KEY_PREFIX, params.timestamp);
+    }
     /**
      * タイムスタンプから発行する
      */
@@ -35,30 +38,26 @@ class RedisRepository {
             const TTL = moment(params.startDate)
                 .add(1, 'minute') // ミリ秒でカウントしていくので、予約日時後1分で十分
                 .diff(now, 'seconds');
-            const key = util.format('%s:%s', RedisRepository.REDIS_KEY_PREFIX, timestamp);
+            const key = RedisRepository.createKey({ startDate: params.startDate, timestamp });
             const [incrReply] = yield this.redisClient.multi()
                 .incr(key)
                 .expire(key, TTL)
                 .exec();
             // tslint:disable-next-line:no-single-line-block-comment
             /* istanbul ignore else: please write tests */
-            if (typeof incrReply === 'number') {
-                let identifier = timestamp;
-                const no = incrReply;
-                identifier = `${identifier}${no}`;
-                // checkdigit
-                const cd = cdigit.luhn.compute(identifier);
-                const cipher = fpe({ password: cd });
-                identifier = cipher.encrypt(identifier);
-                identifier = `${cd}${identifier}`;
-                return identifier;
-            }
-            else {
+            if (typeof incrReply !== 'number') {
                 // 基本的にありえないフロー
-                throw new factory.errors.ServiceUnavailable('ServiceOutput identifier not published');
+                throw new factory.errors.ServiceUnavailable('serviceOutput identifier not incremented unexpectedly');
             }
+            let identifier = `${timestamp}${incrReply}`;
+            // checkdigit
+            const cd = cdigit.luhn.compute(identifier);
+            identifier = fpe({ password: cd })
+                .encrypt(identifier);
+            identifier = `${cd}${identifier}`;
+            return identifier;
         });
     }
 }
-RedisRepository.REDIS_KEY_PREFIX = 'chevre:serviceOutputIdentifier';
+RedisRepository.REDIS_KEY_PREFIX = 'serviceOutputIdentifier';
 exports.RedisRepository = RedisRepository;

package/lib/chevre/repo/{itemAvailability/screeningEvent.d.ts → stockHolder.d.ts}

@@ -1,5 +1,4 @@
 import { RedisClientType } from 'redis';
-import * as factory from '../../factory';
 export interface IOffer {
     itemOffered?: {
         serviceOutput?: {
@@ -24,10 +23,11 @@ export interface IUnlockKey {
     startDate: Date;
     offer: IOffer;
 }
+export type IGetHolderResult = string | null;
 /**
  * イベントストックホルダーリポジトリ
  */
-export declare class RedisRepository {
+export declare class StockHolderRepository {
     static KEY_PREFIX_NEW: string;
     static KEY_PREFIX: string;
     private readonly redisClient;
@@ -70,13 +70,10 @@ export declare class RedisRepository {
      * 在庫状況を検索する
      * offers.lengthが0だと"ERR wrong number of arguments for 'hmget' command"となるので注意
      */
-    searchAvailability(params: {
+    searchHolders(params: {
         eventId: string;
         startDate: Date;
         offers: IOffer[];
-    }): Promise<{
-        seatSection: string;
-        seatNumber: string;
-        availability: factory.itemAvailability;
-    }[]>;
+    }): Promise<IGetHolderResult[]>;
+    private checkIfConflicted;
 }