chore(server): core IoC 5 - getBranchLatestCommitsFactory

packages/server/modules/activitystream/services/commentActivity.ts

@@ -12,7 +12,7 @@ import {
   ReplyCreateInput
 } from '@/modules/core/graph/generated/graphql'
 import {
-  getBranchLatestCommits,
+  getBranchLatestCommitsFactory,
   getStreamBranchesByNameFactory
 } from '@/modules/core/repositories/branches'
 import {
@@ -66,7 +66,7 @@ export async function addCommentCreatedActivity(params: {
   const getViewerResourceItemsUngrouped = getViewerResourceItemsUngroupedFactory({
     getViewerResourceGroups: getViewerResourceGroupsFactory({
       getStreamObjects,
-      getBranchLatestCommits,
+      getBranchLatestCommits: getBranchLatestCommitsFactory({ db }),
       getStreamBranchesByName: getStreamBranchesByNameFactory({ db }),
       getSpecificBranchCommits,
       getAllBranchCommits

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

@@ -60,7 +60,7 @@ import { Automate, Roles, isNullOrUndefined, isNonNullable } from '@speckle/shar
 import { getFeatureFlags, getServerOrigin } from '@/modules/shared/helpers/envHelper'
 import {
   getBranchesByIdsFactory,
-  getBranchLatestCommits
+  getBranchLatestCommitsFactory
 } from '@/modules/core/repositories/branches'
 import {
   createTestAutomationRunFactory,
@@ -134,6 +134,7 @@ const getAutomationRunsItems = getAutomationRunsItemsFactory({ db })
 
 const getProjectAutomationsItems = getProjectAutomationsItemsFactory({ db })
 const getProjectAutomationsTotalCount = getProjectAutomationsTotalCountFactory({ db })
+const getBranchLatestCommits = getBranchLatestCommitsFactory({ db })
 
 export = (FF_AUTOMATE_MODULE_ENABLED
   ? {
@@ -555,7 +556,8 @@ export = (FF_AUTOMATE_MODULE_ENABLED
               automateRunsEmitter: AutomateRunsEmitter.emit,
               getAutomationToken,
               upsertAutomationRun,
-              getFullAutomationRevisionMetadata
+              getFullAutomationRevisionMetadata,
+              getBranchLatestCommits
             }),
             validateStreamAccess
           })

packages/server/modules/automate/index.ts

@@ -39,6 +39,7 @@ import { AutomationsEmitter } from '@/modules/automate/events/automations'
 import { publish } from '@/modules/shared/utils/subscriptions'
 import { AutomateRunsEmitter } from '@/modules/automate/events/runs'
 import { createAppToken } from '@/modules/core/services/tokens'
+import { getBranchLatestCommitsFactory } from '@/modules/core/repositories/branches'
 
 const { FF_AUTOMATE_MODULE_ENABLED } = getFeatureFlags()
 let quitListeners: Optional<() => void> = undefined
@@ -84,7 +85,8 @@ const initializeEventListeners = () => {
     automateRunsEmitter: AutomateRunsEmitter.emit,
     getAutomationToken: getAutomationTokenFactory({ db }),
     upsertAutomationRun: upsertAutomationRunFactory({ db }),
-    getFullAutomationRevisionMetadata
+    getFullAutomationRevisionMetadata,
+    getBranchLatestCommits: getBranchLatestCommitsFactory({ db })
   })
   const setupStatusUpdateSubscriptionsInvoke = setupStatusUpdateSubscriptionsFactory({
     getAutomationRunFullTriggers,

packages/server/modules/automate/services/trigger.ts

@@ -10,7 +10,6 @@ import {
   LiveAutomation,
   RunTriggerSource
 } from '@/modules/automate/helpers/types'
-import { getBranchLatestCommits } from '@/modules/core/repositories/branches'
 import { getCommit } from '@/modules/core/repositories/commits'
 import { createAppToken } from '@/modules/core/services/tokens'
 import { Roles, Scopes } from '@speckle/shared'
@@ -48,6 +47,7 @@ import {
   TriggerAutomationRevisionRun,
   UpsertAutomationRun
 } from '@/modules/automate/domain/operations'
+import { GetBranchLatestCommits } from '@/modules/core/domain/branches/operations'
 
 export type OnModelVersionCreateDeps = {
   getAutomation: GetAutomation
@@ -216,7 +216,8 @@ export type TriggerAutomationRevisionRunDeps = {
   upsertAutomationRun: UpsertAutomationRun
   automateRunsEmitter: AutomateRunsEventsEmitter
   getFullAutomationRevisionMetadata: GetFullAutomationRevisionMetadata
-} & CreateAutomationRunDataDeps
+} & CreateAutomationRunDataDeps &
+  ComposeTriggerDataDeps
 
 /**
  * This triggers a run for a specific automation revision
@@ -254,7 +255,7 @@ export const triggerAutomationRevisionRunFactory =
         manifest
       })
 
-    const triggerManifests = await composeTriggerData({
+    const triggerManifests = await composeTriggerDataFactory(deps)({
       manifest,
       projectId: automationWithRevision.projectId,
       triggerDefinitions: automationWithRevision.revision.triggers
@@ -405,58 +406,64 @@ export const ensureRunConditionsFactory =
     }
   }
 
-async function composeTriggerData(params: {
-  projectId: string
-  manifest: BaseTriggerManifest
-  triggerDefinitions: AutomationTriggerDefinitionRecord[]
-}): Promise<BaseTriggerManifest[]> {
-  const { projectId, manifest, triggerDefinitions } = params
-
-  const manifests: BaseTriggerManifest[] = [{ ...manifest }]
-
-  /**
-   * The reason why we collect multiple triggers, even tho there's only one:
-   * - We want to collect the current context (all active versions of all triggers) at the time when the run is triggered,
-   * cause once the function already runs, there may be new versions already
-   */
-
-  if (triggerDefinitions.length > 1) {
-    const associatedTriggers = triggerDefinitions.filter((t) => {
-      if (t.triggerType !== manifest.triggerType) return false
+type ComposeTriggerDataDeps = {
+  getBranchLatestCommits: GetBranchLatestCommits
+}
 
-      if (isVersionCreatedTriggerManifest(manifest)) {
-        return t.triggeringId === manifest.modelId
-      }
+const composeTriggerDataFactory =
+  (deps: ComposeTriggerDataDeps) =>
+  async (params: {
+    projectId: string
+    manifest: BaseTriggerManifest
+    triggerDefinitions: AutomationTriggerDefinitionRecord[]
+  }): Promise<BaseTriggerManifest[]> => {
+    const { projectId, manifest, triggerDefinitions } = params
+
+    const manifests: BaseTriggerManifest[] = [{ ...manifest }]
+
+    /**
+     * The reason why we collect multiple triggers, even tho there's only one:
+     * - We want to collect the current context (all active versions of all triggers) at the time when the run is triggered,
+     * cause once the function already runs, there may be new versions already
+     */
+
+    if (triggerDefinitions.length > 1) {
+      const associatedTriggers = triggerDefinitions.filter((t) => {
+        if (t.triggerType !== manifest.triggerType) return false
+
+        if (isVersionCreatedTriggerManifest(manifest)) {
+          return t.triggeringId === manifest.modelId
+        }
 
-      return false
-    })
+        return false
+      })
 
-    // Version creation triggers
-    if (manifest.triggerType === VersionCreationTriggerType) {
-      const latestVersions = await getBranchLatestCommits(
-        associatedTriggers.map((t) => t.triggeringId),
-        projectId
-      )
-      manifests.push(
-        ...latestVersions.map(
-          (version): VersionCreatedTriggerManifest => ({
-            modelId: version.branchId,
-            projectId,
-            versionId: version.id,
-            triggerType: VersionCreationTriggerType
-          })
+      // Version creation triggers
+      if (manifest.triggerType === VersionCreationTriggerType) {
+        const latestVersions = await deps.getBranchLatestCommits(
+          associatedTriggers.map((t) => t.triggeringId),
+          projectId
         )
-      )
+        manifests.push(
+          ...latestVersions.map(
+            (version): VersionCreatedTriggerManifest => ({
+              modelId: version.branchId,
+              projectId,
+              versionId: version.id,
+              triggerType: VersionCreationTriggerType
+            })
+          )
+        )
+      }
     }
-  }
 
-  return manifests
-}
+    return manifests
+  }
 
 export type ManuallyTriggerAutomationDeps = {
   getAutomationTriggerDefinitions: GetAutomationTriggerDefinitions
   getAutomation: GetAutomation
-  getBranchLatestCommits: typeof getBranchLatestCommits
+  getBranchLatestCommits: GetBranchLatestCommits
   triggerFunction: TriggerAutomationRevisionRun
   validateStreamAccess: typeof validateStreamAccess
 }
@@ -534,8 +541,9 @@ export type CreateTestAutomationRunDeps = {
   getFullAutomationRevisionMetadata: GetFullAutomationRevisionMetadata
   upsertAutomationRun: UpsertAutomationRun
   validateStreamAccess: typeof validateStreamAccess
-  getBranchLatestCommits: typeof getBranchLatestCommits
-} & CreateAutomationRunDataDeps
+  getBranchLatestCommits: GetBranchLatestCommits
+} & CreateAutomationRunDataDeps &
+  ComposeTriggerDataDeps
 
 /**
  * TODO: Reduce duplication w/ other fns in this service
@@ -596,7 +604,7 @@ export const createTestAutomationRunFactory =
       { limit: 1 }
     )
 
-    const triggerManifests = await composeTriggerData({
+    const triggerManifests = await composeTriggerDataFactory(deps)({
       projectId: automationRevisionRecord.projectId,
       triggerDefinitions: automationRevisionRecord.revision.triggers,
       manifest: <VersionCreatedTriggerManifest>{

packages/server/modules/automate/tests/trigger.spec.ts

@@ -52,7 +52,7 @@ import { beforeEachContext, truncateTables } from '@/test/hooks'
 import { Automate } from '@speckle/shared'
 import { getFeatureFlags } from '@/modules/shared/helpers/envHelper'
 import {
-  getBranchLatestCommits,
+  getBranchLatestCommitsFactory,
   getLatestStreamBranch
 } from '@/modules/core/repositories/branches'
 import {
@@ -96,6 +96,7 @@ const getFullAutomationRevisionMetadata = getFullAutomationRevisionMetadataFacto
 })
 const updateAutomationRevision = updateAutomationRevisionFactory({ db })
 const updateAutomationRun = updateAutomationRunFactory({ db })
+const getBranchLatestCommits = getBranchLatestCommitsFactory({ db })
 
 ;(FF_AUTOMATE_MODULE_ENABLED ? describe : describe.skip)(
   'Automate triggers @automate',
@@ -320,7 +321,8 @@ const updateAutomationRun = updateAutomationRunFactory({ db })
             automateRunsEmitter: AutomateRunsEmitter.emit,
             getAutomationToken,
             upsertAutomationRun,
-            getFullAutomationRevisionMetadata
+            getFullAutomationRevisionMetadata,
+            getBranchLatestCommits
           })({
             revisionId: cryptoRandomString({ length: 10 }),
             manifest: <VersionCreatedTriggerManifest>{
@@ -412,7 +414,8 @@ const updateAutomationRun = updateAutomationRunFactory({ db })
           automateRunsEmitter: AutomateRunsEmitter.emit,
           getAutomationToken,
           upsertAutomationRun,
-          getFullAutomationRevisionMetadata
+          getFullAutomationRevisionMetadata,
+          getBranchLatestCommits
         })({
           revisionId: automationRevisionId,
           manifest: <VersionCreatedTriggerManifest>{
@@ -510,7 +513,8 @@ const updateAutomationRun = updateAutomationRunFactory({ db })
           automateRunsEmitter: AutomateRunsEmitter.emit,
           getAutomationToken,
           upsertAutomationRun,
-          getFullAutomationRevisionMetadata
+          getFullAutomationRevisionMetadata,
+          getBranchLatestCommits
         })({
           revisionId: automationRevisionId,
           manifest: <VersionCreatedTriggerManifest>{
@@ -992,7 +996,8 @@ const updateAutomationRun = updateAutomationRunFactory({ db })
             automateRunsEmitter: AutomateRunsEmitter.emit,
             getAutomationToken,
             upsertAutomationRun,
-            getFullAutomationRevisionMetadata
+            getFullAutomationRevisionMetadata,
+            getBranchLatestCommits
           }),
           validateStreamAccess,
           ...(overrides || {})

packages/server/modules/cli/commands/download/commit.ts

@@ -3,7 +3,7 @@ import { downloadCommitFactory } from '@/modules/cross-server-sync/services/comm
 import { cliLogger } from '@/logging/logging'
 import { getStream, getStreamCollaborators } from '@/modules/core/repositories/streams'
 import {
-  getBranchLatestCommits,
+  getBranchLatestCommitsFactory,
   getStreamBranchByNameFactory,
   getStreamBranchesByNameFactory
 } from '@/modules/core/repositories/branches'
@@ -82,6 +82,7 @@ const command: CommandModule<
     const validateInputAttachments = validateInputAttachmentsFactory({
       getBlobs: getBlobsFactory({ db })
     })
+    const getBranchLatestCommits = getBranchLatestCommitsFactory({ db })
     const insertComments = insertCommentsFactory({ db })
     const insertCommentLinks = insertCommentLinksFactory({ db })
     const getViewerResourceItemsUngrouped = getViewerResourceItemsUngroupedFactory({

packages/server/modules/cli/commands/download/project.ts

@@ -4,7 +4,7 @@ import { downloadProjectFactory } from '@/modules/cross-server-sync/services/pro
 import { downloadCommitFactory } from '@/modules/cross-server-sync/services/commit'
 import { getStream, getStreamCollaborators } from '@/modules/core/repositories/streams'
 import {
-  getBranchLatestCommits,
+  getBranchLatestCommitsFactory,
   getStreamBranchByNameFactory,
   getStreamBranchesByNameFactory
 } from '@/modules/core/repositories/branches'
@@ -83,7 +83,7 @@ const command: CommandModule<
     const getViewerResourceItemsUngrouped = getViewerResourceItemsUngroupedFactory({
       getViewerResourceGroups: getViewerResourceGroupsFactory({
         getStreamObjects,
-        getBranchLatestCommits,
+        getBranchLatestCommits: getBranchLatestCommitsFactory({ db }),
         getStreamBranchesByName: getStreamBranchesByNameFactory({ db }),
         getSpecificBranchCommits,
         getAllBranchCommits

packages/server/modules/comments/domain/operations.ts

@@ -9,14 +9,14 @@ import {
   CommentRecord,
   CommentViewRecord
 } from '@/modules/comments/helpers/types'
+import { BranchLatestCommit } from '@/modules/core/domain/commits/types'
 import {
   CreateCommentInput,
   CreateCommentReplyInput,
   EditCommentInput,
   LegacyCommentViewerData,
   ViewerUpdateTrackingTarget
 } from '@/modules/core/graph/generated/graphql'
-import { CommitRecord } from '@/modules/core/helpers/types'
 import { SmartTextEditorValueSchema } from '@/modules/core/services/richTextEditorService'
 import { MarkNullableOptional, Optional } from '@/modules/shared/helpers/typeHelper'
 import { MaybeNullOrUndefined, SpeckleViewer } from '@speckle/shared'
@@ -93,10 +93,6 @@ export type GetPaginatedBranchCommentsTotalCount = (
   params: Omit<PaginatedBranchCommentsParams, 'limit' | 'cursor'>
 ) => Promise<number>
 
-type BranchLatestCommit = CommitRecord & {
-  branchId: string
-}
-
 export type GetPaginatedProjectCommentsPage = (
   params: PaginatedProjectCommentsParams,
   options?: {

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

@@ -93,7 +93,7 @@ import {
 import { getStreamObjects } from '@/modules/core/repositories/objects'
 import { adminOverrideEnabled } from '@/modules/shared/helpers/envHelper'
 import {
-  getBranchLatestCommits,
+  getBranchLatestCommitsFactory,
   getStreamBranchesByNameFactory
 } from '@/modules/core/repositories/branches'
 
@@ -176,7 +176,7 @@ const authorizeCommentAccess = authorizeCommentAccessFactory({
 const getViewerResourceItemsUngrouped = getViewerResourceItemsUngroupedFactory({
   getViewerResourceGroups: getViewerResourceGroupsFactory({
     getStreamObjects,
-    getBranchLatestCommits,
+    getBranchLatestCommits: getBranchLatestCommitsFactory({ db }),
     getStreamBranchesByName: getStreamBranchesByNameFactory({ db }),
     getSpecificBranchCommits,
     getAllBranchCommits
@@ -226,7 +226,7 @@ const getPaginatedBranchComments = getPaginatedBranchCommentsFactory({
 })
 const getPaginatedProjectComments = getPaginatedProjectCommentsFactory({
   resolvePaginatedProjectCommentsLatestModelResources:
-    resolvePaginatedProjectCommentsLatestModelResourcesFactory(),
+    resolvePaginatedProjectCommentsLatestModelResourcesFactory({ db }),
   getPaginatedProjectCommentsPage: getPaginatedProjectCommentsPageFactory({ db }),
   getPaginatedProjectCommentsTotalCount: getPaginatedProjectCommentsTotalCountFactory({
     db