activeitem 0.0.15 → 0.0.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2706d94d7f88c19fdb9fc14d8a9408d1f8dc088a5eabf2e583d60351173b9870
-  data.tar.gz: 41c8e00d8b5a45ec26b58123efc86437795e1921c59dc8c44f3a770727496702
+  metadata.gz: 3a4b1c7cc7af49e67776f895886bdf472d1e801ab3280f3ea28101bd20b8a701
+  data.tar.gz: 7415931df8a26b187e4a9ab52586b67c7cea08f0fa3a476ab09b863c02250835
 SHA512:
-  metadata.gz: 41689642db2d18371ae7f9c7987a72d001f3aa18d5e7bb3f0a7248100e5de2a8aa6cb039742057c176bfb6f9eeaa02a240847d50c64f6f02c54372da6c069020
-  data.tar.gz: 5c1a35c85c0b6d641fd630681fccb4995637eb733c50eada9a197a1c2fd503cc62855c1ad14eb81e19ccf324e1da2941ab93cbf87b72e5116285b8b5e49ed7a8
+  metadata.gz: b8c97c1ffadb921d440702b5299cf4bb219ba97ad0351cef7bebfea1125e74bf027ddc0546e1a254da8d6da8952598bf170368404c6ab65074ecc8379bfaec3b
+  data.tar.gz: b9936169d15857e1423de8f622ddfe85b7be05458739f569ce1983dd6565f234ae2789f12978ac530106cc98203906a99b9666805d1e2e43c7e0a275e7c41d06

data/lib/active_item/associations.rb

@@ -143,9 +143,13 @@ module ActiveItem
                        "#{association_name.to_s.camelize}Index"
                      end
 
+        # Store partition key in DynamoDB format (camelCase) for consistency
+        # with RECENT_INDEX and explicit index definitions
+        dynamo_key = to_dynamo_key(foreign_key)
+
         @_belongs_to_indexes ||= {}
         @_belongs_to_indexes = @_belongs_to_indexes.merge(
-          index_name => { partition_key: foreign_key }
+          index_name => { partition_key: dynamo_key }
         )
       end
     end

data/lib/active_item/relation.rb

@@ -559,6 +559,12 @@ module ActiveItem
       else
         paginated_scan_with_conditions(normalized_conditions, exclusive_start_key, per_page)
       end
+    rescue Aws::DynamoDB::Errors::ValidationException => e
+      raise unless e.message.include?('specified index')
+
+      warn "[ActiveItem] WARNING: Index not found on table '#{resolved_model.table_name}'. " \
+           'Falling back to table scan. Create the index: belt setup tables && belt deploy'
+      paginated_scan_with_conditions(normalized_conditions, exclusive_start_key, per_page)
     rescue Aws::DynamoDB::Errors::AccessDeniedException => e
       raise ActiveItem::AccessDeniedError.new(model_name: resolved_model.name, table: resolved_model.table_name,
                                               operation: 'PaginatedQuery', original_error: e)
@@ -788,7 +794,7 @@ module ActiveItem
                   effective_index = index_name || resolved_model.send(:detect_index_for_conditions, normalized_conditions)
 
                   if effective_index && normalized_conditions.any?
-                    query_with_index_normalized(effective_index, normalized_conditions)
+                    query_with_index_or_fallback(effective_index, normalized_conditions)
                   else
                     scan_with_conditions_normalized(normalized_conditions)
                   end
@@ -838,6 +844,13 @@ module ActiveItem
       end
 
       limit_value ? [total, limit_value].min : total
+    rescue Aws::DynamoDB::Errors::ValidationException => e
+      raise unless e.message.include?('specified index')
+
+      warn "[ActiveItem] WARNING: Index not found on table '#{resolved_model.table_name}'. " \
+           'Falling back to table scan for count. Create the index: belt setup tables && belt deploy'
+      # Retry without the index
+      count_via_scan(normalized_conditions)
     rescue Aws::DynamoDB::Errors::AccessDeniedException => e
       raise ActiveItem::AccessDeniedError.new(model_name: resolved_model.name, table: resolved_model.table_name,
                                               operation: 'Count', original_error: e)
@@ -911,6 +924,26 @@ module ActiveItem
       params
     end
 
+    # Fallback count via scan when an index is missing
+    def count_via_scan(normalized_conditions)
+      total = 0
+      exclusive_start_key = nil
+
+      loop do
+        params = build_count_scan_params(normalized_conditions)
+        params[:exclusive_start_key] = exclusive_start_key if exclusive_start_key
+        params[:limit] = limit_value if limit_value
+
+        response = resolved_model.dynamodb.scan(params)
+        total += response.count
+        exclusive_start_key = response.last_evaluated_key
+        break unless exclusive_start_key
+        break if limit_value && total >= limit_value
+      end
+
+      limit_value ? [total, limit_value].min : total
+    end
+
     # Build scan params for a count-only scan
     def build_count_scan_params(normalized_conditions)
       filter_parts = []
@@ -1082,6 +1115,18 @@ module ActiveItem
       foreign_key.to_s == attr_name ? nil : foreign_key.to_s
     end
 
+    # Attempt a GSI query, falling back to a filtered scan if the index doesn't exist.
+    # Logs a warning when falling back so the developer knows to create the index.
+    def query_with_index_or_fallback(idx_name, normalized_conditions)
+      query_with_index_normalized(idx_name, normalized_conditions)
+    rescue Aws::DynamoDB::Errors::ValidationException => e
+      raise unless e.message.include?('specified index')
+
+      warn "[ActiveItem] WARNING: Index '#{idx_name}' not found on table '#{resolved_model.table_name}'. " \
+           'Falling back to table scan. Create the index for better performance: belt setup tables && belt deploy'
+      scan_with_conditions_normalized(normalized_conditions)
+    end
+
     def query_with_index_normalized(idx_name, normalized_conditions)
       # Get the partition key from conditions (Ruby snake_case)
       ruby_partition_key = normalized_conditions.keys.first.to_s
@@ -1090,6 +1135,7 @@ module ActiveItem
       # Get the actual DynamoDB partition key name from the index definition
       # The index definition stores the DynamoDB key name (which may be camelCase)
       index_config = resolved_model.indexes[idx_name] || {}
+      # Always convert to DynamoDB key format (camelCase) for the expression
       dynamo_partition_key = index_config[:partition_key]&.to_s || resolved_model.to_dynamo_key(ruby_partition_key)
 
       return fanout_query(idx_name, normalized_conditions, index_config, dynamo_partition_key, partition_value) if partition_value.is_a?(Array)

data/lib/active_item/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ActiveItem
-  VERSION = '0.0.15'
+  VERSION = '0.0.17'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activeitem
 version: !ruby/object:Gem::Version
-  version: 0.0.15
+  version: 0.0.17
 platform: ruby
 authors:
 - Andy Davis