@chevre/domain 21.2.0-alpha.126 → 21.2.0-alpha.128

package/example/src/chevre/searchHoldReservations.ts

@@ -0,0 +1,31 @@
+// tslint:disable:no-console
+// import * as redis from 'redis';
+import * as mongoose from 'mongoose';
+import * as redis from 'redis';
+
+import { chevre } from '../../../lib/index';
+
+async function main() {
+    await mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: false });
+    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 stockHolderRepo = new chevre.repository.StockHolder(client, mongoose.connection);
+
+    const holdReservations = await stockHolderRepo.search({
+        limit: 100,
+        page: 1
+    });
+    console.log(holdReservations[0]?.reservationFor.aggregateReservation, holdReservations[0]?.objectSize);
+    console.log(holdReservations.length);
+}
+
+main()
+    .then(console.log)
+    .catch(console.error);

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

@@ -62,6 +62,21 @@ export interface ISearchSubReservationResult {
     reservationNumber: string;
     identifier: string;
 }
+export interface ISearchResult {
+    reservationNumber: string;
+    identifier: string;
+    reservationFor: {
+        id: string;
+        startDate: Date;
+        aggregateReservation: {
+            reservationCount: number;
+        };
+    };
+    reservedTicket?: {
+        ticketedSeat?: Pick<factory.reservation.ISeat<factory.reservationType>, 'seatNumber' | 'seatSection'>;
+    };
+    objectSize?: number;
+}
 /**
  * イベントストックホルダーリポジトリ
  */
@@ -158,7 +173,7 @@ export declare class StockHolderRepository {
                 };
             };
         };
-    }): Promise<ISearchSubReservationResult[]>;
+    }): Promise<ISearchResult[]>;
     private checkIfConflicted;
     private initializeHoldReservation;
 }

package/lib/chevre/repo/stockHolder.js

