add scopes in story

Author: gabrielcicero45

app/controllers/beta/project_boards_controller.rb

@@ -12,8 +12,7 @@ def show
     @project = result.success.project
     authorize @project, policy_class: Beta::ProjectPolicy
 
-    response = result.success.as_json(root: false)
-    render json: response
+    render json: result.success.as_json(root: false)
   end
 
   private

app/models/story.rb

@@ -20,6 +20,18 @@ class Story < ApplicationRecord
                                start_date.beginning_of_day,
                                end_date.end_of_day)
                            }
+  scope :not_accepted_or_recently_accepted, ->(current_iteration_start) { where.not(state: 'accepted').or(where("accepted_at >= ?", current_iteration_start))}
+  scope :collapsed_story, -> {select(
+    :id,
+    :title,
+    :description,
+    :estimate,
+    :story_type,
+    :state,
+    :requested_by_name,
+    :owned_by_initials,
+    :project_id
+  )}
 
   delegate :suppress_notifications, to: :project
 

app/operations/beta/project_board_operations/read.rb

@@ -56,25 +56,15 @@ def stories_and_past_iterations
         yield Success(
           stories: @active_stories,
           past_iterations: past_iterations
-              )
+        )
       end
 
       def active_stories
         @active_stories ||= begin
             project
               .stories
-              .where("state != 'accepted' OR accepted_at >= ?", current_iteration_start)
-              .select(
-                :id,
-                :title,
-                :description,
-                :estimate,
-                :story_type,
-                :state,
-                :requested_by_name,
-                :owned_by_initials,
-                :project_id
-              )
+              .not_accepted_or_recently_accepted(current_iteration_start)
+              .collapsed_story
               .order('updated_at DESC')
           end
 

app/operations/story_operations/read_all.rb

@@ -35,7 +35,7 @@ def active_stories
           project
             .stories
             .with_dependencies
-            .where("state != 'accepted' OR accepted_at >= ?", current_iteration_start)
+            .not_accepted_or_recently_accepted(current_iteration_start)
             .order('updated_at DESC')
         end