Merge branch 'enhancement/disable-input-fields-for-enabled-feature-fl…

…ag' of https://github.com/CarnegieLearningWeb/UpGrade into enhancement/disable-input-fields-for-enabled-feature-flag
CarnegieLearningWeb · Nov 25, 2024 · 4a4a569 · 4a4a569
2 parents dcecbe3 + 9efe58d
commit 4a4a569
Show file tree

Hide file tree

Showing 20 changed files with 107 additions and 38 deletions.
diff --git a/backend/packages/Upgrade/.env.docker.local.example b/backend/packages/Upgrade/.env.docker.local.example
@@ -82,4 +82,4 @@ CLIENT_API_SECRET=secret
 CLIENT_API_KEY=key
 
 CONTEXT_METADATA={"context_identifier_1":{"CONDITIONS":["potential-condition-1","potential-condition-2"],"GROUP_TYPES":["client_group_identifier_1","client_group_identifier_2","client_group_identifier_3"],"EXP_IDS":["decision_point_target_identifier_1","decision_point_target_identifier_2"],"EXP_POINTS":["decision_point_site_identifier_1","decision_point_site_identifier_2"]}}
-METRICS=[{"metrics":[{"metric": "totalTimeSeconds","datatype": "continuous"}, {"groupClass":"masteryWorkspace","allowedKeys":["calculating_area_various_figures","Compare_functions_diff_reps_quadratic"],"attributes":[{"metric":"timeSeconds","datatype":"continuous"}]}],"contexts": ["context_identifier_1"]}]
+METRICS=[{"metrics":[{"metric": "totalTimeSeconds","datatype": "continuous"}, {"groupClass":"masteryWorkspace","allowedKeys":["calculating_area_various_figures","Compare_functions_diff_reps_quadratic"],"attributes":[{"metric":"timeSeconds","datatype":"continuous"}]}],"contexts": ["context_identifier_1"]}]
diff --git a/backend/packages/Upgrade/src/api/DTO/ExperimentDTO.ts b/backend/packages/Upgrade/src/api/DTO/ExperimentDTO.ts
@@ -149,7 +149,7 @@ export class ConditionValidator {
   @IsOptional()
   @ValidateNested({ each: true })
   @Type(() => LevelCombinationElementValidator)
-  public levelCombinationElements: LevelCombinationElementValidator[];
+  public levelCombinationElements?: LevelCombinationElementValidator[];
 }
 export class PartitionValidator {
   @IsNotEmpty()

diff --git a/.../Upgrade/test/integration/Experiment/enrollmentCode/ExperimentExperimentEnrollmentCode.ts b/.../Upgrade/test/integration/Experiment/enrollmentCode/ExperimentExperimentEnrollmentCode.ts
@@ -9,7 +9,7 @@ import {
   checkExperimentAssignedIsNotDefault,
 } from '../../utils/index';
 import { experimentUsers } from '../../mockData/experimentUsers/index';
-import { EXPERIMENT_STATE, ENROLLMENT_CODE } from 'upgrade_types';
+import { EXPERIMENT_STATE, ENROLLMENT_CODE, ASSIGNMENT_UNIT } from 'upgrade_types';
 import { UpgradeLogger } from '../../../../src/lib/logger/UpgradeLogger';
 import { CheckService } from '../../../../src/api/services/CheckService';
 
@@ -150,7 +150,7 @@ export default async function testCase(): Promise<void> {
     ])
   );
 
-  experimentObject.assignmentUnit = "group";
+  experimentObject.assignmentUnit = ASSIGNMENT_UNIT.GROUP;
 
   await experimentService.update(experimentObject as any, user, new UpgradeLogger());
   // change experiment status to Enrolling

