Merge pull request #12 from dmd-web-and-mobile/reversionapi

reverting back
dmd-web-and-mobile · Mar 3, 2017 · 15df02e · 15df02e
2 parents 47a0365 + 7488ecd
commit 15df02e
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 11 deletions.
diff --git a/api/routes/category.php b/api/routes/category.php
@@ -15,27 +15,29 @@
     ],
     "data" => []
   ];
-
+//[strtolower($rule->getRank()->getName())][$rule->getNutrient()->getName()]
   foreach( $cats as $cat ) {
     $rules = [];
     $q = new CategoryRankNutrientQuery;
-    $requestedCatRules = $q->filterByCategoryId($cat->getId())->orderByRankId()->find();
+    $requestedCatRules = $q->filterByCategoryId($cat->getId())->orderByNutrientId()->find();
     foreach($requestedCatRules as $rule) {
-      $rules[$rule->getNutrient()->getName()][] = [
-        "nutrientName" => $rule->getNutrient()->getName(),
-        "nutrientId" => $rule->getNutrient()->getId(),
-        "operator" => $rule->getOperator(),
-        "threshold" => $rule->getThreshold(),
-        "units" => $rule->getUnits(),
-        "rank" => $rule->getRankId()
+      $rules[]  = [
+      "ruleId" => $rule->getId(),
+      "nutrientName" => $rule->getNutrient()->getName(),
+      "nutrientId" => $rule->getNutrient()->getId(),
+      "operator" => $rule->getOperator(),
+      "threshold" => $rule->getThreshold(),
+      "units" => $rule->getUnits(),
+      "rank" => $rule->getRankId(),
+      "categoryId" => $rule->getCategoryId()
       ];
     }
 
 
     $response_json["data"][] = [
       "id" => $cat->getId(),
       "name" => $cat->getName(),
-      "rules" => $rules
+      "rules" => [$rules]
     ];
 
   }

diff --git a/api/routes/rules.php b/api/routes/rules.php
@@ -14,12 +14,14 @@
 
   foreach($requestedCatRules as $rule) {
     $response_json["data"][] = [
+      "ruleId" => $rule->getId(),
       "nutrientName" => $rule->getNutrient()->getName(),
       "nutrientId" => $rule->getNutrient()->getId(),
       "operator" => $rule->getOperator(),
       "threshold" => $rule->getThreshold(),
       "units" => $rule->getUnits(),
-      "rank" => $rule->getRankId()
+      "rank" => $rule->getRankId(),
+      "categoryId" => $rule->getCategoryId()
     ];
   }