Cleanup of giant merge

Author: nyarly

Gemfile

@@ -19,7 +19,7 @@ gem 'dynamic_form'
 gem 'i18n_alchemy'
 gem 'virtus'
 gem 'github_api', "~> 0.11.1"
-gem 'pivotal-tracker', "= 0.5.14", :git => 'https://github.com/hannahhoward/pivotal-tracker'
+gem 'lrd-pivotal-tracker', "= 0.5.14"
 gem 'newrelic_rpm'
 gem 'active_model_serializers'
 gem 'bibliotech'

Gemfile.lock

@@ -6,17 +6,13 @@ GIT
       activerecord (>= 4.0.0, < 5)
 
 GIT
-  remote: https://github.com/hannahhoward/pivotal-tracker
-  revision: 3c738617558e4734f261bc881688d2d4f83136ca
+  remote: https://github.com/ncri/nested_form_fields.git
+  revision: c7edc8645a0f4e5f40bd14740256aebe2998987a
   specs:
-    pivotal-tracker (0.5.14)
-      builder
-      crack
-      happymapper (>= 0.3.2)
-      nokogiri (>= 1.4.3)
-      nokogiri (>= 1.5.5)
-      nokogiri-happymapper (>= 0.5.4)
-      rest-client (~> 1.6.0)
+    nested_form_fields (0.7)
+      coffee-rails (>= 3.2.1)
+      jquery-rails
+      rails (>= 3.2.0)
 
 GEM
   remote: http://rubygems.org/
@@ -98,6 +94,13 @@ GEM
       simplecov (>= 0.7.1, < 1.0.0)
     coercible (1.0.0)
       descendants_tracker (~> 0.0.1)
+    coffee-rails (4.1.0)
+      coffee-script (>= 2.2.0)
+      railties (>= 4.0.0, < 5.0)
+    coffee-script (2.4.1)
+      coffee-script-source
+      execjs
+    coffee-script-source (1.9.1.1)
     columnize (0.9.0)
     compass (0.12.7)
       chunky_png (~> 1.2)
@@ -172,6 +175,9 @@ GEM
       activesupport (>= 3.2.0, < 4.2)
       i18n (~> 0.6)
     ice_nine (0.11.1)
+    jquery-rails (3.1.3)
+      railties (>= 3.0, < 5.0)
+      thor (>= 0.14, < 2.0)
     json (1.8.2)
     json_spec (1.1.4)
       multi_json (~> 1.0)
@@ -185,6 +191,13 @@ GEM
       sqlite3 (~> 1.3.3)
       uuid (~> 2.3.1)
     logical_tabs (0.8.0)
+    lrd-pivotal-tracker (0.5.14)
+      builder
+      crack
+      happymapper (>= 0.3.2)
+      nokogiri (>= 1.5.5)
+      nokogiri-happymapper (>= 0.5.4)
+      rest-client (~> 1.6.0)
     lrd_view_tools (0.1.5)
     macaddr (1.7.1)
       systemu (~> 2.6.2)
@@ -251,13 +264,10 @@ GEM
       thor (>= 0.18.1, < 2.0)
     raindrops (0.13.0)
     rake (10.4.2)
-    rdoc (4.2.0)
-      json (~> 1.4)
     responders (1.1.2)
       railties (>= 3.2, < 4.2)
-    rest-client (1.6.8)
+    rest-client (1.6.9)
       mime-types (~> 1.16)
-      rdoc (>= 2.4.2)
     rspec (2.13.0)
       rspec-core (~> 2.13.0)
       rspec-expectations (~> 2.13.0)
@@ -387,12 +397,13 @@ DEPENDENCIES
   launchy
   logical-insight
   logical_tabs
+  lrd-pivotal-tracker (= 0.5.14)
   lrd_view_tools
   mizugumo
+  nested_form_fields!
   newrelic_rpm
   pg
   pivotal-github
-  pivotal-tracker (= 0.5.14)!
   poltergeist
   populator
   quiet_assets
@@ -415,3 +426,6 @@ DEPENDENCIES
   webmock
   will_paginate
   zurb-foundation (~> 4.0.0)
+
+BUNDLED WITH
+   1.10.6

