propel_api 0.2.1 → 0.3.1

data/lib/generators/propel_api/templates/scaffold/facet_controller_template.rb.tt

@@ -10,15 +10,48 @@ class <%= controller_class_name_with_namespace %>Controller < <%= api_controller
   # Define which parameters are allowed for <%= class_name %> creation/updates
   # This uses the StrongParamsHelper concern from the base controller
 <% end -%>
-  permitted_params <%= permitted_param_names.map { |param| 
-    # If param already contains colon (JSON field syntax), use as-is
-    # Otherwise add colon prefix for regular fields
-    if param.to_s.include?(':')
-      param  # Already formatted as "field: {}" for JSON fields
+  permitted_params <% 
+    # Generate permitted parameters using shared polymorphic support
+    regular_params = []
+    json_params = []
+    
+    # Add attribute-based params using polymorphic support
+    attributes.each do |attr|
+      if attr.type == :json
+        json_params << "#{attr.name}: {}"
+      elsif attr.type == :references
+        # Use Rails' built-in polymorphic detection
+        if attr.respond_to?(:polymorphic?) && attr.polymorphic?
+          regular_params << ":#{attr.name}_id"
+          regular_params << ":#{attr.name}_type" 
+        else
+          regular_params << ":#{attr.name}_id"
+        end
+      else
+        regular_params << ":#{attr.name}"
+      end
+    end
+
+     # Add multi-tenancy params unless skipped
+    if has_organization_reference?
+      regular_params += [":organization_id"]
+    end
+
+    if has_agency_reference?
+      regular_params += [":agency_id"]
+    end
+    
+    # Remove organization/agency duplicates if they were user-specified
+    regular_params.uniq!
+    
+    # Combine regular and JSON params properly
+    if json_params.any?
+      all_params = regular_params + json_params
     else
-      ":#{param}"  # Add colon prefix for regular fields
+      all_params = regular_params
     end
-  }.join(', ') %>
+    
+    -%><%= all_params.join(', ') %>
 
 <% if options[:with_comments] -%>
   # Connect facets to actions - customize as needed for your <%= class_name.downcase %> model
@@ -84,7 +117,7 @@ class <%= controller_class_name_with_namespace %>Controller < <%= api_controller
   #   if @resource.save
   #     render json: { data: resource_json(@resource) }, status: :created
   #   else
-  #     render json: { errors: @resource.errors }, status: :unprocessable_entity
+  #     render json: { errors: @resource.errors }, status: :unprocessable_content
   #   end
   # end
   #

data/lib/generators/propel_api/templates/scaffold/facet_model_template.rb.tt

@@ -3,7 +3,7 @@
 class <%= class_name %> < ApplicationRecord
 
   # Validations
-<% unless options[:skip_tenancy] -%>
+<% if has_organization_reference? -%>
   # Multi-tenancy: Organization is always required
   validates :organization, presence: true
   
@@ -24,7 +24,7 @@ class <%= class_name %> < ApplicationRecord
 <% if attribute.name.to_s.match?(/\A(phone|phone_number)\z/i) -%>
   validates :<%= attribute.name %>, format: { with: /\A\+?[\d\s-\(\)]+\z/ }, allow_nil: <%= !attribute.required? %>
 <% end -%>
-<% if attribute.name.to_s.match?(/\A(url|website|web_address)\z/i) -%>
+<% if attribute.name.to_s.match?(/\A(url|website|web_address|domain|domain_name)\z/i) -%>
   validates :<%= attribute.name %>, format: { with: URI::DEFAULT_PARSER.make_regexp(%w[http https]) }, allow_nil: <%= !attribute.required? %>
 <% end -%>
 <% if attribute.name.to_s.match?(/\Alatitude\z/i) -%>
@@ -45,32 +45,40 @@ class <%= class_name %> < ApplicationRecord
 <% end -%>
 
 # Associations
-<% unless options[:skip_tenancy] -%>
+<% if has_organization_reference? -%>
   # Multi-tenancy: Always include organization and agency for data isolation
   # User/Agent associations are only added when explicitly specified as generator arguments
   belongs_to :organization
+<% end -%>
+<% if has_agency_reference? -%>
   belongs_to :agency
