@chevre/domain 21.2.0-alpha.2 → 21.2.0-alpha.20

package/lib/chevre/repo/mongoose/schemas/serviceOutput.js

@@ -17,9 +17,10 @@ const schema = new mongoose_1.Schema({
 }, {
     collection: 'serviceOutputs',
     id: true,
-    read: 'primaryPreferred',
+    read: 'primary',
     writeConcern: writeConcern_1.writeConcern,
     strict: false,
+    strictQuery: false,
     useNestedStrict: true,
     timestamps: {
         createdAt: 'createdAt',

package/lib/chevre/repo/mongoose/schemas/task.d.ts

@@ -27,12 +27,13 @@ declare const modelName = "Task";
 /**
  * タスクスキーマ
  */
-declare const schema: Schema<any, import("mongoose").Model<any, any, any, any, any>, {}, {}, {}, {}, import("mongoose").ResolveSchemaOptions<{
+declare const schema: Schema<any, import("mongoose").Model<any, any, any, any, any, any>, {}, {}, {}, {}, {
     collection: string;
     id: true;
     read: string;
     writeConcern: import("mongodb").WriteConcern;
     strict: true;
+    strictQuery: false;
     useNestedStrict: boolean;
     timestamps: {
         createdAt: string;
@@ -50,7 +51,7 @@ declare const schema: Schema<any, import("mongoose").Model<any, any, any, any, a
         minimize: false;
         versionKey: false;
     };
-}>, {
+}, {
     executionResults: any[];
     name?: string | undefined;
     status?: string | undefined;
@@ -61,5 +62,29 @@ declare const schema: Schema<any, import("mongoose").Model<any, any, any, any, a
     lastTriedAt?: Date | undefined;
     numberOfTried?: number | undefined;
     dateAborted?: Date | undefined;
-}>;
+}, import("mongoose").Document<unknown, {}, import("mongoose").FlatRecord<{
+    executionResults: any[];
+    name?: string | undefined;
+    status?: string | undefined;
+    data?: any;
+    project?: any;
+    runsAt?: Date | undefined;
+    remainingNumberOfTries?: number | undefined;
+    lastTriedAt?: Date | undefined;
+    numberOfTried?: number | undefined;
+    dateAborted?: Date | undefined;
+}>> & Omit<import("mongoose").FlatRecord<{
+    executionResults: any[];
+    name?: string | undefined;
+    status?: string | undefined;
+    data?: any;
+    project?: any;
+    runsAt?: Date | undefined;
+    remainingNumberOfTries?: number | undefined;
+    lastTriedAt?: Date | undefined;
+    numberOfTried?: number | undefined;
+    dateAborted?: Date | undefined;
+}> & {
+    _id: import("mongoose").Types.ObjectId;
+}, never>>;
 export { modelName, schema };

package/lib/chevre/repo/mongoose/schemas/task.js

@@ -22,9 +22,10 @@ const schema = new mongoose_1.Schema({
 }, {
     collection: 'tasks',
     id: true,
-    read: 'primaryPreferred',
+    read: 'primary',
     writeConcern: writeConcern_1.writeConcern,
     strict: true,
+    strictQuery: false,
     useNestedStrict: true,
     timestamps: {
         createdAt: 'createdAt',

package/lib/chevre/repo/mongoose/schemas/telemetry.d.ts

@@ -27,12 +27,13 @@ declare const modelName = "Telemetry";
 /**
  * 測定スキーマ
  */
-declare const schema: Schema<any, import("mongoose").Model<any, any, any, any, any>, {}, {}, {}, {}, import("mongoose").ResolveSchemaOptions<{
+declare const schema: Schema<any, import("mongoose").Model<any, any, any, any, any, any>, {}, {}, {}, {}, {
     collection: string;
     id: true;
     read: string;
     writeConcern: import("mongodb").WriteConcern;
     strict: true;
+    strictQuery: false;
     useNestedStrict: boolean;
     timestamps: {
         createdAt: string;
@@ -50,13 +51,31 @@ declare const schema: Schema<any, import("mongoose").Model<any, any, any, any, a
         minimize: false;
         versionKey: false;
     };
-}>, {
+}, {
     object?: any;
     error?: any;
+    result?: any;
+    project?: any;
+    startDate?: Date | undefined;
+    endDate?: Date | undefined;
+    purpose?: any;
+}, import("mongoose").Document<unknown, {}, import("mongoose").FlatRecord<{
+    object?: any;
+    error?: any;
+    result?: any;
     project?: any;
     startDate?: Date | undefined;
     endDate?: Date | undefined;
+    purpose?: any;
+}>> & Omit<import("mongoose").FlatRecord<{
+    object?: any;
+    error?: any;
     result?: any;
+    project?: any;
+    startDate?: Date | undefined;
+    endDate?: Date | undefined;
     purpose?: any;
-}>;
+}> & {
+    _id: import("mongoose").Types.ObjectId;
+}, never>>;
 export { modelName, schema };

package/lib/chevre/repo/mongoose/schemas/telemetry.js

@@ -22,6 +22,7 @@ const schema = new mongoose_1.Schema({
     read: 'primaryPreferred',
     writeConcern: writeConcern_1.writeConcern,
     strict: true,
+    strictQuery: false,
     useNestedStrict: true,
     timestamps: {
         createdAt: 'createdAt',

package/lib/chevre/repo/mongoose/schemas/transaction.d.ts

@@ -27,12 +27,13 @@ declare const modelName = "Transaction";
 /**
  * 取引スキーマ
  */
-declare const schema: Schema<any, import("mongoose").Model<any, any, any, any, any>, {}, {}, {}, {}, import("mongoose").ResolveSchemaOptions<{
+declare const schema: Schema<any, import("mongoose").Model<any, any, any, any, any, any>, {}, {}, {}, {}, {
     collection: string;
     id: true;
     read: string;
     writeConcern: import("mongodb").WriteConcern;
     strict: true;
+    strictQuery: false;
     useNestedStrict: boolean;
     timestamps: {
         createdAt: string;
@@ -50,11 +51,28 @@ declare const schema: Schema<any, import("mongoose").Model<any, any, any, any, a
         minimize: false;
         versionKey: false;
     };
-}>, {
+}, {
     object?: any;
     typeOf?: string | undefined;
+    error?: any;
     status?: string | undefined;
+    result?: any;
+    expires?: Date | undefined;
+    project?: any;
+    agent?: any;
+    recipient?: any;
+    startDate?: Date | undefined;
+    endDate?: Date | undefined;
+    potentialActions?: any;
+    tasksExportationStatus?: string | undefined;
+    tasksExportedAt?: Date | undefined;
+    seller?: any;
+}, import("mongoose").Document<unknown, {}, import("mongoose").FlatRecord<{
+    object?: any;
+    typeOf?: string | undefined;
     error?: any;
+    status?: string | undefined;
+    result?: any;
     expires?: Date | undefined;
     project?: any;
     agent?: any;
@@ -64,7 +82,24 @@ declare const schema: Schema<any, import("mongoose").Model<any, any, any, any, a
     potentialActions?: any;
     tasksExportationStatus?: string | undefined;
     tasksExportedAt?: Date | undefined;
+    seller?: any;
+}>> & Omit<import("mongoose").FlatRecord<{
+    object?: any;
+    typeOf?: string | undefined;
+    error?: any;
+    status?: string | undefined;
     result?: any;
+    expires?: Date | undefined;
+    project?: any;
+    agent?: any;
+    recipient?: any;
+    startDate?: Date | undefined;
+    endDate?: Date | undefined;
+    potentialActions?: any;
+    tasksExportationStatus?: string | undefined;
+    tasksExportedAt?: Date | undefined;
     seller?: any;
-}>;
+}> & {
+    _id: import("mongoose").Types.ObjectId;
+}, never>>;
 export { modelName, schema };

package/lib/chevre/repo/mongoose/schemas/transaction.js

@@ -28,9 +28,10 @@ const schema = new mongoose_1.Schema({
 }, {
     collection: 'transactions',
     id: true,
-    read: 'primaryPreferred',
+    read: 'primary',
     writeConcern: writeConcern_1.writeConcern,
     strict: true,
+    strictQuery: false,
     useNestedStrict: true,
     timestamps: {
         createdAt: 'createdAt',

package/lib/chevre/repo/mongoose/schemas/trip.d.ts

@@ -27,12 +27,13 @@ declare const modelName = "Trip";
 /**
  * トリップスキーマ
  */
-declare const schema: Schema<any, import("mongoose").Model<any, any, any, any, any>, {}, {}, {}, {}, import("mongoose").ResolveSchemaOptions<{
+declare const schema: Schema<any, import("mongoose").Model<any, any, any, any, any, any>, {}, {}, {}, {}, {
     collection: string;
     id: true;
     read: string;
     writeConcern: import("mongodb").WriteConcern;
     strict: false;
+    strictQuery: false;
     useNestedStrict: boolean;
     timestamps: {
         createdAt: string;
@@ -50,8 +51,16 @@ declare const schema: Schema<any, import("mongoose").Model<any, any, any, any, a
         minimize: false;
         versionKey: false;
     };
-}>, {
+}, {
     typeOf: string;
     project?: any;
-}>;
+}, import("mongoose").Document<unknown, {}, import("mongoose").FlatRecord<{
+    typeOf: string;
+    project?: any;
+}>> & Omit<import("mongoose").FlatRecord<{
+    typeOf: string;
+    project?: any;
+}> & {
+    _id: import("mongoose").Types.ObjectId;
+}, never>>;
 export { modelName, schema };

package/lib/chevre/repo/mongoose/schemas/trip.js

@@ -20,6 +20,7 @@ const schema = new mongoose_1.Schema({
     read: 'primaryPreferred',
     writeConcern: writeConcern_1.writeConcern,
     strict: false,
+    strictQuery: false,
     useNestedStrict: true,
     timestamps: {
         createdAt: 'createdAt',

package/lib/chevre/repo/offer.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 offer_1 = require("./mongoose/schemas/offer");
 const offerCatalog_1 = require("./mongoose/schemas/offerCatalog");
 /**
@@ -33,10 +32,6 @@ class MongoRepository {
     constructor(connection) {
         this.offerModel = connection.model(offer_1.modelName, offer_1.schema);
         this.offerCatalogModel = connection.model(offerCatalog_1.modelName, offerCatalog_1.schema);
-        if (connection.get('autoIndex') === true) {
-            this.offerModel.on(onIndexCreated_1.INDEX_EVENT, onIndexCreated_1.onIndexCreated);
-            this.offerCatalogModel.on(onIndexCreated_1.INDEX_EVENT, onIndexCreated_1.onIndexCreated);
-        }
     }
     // tslint:disable-next-line:cyclomatic-complexity max-func-body-length
     static CREATE_OFFER_MONGO_CONDITIONS(params) {

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.d.ts

@@ -1,3 +1,27 @@
+/// <reference types="mongoose/types/aggregate" />
+/// <reference types="mongoose/types/callback" />
+/// <reference types="mongoose/types/collection" />
+/// <reference types="mongoose/types/connection" />
+/// <reference types="mongoose/types/cursor" />
+/// <reference types="mongoose/types/document" />
+/// <reference types="mongoose/types/error" />
+/// <reference types="mongoose/types/expressions" />
+/// <reference types="mongoose/types/helpers" />
+/// <reference types="mongoose/types/middlewares" />
+/// <reference types="mongoose/types/indexes" />
+/// <reference types="mongoose/types/models" />
+/// <reference types="mongoose/types/mongooseoptions" />
+/// <reference types="mongoose/types/pipelinestage" />
+/// <reference types="mongoose/types/populate" />
+/// <reference types="mongoose/types/query" />
+/// <reference types="mongoose/types/schemaoptions" />
+/// <reference types="mongoose/types/schematypes" />
+/// <reference types="mongoose/types/session" />
+/// <reference types="mongoose/types/types" />
+/// <reference types="mongoose/types/utility" />
+/// <reference types="mongoose/types/validation" />
+/// <reference types="mongoose/types/virtuals" />
+/// <reference types="mongoose/types/inferschematype" />
 import { Connection } from 'mongoose';
 import * as factory from '../factory';
 /**
@@ -86,4 +110,5 @@ export declare class MongoRepository {
             $in: string[];
         };
     }): Promise<(string)[]>;
+    getCursor(conditions: any, projection: any): import("mongoose").Cursor<any, import("mongoose").QueryOptions<any>>;
 }

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) {
@@ -1014,5 +1010,10 @@ class MongoRepository {
             return [...new Set(reservationNumbers)];
         });
     }
+    getCursor(conditions, projection) {
+        return this.orderModel.find(conditions, projection)
+            .sort({ orderDate: factory.sortType.Descending })
+            .cursor();
+    }
 }
 exports.MongoRepository = MongoRepository;

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;