#RI - 5239 - fix import db job (#2870)

* #RI - 5239 - fix import db job

---------

Co-authored-by: Artem <[email protected]>

Author: AmirAllayarovSofteq

redisinsight/api/src/modules/cloud/job/dto/import-database.cloud-job.data.dto.ts

@@ -1,5 +1,5 @@
 import { ApiProperty } from '@nestjs/swagger';
-import { IsNotEmpty, IsNumber } from 'class-validator';
+import { IsNotEmpty, IsNumber, IsString } from 'class-validator';
 
 export class ImportDatabaseCloudJobDataDto {
   @ApiProperty({
@@ -17,4 +17,20 @@ export class ImportDatabaseCloudJobDataDto {
   @IsNumber()
   @IsNotEmpty()
   databaseId: number;
+
+  @ApiProperty({
+    description: 'Subscription region',
+    type: String,
+  })
+  @IsString()
+  @IsNotEmpty()
+  region: string;
+
+  @ApiProperty({
+    description: 'Subscription provider',
+    type: String,
+  })
+  @IsString()
+  @IsNotEmpty()
+  provider: string;
 }

redisinsight/api/src/modules/cloud/job/exceptions/cloud-database-already-exists-free.exception.ts

@@ -5,7 +5,7 @@ import { CustomErrorCodes } from 'src/constants';
 export class CloudDatabaseAlreadyExistsFreeException extends HttpException {
   constructor(
     message = ERROR_MESSAGES.CLOUD_DATABASE_ALREADY_EXISTS_FREE,
-    options?: HttpExceptionOptions & { subscriptionId?: number, databaseId?: number },
+    options?: HttpExceptionOptions & { subscriptionId?: number, databaseId?: number, region?: string, provider?: string },
   ) {
     const response = {
       message,
@@ -15,6 +15,8 @@ export class CloudDatabaseAlreadyExistsFreeException extends HttpException {
       resource: {
         subscriptionId: options?.subscriptionId,
         databaseId: options?.databaseId,
+        region: options?.region,
+        provider: options?.provider,
       },
     };
 

redisinsight/api/src/modules/cloud/job/jobs/cloud-job.ts

@@ -24,6 +24,8 @@ export class CloudJobOptions {
   stateCallbacks?: ((self: CloudJob) => any)[] = [];
 
   name?: CloudJobName;
+
+  child?: boolean;
 }
 
 export abstract class CloudJob {
@@ -57,18 +59,22 @@ export abstract class CloudJob {
     }
 
     this.debounce = debounce(() => {
-      try {
-        (this.options?.stateCallbacks || []).forEach((cb) => {
-          cb?.(this)?.catch?.(() => {});
-        });
-      } catch (e) {
-        // silently ignore callback
-      }
+      this.triggerChangeStateCallbacks();
     }, 1_000, {
       maxWait: 2_000,
     });
   }
 
+  private triggerChangeStateCallbacks() {
+    try {
+      (this.options?.stateCallbacks || []).forEach((cb) => {
+        cb?.(this)?.catch?.(() => {});
+      });
+    } catch (e) {
+      // silently ignore callback
+    }
+  }
+
   public async run() {
     try {
       this.changeState({
@@ -127,8 +133,9 @@ export abstract class CloudJob {
     return new TargetJob(
       {
         ...this.options,
-        stateCallbacks: [() => this.changeState()],
         ...options,
+        stateCallbacks: [() => this.changeState()],
+        child: true,
       },
       data,
       this.dependencies,
@@ -154,7 +161,11 @@ export abstract class CloudJob {
   protected changeState(state = {}) {
     Object.entries(state).forEach(([key, value]) => { this[key] = value; });
 
-    this.debounce();
+    if (this.options.child) {
+      this.triggerChangeStateCallbacks();
+    } else {
+      this.debounce();
+    }
   }
 
   protected checkSignal() {

redisinsight/api/src/modules/cloud/job/jobs/create-free-subscription-and-database.cloud-job.ts

@@ -12,7 +12,7 @@ import { CloudCapiKeyService } from 'src/modules/cloud/capi-key/cloud-capi-key.s
 import { CloudSubscription } from 'src/modules/cloud/subscription/models';
 
 export class CreateFreeSubscriptionAndDatabaseCloudJob extends CloudJob {
-  protected name = CloudJobName.CreateFreeDatabase;
+  protected name = CloudJobName.CreateFreeSubscriptionAndDatabase;
 
   constructor(
     readonly options: CloudJobOptions,

redisinsight/api/src/modules/cloud/job/jobs/create-free-subscription.cloud-job.ts

@@ -70,6 +70,8 @@ export class CreateFreeSubscriptionCloudJob extends CloudJob {
         throw new CloudDatabaseAlreadyExistsFreeException(undefined, {
           subscriptionId: freeSubscription.id,
           databaseId: databases[0].databaseId,
+          region: freeSubscription?.region,
+          provider: freeSubscription?.provider,
         });
       }
 

redisinsight/api/src/modules/cloud/job/jobs/import-free-database.cloud-job.ts

@@ -17,13 +17,15 @@ import { CloudCapiKeyService } from 'src/modules/cloud/capi-key/cloud-capi-key.s
 const cloudConfig = config.get('cloud');
 
 export class ImportFreeDatabaseCloudJob extends CloudJob {
-  protected name = CloudJobName.CreateFreeDatabase;
+  protected name = CloudJobName.ImportFreeDatabase;
 
   constructor(
     readonly options: CloudJobOptions,
     private readonly data: {
       subscriptionId: number,
       databaseId: number,
+      region: string,
+      provider: string,
     },
     protected readonly dependencies: {
       cloudDatabaseCapiService: CloudDatabaseCapiService,
@@ -84,7 +86,11 @@ export class ImportFreeDatabaseCloudJob extends CloudJob {
       timeout: cloudConfig.cloudDatabaseConnectionTimeout,
     });
 
-    this.result = { resourceId: database.id };
+    this.result = {
+      resourceId: database.id,
+      region: this.data?.region,
+      provider: this.data?.provider,
+    };
 
     this.changeState({ status: CloudJobStatus.Finished });
 

redisinsight/ui/src/components/oauth/oauth-jobs/OAuthJobs.tsx

@@ -6,6 +6,7 @@ import { get } from 'lodash'
 import { CloudJobStatus, CloudJobName, CloudJobStep } from 'uiSrc/electron/constants'
 import { fetchInstancesAction } from 'uiSrc/slices/instances/instances'
 import { createFreeDbJob, createFreeDbSuccess, oauthCloudJobSelector, oauthCloudSelector, setJob } from 'uiSrc/slices/oauth/cloud'
+import { CloudImportDatabaseResources } from 'uiSrc/slices/interfaces/cloud'
 import { addErrorNotification, addInfiniteNotification, removeInfiniteNotification } from 'uiSrc/slices/app/notifications'
 import { parseCloudOAuthError } from 'uiSrc/utils'
 import { INFINITE_MESSAGES, InfiniteMessagesIds } from 'uiSrc/components/notifications/components'
@@ -43,13 +44,13 @@ const OAuthJobs = () => {
 
         const errorCode = get(error, 'errorCode', 0) as CustomErrorCodes
         const subscriptionId = get(error, 'resource.subscriptionId', 0)
-        const databaseId = get(error, 'resource.databaseId', 0)
+        const resources = get(error, 'resource', {}) as CloudImportDatabaseResources
         // eslint-disable-next-line sonarjs/no-nested-switch
         switch (errorCode) {
           case CustomErrorCodes.CloudDatabaseAlreadyExistsFree:
             dispatch(addInfiniteNotification(
               INFINITE_MESSAGES.DATABASE_EXISTS(
-                () => importDatabase(subscriptionId, databaseId),
+                () => importDatabase(resources),
                 closeImportDatabase,
               )
             ))
@@ -77,13 +78,13 @@ const OAuthJobs = () => {
     }
   }, [status, error, step, result, showProgress])
 
-  const importDatabase = (subscriptionId: number, databaseId: number) => {
+  const importDatabase = (resources: CloudImportDatabaseResources) => {
     sendEventTelemetry({
       event: TelemetryEvent.CLOUD_IMPORT_EXISTING_DATABASE,
     })
     dispatch(createFreeDbJob({
       name: CloudJobName.ImportFreeDatabase,
-      resources: { subscriptionId, databaseId },
+      resources,
       onSuccessAction: () => {
         dispatch(removeInfiniteNotification(InfiniteMessagesIds.databaseExists))
         dispatch(addInfiniteNotification(INFINITE_MESSAGES.PENDING_CREATE_DB(CloudJobStep.Credentials)))

redisinsight/ui/src/slices/interfaces/cloud.ts

@@ -38,6 +38,13 @@ export interface StateAppOAuth {
   agreement: boolean
 }
 
+export interface CloudImportDatabaseResources {
+  subscriptionId: number,
+  databaseId?: number
+  region: string
+  provider?: string
+}
+
 export interface Region {
   provider: string
   regions: string[]

redisinsight/ui/src/slices/oauth/cloud.ts

@@ -315,6 +315,8 @@ export function createFreeDbJob({
     planId?: number,
     databaseId?: number,
     subscriptionId?: number,
+    region?: string,
+    provider?: string,
   }
   onSuccessAction?: () => void,
   onFailAction?: () => void