Merge pull request #2934 from specklesystems/fabians/accessreq-ioc-5

chore(server): accessrequests IoC 5 - getUsersPendingAccessRequestFac…

packages/server/modules/accessrequests/repositories/index.ts

@@ -1,4 +1,3 @@
-import { db } from '@/db/knex'
 import { ServerAccessRequests, Streams } from '@/modules/core/dbSchema'
 import { InvalidArgumentError } from '@/modules/shared/errors'
 import { Nullable } from '@/modules/shared/helpers/typeHelper'
@@ -132,18 +131,24 @@ export const createNewRequestFactory =
     return results[0]
   }
 
-export async function getUsersPendingAccessRequest<
-  T extends AccessRequestType = AccessRequestType,
-  I extends Nullable<string> = Nullable<string>
->(userId: string, resourceType: T, resourceId: I) {
-  if (!userId || !resourceType) {
-    throw new InvalidArgumentError('User ID or resource type missing')
-  }
+export const getUsersPendingAccessRequestFactory =
+  (deps: { db: Knex }) =>
+  async <
+    T extends AccessRequestType = AccessRequestType,
+    I extends Nullable<string> = Nullable<string>
+  >(
+    userId: string,
+    resourceType: T,
+    resourceId: I
+  ) => {
+    if (!userId || !resourceType) {
+      throw new InvalidArgumentError('User ID or resource type missing')
+    }
 
-  const q = baseQueryFactory({ db })<T, I>(resourceType)
-    .andWhere(ServerAccessRequests.col.requesterId, userId)
-    .andWhere(ServerAccessRequests.col.resourceId, resourceId)
-    .first()
+    const q = baseQueryFactory({ db: deps.db })<T, I>(resourceType)
+      .andWhere(ServerAccessRequests.col.requesterId, userId)
+      .andWhere(ServerAccessRequests.col.resourceId, resourceId)
+      .first()
 
-  return await q
-}
+    return await q
+  }

packages/server/modules/accessrequests/services/stream.ts

@@ -11,7 +11,7 @@ import {
   generateId,
   getPendingAccessRequestFactory,
   getPendingAccessRequestsFactory,
-  getUsersPendingAccessRequest,
+  getUsersPendingAccessRequestFactory,
   ServerAccessRequestRecord,
   StreamAccessRequestRecord
 } from '@/modules/accessrequests/repositories'
@@ -42,7 +42,7 @@ export async function getUserProjectAccessRequest(
   userId: string,
   projectId: string
 ): Promise<Nullable<StreamAccessRequestRecord>> {
-  const req = await getUsersPendingAccessRequest(
+  const req = await getUsersPendingAccessRequestFactory({ db })(
     userId,
     AccessRequestType.Stream,
     projectId