Find inputs and fields by ID manually if not found in the map

Author: adazem009

src/scratch/block.cpp

@@ -199,6 +199,12 @@ Input *Block::findInputById(int id) const
 {
     if (impl->inputMap.count(id) == 1)
         return impl->inputMap.at(id);
+    else {
+        auto it = std::find_if(impl->inputs.begin(), impl->inputs.end(), [id](std::shared_ptr<Input> input) { return input->inputId() == id; });
+
+        if (it != impl->inputs.end())
+            return it->get();
+    }
     return nullptr;
 }
 
@@ -255,6 +261,12 @@ Field *Block::findFieldById(int id) const
 {
     if (impl->fieldMap.count(id) == 1)
         return impl->fieldMap.at(id);
+    else {
+        auto it = std::find_if(impl->fields.begin(), impl->fields.end(), [id](std::shared_ptr<Field> field) { return field->fieldId() == id; });
+
+        if (it != impl->fields.end())
+            return it->get();
+    }
     return nullptr;
 }
 

test/scratch_classes/block_test.cpp

@@ -118,6 +118,11 @@ TEST_F(BlockTest, Inputs)
     ASSERT_EQ(block.findInputById(11), i1.get());
     ASSERT_EQ(block.findInputById(12), i2.get());
     ASSERT_EQ(block.findInputById(15), i3.get());
+
+    auto i4 = std::make_shared<Input>("VALUE4", Input::Type::Shadow);
+    block.addInput(i4);
+    i4->setInputId(20);
+    ASSERT_EQ(block.findInputById(20), i4.get());
 }
 
 TEST_F(BlockTest, Fields)
@@ -153,6 +158,11 @@ TEST_F(BlockTest, Fields)
     ASSERT_EQ(block.findFieldById(11), f1.get());
     ASSERT_EQ(block.findFieldById(12), f2.get());
     ASSERT_EQ(block.findFieldById(15), f3.get());
+
+    auto f4 = std::make_shared<Field>("VARIABLE4", Value());
+    block.addField(f4);
+    f4->setFieldId(20);
+    ASSERT_EQ(block.findFieldById(20), f4.get());
 }
 
 TEST_F(BlockTest, Shadow)