feat(server): improved subscription testing DX + tests for common subs + new subs #3554

fabis94 · 2024-11-26T09:55:59Z

Description & motivation

Changes:

To-do before merge:

Screenshots:

Validation of changes:

Checklist:

My pull request follows the guidelines in the Contributing guide?
My pull request does not duplicate any other open Pull Requests for the same update/change?
My commits are related to the pull request and do not amend unrelated code or documentation.
My code follows a similar style to existing code.
I have added appropriate tests.
I have updated or added relevant documentation.

References

linear · 2024-11-26T09:56:03Z

WEB-2168 Multi region subscriptions

fabis94 · 2024-11-26T10:16:52Z

packages/server/modules/core/repositories/users.ts

-    q.leftJoin(UserEmails.name, UserEmails.col.userId, Users.col.id).where({
-      [UserEmails.col.primary]: true
+    q.leftJoin(UserEmails.name, (j1) => {
+      j1.on(UserEmails.col.userId, Users.col.id).andOnVal(UserEmails.col.primary, true)


this was causing getUser(s) to return null, even if the user was there, because user_emails is not synced to the region db

why are we querying users from the region db?

@gjedlicska test prep. even outside of that, the query is invalid - it should not filter out users just because they dont have a UserEmails entry

edit: i suppose in theory you could also want to omit users w/o user_emails, but I still believe that in practice in shouldn't

fabis94 · 2024-11-26T10:31:09Z

packages/server/test/speckle-helpers/commitHelper.ts

-  ) => {
-    const { db } = deps
-    const { owner, stream } = options || {}
+export async function createTestCommits(


makes more sense for these to autoresolve the projectdb, instead of test writers having to do that manually beforehand

fabis94 · 2024-11-26T10:31:46Z

packages/server/test/speckle-helpers/streamHelper.ts

-  })
+  let id: string
+  if (streamObj.workspaceId) {
+    const createWorkspaceProject = createWorkspaceProjectFactory({


if u want a multiregion project, do createTestStream w/ workspaceId set AND run tests in multiregion mode

github-actions · 2024-11-26T10:35:55Z

📸 Preview service has generated an image.

github-actions · 2024-11-26T10:40:36Z

📸 Preview service has generated an image.

github-actions · 2024-11-26T11:06:07Z

📸 Preview service has generated an image.

fabis94 · 2024-11-26T11:09:58Z

packages/server/modules/workspaces/tests/helpers/creation.ts

+  const useRegion = isMultiRegionTestMode() && regionKey
+
+  if (!FF_WORKSPACES_MODULE_ENABLED) {
+    // Just skip creation and set id to undefined - this allows this to be invoked the same way if FFs are on or off


i can see how this is kinda hacky, but this allows me to write the same test code that works in both no-workspaces/with workspaces but not multiregion/with workspaces and multiregion mode

if there's better options, i'm open to it

github-actions · 2024-11-26T11:13:41Z

📸 Preview service has generated an image.

fabis94 · 2024-11-27T10:42:21Z

packages/server/modules/workspaces/graph/resolvers/workspaces.ts

-            totalCount: await getUserStreamsCount(filter)
+            totalCount: await getUserStreamsCount({
+              ...filter,
+              searchQuery: filter.search || undefined


Workspace.projects.totalCount when filter was applied was busted until now

fabis94 · 2024-11-27T10:50:54Z

packages/frontend-2/components/projects/Dashboard.vue

@@ -108,7 +108,8 @@ const {
  filter: {
    search: (search.value || '').trim() || null,
    onlyWithRoles: selectedRoles.value?.length ? selectedRoles.value : null
-  }
+  },
+  cursor: null as Nullable<string>


ts error from previous code, @Mikehrn @andrewwallacespeckle plz check that TS linting works on ur end

@fabis94 Generally my linting is working as expected, but this never threw an error 🤔

@Mikehrn it appears that vue-tsc, the CI linter doesn't pick up on this, which explains why it got through to main. in VSCode I definitely see squiggly lines in Dashboard.vue due to the type not being valid 🤔

fabis94 · 2024-11-27T10:51:29Z

packages/server/app.ts

@@ -451,9 +490,9 @@ export async function init() {
 }

 export async function shutdown(params: {
-  graphqlServer: ApolloServer<GraphQLContext>
+  graphqlServer: Optional<ApolloServer<GraphQLContext>>


server will be undefined if test beforeAll hook fails

fabis94 · 2024-11-27T10:52:01Z

packages/server/modules/core/tests/integration/subs.graph.spec.ts

+import { BasicTestStream, createTestStreams } from '@/test/speckle-helpers/streamHelper'
+import { expect } from 'chai'
+
+describe('Core GraphQL Subscriptions (New)', () => {


NEW PATTERN FOR SUBSCRIPTION TESTING - EASY AND FAST

fabis94 · 2024-11-27T10:53:19Z

packages/server/package.json

@@ -24,6 +24,7 @@
    "dev:server:test": "cross-env DISABLE_NOTIFICATIONS_CONSUMPTION=true NODE_ENV=test LOG_LEVEL=silent LOG_PRETTY=true node ./bin/ts-www",
    "test": "cross-env NODE_ENV=test LOG_LEVEL=silent LOG_PRETTY=true mocha",
    "test:multiregion": "cross-env RUN_TESTS_IN_MULTIREGION_MODE=true FF_WORKSPACES_MODULE_ENABLED=true FF_WORKSPACES_MULTI_REGION_ENABLED=true yarn test",
+    "test:no-ff": "cross-env DISABLE_ALL_FFS=true yarn test",


new easy way to run all tests w/ FFs off, even locally

github-actions · 2024-11-27T10:58:16Z

📸 Preview service has generated an image.

github-actions · 2024-11-27T11:00:36Z

📸 Preview service has generated an image.

Mikehrn

FE looks good 🚀

fabis94 added 4 commits November 25, 2024 17:00

userProjectsUpdated.added test

4c81565

multi region support

d00a8e4

userStreamAdded

4f22983

commit subs tested

152a5ab

fabis94 commented Nov 26, 2024

View reviewed changes

fabis94 added 3 commits November 26, 2024 12:17

fix for proj workspace assignment

4b3b10a

Merge branch 'main' into fabians/web-2168

739eb13

undo commitHelper main changes

2745d9d

fabis94 commented Nov 26, 2024

View reviewed changes

disable all ffs mode

94a0510

createTestWorkspace support when workspaces arent enabled

7ced930

fabis94 commented Nov 26, 2024

View reviewed changes

fabis94 added 7 commits November 26, 2024 14:06

project create fix

0229287

workspace projects updated subscription

9cc80d3

WIP new workspace sub

47ac74c

updated workspaceCreated

3fa86b1

updated workspaceUpdated

90213c7

BE for workspace updated sub

4351ba2

workspace updated sub

f395a95

fabis94 commented Nov 27, 2024

View reviewed changes

Merge branch 'main' into fabians/web-2168

e6bc938

fabis94 marked this pull request as ready for review November 27, 2024 10:48

fabis94 requested review from gjedlicska and alemagio November 27, 2024 10:48

fabis94 requested review from Mikehrn, andrewwallacespeckle and iainsproat November 27, 2024 10:48

fabis94 changed the title ~~feat(server): improved subscription testing DX + tests for common subs~~ feat(server): improved subscription testing DX + tests for common subs + new subs Nov 27, 2024

fabis94 commented Nov 27, 2024

View reviewed changes

fabis94 requested a review from cdriesler November 27, 2024 10:54

ts err fix

ab31934

Mikehrn approved these changes Nov 27, 2024

View reviewed changes

fabis94 merged commit 1800dbb into main Nov 27, 2024
28 of 30 checks passed

fabis94 deleted the fabians/web-2168 branch November 27, 2024 13:41

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

feat(server): improved subscription testing DX + tests for common subs + new subs #3554

feat(server): improved subscription testing DX + tests for common subs + new subs #3554

fabis94 commented Nov 26, 2024

linear bot commented Nov 26, 2024

fabis94 Nov 26, 2024

gjedlicska Nov 26, 2024

fabis94 Nov 27, 2024 •

edited

Loading

fabis94 Nov 26, 2024

fabis94 Nov 26, 2024

github-actions bot commented Nov 26, 2024

github-actions bot commented Nov 26, 2024

github-actions bot commented Nov 26, 2024

fabis94 Nov 26, 2024

github-actions bot commented Nov 26, 2024

fabis94 Nov 27, 2024 •

edited

Loading

fabis94 Nov 27, 2024

Mikehrn Nov 27, 2024

fabis94 Nov 27, 2024

fabis94 Nov 27, 2024

fabis94 Nov 27, 2024

fabis94 Nov 27, 2024

github-actions bot commented Nov 27, 2024

github-actions bot commented Nov 27, 2024

Mikehrn left a comment

feat(server): improved subscription testing DX + tests for common subs + new subs #3554

feat(server): improved subscription testing DX + tests for common subs + new subs #3554

Conversation

fabis94 commented Nov 26, 2024

Description & motivation

Changes:

To-do before merge:

Screenshots:

Validation of changes:

Checklist:

References

linear bot commented Nov 26, 2024

Choose a reason for hiding this comment

Choose a reason for hiding this comment

fabis94 Nov 27, 2024 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

github-actions bot commented Nov 26, 2024

github-actions bot commented Nov 26, 2024

github-actions bot commented Nov 26, 2024

Choose a reason for hiding this comment

github-actions bot commented Nov 26, 2024

fabis94 Nov 27, 2024 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

github-actions bot commented Nov 27, 2024

github-actions bot commented Nov 27, 2024

Mikehrn left a comment

Choose a reason for hiding this comment

fabis94 Nov 27, 2024 •

edited

Loading

fabis94 Nov 27, 2024 •

edited

Loading