From 97d35c8d1f1fa1b0b056ebd87ec87562fe0b55a0 Mon Sep 17 00:00:00 2001
From: Jake Bolam <jake.bolam@gmail.com>
Date: Sat, 16 Mar 2019 18:44:29 -0400
Subject: [PATCH] Revert "fix(Analytics): log user correctly (#162)" (#163)

This reverts commit 2f73945de9c2f651c40ffc86e49702ae1ea3ad26.
---
 src/tasks/processIssueComment/probot-processIssueComment.js | 2 +-
 src/tasks/trackInstall/index.js                             | 2 +-
 src/utils/Analytics.js                                      | 3 +--
 test/utils/Analytics.test.js                                | 5 +----
 test/utils/__snapshots__/Analytics.test.js.snap             | 2 +-
 5 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/src/tasks/processIssueComment/probot-processIssueComment.js b/src/tasks/processIssueComment/probot-processIssueComment.js
index b53c86eb..e5c4a751 100644
--- a/src/tasks/processIssueComment/probot-processIssueComment.js
+++ b/src/tasks/processIssueComment/probot-processIssueComment.js
@@ -179,7 +179,7 @@ async function probotProcessIssueComment({ context, commentReply, analytics }) {
 async function probotProcessIssueCommentSafe({ context }) {
     const analytics = new Analytics({
         ...context.repo(),
-        user: context.payload.sender,
+        user: context.payload.sender.login,
         log: context.log,
     })
     const commentReply = new CommentReply({ context })
diff --git a/src/tasks/trackInstall/index.js b/src/tasks/trackInstall/index.js
index 7041fecd..93749e45 100644
--- a/src/tasks/trackInstall/index.js
+++ b/src/tasks/trackInstall/index.js
@@ -13,7 +13,7 @@ function getTrackName(action) {
 async function trackInstall(payload) {
     const analytics = new Analytics({
         owner: payload.installation.account.login,
-        user: payload.sender,
+        user: payload.sender.login,
         log: {
             info: console.log, // eslint-disable-line no-console
             error: console.error, // eslint-disable-line no-console
diff --git a/src/utils/Analytics.js b/src/utils/Analytics.js
index 1982be3d..143beb1a 100644
--- a/src/utils/Analytics.js
+++ b/src/utils/Analytics.js
@@ -42,12 +42,11 @@ class Analytics {
         }
 
         const event = {
-            user_id: this.user.id,
+            user_id: this.user,
             event_type: eventName,
             user_properties: {
                 repo: this.repo,
                 owner: this.owner,
-                login: this.user.login,
             },
             event_properties: {
                 funnel_id: this.funnelId,
diff --git a/test/utils/Analytics.test.js b/test/utils/Analytics.test.js
index 0450471b..7b786962 100644
--- a/test/utils/Analytics.test.js
+++ b/test/utils/Analytics.test.js
@@ -8,10 +8,7 @@ describe('Analytics', () => {
         const analytics = new Analytics({
             repo: 'all-contributors-bot',
             owner: 'all-contributors',
-            user: {
-                login: 'mockusername',
-                id: 1234,
-            },
+            user: 'mockusername',
             apiKey: 'mock api key',
             funnelId: 'mockFunnelId',
             isMock: true,
diff --git a/test/utils/__snapshots__/Analytics.test.js.snap b/test/utils/__snapshots__/Analytics.test.js.snap
index 8fa42599..06b8d68e 100644
--- a/test/utils/__snapshots__/Analytics.test.js.snap
+++ b/test/utils/__snapshots__/Analytics.test.js.snap
@@ -3,6 +3,6 @@
 exports[`Analytics Analytics 1`] = `
 Object {
   "api_key": "mock api key",
-  "event": "[{\\"user_id\\":1234,\\"event_type\\":\\"my-event\\",\\"user_properties\\":{\\"repo\\":\\"all-contributors-bot\\",\\"owner\\":\\"all-contributors\\",\\"login\\":\\"mockusername\\"},\\"event_properties\\":{\\"funnel_id\\":\\"mockFunnelId\\"}}]",
+  "event": "[{\\"user_id\\":\\"mockusername\\",\\"event_type\\":\\"my-event\\",\\"user_properties\\":{\\"repo\\":\\"all-contributors-bot\\",\\"owner\\":\\"all-contributors\\"},\\"event_properties\\":{\\"funnel_id\\":\\"mockFunnelId\\"}}]",
 }
 `;