#RI-4938 fix UTests

Artem · Artem · commit 370415f52e09 · 2023-09-13T11:31:18.000+03:00
diff --git a/redisinsight/api/src/modules/cloud/common/providers/cloud.api.provider.spec.ts b/redisinsight/api/src/modules/cloud/common/providers/cloud.api.provider.spec.ts
@@ -10,16 +10,12 @@ const generateUtmQueryTests = [
     input: { source: 'source' },
     expected: new URLSearchParams([
       ['utm_source', 'source'],
-      ['utm_medium', 'undefined'],
-      ['utm_campaign', 'undefined'],
     ]),
   },
   {
     input: { medium: 'medium' },
     expected: new URLSearchParams([
-      ['utm_source', 'undefined'],
       ['utm_medium', 'medium'],
-      ['utm_campaign', 'undefined'],
     ]),
   },
   {
@@ -33,8 +29,6 @@ const generateUtmQueryTests = [
   {
     input: { campaign: 'campaign' },
     expected: new URLSearchParams([
-      ['utm_source', 'undefined'],
-      ['utm_medium', 'undefined'],
       ['utm_campaign', 'campaign'],
     ]),
   },
diff --git a/redisinsight/api/src/modules/cloud/job/cloud-job.controller.ts b/redisinsight/api/src/modules/cloud/job/cloud-job.controller.ts
@@ -4,13 +4,15 @@ import {
   Controller, Get, Param, Post, UseInterceptors, UsePipes, ValidationPipe,
 } from '@nestjs/common';
 import { RequestSessionMetadata } from 'src/common/decorators';
-import { ApiTags } from '@nestjs/swagger';
+import { ApiExtraModels, ApiTags } from '@nestjs/swagger';
 import { ApiEndpoint } from 'src/decorators/api-endpoint.decorator';
 import { CloudJobService } from 'src/modules/cloud/job/cloud-job.service';
-import { CreateCloudJobDto } from 'src/modules/cloud/job/dto';
+import { CreateDatabaseCloudJobDataDto } from 'src/modules/cloud/job/dto/create-database.cloud-job.data.dto';
+import { CreateCloudJobDto } from 'src/modules/cloud/job/dto/create.cloud-job.dto';
 import { CloudJobInfo } from 'src/modules/cloud/job/models';
 import { CloudRequestUtm } from 'src/modules/cloud/common/models';
 
+@ApiExtraModels(CreateDatabaseCloudJobDataDto)
 @ApiTags('Cloud Jobs')
 @UseInterceptors(ClassSerializerInterceptor)
 @Controller('cloud/me/jobs')
diff --git a/redisinsight/api/src/modules/cloud/job/cloud-job.gateway.ts b/redisinsight/api/src/modules/cloud/job/cloud-job.gateway.ts
@@ -5,12 +5,12 @@ import {
   WebSocketServer, WsException,
 } from '@nestjs/websockets';
 import {
-  Logger, ValidationPipe
+  Logger, ValidationPipe,
 } from '@nestjs/common';
 import config from 'src/utils/config';
 import { CloudJobEvents } from 'src/modules/cloud/common/constants';
 import { CloudJobService } from 'src/modules/cloud/job/cloud-job.service';
-import { MonitorCloudJobDto } from 'src/modules/cloud/job/dto';
+import { MonitorCloudJobDto } from 'src/modules/cloud/job/dto/monitor.cloud-job.dto';
 import { Validator } from 'class-validator';
 import { plainToClass } from 'class-transformer';
 import { DEFAULT_SESSION_ID, DEFAULT_USER_ID } from 'src/common/constants';
diff --git a/redisinsight/api/src/modules/cloud/job/cloud-job.provider.ts b/redisinsight/api/src/modules/cloud/job/cloud-job.provider.ts
@@ -1,7 +1,7 @@
 import { filter } from 'lodash';
 import { CloudJob } from 'src/modules/cloud/job/jobs';
 import { SessionMetadata } from 'src/common/models';
-import { CreateCloudJobDto } from 'src/modules/cloud/job/dto';
+import { CreateCloudJobDto } from 'src/modules/cloud/job/dto/create.cloud-job.dto';
 import { CloudJobInfo, CloudJobRunMode } from 'src/modules/cloud/job/models';
 import { CloudJobFactory } from 'src/modules/cloud/job/cloud-job.factory';
 import { wrapHttpError } from 'src/common/utils';
diff --git a/redisinsight/api/src/modules/cloud/job/cloud-job.service.ts b/redisinsight/api/src/modules/cloud/job/cloud-job.service.ts
@@ -1,6 +1,7 @@
 import { ForbiddenException, Injectable } from '@nestjs/common';
 import { SessionMetadata } from 'src/common/models';
-import { CreateCloudJobDto, MonitorCloudJobDto } from 'src/modules/cloud/job/dto';
+import { CreateCloudJobDto } from 'src/modules/cloud/job/dto/create.cloud-job.dto';
+import { MonitorCloudJobDto } from 'src/modules/cloud/job/dto/monitor.cloud-job.dto';
 import { wrapHttpError } from 'src/common/utils';
 import { CloudJobProvider } from 'src/modules/cloud/job/cloud-job.provider';
 import { CloudJobInfo } from 'src/modules/cloud/job/models';
diff --git a/redisinsight/api/src/modules/cloud/job/dto/create-database.cloud-job.data.dto.ts b/redisinsight/api/src/modules/cloud/job/dto/create-database.cloud-job.data.dto.ts
@@ -0,0 +1,12 @@
+import { ApiProperty } from '@nestjs/swagger';
+import { IsNotEmpty, IsNumber } from 'class-validator';
+
+export class CreateDatabaseCloudJobDataDto {
+  @ApiProperty({
+    description: 'Plan id for create a subscription.',
+    type: Number,
+  })
+  @IsNumber()
+  @IsNotEmpty()
+  planId: number;
+}
diff --git a/redisinsight/api/src/modules/cloud/job/dto/create.cloud-job.dto.ts b/redisinsight/api/src/modules/cloud/job/dto/create.cloud-job.dto.ts
@@ -4,24 +4,15 @@ import {
 import {
   IsEnum,
   IsNotEmpty,
-  IsNumber,
+  IsNotEmptyObject,
   IsOptional,
   ValidateNested,
 } from 'class-validator';
 import { Expose, Type } from 'class-transformer';
+import { cloudJobDataTransformer } from 'src/modules/cloud/job/transformers/cloud-job-data.transformer';
 import { CloudJobName } from 'src/modules/cloud/job/constants';
 import { CloudJobRunMode } from 'src/modules/cloud/job/models';
-import { cloudJobDataTransformer } from 'src/modules/cloud/job/transformers/cloud-job-data.transformer';
-
-export class CreateDatabaseCloudJobDataDto {
-  @ApiProperty({
-    description: 'Plan id for create a subscription.',
-    type: Number,
-  })
-  @IsNumber()
-  @IsNotEmpty()
-  planId: number;
-}
+import { CreateDatabaseCloudJobDataDto } from 'src/modules/cloud/job/dto/create-database.cloud-job.data.dto';
 
 @ApiExtraModels(CreateDatabaseCloudJobDataDto)
 export class CreateCloudJobDto {
@@ -49,10 +40,10 @@ export class CreateCloudJobDto {
       { $ref: getSchemaPath(CreateDatabaseCloudJobDataDto) },
     ],
   })
-  @ValidateNested()
   @Expose()
-  @IsNotEmpty()
   @IsOptional()
+  @IsNotEmptyObject()
   @Type(cloudJobDataTransformer)
-  data: CreateDatabaseCloudJobDataDto | undefined;
+  @ValidateNested()
+  data?: CreateDatabaseCloudJobDataDto;
 }
diff --git a/redisinsight/api/src/modules/cloud/job/dto/index.ts b/redisinsight/api/src/modules/cloud/job/dto/index.ts
diff --git a/redisinsight/api/src/modules/cloud/job/transformers/cloud-job-data.transformer.spec.ts b/redisinsight/api/src/modules/cloud/job/transformers/cloud-job-data.transformer.spec.ts
@@ -1,8 +1,7 @@
 import { TypeHelpOptions } from 'class-transformer';
 import { CloudJobName } from 'src/modules/cloud/job/constants';
-import { CreateDatabaseCloudJobDataDto } from '../dto';
-
-import { cloudJobDataTransformer } from './cloud-job-data.transformer';
+import { CreateDatabaseCloudJobDataDto } from 'src/modules/cloud/job/dto/create-database.cloud-job.data.dto';
+import { cloudJobDataTransformer } from 'src/modules/cloud/job/transformers/cloud-job-data.transformer';
 
 describe('cloudJobDataTransformer', () => {
   [
diff --git a/redisinsight/api/src/modules/cloud/job/transformers/cloud-job-data.transformer.ts b/redisinsight/api/src/modules/cloud/job/transformers/cloud-job-data.transformer.ts
@@ -1,6 +1,6 @@
 import { get } from 'lodash';
 import { TypeHelpOptions } from 'class-transformer';
-import { CreateDatabaseCloudJobDataDto } from 'src/modules/cloud/job/dto';
+import { CreateDatabaseCloudJobDataDto } from 'src/modules/cloud/job/dto/create-database.cloud-job.data.dto';
 import { CloudJobName } from 'src/modules/cloud/job/constants';
 
 export const cloudJobDataTransformer = (data: TypeHelpOptions) => {
diff --git a/redisinsight/api/src/modules/cloud/user/providers/cloud-user.api.provider.spec.ts b/redisinsight/api/src/modules/cloud/user/providers/cloud-user.api.provider.spec.ts
@@ -58,7 +58,50 @@ describe('CloudUserApiProvider', () => {
       mockedAxios.post.mockResolvedValue(response);
 
       expect(await service.getApiSessionId(mockCloudSession)).toEqual(mockCloudApiAuthDto.apiSessionId);
-      expect(mockedAxios.post).toHaveBeenCalledWith('login', {}, mockCloudApiHeaders);
+      expect(mockedAxios.post).toHaveBeenCalledWith('login', {}, {
+        ...mockCloudApiHeaders,
+        params: null,
+      });
+    });
+    it('successfully get api session id (login to api) with utm parameters', async () => {
+      const response = {
+        status: 200,
+        headers: { 'set-cookie': [`anything;JSESSIONID=${mockCloudApiAuthDto.apiSessionId};anything;`] },
+      };
+      mockedAxios.post.mockResolvedValue(response);
+
+      expect(await service.getApiSessionId(
+        mockCloudSession,
+        { source: 's', medium: 'm', campaign: 'c' },
+      )).toEqual(mockCloudApiAuthDto.apiSessionId);
+
+      expect(mockedAxios.post).toHaveBeenCalledWith('login', {}, {
+        ...mockCloudApiHeaders,
+        params: new URLSearchParams([
+          ['utm_source', 's'],
+          ['utm_medium', 'm'],
+          ['utm_campaign', 'c'],
+        ]),
+      });
+    });
+    it('successfully get api session id (login to api) with defined only utm parameters', async () => {
+      const response = {
+        status: 200,
+        headers: { 'set-cookie': [`anything;JSESSIONID=${mockCloudApiAuthDto.apiSessionId};anything;`] },
+      };
+      mockedAxios.post.mockResolvedValue(response);
+
+      expect(await service.getApiSessionId(
+        mockCloudSession,
+        { medium: 'm' },
+      )).toEqual(mockCloudApiAuthDto.apiSessionId);
+
+      expect(mockedAxios.post).toHaveBeenCalledWith('login', {}, {
+        ...mockCloudApiHeaders,
+        params: new URLSearchParams([
+          ['utm_medium', 'm'],
+        ]),
+      });
     });
     it('throw CloudApiUnauthorizedException exception', async () => {
       mockedAxios.post.mockRejectedValue(mockCapiUnauthorizedError);
