ROAD-607: Action Plan should only include approved stories (#322)

* Action Plan should only include approved stories

Closes #321

* Update scope's name

* VLT-1: Improve specs related to approved stories.

---------

Co-authored-by: Francois Buys <buys.fran@gmail.com>

app/controllers/action_plans_controller.rb

@@ -3,7 +3,7 @@ class ActionPlansController < ApplicationController
 
   def show
     @project = Project.find(params[:project_id])
-    @project_stories = @project.stories.by_position
-    @children = Project.sub_projects_with_ordered_stories(@project.id)
+    @project_stories = @project.stories.approved.by_position
+    @children = Project.sub_projects_with_approved_and_ordered_stories(@project.id)
   end
 end

app/models/project.rb

@@ -13,9 +13,10 @@ class Project < ApplicationRecord
 
   scope :active, -> { where.not(status: "archived").or(where(status: nil)) }
   scope :parents, -> { where(parent: nil) }
-  scope :sub_projects_with_ordered_stories, ->(project_id) {
+  scope :sub_projects_with_approved_and_ordered_stories, ->(project_id) {
     where(parent_id: project_id)
       .includes(:stories).references(:stories)
+      .where(stories: {status: :approved})
       .order("projects.position ASC, stories.position ASC NULLS FIRST")
   }
 

spec/features/action_plan_generate_spec.rb

@@ -8,15 +8,17 @@
 
   let!(:project) do
     FactoryBot.create(:project, parent: parent).tap do |project|
-      FactoryBot.create(:story, title: "Second Story", description: "Second", position: 2, project: project, extra_info: "Extra Information")
-      FactoryBot.create(:story, title: "First Story", description: "First", position: 1, project: project)
+      FactoryBot.create(:story, :approved, title: "Second Story", description: "Second", position: 3, project: project, extra_info: "Extra Information")
+      FactoryBot.create(:story, :approved, title: "First Story", description: "First", position: 1, project: project)
+      FactoryBot.create(:story, :pending, title: "Pending task", description: "Pending description", position: 2, project: project)
+      FactoryBot.create(:story, :rejected, title: "Rejected task", description: "Rejected description", position: 4, project: project)
     end
   end
 
   let!(:project2) do
     FactoryBot.create(:project, parent: parent).tap do |project|
-      FactoryBot.create(:story, title: "Third Story", description: "Third", position: 2, project: project)
-      FactoryBot.create(:story, title: "Forth Story", description: "Forth", position: 1, project: project)
+      FactoryBot.create(:story, :approved, title: "Third Story", description: "Third", position: 2, project: project)
+      FactoryBot.create(:story, :approved, title: "Forth Story", description: "Forth", position: 1, project: project)
     end
   end
 

spec/models/project_spec.rb

@@ -21,18 +21,19 @@
     expect(sub_project2.position).to eq 2
   end
 
-  describe ".with_ordered_descendents" do
+  describe ".sub_projects_with_approved_and_ordered_stories" do
     it "orders sub projects properly" do
       parent = FactoryBot.create(:project)
       sub_project1 = FactoryBot.create(:project, parent: parent, position: 2)
-      story_5 = FactoryBot.create(:story, project: sub_project1, position: 2)
-      story_4 = FactoryBot.create(:story, project: sub_project1, position: 1)
-      story_6 = FactoryBot.create(:story, project: sub_project1, position: 3)
+      story_5 = FactoryBot.create(:story, :approved, project: sub_project1, position: 2)
+      story_4 = FactoryBot.create(:story, :approved, project: sub_project1, position: 1)
+      story_6 = FactoryBot.create(:story, :approved, project: sub_project1, position: 3)
+
       sub_project2 = FactoryBot.create(:project, parent: parent, position: 1)
-      story_3 = FactoryBot.create(:story, project: sub_project2, position: 3)
-      story_1 = FactoryBot.create(:story, project: sub_project2, position: 1)
-      story_2 = FactoryBot.create(:story, project: sub_project2, position: 2)
-      sub_projects = Project.sub_projects_with_ordered_stories(parent.id)
+      story_3 = FactoryBot.create(:story, :approved, project: sub_project2, position: 3)
+      story_1 = FactoryBot.create(:story, :approved, project: sub_project2, position: 1)
+      story_2 = FactoryBot.create(:story, :approved, project: sub_project2, position: 2)
+      sub_projects = Project.sub_projects_with_approved_and_ordered_stories(parent.id)
 
       expect(sub_projects.count).to eq 2
       expect(sub_projects[0].id).to eq sub_project2.id

spec/models/story_spec.rb

@@ -115,4 +115,14 @@
       end
     end
   end
+
+  describe ".approved" do
+    it "returns only approved stories" do
+      approved_stories = FactoryBot.create_list(:story, 2, :approved)
+      FactoryBot.create(:story, :rejected)
+      FactoryBot.create(:story, :pending)
+
+      expect(Story.approved.map(&:id).sort).to eq(approved_stories.map(&:id).sort)
+    end
+  end
 end