Updated the Avatar migration to move over the image name and set the store dir to fall back to the legacy mongo_id if it's present

just3ws · just3ws · commit aa5d18b93484 · 2014-11-04T17:37:00.000-06:00
diff --git a/Rakefile b/Rakefile
@@ -152,7 +152,6 @@ namespace :team do
             about
             achievement_count
             analytics
-            avatar
             benefit_description_1
             benefit_description_2
             benefit_description_3
@@ -210,6 +209,8 @@ namespace :team do
             neq(attr, pg_team_follower, mongo_team_follower, false)
           end
 
+          neq_string(:avatar, pg_team_follower, pg_team_follower.avatar.url, mongo_team_follower, mongo_team_follower.avatar.url, false)
+
           %i(score size total mean median).each do |attr|
             neq_dec(attr, pg_team_follower, mongo_team_follower, false)
           end
@@ -234,6 +235,17 @@ namespace :team do
     print_neq_error(ex)
   end
 
+  def neq_string(attr, pg, left, mongo, right, fail_if_neq=true)
+    if left != right
+      puts "#{attr} | pg:#{pg.id} | mongo:#{mongo.id}| #{left} != #{right}"
+      true
+    else
+      false
+    end
+  rescue => ex
+    print_neq_error(ex)
+  end
+
   def neq_dec(attr, pg, mongo, fail_if_neq=true)
     scale = 7
 
diff --git a/app/jobs/team_migrator_job.rb b/app/jobs/team_migrator_job.rb
@@ -28,7 +28,6 @@ def find_or_initialize_team(id, team)
 
     begin
       PgTeam.find_or_initialize_by_mongo_id(id) do |pgteam|
-        # pgteam.avatar                 = team.avatar
         pgteam.about                    = team.about
         pgteam.achievement_count        = team.achievement_count
         pgteam.analytics                = team.analytics
@@ -96,6 +95,10 @@ def find_or_initialize_team(id, team)
         pgteam.score                    = team.score.to_d.round(scale)
 
         pgteam.save!
+
+        if team.avatar && team.avatar.file
+          pgteam.update_column(:avatar, team.avatar.file.filename)
+        end
       end
     rescue ActiveRecord::RecordInvalid => ex
       Rails.logger.error("[find_or_initialize_team(#{id}, #{team.id})] #{ex} >>\n#{ex.backtrace.join("\n  ")}")
diff --git a/app/uploaders/team_uploader.rb b/app/uploaders/team_uploader.rb
@@ -2,6 +2,10 @@ class TeamUploader < CoderwallUploader
 
   process resize_and_pad: [100, 100]
 
+  def store_dir
+    "/uploads/team/avatar/#{model.mongo_id || model.id}"
+  end
+
   def default_url
     ActionController::Base.helpers.asset_path 'team-avatar.png'
   end
