allow custom export repositories (#2182)

src/Controller/ExportController.php

@@ -13,8 +13,6 @@ use App\Entity\Timesheet;
 use App\Export\ServiceExport;
 use App\Form\Toolbar\ExportToolbarForm;
 use App\Repository\Query\ExportQuery;
-use App\Repository\TimesheetRepository;
-use App\Timesheet\UserDateTimeFactory;
 use Sensio\Bundle\FrameworkExtraBundle\Configuration\Security;
 use Symfony\Component\Form\FormInterface;
 use Symfony\Component\Form\SubmitButton;
@@ -30,29 +28,14 @@ use Symfony\Component\Routing\Annotation\Route;
  */
 class ExportController extends AbstractController
 {
-    /**
-     * @var TimesheetRepository
-     */
-    protected $timesheetRepository;
-
     /**
      * @var ServiceExport
      */
-    protected $export;
-    /**
-     * @var UserDateTimeFactory
-     */
-    protected $dateFactory;
+    private $export;
 
-    /**
-     * @param TimesheetRepository $timesheet
-     * @param ServiceExport $export
-     */
-    public function __construct(TimesheetRepository $timesheet, ServiceExport $export, UserDateTimeFactory $dateTime)
+    public function __construct(ServiceExport $export)
     {
-        $this->timesheetRepository = $timesheet;
         $this->export = $export;
-        $this->dateFactory = $dateTime;
     }
 
     /**
@@ -100,7 +83,7 @@ class ExportController extends AbstractController
         $form = $this->getToolbarForm($query, 'POST');
         $form->handleRequest($request);
 
-        $type = $query->getType();
+        $type = $query->getRenderer();
         if (null === $type) {
             throw $this->createNotFoundException('Missing export renderer');
         }
@@ -114,8 +97,9 @@ class ExportController extends AbstractController
         $entries = $this->getEntries($query);
         $response = $renderer->render($entries, $query);
 
+        // TODO check entries if user is allowed to update export state - see https://github.com/kevinpapst/kimai2/issues/1473
         if ($query->isMarkAsExported()) {
-            $this->timesheetRepository->setExported($entries);
+            $this->export->setExported($entries);
         }
 
         return $response;
@@ -123,8 +107,8 @@ class ExportController extends AbstractController
 
     protected function getDefaultQuery(): ExportQuery
     {
-        $begin = $this->dateFactory->createDateTime('first day of this month 00:00:00');
-        $end = $this->dateFactory->createDateTime('last day of this month 23:59:59');
+        $begin = $this->getDateTimeFactory()->getStartOfMonth();
+        $end = $this->getDateTimeFactory()->getEndOfMonth();
 
         $query = new ExportQuery();
         $query->setOrder(ExportQuery::ORDER_ASC);
@@ -150,13 +134,14 @@ class ExportController extends AbstractController
             $query->getEnd()->setTime(23, 59, 59);
         }
 
-        return $this->timesheetRepository->getTimesheetsForQuery($query, true);
+        return $this->export->getExportItems($query);
     }
 
     protected function getToolbarForm(ExportQuery $query, string $method): FormInterface
     {
         return $this->createForm(ExportToolbarForm::class, $query, [
             'action' => $this->generateUrl('export', []),
+            'include_user' => $this->isGranted('view_other_timesheet'),
             'method' => $method,
             'attr' => [
                 'id' => 'export-form'