Add inherited vvt to descendant team dashboards

Also adds all related entities to dashboard network: - DSFA - TOM - Kontakte - Datenweitergabe - Auftragsverarbeitung - Richtlinie - Software
H2-invent · Jul 24, 2023 · cf8a59b · cf8a59b
1 parent 58a4f80
commit cf8a59b
Show file tree

Hide file tree

Showing 6 changed files with 48 additions and 23 deletions.
diff --git a/src/Controller/DashboardController.php b/src/Controller/DashboardController.php
@@ -79,22 +79,23 @@ public function dashboard(Request                     $request,
                 return $this->redirectToRoute('no_team');
             }
         }
+        $teamPath = $teamRepository->getPath($currentTeam);
 
         $audit = $auditRepository->findAllByTeam($currentTeam);
-        $daten = $transferRepository->findActiveTransfersByTeam($currentTeam);
-        $av = $transferRepository->findActiveOrderProcessingsByTeam($currentTeam);
-        $vvt = $procedureRepository->findActiveByTeam($currentTeam);
-        $vvtDsfa = $impactAssessmentRepository->findActiveByTeam($currentTeam);
-        $kontakte = $contactRepository->findActiveByTeam($currentTeam);
-        $tom = $tomRepository->findActiveByTeam($currentTeam);
+        $daten = $transferRepository->findActiveTransfersByTeamPath($teamPath);
+        $av = $transferRepository->findActiveOrderProcessingsByTeamPath($teamPath);
+        $vvt = $procedureRepository->findActiveByTeamPath($teamPath);
+        $vvtDsfa = $impactAssessmentRepository->findActiveByTeamPath($teamPath);
+        $kontakte = $contactRepository->findActiveByTeamPath($teamPath);
+        $tom = $tomRepository->findActiveByTeamPath($teamPath);
         $forms = $formRepository->findPublicByTeam($currentTeam);
-        $policies = $policyRepository->findPublicByTeam($currentTeam);
-        $software = $softwareRepository->findActiveByTeam($currentTeam);
+        $policies = $policyRepository->findPublicByTeamPath($teamPath);
+        $software = $softwareRepository->findActiveByTeamPath($teamPath);
         $tasks = $taskRepository->findActiveAndOpenByTeam($currentTeam);
         $loeschkonzepte = $deletionConceptRepository->findByTeam($currentTeam);
         $vvtdatenkategorien = $dataCategoryRepository->findByTeam($currentTeam);
         $kritischeAudits = $auditRepository->findCriticalByTeam($currentTeam);
-        $kritischeVvts = $procedureRepository->findCriticalByTeam($currentTeam);
+        $kritischeVvts = $procedureRepository->findCriticalByTeamPath($teamPath);
         $openDsfa = $impactAssessmentRepository->findActiveAndOpenByTeam($currentTeam);
         $buchungen = $bookingRepository->findActiveByUser($user);
 

diff --git a/src/Repository/DatenweitergabeRepository.php b/src/Repository/DatenweitergabeRepository.php
@@ -42,34 +42,34 @@ public function findActiveByTeamPath(array $teamPath)
     }
 
     /**
-     * @param $value
+     * @param array $teamPath
      * @return int|mixed|string
      * find transfers of type Datenweitergabe
      */
-    public function findActiveTransfersByTeam($value)
+    public function findActiveTransfersByTeamPath(array $teamPath): mixed
     {
         return $this->createQueryBuilder('a')
-            ->andWhere('a.team = :val')
+            ->andWhere('a.team IN (:teamPath)')
             ->andWhere('a.activ = 1')
             ->andWhere('a.art = 1')
-            ->setParameter('val', $value)
+            ->setParameter('teamPath', $teamPath)
             ->getQuery()
             ->getResult()
             ;
     }
 
     /**
-     * @param $value
+     * @param array $teamPath
      * @return int|mixed|string
      * find transfers of type Auftragsverarbeitung
      */
-    public function findActiveOrderProcessingsByTeam($value)
+    public function findActiveOrderProcessingsByTeamPath(array $teamPath): mixed
     {
         return $this->createQueryBuilder('a')
-            ->andWhere('a.team = :val')
+            ->andWhere('a.team IN (:teamPath)')
             ->andWhere('a.activ = 1')
             ->andWhere('a.art = 2')
-            ->setParameter('val', $value)
+            ->setParameter('teamPath', $teamPath)
             ->getQuery()
             ->getResult()
             ;

diff --git a/src/Repository/KontakteRepository.php b/src/Repository/KontakteRepository.php
@@ -58,4 +58,15 @@ public function findActiveByTeam($value)
             ->getResult()
             ;
     }
+
+    public function findActiveByTeamPath(array $teamPath)
+    {
+        return $this->createQueryBuilder('a')
+            ->andWhere('a.team IN (:teamPath)')
+            ->andWhere('a.activ = 1')
+            ->setParameter('teamPath', $teamPath)
+            ->getQuery()
+            ->getResult()
+            ;
+    }
 }
diff --git a/src/Repository/PoliciesRepository.php b/src/Repository/PoliciesRepository.php
@@ -29,13 +29,13 @@ public function findActiveByTeam($value)
             ->getResult();
     }
 
-    public function findPublicByTeam($value)
+    public function findPublicByTeamPath(array $teamPath)
     {
         return $this->createQueryBuilder('a')
-            ->andWhere('a.team = :val')
+            ->andWhere('a.team IN (:teamPath)')
             ->andWhere('a.activ = 1')
             ->andWhere('a.status != 4')
-            ->setParameter('val', $value)
+            ->setParameter('teamPath', $teamPath)
             ->getQuery()
             ->getResult();
     }

diff --git a/src/Repository/VVTDsfaRepository.php b/src/Repository/VVTDsfaRepository.php
@@ -32,6 +32,19 @@ public function findActiveByTeam($value)
             ;
     }
 
+    public function findActiveByTeamPath(array $teamPath)
+    {
+        return $this->createQueryBuilder('a')
+            ->innerJoin('a.vvt', 'v')
+            ->andWhere('a.activ = 1')
+            ->andWhere('v.team IN (:teamPath)')
+            ->andWhere('v.activ = 1')
+            ->setParameter('teamPath', $teamPath)
+            ->getQuery()
+            ->getResult()
+            ;
+    }
+
     public function findActiveAndOpenByTeam($team) {
         return $this->createQueryBuilder('dsfa')
             ->innerJoin('dsfa.vvt', 'vvt')

diff --git a/src/Repository/VVTRepository.php b/src/Repository/VVTRepository.php
@@ -44,13 +44,13 @@ public function findActiveByTeamPath(array $teamPath)
             ;
     }
 
-    public function findCriticalByTeam(Team $team) {
+    public function findCriticalByTeamPath(array $teamPath) {
         return $this->createQueryBuilder('vvt')
-            ->andWhere('vvt.team = :team')
+            ->andWhere('vvt.team IN (:teamPath)')
             ->andWhere('vvt.activ = 1')
             ->andWhere('vvt.status = 3')
             ->orderBy('vvt.CreatedAt', 'DESC')
-            ->setParameter('team', $team)
+            ->setParameter('teamPath', $teamPath)
             ->getQuery()
             ->getResult();
     }