Raise MissingHashKey in non-transactional #find when a partition key is nil

Author: andrykonchin

lib/dynamoid/finders.rb

@@ -107,17 +107,27 @@ def find_by_id(id, options = {})
 
       # @private
       def _find_all(ids, options = {})
-        raise Errors::MissingRangeKey if range_key && ids.any? { |_pk, sk| sk.nil? }
-
         ids = ids.map do |id|
           if range_key
             # expect [hash key, range key] pair
             pk, sk = id
+
+            if pk.nil?
+              raise Errors::MissingHashKey
+            end
+            if sk.nil?
+              raise Errors::MissingRangeKey
+            end
+
             pk_dumped = cast_and_dump(hash_key, pk)
             sk_dumped = cast_and_dump(range_key, sk)
 
             [pk_dumped, sk_dumped]
           else
+            if id.nil?
+              raise Errors::MissingHashKey
+            end
+
             cast_and_dump(hash_key, id)
           end
         end
@@ -157,6 +167,7 @@ def _find_all(ids, options = {})
 
       # @private
       def _find_by_id(id, options = {})
+        raise Errors::MissingHashKey if id.nil?
         raise Errors::MissingRangeKey if range_key && options[:range_key].nil?
 
         partition_key_dumped = cast_and_dump(hash_key, id)

spec/dynamoid/finders_spec.rb

@@ -27,6 +27,13 @@
             klass.find('wrong-id')
           }.to raise_error(Dynamoid::Errors::RecordNotFound, "Couldn't find Document with primary key \"wrong-id\"")
         end
+
+        it 'raises MissingHashKey when partition key is nil' do
+          klass.create_table
+          expect {
+            klass.find(nil)
+          }.to raise_error(Dynamoid::Errors::MissingHashKey)
+        end
       end
 
       context 'composite primary key' do
@@ -42,6 +49,14 @@
           }.to raise_error(Dynamoid::Errors::RecordNotFound, "Couldn't find Cat with primary key (\"wrong-id\",100500)")
         end
 
+        it 'raises MissingHashKey when partition key is nil' do
+          obj = klass_with_composite_key.create!(age: 12)
+
+          expect {
+            klass_with_composite_key.find(nil, range_key: obj.age)
+          }.to raise_error(Dynamoid::Errors::MissingHashKey)
+        end
+
         it 'raises MissingRangeKey when range key is not specified' do
           obj = klass_with_composite_key.create!(age: 12)
 
@@ -171,6 +186,14 @@
           }.to raise_error(Dynamoid::Errors::RecordNotFound,
                            "Couldn't find all Documents with primary keys [\"wrong-id\"] (found 0 results, but was looking for 1)")
         end
+
+        it 'raises MissingHashKey when any partition key is nil' do
+          obj1, _ = (1..2).map { klass.create! }
+
+          expect {
+            klass.find([obj1.id, nil])
+          }.to raise_error(Dynamoid::Errors::MissingHashKey)
+        end
       end
 
       context 'composite primary key' do
@@ -214,9 +237,22 @@
           expect(klass_with_composite_key.find([obj1.id, obj1.age], [obj2.id, obj2.age])).to match_array(objects)
         end
 
+        it 'raises MissingHashKey when any partition key is nil' do
+          objects = (1..2).map { |i| klass_with_composite_key.create!(age: i) }
+          obj1, obj2 = objects
+
+          expect {
+            klass_with_composite_key.find([[obj1.id, obj1.age], [nil, obj2.age]])
+          }.to raise_error(Dynamoid::Errors::MissingHashKey)
+        end
+
         it 'raises MissingRangeKey when range key is not specified' do
           obj1, obj2 = klass_with_composite_key.create!([{ age: 1 }, { age: 2 }])
 
+          expect {
+            klass_with_composite_key.find([[obj1.id, obj1.age], [obj2.id, nil]])
+          }.to raise_error(Dynamoid::Errors::MissingRangeKey)
+
           expect {
             klass_with_composite_key.find([obj1.id, obj2.id])
           }.to raise_error(Dynamoid::Errors::MissingRangeKey)