feat: add default order by to goals n objectives

globalfund · Jul 11, 2023 · 06c7c68 · 06c7c68
1 parent df7ee72
commit 06c7c68
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/src/config/mapping/grants/grantDetail.utils.json b/src/config/mapping/grants/grantDetail.utils.json
@@ -12,5 +12,6 @@
   "periodInfoRatingGrantNumber": "grantAgreementImplementationPeriod/grantAgreement/grantAgreementNumber",
   "periodInfoRatingPeriodNumber": "grantAgreementImplementationPeriod/implementationPeriodNumber",
   "periodInfoRatingExtraFilter": " and performanceRating ne null",
+  "goalsObjectivesSort": "$orderby=goalObjectiveIndex asc,goalObjectiveName asc&",
   "grantNumber": "grantAgreementNumber"
 }
diff --git a/src/controllers/grants.controller.ts b/src/controllers/grants.controller.ts
@@ -343,7 +343,7 @@ export class GrantsController {
       };
     }
     const mapper = mapTransform(grantPeriodGoalsObjectivesMap);
-    const url = `${urls.grantIPGoalsObjectives}/?$filter=${grantDetailUtils.periodInfoRatingGrantNumber} eq '${grantNumber}' AND ${grantDetailUtils.periodInfoRatingPeriodNumber} eq ${IPnumber}`;
+    const url = `${urls.grantIPGoalsObjectives}/?$filter=${grantDetailUtils.periodInfoRatingGrantNumber} eq '${grantNumber}' AND ${grantDetailUtils.periodInfoRatingPeriodNumber} eq ${IPnumber}&${grantDetailUtils.goalsObjectivesSort}`;
 
     return axios
       .get(url)