Solved bugs for ConditionPayload json structure change

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

@@ -191,14 +191,12 @@ class ConditionPayloadValidator {
   public payload: PayloadValidator;
 
   @IsNotEmpty()
-  @ValidateNested()
-  @Type(() => ConditionValidator)
-  public parentCondition: ConditionValidator;
+  @IsString()
+  public parentCondition: string;
 
   @IsOptional()
-  @ValidateNested()
-  @Type(() => PartitionValidator)
-  public decisionPoint?: PartitionValidator;
+  @IsString()
+  public decisionPoint?: string;
 }
 
 class MetricValidator {

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

@@ -615,7 +615,7 @@ export class ExperimentService {
         { experimentName: experiment.name },
         user
       );
-      return this.formatingPayload(this.formatingConditionPayload(experiment));
+      return this.reducedConditionPayload(this.formatingPayload(this.formatingConditionPayload(experiment)));
     });
 
     return formatedExperiments;
@@ -1388,8 +1388,8 @@ export class ExperimentService {
               id: conditionPayload.id,
               payloadType: conditionPayload.payload.type,
               payloadValue: conditionPayload.payload.value,
-              parentCondition: conditions.find((doc) => doc.id === conditionPayload.parentCondition.id),
-              decisionPoint: partitions.find((doc) => doc.id === conditionPayload.decisionPoint?.id),
+              parentCondition: conditions.find((doc) => doc.id === conditionPayload.parentCondition),
+              decisionPoint: partitions.find((doc) => doc.id === conditionPayload?.decisionPoint),
             };
             return conditionPayloadToReturn;
           })) ||
@@ -1542,7 +1542,7 @@ export class ExperimentService {
       createAuditLogData,
       user
     );
