fix: ルール予約によってイベントリレーされた予約情報が更新されない問題を修正

Author: l3tnun

src/model/db/IReserveDB.ts

@@ -53,5 +53,6 @@ export default interface IReserveDB {
     findOldTime(baseTime: apid.UnixtimeMS): Promise<Reserve[]>;
     findTimeSpecification(option: IFindTimeSpecificationOption): Promise<Reserve | null>;
     getManualIds(option: IGetManualIdsOption): Promise<apid.ReserveId[]>;
+    getRuleEventRelayIds(): Promise<apid.ReserveId[]>;
     countRuleIds(ruleIds: apid.RuleId[], type: apid.GetReserveType): Promise<RuleIdCountResult[]>;
 }

src/model/db/ReserveDB.ts

@@ -452,7 +452,7 @@ export default class ReserveDB implements IReserveDB {
             .createQueryBuilder()
             .select('reserve.id')
             .from(Reserve, 'reserve')
-            .where('reserve.ruleId is null');
+            .where('reserve.ruleId is :ruleId', { ruleId: null });
 
         if (option.hasTimeReserve === false) {
             queryBuilder = queryBuilder.andWhere('reserve.programId is not null');
@@ -468,6 +468,30 @@ export default class ReserveDB implements IReserveDB {
         });
     }
 
+    /**
+     * ルール予約によってイベントリレーで予約された reserve id を取得する
+     * @returns Promise<apid.ReserveId[]>
+     */
+    public async getRuleEventRelayIds(): Promise<apid.ReserveId[]> {
+        const connection = await this.op.getConnection();
+
+        const queryBuilder = connection
+            .createQueryBuilder()
+            .select('reserve.id')
+            .from(Reserve, 'reserve')
+            .andWhere('reserve.ruleId is not null')
+            .andWhere('reserve.isEventRelay is :isEventRelay', { isEventRelay: this.op.convertBoolean(true) })
+            .orderBy('reserve.id', 'ASC');
+
+        const result = await this.promieRetry.run(() => {
+            return queryBuilder.getMany();
+        });
+
+        return result.map(r => {
+            return r.id;
+        });
+    }
+
     /**
      * ruleId を指定して予約数をカウントする
      * @param ruleIds: apid.RuleId[]

src/model/operator/reservation/ReservationManageModel.ts

@@ -1149,6 +1149,12 @@ class ReservationManageModel implements IReservationManageModel {
             throw err;
         });
 
+        // ルール予約によってイベントリレーで予約された予約の id を取得
+        const ruleEventRelayIds = await this.reserveDB.getRuleEventRelayIds().catch(err => {
+            this.log.system.error('get rule event relay ids error');
+            throw err;
+        });
+
         // ルールの id を取得
         const ruleIds = await this.ruleDB.getIds().catch(err => {
             this.log.system.error('get rule ids error');
@@ -1163,6 +1169,14 @@ class ReservationManageModel implements IReservationManageModel {
             await Util.sleep(10);
         }
 
+        // ルール予約によってイベントリレーで予約された予約の更新
+        for (const manualId of ruleEventRelayIds) {
+            await this.update(manualId, isSuppressLog).catch(err => {
+                this.log.system.error(err);
+            });
+            await Util.sleep(10);
+        }
+
         // ルール予約更新
         for (const ruleId of ruleIds) {
             await this.updateRule(ruleId, isSuppressLog, isFirstUpdate).catch(err => {