Skip to content

Commit

Permalink
rewriting user and org data in event only when it is from client
Browse files Browse the repository at this point in the history
  • Loading branch information
Eldies committed Dec 13, 2024
1 parent db1ae66 commit f3667c4
Showing 1 changed file with 8 additions and 7 deletions.
15 changes: 8 additions & 7 deletions cvat/apps/events/serializers.py
Original file line number Diff line number Diff line change
Expand Up @@ -53,8 +53,13 @@ def to_internal_value(self, data):
data = super().to_internal_value(data)
request = self.context.get("request")
org = request.iam_context["organization"]
org_id = getattr(org, "id", None)
org_slug = getattr(org, "slug", None)
user_and_org_data = {
"org_id": getattr(org, "id", None),
"org_slug": getattr(org, "slug", None),
"user_id": request.user.id,
"user_name": request.user.username,
"user_email": request.user.email,
}

send_time = data["timestamp"]
receive_time = datetime.datetime.now(datetime.timezone.utc)
Expand All @@ -77,12 +82,8 @@ def to_internal_value(self, data):
event.update({
"timestamp": event["timestamp"] + time_correction,
"source": source,
"org_id": event.get("org_id", org_id),
"org_slug": event.get("org_slug", org_slug),
"user_id": event.get("user_id", request.user.id),
"user_name": event.get("user_name", request.user.username),
"user_email": event.get("user_email", request.user.email),
"payload": json.dumps(payload),
**(user_and_org_data if source == 'client' else {})
})

return data

0 comments on commit f3667c4

Please sign in to comment.