#RI-4489 add migrations + start UTests

Author: Artem

redisinsight/api/migration/1684175820824-feature.ts

@@ -0,0 +1,16 @@
+import { MigrationInterface, QueryRunner } from "typeorm";
+
+export class feature1684175820824 implements MigrationInterface {
+    name = 'feature1684175820824'
+
+    public async up(queryRunner: QueryRunner): Promise<void> {
+        await queryRunner.query(`CREATE TABLE "features" ("name" varchar PRIMARY KEY NOT NULL, "flag" boolean NOT NULL)`);
+        await queryRunner.query(`CREATE TABLE "features_config" ("id" varchar PRIMARY KEY NOT NULL, "controlNumber" integer, "data" varchar NOT NULL, "updatedAt" datetime NOT NULL DEFAULT (datetime('now')))`);
+    }
+
+    public async down(queryRunner: QueryRunner): Promise<void> {
+        await queryRunner.query(`DROP TABLE "features_config"`);
+        await queryRunner.query(`DROP TABLE "features"`);
+    }
+
+}

redisinsight/api/migration/index.ts

@@ -31,6 +31,7 @@ import { databaseCompressor1678182722874 } from './1678182722874-database-compre
 import { customTutorials1677135091633 } from './1677135091633-custom-tutorials';
 import { databaseRecommendations1681900503586 } from './1681900503586-database-recommendations';
 import { databaseRecommendationParams1683006064293 } from './1683006064293-database-recommendation-params';
