Merge pull request #16 from cbus-sea-lions-2015/add-includes-librarie…

…s-show add mechanics and categories to libraries#show
cbus-sea-lions-2015 · Apr 20, 2015 · b012e9f · b012e9f
2 parents 3c7c9f8 + 4df4549
commit b012e9f
Showing 1 changed file with 10 additions and 2 deletions.
diff --git a/app/controllers/libraries_controller.rb b/app/controllers/libraries_controller.rb
@@ -5,8 +5,16 @@ def index
   end
 
   def show
-    all_games = Library.find_by(bgg_username: params[:id]).games
-    render json: all_games.to_json
+    all_games = Library.find_by(bgg_username: params[:id]).games.includes(:categories,:mechanics)
+
+    json_games = all_games.map do |game|
+      JSON::parse(game.to_json).merge({
+        "mechanics"=> game.mechanics.map(&:name),
+        "categories"=> game.categories.map(&:name),
+      })
+    end
+
+    render json: json_games.to_json
   end
 
   def create