From 23046c149c60285fc1d2f2a5276bea45350ef26b Mon Sep 17 00:00:00 2001 From: Alejandro Celaya Date: Sat, 19 Sep 2020 10:31:23 +0200 Subject: [PATCH] Fixed visits normalization not converting empty strings into null --- src/visits/services/VisitsParser.ts | 4 ++-- test/visits/services/VisitsParser.test.ts | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/visits/services/VisitsParser.ts b/src/visits/services/VisitsParser.ts index 3956788d..5a83c035 100644 --- a/src/visits/services/VisitsParser.ts +++ b/src/visits/services/VisitsParser.ts @@ -72,8 +72,8 @@ export const normalizeVisits = map(({ userAgent, date, referer, visitLocation }: date, ...parseUserAgent(userAgent), referer: extractDomain(referer), - country: visitLocation?.countryName ?? 'Unknown', - city: visitLocation?.cityName ?? 'Unknown', + country: visitLocation?.countryName || 'Unknown', // eslint-disable-line @typescript-eslint/prefer-nullish-coalescing + city: visitLocation?.cityName || 'Unknown', // eslint-disable-line @typescript-eslint/prefer-nullish-coalescing latitude: visitLocation?.latitude, longitude: visitLocation?.longitude, })); diff --git a/test/visits/services/VisitsParser.test.ts b/test/visits/services/VisitsParser.test.ts index 9c70e1d5..524dc7e1 100644 --- a/test/visits/services/VisitsParser.test.ts +++ b/test/visits/services/VisitsParser.test.ts @@ -28,6 +28,7 @@ describe('VisitsParser', () => { userAgent: 'Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/51.0.2704.103 Safari/537.36', visitLocation: { countryName: 'Spain', + cityName: '', }, }), Mock.of({