From 48286f7de9f1c8e13a9528a68e60eeac87cec99a Mon Sep 17 00:00:00 2001
From: Bertocq <bertocq@gmail.com>
Date: Tue, 13 Mar 2018 18:27:55 +0100
Subject: [PATCH 1/2] Validate ValuatorGroup#name presence & uniqueness

Why:

ValuatorGroup name should be unique and present to be able to identify
correctly each of them.

How:
  - Adding a presence & uniqueness validation at the model
  - Adding a sequenced value for name attribute at its factory
  - Adding missing model spec that covers validations
---
 app/models/valuator_group.rb       |  4 +++-
 spec/factories.rb                  |  1 +
 spec/models/valuator_group_spec.rb | 20 ++++++++++++++++++++
 3 files changed, 24 insertions(+), 1 deletion(-)
 create mode 100644 spec/models/valuator_group_spec.rb

diff --git a/app/models/valuator_group.rb b/app/models/valuator_group.rb
index c5bf8d29b..61a4e4458 100644
--- a/app/models/valuator_group.rb
+++ b/app/models/valuator_group.rb
@@ -2,4 +2,6 @@ class ValuatorGroup < ActiveRecord::Base
   has_many :valuators
   has_many :valuator_group_assignments, dependent: :destroy, class_name: 'Budget::ValuatorGroupAssignment'
   has_many :investments, through: :valuator_group_assignments, class_name: 'Budget::Investment'
-end
\ No newline at end of file
+
+  validates :name, presence: true, uniqueness: true
+end
diff --git a/spec/factories.rb b/spec/factories.rb
index 05ddd2fc0..8f872daaf 100644
--- a/spec/factories.rb
+++ b/spec/factories.rb
@@ -62,6 +62,7 @@ FactoryBot.define do
   end
 
   factory :valuator_group, class: ValuatorGroup do
+    sequence(:name) { |n| "Valuator Group #{n}" }
   end
 
   factory :identity do
diff --git a/spec/models/valuator_group_spec.rb b/spec/models/valuator_group_spec.rb
new file mode 100644
index 000000000..98a1effd8
--- /dev/null
+++ b/spec/models/valuator_group_spec.rb
@@ -0,0 +1,20 @@
+require 'rails_helper'
+
+describe ValuatorGroup do
+
+  describe 'Validations' do
+    it "should be valid" do
+      expect(build(:valuator_group)).to be_valid
+    end
+
+    it "should not be valid without a name" do
+      expect(build(:valuator_group, name: nil)).not_to be_valid
+    end
+
+    it "should not be valid with the same name as an existing one" do
+      create(:valuator_group, name: 'The Valuators')
+
+      expect(build(:valuator_group, name: 'The Valuators')).not_to be_valid
+    end
+  end
+end

From 43d78c6c722bfe5149ec40e7b3f595415b70aab6 Mon Sep 17 00:00:00 2001
From: Bertocq <bertocq@gmail.com>
Date: Tue, 13 Mar 2018 18:30:11 +0100
Subject: [PATCH 2/2] Adding Investment#by_valuator_group test scenario

Budget::Investment#by_valuator_group scope didn't had a test scenario
---
 spec/models/budget/investment_spec.rb | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/spec/models/budget/investment_spec.rb b/spec/models/budget/investment_spec.rb
index e2db88221..a4e1d246d 100644
--- a/spec/models/budget/investment_spec.rb
+++ b/spec/models/budget/investment_spec.rb
@@ -340,6 +340,24 @@ describe Budget::Investment do
     end
   end
 
+  describe "#by_valuator_group" do
+
+    it "returns investments assigned to a valuator's group" do
+      valuator = create(:valuator)
+      valuator_group = create(:valuator_group, valuators: [valuator])
+      assigned_investment = create(:budget_investment, valuators: [valuator],
+                                                       valuator_groups: [valuator_group])
+      another_assigned_investment = create(:budget_investment, valuator_groups: [valuator_group])
+      unassigned_investment = create(:budget_investment, valuators: [valuator], valuator_groups: [])
+      create(:budget_investment, valuators: [valuator], valuator_groups: [create(:valuator_group)])
+
+      by_valuator_group = described_class.by_valuator_group(valuator.valuator_group_id)
+
+      expect(by_valuator_group.size).to eq(2)
+      expect(by_valuator_group).to contain_exactly(assigned_investment, another_assigned_investment)
+    end
+  end
+
   describe "scopes" do
     describe "valuation_open" do
       it "returns all investments with false valuation_finished" do