chore(services/user): migrate user-team-list proto op #1650

ABCxFF · 2024-12-18T22:20:51Z

Changes

ABCxFF · 2024-12-18T22:21:08Z

How to use the Graphite Merge Queue

Add the label merge-queue to this PR to add it to the merge queue.

You must have a Graphite account in order to use the merge queue. Sign up using this link.

_{An organization admin has enabled the Graphite Merge Queue in this repository.} _{Please do not merge from GitHub as this will restart CI on PRs being processed by the merge queue.}

This stack of pull requests is managed by Graphite. Learn more about stacking.

cloudflare-workers-and-pages · 2024-12-18T22:25:24Z

Deploying rivet with Cloudflare Pages

Latest commit:	`742f6bc`
Status:	✅ Deploy successful!
Preview URL:	https://f8f8b197.rivet.pages.dev
Branch Preview URL:	https://12-18-chore-services-user-mi-7ha2.rivet.pages.dev

View logs

MasterPtato

I know this is still in progress, just providing some initial feedback. Feel free to ignore any changes you've already made. Really good stuff all around.

I only have nits to add on top of the comments i left:

You can remove the leading :: from all user pkg paths (::user::ops::get -> user::ops::get)
Auto dereferencing should handle calls to .op in API services automatically, so you can change (*ctx) to just ctx
The migration files from api-identity were moved to the wrong location, the entire folder at packages/services/user-identity/db/user-identity should be moved to packages/services/user/db/user-identity
In the API layer we could change functions to accept an OperationCtx (new, from chirp-workflow) or a Ctx (from api-helper) instead of an OperationContext (old) which would allow us to get rid of compat calls and just do .op. This is low priority though and isn't required

packages/api/cloud/src/auth.rs

MasterPtato · 2025-01-06T18:28:10Z

packages/services/load-test/standalone/api-cloud/src/lib.rs

+		chirp_workflow::compat::op(
+			&ctx,
+			::user::ops::identity::create::Input {
+				user_id: primary_user_id,
+				identity: backend::user_identity::Identity {
+					kind: Some(backend::user_identity::identity::Kind::Email(backend::user_identity::identity::Email {
+						email: util::faker::email()
+					}))
+				}
+			}
+		)


Standalone services should be converted to use the new contexts as well, that way you dont have to use compat. See cluster-gc for an example. You'll have to change the ctx variable above to use StandaloneCtx

MasterPtato · 2025-01-06T18:28:29Z

packages/services/load-test/standalone/watch-requests/src/lib.rs

+		chirp_workflow::compat::op(
+			&ctx,
+			::user::ops::identity::create::Input {
+				user_id: primary_user_id,
+				identity: backend::user_identity::Identity {
+					kind: Some(backend::user_identity::identity::Kind::Email(backend::user_identity::identity::Email {
+						email: util::faker::email()
+					}))
+				}
+			}
+		)


See above comment

packages/services/user/src/ops/get.rs

packages/services/user/src/ops/identity/create.rs

packages/services/user/src/ops/identity/get.rs

MasterPtato · 2025-01-06T18:35:30Z

packages/services/user/src/ops/profile_validate.rs

