feat: expose userId field on IntegrationGoogle GraphQL type (NES-1492) by jianwei1 · Pull Request #8967 · JesusFilm/core

jianwei1 · 2026-04-07T03:57:58Z

Summary

Exposes userId (Firebase UID) as a scalar field on IntegrationGoogle in both api-journeys and api-journeys-modern
Consistent with 10+ other types that already expose userId (UserJourney, UserRole, JourneyProfile, etc.)
Enables the frontend to filter integrations by authenticated user without relying on the federated User entity, which resolves to a different ID format (Prisma UUID vs Firebase UID)
No breaking changes — additive only, no existing queries are affected

Context

This is part 1 of 2 for NES-1492. The frontend PR (#8958) depends on this being deployed first.

Test plan

Verify userId field is queryable on IntegrationGoogle via GraphQL
Verify existing integrations query continues to work without changes

🤖 Generated with Claude Code

Summary by CodeRabbit

New Features
- Added userId field to Google Integration objects.
- Added notes field to VideoBlock for template adapters reference.
Schema Updates
- Reorganized CardBlock mutations across API implementations for improved structure.

Exposes the Firebase UID stored on Integration.userId as a scalar field on IntegrationGoogle, consistent with 10+ other types that already expose userId (UserJourney, UserRole, JourneyProfile, etc.). This enables frontend consumers to filter integrations by the authenticated user without relying on the federated User entity, which resolves to a different ID format (Prisma UUID). Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

linear · 2026-04-07T03:58:02Z

NES-1492 Google Sync dropdown shows another manager's Gmail account for other managers

coderabbitai · 2026-04-07T03:58:06Z

Walkthrough

The PR reorganizes GraphQL schemas across API services, relocating the cardBlockCreate mutation from API_JOURNEYS to API_JOURNEYS_MODERN, adding a userId field to IntegrationGoogle type in multiple services, and removing legacy cardBlockCreate mutation from the older API_JOURNEYS schema.

Changes

Cohort / File(s)	Summary
API Gateway Schema Reorganization `apis/api-gateway/schema.graphql`	Moved `cardBlockCreate` mutation to API_JOURNEYS_MODERN, reordered VideoBlock fields (`notes` and `mediaVideo`), relocated `CardBlockCreateInput` input type to API_JOURNEYS_MODERN only, and added `userId: ID` field to `IntegrationGoogle`.
API Journeys Modern Implementation `apis/api-journeys-modern/schema.graphql`, `apis/api-journeys-modern/src/schema/integration/google/google.ts`	Added `userId: ID` optional field to `IntegrationGoogle` type in schema and exposed it via `t.exposeID()` in TypeScript implementation.
API Journeys Legacy Schema `apis/api-journeys/schema.graphql`, `apis/api-journeys/src/app/modules/integration/google/google.graphql`	Removed `cardBlockCreate` mutation and `CardBlockCreateInput` input type, added `notes: String` field to `VideoBlock`, and added `userId: ID` field to `IntegrationGoogle` in both schema and implementation files.

Estimated code review effort

🎯 3 (Moderate) | ⏱️ ~22 minutes

🚥 Pre-merge checks | ✅ 3

✅ Passed checks (3 passed)

Check name	Status	Explanation
Description Check	✅ Passed	Check skipped - CodeRabbit’s high-level summary is enabled.
Title check	✅ Passed	The PR title accurately summarizes the main change: exposing a userId field on IntegrationGoogle, which is the primary focus across all modified files.
Docstring Coverage	✅ Passed	No functions found in the changed files to evaluate docstring coverage. Skipping docstring coverage check.

_{✏️ Tip: You can configure your own custom pre-merge checks in the settings.}

✨ Finishing Touches

📝 Generate docstrings

Create stacked PR
Commit on current branch

🧪 Generate unit tests (beta)

Create PR with unit tests
Commit unit tests in branch jianweichong/nes-1492-expose-userid-on-integration-google

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

_{Comment @coderabbitai help to get the list of available commands and usage tips.}

nx-cloud · 2026-04-07T03:59:06Z

View your CI Pipeline Execution ↗ for commit 5604dc9

Command	Status	Duration	Result
`nx run journeys-admin-e2e:e2e`	✅ Succeeded	32s	View ↗
`nx run watch-e2e:e2e`	✅ Succeeded	24s	View ↗
`nx run journeys-e2e:e2e`	✅ Succeeded	27s	View ↗
`nx run player-e2e:e2e`	✅ Succeeded	3s	View ↗
`nx run resources-e2e:e2e`	✅ Succeeded	19s	View ↗
`nx run videos-admin-e2e:e2e`	✅ Succeeded	4s	View ↗
`nx run short-links-e2e:e2e`	✅ Succeeded	3s	View ↗
`nx run-many --target=vercel-alias --projects=jo...`	✅ Succeeded	2s	View ↗
`Additional runs (20)`	✅ Succeeded	...	View ↗

☁️ Nx Cloud last updated this comment at 2026-04-07 04:40:38 UTC

stage-branch-merger · 2026-04-07T03:59:13Z

I see you added the "on stage" label, I'll get this merged to the stage branch!

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

stage-branch-merger · 2026-04-07T04:27:53Z

Merge conflict attempting to merge this into stage. Please fix manually.

github-actions · 2026-04-07T04:30:48Z