UPDATE: test and logic for checking and applying geodata

navikt · Nov 4, 2022 · bff9e8a · bff9e8a
1 parent c102e0e
commit bff9e8a
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 8 deletions.
diff --git a/src/filters/add-geo-data.js b/src/filters/add-geo-data.js
@@ -1,8 +1,8 @@
 const geoLookup = require('geoip-lite').lookup;
 module.exports = function(inputEvents, ip) {
   const outputEvents = [];
-  const geoData = geoLookup(ip);
   if(ip){
+    const geoData = geoLookup(ip);
     inputEvents.forEach(event => {
       const cloneEvent = Object.assign({}, event);
       cloneEvent.user_agent = null;
@@ -19,11 +19,11 @@ module.exports = function(inputEvents, ip) {
       const cloneEvent = Object.assign({}, event);
       cloneEvent.user_agent = null;
       cloneEvent.os_version = null;
-      if (geoData && geoData.country) cloneEvent.country = null;
-      if (geoData && geoData.region) cloneEvent.region = null;
-      if (geoData && geoData.city) cloneEvent.city = null;
-      if (geoData && geoData.ll) cloneEvent.location_lat = null;
-      if (geoData && geoData.ll) cloneEvent.location_lng = null;
+      cloneEvent.country = null;
+      cloneEvent.region = null;
+      cloneEvent.city = null;
+      cloneEvent.location_lat = null;
+      cloneEvent.location_lng = null;
       outputEvents.push(cloneEvent);
     });
   }

diff --git a/src/filters/add-geo-data.spec.js b/src/filters/add-geo-data.spec.js
@@ -12,4 +12,19 @@ describe('add-tracking-options', function() {
       assert.notStrictEqual(event.os_version, events[0].os_version);
     });
   });
+
+  it('should not add tracking options', function() {
+    let events = [generateTestEvent(), generateTestEvent()];
+    const result = addGeoData(events, undefined);
+    assert.strictEqual(result.length, 2);
+    result.forEach(event => {
+      assert.strictEqual(event.city, null);
+      assert.strictEqual(event.country, null);
+      assert.strictEqual(event.location_lat, null);
+      assert.strictEqual(event.location_lng, null);
+      assert.strictEqual(event.region, null);
+      assert.notStrictEqual(event.user_agent, events[0].user_agent);
+      assert.notStrictEqual(event.os_version, events[0].user_agent);
+    });
+  });
 });
diff --git a/src/routes/collect-auto.js b/src/routes/collect-auto.js
@@ -63,7 +63,7 @@ const customHandler = function (request, reply, ingresses) {
     const eventsWithProxyData = addProxyData(eventsWithClusterData, process.env.NAIS_APP_IMAGE);
     let eventsWithGeoData;
     if(request.api_properties && request.api_properties.ip_address) {
-      eventsWithGeoData = addGeoData(eventsWithProxyData, undefined);
+      eventsWithGeoData = addGeoData(eventsWithProxyData, null);
     } else {
       eventsWithGeoData = addGeoData(eventsWithProxyData, request.ip);
     }

diff --git a/src/routes/collect.js b/src/routes/collect.js
@@ -34,7 +34,7 @@ const handler = function(request, reply) {
     const eventsWithProxyData = addProxyData(inputEvents, process.env.NAIS_APP_IMAGE);
     let eventsWithGeoData;
     if(request.api_properties && !request.api_properties.ip_address) {
-      eventsWithGeoData = addGeoData(eventsWithProxyData, undefined);
+      eventsWithGeoData = addGeoData(eventsWithProxyData, null);
     } else {
       eventsWithGeoData = addGeoData(eventsWithProxyData, request.ip);
     }