Reuse getVacationsProjectId() inside getVacationsDates().

We simplify our code and remove one use of the VACATIONS_PROJECT config parameter, which we may want to get rid of later.
Igalia · Mar 30, 2022 · aa29fc5 · aa29fc5
1 parent 650b8ef
commit aa29fc5
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 6 deletions.
diff --git a/model/dao/TaskDAO/PostgreSQLTaskDAO.php b/model/dao/TaskDAO/PostgreSQLTaskDAO.php
@@ -621,8 +621,10 @@ public function getVacations(UserVO $userVO, DateTime $initDate = NULL, DateTime
 
     }
 
-    public function getVacationsDates(UserVO $userVO, int $projectId = NULL, DateTime $initDate = NULL, DateTime $endDate = NULL): array
+    public function getVacationsDates(UserVO $userVO, DateTime $initDate = NULL, DateTime $endDate = NULL): array
     {
+        $projectId = $this->getVacationsProjectId();
+
         if (is_null($projectId)) {
             return [];
         }

diff --git a/model/dao/TaskDAO/TaskDAO.php b/model/dao/TaskDAO/TaskDAO.php
@@ -258,7 +258,7 @@ public abstract function getProjectUserWeeklyWorkingHours(ProjectVO $project, Da
      */
     public abstract function getVacations(UserVO $userVO, DateTime $initDate = NULL, DateTime $endDate = NULL);
 
-    public abstract function getVacationsDates(UserVO $userVO, int $projectId = NULL, DateTime $initDate = NULL, DateTime $endDate = NULL): array;
+    public abstract function getVacationsDates(UserVO $userVO, DateTime $initDate = NULL, DateTime $endDate = NULL): array;
 
     /** Task partial updater for PostgreSQL.
      *

diff --git a/model/facade/action/GetScheduledHolidaysAction.php b/model/facade/action/GetScheduledHolidaysAction.php
@@ -45,7 +45,6 @@ protected function doExecute(): array
 
         $taskDao = DAOFactory::getTaskDAO();
         $userDao = DAOFactory::getUserDAO();
-        $projectDao = DAOFactory::getProjectDAO();
 
         if (is_null($this->user)) {
             return [];
@@ -58,12 +57,10 @@ protected function doExecute(): array
         } else
             if (is_null($this->user->getId()))
             $this->user = $userDao->getByUserLogin($this->user->getLogin());
-
-        $projectId = $projectDao->getByDescription(ConfigurationParametersManager::getParameter('VACATIONS_PROJECT'));
         $reportInit = $this->init;
         $reportEnd = $this->end;
 
-        $vacations = $taskDao->getVacationsDates($this->user, $projectId, $reportInit, $reportEnd);
+        $vacations = $taskDao->getVacationsDates($this->user, $reportInit, $reportEnd);
 
         return $vacations;
     }