Updated bulk import scripts based on Selase's feedback and extended badge imports

RubenOussoren · RubenOussoren · commit 016ca7a39dc0 · 2025-05-29T17:34:37.000-04:00
diff --git a/script/bulk_import/base.rb b/script/bulk_import/base.rb
@@ -76,6 +76,7 @@ def initialize
     @html_entities = HTMLEntities.new
     @encoding = CHARSET_MAP[charset]
     @bbcode_to_md = true if use_bbcode_to_md?
+    @assign_plugin_enabled = defined?(::DiscourseAssign)
 
     @markdown =
       Redcarpet::Markdown.new(
@@ -511,8 +512,8 @@ def discourse_reaction_id_from_original_id(id)
     messageable_level
     created_at
     updated_at
-    assignable_level
   ]
+  GROUP_COLUMNS << :assignable_level if defined?(::DiscourseAssign)
 
   USER_COLUMNS = %i[
     id
@@ -649,7 +650,6 @@ def discourse_reaction_id_from_original_id(id)
     description
     position
     parent_category_id
-    read_restricted
     uploaded_logo_id
     created_at
     updated_at
@@ -803,6 +803,14 @@ def discourse_reaction_id_from_original_id(id)
     updated_at
     multiple_grant
     query
+    allow_title
+    icon
+    listable
+    target_posts
+    enabled
+    auto_revoke
+    trigger
+    show_posts
   ]
 
   USER_BADGE_COLUMNS = %i[badge_id user_id granted_at granted_by_id seq post_id created_at]
@@ -1235,6 +1243,7 @@ def process_group(group)
 
     group[:created_at] ||= NOW
     group[:updated_at] ||= group[:created_at]
+    group[:assignable_level] ||= Group::ALIAS_LEVELS[:nobody] if @assign_plugin_enabled
     group
   end
 
@@ -1415,6 +1424,7 @@ def process_user_associated_account(account)
   end
 
   def process_group_user(group_user)
+    group_user[:owner] ||= false
     group_user[:created_at] = NOW
     group_user[:updated_at] = NOW
     group_user
@@ -1450,7 +1460,6 @@ def process_category(category)
     category[:slug] ||= Slug.for(name_lower, "") # TODO Ensure that slug doesn't exist yet
     category[:description] = (category[:description] || "").scrub.strip.presence
     category[:user_id] ||= Discourse::SYSTEM_USER_ID
-    category[:read_restricted] = false if category[:read_restricted].nil?
     category[:created_at] ||= NOW
     category[:updated_at] ||= category[:created_at]
 
diff --git a/script/bulk_import/generic_bulk.rb b/script/bulk_import/generic_bulk.rb
@@ -78,7 +78,7 @@ def execute
     import_category_permissions
     import_category_users
     import_category_moderation_groups
-    update_read_restricted_flags
+    update_category_read_restricted
 
     import_topics
     import_posts
@@ -379,7 +379,7 @@ def import_category_moderation_groups
       group_id = group_id_from_imported_id(row["group_id"])
 
       next unless category_id && group_id
-      next if existing_moderation_groups.include?([category_id, group_id])
+      next unless existing_moderation_groups.add?([category_id, group_id])
 
       { category_id: category_id, group_id: group_id }
     end
@@ -414,19 +414,24 @@ def import_category_users
     category_users.close
   end
 
-  def update_read_restricted_flags
+  def update_category_read_restricted
     puts "", "Updating category read_restricted flags..."
     start_time = Time.now
     processed_count = 0
     updated_count = 0
     skipped_count = 0
 
     Category
-      .includes(:category_groups)
+      .includes(category_groups: :group)
       .find_each do |category|
         processed_count += 1
 
-        permissions = category.permissions_params
+        permissions = {}
+        category.category_groups.each do |category_group|
+          group = category_group.group
+          permissions[category_group.group_name] = category_group.permission_type if group.present?
+        end
+
         expected_read_restricted =
           if permissions.empty?
             false
@@ -459,19 +464,20 @@ def import_groups
     create_groups(groups) do |row|
       next if group_id_from_imported_id(row["id"]).present?
 
