Fixed the models removals, by correction of the analysis removal and …

…the query to fetch only active models.
monarc-project · Dec 6, 2024 · c0305a5 · c0305a5
1 parent 82b1423
commit c0305a5
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/src/Entity/Model.php b/src/Entity/Model.php
@@ -123,7 +123,7 @@ public function getAnr(): ?Anr
         return $this->anr;
     }
 
-    public function setAnr(Anr $anr): self
+    public function setAnr(?Anr $anr): self
     {
         $this->anr = $anr;
 

diff --git a/src/Service/ModelService.php b/src/Service/ModelService.php
@@ -148,8 +148,10 @@ public function delete(int $id): void
         /** @var Model $model */
         $model = $this->modelTable->findById($id);
         $model->setStatus(Model::STATUS_DELETED);
+        $anr = $model->getAnr();
+        $model->setAnr(null);
 
-        $this->anrTable->remove($model->getAnr(), false);
+        $this->anrTable->remove($anr);
 
         $this->modelTable->save($model);
     }

diff --git a/src/Table/ModelTable.php b/src/Table/ModelTable.php
@@ -56,11 +56,12 @@ public function findGenericsAndSpecificsByIds(array $specificModelsIds = []): ar
     {
         $queryBuilder = $this->getRepository()->createQueryBuilder('m')
             ->where('m.isGeneric = 1')
-            ->andWhere('m.anr IS NOT NULL');
+            ->andWhere('m.status = ' . Model::STATUS_ACTIVE);
 
         if (!empty($specificModelsIds)) {
             $queryBuilder->orWhere($queryBuilder->expr()->andX(
                 $queryBuilder->expr()->eq('m.isGeneric', 0),
+                $queryBuilder->expr()->eq('m.status', Model::STATUS_ACTIVE),
                 $queryBuilder->expr()->in('m.id', array_map('\intval', $specificModelsIds))
             ));
         }