From 4b6c475c3f79347685136433d5b35cf64c85c57e Mon Sep 17 00:00:00 2001
From: Joel Salisbury <joel.salisbury@gmail.com>
Date: Thu, 16 Feb 2017 17:19:53 -0500
Subject: [PATCH] category all

---
 api/routes/category.php | 23 ++++++++++++++++++++++-
 api/routes/rules.php    |  2 +-
 2 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/api/routes/category.php b/api/routes/category.php
index cb5856e..1122017 100644
--- a/api/routes/category.php
+++ b/api/routes/category.php
@@ -7,6 +7,11 @@
 $app->get('/category/all', function( $request, $response ) {
   $q = new CategoryQuery;
   $cats = $q::create()->find();
+
+  
+
+
+
   $response_json = [
     "status" => [
       "code" => $response->getStatusCode(),
@@ -15,9 +20,25 @@
     "data" => []
   ];
   foreach( $cats as $cat ) {
+
+    $q = new CategoryRankNutrientQuery;
+    $requestedCatRules = $q->filterByCategoryId($cat->getId())->find();
+    foreach($requestedCatRules as $rule) {
+      $rules[] = [
+        "nutrientName" => $rule->getNutrient()->getName(),
+        "nutrientId" => $rule->getNutrient()->getId(),
+        "operator" => $rule->getOperator(),
+        "threshold" => $rule->getThreshold(),
+        "units" => $rule->getUnits(),
+        "rank" => $rule->getRankId()
+      ];
+    }
+
+
     $response_json["data"][] = [
       "id" => $cat->getId(),
-      "name" => $cat->getName()
+      "name" => $cat->getName(),
+      "rules" => $rules
     ];
   }
   $response = $response->withJSON($response_json);
diff --git a/api/routes/rules.php b/api/routes/rules.php
index 8aca038..0b81736 100644
--- a/api/routes/rules.php
+++ b/api/routes/rules.php
@@ -72,7 +72,7 @@
 $app->post('/rules/updateRuleById/{ruleId}', function($request, $response) {
 
   $rule = CategoryRankNutrientQuery::create()->findPk($request->getAttribute("ruleId"));
-  print_r($rule);
+  
   $cat = $request->getParam('catId');