A big pile of refactoring

Dockerfile

@@ -39,6 +39,7 @@ ADD ./cwc/ ./cwc
 RUN bundle install
 
 ADD app ./app
+ADD lib ./lib
 ADD config ./config
 ADD db ./db
 ADD public ./public

README.md

@@ -270,15 +270,16 @@ If you prefer to dive deep, you can fire up the padrino console with `padrino c`
 > job = Delayed::Job.where(queue: "error_or_failure").first # get the first job
  => #<Delayed::Backend::ActiveRecord::Job id: 318, priority: 0, attempts: 1, handler: "--- !ruby/object:Delayed::PerformableMethod\nobject:...", last_error: "Unable to find css \"p\" with text /Thank you!/\n[\"/ho...", run_at: "2014-07-03 12:14:10", locked_at: nil, failed_at: nil, locked_by: nil, queue: "error_or_failure", created_at: "2014-07-03 12:14:10", updated_at: "2014-08-26 18:50:27">
 > handler = YAML.load job.handler # get the "handler" which contains the object to be acted upon and the arguments
- => #<Delayed::PerformableMethod:0x0000000544ae30 @object=#<CongressMember id: 60, bioguide_id: "F000457", success_criteria: "---\nheaders:\n  status: 200\nbody:\n  contains: Your m...", created_at: "2014-04-30 19:08:05", updated_at: "2014-07-03 18:54:34">, @method_name=:fill_out_form, @args=[{"$NAME_FIRST"=>"John", "$NAME_LAST"=>"Doe", "$ADDRESS_STREET"=>"123 Fake Street", "$ADDRESS_CITY"=>"Hennepin", "$ADDRESS_ZIP5"=>"55369", "$EMAIL"=>"[email protected]", "subscribe"=>"1", "$SUBJECT"=>"Example subject", "$MESSAGE"=>"Example Message", "$NAME_PREFIX"=>"Mr.", "$ADDRESS_STATE_POSTAL_ABBREV"=>"MN", "$TOPIC"=>"Example Topic", "$PHONE"=>"555-555-5555", "$ADDRESS_ZIP4"=>"1234"}, nil]>
+ => #<Delayed::PerformableMethod:0x0000000544ae30 @object=
+#<FormFiller:0x007fd1abb23728 @campaign_tag=nil, @fields={}, @rep= #<CongressMember:0x007fd1ac1e0020 id: 1, bioguide_id: "A000374", success_criteria: "---\n" + "headers:\n" + "  status: 200\n" + "body:\n" + "  contains: your message has been sent\n", created_at: 2018-05-04 19:38:48 UTC, updated_at: 2018-05-04 19:41:35 UTC, defunct: false, contact_url: "https://abraham.house.gov", name: "Abraham", state: "LA", chamber: "house", house_district: 5, senate_class: nil>, @session=nil>, @method_name=:fill_out_form, @args=[{"$NAME_FIRST"=>"John", "$NAME_LAST"=>"Doe", "$ADDRESS_STREET"=>"123 Fake Street", "$ADDRESS_CITY"=>"Hennepin", "$ADDRESS_ZIP5"=>"55369", "$EMAIL"=>"[email protected]", "subscribe"=>"1", "$SUBJECT"=>"Example subject", "$MESSAGE"=>"Example Message", "$NAME_PREFIX"=>"Mr.", "$ADDRESS_STATE_POSTAL_ABBREV"=>"MN", "$TOPIC"=>"Example Topic", "$PHONE"=>"555-555-5555", "$ADDRESS_ZIP4"=>"1234"}, nil]>
 handler.args[0]['$PHONE'] = '123-456-7890' # set the phone number
 ```
 
 Then, when you're ready to retry the fill:
 
 ```rb
 handler.perform # try filling out the form
-handler.object.fill_out_form(handler.args[0]) do |c|
+handler.object.fill_out_form do |c|
   puts c
   STDIN.gets.strip
 end # fills out a form with a captcha

app/controllers/cwc.rb

@@ -3,53 +3,45 @@
 CongressForms::App.controller do
   before do
     Raven.tags_context web: true
+    @cm = CongressMember.find_by_cwc_office_code(params[:office_code])
   end
 
   get "cwc/:office_code/fields" do
-    cm = CongressMember.find_by_cwc_office_code(params[:office_code])
     Cwc::RequiredJson.to_json
   end
 
   post "cwc/:office_code/messages" do
     content_type :json
 
-    cm = CongressMember.find_by_cwc_office_code(params[:office_code])
-    return { status: "error", message: "Congress member with provided bio id not found" }.to_json if cm.nil?
+    return error_response("Congress member with provided bio id not found") if @cm.nil?
 
-    missing_parameters = []
     fields = params["fields"] || {}
     fields["$MESSAGE"] ||= fields["$STATEMENT"]
-    Cwc::RequiredJson["required_actions"].each do |field|
-      unless fields.include?(field["value"])
-        missing_parameters << field["value"]
-      end
-    end
 
+    missing_parameters = Cwc::RequiredJson["required_actions"].map {|f| f["value"] } - fields.keys
     if missing_parameters.any?
       see_other = "/cwc/#{params[:office_code]}/fields"
       message = "Error: missing fields (#{missing_parameters.join(', ')}). See #{see_other} for required fields."
-      return { status: "error", message: message }.to_json
+      return error_response(message)
     end
 
     keywords = { campaign_tag: params["campaign_tag"] }
     keywords[:organization] = { name: params["organization"] } if params["organization"]
     keywords[:validate_only] = true if params["test"] == "1"
 
     begin
-      cm.message_via_cwc(fields, **keywords)
-      if params["test"] == "1"
-        { status: "success", test: true }.to_json
-      else
-        { status: "success" }.to_json
-      end
+      @cm.message_via_cwc(fields, **keywords)
+      response = { status: "success" }
+      response[:test] = true if params["test"] == "1"
+      response.to_json
     rescue Cwc::BadRequest => e
       logger.warn("Cwc::BadRequest:")
       e.errors.each{ |error| logger.warn("  * #{error}") }
 
       Raven.capture_message("Cwc::BadRequest: #{e.errors.last}",
-                            extra: { bioguide: cm.bioguide_id, fields: fields, errors: e.errors })
+                            extra: { bioguide: @cm.bioguide_id, fields: fields, errors: e.errors })
 
-      NotifySender.new(cm, fields).delay(queue: "notifications").execute if SMTP_SETTINGS.present?
+      NotifySender.new(@cm, fields).delay(queue: "notifications").execute if SMTP_SETTINGS.present?
 
       { status: "error" }.to_json
     end