From 282cebc96cb9548e5af3f2ee7c635c39da4bdbce Mon Sep 17 00:00:00 2001 From: Louise Crow Date: Tue, 24 Sep 2013 18:14:35 +0100 Subject: Add a batch_request_template flag A virtual attribute to use to customise some info request behaviours when we are using one request as a template for creating multiple requests. --- spec/models/info_request_spec.rb | 13 +++++++++++++ 1 file changed, 13 insertions(+) (limited to 'spec/models') diff --git a/spec/models/info_request_spec.rb b/spec/models/info_request_spec.rb index dcc94e967..be9206ad1 100644 --- a/spec/models/info_request_spec.rb +++ b/spec/models/info_request_spec.rb @@ -46,6 +46,19 @@ describe InfoRequest do info_request.valid? info_request.errors[:title].should_not be_empty end + + it 'should require a public body id by default' do + info_request = InfoRequest.new + info_request.valid? + info_request.errors[:public_body_id].should_not be_empty + end + + it 'should not require a public body id if it is a batch request template' do + info_request = InfoRequest.new + info_request.is_batch_request_template = true + info_request.valid? + info_request.errors[:public_body_id].should be_empty + end end describe 'when generating a user name slug' do -- cgit v1.2.3 From 0028d63dce4db36fcb0877770c67131b652d3cfd Mon Sep 17 00:00:00 2001 From: Louise Crow Date: Tue, 24 Sep 2013 18:40:09 +0100 Subject: Handle the application of censor rules to a batch request template. --- spec/models/info_request_spec.rb | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'spec/models') diff --git a/spec/models/info_request_spec.rb b/spec/models/info_request_spec.rb index be9206ad1..0c6457b1a 100644 --- a/spec/models/info_request_spec.rb +++ b/spec/models/info_request_spec.rb @@ -613,6 +613,12 @@ describe InfoRequest do @info_request.apply_censor_rules_to_text!(@text) end + it 'should not raise an error if the request is a batch request template' do + @info_request.stub!(:public_body).and_return(nil) + @info_request.is_batch_request_template = true + lambda{ @info_request.apply_censor_rules_to_text!(@text) }.should_not raise_error + end + end context 'when applying censor rules to binary files' do -- cgit v1.2.3 From 4ac3189ac35e7c4d59d0bff7ec1a82c36d9d6a28 Mon Sep 17 00:00:00 2001 From: Louise Crow Date: Tue, 24 Sep 2013 18:55:18 +0100 Subject: Create a placeholder salutation for a batch request template. --- spec/models/outgoing_message_spec.rb | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) (limited to 'spec/models') diff --git a/spec/models/outgoing_message_spec.rb b/spec/models/outgoing_message_spec.rb index bb270ca16..a3e2d1c68 100644 --- a/spec/models/outgoing_message_spec.rb +++ b/spec/models/outgoing_message_spec.rb @@ -57,7 +57,8 @@ describe OutgoingMessage, " when making an outgoing message" do info_request = mock_model(InfoRequest, :public_body => public_body, :url_title => 'a_test_title', :title => 'A test title', - :apply_censor_rules_to_text! => nil) + :apply_censor_rules_to_text! => nil, + :is_batch_request_template? => false) outgoing_message = OutgoingMessage.new({ :status => 'ready', :message_type => 'followup', @@ -68,6 +69,15 @@ describe OutgoingMessage, " when making an outgoing message" do outgoing_message.body.should include(expected_text) end + context "when associated with a batch template request" do + + it 'should produce a salutation with a placeholder' do + @om.info_request.is_batch_request_template = true + @om.get_salutation.should == 'Dear [Authority name],' + end + end + + describe 'when asked if a user can view it' do before do @@ -166,7 +176,7 @@ describe OutgoingMessage, " when censoring data" do end end -describe OutgoingMessage, "when validating the format of the message body", :focus => true do +describe OutgoingMessage, "when validating the format of the message body" do it 'should handle a salutation with a bracket in it' do outgoing_message = FactoryGirl.build(:initial_request) -- cgit v1.2.3 From bf511988c786d8bc7b7e800b595f103bae91b4e5 Mon Sep 17 00:00:00 2001 From: Louise Crow Date: Wed, 23 Oct 2013 14:53:46 +0100 Subject: Add some specs for existing exceeded_limit? behaviour --- spec/models/user_spec.rb | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) (limited to 'spec/models') diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb index cbbf4b5ce..bb1b054aa 100644 --- a/spec/models/user_spec.rb +++ b/spec/models/user_spec.rb @@ -337,3 +337,27 @@ describe User, "when emails have bounced" do user.email_bounce_message.should == "The reason we think the email bounced (e.g. a bounce message)" end end + +describe User, "when calculating if a user has exceeded the request limit" do + + before do + @info_request = FactoryGirl.create(:info_request) + @user = @info_request.user + end + + it 'should return false if no request limit is set' do + AlaveteliConfiguration.stub!(:max_requests_per_user_per_day).and_return nil + @user.exceeded_limit?.should be_false + end + + it 'should return false if the user has not submitted more than the limit' do + AlaveteliConfiguration.stub!(:max_requests_per_user_per_day).and_return(2) + @user.exceeded_limit?.should be_false + end + + it 'should return true if the user has submitted more than the limit' do + AlaveteliConfiguration.stub!(:max_requests_per_user_per_day).and_return(0) + @user.exceeded_limit?.should be_true + end + +end -- cgit v1.2.3 From b97cf2f206ae9aea778db2a10132fa68aeaa764b Mon Sep 17 00:00:00 2001 From: Louise Crow Date: Wed, 23 Oct 2013 14:58:02 +0100 Subject: Batch users don't have a daily limit. It doesn't make logical sense that they would. However I am preserving the ability to make batch requests as a separate thing from not having a daily limit - I think batch sending requires a (perhaps marginally) bigger level of trust. --- spec/models/user_spec.rb | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'spec/models') diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb index bb1b054aa..b6f48dad3 100644 --- a/spec/models/user_spec.rb +++ b/spec/models/user_spec.rb @@ -360,4 +360,11 @@ describe User, "when calculating if a user has exceeded the request limit" do @user.exceeded_limit?.should be_true end + it 'should return false if the user is allowed to make batch requests' do + @user.can_make_batch_requests = true + AlaveteliConfiguration.stub!(:max_requests_per_user_per_day).and_return(0) + @user.exceeded_limit?.should be_false + end + + end -- cgit v1.2.3 From 9a5c01d781129aeb1ab2b18771ac131ecdfb56c1 Mon Sep 17 00:00:00 2001 From: Louise Crow Date: Thu, 24 Oct 2013 14:35:25 +0100 Subject: Add InfoRequestBatch model. Re-annotate models. Index InfoRequestBatches by user - we'll display the batches for a user when they view their own requests. --- spec/models/info_request_batch_spec.rb | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 spec/models/info_request_batch_spec.rb (limited to 'spec/models') diff --git a/spec/models/info_request_batch_spec.rb b/spec/models/info_request_batch_spec.rb new file mode 100644 index 000000000..f6d9bea0c --- /dev/null +++ b/spec/models/info_request_batch_spec.rb @@ -0,0 +1,21 @@ +require File.expand_path(File.dirname(__FILE__) + '/../spec_helper') + +describe InfoRequestBatch, "when validating" do + + before do + @info_request_batch = FactoryGirl.build(:info_request_batch) + end + + it 'should require a user' do + @info_request_batch.user = nil + @info_request_batch.valid?.should be_false + @info_request_batch.errors.full_messages.should == ["User can't be blank"] + end + + it 'should require a title' do + @info_request_batch.title = nil + @info_request_batch.valid?.should be_false + @info_request_batch.errors.full_messages.should == ["Title can't be blank"] + end + +end -- cgit v1.2.3 From 4b2e3ef0b6f5b881597242a4afe1404415256f3b Mon Sep 17 00:00:00 2001 From: Louise Crow Date: Thu, 24 Oct 2013 16:19:22 +0100 Subject: Make method names for finding existing objects clearer They're not finding by the existing object, they're finding an existing object. --- spec/models/track_thing_spec.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'spec/models') diff --git a/spec/models/track_thing_spec.rb b/spec/models/track_thing_spec.rb index 86d3c0cda..1c582564b 100644 --- a/spec/models/track_thing_spec.rb +++ b/spec/models/track_thing_spec.rb @@ -39,7 +39,7 @@ describe TrackThing, "when tracking changes" do it "will find existing tracks which are the same" do track_thing = TrackThing.create_track_for_search_query('fancy dog') - found_track = TrackThing.find_by_existing_track(users(:silly_name_user), track_thing) + found_track = TrackThing.find_existing(users(:silly_name_user), track_thing) found_track.should == @track_thing end -- cgit v1.2.3 From ce262657761c1c47c47e2f6cc7bf683543ebbdb7 Mon Sep 17 00:00:00 2001 From: Louise Crow Date: Thu, 24 Oct 2013 17:03:52 +0100 Subject: Add check for double submission. --- spec/models/info_request_batch_spec.rb | 45 ++++++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) (limited to 'spec/models') diff --git a/spec/models/info_request_batch_spec.rb b/spec/models/info_request_batch_spec.rb index f6d9bea0c..787b812cf 100644 --- a/spec/models/info_request_batch_spec.rb +++ b/spec/models/info_request_batch_spec.rb @@ -18,4 +18,49 @@ describe InfoRequestBatch, "when validating" do @info_request_batch.errors.full_messages.should == ["Title can't be blank"] end + it 'should require a body' do + @info_request_batch.body = nil + @info_request_batch.valid?.should be_false + @info_request_batch.errors.full_messages.should == ["Body can't be blank"] + end + +end + +describe InfoRequestBatch, "when finding an existing batch" do + + before do + @info_request_batch = FactoryGirl.create(:info_request_batch, :title => 'Matched title', + :body => 'Matched body') + @first_request = FactoryGirl.create(:info_request, :info_request_batch => @info_request_batch) + @second_request = FactoryGirl.create(:info_request, :info_request_batch => @info_request_batch) + end + + it 'should return a batch with the same user, title and body sent to one of the same public bodies' do + InfoRequestBatch.find_existing(@info_request_batch.user, + @info_request_batch.title, + @info_request_batch.body, + [@first_request.public_body_id]).should_not be_nil + end + + it 'should not return a batch with the same title and body sent to another public body' do + InfoRequestBatch.find_existing(@info_request_batch.user, + @info_request_batch.title, + @info_request_batch.body, + [FactoryGirl.create(:public_body).id]).should be_nil + end + + it 'should not return a batch sent the same public bodies with a different title and body' do + InfoRequestBatch.find_existing(@info_request_batch.user, + 'Other title', + 'Other body', + [@first_request.public_body_id]).should be_nil + end + + it 'should not return a batch sent to one of the same public bodies with the same title and body by + a different user' do + InfoRequestBatch.find_existing(FactoryGirl.create(:user), + @info_request_batch.title, + @info_request_batch.body, + [@first_request.public_body_id]).should be_nil + end end -- cgit v1.2.3 From 90fd2c06e48c17909b9a7d2aae6d01c41047b4de Mon Sep 17 00:00:00 2001 From: Louise Crow Date: Mon, 28 Oct 2013 13:33:08 +0000 Subject: Add the specific salutations to each request. Also, wrap model creation in a transaction and do the message sending separately - we may ultimately want to do this outside the request cycle. --- spec/models/info_request_batch_spec.rb | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) (limited to 'spec/models') diff --git a/spec/models/info_request_batch_spec.rb b/spec/models/info_request_batch_spec.rb index 787b812cf..ba4bcd181 100644 --- a/spec/models/info_request_batch_spec.rb +++ b/spec/models/info_request_batch_spec.rb @@ -64,3 +64,25 @@ describe InfoRequestBatch, "when finding an existing batch" do [@first_request.public_body_id]).should be_nil end end + +describe InfoRequestBatch, "when creating a batch", :focus => true do + + it 'should substitute authority name for the placeholder in each request' do + info_request_params = {:title => 'A test title'} + outgoing_message_params = {:body => "Dear [Authority name],\nA message\nYours faithfully,\nRequester", + } + first_public_body = FactoryGirl.create(:public_body) + second_public_body = FactoryGirl.create(:public_body) + user = FactoryGirl.create(:user) + results = InfoRequestBatch.create_batch!(info_request_params, + outgoing_message_params, + [first_public_body.id, second_public_body.id], + user) + info_requests = results[:batch].info_requests + [first_public_body, second_public_body].each do |public_body| + request = info_requests.detect{|info_request| info_request.public_body == public_body} + request.outgoing_messages.first.body.should == "Dear #{public_body.name},\nA message\nYours faithfully,\nRequester" + end + end + +end -- cgit v1.2.3 From 51c80db7a35a41fbbab9b28e86a5d60166791b4c Mon Sep 17 00:00:00 2001 From: Louise Crow Date: Wed, 27 Nov 2013 12:03:28 +0000 Subject: Split the creation of a batch and the associated requests. We're going to want to actually create and send the requests later. --- spec/models/info_request_batch_spec.rb | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) (limited to 'spec/models') diff --git a/spec/models/info_request_batch_spec.rb b/spec/models/info_request_batch_spec.rb index ba4bcd181..7f6905c8e 100644 --- a/spec/models/info_request_batch_spec.rb +++ b/spec/models/info_request_batch_spec.rb @@ -61,26 +61,25 @@ describe InfoRequestBatch, "when finding an existing batch" do InfoRequestBatch.find_existing(FactoryGirl.create(:user), @info_request_batch.title, @info_request_batch.body, - [@first_request.public_body_id]).should be_nil + [@first_body]).should be_nil end end describe InfoRequestBatch, "when creating a batch", :focus => true do it 'should substitute authority name for the placeholder in each request' do - info_request_params = {:title => 'A test title'} - outgoing_message_params = {:body => "Dear [Authority name],\nA message\nYours faithfully,\nRequester", - } + body = "Dear [Authority name],\nA message\nYours faithfully,\nRequester" first_public_body = FactoryGirl.create(:public_body) second_public_body = FactoryGirl.create(:public_body) user = FactoryGirl.create(:user) - results = InfoRequestBatch.create_batch!(info_request_params, - outgoing_message_params, - [first_public_body.id, second_public_body.id], - user) - info_requests = results[:batch].info_requests + info_request_batch = InfoRequestBatch.create!({:title => 'A test title', + :body => body, + :public_bodies => [first_public_body, + second_public_body], + :user => user}) + results = info_request_batch.create_batch! [first_public_body, second_public_body].each do |public_body| - request = info_requests.detect{|info_request| info_request.public_body == public_body} + request = info_request_batch.info_requests.detect{|info_request| info_request.public_body == public_body} request.outgoing_messages.first.body.should == "Dear #{public_body.name},\nA message\nYours faithfully,\nRequester" end end -- cgit v1.2.3 From d898b9308f98f84c4f44bcc3316193e80b007b23 Mon Sep 17 00:00:00 2001 From: Louise Crow Date: Wed, 27 Nov 2013 12:05:11 +0000 Subject: Use public bodies not requests in find_existing The requests may not have been created at this point. --- spec/models/info_request_batch_spec.rb | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) (limited to 'spec/models') diff --git a/spec/models/info_request_batch_spec.rb b/spec/models/info_request_batch_spec.rb index 7f6905c8e..2323c3bd3 100644 --- a/spec/models/info_request_batch_spec.rb +++ b/spec/models/info_request_batch_spec.rb @@ -29,31 +29,33 @@ end describe InfoRequestBatch, "when finding an existing batch" do before do + @first_body = FactoryGirl.create(:public_body) + @second_body = FactoryGirl.create(:public_body) @info_request_batch = FactoryGirl.create(:info_request_batch, :title => 'Matched title', - :body => 'Matched body') - @first_request = FactoryGirl.create(:info_request, :info_request_batch => @info_request_batch) - @second_request = FactoryGirl.create(:info_request, :info_request_batch => @info_request_batch) + :body => 'Matched body', + :public_bodies => [@first_body, + @second_body]) end it 'should return a batch with the same user, title and body sent to one of the same public bodies' do InfoRequestBatch.find_existing(@info_request_batch.user, @info_request_batch.title, @info_request_batch.body, - [@first_request.public_body_id]).should_not be_nil + [@first_body]).should_not be_nil end it 'should not return a batch with the same title and body sent to another public body' do InfoRequestBatch.find_existing(@info_request_batch.user, @info_request_batch.title, @info_request_batch.body, - [FactoryGirl.create(:public_body).id]).should be_nil + [FactoryGirl.create(:public_body)]).should be_nil end it 'should not return a batch sent the same public bodies with a different title and body' do InfoRequestBatch.find_existing(@info_request_batch.user, 'Other title', 'Other body', - [@first_request.public_body_id]).should be_nil + [@first_body]).should be_nil end it 'should not return a batch sent to one of the same public bodies with the same title and body by -- cgit v1.2.3 From e55d7850d36b147275c2f8ffcacccbcf97e0a1d5 Mon Sep 17 00:00:00 2001 From: Louise Crow Date: Wed, 27 Nov 2013 17:40:59 +0000 Subject: Simplify return value, set sent_at in create_batch! --- spec/models/info_request_batch_spec.rb | 47 ++++++++++++++++++++++++---------- 1 file changed, 34 insertions(+), 13 deletions(-) (limited to 'spec/models') diff --git a/spec/models/info_request_batch_spec.rb b/spec/models/info_request_batch_spec.rb index 2323c3bd3..8914da3fa 100644 --- a/spec/models/info_request_batch_spec.rb +++ b/spec/models/info_request_batch_spec.rb @@ -69,21 +69,42 @@ end describe InfoRequestBatch, "when creating a batch", :focus => true do + before do + @title = 'A test title' + @body = "Dear [Authority name],\nA message\nYours faithfully,\nRequester" + @first_public_body = FactoryGirl.create(:public_body) + @second_public_body = FactoryGirl.create(:public_body) + @user = FactoryGirl.create(:user) + @info_request_batch = InfoRequestBatch.create!({:title => @title, + :body => @body, + :public_bodies => [@first_public_body, + @second_public_body], + :user => @user}) + end + it 'should substitute authority name for the placeholder in each request' do - body = "Dear [Authority name],\nA message\nYours faithfully,\nRequester" - first_public_body = FactoryGirl.create(:public_body) - second_public_body = FactoryGirl.create(:public_body) - user = FactoryGirl.create(:user) - info_request_batch = InfoRequestBatch.create!({:title => 'A test title', - :body => body, - :public_bodies => [first_public_body, - second_public_body], - :user => user}) - results = info_request_batch.create_batch! - [first_public_body, second_public_body].each do |public_body| - request = info_request_batch.info_requests.detect{|info_request| info_request.public_body == public_body} - request.outgoing_messages.first.body.should == "Dear #{public_body.name},\nA message\nYours faithfully,\nRequester" + unrequestable = @info_request_batch.create_batch! + [@first_public_body, @second_public_body].each do |public_body| + request = @info_request_batch.info_requests.detect do |info_request| + info_request.public_body == public_body + end + expected = "Dear #{public_body.name},\nA message\nYours faithfully,\nRequester" + request.outgoing_messages.first.body.should == expected end end + it 'should send requests to requestable public bodies, and return a list of unrequestable ones' do + @first_public_body.stub(:is_requestable?).and_return(false) + unrequestable = @info_request_batch.create_batch! + unrequestable.should == [@first_public_body] + @info_request_batch.info_requests.size.should == 1 + request = @info_request_batch.info_requests.first + request.outgoing_messages.first.status.should == 'sent' + end + + it 'should set the sent_at value of the info request batch' do + @info_request_batch.create_batch! + @info_request_batch.sent_at.should_not be_nil + end + end -- cgit v1.2.3 From d0a78300b84021e50268c1a7f947f0ddd5d35f51 Mon Sep 17 00:00:00 2001 From: Louise Crow Date: Wed, 27 Nov 2013 18:39:03 +0000 Subject: Send batch requests as a cron job. --- spec/models/info_request_batch_spec.rb | 40 ++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) (limited to 'spec/models') diff --git a/spec/models/info_request_batch_spec.rb b/spec/models/info_request_batch_spec.rb index 8914da3fa..53158ebe2 100644 --- a/spec/models/info_request_batch_spec.rb +++ b/spec/models/info_request_batch_spec.rb @@ -108,3 +108,43 @@ describe InfoRequestBatch, "when creating a batch", :focus => true do end end + +describe InfoRequestBatch, "when sending batches" do + + before do + @title = 'A test title' + @body = "Dear [Authority name],\nA message\nYours faithfully,\nRequester" + @first_public_body = FactoryGirl.create(:public_body) + @second_public_body = FactoryGirl.create(:public_body) + @user = FactoryGirl.create(:user) + @info_request_batch = InfoRequestBatch.create!({:title => @title, + :body => @body, + :public_bodies => [@first_public_body, + @second_public_body], + :user => @user}) + @sent_batch = InfoRequestBatch.create!({:title => @title, + :body => @body, + :public_bodies => [@first_public_body, + @second_public_body], + :user => @user, + :sent_at => Time.now}) + end + + it 'should send requests and notifications for only unsent batch requests' do + InfoRequestBatch.send_batches + ActionMailer::Base.deliveries.size.should == 3 + first_email = ActionMailer::Base.deliveries.first + first_email.to.should == [@first_public_body.request_email] + first_email.subject.should == 'Freedom of Information request - A test title' + + second_email = ActionMailer::Base.deliveries.second + second_email.to.should == [@second_public_body.request_email] + second_email.subject.should == 'Freedom of Information request - A test title' + + third_email = ActionMailer::Base.deliveries.third + third_email.to.should == [@user.email] + third_email.subject.should == 'Your batch request "A test title" has been sent' + end + +end + -- cgit v1.2.3