Merge branch 'dev' into merge-down-6-0-8-to-dev

backend/packages/Upgrade/package.json

@@ -71,6 +71,7 @@
         "chalk": "^5.3.0",
         "class-transformer": "^0.5.1",
         "class-validator": "^0.14.0",
+        "compare-versions": "^6.1.1",
         "compression": "^1.7.4",
         "cors": "^2.8.5",
         "csv-stringify": "^6.4.5",

backend/packages/Upgrade/src/api/DTO/ExperimentDTO.ts

@@ -182,7 +182,7 @@ export class PartitionValidator {
   public excludeIfReached: boolean;
 }
 
-class ConditionPayloadValidator {
+abstract class BaseConditionPayloadValidator {
   @IsNotEmpty()
   @IsString()
   public id: string;
@@ -191,7 +191,9 @@ class ConditionPayloadValidator {
   @ValidateNested()
   @Type(() => PayloadValidator)
   public payload: PayloadValidator;
+}
 
+export class ConditionPayloadValidator extends BaseConditionPayloadValidator {
   @IsNotEmpty()
   @IsString()
   public parentCondition: string;
@@ -201,6 +203,16 @@ class ConditionPayloadValidator {
   public decisionPoint?: string;
 }
 
+class OldConditionPayloadValidator extends BaseConditionPayloadValidator {
+  @IsNotEmpty()
+  @IsString()
+  public parentCondition: ConditionValidator;
+
+  @IsOptional()
+  @IsString()
+  public decisionPoint?: PartitionValidator;
+}
+
 class MetricValidator {
   @IsNotEmpty()
   @IsString()
@@ -322,7 +334,7 @@ class StratificationFactor {
   public stratificationFactorName: string;
 }
 
-export class ExperimentDTO {
+abstract class BaseExperimentWithoutPayload {
   @IsString()
   @IsOptional()
   public id?: string;
@@ -418,12 +430,6 @@ export class ExperimentDTO {
   @Type(() => PartitionValidator)
   public partitions: PartitionValidator[];
 
-  @IsOptional()
-  @IsArray()
-  @ValidateNested({ each: true })
-  @Type(() => ConditionPayloadValidator)
-  public conditionPayloads?: ConditionPayloadValidator[];
-
   @IsOptional()
   @IsArray()
   @ValidateNested({ each: true })
@@ -455,6 +461,22 @@ export class ExperimentDTO {
   public type: EXPERIMENT_TYPE;
 }
 
+export class ExperimentDTO extends BaseExperimentWithoutPayload {
+  @IsOptional()
+  @IsArray()
+  @ValidateNested({ each: true })
+  @Type(() => ConditionPayloadValidator)
+  public conditionPayloads?: ConditionPayloadValidator[];
+}
+
+export class OldExperimentDTO extends BaseExperimentWithoutPayload {
+  @IsOptional()
+  @IsArray()
+  @ValidateNested({ each: true })
+  @Type(() => OldConditionPayloadValidator)
+  public conditionPayloads?: OldConditionPayloadValidator[];
+}
+
 export class ExperimentIdValidator {
   @IsNotEmpty()
   @IsUUID()

backend/packages/Upgrade/src/api/services/ExperimentAssignmentService.ts

@@ -29,7 +29,6 @@ import { ExperimentRepository } from '../repositories/ExperimentRepository';
 import { IndividualExclusion } from '../models/IndividualExclusion';
 import { GroupExclusion } from '../models/GroupExclusion';
 import { Experiment } from '../models/Experiment';
-import { ScheduledJobService } from './ScheduledJobService';
 import { ExperimentCondition } from '../models/ExperimentCondition';
 import { v4 as uuid } from 'uuid';
 import { PreviewUserService } from './PreviewUserService';
@@ -108,7 +107,6 @@ export class ExperimentAssignmentService {
 
     public previewUserService: PreviewUserService,
     public experimentUserService: ExperimentUserService,
-    public scheduledJobService: ScheduledJobService,
     public errorService: ErrorService,
     public settingService: SettingService,
     public segmentService: SegmentService,

backend/packages/Upgrade/src/api/services/ExperimentService.ts

@@ -1,7 +1,7 @@
 /* eslint-disable no-var */
 import { GroupExclusion } from './../models/GroupExclusion';
 import { ErrorWithType } from './../errors/ErrorWithType';
-import { Service } from 'typedi';
+import { Inject, Service } from 'typedi';
 import { InjectDataSource, InjectRepository } from '../../typeorm-typedi-extensions';
 import { ExperimentRepository } from '../repositories/ExperimentRepository';
 import {
@@ -73,6 +73,7 @@ import {
   ParticipantsValidator,
   ExperimentFile,
   ValidatedExperimentError,
+  OldExperimentDTO,
 } from '../DTO/ExperimentDTO';
 import { ConditionPayloadDTO } from '../DTO/ConditionPayloadDTO';
 import { FactorDTO } from '../DTO/FactorDTO';
@@ -85,6 +86,7 @@ import { validate } from 'class-validator';
 import { plainToClass } from 'class-transformer';
 import { StratificationFactorRepository } from '../repositories/StratificationFactorRepository';
 import { ExperimentDetailsForCSVData } from '../repositories/AnalyticsRepository';
+import { compare } from 'compare-versions';
 
 const errorRemovePart = 'instance of ExperimentDTO has failed the validation:\n - ';
 const stratificationErrorMessage =
@@ -121,6 +123,7 @@ export class ExperimentService {
     @InjectDataSource() private dataSource: DataSource,
     public previewUserService: PreviewUserService,
     public segmentService: SegmentService,
+    @Inject(() => ScheduledJobService)
     public scheduledJobService: ScheduledJobService,
     public errorService: ErrorService,
     public cacheService: CacheService,
@@ -1525,7 +1528,14 @@ export class ExperimentService {
         } catch (error) {
           return { fileName: experimentFile.fileName, error: 'Invalid JSON' };
         }
-        const newExperiment = plainToClass(ExperimentDTO, experiment);
+
+        let newExperiment: ExperimentDTO;
+        if (compare(experiment.backendVersion, '5.3.0', '>=')) {
+          newExperiment = plainToClass(ExperimentDTO, experiment);
+        } else {
+          newExperiment = plainToClass(ExperimentDTO, this.experimentPayloadConverter(experiment));
+        }
+
         if (!(newExperiment instanceof ExperimentDTO)) {
           return { fileName: experimentFile.fileName, error: 'Invalid JSON' };
         }
@@ -1569,6 +1579,19 @@ export class ExperimentService {
       .filter((error) => error !== null);
   }
 
+  private experimentPayloadConverter(experiment: OldExperimentDTO): ExperimentDTO {
+    const updatedExperimentPayload = experiment.conditionPayloads.map((conditionPayload) => {
+      return {
+        ...conditionPayload,
+        parentCondition: conditionPayload.parentCondition.id,
+        decisionPoint: conditionPayload.decisionPoint.id,
+      };
+    });
+
+    const newExperiment: ExperimentDTO = { ...experiment, conditionPayloads: updatedExperimentPayload };
+    return newExperiment;
+  }
+
   private async validateExperimentJSON(experiment: ExperimentDTO): Promise<string> {
     let errorString = '';
     await validate(experiment).then((errors) => {

backend/packages/Upgrade/src/api/services/ScheduledJobService.ts

@@ -44,7 +44,7 @@ export class ScheduledJobService {
         if (scheduledJob && scheduledJob.experiment) {
           const experimentRepository = transactionalEntityManager.getRepository(Experiment);
           const experiment = await experimentRepository.findOneBy({ id: scheduledJob.experiment.id });
-          if (scheduledJob && experiment) {
+          if (experiment) {
             const systemUser = await transactionalEntityManager
               .getRepository(User)
               .findOneBy({ email: systemUserDoc.email });

backend/packages/Upgrade/test/unit/services/ExperimentAssignmentService.test.ts

@@ -17,7 +17,6 @@ import { ExperimentAssignmentService } from '../../../src/api/services/Experimen
 import { ExperimentService } from '../../../src/api/services/ExperimentService';
 import { ExperimentUserService } from '../../../src/api/services/ExperimentUserService';
 import { PreviewUserService } from '../../../src/api/services/PreviewUserService';
-import { ScheduledJobService } from '../../../src/api/services/ScheduledJobService';
 import { SegmentService } from '../../../src/api/services/SegmentService';
 import { SettingService } from '../../../src/api/services/SettingService';
 import {
@@ -54,7 +53,6 @@ describe('Experiment Assignment Service Test', () => {
   const userStratificationFactorRepository = sinon.createStubInstance(UserStratificationFactorRepository);
   const previewUserServiceMock = sinon.createStubInstance(PreviewUserService);
   const experimentUserServiceMock = sinon.createStubInstance(ExperimentUserService);
-  const scheduledJobServiceMock = sinon.createStubInstance(ScheduledJobService);
   const errorServiceMock = sinon.createStubInstance(ErrorService);
   const settingServiceMock = sinon.createStubInstance(SettingService);
   const segmentServiceMock = sinon.createStubInstance(SegmentService);
@@ -87,7 +85,6 @@ describe('Experiment Assignment Service Test', () => {
       userStratificationFactorRepository,
       previewUserServiceMock,
       experimentUserServiceMock,
-      scheduledJobServiceMock,
       errorServiceMock,
       settingServiceMock,
       segmentServiceMock,