clerk orgs Backend architecture by eric-kitagawa · Pull Request #175 · GenerateNU/selfserve

eric-kitagawa · 2026-03-15T04:09:50Z

Description

Type of Change

Bug fix (non-breaking change that fixes an issue)
New feature (non-breaking change that adds functionality)
Breaking change (fix or feature that would cause existing functionality to not work as expected)
Refactoring (code improvement without changing functionality)
Documentation update
Configuration/infrastructure change
Performance improvement
Test coverage improvement

Related Issue(s)

Closes #
Related to #

What Changed?

Testing & Validation

How this was tested

Screenshots/Recordings

Unfinished Work & Known Issues

None, this PR is complete and production-ready
The following items are intentionally deferred:

Notes & Nuances

Pre-Merge Checklist

Code Quality

Code follows the project's style guidelines and conventions
Self-review completed (I've reviewed my own code for obvious issues)
No debugging code, console logs, or commented-out code left behind
No merge conflicts with the base branch
Meaningful commit messages that explain the "why"

Testing & CI

All CI checks are passing
All new and existing tests pass locally
Test coverage hasn't decreased (or decrease is justified)
Linting passes without errors

Documentation

Code is self-documenting or includes helpful comments for complex logic
API documentation updated (if backend endpoints changed)
Type definitions are accurate and up-to-date

Reviewer Notes

Areas needing extra attention: ...
Questions for reviewers: ...

Dao-Ho

This is a good start, and definitely one of the flows we want. But some things to consider.

What you have: whenever a new user gets created under an org, you insert that user into an existing org/hotel in our DB.

Some questions to consider:

What happens if a user is created before their org is created?
What happens if the org is created on clerk, and a member is created under that org, but it isn't in our internal database. How do we handle that now?

I think this should give you a good direction on improving this.

codecov · 2026-04-05T16:37:37Z

Codecov Report

❌ Patch coverage is 0% with 81 lines in your changes missing coverage. Please review.
✅ Project coverage is 19.07%. Comparing base (87ced32) to head (1eb93af).
⚠️ Report is 4 commits behind head on main.

Files with missing lines	Patch %	Lines
backend/internal/handler/clerk.go	0.00%	37 Missing ⚠️
backend/internal/utils/clerk.go	0.00%	11 Missing ⚠️
backend/internal/repository/hotels.go	0.00%	10 Missing ⚠️
backend/internal/handler/utils.go	0.00%	9 Missing ⚠️
backend/internal/service/clerk/organizations.go	0.00%	8 Missing ⚠️
backend/internal/service/server.go	0.00%	4 Missing ⚠️
backend/internal/handler/hotels.go	0.00%	1 Missing and 1 partial ⚠️

Additional details and impacted files

@@            Coverage Diff             @@
##            main     #175       +/-   ##
==========================================
+ Coverage   0.62%   19.07%   +18.45%     
==========================================
  Files         78       48       -30     
  Lines       3218     2307      -911     
==========================================
+ Hits          20      440      +420     
+ Misses      3198     1852     -1346     
- Partials       0       15       +15

Flag	Coverage Δ
backend	`19.07% <0.00%> (?)`
web	`?`

Flags with carried forward coverage won't be shown. Click here to find out more.

Files with missing lines	Coverage Δ
backend/internal/handler/hotels.go	`86.95% <0.00%> (ø)`
backend/internal/service/server.go	`0.00% <0.00%> (ø)`
backend/internal/service/clerk/organizations.go	`0.00% <0.00%> (ø)`
backend/internal/handler/utils.go	`21.27% <0.00%> (ø)`
backend/internal/repository/hotels.go	`0.00% <0.00%> (ø)`
backend/internal/utils/clerk.go	`0.00% <0.00%> (ø)`
backend/internal/handler/clerk.go	`0.00% <0.00%> (ø)`

... and 119 files with indirect coverage changes

🚀 New features to boost your workflow:

❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.
📦 JS Bundle Analysis: Save yourself from yourself by tracking and limiting bundle sizes in JS merges.

manueltorres0 · 2026-04-05T16:47:54Z

Update on the PR for clerk orgs.
Key changes:

modified flow to handle organization created webhook, and organization membership creted webhook separetly
added utility to hit Clerk API to create org when onboarding directly on selfserve

Debt:

org deleted/updated webhook + membership deleted/updated webhook
refactor the user sync script
make onboarding use the utility
redirect users that are not assigned to an association page

Current FLOW:
A)

Manager creates a Clerk org via clerk UI

B)

Manager creates a Clerk org on app
BE hits clerk to create org and makes the corresponding hotel
organization.created fires → hotel created in DB with org name and clerk_org_id
hotel id injected into clerk maintained FE accesible metadata
Manager auto-added as member → organizationMembership.created fires → user created in DB
Staff invited → accepts → organizationMembership.created fires → staff user created in DB
If hotel not found during step 3/4 → 503 returned → Clerk retries until hotel exists

