chore: fix deprecated analytics events fields

svc/pkg/team/worker/src/workers/create.rs

@@ -58,9 +58,9 @@ async fn worker(ctx: &OperationContext<team::msg::create::Message>) -> GlobalRes
 			analytics::msg::event_create::Event {
 				event_id: Some(Uuid::new_v4().into()),
 				name: "team.create".into(),
-				user_id: ctx.owner_user_id,
 				properties_json: Some(serde_json::to_string(&json!({
 					"team_id": team_id,
+					"user_id": owner_user_id,
 				}))?),
 				..Default::default()
 			},

svc/pkg/team/worker/src/workers/join_request_create.rs

@@ -20,10 +20,10 @@ async fn fail(
 			analytics::msg::event_create::Event {
 				event_id: Some(Uuid::new_v4().into()),
 				name: "team.join_request.create_fail".into(),
-				user_id: Some(user_id.into()),
 				properties_json: Some(serde_json::to_string(&json!({
 					"team_id": team_id,
 					"error": error_code as i32,
+					"user_id": user_id,
 				}))?),
 				..Default::default()
 			}
@@ -87,9 +87,9 @@ async fn worker(
 			analytics::msg::event_create::Event {
 				event_id: Some(Uuid::new_v4().into()),
 				name: "team.join_request.create".into(),
-				user_id: ctx.user_id,
 				properties_json: Some(serde_json::to_string(&json!({
 					"team_id": team_id,
+					"user_id": user_id,
 				}))?),
 				..Default::default()
 			}

svc/pkg/team/worker/src/workers/join_request_resolve.rs

@@ -39,9 +39,9 @@ async fn worker(
 			analytics::msg::event_create::Event {
 				event_id: Some(Uuid::new_v4().into()),
 				name: "team.join_request.resolve".into(),
-				user_id: Some(user_id.into()),
 				properties_json: Some(serde_json::to_string(&json!({
 					"team_id": team_id,
+					"user_id": user_id,
 				}))?),
 				..Default::default()
 			}

svc/pkg/team/worker/src/workers/member_create.rs

@@ -68,9 +68,9 @@ async fn worker(ctx: &OperationContext<team::msg::member_create::Message>) -> Gl
 			analytics::msg::event_create::Event {
 				event_id: Some(Uuid::new_v4().into()),
 				name: "team.member.create".into(),
-				user_id: Some(user_id.into()),
 				properties_json: Some(serde_json::to_string(&json!({
 					"team_id": team_id,
+					"user_id": user_id,
 				}))?),
 				..Default::default()
 			}
@@ -127,11 +127,11 @@ async fn fail(
 				analytics::msg::event_create::Event {
 					event_id: Some(Uuid::new_v4().into()),
 					name: "team.invite.consume_fail".into(),
-					user_id: Some(user_id.into()),
 					properties_json: Some(serde_json::to_string(&json!({
 						"team_id": team_id,
 						"code": invitation.code,
 						"error": invite_error_code as i32,
+						"user_id": user_id,
 					}))?),
 					..Default::default()
 				}

svc/pkg/team/worker/src/workers/member_kick.rs

@@ -26,16 +26,23 @@ async fn worker(ctx: &OperationContext<team::msg::member_kick::Message>) -> Glob
 
 	msg!([ctx] team::msg::member_kick_complete(team_id, user_id) { }).await?;
 
+	let mut properties = json!({
+		"team_id": team_id,
+		"kick_user_id": user_id,
+	});
+
+	if let Some(kicker_user_id) = ctx.kicker_user_id {
+		properties["user_id"] = json!(kicker_user_id.to_string());
+	}
+
+	let properties_json = Some(serde_json::to_string(&properties)?);
+
 	msg!([ctx] analytics::msg::event_create() {
 		events: vec![
 			analytics::msg::event_create::Event {
 				event_id: Some(Uuid::new_v4().into()),
 				name: "team.member.kick".into(),
-				user_id: ctx.kicker_user_id,
-				properties_json: Some(serde_json::to_string(&json!({
-					"team_id": team_id,
-					"kick_user_id": user_id,
-				}))?),
+				properties_json,
 				..Default::default()
 			}
 		],

svc/pkg/team/worker/src/workers/member_remove.rs

@@ -46,9 +46,9 @@ async fn worker(ctx: &OperationContext<team::msg::member_remove::Message>) -> Gl
 			analytics::msg::event_create::Event {
 				event_id: Some(Uuid::new_v4().into()),
 				name: "team.member.remove".into(),
-				user_id: Some(user_id.into()),
 				properties_json: Some(serde_json::to_string(&json!({
 					"team_id": team_id,
+					"user_id": user_id,
 				}))?),
 				..Default::default()
 			}

svc/pkg/team/worker/src/workers/user_ban.rs

@@ -45,16 +45,23 @@ async fn worker(ctx: &OperationContext<team::msg::user_ban::Message>) -> GlobalR
 	})
 	.await?;
 
+	let mut properties = json!({
+		"team_id": team_id,
+		"ban_user_id": user_id,
+	});
+
+	if let Some(banner_user_id) = ctx.banner_user_id {
+		properties["user_id"] = json!(banner_user_id.to_string());
+	}
+
+	let properties_json = Some(serde_json::to_string(&properties)?);
+
 	msg!([ctx] analytics::msg::event_create() {
 		events: vec![
 			analytics::msg::event_create::Event {
 				event_id: Some(Uuid::new_v4().into()),
 				name: "team.user.ban".into(),
-				user_id: ctx.banner_user_id,
-				properties_json: Some(serde_json::to_string(&json!({
-					"team_id": team_id,
-					"banned_user_id": user_id,
-				}))?),
+				properties_json,
 				..Default::default()
 			}
 		],

svc/pkg/team/worker/src/workers/user_unban.rs

@@ -35,16 +35,23 @@ async fn worker(ctx: &OperationContext<team::msg::user_unban::Message>) -> Globa
 	})
 	.await?;
 
+	let mut properties = json!({
+		"team_id": team_id,
+		"unban_user_id": user_id,
+	});
+
+	if let Some(unbanner_user_id) = ctx.unbanner_user_id {
+		properties["user_id"] = json!(unbanner_user_id.to_string());
+	}
+
+	let properties_json = Some(serde_json::to_string(&properties)?);
+
 	msg!([ctx] analytics::msg::event_create() {
 		events: vec![
 			analytics::msg::event_create::Event {
 				event_id: Some(Uuid::new_v4().into()),
 				name: "team.user.unban".into(),
-				user_id: ctx.unbanner_user_id,
-				properties_json: Some(serde_json::to_string(&json!({
-					"team_id": team_id,
-					"unban_user_id": user_id,
-				}))?),
+				properties_json,
 				..Default::default()
 			}
 		],

svc/pkg/user-follow/ops/toggle/src/lib.rs

@@ -90,11 +90,11 @@ async fn handle(
 			events: vec![ analytics::msg::event_create::Event {
 				event_id: Some(Uuid::new_v4().into()),
 				name: "user_follow.create".into(),
-				user_id: Some(follower_user_id.into()),
 				properties_json: Some(serde_json::to_string(&json!({
 					"follower": follower_user_id,
 					"following": following_user_id,
 					"became_mutual": mutual,
+					"user_id": follower_user_id,
 				}))?),
 				..Default::default()
 			} ],
@@ -125,11 +125,11 @@ async fn handle(
 			events: vec![analytics::msg::event_create::Event {
 				event_id: Some(Uuid::new_v4().into()),
 				name: "user_follow.delete".into(),
-				user_id: Some(follower_user_id.into()),
 				properties_json: Some(serde_json::to_string(&json!({
 					"follower": follower_user_id,
 					"following": following_user_id,
 					"was_mutual": mutual,
+					"user_id": follower_user_id,
 				}))?),
 				..Default::default()
 			}],

svc/pkg/user-identity/ops/create/src/lib.rs

@@ -32,10 +32,9 @@ async fn handle(
 					analytics::msg::event_create::Event {
 						event_id: Some(Uuid::new_v4().into()),
 						name: "user_identity.create".into(),
-						user_id: Some(user_id.into()),
-						namespace_id: None,
 						properties_json: Some(serde_json::to_string(&json!({
 							"identity_email": email.email,
+							"user_id": user_id,
 						}))?),
 						..Default::default()
 					}
@@ -61,10 +60,9 @@ async fn handle(
 					analytics::msg::event_create::Event {
 						event_id: Some(Uuid::new_v4().into()),
 						name: "user_identity.create".into(),
-						user_id: Some(user_id.into()),
-						namespace_id: None,
 						properties_json: Some(serde_json::to_string(&json!({
 							"identity_access_token": access_token.name,
+							"user_id": user_id,
 						}))?),
 						..Default::default()
 					}

svc/pkg/user/ops/avatar-upload-complete/src/lib.rs

@@ -1,5 +1,6 @@
 use proto::backend::pkg::*;
 use rivet_operation::prelude::*;
+use serde_json::json;
 
 #[operation(name = "user-avatar-upload-complete")]
 async fn handle(
@@ -38,7 +39,9 @@ async fn handle(
 			analytics::msg::event_create::Event {
 				event_id: Some(Uuid::new_v4().into()),
 				name: "user.avatar_set".into(),
-				user_id: Some(user_id.into()),
+				properties_json: Some(serde_json::to_string(&json!({
+					"user_id": user_id,
+				}))?),
 				..Default::default()
 			}
 		],

svc/pkg/user/worker/src/workers/create.rs

@@ -81,22 +81,28 @@ async fn worker(ctx: &OperationContext<user::msg::create::Message>) -> GlobalRes
 	})
 	.await?;
 
+	let mut properties = json!({
+		"user_id": user_id,
+	});
+
+	if let Some(display_name) = display_name {
+		properties["display_name"] = json!(display_name);
+	}
+
+	let properties_json = Some(serde_json::to_string(&properties)?);
+
 	msg!([ctx] analytics::msg::event_create() {
 		events: vec![
 			analytics::msg::event_create::Event {
 				event_id: Some(Uuid::new_v4().into()),
 				name: "user.create".into(),
-				user_id: Some(user_id.into()),
-				namespace_id: ctx.namespace_id,
-				properties_json: Some(serde_json::to_string(&json!({
-				}))?),
+				properties_json: properties_json.clone(),
 				..Default::default()
 			},
 			analytics::msg::event_create::Event {
 				event_id: Some(Uuid::new_v4().into()),
 				name: "user.profile_set".into(),
-				user_id: Some(user_id.into()),
-				namespace_id: ctx.namespace_id,
+				properties_json,
 				..Default::default()
 			},
 		],

svc/pkg/user/worker/src/workers/delete.rs

@@ -135,8 +135,6 @@ async fn worker(ctx: &OperationContext<user::msg::delete::Message>) -> GlobalRes
 			analytics::msg::event_create::Event {
 				event_id: Some(Uuid::new_v4().into()),
 				name: "user.delete".into(),
-				user_id: None,
-				namespace_id: None,
 				properties_json: Some(serde_json::to_string(&json!({
 					"deleted_user_id": user_id
 				}))?),

svc/pkg/user/worker/src/workers/profile_set.rs

@@ -1,5 +1,6 @@
 use chirp_worker::prelude::*;
 use proto::backend::pkg::*;
+use serde_json::json;
 
 #[worker(name = "user-profile-set")]
 async fn worker(ctx: &OperationContext<user::msg::profile_set::Message>) -> GlobalResult<()> {
@@ -92,7 +93,9 @@ async fn worker(ctx: &OperationContext<user::msg::profile_set::Message>) -> Glob
 			analytics::msg::event_create::Event {
 				event_id: Some(Uuid::new_v4().into()),
 				name: "user.profile_set".into(),
-				user_id: Some(*user_id),
+				properties_json: Some(serde_json::to_string(&json!({
+					"user_id": user_id.to_string()
+				}))?),
 				..Default::default()
 			},
 		],