From d6e14b5ec2ebcddd59f1a795c118e8586f864292 Mon Sep 17 00:00:00 2001
From: Phil <phil.ayres@consected.com>
Date: Tue, 7 Apr 2026 19:53:57 +0100
Subject: [PATCH] Added item flag name import support and test - fixes #3

---
 app/models/admin/app_type_import.rb       |  2 +
 spec/models/admin/app_type_import_spec.rb | 46 +++++++++++++++++++++++
 2 files changed, 48 insertions(+)

diff --git a/app/models/admin/app_type_import.rb b/app/models/admin/app_type_import.rb
index beca6de82c..854f6c0d9f 100644
--- a/app/models/admin/app_type_import.rb
+++ b/app/models/admin/app_type_import.rb
@@ -161,6 +161,8 @@ def import_set
 
       import_config_sub_items 'associated_general_selections', %w[item_type value]
 
+      import_config_sub_items 'associated_item_flag_names', %w[name item_type]
+
       import_config_sub_items 'associated_reports', %w[short_name item_type]
 
       import_config_sub_items 'page_layouts', %w[layout_name panel_name]
diff --git a/spec/models/admin/app_type_import_spec.rb b/spec/models/admin/app_type_import_spec.rb
index 8e4af2ab60..9074cb0054 100644
--- a/spec/models/admin/app_type_import_spec.rb
+++ b/spec/models/admin/app_type_import_spec.rb
@@ -1,5 +1,10 @@
 # frozen_string_literal: true
 
+# Tests for Admin::AppType import functionality.
+# Verifies that import_config correctly creates app types from exported JSON,
+# including app configurations, user access controls, activity logs,
+# config libraries, and item flag names.
+
 require 'rails_helper'
 
 RSpec.describe 'Import an app configuration', type: :model do
@@ -319,4 +324,45 @@ def import_test_app
     imported_lib_b.update(disabled: true, current_admin: @admin)
     imported_lib_z.update(disabled: true, current_admin: @admin)
   end
+
+  it 'imports item flag names from an exported configuration' do
+    # Create an item flag name associated with a table in the app type
+    existing_flag_name = "Existing Flag #{rand(1_000_000)}"
+    Classification::ItemFlagName.create!(
+      name: existing_flag_name,
+      item_type: 'player_info',
+      current_admin: @admin
+    )
+
+    # Export the app type configuration
+    config = @app_type.export_config
+    exported = JSON.parse(config)
+    expect(exported['app_type']['associated_item_flag_names'].map { |f| f['name'] }).to include(existing_flag_name)
+
+    # Inject a new item flag name into the exported config that does not yet exist in the database
+    new_flag_name = "New Imported Flag #{rand(1_000_000)}"
+    exported['app_type']['associated_item_flag_names'] << {
+      'name' => new_flag_name,
+      'item_type' => 'player_info',
+      'updated_at' => Time.now.iso8601
+    }
+
+    # Import into a new app type using the modified config
+    modified_config = JSON.generate(exported)
+    res, results = Admin::AppTypeImport.import_config(modified_config, @admin, name: 'import_flags_test')
+
+    expect(results).to be_a Hash
+    expect(res).to be_a Admin::AppType
+    expect(res.name).to eq 'import_flags_test'
+
+    # Verify the import processed item flag names
+    expect(results['updates / creations']).to have_key('associated_item_flag_names')
+
+    # Verify the new item flag name was created by the import
+    imported_flag = Classification::ItemFlagName.active.find_by(name: new_flag_name, item_type: 'player_info')
+    expect(imported_flag).to be_present
+
+    # Cleanup
+    res.update(disabled: true, current_admin: @admin)
+  end
 end