@@ -75,12 +75,19 @@ class StockHolderRepository {
      * 新リポジトリを使用するかどうか
      */
     static useMongoose(params) {
+        if (!(params.startDate instanceof Date)) {
+            throw new factory.errors.Argument('startDate', 'must be Date');
+        }
         if (params.useMongooseForcibly === true) {
             return true;
         }
         if (settings_1.USE_NEW_STOCK_HOLDER_REPO_IDS.includes(params.eventId)) {
             return true;
         }
+        if (moment(params.startDate)
+            .isSameOrAfter(settings_1.USE_NEW_STOCK_HOLDER_REPO_FROM)) {
+            return true;
+        }
         return false;
     }
     /**
@@ -534,7 +541,8 @@ class StockHolderRepository {
                             }
                         },
                         reservationNumber: '$reservations.reservationNumber',
-                        reservedTicket: '$reservations.subReservation.reservedTicket'
+                        reservedTicket: '$reservations.subReservation.reservedTicket',
+                        objectSize: { $bsonSize: '$$ROOT' }
                     }
                 }
             ]);

package/lib/chevre/settings.d.ts

@@ -39,6 +39,7 @@ export declare const DEFAULT_TASKS_EXPORT_AGENT_NAME: 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;
+export declare const USE_NEW_STOCK_HOLDER_REPO_FROM: moment.Moment;
 export declare const USE_NEW_STOCK_HOLDER_REPO_IDS: string[];
 export declare const INFORM_RESERVATION_TASK_DELAY_IN_SECONDS: number;
 export declare const MONGO_MAX_TIME_MS: number;

package/lib/chevre/settings.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.settings = exports.MONGO_MAX_TIME_MS = exports.INFORM_RESERVATION_TASK_DELAY_IN_SECONDS = exports.USE_NEW_STOCK_HOLDER_REPO_IDS = exports.USE_NEW_EVENT_AVAILABILITY_KEY_FROM = exports.USE_PAY_ASSET_TRANSACTION_SYNC_PROCESSING = exports.USE_ASSET_TRANSACTION_SYNC_PROCESSING = exports.DEFAULT_TASKS_EXPORT_AGENT_NAME = 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 = exports.TRIGGER_WEBHOOK_RETRY_INTERVAL_IN_MS = exports.TRIGGER_WEBHOOK_MAX_RETRY_COUNT = void 0;
+exports.settings = exports.MONGO_MAX_TIME_MS = exports.INFORM_RESERVATION_TASK_DELAY_IN_SECONDS = exports.USE_NEW_STOCK_HOLDER_REPO_IDS = exports.USE_NEW_STOCK_HOLDER_REPO_FROM = exports.USE_NEW_EVENT_AVAILABILITY_KEY_FROM = exports.USE_PAY_ASSET_TRANSACTION_SYNC_PROCESSING = exports.USE_ASSET_TRANSACTION_SYNC_PROCESSING = exports.DEFAULT_TASKS_EXPORT_AGENT_NAME = 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 = exports.TRIGGER_WEBHOOK_RETRY_INTERVAL_IN_MS = exports.TRIGGER_WEBHOOK_MAX_RETRY_COUNT = void 0;
 const moment = require("moment");
 const factory = require("./factory");
 const transactionWebhookUrls = (typeof process.env.INFORM_TRANSACTION_URL === 'string')
@@ -65,6 +65,9 @@ exports.USE_PAY_ASSET_TRANSACTION_SYNC_PROCESSING = process.env.USE_PAY_ASSET_TR
 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-08-31T15:00:00Z');
+exports.USE_NEW_STOCK_HOLDER_REPO_FROM = (typeof process.env.USE_NEW_STOCK_HOLDER_REPO_FROM === 'string')
+    ? moment(process.env.USE_NEW_STOCK_HOLDER_REPO_FROM)
+    : moment('2023-11-30T15:00:00Z');
 exports.USE_NEW_STOCK_HOLDER_REPO_IDS = (typeof process.env.USE_NEW_STOCK_HOLDER_REPO_IDS === 'string')
     ? process.env.USE_NEW_STOCK_HOLDER_REPO_IDS.split(' ')
     : [];

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.126"
+  "version": "21.2.0-alpha.128"
 }

package/example/src/chevre/migrateStockHolderKeys.ts

@@ -1,89 +0,0 @@
-// tslint:disable:no-console
-import * as moment from 'moment';
-import * as mongoose from 'mongoose';
-import * as redis from 'redis';
-
-import { chevre } from '../../../lib/index';
-
-// const project = { id: String(process.env.PROJECT_ID) };
-
-const EXCLUDED_PROJECT_ID = process.env.EXCLUDED_PROJECT_ID;
-
-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();
-    await mongoose.connect(<string>process.env.MONGOLAB_URI);
-
-    const eventRepo = new chevre.repository.Event(mongoose.connection);
-    const stockHolderRepo = new chevre.repository.StockHolder(client, mongoose.connection);
-
-    const cursor = eventRepo.getCursor(
-        {
-            // 'project.id': { $eq: project.id },
-            'project.id': { $ne: EXCLUDED_PROJECT_ID },
-            typeOf: { $eq: chevre.factory.eventType.ScreeningEvent },
-            startDate: {
-                $gte: moment('2023-04-23T15:00:00Z')
-                    .toDate()
-            }
-            // _id: { $eq: 'al6aff83w' }
-        },
-        {
-            // _id: 1,
-        }
-    );
-    console.log('events found');
-
-    let i = 0;
-    let updateCount = 0;
-    await cursor.eachAsync(async (doc) => {
-        i += 1;
-        const event: chevre.factory.event.screeningEvent.IEvent = doc.toObject();
-
-        const oldKey = chevre.repository.StockHolder.GET_KEY({
-            eventId: event.id,
-            startDate: new Date()
-        });
-        const newKey = chevre.repository.StockHolder.GET_KEY({
-            eventId: event.id,
-            startDate: moment(event.startDate)
-                .toDate()
-        });
-
-        let conflicted = false;
-        try {
-            await stockHolderRepo.checkIfConflicted({
-                key: newKey,
-                eventId: event.id
-            });
-        } catch (error) {
-            conflicted = true;
-        }
-
-        if (conflicted) {
-            updateCount += 1;
-            await stockHolderRepo.migrateKey({
-                key: newKey,
-                eventId: event.id
-            });
-            console.log(
-                'updated...', event.project.id, event.id, event.startDate, i);
-        } else {
-            console.log(
-                'already exist...', event.project.id, event.id, event.startDate, i);
-        }
-    });
-
-    console.log(i, 'events checked');
-    console.log(updateCount, 'events updated');
-}
-
-main()
-    .then()
-    .catch(console.error);