Refactor PastIteration mounting process

CHANGELOG.md

@@ -1,9 +1,14 @@
 # Changelog
 
 ## [Unreleased]
+### Added
 - New endpoint to update batch stories
 - Replace polling with Pusher to fetch project updates
 
+### Fixed
+- StoryOperations reading refactored to optimize queries and performance
+- Fixes the project export process, to properly generate the downloadable CSV file 
+
 ## [1.19.0] 2018-05-25
 ### Added
 - New way to load past stories

Gemfile

@@ -40,6 +40,7 @@ gem 'jquery-atwho-rails'
 gem 'jquery-ui-rails'
 gem 'kaminari'
 gem 'material_icons'
+gem 'newrelic_rpm'
 gem 'pg'
 gem 'pg_search'
 gem 'platform-api'
@@ -66,35 +67,34 @@ end
 group :production do
   gem 'kgio'
   gem 'letsencrypt-rails-heroku'
-  gem 'newrelic_rpm'
   gem 'rack-cache'
   gem 'rack-timeout'
   gem 'rails_12factor'
 end
 
 group :test do
-  gem 'rspec-rails'
-  gem 'rspec-its'
-  gem 'rspec-activemodel-mocks'
-  gem 'shoulda-matchers'
   gem 'capybara'
-  gem 'poltergeist'
   gem 'capybara-screenshot'
+  gem 'codeclimate-test-reporter', require: nil
   gem 'database_cleaner'
   gem 'factory_girl_rails'
-  gem 'codeclimate-test-reporter', require: nil
+  gem 'poltergeist'
+  gem 'rspec-activemodel-mocks'
+  gem 'rspec-its'
+  gem 'rspec-rails'
+  gem 'shoulda-matchers'
+  gem 'simplecov'
+  gem 'timecop'
   gem 'vcr'
   gem 'webmock'
-  gem 'timecop'
-  gem 'simplecov'
 end
 
 group :development do
+  gem 'better_errors'
+  gem 'binding_of_caller'
+  gem 'bullet'
   gem 'letter_opener'
   gem 'letter_opener_web', '~> 1.3.4'
-  gem "better_errors"
-  gem "binding_of_caller"
-  gem "bullet"
   gem 'rubocop', '0.49.1'
 end
 

app/controllers/stories_controller.rb

@@ -95,7 +95,7 @@ def select_stories_by_params
     elsif params[:label]
       StorySearch.labels(policy_scope(Story), params[:label])
     else
-      StoryOperations::ReadAll.call(project: @project)
+      @project.stories.with_dependencies
     end
   end
 

app/models/iterations/past_iteration.rb

@@ -1,23 +1,15 @@
 module Iterations
   class PastIteration
-    attr_reader :start_date, :end_date, :points, :iteration_number
+    include Virtus.model
 
-    def initialize(start_date:, end_date:, project:, iteration_number: nil)
-      @start_date = start_date
-      @end_date = end_date
-      @project = project
-      @points = points
-      @iteration_number = iteration_number
-    end
+    attribute :start_date, Date
+    attribute :end_date, Date
+    attribute :iteration_number, Integer
+    attribute :stories, Array[Story]
+    attribute :points, Integer
 
     def points
-      @points ||= stories.sum(:estimate)
-    end
-
-    def stories
-      @stories ||= @project.stories.where(
-        'accepted_at >= ? AND accepted_at <= ?', @start_date, @end_date
-      )
+      @points ||= stories.to_a.map(&:estimate).compact.sum
     end
   end
 end

app/models/iterations/project_iterations.rb

@@ -1,5 +1,7 @@
 module Iterations
   class ProjectIterations
+    DAYS_IN_A_WEEK = 7
+
     def initialize(project:)
       @project = project
     end
@@ -10,35 +12,58 @@ def current_iteration_start
 
     def past_iterations
       (0...length).map do |iteration_number|
-        start_date = start_date(iteration_number)
-        end_date = end_date(start_date)
-        PastIteration.new(start_date: start_date,
-                          end_date: end_date,
-                          project: @project,
-                          iteration_number: iteration_number + 1)
+        start_at = start_date(iteration_number)
+        end_at = end_date(start_at)
+
+        PastIteration.new(
+          start_date: start_at,
+          end_date: end_at,
+          stories: stories_from(start_at, end_at),
+          iteration_number: iteration_number + 1
+        )
       end
     end
 
     private
 
+    attr_reader :project
+
+    def stories_from(start_at, end_at)
+      stories.select do |story|
+        story.accepted_at.to_date >= start_at && story.accepted_at.to_date <= end_at
+      end
+    end
+
+    def stories
+      @stories ||= begin
+        project
+          .stories
+          .with_dependencies
+          .where(state: 'accepted')
+          .where.not(accepted_at: nil)
+          .order(:accepted_at)
+      end
+    end
+
     def length
       (days_since_project_start / iteration_length_in_days).floor
     end
 
     def iteration_length_in_days
-      @project.iteration_length * 7
+      project.iteration_length * DAYS_IN_A_WEEK
     end
 
     def project_start_date
-      @project.start_date
+      project.start_date
     end
 
     def start_date(iteration_number)
-      project_start_date + (iteration_number * iteration_length_in_days)
+      iteration_days = (iteration_number * iteration_length_in_days)
+      (project_start_date + iteration_days)
     end
 
     def end_date(start_date)
-      start_date + iteration_length_in_days - 1
+      (start_date + (iteration_length_in_days - 1))
     end
 
     def days_since_project_start

