@chevre/domain 21.2.0-alpha.4 → 21.2.0-alpha.6

package/example/src/chevre/lockStockHolder.ts

@@ -0,0 +1,48 @@
+// tslint:disable:no-console
+import * as moment from 'moment';
+import * as redis from 'redis';
+
+import { chevre } from '../../../lib/index';
+
+// const project = { id: String(process.env.PROJECT_ID) };
+
+// tslint:disable-next-line:max-func-body-length
+async function main() {
+    const client = redis.createClient<redis.RedisDefaultModules, Record<string, never>, Record<string, never>>({
+        socket: {
+            port: Number(<string>process.env.REDIS_PORT),
+            host: <string>process.env.REDIS_HOST
+        },
+        password: <string>process.env.REDIS_KEY
+    });
+    await client.connect();
+
+    const startDate = moment('2023-04-18T00:00:00Z');
+
+    const stockHolderRepo = new chevre.repository.StockHolder(client);
+    await stockHolderRepo.lock({
+        eventId: 'sampleEventId',
+        startDate: startDate.toDate(),
+        offers: [
+            {
+                seatSection: 'sampleSeatSection',
+                seatNumber: 'sampleSeatNumber'
+            },
+            {
+                seatSection: 'sampleSeatSection1',
+                seatNumber: 'sampleSeatNumber1'
+            }
+        ],
+        expires: moment(startDate)
+            .add(1, 'month')
+            .toDate(),
+        holder: 'sampleStockHolder'
+    });
+    console.log('locked');
+}
+
+main()
+    .then(() => {
+        console.log('success!');
+    })
+    .catch(console.error);

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/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

@@ -276,12 +276,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/serviceOutputIdentifier.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/serviceOutputIdentifier.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");
 /**
  * サービスアウトプット識別子リポジトリ
  */
@@ -25,15 +24,7 @@ class RedisRepository {
         this.redisClient = redisClient;
     }
     static createKey(params) {
-        const useNewKey = params.startDate instanceof Date
-            && moment(params.startDate)
-                .isSameOrAfter(settings_1.USE_NEW_ORDER_NUMBER_KEY_FROM);
-        if (useNewKey) {
-            return util.format('%s:%s', RedisRepository.REDIS_KEY_PREFIX_NEW, params.timestamp);
-        }
-        else {
-            return util.format('%s:%s', RedisRepository.REDIS_KEY_PREFIX, params.timestamp);
-        }
+        return util.format('%s:%s', RedisRepository.REDIS_KEY_PREFIX, params.timestamp);
     }
     /**
      * タイムスタンプから発行する
@@ -68,6 +59,5 @@ class RedisRepository {
         });
     }
 }
-RedisRepository.REDIS_KEY_PREFIX_NEW = 'serviceOutputIdentifier';
-RedisRepository.REDIS_KEY_PREFIX = 'chevre:serviceOutputIdentifier';
+RedisRepository.REDIS_KEY_PREFIX = 'serviceOutputIdentifier';
 exports.RedisRepository = RedisRepository;

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

@@ -75,4 +75,5 @@ export declare class StockHolderRepository {
         startDate: Date;
         offers: IOffer[];
     }): Promise<IGetHolderResult[]>;
+    private checkIfConflicted;
 }

package/lib/chevre/repo/stockHolder.js

@@ -32,9 +32,11 @@ class StockHolderRepository {
         return `${params.seatSection}:${params.seatNumber}`;
     }
     static createKey(params) {
-        const useNewKey = params.startDate instanceof Date
-            && moment(params.startDate)
-                .isSameOrAfter(settings_1.USE_NEW_EVENT_AVAILABILITY_KEY_FROM);
+        if (!(params.startDate instanceof Date)) {
+            throw new factory.errors.Argument('startDate', 'must be Date');
+        }
+        const useNewKey = moment(params.startDate)
+            .isSameOrAfter(settings_1.USE_NEW_EVENT_AVAILABILITY_KEY_FROM);
         if (useNewKey) {
             return `${StockHolderRepository.KEY_PREFIX_NEW}:${params.eventId}`;
         }
@@ -64,7 +66,11 @@ class StockHolderRepository {
      */
     lock(lockKey) {
         return __awaiter(this, void 0, void 0, function* () {
+            if (!(lockKey.expires instanceof Date)) {
+                throw new factory.errors.Argument('expires', 'must be Date');
+            }
             const key = StockHolderRepository.createKey({ eventId: lockKey.eventId, startDate: lockKey.startDate });
+            yield this.checkIfConflicted({ key, eventId: lockKey.eventId });
             const value = lockKey.holder;
             const multi = this.redisClient.multi();
             const fields = lockKey.offers.map((offer) => StockHolderRepository.offer2field(offer));
@@ -74,7 +80,6 @@ class StockHolderRepository {
             const results = yield multi.expireAt(key, moment(lockKey.expires)
                 .unix())
                 .exec();
-            debug('results:', results);
             const lockedFields = [];
             if (Array.isArray(results)) {
                 results.slice(0, fields.length)
@@ -84,17 +89,25 @@ class StockHolderRepository {
                     }
                 });
             }
-            debug('locked fields:', lockedFields);
             const lockedAll = lockedFields.length === fields.length;
             debug('lockedAll?', lockedAll);
-            if (!lockedAll) {
+            // expireAtReplyの検証も追加する(2023-04-19~)
+            const expiredAll = results.slice(fields.length)
+                .every((r) => (r === 1 || r === true));
+            debug('expiredAll?', expiredAll);
+            if (!lockedAll || !expiredAll) {
                 if (lockedFields.length > 0) {
                     // 全て仮押さえできなければ仮押さえできたものは解除
                     yield this.redisClient.multi()
                         .hDel(key, lockedFields)
                         .exec();
                 }
-                throw new factory.errors.AlreadyInUse(factory.reservationType.EventReservation, ['ticketedSeat'], 'Already hold');
+                if (!lockedAll) {
+                    throw new factory.errors.AlreadyInUse(factory.reservationType.EventReservation, ['ticketedSeat'], 'Already hold');
+                }
+                else {
+                    throw new factory.errors.ServiceUnavailable('timeout cannot be set unexpectedly');
+                }
             }
         });
     }
