UPDATE: event clause logic for geo data

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

Hide file tree

Showing 3 changed files with 7 additions and 4 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;
@@ -15,7 +15,6 @@ module.exports = function(inputEvents, ip) {
       outputEvents.push(cloneEvent);
     });
   } else {
-    const geoData = geoLookup(ip);
     inputEvents.forEach(event => {
       const cloneEvent = Object.assign({}, event);
       cloneEvent.user_agent = null;

diff --git a/src/routes/collect-auto.js b/src/routes/collect-auto.js
@@ -61,9 +61,11 @@ const customHandler = function (request, reply, ingresses) {
 
   } else {
     const eventsWithProxyData = addProxyData(eventsWithClusterData, process.env.NAIS_APP_IMAGE);
-    let eventsWithGeoData = addGeoData(eventsWithProxyData, request.ip);
+    let eventsWithGeoData;
     if(request.api_properties && request.api_properties.ip_address) {
       eventsWithGeoData = addGeoData(eventsWithProxyData, undefined);
+    } else {
+      eventsWithGeoData = addGeoData(eventsWithProxyData, request.ip);
     }
     const eventsWithUrlsCleaned = cleanEventUrls(eventsWithGeoData);
 

diff --git a/src/routes/collect.js b/src/routes/collect.js
@@ -32,9 +32,11 @@ const handler = function(request, reply) {
     reply.send(constants.IGNORED);
   } else {
     const eventsWithProxyData = addProxyData(inputEvents, process.env.NAIS_APP_IMAGE);
-    let eventsWithGeoData = addGeoData(eventsWithProxyData, request.ip);
+    let eventsWithGeoData;
     if(request.api_properties && !request.api_properties.ip_address) {
       eventsWithGeoData = addGeoData(eventsWithProxyData, undefined);
+    } else {
+      eventsWithGeoData = addGeoData(eventsWithProxyData, request.ip);
     }
     const eventsWithUrlsCleaned = cleanEventUrls(eventsWithGeoData);
     forwardEvents(eventsWithUrlsCleaned, apiKey, process.env.AMPLITUDE_URL).then(function(response) {