improved optimization migrations; moved status flag near temperature …

…links
bddcasts · Jul 5, 2010 · 6ac21f0 · 6ac21f0
1 parent bfa7ca2
commit 6ac21f0
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 9 deletions.
diff --git a/app/controllers/brand_results_controller.rb b/app/controllers/brand_results_controller.rb
@@ -8,7 +8,7 @@ def index
 
     @brand_results = @search.paginate(
       :page          => params[:page],
-      :include       => :result,
+      :include       => [:brand, :result],
       :order         => "result_created_at DESC")
   end
 

diff --git a/app/stylesheets/partials/_results.sass b/app/stylesheets/partials/_results.sass
@@ -29,10 +29,12 @@ div
           :float right
           a
             :text-decoration none
+        &.status
+          :float right
     .body
       +general_font
       :margin-bottom 5px
-    .status, .result_link
+    .view_links, .result_link
       :font-size 11px
       :margin-bottom 5px
   &.read

diff --git a/app/views/brand_results/_brand_result.html.haml b/app/views/brand_results/_brand_result.html.haml
@@ -6,12 +6,13 @@
       = brand_result.state_links.join(" | ")
     %div.temperature_links
       = "[ #{brand_result.temperature_links.join(" | ")} ]"
+    %div.status
+      = brand_result.status
   %div.body
     = auto_link(sanitize(brand_result.result.body), :urls, :html => { :target => '_blank'})
   %div.result_link
     = brand_result.result_link
-  %div.status
+  %div.view_links
     = brand_result.result.created_at.strftime("%I:%M%p")
-    = brand_result.status
     = brand_result.view_links.join(" | ")
 
diff --git a/app/views/brand_results/show.html.haml b/app/views/brand_results/show.html.haml
@@ -9,13 +9,14 @@
         = brand_result.state_links.join(" | ")
       %div.temperature_links
         = "[ #{brand_result.temperature_links.join(" | ")} ]"
+      %div.status
+        = brand_result.status
     %div.body
       = auto_link(sanitize(brand_result.result.body), :urls, :html => { :target => '_blank'})
     %div.result_link
       = brand_result.result_link
-    %div.status
+    %div.view_links
       = brand_result.result.created_at.strftime("%I:%M%p")
-      = brand_result.status
 
   %div.comments
     - @comments.each do |comment|

diff --git a/db/migrate/20100705074120_add_brand_result_to_team.rb b/db/migrate/20100705074120_add_brand_result_to_team.rb
@@ -6,7 +6,7 @@ def self.up
     BrandResult.reset_column_information
 
     Brand.all.each do |b|
-      b.brand_results.update_all("team_id" => b.team)
+      b.brand_results.update_all("team_id" => b.team_id)
     end
   end
 

diff --git a/db/migrate/20100705085415_add_result_created_at_to_brand_result.rb b/db/migrate/20100705085415_add_result_created_at_to_brand_result.rb
@@ -5,8 +5,10 @@ def self.up
 
     BrandResult.reset_column_information
 
-    BrandResult.all.each do |br|
-      br.update_attribute(:result_created_at, br.result.created_at)
+    BrandResult.find_in_batches(:batch_size => 200) do |batch|
+      batch.each do |br|
+        br.update_attribute(:result_created_at, br.result.created_at)
+      end
     end
   end