chore(fileimport): parseAndCreateCommit refactor multiregion

packages/fileimport-service/ifc/import_file.js

@@ -3,8 +3,9 @@ const { logger: parentLogger } = require('../observability/logging')
 
 const TMP_RESULTS_PATH = '/tmp/import_result.json'
 
-const { parseAndCreateCommit } = require('./index')
+const { parseAndCreateCommitFactory } = require('./index')
 const Observability = require('@speckle/shared/dist/commonjs/observability/index.js')
+const knex = require('../knex')
 
 async function main() {
   const cmdArgs = process.argv.slice(2)
@@ -35,7 +36,7 @@ async function main() {
   }
 
   try {
-    const commitId = await parseAndCreateCommit(ifcInput)
+    const commitId = await parseAndCreateCommitFactory({ db: knex })(ifcInput)
     output = {
       success: true,
       commitId

packages/fileimport-service/ifc/index.js

@@ -4,84 +4,85 @@ const Parser = require('./parser_v2')
 const ServerAPI = require('./api.js')
 const Observability = require('@speckle/shared/dist/commonjs/observability/index.js')
 const { logger: parentLogger } = require('../observability/logging')
-const knex = require('../knex')
 
-async function parseAndCreateCommit({
-  data,
-  streamId,
-  branchName = 'uploads',
-  userId,
-  message = 'Manual IFC file upload',
-  fileId,
-  logger
-}) {
-  if (!logger) {
-    logger = Observability.extendLoggerComponent(
-      parentLogger.child({ streamId, branchName, userId, fileId }),
-      'ifc'
+const parseAndCreateCommitFactory =
+  ({ db }) =>
+  async ({
+    data,
+    streamId,
+    branchName = 'uploads',
+    userId,
+    message = 'Manual IFC file upload',
+    fileId,
+    logger
+  }) => {
+    if (!logger) {
+      logger = Observability.extendLoggerComponent(
+        parentLogger.child({ streamId, branchName, userId, fileId }),
+        'ifc'
+      )
+    }
+    const serverApi = new ServerAPI({ db, streamId, logger })
+    const myParser = new Parser({ serverApi, fileId, logger })
+
+    const start = performance.now()
+    const { id, tCount } = await myParser.parse(data)
+    logger = logger.child({ objectId: id })
+    const end = performance.now()
+    logger.info(
+      {
+        fileProcessingDurationMs: (end - start).toFixed(2)
+      },
+      'Total processing time V2: {fileProcessingDurationMs}ms'
     )
-  }
-  const serverApi = new ServerAPI({ db: knex, streamId, logger })
-  const myParser = new Parser({ serverApi, fileId, logger })
 
-  const start = performance.now()
-  const { id, tCount } = await myParser.parse(data)
-  logger = logger.child({ objectId: id })
-  const end = performance.now()
-  logger.info(
-    {
-      fileProcessingDurationMs: (end - start).toFixed(2)
-    },
-    'Total processing time V2: {fileProcessingDurationMs}ms'
-  )
-
-  const commit = {
-    streamId,
-    branchName,
-    objectId: id,
-    message,
-    sourceApplication: 'IFC',
-    totalChildrenCount: tCount
-  }
-
-  const branch = await serverApi.getBranchByNameAndStreamId({
-    streamId,
-    name: branchName
-  })
-
-  if (!branch) {
-    logger.info("Branch '{branchName}' not found, creating it.")
-    await serverApi.createBranch({
-      name: branchName,
+    const commit = {
       streamId,
-      description: branchName === 'uploads' ? 'File upload branch' : null,
-      authorId: userId
+      branchName,
+      objectId: id,
+      message,
+      sourceApplication: 'IFC',
+      totalChildrenCount: tCount
+    }
+
+    const branch = await serverApi.getBranchByNameAndStreamId({
+      streamId,
+      name: branchName
     })
+
+    if (!branch) {
+      logger.info("Branch '{branchName}' not found, creating it.")
+      await serverApi.createBranch({
+        name: branchName,
+        streamId,
+        description: branchName === 'uploads' ? 'File upload branch' : null,
+        authorId: userId
+      })
+    }
+
+    const userToken = process.env.USER_TOKEN
+
+    const serverBaseUrl = process.env.SPECKLE_SERVER_URL || 'http://127.0.0.1:3000'
+    logger.info(`Creating commit for object ({objectId}), with message "${message}"`)
+    const response = await fetch(serverBaseUrl + '/graphql', {
+      method: 'POST',
+      headers: {
+        'Content-Type': 'application/json',
+        Authorization: `Bearer ${userToken}`
+      },
+      body: JSON.stringify({
+        query:
+          'mutation createCommit( $myCommitInput: CommitCreateInput!) { commitCreate( commit: $myCommitInput ) }',
+        variables: {
+          myCommitInput: commit
+        }
+      })
+    })
+
+    const json = await response.json()
+    logger.info(json, 'Commit created')
+
+    return json.data.commitCreate
   }
 
-  const userToken = process.env.USER_TOKEN
-
-  const serverBaseUrl = process.env.SPECKLE_SERVER_URL || 'http://127.0.0.1:3000'
-  logger.info(`Creating commit for object ({objectId}), with message "${message}"`)
-  const response = await fetch(serverBaseUrl + '/graphql', {
-    method: 'POST',
-    headers: {
-      'Content-Type': 'application/json',
-      Authorization: `Bearer ${userToken}`
-    },
-    body: JSON.stringify({
-      query:
-        'mutation createCommit( $myCommitInput: CommitCreateInput!) { commitCreate( commit: $myCommitInput ) }',
-      variables: {
-        myCommitInput: commit
-      }
-    })
-  })
-
-  const json = await response.json()
-  logger.info(json, 'Commit created')
-
-  return json.data.commitCreate
-}
-
-module.exports = { parseAndCreateCommit }
+module.exports = { parseAndCreateCommitFactory }