app/models/activity_builder.rb

@@ -32,10 +32,11 @@ def build
       find_user
       find_work_unit
       @activity = Activity.new(activity_params)
-      @activity.user_id = @user ? @user.id : nil
-      @activity.project_id = @project ? @project.id : nil
-      @activity.work_unit_id = @work_unit ? @work_unit.id : nil
+      @activity.user_id = user ? user.id : nil
+      @activity.project_id = project ? project.id : nil
+      @activity.work_unit_id = work_unit ? work_unit.id : nil
     end
+
     if activity.valid?
       true
     else

app/presenters/bill_report.rb

@@ -46,7 +46,7 @@ def projects_and_hours
         clockable_projects.map do |proj|
           Project.new(
             project_name_with_client(proj),
-            ProjectWorkQuery.new(bill.work_units.billable).find_for_project(proj).sum(:hours)
+            ProjectWorkQuery.new(bill.work_units.billable).find_for_project(proj, :exclusive => true).sum(:hours)
           )
         end
       end

db/migrate/20150724191322_add_work_unit_ref_to_activities.rb

@@ -1,4 +1,5 @@
 require 'spec_helper'
+require 'pivotal-tracker'
 
 describe PivotalPullController, :vcr => {} do
   before do
@@ -43,7 +44,7 @@
         end
       end
 
-      let :number_of_activities_for_project do 3 end
+      let(:number_of_activities_for_project){ 3 }
 
       before do
         unless defined?(::API_KEYS)

spec/controllers/pivotal_pull_controller_spec.rb

@@ -1,73 +1,113 @@
 require 'spec_helper'
 
 describe BillReport, :type => :presenter do
-  let :billable_projects do
-    FactoryGirl.create_list(:project, 3, :billable => true)
-  end
+  describe "with a mix of project types" do
+    let :billable_projects do
+      FactoryGirl.create_list(:project, 3, :billable => true)
+    end
 
-  let :unbillable_projects do
-    FactoryGirl.create_list(:project, 3, :billable => false)
-  end
+    let :unbillable_projects do
+      FactoryGirl.create_list(:project, 3, :billable => false)
+    end
 
-  let :unclockable_projects do
-    FactoryGirl.create_list(:project, 2, :billable => false, :clockable => false)
-  end
+    let :unclockable_projects do
+      FactoryGirl.create_list(:project, 2, :billable => false, :clockable => false)
+    end
 
-  let :clockable_projects do
-    billable_projects + unbillable_projects
-  end
+    let :clockable_projects do
+      billable_projects + unbillable_projects
+    end
 
-  let :projects do
-    (clockable_projects + unclockable_projects).shuffle
-  end
+    let :projects do
+      (clockable_projects + unclockable_projects).shuffle
+    end
 
-  let :bill do
-    FactoryGirl.create(:bill)
-  end
+    let :bill do
+      FactoryGirl.create(:bill)
+    end
 
-  let :unbillable_wus do
-    (1..17).zip(projects.cycle).map do |num, project|
-      FactoryGirl.create(:work_unit, :billable => false, :hours => 1, :project => project, :bill => bill)
+    let :unbillable_wus do
+      (1..17).zip(projects.cycle).map do |num, project|
+        FactoryGirl.create(:work_unit, :billable => false, :hours => 1, :project => project, :bill => bill)
+      end
     end
-  end
 
-  let :billable_wus do
-    (1..17).zip(projects.cycle).map do |num, project|
-      FactoryGirl.create(:work_unit, :billable => true, :hours => 1, :project => project, :bill => bill)
+    let :billable_wus do
+      (1..17).zip(projects.cycle).map do |num, project|
+        FactoryGirl.create(:work_unit, :billable => true, :hours => 1, :project => project, :bill => bill)
+      end
     end
-  end
 
-  let :billable_clockable do
-    billable_wus.find_all do |wu|
-      wu.project.clockable?
+    let :billable_clockable do
+      billable_wus.find_all do |wu|
+        wu.project.clockable?
+      end
     end
-  end
 
-  let! :work_units do
-    unbillable_wus + billable_wus
-  end
+    let! :work_units do
+      unbillable_wus + billable_wus
+    end
 