Dao-Ho

Just a couple of comments, otherwise this is awesome, great ship! 🚀 🚀 🚀

Dao-Ho · 2026-04-07T16:55:41Z

backend/internal/handler/clerk.go

+	hotel, err := h.HotelsRepository.FindByClerkOrgID(c.Context(), payload.Data.Organization.ID)
+	if err != nil {
+		if errors.Is(err, errs.ErrNotFoundInDB) {
+			return c.SendStatus(fiber.StatusServiceUnavailable)


I would actually return an internal error here if the hotel hasn't been inserted into our DB yet instead of service unavailable.

Although we don't have to in this pr, it might make sense to build a sync pipeline and trigger a sync and reinsert if this is the case. We can do that separately though

Dao-Ho · 2026-04-07T16:57:53Z

backend/internal/repository/hotels.go

+		return nil, err
+	}
+	return &hotel, nil
+}


We can just have clerk org id as our hotel id, just like how clerk user id is our user id. They are the same and do not need a separate field.

You can then reformat your fetch to be just FindHotel(id)

Dao-Ho · 2026-04-07T16:58:27Z

backend/supabase/migrations/20260315000000_hotels-add-clerk-org-id.sql

@@ -0,0 +1 @@
+ALTER TABLE public.hotels ADD COLUMN clerk_org_id text UNIQUE;


With comments above - we wont need this

Dao-Ho

LGTM ✅

first pass on clerk orgs

cbddc01

Dao-Ho reviewed Mar 15, 2026

View reviewed changes

manueltorres0 added 3 commits April 5, 2026 11:18

merged main

4332ab9

update of clerk orgs

4d48289

lint

aca427f

manueltorres0 marked this pull request as ready for review April 5, 2026 16:37

manueltorres0 changed the title ~~first pass on clerk orgs~~ clerk orgs Backend arch Apr 5, 2026

slight refactor

1ef7bbf

manueltorres0 changed the title ~~clerk orgs Backend arch~~ clerk orgs Backend architecture Apr 5, 2026

Dao-Ho requested changes Apr 7, 2026

View reviewed changes

Dao-Ho added the changes requested label Apr 7, 2026

danctila assigned eric-kitagawa and manueltorres0 Apr 7, 2026

cmts

1eb93af

Dao-Ho approved these changes Apr 7, 2026

View reviewed changes

manueltorres0 merged commit 5532abf into main Apr 7, 2026
6 checks passed

manueltorres0 deleted the eric/hotel-id-on-user-middleware branch April 7, 2026 18:21

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

clerk orgs Backend architecture#175

clerk orgs Backend architecture#175
manueltorres0 merged 6 commits intomainfrom
eric/hotel-id-on-user-middleware

eric-kitagawa commented Mar 15, 2026

Uh oh!

Dao-Ho left a comment

Uh oh!

codecov bot commented Apr 5, 2026 •

edited

Loading

Uh oh!

manueltorres0 commented Apr 5, 2026 •

edited

Loading

Uh oh!

Dao-Ho left a comment

Uh oh!

Dao-Ho Apr 7, 2026

Uh oh!

manueltorres0 Apr 7, 2026

Uh oh!

Dao-Ho Apr 7, 2026

Uh oh!

Dao-Ho Apr 7, 2026

Uh oh!

manueltorres0 Apr 7, 2026

Uh oh!

Dao-Ho left a comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

		@@ -0,0 +1 @@
		ALTER TABLE public.hotels ADD COLUMN clerk_org_id text UNIQUE;

Conversation

eric-kitagawa commented Mar 15, 2026

Description

Type of Change

Related Issue(s)

What Changed?

Testing & Validation

How this was tested

Screenshots/Recordings

Unfinished Work & Known Issues

Notes & Nuances

Pre-Merge Checklist

Code Quality

Testing & CI

Documentation

Reviewer Notes

Uh oh!

Dao-Ho left a comment

Choose a reason for hiding this comment

Uh oh!

codecov bot commented Apr 5, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

manueltorres0 commented Apr 5, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Dao-Ho left a comment

Choose a reason for hiding this comment

Uh oh!

Dao-Ho Apr 7, 2026

Choose a reason for hiding this comment

Uh oh!

manueltorres0 Apr 7, 2026

Choose a reason for hiding this comment

Uh oh!

Dao-Ho Apr 7, 2026

Choose a reason for hiding this comment

Uh oh!

Dao-Ho Apr 7, 2026

Choose a reason for hiding this comment

Uh oh!

manueltorres0 Apr 7, 2026

Choose a reason for hiding this comment

Uh oh!

Dao-Ho left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

codecov bot commented Apr 5, 2026 •

edited

Loading

manueltorres0 commented Apr 5, 2026 •

edited

Loading