chore(server): core IoC 25 - getObjectCommitsWithStreamIdsFactory

packages/server/modules/core/domain/commits/operations.ts

@@ -1,9 +1,10 @@
 import { Branch } from '@/modules/core/domain/branches/types'
 import {
-  BranchCommit,
+  CommitWithBranchId,
   CommitWithStreamBranchMetadata,
   Commit,
-  CommitBranch
+  CommitBranch,
+  CommitWithStreamId
 } from '@/modules/core/domain/commits/types'
 import {
   CommitsMoveInput,
@@ -43,7 +44,7 @@ export type GetSpecificBranchCommits = (
     branchId: string
     commitId: string
   }[]
-) => Promise<BranchCommit[]>
+) => Promise<CommitWithBranchId[]>
 
 export type StoreCommit = (
   params: Omit<Commit, 'id' | 'createdAt'> & {
@@ -157,7 +158,7 @@ export type GetUserAuthoredCommitCounts = (params: {
 
 export type GetCommitsAndTheirBranchIds = (
   commitIds: string[]
-) => Promise<BranchCommit[]>
+) => Promise<CommitWithBranchId[]>
 
 export type GetBatchedStreamCommits = (
   streamId: string,
@@ -221,3 +222,10 @@ export type ValidateAndBatchMoveCommits = (
   params: CommitsMoveInput | MoveVersionsInput,
   userId: string
 ) => Promise<Branch>
+
+export type GetObjectCommitsWithStreamIds = (
+  objectIds: string[],
+  options?: {
+    streamIds?: string[]
+  }
+) => Promise<CommitWithStreamId[]>

packages/server/modules/core/domain/commits/types.ts

@@ -2,10 +2,11 @@ import { Branch } from '@/modules/core/domain/branches/types'
 import { CommitRecord } from '@/modules/core/helpers/types'
 
 export type Commit = CommitRecord
-export type BranchLatestCommit = Commit & {
+export type CommitWithBranchId = Commit & {
   branchId: string
 }
-export type BranchCommit = BranchLatestCommit
+export type CommitWithStreamId = Commit & { streamId: string }
+export type BranchLatestCommit = CommitWithBranchId
 
 export type CommitWithStreamBranchMetadata = Commit & {
   streamId: string

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

@@ -45,6 +45,7 @@ import {
   GetBatchedStreamCommits,
   GetBatchedBranchCommits,
   InsertCommits,
+  GetObjectCommitsWithStreamIds,
   PaginatedBranchCommitsBaseParams,
   PaginatedBranchCommitsParams,
   GetPaginatedBranchCommitsItems,
@@ -402,32 +403,35 @@ export const createCommitFactory =
     return item
   }
 
-export async function getObjectCommitsWithStreamIds(
-  objectIds: string[],
-  options?: {
-    /**
-     * Optionally also filter by stream ids
-     */
-    streamIds?: string[]
-  }
-) {
-  if (!objectIds?.length) return []
-  const { streamIds } = options || {}
-
-  const q = Commits.knex()
-    .select<Array<CommitRecord & { streamId: string }>>([
-      ...Commits.cols,
-      StreamCommits.col.streamId
-    ])
-    .whereIn(Commits.col.referencedObject, objectIds)
-    .innerJoin(StreamCommits.name, StreamCommits.col.commitId, Commits.col.id)
-
-  if (streamIds?.length) {
-    q.whereIn(StreamCommits.col.streamId, streamIds)
-  }
+export const getObjectCommitsWithStreamIdsFactory =
+  (deps: { db: Knex }): GetObjectCommitsWithStreamIds =>
+  async (
+    objectIds: string[],
+    options?: {
+      /**
+       * Optionally also filter by stream ids
+       */
+      streamIds?: string[]
+    }
+  ) => {
+    if (!objectIds?.length) return []
+    const { streamIds } = options || {}
 
-  return await q
-}
+    const q = tables
+      .commits(deps.db)
+      .select<Array<CommitRecord & { streamId: string }>>([
+        ...Commits.cols,
+        StreamCommits.col.streamId
+      ])
+      .whereIn(Commits.col.referencedObject, objectIds)
+      .innerJoin(StreamCommits.name, StreamCommits.col.commitId, Commits.col.id)
+
+    if (streamIds?.length) {
+      q.whereIn(StreamCommits.col.streamId, streamIds)
+    }
+
+    return await q
+  }
 
 export const getAllBranchCommitsFactory =
   (deps: { db: Knex }): GetAllBranchCommits =>

packages/server/modules/previews/index.ts

@@ -26,8 +26,8 @@ import {
 } from '@/modules/previews/repository/previews'
 import { publish } from '@/modules/shared/utils/subscriptions'
 import {
-  getObjectCommitsWithStreamIds,
-  getCommitFactory
+  getCommitFactory,
+  getObjectCommitsWithStreamIdsFactory
 } from '@/modules/core/repositories/commits'
 import { SpeckleModule } from '@/modules/shared/helpers/typeHelper'
 
@@ -166,7 +166,7 @@ export const init: SpeckleModule['init'] = (app, isInitial) => {
 
   if (isInitial) {
     const listenForPreviewGenerationUpdates = listenForPreviewGenerationUpdatesFactory({
-      getObjectCommitsWithStreamIds,
+      getObjectCommitsWithStreamIds: getObjectCommitsWithStreamIdsFactory({ db }),
       publish
     })
     listenForPreviewGenerationUpdates()

packages/server/modules/previews/services/resultListener.ts

@@ -1,14 +1,14 @@
-import { getObjectCommitsWithStreamIds } from '@/modules/core/repositories/commits'
 import {
   ProjectSubscriptions,
   PublishSubscription
 } from '@/modules/shared/utils/subscriptions'
 import { listenFor, MessageType } from '@/modules/core/utils/dbNotificationListener'
+import { GetObjectCommitsWithStreamIds } from '@/modules/core/domain/commits/operations'
 
 const payloadRegexp = /^([\w\d]+):([\w\d]+):([\w\d]+)$/i
 
 type MessageProcessorDeps = {
-  getObjectCommitsWithStreamIds: typeof getObjectCommitsWithStreamIds
+  getObjectCommitsWithStreamIds: GetObjectCommitsWithStreamIds
   publish: PublishSubscription
 }