diff --git a/apps/vc-api/src/config/db.ts b/apps/vc-api/src/config/db.ts index d098f273..21e5f4f9 100644 --- a/apps/vc-api/src/config/db.ts +++ b/apps/vc-api/src/config/db.ts @@ -81,6 +81,3 @@ export const typeOrmConfigFactory = (config: ConfigService): TypeOrmModuleOption }; } }; - -export const typeOrmInMemoryModuleFactory = () => - TypeOrmModule.forRoot({ ...inMemoryDBConfig, ...commonOptions }); diff --git a/apps/vc-api/src/did/did.controller.spec.ts b/apps/vc-api/src/did/did.controller.spec.ts index 7f0251a8..ca791b89 100644 --- a/apps/vc-api/src/did/did.controller.spec.ts +++ b/apps/vc-api/src/did/did.controller.spec.ts @@ -17,13 +17,15 @@ import { Test, TestingModule } from '@nestjs/testing'; import { TypeOrmModule } from '@nestjs/typeorm'; -import { typeOrmInMemoryModuleFactory } from '../config/db'; import { KeyModule } from '../key/key.module'; import { DIDController } from './did.controller'; import { DIDService } from './did.service'; import { DIDDocumentEntity } from './entities/did-document.entity'; import { VerificationMethodEntity } from './entities/verification-method.entity'; import { DidMethod } from './types/did-method'; +import { typeOrmConfigFactory } from '../config/db'; +import { DB_TYPES } from '../config/env-vars-validation-schema'; +import { ConfigService } from '@nestjs/config'; describe('DidController', () => { let controller: DIDController; @@ -32,7 +34,13 @@ describe('DidController', () => { const module: TestingModule = await Test.createTestingModule({ imports: [ KeyModule, - typeOrmInMemoryModuleFactory(), + TypeOrmModule.forRoot( + typeOrmConfigFactory({ + get: (key): Record => { + return { DB_TYPE: DB_TYPES.SQLITE_IN_MEMORY }[key]; + } + } as unknown as ConfigService) + ), TypeOrmModule.forFeature([DIDDocumentEntity, VerificationMethodEntity]) ], controllers: [DIDController], diff --git a/apps/vc-api/src/did/did.service.spec.ts b/apps/vc-api/src/did/did.service.spec.ts index b7d95692..cb31ab6c 100644 --- a/apps/vc-api/src/did/did.service.spec.ts +++ b/apps/vc-api/src/did/did.service.spec.ts @@ -17,12 +17,14 @@ import { Test, TestingModule } from '@nestjs/testing'; import { TypeOrmModule } from '@nestjs/typeorm'; -import { typeOrmInMemoryModuleFactory } from '../config/db'; +import { typeOrmConfigFactory } from '../config/db'; import { KeyModule } from '../key/key.module'; import { KeyService } from '../key/key.service'; import { DIDService } from './did.service'; import { DIDDocumentEntity } from './entities/did-document.entity'; import { VerificationMethodEntity } from './entities/verification-method.entity'; +import { ConfigService } from '@nestjs/config'; +import { DB_TYPES } from '../config/env-vars-validation-schema'; describe('DIDService', () => { let service: DIDService; @@ -32,7 +34,13 @@ describe('DIDService', () => { const module: TestingModule = await Test.createTestingModule({ imports: [ KeyModule, - typeOrmInMemoryModuleFactory(), + TypeOrmModule.forRoot( + typeOrmConfigFactory({ + get: (key): Record => { + return { DB_TYPE: DB_TYPES.SQLITE_IN_MEMORY }[key]; + } + } as unknown as ConfigService) + ), TypeOrmModule.forFeature([DIDDocumentEntity, VerificationMethodEntity]) ], providers: [DIDService] diff --git a/apps/vc-api/src/key/key.service.spec.ts b/apps/vc-api/src/key/key.service.spec.ts index 0a6fc353..3b571fd7 100644 --- a/apps/vc-api/src/key/key.service.spec.ts +++ b/apps/vc-api/src/key/key.service.spec.ts @@ -18,10 +18,12 @@ import { Test, TestingModule } from '@nestjs/testing'; import { TypeOrmModule } from '@nestjs/typeorm'; import { calculateJwkThumbprint, JWK } from 'jose'; -import { typeOrmInMemoryModuleFactory } from '../config/db'; +import { typeOrmConfigFactory } from '../config/db'; import { KeyPair } from './key-pair.entity'; import { keyType } from './key-types'; import { KeyService } from './key.service'; +import { DB_TYPES } from '../config/env-vars-validation-schema'; +import { ConfigService } from '@nestjs/config'; describe('KeyService', () => { let service: KeyService; @@ -29,7 +31,16 @@ describe('KeyService', () => { beforeEach(async () => { const module: TestingModule = await Test.createTestingModule({ - imports: [typeOrmInMemoryModuleFactory(), TypeOrmModule.forFeature([KeyPair])], + imports: [ + TypeOrmModule.forRoot( + typeOrmConfigFactory({ + get: (key): Record => { + return { DB_TYPE: DB_TYPES.SQLITE_IN_MEMORY }[key]; + } + } as unknown as ConfigService) + ), + TypeOrmModule.forFeature([KeyPair]) + ], providers: [KeyService] }).compile();