bugfix for pg promise named parameters

Author: Uroš Marolt

services/apps/data_sink_worker/package.json

@@ -14,7 +14,8 @@
     "format": "prettier --write \"src/**/*.ts\"",
     "format-check": "prettier --check .",
     "tsc-check": "tsc --noEmit",
-    "script:restart-failed-results": "node -r tsconfig-paths/register -r ts-node/register src/bin/restart-failed-results.ts --transpile-only"
+    "script:restart-failed-results": "node -r tsconfig-paths/register -r ts-node/register src/bin/restart-failed-results.ts --transpile-only",
+    "script:restart-result": "node -r tsconfig-paths/register -r ts-node/register src/bin/restart-result.ts --transpile-only"
   },
   "dependencies": {
     "@crowd/common": "file:../../libs/common",

services/apps/data_sink_worker/src/bin/restart-result.ts

@@ -0,0 +1,39 @@
+import { DB_CONFIG, SQS_CONFIG } from '@/conf'
+import DataSinkRepository from '@/repo/dataSink.repo'
+import { DbStore, getDbConnection } from '@crowd/database'
+import { getServiceLogger } from '@crowd/logging'
+import { DataSinkWorkerEmitter, getSqsClient } from '@crowd/sqs'
+import { ProcessIntegrationResultQueueMessage } from '@crowd/types'
+
+const log = getServiceLogger()
+
+const processArguments = process.argv.slice(3)
+
+if (processArguments.length !== 1) {
+  log.error('Expected 1 argument: resultId')
+  process.exit(1)
+}
+
+const resultId = processArguments[0]
+
+setImmediate(async () => {
+  const sqsClient = getSqsClient(SQS_CONFIG())
+  const emitter = new DataSinkWorkerEmitter(sqsClient, log)
+  await emitter.init()
+
+  const dbConnection = getDbConnection(DB_CONFIG())
+  const store = new DbStore(log, dbConnection)
+
+  const repo = new DataSinkRepository(store, log)
+
+  const result = await repo.getResultInfo(resultId)
+  if (!result) {
+    log.error(`Result ${resultId} not found!`)
+    process.exit(1)
+  } else {
+    await emitter.sendMessage(
+      `results-${result.tenantId}-${result.platform}`,
+      new ProcessIntegrationResultQueueMessage(result.id),
+    )
+  }
+})

services/libs/database/src/repoBase.ts

@@ -144,12 +144,15 @@ export abstract class RepositoryBase<TRepo extends RepositoryBase<TRepo>> extend
     const obj: any = {}
 
     for (const column of columnSet.columns) {
-      obj[column.name] =
-        // eslint-disable-next-line @typescript-eslint/no-explicit-any
-        (entity as any)[column.name] !== undefined
-          ? // eslint-disable-next-line @typescript-eslint/no-explicit-any
-            (entity as any)[column.name]
-          : undefined
+      let value = (entity as unknown as Record<string, unknown>)[column.name]
+      if (value !== undefined) {
+        if (typeof value === 'string') {
+          value = this.escapeString(value)
+        }
+        obj[column.name] = value
+      } else {
+        obj[column.name] = undefined
+      }
     }
 
     return obj
@@ -165,4 +168,14 @@ export abstract class RepositoryBase<TRepo extends RepositoryBase<TRepo>> extend
       )
     }
   }
+
+  public static escapeString(str: string): string {
+    // need to escape $(), $<>, $[] and $// and prepend with another dollar sign
+    // to avoid pg-promise named parameter parsing
+    return str
+      .replace(/(\$[{])/g, '$$$$1') // Replace ${ with $${ to escape it
+      .replace(/(\$[[(])/g, '$$$$1') // Replace $[ with $$[ to escape it
+      .replace(/(\$[<])/g, '$$$$1') // Replace $< with $$< to escape it
+      .replace(/(\$[\\/])/g, '$$$$1') // Replace $/ with $$/ to escape it;
+  }
 }