Scope, coherence, and misc (found by stan)

libertempo · May 24, 2018 · f0c0f6e · f0c0f6e
1 parent 3d2cb5e
commit f0c0f6e
Show file tree

Hide file tree

Showing 9 changed files with 18 additions and 20 deletions.
diff --git a/Absence/Type/TypeController.php b/Absence/Type/TypeController.php
@@ -70,7 +70,6 @@ private function getOne(IResponse $response, int $id) : IResponse
      * @param IResponse $response Réponse Http
      *
      * @return IResponse
-     * @throws \Exception en cas d'erreur inconnue (fallback, ne doit pas arriver)
      */
     private function getList(IRequest $request, IResponse $response)
     {

diff --git a/Groupe/Employe/EmployeRepository.php b/Groupe/Employe/EmployeRepository.php
@@ -43,7 +43,7 @@ public function getList(array $parametres) : array
     {
         $this->queryBuilder->select('users.*, users.u_login AS id');
         $this->queryBuilder->innerJoin('current', 'conges_users', 'users', 'current.gu_login = u_login');
-        $this->setWhere($parametres);
+        $this->setWhere($this->getParamsConsumer2Storage($parametres));
         $res = $this->queryBuilder->execute();
 
         $data = $res->fetchAll(\PDO::FETCH_ASSOC);

diff --git a/Groupe/GrandResponsable/GrandResponsableRepository.php b/Groupe/GrandResponsable/GrandResponsableRepository.php
@@ -30,7 +30,7 @@ public function getList(array $parametres) : array
     {
         $this->queryBuilder->select('users.*, users.u_login AS id');
         $this->queryBuilder->innerJoin('current', 'conges_users', 'users', 'current.ggr_login = u_login');
-        $this->setWhere($parametres);
+        $this->setWhere($this->getParamsConsumer2Storage($parametres));
         $res = $this->queryBuilder->execute();
 
         $data = $res->fetchAll(\PDO::FETCH_ASSOC);

diff --git a/Groupe/Responsable/ResponsableRepository.php b/Groupe/Responsable/ResponsableRepository.php
@@ -35,7 +35,7 @@ public function getList(array $parametres) : array
     {
         $this->queryBuilder->select('users.*, users.u_login AS id');
         $this->queryBuilder->innerJoin('current', 'conges_users', 'users', 'current.gr_login = u_login');
-        $this->setWhere($parametres);
+        $this->setWhere($this->getParamsConsumer2Storage($parametres));
         $res = $this->queryBuilder->execute();
 
         $data = $res->fetchAll(\PDO::FETCH_ASSOC);

diff --git a/Planning/Creneau/CreneauController.php b/Planning/Creneau/CreneauController.php
@@ -38,22 +38,21 @@ public function get(IRequest $request, IResponse $response, array $arguments) :
             return $this->getList($response, (int) $arguments['planningId']);
         }
 
-        return $this->getOne($response, (int) $arguments['creneauId'], (int) $arguments['planningId']);
+        return $this->getOne($response, (int) $arguments['creneauId']);
     }
 
     /**
      * Retourne un élément unique
      *
      * @param IResponse $response Réponse Http
      * @param int $id ID de l'élément
-     * @param int $planningId Contrainte de recherche sur le planning
      *
      * @return IResponse, 404 si l'élément n'est pas trouvé, 200 sinon
      */
-    private function getOne(IResponse $response, $id, $planningId)
+    private function getOne(IResponse $response, $id)
     {
         try {
-            $creneau = $this->repository->getOne($id, $planningId);
+            $creneau = $this->repository->getOne($id);
         } catch (\DomainException $e) {
             return $this->getResponseNotFound($response, 'Element « creneaux#' . $id . ' » is not a valid resource');
         } catch (\Exception $e) {
@@ -159,9 +158,8 @@ public function put(IRequest $request, IResponse $response, array $arguments) :
         }
 
         $id = (int) $arguments['creneauId'];
-        $planningId = (int) $arguments['planningId'];
         try {
-            $creneau = $this->repository->getOne($id, $planningId);
+            $creneau = $this->repository->getOne($id);
         } catch (\DomainException $e) {
             return $this->getResponseNotFound($response, 'Element « creneau#' . $id . ' » is not a valid resource');
         } catch (\Exception $e) {

diff --git a/Tools/Libraries/ARepository.php b/Tools/Libraries/ARepository.php
@@ -2,6 +2,7 @@
 namespace LibertAPI\Tools\Libraries;
 
 use Doctrine\DBAL\Driver;
+use Doctrine\DBAL\Query\QueryBuilder;
 
 /**
  * Garant de la cohérence métier de l'entité en relation.
@@ -31,7 +32,7 @@ public function __construct(Driver\Connection $storageConnector)
     protected $storageConnector;
 
     /**
-    * @var Query\QueryBuilder
+    * @var QueryBuilder
     */
     protected $queryBuilder;
 
@@ -56,7 +57,7 @@ public function getOne(int $id) : AEntite
 
         $entiteClass = $this->getEntiteClass();
 
-        return new  $entiteClass($this->getStorage2Entite($data));
+        return new $entiteClass($this->getStorage2Entite($data));
     }
 
     /**
@@ -70,7 +71,7 @@ public function getOne(int $id) : AEntite
     public function getList(array $parametres) : array
     {
         $this->queryBuilder->select('*');
-        $this->setWhere($parametres);
+        $this->setWhere($this->getParamsConsumer2Storage($parametres));
         $res = $this->queryBuilder->execute();
 
         $data = $res->fetchAll(\PDO::FETCH_ASSOC);
@@ -128,7 +129,7 @@ public function postOne(array $data, AEntite $entite) : int
         $this->setValues($this->getEntite2Storage($entite));
         $this->queryBuilder->execute();
 
-        return $this->storageConnector->lastInsertId();
+        return (int) $this->storageConnector->lastInsertId();
     }
 
     /**
@@ -194,23 +195,23 @@ abstract protected function getTableName() : string;
     /**
      * Initie une transaction
      */
-    private function beginTransaction() : bool
+    final protected function beginTransaction() : bool
     {
         return $this->storageConnector->beginTransaction();
     }
 
     /**
      * Valide une transaction
      */
-    private function commit() : bool
+    final protected function commit() : bool
     {
         return $this->storageConnector->commit();
     }
 
     /**
      * Annule une transaction
      */
-    private function rollback() : bool
+    final protected function rollback() : bool
     {
         return $this->storageConnector->rollBack();
     }

diff --git a/Tools/Middlewares/Identification.php b/Tools/Middlewares/Identification.php
@@ -30,7 +30,8 @@ public function __construct(IRequest $request, \LibertAPI\Tools\Libraries\ARepos
         try {
             $this->utilisateur = $repository->find([
                 'token' => $token,
-                'gt_date_last_access' => $this->getDateLastAccessAuthorized()
+                'gt_date_last_access' => $this->getDateLastAccessAuthorized(),
+                'isActif' => true,
             ]);
         } catch (\UnexpectedValueException $e) {
             return;

diff --git a/Utilisateur/UtilisateurEntite.php b/Utilisateur/UtilisateurEntite.php
@@ -2,7 +2,6 @@
 namespace LibertAPI\Utilisateur;
 
 use LibertAPI\Tools\Exceptions\MissingArgumentException;
-
 use LibertAPI\Tools\Helpers\Formatter;
 
 /**

diff --git a/Utilisateur/UtilisateurRepository.php b/Utilisateur/UtilisateurRepository.php
@@ -63,7 +63,7 @@ public function find(array $parametres)
     public function getList(array $parametres) : array
     {
         $this->queryBuilder->select('*, u_login AS id');
-        $this->setWhere($parametres);
+        $this->setWhere($this->getParamsConsumer2Storage($parametres));
         $res = $this->queryBuilder->execute();
         $data = $res->fetchAll(\PDO::FETCH_ASSOC);