From 434fe17617ef96a6bee98b4e338920070348c37d Mon Sep 17 00:00:00 2001
From: Innokentii Konstantinov <innokenty.konstantinov@grafana.com>
Date: Thu, 25 Aug 2022 13:34:19 +0500
Subject: [PATCH] user_id -> linked_user_id (#410)

---
 engine/apps/api/views/user.py                        | 8 ++++----
 engine/apps/social_auth/pipeline.py                  | 4 ++--
 engine/apps/telegram/models/verification/personal.py | 4 ++--
 engine/common/insight_log/chatops_insight_logs.py    | 2 +-
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/engine/apps/api/views/user.py b/engine/apps/api/views/user.py
index ed3f633b..7911acd2 100644
--- a/engine/apps/api/views/user.py
+++ b/engine/apps/api/views/user.py
@@ -361,8 +361,8 @@ class UserView(
                 author=request.user,
                 event_name=ChatOpsEvent.USER_UNLINKED,
                 chatops_type=ChatOpsType.TELEGRAM,
-                user=user.username,
-                user_id=user.public_primary_key,
+                linked_user=user.username,
+                linked_user_id=user.public_primary_key,
             )
         except TelegramToUserConnector.DoesNotExist:
             return Response(status=status.HTTP_400_BAD_REQUEST)
@@ -383,8 +383,8 @@ class UserView(
                 author=request.user,
                 event_name=ChatOpsEvent.USER_UNLINKED,
                 chatops_type=backend.backend_id,
-                user=user.username,
-                user_id=user.public_primary_key,
+                linked_user=user.username,
+                linked_user_id=user.public_primary_key,
             )
         except ObjectDoesNotExist:
             return Response(status=status.HTTP_400_BAD_REQUEST)
diff --git a/engine/apps/social_auth/pipeline.py b/engine/apps/social_auth/pipeline.py
index 1babe21d..a271d056 100644
--- a/engine/apps/social_auth/pipeline.py
+++ b/engine/apps/social_auth/pipeline.py
@@ -72,8 +72,8 @@ def connect_user_to_slack(response, backend, strategy, user, organization, *args
         author=user,
         event_name=ChatOpsEvent.USER_LINKED,
         chatops_type=ChatOpsType.SLACK,
-        user=user.username,
-        user_id=user.public_primary_key,
+        linked_user=user.username,
+        linked_user_id=user.public_primary_key,
     )
     user.slack_user_identity = slack_user_identity
     user.save(update_fields=["slack_user_identity"])
diff --git a/engine/apps/telegram/models/verification/personal.py b/engine/apps/telegram/models/verification/personal.py
index 9dc49cbc..43823312 100644
--- a/engine/apps/telegram/models/verification/personal.py
+++ b/engine/apps/telegram/models/verification/personal.py
@@ -36,8 +36,8 @@ class TelegramVerificationCode(models.Model):
                 author=user,
                 event_name=ChatOpsEvent.USER_LINKED,
                 chatops_type=ChatOpsType.TELEGRAM,
-                user=user.username,
-                user_id=user.public_primary_key,
+                linked_user=user.username,
+                linked_user_id=user.public_primary_key,
             )
             return connector, created
 
diff --git a/engine/common/insight_log/chatops_insight_logs.py b/engine/common/insight_log/chatops_insight_logs.py
index aae90ed3..5999b655 100644
--- a/engine/common/insight_log/chatops_insight_logs.py
+++ b/engine/common/insight_log/chatops_insight_logs.py
@@ -36,7 +36,7 @@ def write_chatops_insight_log(author, event_name: ChatOpsEvent, chatops_type: Ch
             user_id = author.public_primary_key
             username = json.dumps(author.username)
 
-            log_line = f'tenant_id={tenant_id} author_id={user_id} author={username} action_type="chat_ops" action_name={event_name.value} chat_ops_type={chatops_type.value}'  # noqa
+            log_line = f"tenant_id={tenant_id} author_id={user_id} author={username} action_type=chat_ops action_name={event_name.value} chat_ops_type={chatops_type.value}"  # noqa
             for k, v in kwargs.items():
                 log_line += f" {k}={json.dumps(v)}"