#RI-4667 - resolve pr comments

Author: egor-zalenski

redisinsight/api/src/modules/database-recommendation/database-recommendation.analytics.ts

@@ -12,13 +12,16 @@ export class DatabaseRecommendationAnalytics extends TelemetryBaseService {
   }
 
   sendCreatedRecommendationEvent(recommendation: DatabaseRecommendation, database: Database): void {
-    this.sendEvent(
-      TelemetryEvents.InsightsRecommendationGenerated,
-      {
-        recommendationName: recommendation.name,
-        databaseId: database.id,
-        provider: database.provider,
-      },
-    );
+    try {
+      this.sendEvent(
+        TelemetryEvents.InsightsRecommendationGenerated,
+        {
+          recommendationName: recommendation.name,
+          databaseId: database.id,
+          provider: database.provider,
+        },
+      );
+    } catch (e) {
+    }
   }
 }

redisinsight/api/src/modules/database-recommendation/database-recommendation.service.ts

@@ -11,6 +11,7 @@ import {
 } from 'src/modules/database-recommendation/dto/database-recommendations.response';
 import { Recommendation } from 'src/modules/database-analysis/models/recommendation';
 import { ModifyDatabaseRecommendationDto, DeleteDatabaseRecommendationResponse } from './dto';
+import { DatabaseRecommendationAnalytics } from './database-recommendation.analytics';
 import { DatabaseService } from '../database/database.service';
 
 @Injectable()
@@ -21,6 +22,7 @@ export class DatabaseRecommendationService {
     private readonly databaseRecommendationRepository: DatabaseRecommendationRepository,
     private readonly scanner: RecommendationScanner,
     private readonly databaseService: DatabaseService,
+    private readonly analytics: DatabaseRecommendationAnalytics,
   ) {}
 
   /**
@@ -33,7 +35,11 @@ export class DatabaseRecommendationService {
       DatabaseRecommendation,
       { databaseId: clientMetadata?.databaseId, name: recommendationName },
     );
-    return this.databaseRecommendationRepository.create(entity);
+
+    const recommendation = await this.databaseRecommendationRepository.create(entity)
+    const database = await this.databaseService.get(clientMetadata?.databaseId)
+    this.analytics.sendCreatedRecommendationEvent(recommendation, database)
+    return recommendation;
   }
 
   /**

redisinsight/api/src/modules/database-recommendation/repositories/local.database.recommendation.repository.ts

@@ -22,8 +22,6 @@ import {
 import { RecommendationEvents } from 'src/modules/database-recommendation/constants';
 import { EventEmitter2 } from '@nestjs/event-emitter';
 import { ModelEncryptor } from 'src/modules/encryption/model.encryptor';
-import { DatabaseService } from 'src/modules/database/database.service';
-import { DatabaseRecommendationAnalytics } from '../database-recommendation.analytics';
 
 @Injectable()
 export class LocalDatabaseRecommendationRepository extends DatabaseRecommendationRepository {
@@ -35,8 +33,6 @@ export class LocalDatabaseRecommendationRepository extends DatabaseRecommendatio
     @InjectRepository(DatabaseRecommendationEntity)
     private readonly repository: Repository<DatabaseRecommendationEntity>,
     private eventEmitter: EventEmitter2,
-    private readonly analytics: DatabaseRecommendationAnalytics,
-    private readonly databaseService: DatabaseService,
     private readonly encryptionService: EncryptionService,
   ) {
     super();
@@ -60,10 +56,6 @@ export class LocalDatabaseRecommendationRepository extends DatabaseRecommendatio
     );
     this.eventEmitter.emit(RecommendationEvents.NewRecommendation, [recommendation]);
 
-    const database = await this.databaseService.get(entity?.databaseId)
-
-    this.analytics.sendCreatedRecommendationEvent(recommendation, database)
-
     return recommendation;
   }