refactor(GradingEditComponentMaxScore): get node and set max score di…

…rectly instead of calling function in TeacherProjectService (#1893)
WISE-Community · Aug 20, 2024 · 75b4575 · 75b4575
1 parent f58d4f8
commit 75b4575
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 57 deletions.
diff --git a/src/app/services/teacherProjectService.spec.ts b/src/app/services/teacherProjectService.spec.ts
@@ -50,7 +50,6 @@ describe('TeacherProjectService', () => {
     service.applicationNodes = [];
   });
   registerNewProject();
-  isNodeIdUsed();
   isNodeIdToInsertTargetNotSpecified();
   testGetNodeIdAfter();
   testCreateNodeAfter();
@@ -131,25 +130,6 @@ function registerNewProject() {
   });
 }
 
-function isNodeIdUsed() {
-  describe('isNodeIdUsed', () => {
-    beforeEach(() => {
-      service.setProject(demoProjectJSON);
-    });
-    it('should find used node id in active nodes', () => {
-      expect(service.isNodeIdUsed('node1')).toEqual(true);
-    });
-
-    it('should find used node id in inactive nodes', () => {
-      expect(service.isNodeIdUsed('node789')).toEqual(true);
-    });
-
-    it('should not find used node id in active or inactive nodes', () => {
-      expect(service.isNodeIdUsed('nodedoesnotexist')).toEqual(false);
-    });
-  });
-}
-
 function isNodeIdToInsertTargetNotSpecified() {
   describe('isNodeIdToInsertTargetNotSpecified', () => {
     it('should return true for null, inactive nodes, steps, and activities', () => {

diff --git a/...nents/grading-edit-component-max-score/grading-edit-component-max-score.component.spec.ts b/...nents/grading-edit-component-max-score/grading-edit-component-max-score.component.spec.ts
@@ -6,29 +6,35 @@ import { provideHttpClientTesting } from '@angular/common/http/testing';
 import { CopyNodesService } from '../../../services/copyNodesService';
 import { StudentTeacherCommonServicesModule } from '../../../../../app/student-teacher-common-services.module';
 import { provideHttpClient, withInterceptorsFromDi } from '@angular/common/http';
+import { Node } from '../../../common/Node';
 
 let component: GradingEditComponentMaxScoreComponent;
 let fixture: ComponentFixture<GradingEditComponentMaxScoreComponent>;
 let saveProjectSpy;
-let setMaxScoreForComponentSpy;
+let getNodeSpy;
 let projectService: TeacherProjectService;
 
 describe('GradingEditComponentMaxScoreComponent', () => {
   beforeEach(() => {
     TestBed.configureTestingModule({
-    declarations: [GradingEditComponentMaxScoreComponent],
-    schemas: [NO_ERRORS_SCHEMA],
-    imports: [StudentTeacherCommonServicesModule],
-    providers: [CopyNodesService, TeacherProjectService, provideHttpClient(withInterceptorsFromDi()), provideHttpClientTesting()]
-});
+      declarations: [GradingEditComponentMaxScoreComponent],
+      schemas: [NO_ERRORS_SCHEMA],
+      imports: [StudentTeacherCommonServicesModule],
+      providers: [
+        CopyNodesService,
+        TeacherProjectService,
+        provideHttpClient(withInterceptorsFromDi()),
+        provideHttpClientTesting()
+      ]
+    });
     projectService = TestBed.inject(TeacherProjectService);
     fixture = TestBed.createComponent(GradingEditComponentMaxScoreComponent);
     component = fixture.componentInstance;
+    component.componentId = 'c1';
     saveProjectSpy = spyOn(projectService, 'saveProject').and.callFake(() => new Promise(() => {}));
-    setMaxScoreForComponentSpy = spyOn(
-      projectService,
-      'setMaxScoreForComponent'
-    ).and.callFake(() => {});
+    const node = new Node();
+    node.components = [{ id: 'c1' }];
+    getNodeSpy = spyOn(projectService, 'getNode').and.returnValue(node);
   });
   saveMaxScore();
 });
@@ -48,13 +54,13 @@ function saveMaxScore() {
 
 function shouldSave(maxScore: number) {
   setMaxScoreAndSave(maxScore);
-  expect(setMaxScoreForComponentSpy).toHaveBeenCalled();
+  expect(getNodeSpy).toHaveBeenCalled();
   expect(saveProjectSpy).toHaveBeenCalled();
 }
 
 function shouldNotSave(maxScore: number) {
   setMaxScoreAndSave(maxScore);
-  expect(setMaxScoreForComponentSpy).not.toHaveBeenCalled();
+  expect(getNodeSpy).not.toHaveBeenCalled();
   expect(saveProjectSpy).not.toHaveBeenCalled();
 }
 

diff --git a/...Components/grading-edit-component-max-score/grading-edit-component-max-score.component.ts b/...Components/grading-edit-component-max-score/grading-edit-component-max-score.component.ts
@@ -5,9 +5,14 @@ import { TeacherProjectService } from '../../../services/teacherProjectService';
 
 @Component({
   selector: 'grading-edit-component-max-score',
-  styles: [`
-/* TODO(mdc-migration): The following rule targets internal classes of form-field that may no longer apply for the MDC version. */
-.mat-form-field-infix { width: inherit; }`],
+  styles: [
+    `
+      /* TODO(mdc-migration): The following rule targets internal classes of form-field that may no longer apply for the MDC version. */
+      .mat-form-field-infix {
+        width: inherit;
+      }
+    `
+  ],
   templateUrl: 'grading-edit-component-max-score.component.html',
   encapsulation: ViewEncapsulation.None
 })
@@ -37,7 +42,7 @@ export class GradingEditComponentMaxScoreComponent {
   saveMaxScore(): void {
     const maxScore = Number(this.maxScore);
     if (maxScore >= 0) {
-      this.projectService.setMaxScoreForComponent(this.nodeId, this.componentId, maxScore);
+      this.projectService.getNode(this.nodeId).getComponent(this.componentId).maxScore = maxScore;
       this.projectService.saveProject();
       this.maxScore = this.maxScore || 0;
     }

diff --git a/src/assets/wise5/services/teacherProjectService.ts b/src/assets/wise5/services/teacherProjectService.ts
@@ -207,20 +207,6 @@ export class TeacherProjectService extends ProjectService {
     return false;
   }
 
-  /**
-   * Check if a node id is already being used in the project
-   * @param nodeId check if this node id is already being used in the project
-   * @return whether the node id is already being used in the project
-   */
-  isNodeIdUsed(nodeId) {
-    for (const node of this.getNodes().concat(this.getInactiveNodes())) {
-      if (node.id === nodeId) {
-        return true;
-      }
-    }
-    return false;
-  }
-
   /**
    * Set a field in the transition logic of a node
    */
@@ -1738,13 +1724,6 @@ export class TeacherProjectService extends ProjectService {
     }
   }
 
-  setMaxScoreForComponent(nodeId: string, componentId: string, maxScore: number): void {
-    const component = this.getComponent(nodeId, componentId);
-    if (component != null) {
-      component.maxScore = maxScore;
-    }
-  }
-
   hasGroupStartId(nodeId) {
     const startId = this.getGroupStartId(nodeId);
     return startId != null && startId != '';