Explorar o código

Switch twilio to use message secret, not id

Lily Carpenter %!s(int64=10) %!d(string=hai) anos
pai
achega
61d7f6d33a

+ 6 - 6
twilio/app/controllers/twilio_controller.rb

@@ -3,7 +3,7 @@ class TwilioController < ApplicationController
3 3
     msg = Twilio::TwiML::Response.new do |r|
4 4
       r.Say "Hello, welcome to Scavenger Hunt Express."
5 5
       r.Gather action: '/twilio/get_message', method: 'get' do |g|
6
-        g.Say "Please enter the ID of the message and end with #."
6
+        g.Say "Please enter the secret number of the message and end with #."
7 7
       end
8 8
     end.text
9 9
 
@@ -11,15 +11,15 @@ class TwilioController < ApplicationController
11 11
   end
12 12
 
13 13
   def get_message
14
-    id = params["message"]
15
-    id ||= params["Digits"]
14
+    secret = params["message"]
15
+    secret ||= params["Digits"]
16 16
 
17
-    message_object = Message.find_by_id(id)
17
+    message_object = Message.find_by_secret(secret)
18 18
 
19 19
     if message_object.nil?
20
-      message = "No message with id #{id} found."
20
+      message = "No message with secret #{secret} found."
21 21
     else
22
-      message = "Begin Message." + message_object.body + ". End Message."
22
+      message = message_object.body
23 23
     end
24 24
 
25 25
     # This call is directly from Twilio, not from us

+ 5 - 5
twilio/spec/controllers/twilio_controller_spec.rb

@@ -11,28 +11,28 @@ RSpec.describe TwilioController, :type => :controller do
11 11
   end
12 12
 
13 13
   describe "GET #get_message" do
14
-    context "valid message id" do
14
+    context "valid message secret" do
15 15
       it "has a valid response" do
16 16
         message = generate_message(true)
17
-        get :get_message, "Digits" => message.id
17
+        get :get_message, "Digits" => message.secret
18 18
         expect(response.code).to eq "200"
19 19
         expect(Nokogiri::XML(response.body).xpath("//Response")).to_not be_empty
20 20
       end
21 21
 
22 22
       it "contains the message body" do
23 23
         message = generate_message(true)
24
-        get :get_message, "Digits" => message.id
24
+        get :get_message, "Digits" => message.secret
25 25
         expect(response.body).to include(message.body)
26 26
       end
27 27
 
28 28
       it "accepts message instead of Digits" do
29 29
         message = generate_message(true)
30
-        get :get_message, "message" => message.id, "Digits" => 3243209420948320
30
+        get :get_message, "message" => message.secret, "Digits" => 3243209420948320
31 31
         expect(response.body).to include(message.body)
32 32
       end
33 33
     end
34 34
 
35
-    context "invalid message id" do
35
+    context "invalid message secret" do
36 36
       it "has a valid response" do
37 37
         get :get_message, "Digits" => 99934132432443
38 38
         expect(response.code).to eq "200"