OHRM5X-1959: Soring from employee name added

DulsaraNethmin · Mar 29, 2023 · 23c0f29 · 23c0f29
1 parent 8300436
commit 23c0f29
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 11 deletions.
diff --git a/src/plugins/orangehrmClaimPlugin/Api/EmployeeClaimRequestAPI.php b/src/plugins/orangehrmClaimPlugin/Api/EmployeeClaimRequestAPI.php
@@ -236,7 +236,7 @@ protected function setClaimRequest(ClaimRequest $claimRequest, int $empNumber):
      *         name="sortField",
      *         in="query",
      *         required=false,
-     *         @OA\Schema(type="string", enum=ClaimRequestSearchFilterParams::ALLOWED_SORT_FIELDS)
+     *         @OA\Schema(type="string", enum=EmployeeClaimRequestSearchFilterParams::ALLOWED_SORT_FIELDS)
      *     ),
      *     @OA\Parameter(
      *         name="referenceId",
@@ -355,36 +355,36 @@ protected function setEmpNumbers(ClaimRequestSearchFilterParams $claimRequestSea
     }
 
     /**
-     * @param ClaimRequestSearchFilterParams $myClaimRequestSearchFilterParams
+     * @param ClaimRequestSearchFilterParams $claimRequestSearchFilterParams
      * @return void
      */
-    private function getCommonFilterParams(ClaimRequestSearchFilterParams $myClaimRequestSearchFilterParams): void
+    private function getCommonFilterParams(ClaimRequestSearchFilterParams $claimRequestSearchFilterParams): void
     {
-        $myClaimRequestSearchFilterParams->setReferenceId(
+        $claimRequestSearchFilterParams->setReferenceId(
             $this->getRequestParams()->getStringOrNull(
                 RequestParams::PARAM_TYPE_QUERY,
                 self::PARAMETER_REFERENCE_ID
             )
         );
-        $myClaimRequestSearchFilterParams->setEventId(
+        $claimRequestSearchFilterParams->setEventId(
             $this->getRequestParams()->getIntOrNull(
                 RequestParams::PARAM_TYPE_QUERY,
                 self::PARAMETER_EVENT_ID
             )
         );
-        $myClaimRequestSearchFilterParams->setStatus(
+        $claimRequestSearchFilterParams->setStatus(
             $this->getRequestParams()->getStringOrNull(
                 RequestParams::PARAM_TYPE_QUERY,
                 self::PARAMETER_STATUS
             )
         );
-        $myClaimRequestSearchFilterParams->setFromDate(
+        $claimRequestSearchFilterParams->setFromDate(
             $this->getRequestParams()->getDateTimeOrNull(
                 RequestParams::PARAM_TYPE_QUERY,
                 self::PARAMETER_FROM_DATE
             )
         );
-        $myClaimRequestSearchFilterParams->setToDate(
+        $claimRequestSearchFilterParams->setToDate(
             $this->getRequestParams()->getDateTimeOrNull(
                 RequestParams::PARAM_TYPE_QUERY,
                 self::PARAMETER_TO_DATE
@@ -427,8 +427,7 @@ protected function getCommonParamRuleCollectionGetAll(): ParamRuleCollection
                     self::PARAMETER_TO_DATE,
                     new Rule(Rules::DATE_TIME)
                 )
-            ),
-            ...$this->getSortingAndPaginationParamsRules(ClaimRequestSearchFilterParams::ALLOWED_SORT_FIELDS)
+            )
         );
     }
 
@@ -446,6 +445,12 @@ public function getValidationRuleForGetAll(): ParamRuleCollection
                 )
             )
         );
+        $sortFieldParamRules = $this->getSortingAndPaginationParamsRules(
+            EmployeeClaimRequestSearchFilterParams::ALLOWED_SORT_FIELDS
+        );
+        foreach ($sortFieldParamRules as $sortFieldParamRule) {
+            $paramRuleCollection->addParamValidation($sortFieldParamRule);
+        }
 
         return $paramRuleCollection;
     }

diff --git a/src/plugins/orangehrmClaimPlugin/Api/MyClaimRequestAPI.php b/src/plugins/orangehrmClaimPlugin/Api/MyClaimRequestAPI.php
@@ -237,6 +237,14 @@ protected function setEmpNumbers(ClaimRequestSearchFilterParams $claimRequestSea
      */
     public function getValidationRuleForGetAll(): ParamRuleCollection
     {
-        return $this->getCommonParamRuleCollectionGetAll();
+        $paramRuleCollection = $this->getCommonParamRuleCollectionGetAll();
+        $sortFieldParamRules = $this->getSortingAndPaginationParamsRules(
+            ClaimRequestSearchFilterParams::ALLOWED_SORT_FIELDS
+        );
+        foreach ($sortFieldParamRules as $sortFieldParamRule) {
+            $paramRuleCollection->addParamValidation($sortFieldParamRule);
+        }
+
+        return $paramRuleCollection;
     }
 }
diff --git a/src/plugins/orangehrmClaimPlugin/Dao/ClaimDao.php b/src/plugins/orangehrmClaimPlugin/Dao/ClaimDao.php
@@ -473,6 +473,8 @@ public function getClaimRequestList(ClaimRequestSearchFilterParams $myClaimReque
     protected function getClaimRequestPaginator(ClaimRequestSearchFilterParams $myClaimRequestSearchFilterParams): Paginator
     {
         $q = $this->createQueryBuilder(ClaimRequest::class, 'claimRequest');
+        $q->leftJoin('claimRequest.claimEvent', 'claimEvent');
+        $q->leftJoin('claimRequest.employee', 'employee');
         $this->setSortingAndPaginationParams($q, $myClaimRequestSearchFilterParams);
 
         if (!is_null($myClaimRequestSearchFilterParams->getEmpNumbers())) {