fix: default adopted values overriding admin location

jsdelivr · Apr 11, 2024 · 7aa27c0 · 7aa27c0
1 parent ba1b917
commit 7aa27c0
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 11 deletions.
diff --git a/src/lib/admin-data.ts b/src/lib/admin-data.ts
@@ -52,7 +52,6 @@ export class AdminData {
 	}
 
 	async syncDashboardData () {
-		console.log('syncDashboardData');
 		const overrides = await this.sql(LOCATION_OVERRIDES_TABLE).select<LocationOverride[]>();
 
 		this.rangesToUpdatedFields = new Map(overrides.map(override => [ ipaddr.parseCIDR(override.ip_range), {
@@ -96,11 +95,11 @@ export class AdminData {
 		});
 	}
 
-	getUpdatedLocation (probe: Probe): ProbeLocation {
+	getUpdatedLocation (probe: Probe): ProbeLocation | null {
 		const updatedFields = this.getUpdatedFields(probe);
 
 		if (!updatedFields) {
-			return probe.location;
+			return null;
 		}
 
 		return {

diff --git a/src/lib/adopted-probes.ts b/src/lib/adopted-probes.ts
@@ -96,11 +96,11 @@ export class AdoptedProbes {
 		return this.adoptedIpToProbe.get(ip);
 	}
 
-	getUpdatedLocation (probe: Probe): ProbeLocation {
+	getUpdatedLocation (probe: Probe): ProbeLocation | null {
 		const adoptedProbe = this.getByIp(probe.ipAddress);
 
 		if (!adoptedProbe || !adoptedProbe.isCustomCity || adoptedProbe.countryOfCustomCity !== probe.location.country) {
-			return probe.location;
+			return null;
 		}
 
 		return {
@@ -141,7 +141,7 @@ export class AdoptedProbes {
 				return probe;
 			}
 
-			const newLocation = this.getUpdatedLocation(probe);
+			const newLocation = this.getUpdatedLocation(probe) || probe.location;
 
 			const newTags = this.getUpdatedTags(probe);
 

diff --git a/src/lib/probe-override.ts b/src/lib/probe-override.ts
@@ -23,7 +23,7 @@ export class ProbeOverride {
 	getUpdatedLocation (probe: Probe) {
 		const adminLocation = this.adminData.getUpdatedLocation(probe);
 		const adoptedLocation = this.adoptedProbes.getUpdatedLocation(probe);
-		return { ...adminLocation, ...adoptedLocation };
+		return { ...probe.location, ...adminLocation, ...adoptedLocation };
 	}
 
 	addAdminData (probes: Probe[]) {

diff --git a/test/tests/unit/adopted-probes.test.ts b/test/tests/unit/adopted-probes.test.ts
@@ -393,7 +393,7 @@ describe('AdoptedProbes', () => {
 		});
 	});
 
-	it('getUpdatedLocation method should return same location object if connected.country !== adopted.countryOfCustomCity', async () => {
+	it('getUpdatedLocation method should return null if connected.country !== adopted.countryOfCustomCity', async () => {
 		const adoptedProbes = new AdoptedProbes(sqlStub as unknown as Knex, fetchSocketsStub);
 		selectStub.resolves([{
 			...defaultAdoptedProbe,
@@ -407,10 +407,10 @@ describe('AdoptedProbes', () => {
 
 		await adoptedProbes.syncDashboardData();
 		const updatedLocation = adoptedProbes.getUpdatedLocation(defaultConnectedProbe);
-		expect(updatedLocation).to.equal(defaultConnectedProbe.location);
+		expect(updatedLocation).to.equal(null);
 	});
 
-	it('getUpdatedLocation method should return same location object if "isCustomCity: false"', async () => {
+	it('getUpdatedLocation method should return null if "isCustomCity: false"', async () => {
 		const adoptedProbes = new AdoptedProbes(sqlStub as unknown as Knex, fetchSocketsStub);
 		selectStub.resolves([{
 			...defaultAdoptedProbe,
@@ -422,7 +422,7 @@ describe('AdoptedProbes', () => {
 
 		await adoptedProbes.syncDashboardData();
 		const updatedLocation = adoptedProbes.getUpdatedLocation(defaultConnectedProbe);
-		expect(updatedLocation).to.equal(defaultConnectedProbe.location);
+		expect(updatedLocation).to.equal(null);
 	});
 
 	it('getUpdatedTags method should return updated tags', async () => {