Major fixes after ReadingGroup or KalibroConfiguration hidding

`public_or_owned_by_user` was using a syntax unsupported on all databases. Now it produces two queries to the database, but generated by ActiveRecord which takes care of compability. This was breaking KalibroConfiguration listing acceptance tests. Restored MetricConfiguration form for using `reading_group_options` helper. It was broken using a undefined method. This was breaking MetricConfiguration create and edit acceptance tests.

Major fixes after ReadingGroup or KalibroConfiguration hidding
`public_or_owned_by_user` was using a syntax unsupported on all databases. Now it produces two queries to the database, but generated by ActiveRecord which takes care of compability. This was breaking KalibroConfiguration listing acceptance tests. Restored MetricConfiguration form for using `reading_group_options` helper. It was broken using a undefined method. This was breaking MetricConfiguration create and edit acceptance tests.
Rafael Manzo · Diego Camarinha
1 parent 78614ea7
Showing 6 changed files with 16 additions and 25 deletions Show diff stats
app/models/kalibro_configuration.rb
app/models/reading_group.rb
app/views/metric_configurations/_form.html.erb
features/step_definitions/kalibro_configuration_steps.rb
spec/models/kalibro_configuration_spec.rb
spec/models/reading_group_spec.rb
@@ -2,15 +2,12 @@ class KalibroConfiguration &lt; KalibroClient::Entities::Configurations::KalibroCon
   include KalibroRecord
   def self.public_or_owned_by_user(user=nil)
-    query = if user
-      KalibroConfigurationAttributes.where("user_id == ? OR public", user.id)
-    else
-      KalibroConfigurationAttributes.where(public: true)
-    end
+    kalibro_configuration_attributes = KalibroConfigurationAttributes.where(public: true)
+    kalibro_configuration_attributes += KalibroConfigurationAttributes.where(user_id: user.id, public: false) if user
-    query.map { |cfg_attr|
+    kalibro_configuration_attributes.map { |kalibro_configuration_attribute|
       begin
-        self.find(cfg_attr.kalibro_configuration_id)
+        self.find(kalibro_configuration_attribute.kalibro_configuration_id)
       rescue KalibroClient::Errors::RecordNotFound
         nil
       end
@@ -2,15 +2,12 @@ class ReadingGroup &lt; KalibroClient::Entities::Configurations::ReadingGroup
   include KalibroRecord
   def self.public_or_owned_by_user(user=nil)
-    query = if user
-      ReadingGroupAttributes.where("user_id == ? OR public", user.id)
-    else
-      ReadingGroupAttributes.where(public: true)
-    end
+    reading_group_attributes = ReadingGroupAttributes.where(public: true)
+    reading_group_attributes += ReadingGroupAttributes.where(user_id: user.id, public: false) if user
-    query.map { |rg_attr|
+    reading_group_attributes.map { |reading_group_attribute|
       begin
-        self.find(rg_attr.reading_group_id)
+        self.find(reading_group_attribute.reading_group_id)
       rescue KalibroClient::Errors::RecordNotFound
         nil
       end
@@ -34,7 +34,7 @@
         <div class="form-row">
           <div class="field-container">
             <%= f.label :reading_group_id, class: 'control-label' %>
-            <%= f.select( :reading_group_id, reading_groups, {class: 'form-control'} ) %>
+            <%= f.select( :reading_group_id, reading_group_options, {class: 'form-control'} ) %>
           </div>
           <div class="help-container">
             <p>
@@ -13,6 +13,7 @@ end
 Given(/^I have a sample configuration$/) do
   @kalibro_configuration = FactoryGirl.create(:kalibro_configuration)
   FactoryGirl.create(:kalibro_configuration_attributes, {id: nil, user_id: nil, kalibro_configuration_id: @kalibro_configuration.id})
+
 end
 Given(/^I own a sample configuration$/) do
@@ -34,13 +34,11 @@ describe KalibroConfiguration, :type =&gt; :model do
             kalibro_configurations.each do |kc|
               KalibroConfiguration.stubs(:find).with(kc.id).returns(kc)
             end
+
+            KalibroConfigurationAttributes.expects(:where).with(public: true).returns(public_attrs)
           end
           context 'when user is not provided' do
-            before do
-              KalibroConfigurationAttributes.expects(:where).with(public: true).returns(public_attrs)
-            end
-
             it 'should find all public reading groups' do
               expect(KalibroConfiguration.public).to eq(public_kalibro_configurations)
             end
@@ -48,7 +46,7 @@ describe KalibroConfiguration, :type =&gt; :model do
           context 'when user is provided' do
             before do
-              KalibroConfigurationAttributes.expects(:where).with(kind_of(String), one_user.id).returns(ones_or_public_attrs)
+              KalibroConfigurationAttributes.expects(:where).with(user_id: one_user.id, public: false).returns([ones_private_attrs])
             end
             it 'should find all public and owned reading groups' do
@@ -79,13 +79,11 @@ describe ReadingGroup, :type =&gt; :model do
           reading_groups.each do |rg|
             ReadingGroup.stubs(:find).with(rg.id).returns(rg)
           end
+
+          ReadingGroupAttributes.expects(:where).with(public: true).returns(public_attrs)
         end
         context 'when user is not provided' do
-          before do
-            ReadingGroupAttributes.expects(:where).with(public: true).returns(public_attrs)
-          end
-
           it 'should find all public reading groups' do
             expect(ReadingGroup.public).to eq(public_reading_groups)
           end
@@ -93,7 +91,7 @@ describe ReadingGroup, :type =&gt; :model do
         context 'when user is provided' do
           before do
-            ReadingGroupAttributes.expects(:where).with(kind_of(String), one_user.id).returns(ones_or_public_attrs)
+            ReadingGroupAttributes.expects(:where).with(user_id: one_user.id, public: false).returns([ones_private_attrs])
           end
           it 'should find all public and owned reading groups' do
	@@ -34,7 +34,7 @@		@@ -34,7 +34,7 @@
34	<div class="form-row">	34	<div class="form-row">
35	<div class="field-container">	35	<div class="field-container">
36	<%= f.label :reading_group_id, class: 'control-label' %>	36	<%= f.label :reading_group_id, class: 'control-label' %>
37	- <%= f.select( :reading_group_id, reading_groups, {class: 'form-control'} ) %>	37	+ <%= f.select( :reading_group_id, reading_group_options, {class: 'form-control'} ) %>
38	</div>	38	</div>
39	<div class="help-container">	39	<div class="help-container">
40	<p>	40	<p>
	@@ -13,6 +13,7 @@ end		@@ -13,6 +13,7 @@ end
13	Given(/^I have a sample configuration$/) do	13	Given(/^I have a sample configuration$/) do
14	@kalibro_configuration = FactoryGirl.create(:kalibro_configuration)	14	@kalibro_configuration = FactoryGirl.create(:kalibro_configuration)
15	FactoryGirl.create(:kalibro_configuration_attributes, {id: nil, user_id: nil, kalibro_configuration_id: @kalibro_configuration.id})	15	FactoryGirl.create(:kalibro_configuration_attributes, {id: nil, user_id: nil, kalibro_configuration_id: @kalibro_configuration.id})
		16	+
16	end	17	end
17		18
18	Given(/^I own a sample configuration$/) do	19	Given(/^I own a sample configuration$/) do