Simplified codebase

Keleo · Sep 27, 2024 · b3861e5 · b3861e5
1 parent 4bbcd3a
commit b3861e5
Show file tree

Hide file tree

Showing 8 changed files with 16 additions and 28 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,7 +3,8 @@
 Compatibility: requires minimum Kimai 2.21.0
 
 - Added missing "Documentation" link 
-- Create with invalid type caused 500: redirect to manage view instead 
+- Create with invalid type caused 500: redirect to manage view instead
+- Simplified codebase
 
 ## Version 4.1.0
 

diff --git a/Controller/ManageController.php b/Controller/ManageController.php
@@ -114,9 +114,10 @@ public function update(SharedProjectTimesheet $sharedProject, string $shareKey,
             throw $this->createNotFoundException('Project not found');
         }
 
-        $formClass = $sharedProject->isCustomerSharing() ?
-            SharedCustomerFormType::class :
-            SharedProjectFormType::class;
+        $formClass = SharedProjectFormType::class;
+        if ($sharedProject->getCustomer() !== null) {
+            $formClass = SharedCustomerFormType::class;
+        }
 
         $form = $this->createForm($formClass, $sharedProject, [
             'method' => 'POST',

diff --git a/Controller/ViewController.php b/Controller/ViewController.php
@@ -45,11 +45,11 @@ public function indexAction(#[MapEntity(mapping: ['shareKey' => 'shareKey'])] Sh
             ]);
         }
 
-        if ($sharedPortal->isCustomerSharing()) {
+        if ($sharedPortal->getCustomer() !== null) {
             return $this->renderCustomerView($sharedPortal, $request);
-        } else {
-            return $this->renderProjectView($sharedPortal, $sharedPortal->getProject(), $request);
         }
+
+        return $this->renderProjectView($sharedPortal, $sharedPortal->getProject(), $request);
     }
 
     #[Route(path: '/auth/shared-project-timesheets/customer/{customer}/{shareKey}/project/{project}', methods: ['GET', 'POST'])]

diff --git a/Entity/SharedProjectTimesheet.php b/Entity/SharedProjectTimesheet.php
@@ -198,24 +198,10 @@ public function setTimeBudgetStatsVisible(bool $timeBudgetStatsVisible): void
 
     public function getType(): string
     {
-        if ($this->customer !== null && $this->project !== null) {
-            throw new LogicException('Invalid state: customer and project cannot be filled both');
-        }
-
         if ($this->customer !== null) {
             return static::TYPE_CUSTOMER;
         }
 
         return static::TYPE_PROJECT;
     }
-
-    public function isCustomerSharing(): bool
-    {
-        return $this->getType() === static::TYPE_CUSTOMER;
-    }
-
-    public function isProjectSharing(): bool
-    {
-        return $this->getType() === static::TYPE_PROJECT;
-    }
 }
diff --git a/EventSubscriber/SharedProjectSubscriber.php b/EventSubscriber/SharedProjectSubscriber.php
@@ -36,9 +36,9 @@ public function onActions(PageActionsEvent $event): void
 
         $event->addEdit($this->path('update_shared_project_timesheets', ['sharedProject' => $sharedProject->getId(), 'shareKey' => $sharedProject->getShareKey()]));
 
-        if ($sharedProject->isCustomerSharing()) {
+        if ($sharedProject->getCustomer() !== null) {
             $event->addAction('customer', ['url' => $this->path('customer_details', ['id' => $sharedProject->getCustomer()->getId()])]);
-        } else {
+        } elseif ($sharedProject->getProject() !== null) {
             $event->addAction('project', ['url' => $this->path('project_details', ['id' => $sharedProject->getProject()->getId()])]);
         }
 

diff --git a/Repository/SharedProjectTimesheetRepository.php b/Repository/SharedProjectTimesheetRepository.php
@@ -68,12 +68,12 @@ public function findByShareKey(string $shareKey): ?SharedProjectTimesheet
      */
     public function getProjects(SharedProjectTimesheet $sharedProject): array
     {
-        if ($sharedProject->isProjectSharing()) {
+        if ($sharedProject->getProject() !== null) {
             return [$sharedProject->getProject()];
         }
 
         /** @var ProjectRepository $projectRepository */
-        $projectRepository = $this->_em->getRepository(Project::class); // @phpstan-ignore-line
+        $projectRepository = $this->_em->getRepository(Project::class); // @phpstan-ignore varTag.type
 
         $query = new ProjectQuery();
         $query->setCustomers([$sharedProject->getCustomer()]);

diff --git a/Resources/views/manage/index.html.twig b/Resources/views/manage/index.html.twig
@@ -8,7 +8,7 @@
     {% if column == 'name' %}
         {{ entry.project.name ?? entry.customer.name }}
     {% elseif column == 'type' %}
-        <i class="{% if entry.isCustomerSharing() %}{{ 'customer'|icon(false) }}{% else %}{{ 'project'|icon(false) }}{% endif %}" title="{{ entry.getType() | trans }}"></i>
+        <i class="{% if entry.getCustomer() != null %}{{ 'customer'|icon(false) }}{% else %}{{ 'project'|icon(false) }}{% endif %}" title="{{ entry.getType() | trans }}"></i>
     {% elseif column == 'url' %}
         {% if entry.shareKey %}
             {% set p_url = url('customer_portal_view', {shareKey: entry.shareKey}) %}

diff --git a/Service/ViewService.php b/Service/ViewService.php
@@ -157,7 +157,7 @@ public function getAnnualStats(SharedProjectTimesheet $sharedProject, int $year,
                     'project' => $limitProject,
                     'year' => $year,
                 ]);
-        } elseif ($sharedProject->isProjectSharing()) {
+        } elseif ($sharedProject->getProject() !== null) {
             $queryBuilder = $queryBuilder
                 ->andWhere('t.project = :project')
                 ->setParameters([
@@ -223,7 +223,7 @@ public function getMonthlyStats(SharedProjectTimesheet $sharedProject, int $year
                     'year' => $year,
                     'month' => $month,
                 ]);
-        } elseif ($sharedProject->isProjectSharing()) {
+        } elseif ($sharedProject->getProject() !== null) {
             $queryBuilder = $queryBuilder
                 ->andWhere('t.project = :project')
                 ->setParameters([