diff --git a/script/bulk_import/base.rb b/script/bulk_import/base.rb index 0d7ec65d06e..261110a8ba2 100644 --- a/script/bulk_import/base.rb +++ b/script/bulk_import/base.rb @@ -285,7 +285,7 @@ class BulkImport::Base user_id topics_entered time_read days_visited posts_read_count likes_given likes_received new_since read_faq first_post_created_at post_count topic_count bounce_score - reset_bounce_score_after + reset_bounce_score_after digest_attempted_at } USER_PROFILE_COLUMNS ||= %i{ @@ -435,7 +435,6 @@ class BulkImport::Base user_email[:updated_at] ||= user_email[:created_at] user_email[:email] ||= random_email user_email[:email].downcase! - user_email end @@ -451,11 +450,12 @@ class BulkImport::Base user_stat[:post_count] ||= 0 user_stat[:topic_count] ||= 0 user_stat[:bounce_score] ||= 0 + user_stat[:digest_attempted_at] ||= NOW user_stat end def process_user_profile(user_profile) - user_profile[:bio_raw] = (user_profile[:bio_raw].presence || "").scrub.strip.presence + user_profile[:bio_raw] = (user_profile[:bio_raw].presence || "").scrub.strip.presence user_profile[:bio_cooked] = pre_cook(user_profile[:bio_raw]) if user_profile[:bio_raw].present? user_profile[:views] ||= 0 user_profile @@ -494,7 +494,7 @@ class BulkImport::Base topic[:closed] ||= false topic[:views] ||= 0 topic[:created_at] ||= NOW - topic[:bumped_at] ||= topic[:created_at] + topic[:bumped_at] ||= topic[:created_at] topic[:updated_at] ||= topic[:created_at] topic end diff --git a/script/import_scripts/base.rb b/script/import_scripts/base.rb index bc780e68869..39530d74474 100644 --- a/script/import_scripts/base.rb +++ b/script/import_scripts/base.rb @@ -737,6 +737,10 @@ class ImportScripts::Base WHERE u1.user_id = user_stats.user_id AND user_stats.topic_count <> sub.topic_count SQL + + puts "", "Updating user digest_attempted_at..." + + DB.exec("UPDATE user_stats SET digest_attempted_at = now() WHERE digest_attempted_at IS NULL") end # scripts that are able to import last_seen_at from the source data should override this method