fix

src/app.service.ts

@@ -88,6 +88,25 @@ export class AppService extends ConsoleLogger {
 
     const cards = [...new Set([...ydk.main, ...ydk.extra, ...ydk.side])];
     const cardDatas = await this.cardDataService.getCardDatas(cards);
+
+    const aliasMap = new Map<number, number>();
+    cards.forEach((id, i) => {
+      if (id !== cardDatas[i].id) {
+        this.log(`Card ID ${id} is an alias for ${cardDatas[i].id}`);
+        aliasMap.set(id, cardDatas[i].id);
+      }
+    });
+    if (aliasMap.size > 0) {
+      [ydk.main, ydk.extra, ydk.side].forEach((deck) => {
+        for (let i = 0; i < deck.length; ++i) {
+          const originalId = deck[i];
+          if (aliasMap.has(originalId)) {
+            deck[i] = aliasMap.get(originalId);
+          }
+        }
+      });
+    }
+
     const cardDataMap = _.keyBy(cardDatas, 'id');
 
     const filterType = (type: number) =>
@@ -101,6 +120,18 @@ export class AppService extends ConsoleLogger {
         return cardDataMap[id].type === type;
       });
 
+    let pageCount = 0;
+
+    const ensurePages = async (pc: number) => {
+      if (pageCount >= pc) return;
+      const addCount = pc - pageCount;
+      for (let i = 0; i < addCount; ++i) {
+        await copyFirstPageToBottom();
+        this.log(`Added page ${pageCount + i + 1} to PDF for deck export.`);
+      }
+      pageCount = pc;
+    };
+
     let needExtraPage = false;
     if (
       [1, 2, 4].some((type) => {
@@ -116,36 +147,6 @@ export class AppService extends ConsoleLogger {
       needExtraPage = true;
     }
 
-    let pageCount = 0;
-
-    const ensurePages = async (pc: number) => {
-      if (pageCount >= pc) return;
-      const addCount = pc - pageCount;
-      for (let i = 0; i < addCount; ++i) {
-        await copyFirstPageToBottom();
-        this.log(`Added page ${pageCount + i + 1} to PDF for deck export.`);
-      }
-      pageCount = pc;
-    };
-
-    const aliasMap = new Map<number, number>();
-    cards.forEach((id, i) => {
-      if (id !== cardDatas[i].id) {
-        this.log(`Card ID ${id} is an alias for ${cardDatas[i].id}`);
-        aliasMap.set(id, cardDatas[i].id);
-      }
-    });
-    if (aliasMap.size > 0) {
-      [ydk.main, ydk.extra, ydk.side].forEach((deck) => {
-        for (let i = 0; i < deck.length; ++i) {
-          const originalId = deck[i];
-          if (aliasMap.has(originalId)) {
-            deck[i] = aliasMap.get(originalId);
-          }
-        }
-      });
-    }
-
     const drawCards = async (
       cards: number[],
       cord: {