@@ -104,6 +117,7 @@ class StockHolderRepository {
     unlock(params) {
         return __awaiter(this, void 0, void 0, function* () {
             const key = StockHolderRepository.createKey({ eventId: params.eventId, startDate: params.startDate });
+            yield this.checkIfConflicted({ key, eventId: params.eventId });
             const field = StockHolderRepository.offer2field(params.offer);
             yield this.redisClient.multi()
                 .hDel(key, field)
@@ -200,6 +214,29 @@ class StockHolderRepository {
             return result;
         });
     }
+    checkIfConflicted(params) {
+        return __awaiter(this, void 0, void 0, function* () {
+            // 旧キーと新キーの両方存在検証(念のため)
+            const oldKey = StockHolderRepository.createKey({ eventId: params.eventId, startDate: new Date('2020-01-01T00:00:00Z') });
+            const newKey = StockHolderRepository.createKey({ eventId: params.eventId, startDate: new Date('2030-01-01T00:00:00Z') });
+            if (params.key !== oldKey) {
+                // newの場合oldが存在するはずがない
+                const existingOldKeyCount = yield this.redisClient.exists(oldKey);
+                debug('existingOldKeyCount:', existingOldKeyCount);
+                if (existingOldKeyCount > 0) {
+                    throw new factory.errors.ServiceUnavailable('stockHolder keys conflicted');
+                }
+            }
+            if (params.key !== newKey) {
+                //  oldの場合newが存在するはずがない
+                const existingNewKeyCount = yield this.redisClient.exists(newKey);
+                debug('existingNewKeyCount:', existingNewKeyCount);
+                if (existingNewKeyCount > 0) {
+                    throw new factory.errors.ServiceUnavailable('stockHolder keys conflicted');
+                }
+            }
+        });
+    }
 }
 StockHolderRepository.KEY_PREFIX_NEW = 'stockHolder';
 StockHolderRepository.KEY_PREFIX = 'chevre:itemAvailability:screeningEvent';

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

@@ -6,7 +6,6 @@ interface IPublishResult {
  * 取引番号リポジトリ
  */
 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/transactionNumber.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");
 /**
  * 取引番号リポジトリ
  */
@@ -25,15 +24,7 @@ class RedisRepository {
         this.redisClient = redisClient;
     }
     static createKey(params) {
-        const useNewKey = params.startDate instanceof Date
-            && moment(params.startDate)
-                .isSameOrAfter(settings_1.USE_NEW_ORDER_NUMBER_KEY_FROM);
-        if (useNewKey) {
-            return util.format('%s:%s', RedisRepository.REDIS_KEY_PREFIX_NEW, params.timestamp);
-        }
-        else {
-            return util.format('%s:%s', RedisRepository.REDIS_KEY_PREFIX, params.timestamp);
-        }
+        return util.format('%s:%s', RedisRepository.REDIS_KEY_PREFIX, params.timestamp);
     }
     /**
      * タイムスタンプから発行する
@@ -68,6 +59,5 @@ class RedisRepository {
         });
     }
 }
-RedisRepository.REDIS_KEY_PREFIX_NEW = 'transactionNumber';
-RedisRepository.REDIS_KEY_PREFIX = 'chevre:transactionNumber';
+RedisRepository.REDIS_KEY_PREFIX = 'transactionNumber';
 exports.RedisRepository = RedisRepository;

package/lib/chevre/settings.d.ts

@@ -31,7 +31,6 @@ export declare const USE_ASSET_TRANSACTION_SYNC_PROCESSING: boolean;
 export declare const USE_PAY_ASSET_TRANSACTION_SYNC_PROCESSING: boolean;
 export declare const USE_NEW_EVENT_AVAILABILITY_KEY_FROM: moment.Moment;
 export declare const USE_NEW_CONFIRMATION_NUMBER_KEY_FROM: moment.Moment;
-export declare const USE_NEW_ORDER_NUMBER_KEY_FROM: moment.Moment;
 /**
  * グローバル設定
  */

package/lib/chevre/settings.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.settings = exports.USE_NEW_ORDER_NUMBER_KEY_FROM = exports.USE_NEW_CONFIRMATION_NUMBER_KEY_FROM = exports.USE_NEW_EVENT_AVAILABILITY_KEY_FROM = exports.USE_PAY_ASSET_TRANSACTION_SYNC_PROCESSING = exports.USE_ASSET_TRANSACTION_SYNC_PROCESSING = exports.DEFAULT_PAYMENT_METHOD_TYPE_FOR_CREDIT_CARD = exports.DEFAULT_SENDER_EMAIL = exports.TRANSACTION_CANCELED_STORAGE_PERIOD_IN_DAYS = exports.TRANSACTION_CONFIRMED_STORAGE_PERIOD_IN_DAYS = exports.ASSET_TRANSACTION_STORAGE_PERIOD_IN_DAYS = exports.ABORTED_TASKS_WITHOUT_REPORT = void 0;
+exports.settings = exports.USE_NEW_CONFIRMATION_NUMBER_KEY_FROM = exports.USE_NEW_EVENT_AVAILABILITY_KEY_FROM = exports.USE_PAY_ASSET_TRANSACTION_SYNC_PROCESSING = exports.USE_ASSET_TRANSACTION_SYNC_PROCESSING = exports.DEFAULT_PAYMENT_METHOD_TYPE_FOR_CREDIT_CARD = exports.DEFAULT_SENDER_EMAIL = exports.TRANSACTION_CANCELED_STORAGE_PERIOD_IN_DAYS = exports.TRANSACTION_CONFIRMED_STORAGE_PERIOD_IN_DAYS = exports.ASSET_TRANSACTION_STORAGE_PERIOD_IN_DAYS = exports.ABORTED_TASKS_WITHOUT_REPORT = void 0;
 const moment = require("moment");
 const factory = require("./factory");
 const transactionWebhookUrls = (typeof process.env.INFORM_TRANSACTION_URL === 'string')
@@ -48,13 +48,10 @@ exports.USE_ASSET_TRANSACTION_SYNC_PROCESSING = process.env.USE_ASSET_TRANSACTIO
 exports.USE_PAY_ASSET_TRANSACTION_SYNC_PROCESSING = process.env.USE_PAY_ASSET_TRANSACTION_SYNC_PROCESSING === '1';
 exports.USE_NEW_EVENT_AVAILABILITY_KEY_FROM = (typeof process.env.USE_NEW_EVENT_AVAILABILITY_KEY_FROM === 'string')
     ? moment(process.env.USE_NEW_EVENT_AVAILABILITY_KEY_FROM)
-    : moment('2023-07-23T15:00:00Z');
+    : moment('2023-08-31T15:00:00Z');
 exports.USE_NEW_CONFIRMATION_NUMBER_KEY_FROM = (typeof process.env.USE_NEW_CONFIRMATION_NUMBER_KEY_FROM === 'string')
     ? moment(process.env.USE_NEW_CONFIRMATION_NUMBER_KEY_FROM)
     : moment('2023-04-30T15:00:00Z');
-exports.USE_NEW_ORDER_NUMBER_KEY_FROM = (typeof process.env.USE_NEW_ORDER_NUMBER_KEY_FROM === 'string')
-    ? moment(process.env.USE_NEW_ORDER_NUMBER_KEY_FROM)
-    : moment('2023-04-18T15:00:00Z');
 /**
  * グローバル設定
  */

package/package.json

@@ -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.4"
+  "version": "21.2.0-alpha.6"
 }