-    return this.formatingPayload(createdExperiment);
+    return this.reducedConditionPayload(this.formatingPayload(createdExperiment));
   }
 
   public async validateExperiments(
@@ -1623,7 +1623,19 @@ export class ExperimentService {
     return experiment;
   }
 
-  autoFillSomeMissingProperties(experiment: ExperimentDTO): ExperimentDTO {
+  autoFillSomeMissingProperties(experiment): ExperimentDTO {
+    // modify conditionPayloads to support older exported experiments
+    if (experiment.conditionPayloads) {
+      experiment.conditionPayloads.forEach((conditionPayload) => {
+        if (typeof conditionPayload.parentCondition === 'object') {
+          conditionPayload.parentCondition = conditionPayload.parentCondition.id;
+        }
+        if (typeof conditionPayload.decisionPoint === 'object') {
+          conditionPayload.decisionPoint = conditionPayload.decisionPoint?.id;
+        }
+      });
+    }
+
     return {
       ...experiment,
       backendVersion: experiment.backendVersion || this.backendVersion.toString(),
@@ -1654,9 +1666,9 @@ export class ExperimentService {
     }
     result.conditionPayloads.forEach((conditionPayload) => {
       conditionPayload.id = uuid();
-      conditionPayload.parentCondition.id = this.allIdMap[conditionPayload.parentCondition.id];
-      if (conditionPayload.decisionPoint && conditionPayload.decisionPoint.id) {
-        conditionPayload.decisionPoint.id = this.allIdMap[conditionPayload.decisionPoint.id];
+      conditionPayload.parentCondition = this.allIdMap[conditionPayload.parentCondition];
+      if (conditionPayload.decisionPoint) {
+        conditionPayload.decisionPoint = this.allIdMap[conditionPayload.decisionPoint];
       }
     });
 

backend/packages/Upgrade/test/integration/Experiment/factorial/FactorialEnrollment.ts

@@ -84,7 +84,7 @@ export default async function FactorialExperimentEnrollment(): Promise<void> {
         site: experimentSite,
         assignedCondition: expect.arrayContaining([
           expect.objectContaining({
-            id: experimentConditionPayload.parentCondition.id,
+            id: experimentConditionPayload.parentCondition,
             conditionCode: 'Color=Red; Shape=Circle',
             payload: { type: 'string', value: experimentConditionPayload.payload.value },
           }),

backend/packages/Upgrade/test/integration/mockData/experiment/raw.ts

@@ -356,45 +356,17 @@ export const experimentFifth = {
         type: 'string',
         value: 'ConditionA_W1',
       },
-      parentCondition: {
-        id: 'c22467b1-f0e9-4444-9517-cc03037bc079',
-        name: 'Condition A',
-        description: 'Condition A',
-        assignmentWeight: 40,
-        conditionCode: 'ConditionA',
-        twoCharacterId: 'CA',
-      },
-      decisionPoint: {
-        id: 'd22467b1-f0e9-4444-9517-cc03037bc079',
-        site: 'CurriculumSequence',
-        target: 'W1',
-        description: 'Decision Point on Workspace 1',
-        twoCharacterId: 'W1',
-        excludeIfReached: false,
-      },
+      parentCondition: 'c22467b1-f0e9-4444-9517-cc03037bc079',
+      decisionPoint: 'd22467b1-f0e9-4444-9517-cc03037bc079',
     },
     {
       id: '9d753b90-1111-44b5-8acc-2483c0507ea1',
       payload: {
         type: 'string',
         value: 'ConditionA_W2',
       },
-      parentCondition: {
-        id: 'c22467b1-f0e9-4444-9517-cc03037bc079',
-        name: 'Condition A',
-        description: 'Condition A',
-        assignmentWeight: 40,
-        conditionCode: 'ConditionA',
-        twoCharacterId: 'CA',
-      },
-      decisionPoint: {
-        id: 'e22467b1-f0e9-4444-9517-cc03037bc079',
-        site: 'CurriculumSequence',
-        target: 'W2',
-        description: 'Decision Point on Workspace 2',
-        twoCharacterId: 'W2',
-        excludeIfReached: false,
-      },
+      parentCondition: 'c22467b1-f0e9-4444-9517-cc03037bc079',
+      decisionPoint: 'e22467b1-f0e9-4444-9517-cc03037bc079',
     },
   ],
   backendVersion: '1.0.0',
@@ -624,23 +596,7 @@ export const factorialExperimentFirst = {
         type: 'string',
         value: 'Red-Circle alias name',
       },
-      parentCondition: {
-        id: '6dd63ad9-f121-4d95-8d27-08a80e9560a4',
-        twoCharacterId: '5H',
-        name: '',
-        description: null,
-        conditionCode: 'Shape=Circle; Color=Red',
-        assignmentWeight: 50,
-        order: 1,
-        levelCombinationElements: [
-          {
-            level: '11111111-1111-4a52-a058-90fac2d03679',
-          },
-          {
-            level: '33333333-1111-4a52-a058-90fac2d03679',
-          },
-        ],
-      },
+      parentCondition: '6dd63ad9-f121-4d95-8d27-08a80e9560a4',
     },
   ],
   assignmentAlgorithm: 'random',

frontend/projects/upgrade/src/app/core/experiment-design-stepper/experiment-design-stepper.service.ts

@@ -338,11 +338,11 @@ export class ExperimentDesignStepperService {
     const payloadTableData = this.getSimpleExperimentPayloadTableData();
 
     payloadTableData.forEach((payloadRowData: SimpleExperimentPayloadTableRowData) => {
-      const parentCondition = conditions.find((condition) => condition.conditionCode === payloadRowData.condition);
+      const parentCondition = conditions.find((condition) => condition.conditionCode === payloadRowData.condition).id;
 
       const decisionPoint = decisionPoints.find(
         (decisionPoint) => decisionPoint.target === payloadRowData.target && decisionPoint.site === payloadRowData.site
-      );
+      )?.id;
 
       conditionPayloads.push({
         id: payloadRowData.id || uuidv4(),
@@ -572,7 +572,7 @@ export class ExperimentDesignStepperService {
       factorialConditionPayloadsRequestObject.push({
         id: factorialConditionTableRow.conditionPayloadId || uuidv4(),
         payload: { type: PAYLOAD_TYPE.STRING, value: factorialConditionTableRow.payload },
-        parentCondition: currentConditions[index],
+        parentCondition: currentConditions[index].id,
       });
     });