-      {
+      group_data = {
         imported_id: row["id"],
         name: row["name"],
         full_name: row["full_name"],
-        public_admission: row["public_admission"],
-        public_exit: row["public_exit"],
-        allow_membership_requests: row["allow_membership_requests"],
+        public_admission: row["public_admission"] || false,
+        public_exit: row["public_exit"] || false,
+        allow_membership_requests: row["allow_membership_requests"] || false,
         visibility_level: row["visibility_level"],
         members_visibility_level: row["members_visibility_level"],
         mentionable_level: row["mentionable_level"],
         messageable_level: row["messageable_level"],
-        assignable_level: row["assignable_level"],
       }
+      group_data[:assignable_level] = row["assignable_level"] if defined?(::DiscourseAssign)
+      group_data
     end
 
     groups.close
@@ -609,13 +615,12 @@ def import_user_options
     puts "", "Importing user options..."
 
     users = query(<<~SQL)
-      SELECT id, timezone, email_level, email_messages_level, email_digests, hide_profile_and_presence
+      SELECT id, timezone, email_level, email_messages_level, email_digests
         FROM users
        WHERE timezone IS NOT NULL
           OR email_level IS NOT NULL
           OR email_messages_level IS NOT NULL
           OR email_digests IS NOT NULL
-          OR hide_profile_and_presence IS NOT NULL
        ORDER BY id
     SQL
 
@@ -631,7 +636,9 @@ def import_user_options
         email_level: row["email_level"],
         email_messages_level: row["email_messages_level"],
         email_digests: row["email_digests"],
-        hide_profile_and_presence: row["hide_profile_and_presence"] || false,
+        hide_profile_and_presence: false,
+        hide_profile: false,
+        hide_presence: false,
       }
     end
 
@@ -2023,10 +2030,17 @@ def import_tags
         )
       @tag_mapping[row["id"]] = tag.id
 
-      if row["tag_group_id"] && !row["tag_group_id"].empty?
-        intermediate_group_ids = JSON.parse(row["tag_group_id"])
+      intermediate_group_ids = []
+      if row["tag_group_ids"] && !row["tag_group_ids"].empty?
+        intermediate_group_ids = JSON.parse(row["tag_group_ids"])
+      elsif row["tag_group_id"] && !row["tag_group_id"].empty?
+        # Support old single tag_group_id
+        intermediate_group_ids = [row["tag_group_id"]]
+      end
 
+      if intermediate_group_ids.any?
         intermediate_group_ids.each do |intermediate_group_id|
+          intermediate_group_id = intermediate_group_id.to_i if intermediate_group_id.is_a?(String)
           discourse_tag_group_id = @tag_group_mapping[intermediate_group_id]
 
           if discourse_tag_group_id
@@ -2476,6 +2490,15 @@ def import_badges
         image_upload_id:
           row["image_upload_id"] ? upload_id_from_original_id(row["image_upload_id"]) : nil,
         query: row["query"],
+        multiple_grant: to_boolean(row["multiple_grant"]),
+        allow_title: to_boolean(row["allow_title"]),
+        icon: row["icon"],
+        listable: to_boolean(row["listable"]),
+        target_posts: to_boolean(row["target_posts"]),
+        enabled: to_boolean(row["enabled"]),
+        auto_revoke: to_boolean(row["auto_revoke"]),
+        trigger: row["trigger"],
+        show_posts: to_boolean(row["show_posts"]),
       }
     end
 
@@ -2506,6 +2529,24 @@ def import_user_badges
     end
 
     user_badges.close
+
+    puts "", "Updating badge grant counts..."
+    start_time = Time.now
+
+    DB.exec(<<~SQL)
+        WITH
+          grants AS (
+                      SELECT badge_id, COUNT(*) AS grant_count FROM user_badges GROUP BY badge_id
+                    )
+
+      UPDATE badges
+         SET grant_count = grants.grant_count
+        FROM grants
+       WHERE badges.id = grants.badge_id
+         AND badges.grant_count <> grants.grant_count
+    SQL
+
+    puts "  Update took #{(Time.now - start_time).to_i} seconds."
   end
 
   def import_anniversary_user_badges
