fix(Constraint): Multiple Choice constraint with multiple choices

src/app/services/multipleChoiceService.spec.ts

@@ -134,7 +134,7 @@ function isChoicesSelected() {
   });
   it(`should check if choices are selected when constraint choice ids is a string and the constraint
       choice id is selected along with another choice`, () => {
-    expectIsChoicesSelected([choiceId1, choiceId3], choiceId3, false);
+    expectIsChoicesSelected([choiceId1, choiceId3], choiceId3, true);
   });
   it(`should check if choices are selected when constraint choice ids is a string and only the
       constraint choice id is selected`, () => {

src/assets/wise5/common/constraint/strategies/ChoiceChosenConstraintStrategy.spec.ts

@@ -3,10 +3,13 @@ import { StudentDataService } from '../../../services/studentDataService';
 import { ChoiceChosenConstraintStrategy } from './ChoiceChosenConstraintStrategy';
 import { HttpClientTestingModule } from '@angular/common/http/testing';
 import { StudentTeacherCommonServicesModule } from '../../../../../app/student-teacher-common-services.module';
+import { ComponentServiceLookupServiceModule } from '../../../services/componentServiceLookupServiceModule';
+import { ComponentServiceLookupService } from '../../../services/componentServiceLookupService';
 
 const choiceId1 = 'choice1';
 const choiceId2 = 'choice2';
 const choiceId3 = 'choice3';
+let componentServiceLookupService: ComponentServiceLookupService;
 let dataService: StudentDataService;
 let getLatestComponentStateSpy: jasmine.Spy;
 let strategy: ChoiceChosenConstraintStrategy;
@@ -25,9 +28,15 @@ const criteria = {
 describe('ChoiceChosenConstraintStrategy', () => {
   beforeEach(() => {
     TestBed.configureTestingModule({
-      imports: [HttpClientTestingModule, StudentTeacherCommonServicesModule]
+      imports: [
+        ComponentServiceLookupServiceModule,
+        HttpClientTestingModule,
+        StudentTeacherCommonServicesModule
+      ]
     });
     strategy = new ChoiceChosenConstraintStrategy();
+    componentServiceLookupService = TestBed.inject(ComponentServiceLookupService);
+    strategy.componentServiceLookupService = componentServiceLookupService;
     dataService = TestBed.inject(StudentDataService);
     strategy.dataService = dataService;
     getLatestComponentStateSpy = spyOn(
@@ -70,7 +79,7 @@ function oneChoiceChosen(): void {
 }
 
 function multipleChoicesChosen(): void {
-  describe('multipe choices are chosen', () => {
+  describe('multiple choices are chosen', () => {
     describe('the expected choice is not chosen', () => {
       it('returns false', () => {
         setStudentChoicesEvaluateAndExpect([choice2, choice3], false);

src/assets/wise5/common/constraint/strategies/ChoiceChosenConstraintStrategy.ts

@@ -2,17 +2,11 @@ import { AbstractConstraintStrategy } from './AbstractConstraintStrategy';
 
 export class ChoiceChosenConstraintStrategy extends AbstractConstraintStrategy {
   evaluate(criteria: any): boolean {
+    const service = this.componentServiceLookupService.getService('MultipleChoice');
     const latestComponentState = this.dataService.getLatestComponentStateByNodeIdAndComponentId(
       criteria.params.nodeId,
       criteria.params.componentId
     );
-    return latestComponentState != null && this.isChoiceChosen(criteria, latestComponentState);
-  }
-
-  private isChoiceChosen(criteria: any, componentState: any): boolean {
-    const studentChoiceIds = componentState.studentData.studentChoices.map(
-      (choice: any) => choice.id
-    );
-    return studentChoiceIds.includes(criteria.params.choiceIds);
+    return latestComponentState != null && service.choiceChosen(criteria, latestComponentState);
   }
 }

src/assets/wise5/components/multipleChoice/multipleChoiceService.ts

@@ -35,9 +35,11 @@ export class MultipleChoiceService extends ComponentService {
     studentChoiceIds: string[],
     constraintChoiceIds: string | string[]
   ): boolean {
-    return typeof constraintChoiceIds === 'string'
-      ? studentChoiceIds.length === 1 && studentChoiceIds[0] === constraintChoiceIds
-      : arraysContainSameValues(studentChoiceIds, constraintChoiceIds);
+    if (constraintChoiceIds instanceof Array) {
+      return arraysContainSameValues(studentChoiceIds, constraintChoiceIds);
+    } else {
+      return studentChoiceIds.includes(constraintChoiceIds);
+    }
   }
 
   isCompleted(component: any, componentStates: any[], nodeEvents: any[], node: any) {