fix(bluetooth-low-energy): use original id for allowlist check

Otherwise this leads to confusing config requirements with overridden tag ids. Closes #596
legovaer · Apr 11, 2021 · 6a5d0cc · 6a5d0cc
1 parent d0c5c52
commit 6a5d0cc
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/src/integrations/bluetooth-low-energy/bluetooth-low-energy.service.spec.ts b/src/integrations/bluetooth-low-energy/bluetooth-low-energy.service.spec.ts
@@ -424,7 +424,9 @@ describe('BluetoothLowEnergyService', () => {
     const handleDistanceSpy = jest
       .spyOn(service, 'handleNewDistance')
       .mockImplementation(() => undefined);
-    const allowlistSpy = jest.spyOn(service, 'isOnAllowlist').mockReturnValue(true);
+    const allowlistSpy = jest
+      .spyOn(service, 'isOnAllowlist')
+      .mockReturnValue(true);
     jest.spyOn(service, 'isAllowlistEnabled').mockReturnValue(true);
     mockConfig.tagOverrides = {
       abcd: {
@@ -445,7 +447,7 @@ describe('BluetoothLowEnergyService', () => {
         tagId: 'new-id',
       })
     );
-    expect(allowlistSpy).toHaveBeenCalledWith('new-id')
+    expect(allowlistSpy).toHaveBeenCalledWith('abcd');
   });
 
   it('should apply a tag name override if it exists', async () => {
@@ -1290,7 +1292,7 @@ describe('BluetoothLowEnergyService', () => {
 
       expect(discoverSpy).toHaveBeenCalledTimes(1);
 
-      jest.advanceTimersByTime(1 * 60 * 1000);
+      jest.advanceTimersByTime(60 * 1000);
 
       await service.handleDiscovery(peripheral);
 

diff --git a/src/integrations/bluetooth-low-energy/bluetooth-low-energy.service.ts b/src/integrations/bluetooth-low-energy/bluetooth-low-energy.service.ts
@@ -93,7 +93,6 @@ export class BluetoothLowEnergyService
     }
 
     tag = await this.applyCompanionAppOverride(tag);
-    tag = this.applyOverrides(tag);
 
     if (!this.seenIds.has(tag.id)) {
       this.logger.log(
@@ -107,6 +106,7 @@ export class BluetoothLowEnergyService
         (!this.isAllowlistEnabled() && this.isDenylistEnabled())) &&
       !this.isOnDenylist(tag.id)
     ) {
+      tag = this.applyOverrides(tag);
       tag.rssi = this.filterRssi(tag.id, tag.rssi);
 
       const globalSettings = this.configService.get('global');