From 7cb51dc0e494191becd975ddff84075c0ab47b3a Mon Sep 17 00:00:00 2001
From: Alessandro Magionami <alessandro.magionami@gmail.com>
Date: Thu, 21 Nov 2024 12:20:03 +0100
Subject: [PATCH] chore(multiregion): small fixes to resolvers

---
 .../modules/core/graph/resolvers/models.ts     |  6 +++---
 .../modules/core/graph/resolvers/objects.ts    |  3 +--
 .../modules/core/graph/resolvers/projects.ts   |  1 +
 .../modules/core/graph/resolvers/streams.ts    | 18 +++++++++---------
 4 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/packages/server/modules/core/graph/resolvers/models.ts b/packages/server/modules/core/graph/resolvers/models.ts
index 5e764b035..f222be86f 100644
--- a/packages/server/modules/core/graph/resolvers/models.ts
+++ b/packages/server/modules/core/graph/resolvers/models.ts
@@ -190,9 +190,9 @@ export = {
       // If limit=0, short-cut full execution and use data loader
       if (args.limit === 0) {
         return {
-          totalCount: await ctx.loaders.streams.getCommitCountWithoutGlobals.load(
-            parent.id
-          ),
+          totalCount: await ctx.loaders
+            .forRegion({ db: projectDB })
+            .streams.getCommitCountWithoutGlobals.load(parent.id),
           items: [],
           cursor: null
         }
diff --git a/packages/server/modules/core/graph/resolvers/objects.ts b/packages/server/modules/core/graph/resolvers/objects.ts
index 90b963d08..c17d68c02 100644
--- a/packages/server/modules/core/graph/resolvers/objects.ts
+++ b/packages/server/modules/core/graph/resolvers/objects.ts
@@ -8,7 +8,6 @@ import {
   storeClosuresIfNotFoundFactory,
   storeObjectsIfNotFoundFactory
 } from '@/modules/core/repositories/objects'
-import { db } from '@/db/knex'
 import { createObjectsFactory } from '@/modules/core/services/objects/management'
 import { getProjectDbClient } from '@/modules/multiregion/dbSelector'
 
@@ -37,7 +36,7 @@ export = {
       const projectDB = await getProjectDbClient({ projectId: parent.streamId })
       // The simple query branch
       if (!args.query && !args.orderBy) {
-        const getObjectChildren = getObjectChildrenFactory({ db })
+        const getObjectChildren = getObjectChildrenFactory({ db: projectDB })
         const result = await getObjectChildren({
           streamId: parent.streamId,
           objectId: parent.id,
diff --git a/packages/server/modules/core/graph/resolvers/projects.ts b/packages/server/modules/core/graph/resolvers/projects.ts
index 8faecf564..f48a12f6b 100644
--- a/packages/server/modules/core/graph/resolvers/projects.ts
+++ b/packages/server/modules/core/graph/resolvers/projects.ts
@@ -271,6 +271,7 @@ export = {
       })
       return await updateStreamAndNotify(update, userId!, resourceAccessRules)
     },
+    // This one is only used outside of a workspace, so the project is always created in the main db
     async create(_parent, args, context) {
       const rateLimitResult = await getRateLimitResult('STREAM_CREATE', context.userId!)
       if (isRateLimitBreached(rateLimitResult)) {
diff --git a/packages/server/modules/core/graph/resolvers/streams.ts b/packages/server/modules/core/graph/resolvers/streams.ts
index 3d839f0cd..1cbe2f70a 100644
--- a/packages/server/modules/core/graph/resolvers/streams.ts
+++ b/packages/server/modules/core/graph/resolvers/streams.ts
@@ -231,7 +231,7 @@ export = {
       return stream
     },
 
-    async streams(parent, args, context) {
+    async streams(_, args, context) {
       const totalCount = await getUserStreamsCount({
         userId: context.userId!,
         searchQuery: args.query || undefined,
@@ -248,14 +248,14 @@ export = {
       return { totalCount, cursor, items: streams }
     },
 
-    async discoverableStreams(parent, args, ctx) {
+    async discoverableStreams(_, args, ctx) {
       return await getDiscoverableStreams(
         args,
         toProjectIdWhitelist(ctx.resourceAccessRules)
       )
     },
 
-    async adminStreams(parent, args, ctx) {
+    async adminStreams(_, args, ctx) {
       if (args.limit && args.limit > 50)
         throw new BadRequestError('Cannot return more than 50 items at a time.')
 
@@ -389,7 +389,7 @@ export = {
     }
   },
   Mutation: {
-    async streamCreate(parent, args, context) {
+    async streamCreate(_, args, context) {
       const rateLimitResult = await getRateLimitResult('STREAM_CREATE', context.userId!)
       if (isRateLimitBreached(rateLimitResult)) {
         throw new RateLimitError(rateLimitResult)
@@ -404,7 +404,7 @@ export = {
       return id
     },
 
-    async streamUpdate(parent, args, context) {
+    async streamUpdate(_, args, context) {
       await updateStreamAndNotify(
         args.stream,
         context.userId!,
@@ -413,7 +413,7 @@ export = {
       return true
     },
 
-    async streamDelete(parent, args, context) {
+    async streamDelete(_, args, context) {
       return await deleteStreamAndNotify(
         args.id,
         context.userId!,
@@ -422,7 +422,7 @@ export = {
       )
     },
 
-    async streamsDelete(parent, args, context) {
+    async streamsDelete(_, args, context) {
       const results = await Promise.all(
         (args.ids || []).map(async (id) => {
           return await deleteStreamAndNotify(
@@ -436,7 +436,7 @@ export = {
       return results.every((res) => res === true)
     },
 
-    async streamUpdatePermission(parent, args, context) {
+    async streamUpdatePermission(_, args, context) {
       const result = await updateStreamRoleAndNotify(
         args.permissionParams,
         context.userId!,
@@ -445,7 +445,7 @@ export = {
       return !!result
     },
 
-    async streamRevokePermission(parent, args, context) {
+    async streamRevokePermission(_, args, context) {
       const result = await updateStreamRoleAndNotify(
         args.permissionParams,
         context.userId!,