diff --git a/...ackages/Upgrade/test/integration/Experiment/exclusionCode/GroupExperimentExclusionCode.ts b/...ackages/Upgrade/test/integration/Experiment/exclusionCode/GroupExperimentExclusionCode.ts
@@ -88,7 +88,7 @@ export default async function testCase(): Promise<void> {
   let individualExclusions = await checkService.getAllIndividualExclusion();
   expect(individualExclusions.length).toEqual(1);
   // EXCLUDED_DUE_TO_GROUP_LOGIC
-  experimentObject.state = 'enrolling';
+  experimentObject.state = EXPERIMENT_STATE.ENROLLING;
   experimentObject.experimentSegmentExclusion = {
     "segment": {
         "id": "1b0c0200-7a15-4e19-8688-f9ac283f18aa",

diff --git a/...Upgrade/test/integration/Experiment/exclusionCode/WithinSubjectExperimentExclusionCode.ts b/...Upgrade/test/integration/Experiment/exclusionCode/WithinSubjectExperimentExclusionCode.ts
@@ -87,7 +87,7 @@ export default async function testCase(): Promise<void> {
 
   let individualExclusions = await checkService.getAllIndividualExclusion();
   expect(individualExclusions.length).toEqual(1);
-  experimentObject.state = 'enrolling';
+  experimentObject.state = EXPERIMENT_STATE.ENROLLING;
   experimentObject.experimentSegmentExclusion = {
     "segment": {
         "id": "1b0c0200-7a15-4e19-8688-f9ac283f18aa",

diff --git a/backend/packages/Upgrade/test/integration/ExperimentStats/IndividualEnrollment.ts b/backend/packages/Upgrade/test/integration/ExperimentStats/IndividualEnrollment.ts
@@ -28,7 +28,7 @@ export default async function testCase(): Promise<void> {
   experimentObject.partitions = updateExcludeIfReachedFlag(experimentObject.partitions);
 
   // create experiment
-  await experimentService.create(experimentObject as any, user, new UpgradeLogger());
+  await experimentService.create(experimentObject, user, new UpgradeLogger());
   const experiments = await experimentService.find(new UpgradeLogger());
   expect(experiments).toEqual(
     expect.arrayContaining([

diff --git a/backend/packages/Upgrade/test/integration/ExperimentStats/WithinSubjectEnrollment.ts b/backend/packages/Upgrade/test/integration/ExperimentStats/WithinSubjectEnrollment.ts
@@ -28,7 +28,7 @@ export default async function testCase(): Promise<void> {
   experimentObject.partitions = updateExcludeIfReachedFlag(experimentObject.partitions);
 
   // create experiment
-  await experimentService.create(experimentObject as any, user, new UpgradeLogger());
+  await experimentService.create(experimentObject, user, new UpgradeLogger());
   const experiments = await experimentService.find(new UpgradeLogger());
   expect(experiments).toEqual(
     expect.arrayContaining([

diff --git a/backend/packages/Upgrade/test/integration/ExperimentUser/Scenario1A.ts b/backend/packages/Upgrade/test/integration/ExperimentUser/Scenario1A.ts
@@ -46,7 +46,7 @@ export default async function ExcludeGroupsA(): Promise<void> {
   experimentObject.partitions = updateExcludeIfReachedFlag(experimentObject.partitions);
 
   // create experiment
-  await experimentService.create(experimentObject as any, user, new UpgradeLogger());
+  await experimentService.create(experimentObject, user, new UpgradeLogger());
   const experiments = await experimentService.find(new UpgradeLogger());
   expect(experiments).toEqual(
     expect.arrayContaining([
@@ -141,7 +141,7 @@ export default async function ExcludeGroupsA(): Promise<void> {
       },
     },
   };
-  await experimentService.update(experimentObject as any, user, new UpgradeLogger());
+  await experimentService.update(experimentObject, user, new UpgradeLogger());
 
   // check stats
   stats = await analyticsService.getDetailEnrollment(experimentId);

diff --git a/backend/packages/Upgrade/test/integration/ExperimentUser/Scenario1B.ts b/backend/packages/Upgrade/test/integration/ExperimentUser/Scenario1B.ts
@@ -46,7 +46,7 @@ export default async function ExcludeGroupsB(): Promise<void> {
   experimentObject.partitions = updateExcludeIfReachedFlag(experimentObject.partitions);
 
   // create experiment
-  await experimentService.create(experimentObject as any, user, new UpgradeLogger());
+  await experimentService.create(experimentObject, user, new UpgradeLogger());
   const experiments = await experimentService.find(new UpgradeLogger());
   expect(experiments).toEqual(
     expect.arrayContaining([
@@ -142,7 +142,7 @@ export default async function ExcludeGroupsB(): Promise<void> {
       },
     },
   };
-  await experimentService.update(experimentObject as any, user, new UpgradeLogger());
+  await experimentService.update(experimentObject, user, new UpgradeLogger());
 
   // check stats
   stats = await analyticsService.getDetailEnrollment(experimentId);

diff --git a/backend/packages/Upgrade/test/integration/ExperimentUser/Scenario1C.ts b/backend/packages/Upgrade/test/integration/ExperimentUser/Scenario1C.ts
@@ -46,7 +46,7 @@ export default async function ExcludeGroupsC(): Promise<void> {
   experimentObject.partitions = updateExcludeIfReachedFlag(experimentObject.partitions);
 
   // create experiment
-  await experimentService.create(experimentObject as any, user, new UpgradeLogger());
+  await experimentService.create(experimentObject, user, new UpgradeLogger());
   const experiments = await experimentService.find(new UpgradeLogger());
   expect(experiments).toEqual(
     expect.arrayContaining([
@@ -142,7 +142,7 @@ export default async function ExcludeGroupsC(): Promise<void> {
       },
     },
   };
-  await experimentService.update(experimentObject as any, user, new UpgradeLogger());
+  await experimentService.update(experimentObject, user, new UpgradeLogger());
 
   // check stats
   stats = await analyticsService.getDetailEnrollment(experimentId);

diff --git a/backend/packages/Upgrade/test/integration/ExperimentUser/Scenario2A.ts b/backend/packages/Upgrade/test/integration/ExperimentUser/Scenario2A.ts
@@ -45,7 +45,7 @@ export default async function ExcludeIndividualsA(): Promise<void> {
   experimentObject.partitions = updateExcludeIfReachedFlag(experimentObject.partitions);
 
   // create experiment
-  await experimentService.create(experimentObject as any, user, new UpgradeLogger());
+  await experimentService.create(experimentObject, user, new UpgradeLogger());
   const experiments = await experimentService.find(new UpgradeLogger());
   expect(experiments).toEqual(
     expect.arrayContaining([
@@ -140,7 +140,7 @@ export default async function ExcludeIndividualsA(): Promise<void> {
       },
     },
   };
-  await experimentService.update(experimentObject as any, user, new UpgradeLogger());
+  await experimentService.update(experimentObject, user, new UpgradeLogger());
 
   // check stats
   stats = await analyticsService.getDetailEnrollment(experimentId);

diff --git a/backend/packages/Upgrade/test/integration/ExperimentUser/Scenario2B.ts b/backend/packages/Upgrade/test/integration/ExperimentUser/Scenario2B.ts
@@ -46,7 +46,7 @@ export default async function ExcludeIndividualsB(): Promise<void> {
   experimentObject.partitions = updateExcludeIfReachedFlag(experimentObject.partitions);
 
   // create experiment
-  await experimentService.create(experimentObject as any, user, new UpgradeLogger());
+  await experimentService.create(experimentObject, user, new UpgradeLogger());
   const experiments = await experimentService.find(new UpgradeLogger());
   expect(experiments).toEqual(
     expect.arrayContaining([
@@ -142,7 +142,7 @@ export default async function ExcludeIndividualsB(): Promise<void> {
       },
     },
   };
-  await experimentService.update(experimentObject as any, user, new UpgradeLogger());
+  await experimentService.update(experimentObject, user, new UpgradeLogger());
 
   // check stats
   stats = await analyticsService.getDetailEnrollment(experimentId);

diff --git a/backend/packages/Upgrade/test/integration/ExperimentUser/Scenario2C.ts b/backend/packages/Upgrade/test/integration/ExperimentUser/Scenario2C.ts
@@ -43,7 +43,7 @@ export default async function ExcludeIndividualsC(): Promise<void> {
   experimentObject.partitions = updateExcludeIfReachedFlag(experimentObject.partitions);
 
   // create experiment
-  await experimentService.create(experimentObject as any, user, new UpgradeLogger());
+  await experimentService.create(experimentObject, user, new UpgradeLogger());
   const experiments = await experimentService.find(new UpgradeLogger());
   expect(experiments).toEqual(
     expect.arrayContaining([
@@ -139,7 +139,7 @@ export default async function ExcludeIndividualsC(): Promise<void> {
       },
     },
   };
-  await experimentService.update(experimentObject as any, user, new UpgradeLogger());
+  await experimentService.update(experimentObject, user, new UpgradeLogger());
 
   // check stats
   stats = await analyticsService.getDetailEnrollment(experimentId);

diff --git a/backend/packages/Upgrade/test/integration/ExperimentUser/Scenario3A.ts b/backend/packages/Upgrade/test/integration/ExperimentUser/Scenario3A.ts
@@ -43,7 +43,7 @@ export default async function ExcludeGroupsC(): Promise<void> {
   experimentObject.partitions = updateExcludeIfReachedFlag(experimentObject.partitions);
 
   // create experiment
-  await experimentService.create(experimentObject as any, user, new UpgradeLogger());
+  await experimentService.create(experimentObject, user, new UpgradeLogger());
   const experiments = await experimentService.find(new UpgradeLogger());
   expect(experiments).toEqual(
     expect.arrayContaining([
@@ -139,7 +139,7 @@ export default async function ExcludeGroupsC(): Promise<void> {
       },
     },
   };
-  await experimentService.update(experimentObject as any, user, new UpgradeLogger());
+  await experimentService.update(experimentObject, user, new UpgradeLogger());
 
   // check stats
   stats = await analyticsService.getDetailEnrollment(experimentId);

diff --git a/backend/packages/Upgrade/test/integration/ExperimentUser/Scenario3B.ts b/backend/packages/Upgrade/test/integration/ExperimentUser/Scenario3B.ts
@@ -43,7 +43,7 @@ export default async function ExcludeGroupsB(): Promise<void> {
   experimentObject.partitions = updateExcludeIfReachedFlag(experimentObject.partitions);
 
   // create experiment
-  await experimentService.create(experimentObject as any, user, new UpgradeLogger());
+  await experimentService.create(experimentObject, user, new UpgradeLogger());
   const experiments = await experimentService.find(new UpgradeLogger());
   expect(experiments).toEqual(
     expect.arrayContaining([
@@ -139,7 +139,7 @@ export default async function ExcludeGroupsB(): Promise<void> {
       },
     },
   };
-  await experimentService.update(experimentObject as any, user, new UpgradeLogger());
+  await experimentService.update(experimentObject, user, new UpgradeLogger());
 
   // check stats
   stats = await analyticsService.getDetailEnrollment(experimentId);

diff --git a/backend/packages/Upgrade/test/integration/ExperimentUser/WorkingGroupChangeTest1.ts b/backend/packages/Upgrade/test/integration/ExperimentUser/WorkingGroupChangeTest1.ts
@@ -29,7 +29,7 @@ export default async function testCase(): Promise<void> {
   experimentObject.partitions = updateExcludeIfReachedFlag(experimentObject.partitions);
 
   // create experiment
-  await experimentService.create(experimentObject as any, user, new UpgradeLogger());
+  await experimentService.create(experimentObject, user, new UpgradeLogger());
   const experiments = await experimentService.find(new UpgradeLogger());
   expect(experiments).toEqual(
     expect.arrayContaining([

diff --git a/backend/packages/Upgrade/test/integration/ExperimentUser/WorkingGroupChangeTest2.ts b/backend/packages/Upgrade/test/integration/ExperimentUser/WorkingGroupChangeTest2.ts
@@ -29,7 +29,7 @@ export default async function testCase(): Promise<void> {
   experimentObject.partitions = updateExcludeIfReachedFlag(experimentObject.partitions);
 
   // create experiment
-  await experimentService.create(experimentObject as any, user, new UpgradeLogger());
+  await experimentService.create(experimentObject, user, new UpgradeLogger());
   const experiments = await experimentService.find(new UpgradeLogger());
   expect(experiments).toEqual(
     expect.arrayContaining([