optimisation UserController::existUsers, gestion des $response par le routeur, erreur article déjà supprimé

3 files changed, 13 insertions, 6 deletions

diff --git a/src/controller/ArticleController.php b/src/controller/ArticleController.php
index a982d8c..71bfdc3 100644
--- a/src/controller/ArticleController.php
+++ b/src/controller/ArticleController.php
@@ -101,7 +101,11 @@ class ArticleController
         static public function deleteArticle(EntityManager $entityManager, array $json): Response
         {
                 $director = new Director($entityManager);
-                $director->makeArticleNode($json['id'], true);
+                if(!$director->makeArticleNode($json['id'], true)){
+                        return new Response(
+                        '{"success": false, "message": "Erreur: pas d\'article à supprimer"}',
+                Response::HTTP_INTERNAL_SERVER_ERROR); // 500
+                }
             $article = $director->getArticleNode();
                 $section = $director->getNode();
 
diff --git a/src/controller/CalendarController.php b/src/controller/CalendarController.php
index cc37d0f..b60ff11 100644
--- a/src/controller/CalendarController.php
+++ b/src/controller/CalendarController.php
@@ -52,6 +52,7 @@ class CalendarController
             $entityManager->flush();
                 
                 echo json_encode(['success' => true, 'id' => $event->getId()]);
+                die;
         }
         static public function updateEvent(array $json, EntityManager $entityManager):void
         {
@@ -67,6 +68,7 @@ class CalendarController
             $entityManager->flush();
 
                 echo json_encode(['success' => true]);
+                die;
         }
         static public function removeEvent(array $json, EntityManager $entityManager):void
         {
@@ -75,5 +77,6 @@ class CalendarController
             $entityManager->flush();
 
                 echo json_encode(['success' => true]);
+                die;
         }
 }
\ No newline at end of file
diff --git a/src/controller/UserController.php b/src/controller/UserController.php
index 1acb4d5..a35b09e 100644
--- a/src/controller/UserController.php
+++ b/src/controller/UserController.php
@@ -22,14 +22,14 @@ class UserController
         // account
         static public function existUsers(EntityManager $entityManager): bool
         {
-            // optimiser ça si possible, on veut juste savoir si la table est vide ou non
-                $users = $entityManager->getRepository(User::class)->findAll();
-                
-                if(count($users) === 0) // table vide
+                $nb_users = $entityManager
+                        ->createQuery('SELECT COUNT(u.id_user) FROM App\Entity\User u')
+                        ->getSingleScalarResult();
+
+                if($nb_users === 0) // table vide
                 {
                         $_SESSION['user'] = '';
                         $_SESSION['admin'] = false;
-
                         return false;
                 }
                 else{