Removed redundant database calls

CLOSER-Cohorts · May 26, 2017 · ed85f32 · ed85f32
1 parent e14e49a
commit ed85f32
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/app/controllers/variables_controller.rb b/app/controllers/variables_controller.rb
@@ -50,6 +50,6 @@ def collection
   end
 
   def set_dataset
-    @dataset = policy_scope(Dataset).find(params[:dataset_id])
+    @dataset = policy_scope(Dataset).includes(variables: [:questions, :src_variables, :der_variables, :topic] ).find(params[:dataset_id])
   end
 end
diff --git a/app/views/variables/index.json.jbuilder b/app/views/variables/index.json.jbuilder
@@ -8,7 +8,12 @@ json.array!(@collection) do |variable|
   json.used_bys variable.der_variables, :id, :name, :label, :var_type
   json.topic variable.topic, :id, :code, :name, :parent_id unless variable.topic.nil?
   json.strand do
-    json.topic variable.strand.topic, :id, :code, :name, :parent_id
+    json.topic do
+      json.id = variable.strand.topic.id
+      json.code = variable.strand.topic.code
+      json.name = variable.strand.topic.name
+      json.parent_id = variable.strand.topic.parent_id
+    end
     json.good variable.strand.good
   end unless variable.strand.topic.nil?
   json.suggested_topic variable.get_suggested_topic, :id, :code, :name, :parent_id unless variable.get_suggested_topic.nil?