app/operations/iteration_operations.rb

@@ -12,16 +12,33 @@ def initialize(start_date:, end_date:, project:)
 
     def run
       {
-        stories: stories
+        stories: past_iteration.stories
       }
     end
 
     private
 
+    attr_reader :project, :start_date, :end_date
+
+    def past_iteration
+      Iterations::PastIteration.new(
+        start_date: start_date,
+        end_date: end_date,
+        stories: stories
+      )
+    end
+
     def stories
-      Iterations::PastIteration.new(start_date: @start_date,
-                                    end_date: @end_date,
-                                    project: @project).stories
+      @stories ||= begin
+        project
+          .stories
+          .with_dependencies
+          .where(
+            'accepted_at >= ? AND accepted_at <= ?',
+            start_date.beginning_of_day,
+            end_date.end_of_day
+          )
+      end
     end
   end
 end

app/operations/story_operations.rb

@@ -67,34 +67,39 @@ def after_save
   class DestroyAll < BaseOperations::DestroyAll; end
 
   class ReadAll
+    delegate :past_iterations, :current_iteration_start, to: :iterations
+
     def self.call(*args)
       new(*args).run
     end
 
     def initialize(project:)
-      @story_scope = project.stories.with_dependencies
       @project = project
-      @iterations = Iterations::ProjectIterations.new(project: project)
     end
 
     def run
       {
         active_stories: active_stories,
-        past_iterations: @iterations.past_iterations
+        past_iterations: past_iterations
       }
     end
 
     private
 
+    attr_reader :project
+
     def active_stories
-      order(@story_scope.where("state != 'accepted' OR
-        accepted_at >= ?", @iterations.current_iteration_start))
+      @active_stories ||= begin
+        project
+          .stories
+          .with_dependencies
+          .where("state != 'accepted' OR accepted_at >= ?", current_iteration_start)
+          .order('updated_at DESC')
+      end
     end
 
-    def order(query)
-      query.order('updated_at DESC').tap do |relation|
-        relation.limit(ENV['STORIES_CEILING']) if ENV['STORIES_CEILING']
-      end
+    def iterations
+      @iterations ||= Iterations::ProjectIterations.new(project: project)
     end
   end
 end

spec/controllers/stories_controller_spec.rb

@@ -77,16 +77,16 @@
     end
 
     before do
+      create_list(:story, 3, :done, project: project, requested_by: user)
+
       sign_in user
     end
 
     describe '#index' do
-      let(:stories) { { active_stories: project.stories, past_iterations: [] } }
-
       specify do
         xhr :get, :index, project_id: project.id
         expect(response).to be_success
-        expect(response.body).to eq(stories.to_json)
+        expect(response.body).to eq(project.stories.to_json)
       end
     end
 

spec/models/iterations/past_iteration_spec.rb

@@ -3,28 +3,29 @@
 module Iterations
   describe PastIteration do
     let(:user) { create(:user, :with_team) }
+
     let(:project) do
       create(:project, :with_past_iteration, users: [user], teams: [user.teams.first])
     end
 
+    let(:stories) do
+      create_list(:story, 3, :done, project: project, requested_by: user)
+    end
+
     let(:past_iteration_params) do
-      { start_date: project.created_at, end_date: project.created_at + 7.days, project: project }
+      {
+        start_date: project.created_at,
+        end_date: project.created_at + 7.days,
+        stories: stories
+      }
     end
 
     subject { described_class.new(past_iteration_params) }
 
-    let!(:stories) { create_list(:story, 3, :done, project: project, requested_by: user) }
-
     describe '#points' do
       it 'sums the story estimates in this iteration' do
         expect(subject.points).to eq(24)
       end
     end
-
-    describe '#stories' do
-      it 'returns the stories in the iteration' do
-        expect(subject.stories).to eq(stories)
-      end
-    end
   end
 end

spec/operations/iteration_operations_spec.rb

@@ -6,9 +6,9 @@
       create(:project, :with_past_iteration, users: [user], teams: [user.teams.first])
     end
     let(:user)       { create(:user, :with_team) }
-    let(:stories)    { create_list(:story, 3, :done, project: project, requested_by: user) }
     let(:start_date) { project.created_at.to_date }
     let(:end_date)   { ((project.created_at + project.iteration_length * 7.days) - 1.day).to_date }
+    let!(:stories)   { create_list(:story, 3, :done, project: project, requested_by: user) }
 
     subject      { IterationOperations::Read }
     let(:result) { subject.call(start_date: start_date, end_date: end_date, project: project) }

spec/operations/story_operations_spec.rb

@@ -403,6 +403,7 @@ def expect_past_iteration_attrs(subject_past_iteration, past_iteration)
       expect(subject_past_iteration.start_date).to eq(past_iteration.start_date)
       expect(subject_past_iteration.end_date).to eq(past_iteration.end_date)
       expect(subject_past_iteration.points).to eq(past_iteration.points)
+      expect(subject_past_iteration.stories).to eq(past_iteration.stories)
       expect(subject_past_iteration.iteration_number).to eq(1)
     end
 
@@ -416,7 +417,7 @@ def expect_past_iteration_attrs(subject_past_iteration, past_iteration)
       iteration_end = ((project.created_at + project.iteration_length * 7.days) - 1.day).to_date
       Iterations::PastIteration.new(start_date: iteration_start,
                                     end_date: iteration_end,
-                                    project: project)
+                                    stories: [done_story])
     end
 
     subject      { StoryOperations::ReadAll }