Merge pull request #2876 from compucorp/PCHR-3039-admin-change-absenc…

…e-type PCHR-3039: Allow admins to change Absence Type of open Leave Requests
compucorp · Oct 9, 2018 · b081293 · b081293
2 parents e05631f + b469ab6
commit b081293
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 33 deletions.
diff --git a/...ompucorp.civicrm.hrleaveandabsences/CRM/HRLeaveAndAbsences/Service/LeaveRequestRights.php b/...ompucorp.civicrm.hrleaveandabsences/CRM/HRLeaveAndAbsences/Service/LeaveRequestRights.php
@@ -13,12 +13,6 @@ class CRM_HRLeaveAndAbsences_Service_LeaveRequestRights {
    */
   private $leaveManagerService;
 
-  /**
-   * @var array|null
-   *   Stores the list of option values for the LeaveRequest status_id field.
-   */
-  private static $leaveStatuses;
-
   /**
    * CRM_HRLeaveAndAbsences_Service_LeaveRequestRights constructor.
    *
@@ -57,13 +51,7 @@ public function canChangeDatesFor($contactID, $statusID, $requestType) {
       return TRUE;
     }
 
-    $leaveRequestStatuses = self::getLeaveRequestStatuses();
-    $openStatuses = [
-      $leaveRequestStatuses['awaiting_approval'],
-      $leaveRequestStatuses['more_information_required']
-    ];
-
-    $isOpenLeaveRequest = in_array($statusID, $openStatuses);
+    $isOpenLeaveRequest = in_array($statusID, LeaveRequest::getOpenStatuses());
     $currentUserIsLeaveContact = $this->currentUserIsLeaveContact($contactID);
 
     if ($currentUserIsLeaveContact && $isOpenLeaveRequest) {
@@ -88,9 +76,10 @@ public function canChangeDatesFor($contactID, $statusID, $requestType) {
    * @return bool
    */
   public function canChangeAbsenceTypeFor($contactID, $statusID) {
-    $leaveRequestStatuses = self::getLeaveRequestStatuses();
-    return $this->currentUserIsLeaveContact($contactID) &&
-           in_array($statusID, [$leaveRequestStatuses['awaiting_approval'], $leaveRequestStatuses['more_information_required']]);
+    $isOpenLeaveRequest = in_array($statusID, LeaveRequest::getOpenStatuses());
+    $isLeaveContactOrAdmin = $this->currentUserIsLeaveContact($contactID) || $this->currentUserIsAdmin();
+
+    return $isLeaveContactOrAdmin && $isOpenLeaveRequest;
   }
 
   /**
@@ -161,19 +150,6 @@ private function currentUserIsLeaveContact($contactID) {
     return CRM_Core_Session::getLoggedInContactID() == $contactID;
   }
 
-  /**
-   * Returns the array of the option values for the LeaveRequest status_id field.
-   *
-   * @return array
-   */
-  private static function getLeaveRequestStatuses() {
-    if (is_null(self::$leaveStatuses)) {
-      self::$leaveStatuses = array_flip(LeaveRequest::buildOptions('status_id', 'validate'));
-    }
-
-    return self::$leaveStatuses;
-  }
-
   /**
    * Checks whether the current user can cancel the TOIL Request with
    * past dates or not.

diff --git a/...rleaveandabsences/tests/phpunit/CRM/HRLeaveAndAbsences/Service/LeaveRequestRightsTest.php b/...rleaveandabsences/tests/phpunit/CRM/HRLeaveAndAbsences/Service/LeaveRequestRightsTest.php
@@ -228,24 +228,45 @@ public function testCanChangeAbsenceTypeForReturnsFalseWhenCurrentUserIsLeaveCon
   }
 
   /**
-   * @dataProvider leaveRequestStatusesDataProvider
+   * @dataProvider openLeaveRequestStatusesDataProvider
    */
-  public function testCanChangeAbsenceTypeForReturnsFalseWhenCurrentUserNotLeaveContactIrrespectiveOfStatusPassed($status) {
+  public function testCanChangeAbsenceTypeForReturnsTrueWhenCurrentUserIsAdminAndTheLeaveRequestIsOpen($status) {
     $contactID = 2;
 
-    $this->assertFalse(
-      $this->getLeaveRequestRightsForLeaveManagerAsCurrentUser()->canChangeAbsenceTypeFor(
+    $this->assertTrue(
+      $this->getLeaveRequestRightsForAdminAsCurrentUser()->canChangeAbsenceTypeFor(
         $contactID,
         $status
       )
     );
+  }
+
+  /**
+   * @dataProvider closedLeaveRequestStatusesDataProvider
+   */
+  public function testCanChangeAbsenceTypeForReturnsFalseWhenCurrentUserIsAdminAndTheLeaveRequestIsClosed($status) {
+    $contactID = 2;
 
     $this->assertFalse(
       $this->getLeaveRequestRightsForAdminAsCurrentUser()->canChangeAbsenceTypeFor(
         $contactID,
         $status
       )
     );
+  }
+
+  /**
+   * @dataProvider leaveRequestStatusesDataProvider
+   */
+  public function testCanChangeAbsenceTypeForReturnsFalseWhenCurrentUserNotLeaveContactIrrespectiveOfStatusPassed($status) {
+    $contactID = 2;
+
+    $this->assertFalse(
+      $this->getLeaveRequestRightsForLeaveManagerAsCurrentUser()->canChangeAbsenceTypeFor(
+        $contactID,
+        $status
+      )
+    );
 
     $this->assertFalse(
       $this->getLeaveRightsService()->canChangeAbsenceTypeFor(