+import { feature1684175820824 } from './1684175820824-feature';
 
 export default [
   initialMigration1614164490968,
@@ -66,4 +67,5 @@ export default [
   customTutorials1677135091633,
   databaseRecommendations1681900503586,
   databaseRecommendationParams1683006064293,
+  feature1684175820824,
 ];

redisinsight/api/src/__mocks__/feature.ts

@@ -1,13 +1,18 @@
 import { FeaturesConfigEntity } from 'src/modules/feature/entities/features-config.entity';
-import { FeaturesConfig, FeaturesConfigData } from 'src/modules/feature/model/features-config';
-import { plainToClass } from 'class-transformer';
+import {
+  FeatureConfig,
+  FeatureConfigFilter,
+  FeaturesConfig,
+  FeaturesConfigData,
+} from 'src/modules/feature/model/features-config';
 import { classToClass } from 'src/utils';
 
 export const mockFeaturesConfigId = '1';
+export const mockFeaturesConfigVersion = 1.111;
 export const mockControlNumber = 7.68;
 
 export const mockFeaturesConfigJson = {
-  version: 1,
+  version: mockFeaturesConfigVersion,
   features: {
     liveRecommendations: {
       perc: [[0, 10]],
@@ -23,21 +28,16 @@ export const mockFeaturesConfigJson = {
   },
 };
 
-export const mockFeaturesConfigData = plainToClass(FeaturesConfigData, {
-  version: mockFeaturesConfigJson.version,
-  features: {
-    liveRecommendations: {
-      perc: [[0, 10]],
-      flag: true,
+export const mockFeaturesConfigData = Object.assign(new FeaturesConfigData(), {
+  ...mockFeaturesConfigJson,
+  features: new Map(Object.entries({
+    liveRecommendations: Object.assign(new FeatureConfig(), {
+      ...mockFeaturesConfigJson.features.liveRecommendations,
       filters: [
-        {
-          name: 'agreements.analytics',
-          value: true,
-          cond: 'eq',
-        },
+        Object.assign(new FeatureConfigFilter(), { ...mockFeaturesConfigJson.features.liveRecommendations.filters[0] }),
       ],
-    },
-  },
+    }),
+  })),
 });
 
 export const mockFeaturesConfig = Object.assign(new FeaturesConfig(), {
@@ -51,8 +51,8 @@ export const mockFeaturesConfigEntity = Object.assign(new FeaturesConfigEntity()
 });
 
 export const mockFeaturesConfigRepository = jest.fn(() => ({
-  getOrCreate: jest.fn(),
-  update: jest.fn(),
+  getOrCreate: jest.fn().mockResolvedValue(mockFeaturesConfig),
+  update: jest.fn().mockResolvedValue(mockFeaturesConfig),
 }));
 
 export const mockFeaturesConfigService = () => ({

redisinsight/api/src/modules/feature/features-config.service.ts

@@ -8,6 +8,8 @@ import ERROR_MESSAGES from 'src/constants/error-messages';
 import { FeaturesConfigRepository } from 'src/modules/feature/repositories/features-config.repository';
 import { FeatureServerEvents } from 'src/modules/feature/constants';
 import { Validator } from 'class-validator';
+import { plainToClass } from 'class-transformer';
+import { FeaturesConfigData } from 'src/modules/feature/model/features-config';
 
 const FEATURES_CONFIG = config.get('features_config');
 
@@ -41,9 +43,8 @@ export class FeaturesConfigService {
       return JSON.parse(data);
     } catch (error) {
       this.logger.error('Unable to fetch remote config', error);
+      throw error;
     }
-
-    return null;
   }
 
   /**
@@ -54,7 +55,8 @@ export class FeaturesConfigService {
       this.logger.log('Trying to sync features config...');
 
       const featuresConfig = await this.repository.getOrCreate();
-      const newConfig = await this.fetchRemoteConfig();
+      // todo: update from default config with version > than current
+      const newConfig = plainToClass(FeaturesConfigData, await this.fetchRemoteConfig());
 
       await this.validator.validateOrReject(newConfig);
 

redisinsight/api/src/modules/feature/model/features-config.spec.ts

@@ -0,0 +1,57 @@
+import {
+  mockFeaturesConfig, mockFeaturesConfigEntity,
+  mockFeaturesConfigJson,
+} from 'src/__mocks__';
+import { classToPlain, plainToClass } from 'class-transformer';
+import { FeaturesConfig } from 'src/modules/feature/model/features-config';
+import { classToClass } from 'src/utils';
+import { FeaturesConfigEntity } from 'src/modules/feature/entities/features-config.entity';
+
+const testCases = [
+  {
+    plain: {
+      ...mockFeaturesConfig,
+      data: { ...mockFeaturesConfigJson },
+    },
+    model: mockFeaturesConfig,
+    entity: Object.assign(new FeaturesConfigEntity(), { ...mockFeaturesConfigEntity, id: undefined }),
+  },
+  {
+    plain: {},
+    model: {},
+    entity: {},
+  },
+  {
+    plain: null,
+    model: null,
+    entity: null,
+  },
+  {
+    plain: undefined,
+    model: undefined,
+    entity: undefined,
+  },
+  {
+    plain: 'incorrectdata',
+    model: 'incorrectdata',
+    entity: 'incorrectdata',
+  },
+];
+
+describe('FeaturesConfig', () => {
+  describe('transform', () => {
+    testCases.forEach((tc) => {
+      it(`input ${JSON.stringify(tc.plain)}`, async () => {
+        const modelFromPlain = plainToClass(FeaturesConfig, tc.plain);
+        const plainFromModel = classToPlain(modelFromPlain);
+        const entityFromModel = classToClass(FeaturesConfigEntity, modelFromPlain);
+        const modelFromEntity = classToClass(FeaturesConfig, entityFromModel);
+
+        expect(tc.model).toEqual(modelFromPlain);
+        expect(tc.plain).toEqual(plainFromModel);
+        expect(tc.entity).toEqual(entityFromModel);
+        expect(tc.model).toEqual(modelFromEntity);
+      });
+    });
+  });
+});

redisinsight/api/src/modules/feature/repositories/local.features-config.repository.spec.ts

@@ -12,7 +12,6 @@ import { LocalFeaturesConfigRepository } from 'src/modules/feature/repositories/
 import { FeaturesConfigEntity } from 'src/modules/feature/entities/features-config.entity';
 import { classToPlain, plainToClass } from 'class-transformer';
 import { FeaturesConfigData } from 'src/modules/feature/model/features-config';
-
 describe('LocalFeaturesConfigRepository', () => {
   let service: LocalFeaturesConfigRepository;
   let repository: MockType<Repository<FeaturesConfigEntity>>;
@@ -38,11 +37,43 @@ describe('LocalFeaturesConfigRepository', () => {
     repository.save.mockResolvedValue(mockFeaturesConfigEntity);
   });
 
+  describe('generateControlNumber', () => {
+    const step = 10;
+    const iterations = 10_000;
+    const delta = 100;
+
+    it('check controlNumber generation', async () => {
+      const result = {};
+
+      for (let i = 0; i < 100; i += step) {
+        result[`${i} - ${i + step}`] = 0;
+      }
+
+      (new Array(iterations)).fill(1).forEach(() => {
+        const controlNumber = service['generateControlNumber']();
+
+        expect(controlNumber).toBeGreaterThanOrEqual(0);
+        expect(controlNumber).toBeLessThan(100);
+
+        for (let j = 0; j < 100; j += step) {
+          if (controlNumber <= (j + step)) {
+            result[`${j} - ${j + step}`] += 1;
+            break;
+          }
+        }
+      });
+
+      const amountPerGroup = iterations / step;
+
+      Object.entries(result).forEach(([, value]) => {
+        expect(value).toBeGreaterThan(amountPerGroup - delta);
+        expect(value).toBeLessThan(amountPerGroup + delta);
+      });
+    });
+  });
+
   describe('getOrCreate', () => {
     it('ttt', async () => {
-      console.log('___ mockFeaturesConfigJson', require('util').inspect(mockFeaturesConfigJson, { depth: null }))
-      console.log('___ mockFeaturesConfig', require('util').inspect(mockFeaturesConfig, { depth: null }))
-      console.log('___ mockFeaturesConfigEntity', require('util').inspect(mockFeaturesConfigEntity, { depth: null }))
     });
     // it('should return existing config', async () => {
     //   const result = await service.getOrCreate();

redisinsight/api/src/modules/feature/repositories/local.features-config.repository.ts

@@ -24,17 +24,14 @@ export class LocalFeaturesConfigRepository extends FeaturesConfigRepository {
   }
 
   /**
-   * Generate control group which should never be updated
+   * Generate control number which should never be updated
    * @private
    */
-  private generateControlGroup(): number {
-    this.logger.log('Getting control group');
+  private generateControlNumber(): number {
+    const controlNumber = Number((parseInt((Math.random() * 10_000).toString(), 10) / 100).toFixed(2));
+    this.logger.log('Control number is generated', controlNumber);
 
-    const controlGroup = Number((Math.random() * 100).toFixed(2));
-
-    this.logger.log('Control group generated', controlGroup);
-
-    return controlGroup;
+    return controlNumber;
   }
 
   /**
@@ -51,7 +48,7 @@ export class LocalFeaturesConfigRepository extends FeaturesConfigRepository {
       entity = await this.repository.save(plainToClass(FeaturesConfigEntity, {
         id: this.id,
         data: defaultConfig,
-        controlNumber: this.generateControlGroup(),
+        controlNumber: this.generateControlNumber(),
       }));
     }
 

redisinsight/api/src/modules/server/entities/server.entity.ts

@@ -1,6 +1,4 @@
-import {
-  Entity, PrimaryGeneratedColumn, CreateDateColumn, Column,
-} from 'typeorm';
+import { Entity, PrimaryGeneratedColumn, CreateDateColumn } from 'typeorm';
 import { Expose } from 'class-transformer';
 
 @Entity('server')
@@ -12,8 +10,4 @@ export class ServerEntity {
   @CreateDateColumn({ type: 'datetime', nullable: false })
   @Expose()
   createDateTime: string;
-
-  @Expose()
-  @Column({ nullable: true })
-  controlGroup: number;
 }