fix: refactored usages of enablePostgresUuidExtension to accept query…

…Runner as the main param
Sphereon-Opensource · Nov 25, 2023 · 3654a8a · 3654a8a
1 parent 5161837
commit 3654a8a
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 22 deletions.
diff --git a/packages/data-store/src/migrations/postgres/1659463079428-CreateContacts.ts b/packages/data-store/src/migrations/postgres/1659463079428-CreateContacts.ts
@@ -1,12 +1,11 @@
 import { MigrationInterface, QueryRunner } from 'typeorm'
-import { createQueryRunnerAdapter } from './utils'
 import { enablePostgresUuidExtension } from '@sphereon/ssi-sdk.core'
 
 export class CreateContacts1659463079428 implements MigrationInterface {
   name = 'CreateContacts1659463079428'
 
   public async up(queryRunner: QueryRunner): Promise<void> {
-    await enablePostgresUuidExtension(createQueryRunnerAdapter(queryRunner))
+    await enablePostgresUuidExtension(queryRunner)
     await queryRunner.query(
       `CREATE TABLE "BaseConfigEntity" ("id" uuid NOT NULL DEFAULT uuid_generate_v4(), "client_id" character varying(255), "client_secret" character varying(255), "scopes" text, "issuer" character varying(255), "redirect_url" text, "dangerously_allow_insecure_http_requests" boolean, "client_auth_method" text, "identifier" character varying(255), "session_id" character varying(255), "type" character varying NOT NULL, "connectionId" uuid, CONSTRAINT "REL_BaseConfig_connectionId" UNIQUE ("connectionId"), CONSTRAINT "PK_BaseConfigEntity_id" PRIMARY KEY ("id"))`
     )

diff --git a/packages/data-store/src/migrations/postgres/1685628974232-CreateIssuanceBranding.ts b/packages/data-store/src/migrations/postgres/1685628974232-CreateIssuanceBranding.ts
@@ -1,12 +1,11 @@
 import { MigrationInterface, QueryRunner } from 'typeorm'
-import { createQueryRunnerAdapter } from './utils'
 import { enablePostgresUuidExtension } from '@sphereon/ssi-sdk.core'
 
 export class CreateIssuanceBranding1685628974232 implements MigrationInterface {
   name = 'CreateIssuanceBranding1685628974232'
 
   public async up(queryRunner: QueryRunner): Promise<void> {
-    await enablePostgresUuidExtension(createQueryRunnerAdapter(queryRunner))
+    await enablePostgresUuidExtension(queryRunner)
     await queryRunner.query(
       `CREATE TABLE "ImageDimensions" ("id" uuid NOT NULL DEFAULT uuid_generate_v4(), "width" integer NOT NULL, "height" integer NOT NULL, CONSTRAINT "PK_ImageDimensions_id" PRIMARY KEY ("id"))`
     )

diff --git a/packages/data-store/src/migrations/postgres/1690925872592-CreateContacts.ts b/packages/data-store/src/migrations/postgres/1690925872592-CreateContacts.ts
@@ -1,12 +1,11 @@
 import { MigrationInterface, QueryRunner } from 'typeorm'
-import { createQueryRunnerAdapter } from './utils'
 import { enablePostgresUuidExtension } from '@sphereon/ssi-sdk.core'
 
 export class CreateContacts1690925872592 implements MigrationInterface {
   name = 'CreateContacts1690925872592'
 
   public async up(queryRunner: QueryRunner): Promise<void> {
-    await enablePostgresUuidExtension(createQueryRunnerAdapter(queryRunner))
+    await enablePostgresUuidExtension(queryRunner)
     await queryRunner.query(`ALTER TABLE "CorrelationIdentifier" DROP CONSTRAINT "FK_CorrelationIdentifier_identityId"`)
     await queryRunner.query(`ALTER TABLE "IdentityMetadata" DROP CONSTRAINT "FK_IdentityMetadata_identityId"`)
     await queryRunner.query(`ALTER TABLE "Identity" DROP CONSTRAINT "FK_Identity_contactId"`)

diff --git a/packages/data-store/src/migrations/postgres/utils.ts b/packages/data-store/src/migrations/postgres/utils.ts
diff --git a/packages/ssi-sdk-core/src/utils/database.ts b/packages/ssi-sdk-core/src/utils/database.ts
@@ -2,14 +2,13 @@ export const flattenArray = <T>(args: { items: Array<T | Array<T>> }): Array<T>
 
 export const flattenMigrations = <T>(args: { migrations: Array<T | Array<T>> }): Array<T> => args.migrations.flat() as Array<T>
 
-export type WithTypeOrmQuery =
-  ((query: string, parameters?: any[]) => Promise<any>) |
-  ((query: string, parameters?: any[], useStructuredResult?: boolean) => Promise<any>)
-
-
-export const enablePostgresUuidExtension = async (query: WithTypeOrmQuery) => {
+// It should accept queryRunner from the typeorm
+export const enablePostgresUuidExtension = async (queryRunner: any) => {
+  if (!queryRunner.query) {
+    throw new Error("You should pass a QueryRunner object to this function.")
+  }
   try {
-    await query(`CREATE EXTENSION IF NOT EXISTS "uuid-ossp";`);
+    await queryRunner.query(`CREATE EXTENSION IF NOT EXISTS "uuid-ossp";`);
   } catch (error) {
     console.log(
       `Please enable the uuid-ossp.control extension in your PostgreSQL installation. It enables generating V4 UUID and can be found in the postgresql-contrib package`

diff --git a/packages/ssi-sdk-core/src/utils/index.ts b/packages/ssi-sdk-core/src/utils/index.ts
@@ -1,4 +1,4 @@
 export * from './encoding'
-export { enablePostgresUuidExtension, flattenArray, flattenMigrations, WithTypeOrmQuery } from './database'
+export { enablePostgresUuidExtension, flattenArray, flattenMigrations } from './database'
 export { getImageMediaType, getImageDimensions, downloadImage } from './image'
 export * from './vc'