Merge pull request #1458 from rocket-admin/backend_clickhouse

Backend clickhouse

Author: Artuomka

backend/package.json

@@ -26,10 +26,10 @@
     "test-all": "ava --timeout=5m --serial",
     "test-saas": "ava test/ava-tests/saas-tests/* ",
     "typeorm": "ts-node -r tsconfig-paths/register ../node_modules/.bin/typeorm",
-    "migration:generate": "yarn run typeorm migration:generate -d dist/shared/config/datasource.config.js",
-    "migration:create": "yarn run typeorm migration:create -d dist/shared/config/datasource.config.js",
-    "migration:run": "yarn run typeorm migration:run -d dist/shared/config/datasource.config.js",
-    "migration:revert": "npm run typeorm -- migration:revert -d dist/shared/config/datasource.config.js",
+    "migration:generate": "yarn run typeorm migration:generate -d dist/src/shared/config/datasource.config.js",
+    "migration:create": "yarn run typeorm migration:create -d dist/src/shared/config/datasource.config.js",
+    "migration:run": "yarn run typeorm migration:run -d dist/src/shared/config/datasource.config.js",
+    "migration:revert": "npm run typeorm -- migration:revert -d dist/src/shared/config/datasource.config.js",
     "knip": "knip"
   },
   "dependencies": {

backend/src/app.controller.ts

@@ -16,7 +16,7 @@ export class AppController {
 
   @Get('/hello')
   async getHello(): Promise<string> {
-
     return this.getHelloUseCase.execute(undefined, InTransactionEnum.OFF);
   }
 }
+

backend/src/authorization/auth-with-api.middleware.ts

@@ -28,7 +28,6 @@ export class AuthWithApiMiddleware implements NestMiddleware {
   ) {}
 
   async use(req: Request, res: Response, next: (err?: any, res?: any) => void): Promise<void> {
-    console.info(`Auth with api middleware triggered ->: ${new Date().toISOString()}`);
     try {
       await this.authenticateRequest(req);
       next();

backend/src/authorization/auth.middleware.ts

@@ -27,7 +27,6 @@ export class AuthMiddleware implements NestMiddleware {
     private readonly logOutRepository: Repository<LogOutEntity>,
   ) {}
   async use(req: Request, res: Response, next: (err?: any, res?: any) => void): Promise<void> {
-    console.log(`auth middleware triggered ->: ${new Date().toISOString()}`);
     let token: string;
     try {
       token = req.cookies[Constants.JWT_COOKIE_KEY_NAME];

backend/src/entities/agent/repository/custom-agent-repository-extension.ts

@@ -65,6 +65,8 @@ export const customAgentRepositoryExtension = {
         return 'CASSANDRA-TEST-AGENT-TOKEN';
       case ConnectionTypeTestEnum.agent_redis:
         return 'REDIS-TEST-AGENT-TOKEN';
+      case ConnectionTypeTestEnum.agent_clickhouse:
+        return 'CLICKHOUSE-TEST-AGENT-TOKEN';
     }
   },
 };

backend/src/entities/connection/ssl-certificate/read-certificate.ts

@@ -9,7 +9,7 @@ export async function readSslCertificate(): Promise<string> {
   const fileName = 'global-bundle.pem';
   return new Promise((resolve, reject) => {
     fs.readFile(
-      join(__dirname, '..', '..', '..', '..', 'files', 'certificates', fileName),
+      join(__dirname, '..', '..', '..', '..', '..', 'files', 'certificates', fileName),
       'utf8',
       function (err, data) {
         if (err) {

backend/src/entities/email/template-engine/nunjucks.module.ts

@@ -3,19 +3,20 @@ import * as nunjucks from 'nunjucks';
 import { BaseType } from '../../../common/data-injection.tokens.js';
 import path from 'path';
 import { fileURLToPath } from 'url';
-import { isTest } from '../../../helpers/app/is-test.js';
+import { existsSync } from 'node:fs';
+import assert from 'assert';
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = path.dirname(__filename);
 
+const pathToTemplates = path.join(__dirname, '..', '..', '..', '..', '..', 'public', 'email-templates');
+assert(existsSync(pathToTemplates), `Email templates directory does not exist: ${__dirname} ${pathToTemplates}`);
+
 @Global()
 @Module({
   providers: [
     {
       provide: BaseType.NUNJUCKS,
       useFactory: () => {
-        const pathToTemplates = isTest()
-          ? process.cwd() + '/public/email-templates'
-          : path.join(__dirname, '..', '..', '..', '..', 'public', 'email-templates');
         const env = new nunjucks.Environment(new nunjucks.FileSystemLoader(pathToTemplates));
         return env;
       },

backend/src/entities/logging/winston-logger.ts

@@ -18,6 +18,10 @@ export class WinstonLogger implements LoggerService {
     this.logger.info(message, ...optionalParams);
   }
 
+  public info(message: any, ...optionalParams: any[]) {
+    this.logger.info(message, ...optionalParams);
+  }
+
   public error(message: any, ...optionalParams: any[]) {
     this.logger.error(message, ...optionalParams);
   }

backend/src/enums/connection-type.enum.ts

@@ -10,6 +10,7 @@ export enum ConnectionTypeTestEnum {
   elasticsearch = 'elasticsearch',
   cassandra = 'cassandra',
   redis = 'redis',
+  clickhouse = 'clickhouse',
   agent_postgres = 'agent_postgres',
   agent_mysql = 'agent_mysql',
   agent_oracledb = 'agent_oracledb',
@@ -19,4 +20,5 @@ export enum ConnectionTypeTestEnum {
   agent_elasticsearch = 'agent_elasticsearch',
   agent_cassandra = 'agent_cassandra',
   agent_redis = 'agent_redis',
+  agent_clickhouse = 'agent_clickhouse',
 }

backend/src/helpers/is-connection-entity-agent.ts

@@ -13,6 +13,7 @@ export function isConnectionEntityAgent(connection: ConnectionEntity | CreateCon
     ConnectionTypesEnum.agent_mongodb,
     ConnectionTypesEnum.agent_cassandra,
     ConnectionTypesEnum.agent_redis,
+    ConnectionTypesEnum.agent_clickhouse,
   ];
 
   return agentTypes.includes(connection.type as ConnectionTypesEnum);
@@ -28,6 +29,7 @@ export function isConnectionTypeAgent(type: ConnectionTypesEnum | string): boole
     ConnectionTypeTestEnum.agent_mongodb,
     ConnectionTypeTestEnum.agent_cassandra,
     ConnectionTypesEnum.agent_redis,
+    ConnectionTypesEnum.agent_clickhouse,
   ];
 
   return connectionTypes.includes(type as ConnectionTypeTestEnum);