+<% end -%>
+<% if has_organization_reference? || has_agency_reference? -%>
   
 <% end -%>
 <% if defined?(relationship_inferrer) && relationship_inferrer.should_generate_associations? -%>
 <% relationship_inferrer.belongs_to_relationships.each do |relationship| -%>
 <% # Skip organization and agency if tenancy is included (they're already added above) -%>
-<% unless !options[:skip_tenancy] && (relationship.include?('organization') || relationship.include?('agency')) -%>
+<% unless (has_organization_reference? && relationship.include?('organization')) || (has_agency_reference? && relationship.include?('agency')) -%>
   <%= relationship %>
 <% end -%>
 <% end -%>
 <% elsif !options[:skip_associations] -%>
 <% attributes.select { |attr| attr.type == :references }.each do |attribute| -%>
 <% # Skip organization and agency if tenancy is included (they're already added above) -%>
-<% unless !options[:skip_tenancy] && (attribute.name == 'organization' || attribute.name == 'agency') -%>
+<% unless (has_organization_reference? && attribute.name == 'organization') || (has_agency_reference? && attribute.name == 'agency') -%>
 <% if attribute.name == 'organization' -%>
   belongs_to :organization
+<% else -%>
+<% if attribute.respond_to?(:polymorphic?) && attribute.polymorphic? -%>
+  belongs_to :<%= attribute.name %>, polymorphic: true
 <% else -%>
   belongs_to :<%= attribute.name %>  # Add 'optional: true' if this should be optional
 <% end -%>
 <% end -%>
 <% end -%>
 <% end -%>
+<% end -%>
 # Add additional associations here
 # has_many :comments, dependent: :destroy
 
@@ -105,7 +113,13 @@ json_facet :short, fields: [:id<%
      attr.name.to_s !~ security_patterns &&
      attr.name.to_s.length < 20)
   end