-  let :total_billable_hours do
-    billable_wus.inject(0) do |total, wu|
-      total + wu.hours
+    let :total_billable_hours do
+      billable_wus.inject(0) do |total, wu|
+        total + wu.hours
+      end
     end
-  end
 
-  subject :bill_report do
-    BillReport.new(bill)
-  end
+    subject :bill_report do
+      BillReport.new(bill)
+    end
 
-  it "should total hours consistently" do
-    expect(bill_report.total_hours).to eql(billable_clockable.length * 1.0)
-  end
+    it "should total hours consistently" do
+      expect(bill_report.total_hours).to eql(billable_clockable.length * 1.0)
+    end
+
+    it "should have all the projects in #projects_and_hours" do
+      expect(bill_report.projects_and_hours.length).to eql(clockable_projects.length)
+    end
+
+    it "should have all the billable WUs in #work_units_and_hours" do
+      expect(bill_report.work_units_and_hours.length).to eql(billable_clockable.length)
+      expect(bill_report.work_units_and_hours.map(&:notes).sort).to eql(billable_clockable.map(&:notes).sort)
+    end
 
-  it "should have all the projects in #projects_and_hours" do
-    expect(bill_report.projects_and_hours.length).to eql(clockable_projects.length)
   end
+  describe "with child projects" do
+
+    let! :project do FactoryGirl.create(:project, :name => "Topmost") end
+    let! :child_project do FactoryGirl.create(:project, :name => "Middle", :parent_id => project.id) end
+    let! :grandchild_project do FactoryGirl.create(:project, :name => "Bottom", :parent_id => child_project.id) end
+    let! :bill do FactoryGirl.create(:bill) end
+
+    2.times do |idx|
+      let! "project_work_unit_#{idx}" do
+        FactoryGirl.create(:work_unit, :project => project, :hours => 2, :bill => bill)
+      end
+      let! "child_project_work_unit_#{idx}" do
+        FactoryGirl.create(:work_unit, :project => child_project,  :hours => 4, :bill => bill)
+      end
+      let! "grandchild_project_work_unit_#{idx}" do
+        FactoryGirl.create(:work_unit, :project => grandchild_project,  :hours => 6, :bill => bill)
+      end
+    end
+
+    subject :bill_report do
+      BillReport.new(bill)
+    end
+
+    it "should total hours consistently" do
+      expect(bill_report.total_hours.to_f).to eql((2 * 2 + 2 * 4 + 2 * 6) * 1.0)
+    end
+
+    it "should not accumulate hours to parent projects" do
+      expect(bill_report.projects_and_hours.length).to eql(3)
+      expect(bill_report.projects_and_hours.map(&:hours).map(&:to_f)).to include(4.0, 8.0, 12.0)
+    end
+
+    it "should have all the billable WUs in #work_units_and_hours" do
+      expect(bill_report.work_units_and_hours.length).to eql(6)
+    end
 
-  it "should have all the billable WUs in #work_units_and_hours" do
-    expect(bill_report.work_units_and_hours.length).to eql(billable_clockable.length)
-    expect(bill_report.work_units_and_hours.map(&:notes).sort).to eql(billable_clockable.map(&:notes).sort)
   end
 
 end

spec/presenters/bill_report_spec.rb

@@ -8,9 +8,9 @@
 
   let! :admin do FactoryGirl.create(:admin) end
   let! :user do FactoryGirl.create(:user) end
-  let! :project do FactoryGirl.create(:project) end
-  let! :child_project do FactoryGirl.create(:project, :parent_id => project.id) end
-  let! :grandchild_project do FactoryGirl.create(:project, :parent_id => child_project.id) end
+  let! :project do FactoryGirl.create(:project, :name => "Topmost") end
+  let! :child_project do FactoryGirl.create(:project, :name => "Middle", :parent_id => project.id) end
+  let! :grandchild_project do FactoryGirl.create(:project, :name => "Bottom", :parent_id => child_project.id) end
   let! :bill do FactoryGirl.create(:bill) end
 
   2.times do |idx|
@@ -46,4 +46,4 @@
     expect(page).to_not have_content('56.0') # this would be the total if the hours accumulated through the children
   end
 
-end
+end