change jobs schema

Author: ArtemHoruzhenko

redisinsight/api/src/modules/rdi/client/api.rdi.client.ts

@@ -31,6 +31,7 @@ import {
 import { convertKeysToCamelCase } from 'src/utils/base.helper';
 import { RdiPipelineTimeoutException } from 'src/modules/rdi/exceptions/rdi-pipeline.timeout-error.exception';
 import * as https from 'https';
+import { convertApiDataToRdiPipeline, convertRdiPipelineToApiPayload } from 'src/modules/rdi/utils/pipeline.util';
 
 export class ApiRdiClient extends RdiClient {
   protected readonly client: AxiosInstance;
@@ -59,8 +60,9 @@ export class ApiRdiClient extends RdiClient {
 
   async getPipeline(): Promise<RdiPipeline> {
     try {
-      const response = await this.client.get(RdiUrl.GetPipeline);
-      return response.data;
+      const { data } = await this.client.get(RdiUrl.GetPipeline);
+
+      return convertApiDataToRdiPipeline(data);
     } catch (e) {
       throw wrapRdiPipelineError(e);
     }
@@ -95,7 +97,11 @@ export class ApiRdiClient extends RdiClient {
 
   async deploy(pipeline: RdiPipeline): Promise<void> {
     try {
-      const response = await this.client.post(RdiUrl.Deploy, { ...pipeline });
+      const response = await this.client.post(
+        RdiUrl.Deploy,
+        convertRdiPipelineToApiPayload(pipeline),
+      );
+
       const actionId = response.data.action_id;
 
       return await this.pollActionStatus(actionId);

redisinsight/api/src/modules/rdi/models/rdi-pipeline.ts

@@ -1,13 +1,16 @@
 import {
   IsObject, IsOptional,
 } from 'class-validator';
+import { Expose } from 'class-transformer';
 
 export class RdiPipeline {
+  @Expose()
   @IsOptional()
   @IsObject()
   // todo add validation
   jobs: { [key: string]: object };
 
+  @Expose()
   @IsOptional()
   @IsObject()
   config: object;

redisinsight/api/src/modules/rdi/rdi-pipeline.service.ts

@@ -5,7 +5,6 @@ import { RdiDryRunJobDto, RdiTemplateResponseDto, RdiTestConnectionsResponseDto
 import { RdiDryRunJobResponseDto } from 'src/modules/rdi/dto/rdi.dry-run.job.response.dto';
 import { RdiPipelineAnalytics } from 'src/modules/rdi/rdi-pipeline.analytics';
 import { wrapHttpError } from 'src/common/utils';
-import { plainToClass } from 'class-transformer';
 
 @Injectable()
 export class RdiPipelineService {
@@ -29,13 +28,13 @@ export class RdiPipelineService {
     try {
       const client = await this.rdiClientProvider.getOrCreate(rdiClientMetadata);
 
-      const response = await client.getPipeline();
+      const pipeline = await client.getPipeline();
 
-      this.analytics.sendRdiPipelineFetched(rdiClientMetadata.id, response);
+      this.analytics.sendRdiPipelineFetched(rdiClientMetadata.id, pipeline);
 
       this.logger.log('Succeed to get RDI pipeline');
 
-      return plainToClass(RdiPipeline, response);
+      return pipeline;
     } catch (e) {
       this.logger.error('Failed to get RDI pipeline', e);
 

redisinsight/api/src/modules/rdi/utils/pipeline.util.ts

@@ -0,0 +1,57 @@
+import {
+  isArray, unset, set, forEach,
+} from 'lodash';
+import { plainToClass } from 'class-transformer';
+import { RdiPipeline } from 'src/modules/rdi/models';
+
+export const convertApiDataToRdiJobs = (jobs?: [Record<string, any>]): Record<string, any> => {
+  const jobsMap = {};
+
+  if (jobs && isArray(jobs)) {
+    jobs.forEach((job) => {
+      if (job?.name) {
+        jobsMap[job.name] = {
+          ...job,
+          name: undefined, // do not show name in the config area
+        };
+      }
+    });
+  }
+
+  return jobsMap;
+};
+
+export const convertApiDataToRdiPipeline = (data: { config?: Record<string, any> } = {}): RdiPipeline => {
+  const pipeline = {
+    ...data,
+    jobs: convertApiDataToRdiJobs(data.config.jobs),
+  };
+
+  // do not show jobs in the config area
+  unset(pipeline, 'config.jobs');
+
+  return plainToClass(RdiPipeline, pipeline, { excludeExtraneousValues: true });
+};
+
+export const convertRdiJobsToApiPayload = (jobs: Record<string, any>): Record<string, any>[] => {
+  const payload = [];
+
+  forEach(jobs, (job, key) => {
+    payload.push({
+      ...job,
+      name: key,
+    });
+  });
+
+  return payload;
+};
+
+export const convertRdiPipelineToApiPayload = (pipeline: RdiPipeline): { config?: Record<string, any> } => {
+  const payload = {
+    ...pipeline,
+    jobs: undefined,
+  };
+
+  set(payload, 'config.jobs', convertRdiJobsToApiPayload(pipeline.jobs));
+  return payload;
+};