feat(regions): move project automations

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

@@ -1,6 +1,6 @@
 import { InsertableAutomationFunctionRun } from '@/modules/automate/domain/types'
 import {
-  AutomateRevisionFunctionRecord,
+  AutomationRevisionFunctionRecord,
   AutomationFunctionRunRecord,
   AutomationRecord,
   AutomationRevisionRecord,
@@ -175,7 +175,7 @@ export type GetRevisionsTriggerDefinitions = (params: {
 
 export type GetRevisionsFunctions = (params: {
   automationRevisionIds: string[]
-}) => Promise<{ [automationRevisionId: string]: AutomateRevisionFunctionRecord[] }>
+}) => Promise<{ [automationRevisionId: string]: AutomationRevisionFunctionRecord[] }>
 
 export type CreateStoredAuthCode = (
   params: Omit<AuthCodePayload, 'code'>
@@ -204,3 +204,7 @@ export type TriggerAutomationRevisionRun = <
   manifest: M
   source?: RunTriggerSource
 }) => Promise<{ automationRunId: string }>
+
+export type GetProjectAutomationCount = (params: {
+  projectId: string
+}) => Promise<number>

packages/server/modules/automate/helpers/graphTypes.ts

@@ -1,5 +1,5 @@
 import {
-  AutomateRevisionFunctionRecord,
+  AutomationRevisionFunctionRecord,
   AutomationFunctionRunRecord,
   AutomationRecord,
   AutomationRevisionRecord,
@@ -56,7 +56,7 @@ export type AutomationRunTriggerGraphQLReturn = AutomationRunTriggerRecord & {
 }
 
 export type AutomationRevisionFunctionGraphQLReturn = Merge<
-  AutomateRevisionFunctionRecord,
+  AutomationRevisionFunctionRecord,
   {
     functionInputs: Nullable<Record<string, unknown>>
     release: AutomateFunctionReleaseGraphQLReturn

packages/server/modules/automate/helpers/types.ts

@@ -66,7 +66,7 @@ export type AutomationRunRecord = {
   executionEngineRunId: string | null
 }
 
-export type AutomateRevisionFunctionRecord = {
+export type AutomationRevisionFunctionRecord = {
   functionReleaseId: string
   functionId: string
   functionInputs: string | null
@@ -118,7 +118,7 @@ export type AutomationTokenRecord = {
 }
 
 export type AutomationRevisionWithTriggersFunctions = AutomationRevisionRecord & {
-  functions: AutomateRevisionFunctionRecord[]
+  functions: AutomationRevisionFunctionRecord[]
   triggers: AutomationTriggerDefinitionRecord[]
 }
 

packages/server/modules/automate/repositories/automations.ts

@@ -16,6 +16,7 @@ import {
   GetLatestAutomationRevision,
   GetLatestAutomationRevisions,
   GetLatestVersionAutomationRuns,
+  GetProjectAutomationCount,
   GetRevisionsFunctions,
   GetRevisionsTriggerDefinitions,
   StoreAutomation,
@@ -37,7 +38,7 @@ import {
   AutomationRunRecord,
   AutomationTokenRecord,
   AutomationTriggerRecordBase,
-  AutomateRevisionFunctionRecord,
+  AutomationRevisionFunctionRecord,
   AutomationRunWithTriggersFunctionRuns,
   AutomationRunTriggerRecord,
   AutomationFunctionRunRecord,
@@ -86,7 +87,7 @@ const tables = {
   automationRevisions: (db: Knex) =>
     db<AutomationRevisionRecord>(AutomationRevisions.name),
   automationRevisionFunctions: (db: Knex) =>
-    db<AutomateRevisionFunctionRecord>(AutomationRevisionFunctions.name),
+    db<AutomationRevisionFunctionRecord>(AutomationRevisionFunctions.name),
   automationTriggers: (db: Knex) =>
     db<AutomationTriggerDefinitionRecord>(AutomationTriggers.name),
   automationRuns: (db: Knex) => db<AutomationRunRecord>(AutomationRuns.name),
@@ -321,7 +322,7 @@ export const storeAutomationTokenFactory =
   }
 
 export type InsertableAutomationRevisionFunction = Omit<
-  AutomateRevisionFunctionRecord,
+  AutomationRevisionFunctionRecord,
   'automationRevisionId'
 >
 
@@ -369,7 +370,7 @@ export const storeAutomationRevisionFactory =
         .automationRevisionFunctions(deps.db)
         .insert(
           revision.functions.map(
-            (f): AutomateRevisionFunctionRecord => ({
+            (f): AutomationRevisionFunctionRecord => ({
               ...f,
               automationRevisionId: id
             })
@@ -742,10 +743,12 @@ const getProjectAutomationsBaseQueryFactory =
   }
 
 export const getProjectAutomationsTotalCountFactory =
-  (deps: { db: Knex }) => async (params: GetProjectAutomationsParams) => {
-    const q = getProjectAutomationsBaseQueryFactory(deps)(params).count<
-      [{ count: string }]
-    >(Automations.col.id)
+  (deps: { db: Knex }): GetProjectAutomationCount =>
+  async ({ projectId }) => {
+    const q = getProjectAutomationsBaseQueryFactory(deps)({
+      projectId,
+      args: {}
+    }).count<[{ count: string }]>(Automations.col.id)
 
     const [ret] = await q
 

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

@@ -7,7 +7,7 @@ import { Nullable, Optional } from '@speckle/shared'
 import { MisconfiguredEnvironmentError } from '@/modules/shared/errors'
 import { AutomationFunctionInputEncryptionError } from '@/modules/automate/errors/management'
 import { KeyPair, buildDecryptor } from '@/modules/shared/utils/libsodium'
-import { AutomateRevisionFunctionRecord } from '@/modules/automate/helpers/types'
+import { AutomationRevisionFunctionRecord } from '@/modules/automate/helpers/types'
 import { AutomationRevisionFunctionGraphQLReturn } from '@/modules/automate/helpers/graphTypes'
 import { FunctionReleaseSchemaType } from '@/modules/automate/helpers/executionEngine'
 import { LibsodiumEncryptionError } from '@/modules/shared/errors/encryption'
@@ -118,7 +118,7 @@ export type GetFunctionInputsForFrontendDeps = {
 } & GetFunctionInputDecryptorDeps
 
 export type AutomationRevisionFunctionForInputRedaction = Merge<
-  AutomateRevisionFunctionRecord,
+  AutomationRevisionFunctionRecord,
   { release: FunctionReleaseSchemaType }
 >
 

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

@@ -46,6 +46,7 @@ import { ValidateStreamAccess } from '@/modules/core/domain/streams/operations'
 import { CreateAndStoreAppToken } from '@/modules/core/domain/tokens/operations'
 import { EventBusEmit } from '@/modules/shared/services/eventBus'
 import { AutomationRunEvents } from '@/modules/automate/domain/events'
+import { isTestEnv } from '@/modules/shared/helpers/envHelper'
 
 export type OnModelVersionCreateDeps = {
   getAutomation: GetAutomation
@@ -130,7 +131,7 @@ type CreateAutomationRunDataDeps = {
   getFunctionInputDecryptor: FunctionInputDecryptor
 }
 
-const createAutomationRunDataFactory =
+export const createAutomationRunDataFactory =
   (deps: CreateAutomationRunDataDeps) =>
   async (params: {
     manifests: BaseTriggerManifest[]
@@ -413,7 +414,7 @@ type ComposeTriggerDataDeps = {
   getBranchLatestCommits: GetBranchLatestCommits
 }
 
-const composeTriggerDataFactory =
+export const composeTriggerDataFactory =
   (deps: ComposeTriggerDataDeps) =>
   async (params: {
     projectId: string
@@ -572,7 +573,7 @@ export const createTestAutomationRunFactory =
       throw new TriggerAutomationError('Automation not found')
     }
 
-    if (!automationRecord.isTestAutomation) {
+    if (!isTestEnv() && !automationRecord.isTestAutomation) {
       throw new TriggerAutomationError(
         'Automation is not a test automation and cannot create test function runs'
       )

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

@@ -510,9 +510,11 @@ const buildAutomationUpdate = () => {
 
       it('fails when refering to nonexistent function releases', async () => {
         const create = buildAutomationRevisionCreate({
-          getFunctionRelease: async () => {
-            // TODO: Update once we know how exec engine should respond
-            throw new Error('Function release with ID XXX not found')
+          overrides: {
+            getFunctionRelease: async () => {
+              // TODO: Update once we know how exec engine should respond
+              throw new Error('Function release with ID XXX not found')
+            }
           }
         })
 

packages/server/modules/core/graph/dataloaders/index.ts

@@ -56,7 +56,7 @@ import { Users } from '@/modules/core/dbSchema'
 import { getStreamPendingModelsFactory } from '@/modules/fileuploads/repositories/fileUploads'
 import { FileUploadRecord } from '@/modules/fileuploads/helpers/types'
 import {
-  AutomateRevisionFunctionRecord,
+  AutomationRevisionFunctionRecord,
   AutomationRecord,
   AutomationRevisionRecord,
   AutomationRunTriggerRecord,
@@ -595,7 +595,7 @@ const dataLoadersDefinition = defineRequestDataloaders(
           })
           return ids.map((i) => results[i] || [])
         }),
-        getRevisionFunctions: createLoader<string, AutomateRevisionFunctionRecord[]>(
+        getRevisionFunctions: createLoader<string, AutomationRevisionFunctionRecord[]>(
           async (ids) => {
             const results = await getRevisionsFunctions({
               automationRevisionIds: ids.slice()

packages/server/modules/core/services/projects.ts

@@ -61,7 +61,7 @@ export const createNewProjectFactory =
             const replicatedProject = await getProject({ projectId })
             if (!replicatedProject) throw new StreamNotFoundError()
           },
-          { maxAttempts: 10 }
+          { maxAttempts: 100 }
         )
       } catch (err) {
         if (err instanceof StreamNotFoundError) {

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

@@ -366,3 +366,6 @@ export type CopyProjectVersions = (params: {
 export type CopyProjectObjects = (params: {
   projectIds: string[]
 }) => Promise<Record<string, number>>
+export type CopyProjectAutomations = (params: {
+  projectIds: string[]
+}) => Promise<Record<string, number>>

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

@@ -10,6 +10,7 @@ import {
   upsertRegionAssignmentFactory
 } from '@/modules/workspaces/repositories/regions'
 import {
+  copyProjectAutomationsFactory,
   copyProjectModelsFactory,
   copyProjectObjectsFactory,
   copyProjectsFactory,
@@ -31,6 +32,7 @@ import { getStreamBranchCountFactory } from '@/modules/core/repositories/branche
 import { getStreamCommitCountFactory } from '@/modules/core/repositories/commits'
 import { withTransaction } from '@/modules/shared/helpers/dbHelper'
 import { getStreamObjectCountFactory } from '@/modules/core/repositories/objects'
+import { getProjectAutomationsTotalCountFactory } from '@/modules/automate/repositories/automations'
 import { getFeatureFlags, isTestEnv } from '@/modules/shared/helpers/envHelper'
 import { WorkspacesNotYetImplementedError } from '@/modules/workspaces/errors/workspace'
 
@@ -92,6 +94,9 @@ export default {
         countProjectModels: getStreamBranchCountFactory({ db: sourceDb }),
         countProjectVersions: getStreamCommitCountFactory({ db: sourceDb }),
         countProjectObjects: getStreamObjectCountFactory({ db: sourceDb }),
+        countProjectAutomations: getProjectAutomationsTotalCountFactory({
+          db: sourceDb
+        }),
         getAvailableRegions: getAvailableRegionsFactory({
           getRegions: getRegionsFactory({ db }),
           canWorkspaceUseRegions: canWorkspaceUseRegionsFactory({
@@ -102,7 +107,8 @@ export default {
         copyProjects: copyProjectsFactory({ sourceDb, targetDb }),
         copyProjectModels: copyProjectModelsFactory({ sourceDb, targetDb }),
         copyProjectVersions: copyProjectVersionsFactory({ sourceDb, targetDb }),
-        copyProjectObjects: copyProjectObjectsFactory({ sourceDb, targetDb })
+        copyProjectObjects: copyProjectObjectsFactory({ sourceDb, targetDb }),
+        copyProjectAutomations: copyProjectAutomationsFactory({ sourceDb, targetDb })
       })
 
       return await withTransaction(updateProjectRegion(args), targetDb)