From d526fa30f4f0c2134bbc5d7855de5875cf8c2f62 Mon Sep 17 00:00:00 2001
From: Gregory Ballantine <gballantine@metaunix.net>
Date: Wed, 15 Apr 2026 13:58:44 -0400
Subject: [PATCH] Updated Test and Result views/routes to use BenchmarkProfile

---
 src/controllers/result.rb | 2 +-
 src/controllers/test.rb   | 8 ++++----
 src/models/test.rb        | 2 +-
 views/test/add.erb        | 4 +++-
 views/test/edit.erb       | 4 +++-
 views/test/index.erb      | 2 +-
 views/test/view.erb       | 8 ++++----
 7 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/src/controllers/result.rb b/src/controllers/result.rb
index 1b3861d..d99c894 100644
--- a/src/controllers/result.rb
+++ b/src/controllers/result.rb
@@ -12,7 +12,7 @@ class ResultController < BaseController
 
     Result.create(
       test_id: params[:result_test],
-      benchmark_id: params[:result_benchmark],
+      benchmark_profile_id: params[:result_benchmark],
       avg_score: params[:result_average],
       min_score: result_minimum,
       max_score: result_maximum
diff --git a/src/controllers/test.rb b/src/controllers/test.rb
index 6e0de42..2c61180 100644
--- a/src/controllers/test.rb
+++ b/src/controllers/test.rb
@@ -42,7 +42,7 @@ class TestController < BaseController
     benchmarks = Array(params[:test_benchmarks])
     # associate the benchmarks to the test
     benchmarks.each do |b|
-      tst.add_benchmark(b)
+      tst.add_benchmark_profile(b)
     end
 
     redirect "/test/#{tst.id}"
@@ -81,13 +81,13 @@ class TestController < BaseController
     selected_benchmarks = Array(params[:test_benchmarks])
 
     # remove benchmarks no longer associated with the test
-    tst.benchmarks.dup.each do |b|
-      tst.remove_benchmark(b.id) unless selected_benchmarks.include?(b.id)
+    tst.benchmark_profiles.dup.each do |b|
+      tst.remove_benchmark_profile(b.id) unless selected_benchmarks.include?(b.id)
     end
 
     # associate the benchmarks to the test
     selected_benchmarks.each do |b|
-      tst.add_benchmark(b) unless tst.benchmark?(b)
+      tst.add_benchmark_profile(b) unless tst.benchmark?(b)
     end
 
     redirect "/test/#{tst.id}"
diff --git a/src/models/test.rb b/src/models/test.rb
index 6a6ac85..1f52b96 100644
--- a/src/models/test.rb
+++ b/src/models/test.rb
@@ -8,7 +8,7 @@ class Test < Sequel::Model
   many_to_many :benchmark_profiles
 
   def benchmark?(benchmark_id)
-    return benchmark_profiles_dataset.where(Sequel[:benchmark][:id] => benchmark_id).any?
+    return benchmark_profiles_dataset.where(Sequel[:benchmark_profiles][:id] => benchmark_id).any?
   end
 
 end
diff --git a/views/test/add.erb b/views/test/add.erb
index 6c9e2d0..7164c42 100644
--- a/views/test/add.erb
+++ b/views/test/add.erb
@@ -28,8 +28,10 @@
         <label for="test_benchmarks">Benchmarks</label>
         <select id="test_benchmarks" class="form-select" name="test_benchmarks[]" multiple>
           <% for b in benchmarks %>
-            <option value="<%= b.id %>"><%= b.name %></option>
+            <% for bp in b.benchmark_profiles %>
+              <option value="<%= bp.id %>"><%= bp.display_name %></option>
             <% end %>
+          <% end %>
         </select>
       </div>
 
diff --git a/views/test/edit.erb b/views/test/edit.erb
index 154ed86..2b6484d 100644
--- a/views/test/edit.erb
+++ b/views/test/edit.erb
@@ -28,8 +28,10 @@
         <label for="test_benchmarks">Benchmarks</label>
         <select id="test_benchmarks" class="form-select" name="test_benchmarks[]" multiple>
           <% for b in benchmarks %>
-            <option value="<%= b.id %>" <% if test.benchmark?(b.id) %>selected<% end %>><%= b.name %></option>
+            <% for bp in b.benchmark_profiles %>
+              <option value="<%= bp.id %>" <% if test.benchmark?(bp.id) %>selected<% end %>><%= bp.display_name %></option>
             <% end %>
+          <% end %>
         </select>
       </div>
 
diff --git a/views/test/index.erb b/views/test/index.erb
index 7717b15..5a6bb15 100644
--- a/views/test/index.erb
+++ b/views/test/index.erb
@@ -26,7 +26,7 @@
           <% tests.each do |t| %>
             <tr>
               <td><a href="/test/<%= t.id %>"><%= t.name %></a></td>
-              <td><%= t.benchmarks.length %></td>
+              <td><%= t.benchmark_profiles.length %></td>
               <td><%= date_format(t.created_at) %></td>
               <td><%= date_format(t.updated_at) %></td>
             </tr>
diff --git a/views/test/view.erb b/views/test/view.erb
index 001ac24..78dda69 100644
--- a/views/test/view.erb
+++ b/views/test/view.erb
@@ -28,8 +28,8 @@
         <div class="col-12 col-md-5 mb-3 mb-md-0">
           <label for="result_benchmark">Add benchmark result:</label>
           <select class="form-select" id="result_benchmark" name="result_benchmark">
-            <% test.benchmarks.each do |b| %>
-              <option value="<%= b.id %>"><%= b.name %></option>
+            <% test.benchmark_profiles.each do |b| %>
+              <option value="<%= b.id %>"><%= b.display_name %></option>
             <% end %>
           </select>
         </div>
@@ -71,8 +71,8 @@
         </tr>
       </thead>
       <tbody>
-        <% test.benchmarks.each do |benchmark| %>
-          <tr data-benchmark-id="<%= benchmark.id %>"></tr>
+        <% test.benchmark_profiles.each do |bp| %>
+          <tr data-benchmark-id="<%= bp.id %>"></tr>
         <% end %>
       </tbody>
     </table>