-  short_attributes.each do |attribute| -%>, :<%= attribute.name %><% end %>]
+  
+  # Add polymorphic type fields to short facet (important for frontend handling)
+  polymorphic_type_fields = attributes.select { |attr| attr.name.end_with?('_type') && attr.type == :string }
+  # Also include polymorphic associations (which generate _type fields)
+  polymorphic_associations = attributes.select { |attr| attr.type == :references && attr.respond_to?(:polymorphic?) && attr.polymorphic? }
+  
+  short_attributes.each do |attribute| -%>, :<%= attribute.name %><% end %><% polymorphic_type_fields.each do |type_field| -%>, :<%= type_field.name %><% end %><% polymorphic_associations.each do |poly_attr| -%>, :<%= poly_attr.name %>_type<% end %>]
 json_facet :details, fields: [:id<% 
   # Include most fields except timestamps, security-sensitive, and internal Rails fields for details facet
   detail_attributes = attributes.reject do |attr|
@@ -124,6 +138,11 @@ json_facet :details, fields: [:id<%
   # Collect all field names, avoiding duplicates
   all_fields = Set.new
   
+  # Find polymorphic type fields
+  polymorphic_type_fields = attributes.select { |attr| attr.name.end_with?('_type') && attr.type == :string }
+  # Also find polymorphic associations (which generate _type fields)
+  polymorphic_associations = attributes.select { |attr| attr.type == :references && attr.respond_to?(:polymorphic?) && attr.polymorphic? }
+  
   # Add non-reference attributes
   detail_attributes.reject { |attr| attr.type == :references }.each do |attribute|
     all_fields << attribute.name.to_sym
@@ -134,19 +153,33 @@ json_facet :details, fields: [:id<%
     all_fields << "#{reference.name}_id".to_sym
   end
   
-  # Add tenancy references if not skipped
-  unless options[:skip_tenancy]
+  # Add tenancy references if present
+  if has_organization_reference?
     all_fields << :organization_id
+  end
+  if has_agency_reference?
     all_fields << :agency_id
   end
   
+  # Add polymorphic type fields to details facet (important for frontend handling)
+  polymorphic_type_fields.each do |type_field|
+    all_fields << type_field.name.to_sym
+  end
+  # Also add polymorphic association type fields
+  polymorphic_associations.each do |poly_attr|
+    all_fields << "#{poly_attr.name}_type".to_sym
+  end
+  
   # Output the unique fields
   all_fields.to_a.sort.each do |field| -%>, :<%= field %><% end -%>]<%
   
   # Generate include for nested objects (reference associations)
   reference_associations = detail_attributes.select { |attr| attr.type == :references }.map(&:name)
-  unless options[:skip_tenancy]
-    reference_associations += %w[organization agency]
+  if has_organization_reference?
+    reference_associations += %w[organization]
+  end
+  if has_agency_reference?
+    reference_associations += %w[agency]
   end
   reference_associations.uniq!
   

data/lib/generators/propel_api/templates/scaffold/graphiti_controller_template.rb.tt

@@ -55,7 +55,7 @@ class <%= controller_class_name_with_namespace %>Controller < <%= api_controller
   #   if resource_instance.save
   #     respond_with(resource_instance, status: :created)
   #   else
-  #     respond_with(resource_instance.errors, status: :unprocessable_entity)
+  #     respond_with(resource_instance.errors, status: :unprocessable_content)
   #   end
   # end
   #

data/lib/generators/propel_api/templates/scaffold/graphiti_resource_template.rb.tt

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-<% unless options[:skip_tenancy] -%>
+<% if has_organization_reference? || has_agency_reference? -%>
 require_relative '../concerns/tenancy'
 <% end -%>
 
@@ -20,7 +20,7 @@ require_relative '../concerns/tenancy'
 # @see https://www.graphiti.dev/guides/concepts/resources
 #
 class <%= class_name %>Resource < ApplicationResource
-<% unless options[:skip_tenancy] -%>
+<% if has_organization_reference? || has_agency_reference? -%>
   include Tenancy
 <% end -%>
   

data/lib/generators/propel_api/templates/seeds/seeds_template.rb.tt

@@ -13,7 +13,7 @@ puts "📋 Loading fixture data for consistent test/dev experience..."
 
 # Only load fixtures if not already in development environment with existing data
 fixture_count = 0
-<% unless options[:skip_tenancy] -%>
+<% if has_organization_reference? || has_agency_reference? -%>
 if Rails.env.development? && (Organization.count > 0 || User.count > 0)
 <% else -%>
 <% if attributes.any? { |attr| attr.type == :references && attr.name.to_s.match?(/user/) } -%>
@@ -31,8 +31,10 @@ else
   begin
     # Load all necessary fixtures together to handle dependencies
     fixture_files = ['<%= table_name %>']
-<% unless options[:skip_tenancy] -%>
+<% if has_organization_reference? -%>
     fixture_files << 'organizations'
+<% end -%>
+<% if has_agency_reference? -%>
     fixture_files << 'agencies'
 <% end -%>
 <% if attributes.any? { |attr| attr.type == :references && attr.name.to_s.match?(/user/) } -%>
@@ -67,8 +69,10 @@ end
 puts "🎨 Generating additional realistic <%= table_name %> with Faker..."
 
 # Use existing organizations, agencies, and users (from fixtures + any additional ones)
-<% unless options[:skip_tenancy] -%>
+<% if has_organization_reference? -%>
 organizations = Organization.all
+<% end -%>
+<% if has_agency_reference? -%>
 agencies = Agency.all
 
 # If we still don't have enough orgs, create some with Faker
@@ -102,7 +106,7 @@ users = User.all
 
 if users.count < 6
   puts "➕ Creating additional users..."
-<% unless options[:skip_tenancy] -%>
+<% if has_organization_reference? -%>
   organizations.each do |org|
     next if users.where(organization: org).count >= 2
     
@@ -122,7 +126,7 @@ if users.count < 6
       if org_agencies.any?
         # Assign to random agency within organization
         agency = org_agencies.sample
-        Agent.create!(user: new_user, agency: agency, role: 'member')
+        Agent.create!(user: new_user, agency: agency, organization: org, role: 'member')
       end
     end
   end
@@ -145,12 +149,14 @@ end
 
 # Generate varied, realistic data based on the model attributes
 30.times do |i|
-<% unless options[:skip_tenancy] -%>
+<% if has_organization_reference? -%>
   organization = organizations.sample
+<% end -%>
+<% if has_agency_reference? -%>
   agency = agencies.where(organization: organization).sample || agencies.sample
 <% end -%>
 <% if attributes.any? { |attr| attr.type == :references && attr.name.to_s.match?(/user/) } -%>
-<% unless options[:skip_tenancy] -%>
+<% if has_organization_reference? -%>
   user = users.where(organization: organization).sample || users.sample
 <% else -%>
   user = users.sample
@@ -159,16 +165,32 @@ end
   
   <%= singular_table_name %>_attributes = {}
   
-<% unless options[:skip_tenancy] -%>
-  # Multi-tenancy: Always assign organization (required) and agency (optional)
+<% if has_organization_reference? -%>
+  # Multi-tenancy: Assign organization
   <%= singular_table_name %>_attributes[:organization] = organization
-  <%= singular_table_name %>_attributes[:agency] = [agency, nil].sample # 50% chance of having agency
+<% end -%>
+<% if has_agency_reference? -%>
+  # Multi-tenancy: Assign agency
+  <%= singular_table_name %>_attributes[:agency] = agency # Always assign agency for valid records
+<% end -%>
+<% if has_organization_reference? || has_agency_reference? -%>
   
 <% end -%>
+  # Handle polymorphic associations
+<% polymorphic_associations.each do |poly_assoc| -%>
+  # Assign polymorphic association: <%= poly_assoc[:field_name] %>
+  available_parents = <%= poly_assoc[:parent_types].map { |type| "#{type}.limit(5).to_a" }.join(' + ') %>
+  if available_parents.any?
+    selected_parent = available_parents.sample
+    <%= singular_table_name %>_attributes[:<%= poly_assoc[:id_field] %>] = selected_parent.id
+    <%= singular_table_name %>_attributes[:<%= poly_assoc[:type_field] %>] = selected_parent.class.name
+  end
+<% end -%>
+  
   # Assign additional reference attributes dynamically
-<% attributes.select { |attr| attr.type == :references }.each do |reference| -%>
+<% attributes.select { |attr| attr.type == :references && !(attr.respond_to?(:polymorphic?) && attr.polymorphic?) }.each do |reference| -%>
 <% # Skip organization and agency if tenancy is included (they're already assigned above) -%>
-<% unless !options[:skip_tenancy] && (reference.name == 'organization' || reference.name == 'agency') -%>
+<% unless (has_organization_reference? && reference.name == 'organization') || (has_agency_reference? && reference.name == 'agency') -%>
 <% if reference.name.to_s.match?(/user/) -%>
   <%= singular_table_name %>_attributes[:<%= reference.name %>] = user
 <% else -%>
@@ -189,7 +211,7 @@ end
   <%= singular_table_name %>_attributes[:<%= attribute.name %>] = Faker::Internet.unique.username
 <% elsif attribute.name.to_s.match?(/\A(phone|phone_number)\z/i) -%>
   <%= singular_table_name %>_attributes[:<%= attribute.name %>] = Faker::PhoneNumber.phone_number
-<% elsif attribute.name.to_s.match?(/\A(url|website|web_address)\z/i) -%>
+<% elsif attribute.name.to_s.match?(/\A(url|website|web_address|domain|domain_name)\z/i) -%>
   <%= singular_table_name %>_attributes[:<%= attribute.name %>] = Faker::Internet.url
 <% elsif attribute.name.to_s.match?(/\A(slug)\z/i) -%>
   <%= singular_table_name %>_attributes[:<%= attribute.name %>] = Faker::Internet.slug
@@ -312,9 +334,11 @@ puts "\n✅ Created #{<%= class_name %>.count} <%= table_name %>"
 puts "🎯 Creating specific test scenarios..."
 
 # Create some <%= table_name %> with edge case data
-<% unless options[:skip_tenancy] -%>
+<% if has_organization_reference? -%>
 organizations.each do |org|
+<% if has_agency_reference? -%>
   agency = agencies.where(organization: org).sample
+<% end -%>
 <% if attributes.any? { |attr| attr.type == :references && attr.name.to_s.match?(/user/) } -%>
   user = users.where(organization: org).sample
 <% end -%>
@@ -326,8 +350,19 @@ organizations.each do |org|
   minimal_<%= singular_table_name %>[:organization] = org
   minimal_<%= singular_table_name %>[:agency] = agency
   
+  # Handle polymorphic associations
+<% polymorphic_associations.each do |poly_assoc| -%>
+  # Assign polymorphic association: <%= poly_assoc[:field_name] %>
+  available_parents = <%= poly_assoc[:parent_types].map { |type| "#{type}.limit(5).to_a" }.join(' + ') %>
+  if available_parents.any?
+    selected_parent = available_parents.sample
+    minimal_<%= singular_table_name %>[:<%= poly_assoc[:id_field] %>] = selected_parent.id
+    minimal_<%= singular_table_name %>[:<%= poly_assoc[:type_field] %>] = selected_parent.class.name
+  end
+<% end -%>
+  
   # Assign additional reference attributes dynamically
-<% attributes.select { |attr| attr.type == :references }.each do |reference| -%>
+<% attributes.select { |attr| attr.type == :references && !(attr.respond_to?(:polymorphic?) && attr.polymorphic?) }.each do |reference| -%>
 <% # Skip organization and agency if tenancy is included (they're already assigned above) -%>
 <% unless reference.name == 'organization' || reference.name == 'agency' -%>
 <% if reference.name.to_s.match?(/user/) -%>
@@ -393,8 +428,19 @@ end
   # Create a minimal <%= singular_table_name %> (only required fields)
   minimal_<%= singular_table_name %> = {}
   
+  # Handle polymorphic associations
+<% polymorphic_associations.each do |poly_assoc| -%>
+  # Assign polymorphic association: <%= poly_assoc[:field_name] %>
+  available_parents = <%= poly_assoc[:parent_types].map { |type| "#{type}.limit(5).to_a" }.join(' + ') %>
+  if available_parents.any?
+    selected_parent = available_parents.sample
+    minimal_<%= singular_table_name %>[:<%= poly_assoc[:id_field] %>] = selected_parent.id
+    minimal_<%= singular_table_name %>[:<%= poly_assoc[:type_field] %>] = selected_parent.class.name
+  end
+<% end -%>
+  
   # Assign reference attributes dynamically  
-<% attributes.select { |attr| attr.type == :references }.each do |reference| -%>
+<% attributes.select { |attr| attr.type == :references && !(attr.respond_to?(:polymorphic?) && attr.polymorphic?) }.each do |reference| -%>
 <% if reference.name.to_s.match?(/user/) -%>
   minimal_<%= singular_table_name %>[:<%= reference.name %>] = users.sample if users.any?
 <% else -%>
@@ -466,8 +512,10 @@ puts "📊 Summary:"
 puts "   • Total <%= table_name %>: #{total_<%= table_name %>}"
 puts "   • └── Fixture <%= table_name %>: #{fixture_<%= table_name %>} (same as test data)"
 puts "   • └── Faker <%= table_name %>: #{faker_<%= table_name %>} (realistic dev data)"
-<% unless options[:skip_tenancy] -%>
+<% if has_organization_reference? -%>
 puts "   • Organizations: #{Organization.count}"
+<% end -%>
+<% if has_agency_reference? -%>
 puts "   • Agencies: #{Agency.count}"
 puts "   • <%= table_name %> per organization: #{(total_<%= table_name %>.to_f / Organization.count).round(1)} avg"
 <% end -%>

data/lib/generators/propel_api/templates/tests/controller_test_template.rb.tt

@@ -8,6 +8,18 @@ class <%= controller_class_name_with_namespace %>ControllerTest < ActionDispatch
     @organization = organizations(:acme_org)
     @user = users(:john_user)
     @agency = agencies(:marketing_agency)
+<% # Set up polymorphic associations using --parents specification -%>
+<% polymorphic_associations.each do |assoc| -%>
+<% if assoc[:parent_types] && assoc[:parent_types].any? -%>
+<% first_parent = assoc[:parent_types].first -%>
+    # Set up polymorphic association for <%= assoc[:field_name] %> using specified parents
+    @<%= first_parent.underscore %> = <%= first_parent.underscore.pluralize %>(<%= case first_parent.underscore; when 'agency'; ':marketing_agency'; when 'user'; ':john_user'; when 'organization'; ':acme_org'; else; ':one'; end %>)
+    @<%= assoc[:field_name] %> = @<%= first_parent.underscore %>  # Use first specified parent type
+<% assoc[:parent_types][1..-1].each do |parent_type| -%>
+    @<%= parent_type.underscore %> = <%= parent_type.underscore.pluralize %>(<%= case parent_type.underscore; when 'agency'; ':marketing_agency'; when 'user'; ':john_user'; when 'organization'; ':acme_org'; else; ':one'; end %>)
+<% end -%>
+<% end -%>
+<% end -%>
 <% if singular_table_name == 'organization' -%>
     @<%= singular_table_name %> = <%= table_name %>(:acme_org)
 <% elsif singular_table_name == 'user' -%>
@@ -21,7 +33,7 @@ class <%= controller_class_name_with_namespace %>ControllerTest < ActionDispatch
     @auth_headers = { 'Authorization' => "Bearer #{@token}" }
     
     # Ensure test <%= singular_table_name %> belongs to test user's organization
-<% unless singular_table_name == 'organization' -%>
+<% if has_organization_reference? -%>
     @<%= singular_table_name %>.update!(organization: @organization)
 <% end -%>
   end
@@ -98,6 +110,7 @@ class <%= controller_class_name_with_namespace %>ControllerTest < ActionDispatch
     assert_includes pagination.keys, 'prev_page'
   end
   
+<% if has_organization_reference? -%>
   test "should only show records for user's organization" do
     # Create record for different organization
     other_org = Organization.create!(name: "Other Organization")
@@ -148,6 +161,7 @@ class <%= controller_class_name_with_namespace %>ControllerTest < ActionDispatch
     # Should include own organization's record
     assert_includes <%= table_name %>_ids, @<%= singular_table_name %>.id
   end
+<% end -%>
 
   # === SHOW TESTS ===
   
@@ -167,6 +181,7 @@ class <%= controller_class_name_with_namespace %>ControllerTest < ActionDispatch
     assert_response :not_found
   end
   
+<% if has_organization_reference? -%>
   test "should not show <%= singular_table_name %> from different organization" do
     other_org = Organization.create!(name: "Other Organization")
     other_<%= singular_table_name %> = <%= class_name %>.create!(
@@ -207,6 +222,7 @@ class <%= controller_class_name_with_namespace %>ControllerTest < ActionDispatch
     get <%= api_singular_route_helper %>_url(other_<%= singular_table_name %>), headers: @auth_headers
     assert_response :not_found
   end
+<% end -%>
 
   # === CREATE TESTS ===
   
@@ -242,7 +258,7 @@ class <%= controller_class_name_with_namespace %>ControllerTest < ActionDispatch
     created_<%= singular_table_name %> = response_body['data']
     assert_not_nil created_<%= singular_table_name %>, "Response should contain <%= singular_table_name %> data"
     
-<% if class_name != 'Organization' -%>
+<% if has_organization_reference? -%>
     # Verify organization reference (handle both nested and flat formats)
     if created_<%= singular_table_name %>['organization']
       assert_equal @organization.id, created_<%= singular_table_name %>['organization']['id']
@@ -284,7 +300,7 @@ class <%= controller_class_name_with_namespace %>ControllerTest < ActionDispatch
            headers: @auth_headers
     end
     
-    assert_response :unprocessable_entity
+    assert_response :unprocessable_content
     
     response_body = JSON.parse(response.body)
     assert_includes response_body.keys, 'errors'
@@ -317,7 +333,9 @@ class <%= controller_class_name_with_namespace %>ControllerTest < ActionDispatch
 -%>
     
     params = valid_<%= singular_table_name %>_params
+    <% if has_organization_reference? -%>
     params.delete(:organization_id)  # Remove organization_id to test behavior
+    <% end -%>
 <% if has_user_id -%>
     params.delete(:user_id)          # Remove user_id to test behavior
 <% end -%>
@@ -333,15 +351,17 @@ class <%= controller_class_name_with_namespace %>ControllerTest < ActionDispatch
              headers: @auth_headers
       end
       
-      assert_response :unprocessable_entity
+      assert_response :unprocessable_content
       
       # Should return validation errors for missing tenancy
       error_response = JSON.parse(response.body)
       
+      <% if has_organization_reference? -%>
       if require_org_id
         assert_includes error_response['errors'].keys, 'organization_id',
           "Should require organization_id when require_organization_id = true"
       end
+      <% end -%>
 <% if has_user_id -%>
       if require_user_id
         assert_includes error_response['errors'].keys, 'user_id',
@@ -367,7 +387,7 @@ class <%= controller_class_name_with_namespace %>ControllerTest < ActionDispatch
       created_response = JSON.parse(response.body)
       created_<%= singular_table_name %> = created_response['data']
       
-<% unless class_name == 'Organization' -%>
+<% if has_organization_reference? -%>
       # Verify organization_id was auto-assigned
       if created_<%= singular_table_name %>['organization']
         assert_equal @user.organization.id, created_<%= singular_table_name %>['organization']['id'],
@@ -423,12 +443,13 @@ class <%= controller_class_name_with_namespace %>ControllerTest < ActionDispatch
           params: { data: invalid_<%= singular_table_name %>_params },
           headers: @auth_headers
     
-    assert_response :unprocessable_entity
+    assert_response :unprocessable_content
     
     response_body = JSON.parse(response.body)
     assert_includes response_body.keys, 'errors'
   end
   
+<% if has_organization_reference? -%>
   test "should not update <%= singular_table_name %> from different organization" do
     other_org = Organization.create!(name: "Other Organization")
     other_<%= singular_table_name %> = <%= class_name %>.create!(
@@ -483,6 +504,9 @@ class <%= controller_class_name_with_namespace %>ControllerTest < ActionDispatch
     assert_response :no_content
   end
   
+<% end -%>
+
+<% if has_organization_reference? -%>
   test "should not destroy <%= singular_table_name %> from different organization" do
     other_org = Organization.create!(name: "Other Organization")
     other_<%= singular_table_name %> = <%= class_name %>.create!(
@@ -526,6 +550,7 @@ class <%= controller_class_name_with_namespace %>ControllerTest < ActionDispatch
     
     assert_response :not_found
   end
+<% end -%>
 
   # === PARAMETER HANDLING TESTS ===
   
@@ -664,12 +689,21 @@ class <%= controller_class_name_with_namespace %>ControllerTest < ActionDispatch
 
 <% attributes.each_with_index do |attribute, index| -%>
 <% if attribute.type == :references -%>
+<% if attribute.respond_to?(:polymorphic?) && attribute.polymorphic? -%>
+      <%= attribute.name %>_id: @<%= attribute.name %>.id,
+      <%= attribute.name %>_type: @<%= attribute.name %>.class.name<%= ',' if index < attributes.length - 1 %>
+<% else -%>
       <%= attribute.name %>_id: @<%= attribute.name %>.id<%= ',' if index < attributes.length - 1 %>
+<% end -%>
 <% elsif attribute.type == :string && !reference_names.include?(attribute.name) -%>
 <% if attribute.name.to_s.match?(/email/) -%>
       <%= attribute.name %>: "test@example.com"<%= ',' if index < attributes.length - 1 %>
 <% elsif attribute.name.to_s.match?(/password/) -%>
       <%= attribute.name %>: "password123"<%= ',' if index < attributes.length - 1 %>
+<% elsif attribute.name.to_s.match?(/\A(url|website|web_address|domain|domain_name)\z/i) -%>
+      <%= attribute.name %>: "https://example.com"<%= ',' if index < attributes.length - 1 %>
+<% elsif attribute.name.to_s.end_with?('_type') -%>
+      <%= attribute.name %>: @<%= attribute.name.gsub('_type', '') %>.class.name<%= ',' if index < attributes.length - 1 %>
 <% else -%>
       <%= attribute.name %>: "Test <%= attribute.name.humanize %>"<%= ',' if index < attributes.length - 1 %>
 <% end -%>