Add sprint/type filters to TaskBoards::CreateService queries

Co-authored-by: myabc <755+myabc@users.noreply.github.com>

Author: Copilot

modules/backlogs/app/controllers/rb_taskboards_controller.rb

@@ -40,7 +40,7 @@ def show
   private
 
   def load_or_create_board
-    result = TaskBoards::CreateService.ensure(user: current_user, project: @project, name: @sprint.board_name)
+    result = TaskBoards::CreateService.ensure(user: current_user, project: @project, sprint: @sprint, name: @sprint.board_name)
 
     if result.success?
       @board = result.result

modules/backlogs/app/services/task_boards/create_service.rb

@@ -29,11 +29,11 @@
 #++
 
 class TaskBoards::CreateService
-  def self.ensure(user:, project:, name:)
+  def self.ensure(user:, project:, sprint:, name:)
     board = ::Boards::Grid.find_by(project:, name:)
     return ServiceResult.success(result: board) if board
 
-    new(user:).call(project:, name:)
+    new(user:).call(project:, sprint:, name:)
   rescue ActiveRecord::RecordNotUnique
     ServiceResult.success(result: ::Boards::Grid.find_by!(project:, name:))
   end
@@ -44,16 +44,16 @@ def initialize(user:)
     @user = user
   end
 
-  def call(project:, name:)
-    create(project:, name:)
+  def call(project:, sprint:, name:)
+    create(project:, sprint:, name:)
   end
 
   private
 
-  def create(project:, name:)
+  def create(project:, sprint:, name:)
     ApplicationRecord.transaction do
       statuses = Type.find(Task.type).statuses
-      queries  = create_queries(statuses, project:)
+      queries  = create_queries(statuses, project:, sprint:)
       widgets  = build_widgets(queries)
 
       grid = ::Boards::Grid.create!(
@@ -86,12 +86,14 @@ def build_widgets(queries)
     end
   end
 
-  def create_queries(statuses, project:)
+  def create_queries(statuses, project:, sprint:)
     statuses.map do |status|
       Query.new_default(project:, user:).tap do |query|
         query.name = status.name
         query.public = true
         query.add_filter("status_id", "=", [status.id])
+        query.add_filter("version_id", "=", [sprint.id.to_s])
+        query.add_filter("type_id", "=", [Task.type.to_s])
         query.sort_criteria = [[:manual_sorting, "asc"]]
         query.save!
       end

modules/backlogs/spec/services/task_boards/create_service_spec.rb

@@ -33,6 +33,7 @@
 RSpec.describe TaskBoards::CreateService do
   let(:user) { create(:user) }
   let(:project) { create(:project) }
+  let(:sprint) { create(:sprint, project:) }
   let(:type_task) { create(:type_task) }
   let(:status1) { create(:status) }
   let(:status2) { create(:status) }
@@ -47,7 +48,7 @@
   end
 
   describe ".ensure" do
-    subject(:result) { described_class.ensure(user:, project:, name: "Test Board") }
+    subject(:result) { described_class.ensure(user:, project:, sprint:, name: "Test Board") }
 
     context "when a board with the given name already exists" do
       let!(:existing_board) { create(:board_grid_with_query, project:, name: "Test Board") }
@@ -91,7 +92,7 @@
   end
 
   describe "#call" do
-    subject(:result) { instance.call(project:, name: "Test Board") }
+    subject(:result) { instance.call(project:, sprint:, name: "Test Board") }
 
     context "when successful" do
       it { is_expected.to be_success }
@@ -115,6 +116,26 @@
           "attribute" => "status"
         )
       end
+
+      it "filters each query by the sprint version" do
+        result.result.widgets.each do |widget|
+          query = Query.find(widget.options[:query_id])
+          version_filter = query.filters.find { |f| f.field.to_s == "version_id" }
+          expect(version_filter).not_to be_nil
+          expect(version_filter.operator).to eq("=")
+          expect(version_filter.values).to eq([sprint.id.to_s])
+        end
+      end
+
+      it "filters each query by the task type" do
+        result.result.widgets.each do |widget|
+          query = Query.find(widget.options[:query_id])
+          type_filter = query.filters.find { |f| f.field.to_s == "type_id" }
+          expect(type_filter).not_to be_nil
+          expect(type_filter.operator).to eq("=")
+          expect(type_filter.values).to eq([type_task.id.to_s])
+        end
+      end
     end
 
     context "when grid creation fails" do