Merged education accountant and regular accountant functions

skaut · Feb 8, 2024 · b81a64b · b81a64b
1 parent cbbd082
commit b81a64b
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 9 deletions.
diff --git a/app/AccountancyModule/PaymentModule/presenters/BankAccountsPresenter.php b/app/AccountancyModule/PaymentModule/presenters/BankAccountsPresenter.php
@@ -236,7 +236,7 @@ private function assertCanViewBankAccount(int $id): void
         if (
             $role->getUnitId() === $account->getUnitId()
             && $role->isBasicUnit()
-            && ($role->isAccountant() || $role->isOfficer() || $role->isEventManager() || $role->isEducationLeader() || $role->isEducationAccountant())
+            && ($role->isAccountant() || $role->isOfficer() || $role->isEventManager() || $role->isEducationLeader())
         ) {
             return;
         }

diff --git a/app/model/User/ReadModel/QueryHandlers/EditableUnitsQueryHandler.php b/app/model/User/ReadModel/QueryHandlers/EditableUnitsQueryHandler.php
@@ -19,7 +19,7 @@ public function __invoke(EditableUnitsQuery $query): array
     {
         $role = $query->getRole();
 
-        if (! ($role->isLeader() || $role->isAccountant() || $role->isEventManager() || $role->isEducationLeader() || $role->isEducationAccountant())) {
+        if (! ($role->isLeader() || $role->isAccountant() || $role->isEventManager() || $role->isEducationLeader())) {
             return [];
         }
 

diff --git a/app/model/User/SkautisRole.php b/app/model/User/SkautisRole.php
@@ -46,19 +46,14 @@ public function isLeader(): bool
 
     public function isAccountant(): bool
     {
-        return Strings::startsWith($this->key, self::ACCOUNTANT_PREFIX);
+        return Strings::startsWith($this->key, self::ACCOUNTANT_PREFIX) || $this->key === 'EventEducationEconomist';
     }
 
     public function isEducationLeader(): bool
     {
         return $this->key === 'EventEducationLeader';
     }
 
-    public function isEducationAccountant(): bool
-    {
-        return $this->key === 'EventEducationEconomist';
-    }
-
     public function isOfficer(): bool
     {
         return Strings::startsWith($this->key, self::OFFICER_PREFIX);

diff --git a/app/model/User/UserService.php b/app/model/User/UserService.php
@@ -144,7 +144,7 @@ public function getAccessArrays(UnitService $us): array
                 ];
             }
 
-            if ($role->isLeader() || $role->isAccountant() || $role->isEventManager() || $role->isEducationLeader() || $role->isEducationAccountant()) {
+            if ($role->isLeader() || $role->isAccountant() || $role->isEventManager() || $role->isEducationLeader()) {
                 return [
                     self::ACCESS_READ => $unitIds,
                     self::ACCESS_EDIT => $unitIds,