Error messages for invalid NodeID (#1826)

Fixes #1824 --------- Co-authored-by: Martijn Visser <[email protected]>
Deltares · Sep 19, 2024 · 87f535f · 87f535f
1 parent e2a66ab
commit 87f535f
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 2 deletions.
diff --git a/core/src/parameter.jl b/core/src/parameter.jl
@@ -62,7 +62,9 @@ function NodeID(type::NodeType.T, value::Integer, db::DB)::NodeID
             ),
         ),
     )
-    @assert idx > 0
+    if idx <= 0
+        error("Node ID #$value of type $type is not in the Node table.")
+    end
     return NodeID(type, value, idx)
 end
 
@@ -72,7 +74,9 @@ function NodeID(value::Integer, db::DB)::NodeID
         db,
         "SELECT COUNT(*), node_type FROM Node WHERE node_type == (SELECT node_type FROM Node WHERE node_id == $value) AND node_id <= $value",
     )
-    @assert only(idx) > 0
+    if only(idx) <= 0
+        error("Node ID #$value is not in the Node table.")
+    end
     return NodeID(only(type), value, only(idx))
 end
 

diff --git a/core/test/validation_test.jl b/core/test/validation_test.jl
@@ -475,3 +475,28 @@ end
     @test logger.logs[3].message ==
           "Missing priority parameter(s) for a FlowDemand / static node in the allocation problem."
 end
+
+@testitem "Node ID not in Node table" begin
+    using Ribasim
+    import SQLite
+    using Logging
+
+    toml_path = normpath(@__DIR__, "../../generated_testmodels/basic/ribasim.toml")
+
+    cfg = Ribasim.Config(toml_path)
+    db_path = Ribasim.input_path(cfg, cfg.database)
+    db = SQLite.DB(db_path)
+
+    logger = TestLogger()
+    with_logger(logger) do
+        @test_throws "Node ID #1 of type PidControl is not in the Node table." Ribasim.NodeID(
+            :PidControl,
+            1,
+            db,
+        )
+    end
+
+    with_logger(logger) do
+        @test_throws "Node ID #20 is not in the Node table." Ribasim.NodeID(20, db)
+    end
+end