feat: connect bd and grid fs in db helper[3966]

hashgraph · Aug 20, 2024 · 2995e87 · 2995e87
1 parent 924763a
commit 2995e87
Show file tree

Hide file tree

Showing 10 changed files with 62 additions and 18 deletions.
diff --git a/analytics-service/src/app.ts b/analytics-service/src/app.ts
@@ -1,6 +1,6 @@
 import {
     COMMON_CONNECTION_CONFIG,
-    DataBaseHelper,
+    DataBaseHelper, DatabaseServer,
     LargePayloadContainer,
     MessageBrokerChannel,
     Migration,
@@ -44,7 +44,8 @@ Promise.all([
     mongoForLoggingInitialization(),
 ]).then(async ([db, app, cn, loggerMongo]) => {
     try {
-        DataBaseHelper.orm = db;
+        DatabaseServer.connectBD(db);
+
         app.connectMicroservice<MicroserviceOptions>({
             transport: Transport.NATS,
             options: {

diff --git a/auth-service/src/app.ts b/auth-service/src/app.ts
@@ -3,7 +3,7 @@ import { WalletService } from './api/wallet-service.js';
 import {
     ApplicationState,
     COMMON_CONNECTION_CONFIG,
-    DataBaseHelper,
+    DataBaseHelper, DatabaseServer,
     LargePayloadContainer,
     MessageBrokerChannel,
     Migration,
@@ -60,7 +60,9 @@ Promise.all([
     InitializeVault(process.env.VAULT_PROVIDER),
     mongoForLoggingInitialization(),
 ]).then(async ([_, db, cn, app, vault, loggerMongo]) => {
-    DataBaseHelper.orm = db;
+
+    DatabaseServer.connectBD(db);
+
     const state = new ApplicationState();
     await state.setServiceName('AUTH_SERVICE').setConnection(cn).init();
 

diff --git a/common/src/database-modules/database-server.ts b/common/src/database-modules/database-server.ts
@@ -58,6 +58,7 @@ import { PolicyProperty } from '../entity/policy-property.js';
 import { ObjectId, PopulatePath } from '@mikro-orm/mongodb';
 import { FilterObject, FilterQuery, FindAllOptions } from '@mikro-orm/core';
 import { IAuthUser } from '../interfaces';
+import { Db, GridFSBucket } from 'mongodb';
 
 /**
  * Database server
@@ -3547,7 +3548,22 @@ export class DatabaseServer {
      * @returns file ID
      */
     public static async saveFile(uuid: string, buffer: Buffer): Promise<ObjectId> {
-        return DataBaseHelper.saveFile(uuid, buffer)
+        return DataBaseHelper.saveFile(uuid, buffer);
+    }
+
+    /**
+     * Set MongoDriver
+     * @param db
+     */
+    public static connectBD(db: any): void {
+        DataBaseHelper.connectBD(db);
+    }
+
+    /**
+     * Grid fs connect
+     */
+    public static connectGridFS() {
+        DataBaseHelper.connectGridFS();
     }
 
     /**

diff --git a/common/src/helpers/db-helper.ts b/common/src/helpers/db-helper.ts
@@ -2,7 +2,7 @@ import { MikroORM, CreateRequestContext, wrap, FilterObject, FilterQuery, FindAl
 import { MongoDriver, MongoEntityManager, MongoEntityRepository, ObjectId } from '@mikro-orm/mongodb';
 import { BaseEntity } from '../models/index.js';
 import { DataBaseNamingStrategy } from './db-naming-strategy.js';
-import { GridFSBucket } from 'mongodb';
+import { Db, GridFSBucket } from 'mongodb';
 import fixConnectionString from './fix-connection-string.js';
 import type { FindOptions } from '@mikro-orm/core/drivers/IDatabaseDriver';
 import { MintTransactionStatus } from '@guardian/interfaces';
@@ -138,6 +138,23 @@ export class DataBaseHelper<T extends BaseEntity> {
         return DataBaseHelper._gridFS;
     }
 
+    /**
+     * Set MongoDriver
+     * @param db
+     */
+    public static connectBD(db: MikroORM<MongoDriver>) {
+        DataBaseHelper.orm = db;
+    }
+
+    /**
+     * Grid fs connect
+     */
+    public static connectGridFS() {
+        const connect: Db = DataBaseHelper.orm.em.getDriver().getConnection().getDb();
+
+        DataBaseHelper.gridFS = new GridFSBucket(connect);
+    }
+
     /**
      * Save file
      * @param uuid

diff --git a/common/src/secret-manager/migrations/migrations.ts b/common/src/secret-manager/migrations/migrations.ts
@@ -8,6 +8,7 @@ import { SecretManager } from '../secret-manager.js';
 import { Wallet } from '../../wallet/index.js';
 import { SecretManagerType } from '../secret-manager-config.js';
 import { exit } from 'process';
+import { DatabaseServer } from '../../database-modules';
 
 const globalEnvPath = path.join(process.cwd(), '../.env')
 // const authEnvPath = path.join(process.cwd(), '../auth-service/.env')
@@ -141,7 +142,8 @@ async function migrate() {
       ensureIndexes: true,
   })
 
-  DataBaseHelper.orm = db;
+  DatabaseServer.connectBD(db);
+
   const dbSecret = new DataBaseHelper(WalletAccount)
 
   // write IPFS API KEY to Vault

diff --git a/guardian-service/src/app.ts b/guardian-service/src/app.ts
@@ -139,9 +139,10 @@ Promise.all([
 
     app.listen();
 
-    DataBaseHelper.orm = db;
+    DatabaseServer.connectBD(db);
+
+    DatabaseServer.connectGridFS();
 
-    DataBaseHelper.gridFS = new GridFSBucket(db.em.getDriver().getConnection().getDb());
     new PolicyServiceChannelsContainer().setConnection(cn);
     new TransactionLogger().initialization(
         cn,

diff --git a/logger-service/src/app.ts b/logger-service/src/app.ts
@@ -1,4 +1,4 @@
-import { ApplicationState, COMMON_CONNECTION_CONFIG, DataBaseHelper, LargePayloadContainer, MessageBrokerChannel, Migration, Log, mongoForLoggingInitialization } from '@guardian/common';
+import { ApplicationState, COMMON_CONNECTION_CONFIG, DataBaseHelper, LargePayloadContainer, MessageBrokerChannel, Migration, Log, mongoForLoggingInitialization, DatabaseServer } from '@guardian/common';
 import { ApplicationStates } from '@guardian/interfaces';
 import { NestFactory } from '@nestjs/core';
 import { Deserializer, IncomingRequest, MicroserviceOptions, Serializer, Transport } from '@nestjs/microservices';
@@ -43,7 +43,8 @@ Promise.all([
     }),
 ]).then(async values => {
     const [_, db, mqConnection, app] = values;
-    DataBaseHelper.orm = db;
+
+    DatabaseServer.connectBD(db);
 
     app.listen();
 

diff --git a/notification-service/src/app.ts b/notification-service/src/app.ts
@@ -1,4 +1,4 @@
-import { ApplicationState, COMMON_CONNECTION_CONFIG, DataBaseHelper, MessageBrokerChannel, Migration, mongoForLoggingInitialization, PinoLogger, pinoLoggerInitialization } from '@guardian/common';
+import { ApplicationState, COMMON_CONNECTION_CONFIG, DataBaseHelper, DatabaseServer, MessageBrokerChannel, Migration, mongoForLoggingInitialization, PinoLogger, pinoLoggerInitialization } from '@guardian/common';
 import { ApplicationStates } from '@guardian/interfaces';
 import { MikroORM } from '@mikro-orm/core';
 import { MongoDriver } from '@mikro-orm/mongodb';
@@ -39,7 +39,8 @@ Promise.all([
 ]).then(
     async (values) => {
         const [_, db, mqConnection, app, loggerMongo] = values;
-        DataBaseHelper.orm = db;
+
+        DatabaseServer.connectBD(db);
 
         app.listen();
 

diff --git a/policy-service/src/api/policy-process.ts b/policy-service/src/api/policy-process.ts
@@ -74,9 +74,11 @@ Promise.all([
 ]).then(async values => {
     const [db, cn, app, loggerMongo] = values;
     app.listen();
-    DataBaseHelper.orm = db;
-    // @ts-ignore
-    DataBaseHelper.gridFS = new GridFSBucket(db.em.getDriver().getConnection().getDb());
+
+    DatabaseServer.connectBD(db);
+
+    DatabaseServer.connectGridFS();
+
     Environment.setLocalNodeProtocol(process.env.LOCALNODE_PROTOCOL);
     Environment.setLocalNodeAddress(process.env.LOCALNODE_ADDRESS);
     Environment.setNetwork(process.env.HEDERA_NET);

diff --git a/queue-service/src/app.ts b/queue-service/src/app.ts
@@ -1,4 +1,4 @@
-import { ApplicationState, COMMON_CONNECTION_CONFIG, DataBaseHelper, MessageBrokerChannel, mongoForLoggingInitialization, NotificationService, PinoLogger, pinoLoggerInitialization } from '@guardian/common';
+import { ApplicationState, COMMON_CONNECTION_CONFIG, DataBaseHelper, DatabaseServer, MessageBrokerChannel, mongoForLoggingInitialization, NotificationService, PinoLogger, pinoLoggerInitialization } from '@guardian/common';
 import { ApplicationStates, GenerateUUIDv4 } from '@guardian/interfaces';
 import { MikroORM } from '@mikro-orm/core';
 import { MongoDriver } from '@mikro-orm/mongodb';
@@ -39,7 +39,8 @@ Promise.all([
     mongoForLoggingInitialization()
 ]).then(async values => {
     const [db, cn, app, loggerMongo] = values;
-    DataBaseHelper.orm = db;
+
+    DatabaseServer.connectBD(db);
 
     app.listen();
     // new MessageBrokerChannel(cn, 'worker');