feat: query swapinfo by more columns

lib/db/models/ReverseSwap.ts

@@ -156,6 +156,10 @@ class ReverseSwap extends Model implements ReverseSwapType {
             unique: true,
             fields: ['id'],
           },
+          {
+            unique: false,
+            fields: ['status'],
+          },
           {
             unique: true,
             fields: ['preimageHash'],
@@ -172,6 +176,14 @@ class ReverseSwap extends Model implements ReverseSwapType {
             unique: false,
             fields: ['referral'],
           },
+          {
+            unique: false,
+            fields: ['lockupAddress'],
+          },
+          {
+            unique: false,
+            fields: ['transactionId'],
+          },
         ],
       },
     );

lib/db/models/Swap.ts

@@ -119,6 +119,10 @@ class Swap extends Model implements SwapType {
             unique: true,
             fields: ['id'],
           },
+          {
+            unique: false,
+            fields: ['status'],
+          },
           {
             unique: true,
             fields: ['preimageHash'],
@@ -131,6 +135,14 @@ class Swap extends Model implements SwapType {
             unique: false,
             fields: ['referral'],
           },
+          {
+            unique: false,
+            fields: ['lockupAddress'],
+          },
+          {
+            unique: false,
+            fields: ['lockupTransactionId'],
+          },
         ],
       },
     );

lib/notifications/CommandHandler.ts

@@ -18,11 +18,11 @@ import { coinsToSatoshis, satoshisToCoins } from '../DenominationConverter';
 import ReverseSwapRepository from '../db/repositories/ReverseSwapRepository';
 import ChannelCreationRepository from '../db/repositories/ChannelCreationRepository';
 import {
+  stringify,
+  splitPairId,
   formatError,
-  getChainCurrency,
   getHexString,
-  splitPairId,
-  stringify,
+  getChainCurrency,
 } from '../Utils';
 
 enum Command {
@@ -262,33 +262,44 @@ class CommandHandler {
       return;
     }
 
-    const id = args[0];
+    const identifier = args[0];
 
-    const swap = await SwapRepository.getSwap({
-      id,
+    const swaps = await SwapRepository.getSwaps({
+      [Op.or]: {
+        id: identifier,
+        invoice: identifier,
+        preimageHash: identifier,
+        lockupAddress: identifier,
+        lockupTransactionId: identifier,
+      },
     });
 
-    if (swap) {
+    for (const swap of swaps) {
       const channelCreation =
         await ChannelCreationRepository.getChannelCreation({
-          swapId: id,
+          swapId: swap.id,
         });
 
       await this.sendSwapInfo(swap, false, channelCreation);
-      return;
-    } else {
-      // Query for a reverse swap because there was no normal one found with the specified id
-      const reverseSwap = await ReverseSwapRepository.getReverseSwap({
-        id,
-      });
+    }
 
-      if (reverseSwap) {
-        await this.sendSwapInfo(reverseSwap, true);
-        return;
-      }
+    const reverseSwaps = await ReverseSwapRepository.getReverseSwaps({
+      [Op.or]: {
+        id: identifier,
+        invoice: identifier,
+        preimageHash: identifier,
+        lockupAddress: identifier,
+        transactionId: identifier,
+      },
+    });
+
+    for (const reverseSwap of reverseSwaps) {
+      await this.sendSwapInfo(reverseSwap, true);
     }
 
-    await this.sendCouldNotFindSwap(id);
+    if (swaps.length === 0 && reverseSwaps.length === 0) {
+      await this.sendCouldNotFindSwap(identifier);
+    }
   };
 
   private getStats = async () => {

lib/notifications/DiscordClient.ts

@@ -64,7 +64,7 @@ class DiscordClient extends EventEmitter {
   public destroy = (): void => {
     this.channel = undefined;
     if (this.client.isReady()) {
-      this.client.destroy();
+      this.client.destroy().then();
     }
   };
 

lib/notifications/Markup.ts

@@ -1,5 +1,5 @@
-// TODO: add all other used emojis to this object
 export const Emojis = {
+  Zap: ':zap:',
   Checkmark: ':white_check_mark:',
   RotatingLight: ':rotating_light:',
 };

lib/notifications/NotificationProvider.ts

@@ -1,4 +1,5 @@
 import Logger from '../Logger';
+import { Emojis } from './Markup';
 import Swap from '../db/models/Swap';
 import Service from '../service/Service';
 import DiscordClient from './DiscordClient';
@@ -174,8 +175,8 @@ class NotificationProvider {
         orderSide,
       );
 
-      return `${receiving}${isReverse ? ' :zap:' : ''} -> ${sending}${
-        !isReverse ? ' :zap:' : ''
+      return `${receiving}${isReverse ? ` ${Emojis.Zap}` : ''} -> ${sending}${
+        !isReverse ? ` ${Emojis.Zap}` : ''
       }`;
     };
 

test/unit/notifications/CommandHandler.spec.ts

@@ -1,16 +1,16 @@
 import { wait } from '../../Utils';
 import Logger from '../../../lib/Logger';
-import { getHexBuffer, getHexString, stringify } from '../../../lib/Utils';
 import Database from '../../../lib/db/Database';
 import Service from '../../../lib/service/Service';
 import { NotificationConfig } from '../../../lib/Config';
-import { Balances, GetBalanceResponse } from '../../../lib/proto/boltzrpc_pb';
 import ReferralStats from '../../../lib/data/ReferralStats';
 import BackupScheduler from '../../../lib/backup/BackupScheduler';
 import DiscordClient from '../../../lib/notifications/DiscordClient';
 import CommandHandler from '../../../lib/notifications/CommandHandler';
 import PairRepository from '../../../lib/db/repositories/PairRepository';
 import SwapRepository from '../../../lib/db/repositories/SwapRepository';
+import { getHexBuffer, getHexString, stringify } from '../../../lib/Utils';
+import { Balances, GetBalanceResponse } from '../../../lib/proto/boltzrpc_pb';
 import ReverseSwapRepository from '../../../lib/db/repositories/ReverseSwapRepository';
 import ChannelCreationRepository from '../../../lib/db/repositories/ChannelCreationRepository';
 import {