Merge pull request #36 from praekeltfoundation/invest_ttl

Invest ttl
praekeltfoundation · Aug 12, 2024 · b47d8c0 · b47d8c0
2 parents 6caae86 + 83289f3
commit b47d8c0
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 23 deletions.
diff --git a/lib/turn_junebug_expressway_web/utils.ex b/lib/turn_junebug_expressway_web/utils.ex
@@ -62,8 +62,8 @@ defmodule TurnJunebugExpresswayWeb.Utils do
   end
 
   def send_message(message, ttl) do
-    key = Map.get(message, "user_message_id")
-    value = Map.get(message, "recipient_id")
+    key = Map.get(message, "message_id")
+    value = Map.get(message, "to_addr")
     IO.puts("send_message1")
     IO.puts("#{inspect(message)}")
     IO.puts("#{inspect(key)}, #{inspect(value)}")
@@ -72,8 +72,8 @@ defmodule TurnJunebugExpresswayWeb.Utils do
   end
 
   def send_message(message) do
-    key = Map.get(message, "user_message_id")
-    value = Map.get(message, "recipient_id")
+    key = Map.get(message, "message_id")
+    value = Map.get(message, "to_addr")
     IO.puts("send_message2")
     IO.puts("#{inspect(message)}")
     IO.puts("#{inspect(key)}, #{inspect(value)}")
@@ -129,10 +129,7 @@ defmodule TurnJunebugExpresswayWeb.Utils do
   end
 
   def forward_event(event) do
-    # IO.puts("#{inspect(event)}")
-    IO.puts(
-      "#{inspect(MessageRecipientIdCache.get(:my_cache, Map.get(event, "user_message_id")))}"
-    )
+    IO.puts("#{inspect(event)}")
 
     case event |> get_event_status do
       {:ignore, _} ->

diff --git a/test/turn_junebug_expressway_web/utils_test.exs b/test/turn_junebug_expressway_web/utils_test.exs
@@ -42,8 +42,8 @@ defmodule TurnJunebugExpresswayWeb.UtilsTest do
 
       message = %{
         "content" => "something",
-        "recipient_id" => nil,
-        "user_message_id" => "f74c4e6108d8418ab53dbcfd628242f3"
+        "to_addr" => nil,
+        "message_id" => "f74c4e6108d8418ab53dbcfd628242f3"
       }
 
       Utils.send_message(message)
@@ -81,8 +81,8 @@ defmodule TurnJunebugExpresswayWeb.UtilsTest do
 
       message = %{
         "content" => "something",
-        "recipient_id" => "1234",
-        "user_message_id" => "f74c4e6108d8418ab53dbcfd628242f3"
+        "to_addr" => "1234",
+        "message_id" => "f74c4e6108d8418ab53dbcfd628242f3"
       }
 
       Utils.send_message(message)
@@ -113,7 +113,7 @@ defmodule TurnJunebugExpresswayWeb.UtilsTest do
         "statuses" => [
           %{
             "id" => "f74c4e6108d8418ab53dbcfd628242f3",
-            "recipient_id" => 1234,
+            "to_addr" => "1234",
             "status" => "sent",
             "timestamp" => "1572525144930"
           }
@@ -122,8 +122,8 @@ defmodule TurnJunebugExpresswayWeb.UtilsTest do
 
       message = %{
         "content" => "something",
-        "recipient_id" => "1234",
-        "user_message_id" => "16e42b66-03b7-4558-8a72-e9db481fdb4c"
+        "to_addr" => "1234",
+        "message_id" => "16e42b66-03b7-4558-8a72-e9db481fdb4c"
       }
 
       Utils.send_message(message)
@@ -216,27 +216,27 @@ defmodule TurnJunebugExpresswayWeb.UtilsTest do
     test "checking if key is deleated after 3 seconds" do
       message = %{
         "content" => "something",
-        "recipient_id" => "1234",
-        "user_message_id" => "f74c4e6108d8418ab53dbcfd628242f3"
+        "to_addr" => "1234",
+        "message_id" => "f74c4e6108d8418ab53dbcfd628242f3"
       }
 
       Utils.send_message(message, 1000)
-      assert MessageRecipientIdCache.get(:my_cache, Map.get(message, "user_message_id")) == "1234"
+      assert MessageRecipientIdCache.get(:my_cache, Map.get(message, "message_id")) == "1234"
       :timer.sleep(3_000)
-      assert MessageRecipientIdCache.get(:my_cache, Map.get(message, "user_message_id")) == nil
+      assert MessageRecipientIdCache.get(:my_cache, Map.get(message, "message_id")) == nil
     end
 
     test "checking if key is deleated after default ttl" do
       message = %{
         "content" => "something",
-        "recipient_id" => "1234",
-        "user_message_id" => "f74c4e6108d8418ab53dbcfd628242f3"
+        "to_addr" => "1234",
+        "message_id" => "f74c4e6108d8418ab53dbcfd628242f3"
       }
 
       Utils.send_message(message)
-      assert MessageRecipientIdCache.get(:my_cache, Map.get(message, "user_message_id")) == "1234"
+      assert MessageRecipientIdCache.get(:my_cache, Map.get(message, "message_id")) == "1234"
       :timer.sleep(11_000)
-      assert MessageRecipientIdCache.get(:my_cache, Map.get(message, "user_message_id")) == nil
+      assert MessageRecipientIdCache.get(:my_cache, Map.get(message, "message_id")) == nil
     end
   end