@chevre/domain 21.1.0-alpha.3 → 21.2.0-alpha.0

package/example/src/chevre/publishConfirmationNumber.ts

@@ -0,0 +1,27 @@
+// tslint:disable:no-console
+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: {
+            host: process.env.REDIS_HOST,
+            port: Number(process.env.REDIS_PORT)
+        },
+        password: process.env.REDIS_KEY
+    });
+    await client.connect();
+
+    const confirmationNumberRepo = new chevre.repository.ConfirmationNumber(client);
+    await confirmationNumberRepo.publish({ orderDate: new Date() });
+}
+
+main()
+    .then(() => {
+        console.log('success!');
+    })
+    .catch(console.error);

package/lib/chevre/repo/action/registerServiceInProgress.js

@@ -24,13 +24,13 @@ class RedisRepository {
         return __awaiter(this, void 0, void 0, function* () {
             const key = `${RedisRepository.KEY_PREFIX}:${progressKey.agent.id}:${progressKey.product.id}`;
             const ttl = 7200;
-            const results = yield this.redisClient.multi()
+            const [setNXReply] = yield this.redisClient.multi()
                 .setNX(key, holder)
                 .expire(key, ttl)
                 .exec();
             // tslint:disable-next-line:no-single-line-block-comment
             /* istanbul ignore else: please write tests */
-            if (Array.isArray(results) && (results[0] === 1 || results[0] === true)) {
+            if (setNXReply === 1 || setNXReply === true) {
                 return true;
             }
             else {

package/lib/chevre/repo/confirmationNumber.js

@@ -44,18 +44,18 @@ class RedisRepository {
             const key = util.format('%s:%s', RedisRepository.REDIS_KEY_PREFIX, moment(params.orderDate)
                 .tz('Asia/Tokyo')
                 .format('YYMM'));
-            const results = yield this.redisClient.multi()
+            const [incrReply] = yield this.redisClient.multi()
                 .incr(key)
                 .expire(key, TTL)
                 .exec();
-            if (!Array.isArray(results)) {
-                // なぜかresults: nullのことがあるのでハンドリング
-                throw new factory.errors.ServiceUnavailable('incr confirmationNumber result not array');
-            }
+            // if (!Array.isArray(results)) {
+            //     // なぜかresults: nullのことがあるのでハンドリング
+            //     throw new factory.errors.ServiceUnavailable('incr confirmationNumber result not array');
+            // }
             // tslint:disable-next-line:no-single-line-block-comment
             /* istanbul ignore else: please write tests */
-            if (typeof results[0] === 'number') {
-                const no = results[0];
+            if (typeof incrReply === 'number') {
+                const no = incrReply;
                 // debug('no incremented.', no);
                 // 桁数調整
                 let confirmationNumber = RedisRepository.ALIGN_DIGITS(String(no));

package/lib/chevre/repo/itemAvailability/screeningEvent.d.ts

@@ -14,22 +14,29 @@ export interface IOffer {
 }
 export interface ILockKey {
     eventId: string;
+    startDate: Date;
     offers: IOffer[];
     expires: Date;
     holder: string;
 }
 export interface IUnlockKey {
     eventId: string;
+    startDate: Date;
     offer: IOffer;
 }
 /**
  * イベントの座席在庫リポジトリ
  */
 export declare class RedisRepository {
+    static KEY_PREFIX_NEW: string;
     static KEY_PREFIX: string;
     private readonly redisClient;
     constructor(redisClient: RedisClientType);
     static OFFER2FIELD(params: IOffer): string;
+    static CREATE_KEY(params: {
+        eventId: string;
+        startDate: Date;
+    }): string;
     /**
      * 座席をロックする(maxキャパシティチェック有)
      */
@@ -47,6 +54,7 @@ export declare class RedisRepository {
      */
     findUnavailableOffersByEventId(params: {
         eventId: string;
+        startDate: Date;
     }): Promise<IOffer[]>;
     /**
      * 空席でない座席をカウントする
@@ -54,6 +62,7 @@ export declare class RedisRepository {
     countUnavailableOffers(params: {
         event: {
             id: string;
+            startDate: Date;
         };
     }): Promise<number>;
     /**
@@ -66,6 +75,7 @@ export declare class RedisRepository {
      */
     searchAvailability(params: {
         eventId: string;
+        startDate: Date;
         offers: IOffer[];
     }): Promise<{
         seatSection: string;

package/lib/chevre/repo/itemAvailability/screeningEvent.js

@@ -13,6 +13,7 @@ exports.RedisRepository = void 0;
 const createDebug = require("debug");
 const moment = require("moment");
 const factory = require("../../factory");
+const settings_1 = require("../../settings");
 const debug = createDebug('chevre-domain:repo');
 /**
  * イベントの座席在庫リポジトリ
@@ -30,12 +31,23 @@ class RedisRepository {
         }
         return `${params.seatSection}:${params.seatNumber}`;
     }
+    static CREATE_KEY(params) {
+        const useNewKey = params.startDate instanceof Date
+            && moment(params.startDate)
+                .isAfter(settings_1.USE_NEW_EVENT_AVAILABILITY_KEY_FROM);
+        if (useNewKey) {
+            return `${RedisRepository.KEY_PREFIX_NEW}:${params.eventId}`;
+        }
+        else {
+            return `${RedisRepository.KEY_PREFIX}:${params.eventId}`;
+        }
+    }
     /**
      * 座席をロックする(maxキャパシティチェック有)
      */
     lockIfNotLimitExceeded(lockKey, maximum) {
         return __awaiter(this, void 0, void 0, function* () {
-            const key = `${RedisRepository.KEY_PREFIX}:${lockKey.eventId}`;
+            const key = RedisRepository.CREATE_KEY({ eventId: lockKey.eventId, startDate: lockKey.startDate });
             yield this.redisClient.watch(key);
             const hashCount = yield this.redisClient.hLen(key);
             // Process result
@@ -52,8 +64,7 @@ class RedisRepository {
      */
     lock(lockKey) {
         return __awaiter(this, void 0, void 0, function* () {
-            debug('locking...', lockKey);
-            const key = `${RedisRepository.KEY_PREFIX}:${lockKey.eventId}`;
+            const key = RedisRepository.CREATE_KEY({ eventId: lockKey.eventId, startDate: lockKey.startDate });
             const value = lockKey.holder;
             const multi = this.redisClient.multi();
             const fields = lockKey.offers.map((offer) => RedisRepository.OFFER2FIELD(offer));
@@ -92,12 +103,11 @@ class RedisRepository {
      */
     unlock(params) {
         return __awaiter(this, void 0, void 0, function* () {
-            const key = `${RedisRepository.KEY_PREFIX}:${params.eventId}`;
+            const key = RedisRepository.CREATE_KEY({ eventId: params.eventId, startDate: params.startDate });
             const field = RedisRepository.OFFER2FIELD(params.offer);
-            const reply = yield this.redisClient.multi()
+            yield this.redisClient.multi()
                 .hDel(key, field)
                 .exec();
-            debug('reply:', reply);
         });
     }
     /**
@@ -105,7 +115,7 @@ class RedisRepository {
      */
     findUnavailableOffersByEventId(params) {
         return __awaiter(this, void 0, void 0, function* () {
-            const key = `${RedisRepository.KEY_PREFIX}:${params.eventId}`;
+            const key = RedisRepository.CREATE_KEY({ eventId: params.eventId, startDate: params.startDate });
             const reply = yield this.redisClient.hGetAll(key);
             let offers = [];
             if (reply !== null) {
@@ -124,7 +134,7 @@ class RedisRepository {
      */
     countUnavailableOffers(params) {
         return __awaiter(this, void 0, void 0, function* () {
-            const key = `${RedisRepository.KEY_PREFIX}:${params.event.id}`;
+            const key = RedisRepository.CREATE_KEY({ eventId: params.event.id, startDate: params.event.startDate });
             const reply = yield this.redisClient.hLen(key);
             let fieldCount = 0;
             if (typeof reply === 'number') {
@@ -138,7 +148,7 @@ class RedisRepository {
      */
     getHolder(params) {
         return __awaiter(this, void 0, void 0, function* () {
-            const key = `${RedisRepository.KEY_PREFIX}:${params.eventId}`;
+            const key = RedisRepository.CREATE_KEY({ eventId: params.eventId, startDate: params.startDate });
             const field = RedisRepository.OFFER2FIELD(params.offer);
             return this.redisClient.hGet(key, field);
         });
@@ -149,7 +159,7 @@ class RedisRepository {
      */
     searchAvailability(params) {
         return __awaiter(this, void 0, void 0, function* () {
-            const key = `${RedisRepository.KEY_PREFIX}:${params.eventId}`;
+            const key = RedisRepository.CREATE_KEY({ eventId: params.eventId, startDate: params.startDate });
             const fields = params.offers.map((o) => {
                 return RedisRepository.OFFER2FIELD(o);
             });
@@ -166,5 +176,6 @@ class RedisRepository {
         });
     }
 }
+RedisRepository.KEY_PREFIX_NEW = 'stockHolder';
 RedisRepository.KEY_PREFIX = 'chevre:itemAvailability:screeningEvent';
 exports.RedisRepository = RedisRepository;

package/lib/chevre/repo/orderNumber.js

@@ -38,19 +38,19 @@ class RedisRepository {
                 .add(1, 'minute') // ミリ秒でカウントしていくので、注文日時後1分で十分
                 .diff(now, 'seconds');
             const key = util.format('%s:%s:%s', RedisRepository.REDIS_KEY_PREFIX, projectPrefix, timestamp);
-            const results = yield this.redisClient.multi()
+            const [incrReply] = yield this.redisClient.multi()
                 .incr(key)
                 .expire(key, TTL)
                 .exec();
-            if (!Array.isArray(results)) {
-                // なぜかresults: nullのことがあるのでハンドリング
-                throw new factory.errors.ServiceUnavailable('incr orderNumber result not array');
-            }
+            // if (!Array.isArray(results)) {
+            //     // なぜかresults: nullのことがあるのでハンドリング
+            //     throw new factory.errors.ServiceUnavailable('incr orderNumber result not array');
+            // }
             // tslint:disable-next-line:no-single-line-block-comment
             /* istanbul ignore else: please write tests */
-            if (typeof results[0] === 'number') {
+            if (typeof incrReply === 'number') {
                 let orderNumber = timestamp;
-                const no = results[0];
+                const no = incrReply;
                 orderNumber = `${orderNumber}${no}`;
                 // checkdigit
                 const cd = cdigit.luhn.compute(orderNumber);

package/lib/chevre/repo/serviceOutputIdentifier.js

@@ -36,15 +36,15 @@ class RedisRepository {
                 .add(1, 'minute') // ミリ秒でカウントしていくので、予約日時後1分で十分
                 .diff(now, 'seconds');
             const key = util.format('%s:%s', RedisRepository.REDIS_KEY_PREFIX, timestamp);
-            const results = yield this.redisClient.multi()
+            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 (Array.isArray(results) && typeof results[0] === 'number') {
+            if (typeof incrReply === 'number') {
                 let identifier = timestamp;
-                const no = results[0];
+                const no = incrReply;
                 identifier = `${identifier}${no}`;
                 // checkdigit
                 const cd = cdigit.luhn.compute(identifier);

package/lib/chevre/repo/transactionNumber.js

@@ -36,15 +36,15 @@ class RedisRepository {
                 .add(1, 'minute') // ミリ秒でカウントしていくので、予約日時後1分で十分
                 .diff(now, 'seconds');
             const key = util.format('%s:%s', RedisRepository.REDIS_KEY_PREFIX, timestamp);
-            const results = yield this.redisClient.multi()
+            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 (Array.isArray(results) && typeof results[0] === 'number') {
+            if (typeof incrReply === 'number') {
                 let transactionNumber = timestamp;
-                const no = results[0];
+                const no = incrReply;
                 transactionNumber = `${transactionNumber}${no}`;
                 // checkdigit
                 const cd = cdigit.luhn.compute(transactionNumber);

package/lib/chevre/service/aggregation/event/aggregateScreeningEvent.js

@@ -389,6 +389,8 @@ function filterByEligibleSeatingType(params) {
         if (maximumAttendeeCapacity > 0) {
             const availabilities = yield repos.eventAvailability.searchAvailability({
                 eventId: params.event.id,
+                startDate: moment(params.event.startDate)
+                    .toDate(),
                 offers: eligibleSeatOffers
             });
             remainingAttendeeCapacity = availabilities.filter((a) => a.availability === factory.itemAvailability.InStock).length;
@@ -436,7 +438,13 @@ function aggregateReservationByEvent(params) {
         // remainingAttendeeCapacityを決定
         if (typeof maximumAttendeeCapacity === 'number') {
             // 残席数を座席ロック数から計算
-            const unavailableOfferCount = yield repos.eventAvailability.countUnavailableOffers({ event: { id: params.event.id } });
+            const unavailableOfferCount = yield repos.eventAvailability.countUnavailableOffers({
+                event: {
+                    id: params.event.id,
+                    startDate: moment(params.event.startDate)
+                        .toDate()
+                }
+            });
             remainingAttendeeCapacity = maximumAttendeeCapacity - unavailableOfferCount;
             if (remainingAttendeeCapacity < 0) {
                 remainingAttendeeCapacity = 0;

package/lib/chevre/service/assetTransaction/reserve.js

@@ -577,6 +577,8 @@ function processLockSeats(params) {
         if (typeof maximumAttendeeCapacity4event === 'number') {
             yield repos.eventAvailability.lockIfNotLimitExceeded({
                 eventId: params.event.id,
+                startDate: moment(params.event.startDate)
+                    .toDate(),
                 offers,
                 expires,
                 holder
@@ -585,6 +587,8 @@ function processLockSeats(params) {
         else {
             yield repos.eventAvailability.lock({
                 eventId: params.event.id,
+                startDate: moment(params.event.startDate)
+                    .toDate(),
                 offers,
                 expires,
                 holder

package/lib/chevre/service/offer.js

@@ -10,6 +10,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createAggregateScreeningEventIfNotExist = exports.onEventChanged = exports.searchEventSeatOffersWithPaging = exports.searchEventSeatOffers = exports.product = exports.moneyTransfer = exports.eventServiceByCOA = exports.event = void 0;
+const moment = require("moment");
 const factory = require("../factory");
 const EventOfferService = require("./offer/event");
 exports.event = EventOfferService;
@@ -111,6 +112,8 @@ function searchEventSeatOffers(params) {
             if (seats.length > 0) {
                 const availabilities = yield repos.eventAvailability.searchAvailability({
                     eventId: params.event.id,
+                    startDate: moment(event.startDate)
+                        .toDate(),
                     offers: seats.map((s) => {
                         var _a;
                         return {
@@ -182,6 +185,8 @@ function searchEventSeatOffersWithPaging(params) {
             if (seats.length > 0) {
                 const availabilities = yield repos.eventAvailability.searchAvailability({
                     eventId: params.event.id,
+                    startDate: moment(event.startDate)
+                        .toDate(),
                     offers: seats.map((s) => {
                         var _a;
                         return {

package/lib/chevre/service/reserve/cancelReservation.js

@@ -62,7 +62,12 @@ function cancelPendingReservation(actionAttributesList) {
                                             id: cancelingSubReservation.id,
                                             reservedTicket: cancelingSubReservation.reservedTicket,
                                             subReservation: cancelingSubReservation.subReservation,
-                                            reservationFor: { id: String(reservationFor.id) }
+                                            reservationFor: {
+                                                id: String(reservationFor.id),
+                                                startDate: (reservationFor.typeOf === factory.eventType.ScreeningEvent)
+                                                    ? reservationFor.startDate
+                                                    : reservationFor.departureTime
+                                            }
                                         },
                                         expectedHolder: reserveTransactionId
                                     })(repos);
@@ -199,7 +204,12 @@ function cancelReservation(actionAttributesList) {
                                         id: cancelingSubReservation.id,
                                         reservedTicket: cancelingSubReservation.reservedTicket,
                                         subReservation: cancelingSubReservation.subReservation,
-                                        reservationFor: { id: String(reservationFor.id) }
+                                        reservationFor: {
+                                            id: String(reservationFor.id),
+                                            startDate: (reservationFor.typeOf === factory.eventType.ScreeningEvent)
+                                                ? reservationFor.startDate
+                                                : reservationFor.departureTime
+                                        }
                                     },
                                     expectedHolder: reserveTransaction.id
                                 })(repos);
@@ -241,7 +251,10 @@ function cancelReservation(actionAttributesList) {
                                     id: reservation.id,
                                     reservedTicket: reservation.reservedTicket,
                                     subReservation: reservation.subReservation,
-                                    reservationFor: { id: reservation.reservationFor.id }
+                                    reservationFor: {
+                                        id: reservation.reservationFor.id,
+                                        startDate: reservation.reservationFor.startDate
+                                    }
                                 },
                                 expectedHolder
                             })(repos);
@@ -319,9 +332,12 @@ exports.cancelReservation = cancelReservation;
 function processUnlockSeat(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         const reservation = params.reservation;
+        const eventStartDate = moment(reservation.reservationFor.startDate)
+            .toDate();
         // 予約IDでロックされていれば解除
         let lockKey = {
             eventId: reservation.reservationFor.id,
+            startDate: eventStartDate,
             offer: {
                 itemOffered: { serviceOutput: { id: reservation.id } },
                 seatNumber: '',
@@ -337,6 +353,7 @@ function processUnlockSeat(params) {
         if (ticketedSeat !== undefined) {
             lockKey = {
                 eventId: reservation.reservationFor.id,
+                startDate: eventStartDate,
                 offer: {
                     seatNumber: ticketedSeat.seatNumber,
                     seatSection: ticketedSeat.seatSection
@@ -357,6 +374,7 @@ function processUnlockSeat(params) {
                 if (typeof seatSection4sub === 'string' && typeof seatNumber4sub === 'string') {
                     const lockKey4sub = {
                         eventId: reservation.reservationFor.id,
+                        startDate: eventStartDate,
                         offer: {
                             seatNumber: seatNumber4sub,
                             seatSection: seatSection4sub

package/lib/chevre/settings.d.ts

@@ -1,3 +1,4 @@
+import * as moment from 'moment';
 import * as factory from './factory';
 export declare const ABORTED_TASKS_WITHOUT_REPORT: string[];
 /**
@@ -28,6 +29,7 @@ export type ISettings = factory.project.ISettings & {
 export declare const DEFAULT_PAYMENT_METHOD_TYPE_FOR_CREDIT_CARD: string;
 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;
 /**
  * グローバル設定
  */

package/lib/chevre/settings.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.settings = 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_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')
     ? process.env.INFORM_TRANSACTION_URL.split(' ')
@@ -45,6 +46,9 @@ exports.DEFAULT_SENDER_EMAIL = process.env.DEFAULT_SENDER_EMAIL;
 exports.DEFAULT_PAYMENT_METHOD_TYPE_FOR_CREDIT_CARD = String(process.env.DEFAULT_PAYMENT_METHOD_TYPE_FOR_CREDIT_CARD);
 exports.USE_ASSET_TRANSACTION_SYNC_PROCESSING = process.env.USE_ASSET_TRANSACTION_SYNC_PROCESSING === '1';
 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');
 /**
  * グローバル設定
  */

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.1.0-alpha.3"
+  "version": "21.2.0-alpha.0"
 }