+
+#[derive(Debug)]
+pub struct Output {
+    pub errors: Vec<common::ValidationError>,


Should be converted to rust type

MasterPtato · 2025-01-06T18:36:11Z

packages/services/user/src/ops/token_create.rs

+#[derive(Debug)]
+pub struct Input {
+	pub user_id: Uuid,
+	pub client: backend::net::ClientInfo,


Should be converted to rust type

packages/services/user/tests/token_create.rs

greptile-apps

PR Summary

Based on the extensive changes shown, here's a concise summary of the key modifications in this PR:

Migrates user-related proto operations to a new consolidated structure in the user service, focusing on standardizing operation calls and improving code organization.

Moved user identity database migrations from /services/user-identity/db/user-identity to /services/user/db/user-identity
Added new user service operations in /services/user/src/ops/ including identity management, profile validation, and token handling
Replaced individual user-related dependencies with consolidated user.workspace dependency across multiple packages
Added comprehensive test coverage for new user service operations in /services/user/tests/
Added chirp-workflow dependency to support new operation calling pattern using ctx.op() instead of op! macro

_{77 file(s) reviewed, 49 comment(s)}
_{Edit PR Review Bot Settings | Greptile}

packages/api/auth/src/route/tokens.rs

packages/api/cloud/src/auth.rs

packages/api/group/src/auth.rs

packages/api/group/src/fetch/identity.rs

packages/services/user/tests/profile_validate.rs

packages/services/user/tests/team_list.rs

packages/services/user/tests/token_create.rs

packages/services/user/tests/resolve_email.rs

packages/services/user/worker/src/workers/delete.rs

ABCxFF · 2025-02-14T22:37:04Z

@greptileai

greptile-apps

PR Summary

Based on the extensive changes shown, here's a concise summary of the most recent modifications in this PR:

Migrates user-team-list proto operation to use the new consolidated user service structure, with significant changes to authentication and operation calls.

Replaced op! macro calls with chirp_workflow::compat::op for user operations across auth.rs files in multiple API packages
Updated team membership checks to handle UUID conversions correctly in group-related operations
Simplified user data retrieval in admin validation by reusing existing user calls
Added new user service operations with proper caching and database interactions
Introduced comprehensive test suite for new user operations including identity, profile, and token management

The changes maintain existing functionality while modernizing the API structure and improving code organization.

_{79 file(s) reviewed, 32 comment(s)}
_{Edit PR Review Bot Settings | Greptile}

greptile-apps · 2025-02-14T22:38:50Z

packages/api/auth/src/route/identity.rs

+	let email_res = ctx.op(::user::ops::resolve_email::Input {
 		emails: vec![res.email.clone()],
 	})
 	.await?;


logic: ensure that email_res.users is properly ordered to prevent potential race conditions when multiple users have the same email

greptile-apps · 2025-02-14T22:39:04Z

packages/api/games/src/auth.rs

+				chirp_workflow::compat::op(
+					&ctx,
+					::user::ops::get::Input {
+						user_ids: vec![user_ent.user_id],


logic: user_ids is passed without .into() here, but with .into() on line 112. These should be consistent.

greptile-apps · 2025-02-14T22:40:40Z

packages/api/identity/src/auth.rs

+		let user_res = chirp_workflow::compat::op(
+			&ctx,
+			::user::ops::get::Input {
+				user_ids: vec![user_ent.user_id],
+			},
+		)


logic: The user_id type conversion may need to be checked here. Previously it was explicitly converted with .into(), but now it's passed directly. Verify that user_ent.user_id matches the expected type in the Input struct.

greptile-apps · 2025-02-14T22:40:40Z

packages/api/identity/src/auth.rs

+			::user::ops::get::Input {
+				user_ids: vec![user_ent.user_id],
+			},
+		)
 		.await?;

 		let user = unwrap!(user_res.users.first(), "user not found");


style: The error message 'user not found' is redundant since this code path should be unreachable - the user was already found in the first user_get call. Consider removing this check entirely.

greptile-apps · 2025-02-14T22:41:31Z

packages/api/identity/src/route/identities.rs

+	let res =  ctx.op(::user::ops::profile_validate::Input {
+		user_id: user_ent.user_id,
 		display_name: body.display_name.clone(),
-		account_number:
-			body.account_number
-				.map(|n| n.api_try_into())
-				.transpose()?,
+		account_number: body.account_number
+			.map(|n| n.api_try_into())
+			.transpose()?,
 		bio: body.bio.clone(),
 	})
 	.await?;


style: The indentation here is inconsistent with the rest of the file - there's an extra space after res =

greptile-apps · 2025-02-14T22:49:00Z

packages/services/user/tests/get.rs

+		let user_res = op!([ctx] faker_user { }).await.unwrap();
+		let user_id = user_res.user_id.unwrap().as_uuid();


style: consider adding error handling for faker_user failure case rather than just unwrap()

greptile-apps · 2025-02-14T22:49:01Z

packages/services/user/tests/get.rs

+			.find(|u| u.user_id.unwrap().as_uuid() == user.user_id.unwrap())
+			.expect("user not returned");


style: consider more descriptive error message than 'user not returned', e.g. include the user ID that wasn't found

greptile-apps · 2025-02-14T22:49:22Z

packages/services/user/tests/resolve_email.rs

+	assert_eq!(1, res.users.len());
+	let user = res.users.first().unwrap();
+	assert_eq!(user_id, user.user_id);


style: consider adding assertions to verify that the non-existent email was not resolved to any user

greptile-apps · 2025-02-14T22:49:25Z

packages/services/user/tests/token_create.rs

+
+	let res = ctx.op(::user::ops::token_create::Input {
+		user_id,
+		client: backend::net::ClientInfo::default()


style: consider testing with non-default ClientInfo to ensure token creation works with different client configurations

greptile-apps · 2025-02-14T22:49:26Z

packages/services/user/tests/team_list.rs

+	assert_eq!(3, res.users.len());
+	let users_map = res
+		.users
+		.iter()
+		.map(|u| (u.user_id, u.teams.len()))
+		.collect::<HashMap<Uuid, usize>>();


style: Consider adding error messages to assertions to make test failures more descriptive

ABCxFF force-pushed the 12-18-chore_services_user_migrate_user_proto_ops branch from 06909a8 to 4c41e8e Compare December 21, 2024 00:45

ABCxFF force-pushed the 12-18-chore_services_user_migrate_user_proto_ops branch from 4c41e8e to 075a092 Compare December 30, 2024 23:07

MasterPtato requested changes Jan 6, 2025

View reviewed changes

ABCxFF force-pushed the 12-18-chore_services_user_migrate_user_proto_ops branch from e508246 to ec88581 Compare January 7, 2025 15:45

ABCxFF mentioned this pull request Jan 7, 2025

chore(users): migrate proto backend to native #1805

Open

ABCxFF force-pushed the 12-18-chore_services_user_migrate_user_proto_ops branch from ec88581 to d8bc66a Compare January 14, 2025 22:47

ABCxFF mentioned this pull request Jan 14, 2025

chore(users/workflow): setup basic e2e user workflow #1844

Open

ABCxFF force-pushed the 12-18-chore_services_user_migrate_user_proto_ops branch from d8bc66a to 6fb3d05 Compare January 22, 2025 03:35

This was referenced Jan 22, 2025

feat(user/workflows): profile set signal #1902

Open

feat(users): user wf tests #1935

Open

ABCxFF force-pushed the 12-18-chore_services_user_migrate_user_proto_ops branch 4 times, most recently from b259e38 to 9a2121e Compare January 28, 2025 19:50

ABCxFF mentioned this pull request Jan 28, 2025

feat(user): migrate pub/sub #1953

Open

ABCxFF force-pushed the 12-18-chore_services_user_migrate_user_proto_ops branch 2 times, most recently from 2519b6f to be1bf74 Compare January 28, 2025 22:35

ABCxFF mentioned this pull request Jan 29, 2025

chore(users): delete old worker code #1959

Open

ABCxFF force-pushed the 12-18-chore_services_user_migrate_user_proto_ops branch from be1bf74 to 936d97d Compare February 6, 2025 21:51

ABCxFF added 9 commits February 10, 2025 18:55

chore(services/user): migrate user-team-list proto op

2d86c7a

chore(user/team-list): migrate leftover references

21e99bd

chore(user/resolve-email): migrate resolve-email op & refs

3dfc590

chore(user/token-create): migrate proto ops & refs

da4577e

chore(user/profile-validate): migrate ops & refs

6c6edd6

chore(users/pending-delete-toggle): migrate proto ops & refs

df9efa8

chore(users/get): migrate old proto and refs

1e0686c

chore(user/avatar-upload-complete): migrate ops & refs

941e748

chore(users): migrate user-identity ops to user

a0fbde7

chore(user-identity/db): migrate migrations to user

a70d444

ABCxFF marked this pull request as ready for review February 10, 2025 19:37

greptile-apps bot reviewed Feb 10, 2025

View reviewed changes

ABCxFF force-pushed the 12-18-chore_services_user_migrate_user_proto_ops branch from 936d97d to f0811d0 Compare February 10, 2025 23:08

chore(users): migrate tests

742f6bc

ABCxFF force-pushed the 12-18-chore_services_user_migrate_user_proto_ops branch from f0811d0 to 742f6bc Compare February 14, 2025 14:31

ABCxFF mentioned this pull request Feb 14, 2025

chore: move loops to oss #2031

Open

greptile-apps bot reviewed Feb 14, 2025

View reviewed changes

ABCxFF mentioned this pull request Feb 16, 2025

feat(user): user one-off for users w/o wf #2036

Open

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

chore(services/user): migrate user-team-list proto op #1650

chore(services/user): migrate user-team-list proto op #1650

ABCxFF commented Dec 18, 2024

ABCxFF commented Dec 18, 2024 •

edited

Loading

cloudflare-workers-and-pages bot commented Dec 18, 2024 •

edited

Loading

MasterPtato left a comment

MasterPtato Jan 6, 2025

MasterPtato Jan 6, 2025

MasterPtato Jan 6, 2025

MasterPtato Jan 6, 2025

greptile-apps bot left a comment

ABCxFF commented Feb 14, 2025

greptile-apps bot left a comment

greptile-apps bot Feb 14, 2025

greptile-apps bot Feb 14, 2025

greptile-apps bot Feb 14, 2025

greptile-apps bot Feb 14, 2025

greptile-apps bot Feb 14, 2025

greptile-apps bot Feb 14, 2025

greptile-apps bot Feb 14, 2025

greptile-apps bot Feb 14, 2025

greptile-apps bot Feb 14, 2025

greptile-apps bot Feb 14, 2025

		let user_res = op!([ctx] faker_user { }).await.unwrap();
		let user_id = user_res.user_id.unwrap().as_uuid();

		.find(\|u\| u.user_id.unwrap().as_uuid() == user.user_id.unwrap())
		.expect("user not returned");

chore(services/user): migrate user-team-list proto op #1650

Are you sure you want to change the base?

chore(services/user): migrate user-team-list proto op #1650

Conversation

ABCxFF commented Dec 18, 2024

Changes

ABCxFF commented Dec 18, 2024 • edited Loading

How to use the Graphite Merge Queue

cloudflare-workers-and-pages bot commented Dec 18, 2024 • edited Loading

Deploying rivet with Cloudflare Pages

MasterPtato left a comment

Choose a reason for hiding this comment

MasterPtato Jan 6, 2025

Choose a reason for hiding this comment

MasterPtato Jan 6, 2025

Choose a reason for hiding this comment

MasterPtato Jan 6, 2025

Choose a reason for hiding this comment

MasterPtato Jan 6, 2025

Choose a reason for hiding this comment

greptile-apps bot left a comment

Choose a reason for hiding this comment

PR Summary

ABCxFF commented Feb 14, 2025

greptile-apps bot left a comment

Choose a reason for hiding this comment

PR Summary

greptile-apps bot Feb 14, 2025

Choose a reason for hiding this comment

greptile-apps bot Feb 14, 2025

Choose a reason for hiding this comment

greptile-apps bot Feb 14, 2025

Choose a reason for hiding this comment

greptile-apps bot Feb 14, 2025

Choose a reason for hiding this comment

greptile-apps bot Feb 14, 2025

Choose a reason for hiding this comment

greptile-apps bot Feb 14, 2025

Choose a reason for hiding this comment

greptile-apps bot Feb 14, 2025

Choose a reason for hiding this comment

greptile-apps bot Feb 14, 2025

Choose a reason for hiding this comment

greptile-apps bot Feb 14, 2025

Choose a reason for hiding this comment

greptile-apps bot Feb 14, 2025

Choose a reason for hiding this comment

ABCxFF commented Dec 18, 2024 •

edited

Loading

cloudflare-workers-and-pages bot commented Dec 18, 2024 •

edited

Loading