Merge pull request #252 from internetee/fix_contact_request_readonly

Allow saving of contact request AWS message_id
internetee · Mar 9, 2021 · 9c59768 · 9c59768
2 parents 7609de0 + 6f831b0
commit 9c59768
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 3 deletions.
diff --git a/app/mailers/contact_request_mailer.rb b/app/mailers/contact_request_mailer.rb
@@ -42,7 +42,7 @@ def ses_contact_email(contact_request:, recipients:, mail_body:)
     @domain = contact_request.whois_record.name
     begin
       resp = Aws::SES::Client.new.send_email(ses_request_body(recipients))
-      contact_request.update(message_id: resp[:message_id])
+      contact_request.update_registry_message_id(resp[:message_id])
       logger.warn("Contact email sent to #{recipients} from #{@contact_request.email}.")
     rescue Aws::SES::Errors::ServiceError => e
       logger.warn("Email not sent. Error message: #{e}")

diff --git a/app/models/contact_request.rb b/app/models/contact_request.rb
@@ -46,6 +46,13 @@ def update_registry_status(status:, ip:)
     RegistryConnector.do_update(id: id, data: data)
   end
 
+  def update_registry_message_id(message_id)
+    data = {
+      message_id: message_id,
+    }
+    RegistryConnector.do_update(id: id, data: data)
+  end
+
   def send_confirmation_email
     ContactRequestMailer.confirmation_email(self).deliver_now
   end

diff --git a/app/services/registry_connector.rb b/app/services/registry_connector.rb
@@ -32,7 +32,6 @@ def self.do_save(data)
     url = BASE_URL
     request = request(url: url, type: :post)
     request.body = { contact_request: data }.to_json
-    # binding.pry
     perform_request(request, url)
   rescue CommunicationError
     false

diff --git a/test/mailers/contact_request_mailer_test.rb b/test/mailers/contact_request_mailer_test.rb
@@ -3,6 +3,7 @@
 class ContactRequestMailerTest < ActionMailer::TestCase
   def setup
     @contact_request = contact_requests(:valid)
+    stub_request(:put, /http:\/\/registry:3000\/api\/v1\/contact_requests\/\d+/).to_return(status: 200, body: @contact_request.to_json, headers: {})
   end
 
   def test_confirmation_email
@@ -119,6 +120,8 @@ def test_contact_request_email_cuts_off_message_at_2000_characters
   end
 
   def test_attempts_to_send_contact_email_via_aws_ses
+    @contact_request.message_id = 'TESTING'
+    stub_request(:put, /http:\/\/registry:3000\/api\/v1\/contact_requests\/\d+/).to_return(status: 200, body: @contact_request.to_json, headers: {})
     mail_body = begin
       "Hi!\n" \
       "\n" \
@@ -132,7 +135,7 @@ def test_attempts_to_send_contact_email_via_aws_ses
       region: 'us-east-2',
       credentials: Aws::Credentials.new('123', '123'),
       stub_responses: {
-        send_email: { message_id: 'TESTING' }}
+        send_email: { message_id: @contact_request.message_id }}
     )
 
     ApplicationMailer.stub(:ses_configured?, true) do