Fix sonar code smells

puzzle · Jun 6, 2024 · 244bbe2 · 244bbe2
1 parent 87f9b07
commit 244bbe2
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 9 deletions.
diff --git a/backend/src/test/java/ch/puzzle/okr/service/business/AlignmentBusinessServiceIT.java b/backend/src/test/java/ch/puzzle/okr/service/business/AlignmentBusinessServiceIT.java
@@ -15,14 +15,16 @@ class AlignmentBusinessServiceIT {
     @Autowired
     private AlignmentBusinessService alignmentBusinessService;
 
+    private final String OBJECTIVE = "objective";
+
     @Test
     void shouldReturnCorrectAlignmentData() {
         AlignmentLists alignmentLists = alignmentBusinessService.getAlignmentsByFilters(9L, List.of(5L, 6L), "");
 
         assertEquals(6, alignmentLists.alignmentObjectDtoList().size());
         assertEquals(4, alignmentLists.alignmentConnectionDtoList().size());
         assertEquals(40L, alignmentLists.alignmentObjectDtoList().get(0).objectId());
-        assertEquals("objective", alignmentLists.alignmentObjectDtoList().get(0).objectType());
+        assertEquals(OBJECTIVE, alignmentLists.alignmentObjectDtoList().get(0).objectType());
         assertEquals(40L, alignmentLists.alignmentObjectDtoList().get(1).objectId());
         assertEquals("keyResult", alignmentLists.alignmentObjectDtoList().get(1).objectType());
         assertEquals(41L, alignmentLists.alignmentObjectDtoList().get(2).objectId());
@@ -50,9 +52,9 @@ void shouldReturnCorrectAlignmentDataWhenLimitedTeamMatching() {
         assertEquals(2, alignmentLists.alignmentObjectDtoList().size());
         assertEquals(1, alignmentLists.alignmentConnectionDtoList().size());
         assertEquals(44L, alignmentLists.alignmentObjectDtoList().get(0).objectId());
-        assertEquals("objective", alignmentLists.alignmentObjectDtoList().get(0).objectType());
+        assertEquals(OBJECTIVE, alignmentLists.alignmentObjectDtoList().get(0).objectType());
         assertEquals(42L, alignmentLists.alignmentObjectDtoList().get(1).objectId());
-        assertEquals("objective", alignmentLists.alignmentObjectDtoList().get(1).objectType());
+        assertEquals(OBJECTIVE, alignmentLists.alignmentObjectDtoList().get(1).objectType());
         assertEquals(44L, alignmentLists.alignmentConnectionDtoList().get(0).alignedObjectiveId());
         assertEquals(42L, alignmentLists.alignmentConnectionDtoList().get(0).targetObjectiveId());
         assertNull(alignmentLists.alignmentConnectionDtoList().get(0).targetKeyResultId());
@@ -66,11 +68,11 @@ void shouldReturnCorrectAlignmentDataWithObjectiveSearch() {
         assertEquals(3, alignmentLists.alignmentObjectDtoList().size());
         assertEquals(2, alignmentLists.alignmentConnectionDtoList().size());
         assertEquals(42L, alignmentLists.alignmentObjectDtoList().get(0).objectId());
-        assertEquals("objective", alignmentLists.alignmentObjectDtoList().get(0).objectType());
+        assertEquals(OBJECTIVE, alignmentLists.alignmentObjectDtoList().get(0).objectType());
         assertEquals(40L, alignmentLists.alignmentObjectDtoList().get(1).objectId());
-        assertEquals("objective", alignmentLists.alignmentObjectDtoList().get(1).objectType());
+        assertEquals(OBJECTIVE, alignmentLists.alignmentObjectDtoList().get(1).objectType());
         assertEquals(44L, alignmentLists.alignmentObjectDtoList().get(2).objectId());
-        assertEquals("objective", alignmentLists.alignmentObjectDtoList().get(2).objectType());
+        assertEquals(OBJECTIVE, alignmentLists.alignmentObjectDtoList().get(2).objectType());
         assertEquals(42L, alignmentLists.alignmentConnectionDtoList().get(0).alignedObjectiveId());
         assertEquals(40L, alignmentLists.alignmentConnectionDtoList().get(0).targetObjectiveId());
         assertNull(alignmentLists.alignmentConnectionDtoList().get(0).targetKeyResultId());
@@ -87,7 +89,7 @@ void shouldReturnCorrectAlignmentDataWithKeyResultWhenMatchingObjectiveSearch()
         assertEquals(2, alignmentLists.alignmentObjectDtoList().size());
         assertEquals(1, alignmentLists.alignmentConnectionDtoList().size());
         assertEquals(43L, alignmentLists.alignmentObjectDtoList().get(0).objectId());
-        assertEquals("objective", alignmentLists.alignmentObjectDtoList().get(0).objectType());
+        assertEquals(OBJECTIVE, alignmentLists.alignmentObjectDtoList().get(0).objectType());
         assertEquals(40L, alignmentLists.alignmentObjectDtoList().get(1).objectId());
         assertEquals("keyResult", alignmentLists.alignmentObjectDtoList().get(1).objectType());
         assertEquals(43L, alignmentLists.alignmentConnectionDtoList().get(0).alignedObjectiveId());

diff --git a/frontend/src/app/diagram/diagram.component.ts b/frontend/src/app/diagram/diagram.component.ts
@@ -1,5 +1,5 @@
 import { AfterViewInit, Component, Input, OnDestroy } from '@angular/core';
-import { forkJoin, map, Observable, Subject } from 'rxjs';
+import { map, Observable, Subject, zip } from 'rxjs';
 import { AlignmentLists } from '../shared/types/model/AlignmentLists';
 import cytoscape from 'cytoscape';
 import {
@@ -227,7 +227,7 @@ export class DiagramComponent implements AfterViewInit, OnDestroy {
       }
     });
 
-    forkJoin(observableArray).subscribe(() => {
+    zip(observableArray).subscribe(() => {
       this.generateConnections(alignmentData, diagramElements);
     });
   }