Move unpacking nadia update struct to the separate function, add case… (#34)

* Move unpacking nadia update struct to the separate function, add case with edited_message instead of message

* Ignore edited messages

* Fix dumb matching mistake

Author: anime-memes

lib/mauricio/acceptor.ex

@@ -35,7 +35,8 @@ defmodule Mauricio.Acceptor do
     |> List.wrap()
     |> Nadia.Parser.parse_result("getUpdates")
     |> hd()
-    |> call_process_update()
+    |> unpack_update_struct()
+    |> CatChat.process_update(:sync)
 
     {200, [], ""}
   end
@@ -48,20 +49,31 @@ defmodule Mauricio.Acceptor do
     {404, [], "Our princess is in another castle..."}
   end
 
-  def call_process_update(%NadiaUpdate{
-         message: %NadiaMessage{
-           chat: %NadiaChat{id: chat_id},
-           date: date,
-           from: from,
-           message_id: message_id,
-           text: text
-         },
-         update_id: update_id
-       }, mode \\ :sync) do
-    CatChat.process_update(%{
-      message: %{chat: %{id: chat_id}, date: date, from: from, message_id: message_id, text: text},
+  @spec unpack_update_struct(NadiaUpdate.t()) :: Acceptor.unpacked_nadia_message()
+  def unpack_update_struct(%NadiaUpdate{message: message, update_id: update_id}) when not is_nil(message) do
+    %NadiaMessage{
+      chat: %NadiaChat{id: chat_id},
+      date: date,
+      from: from,
+      message_id: message_id,
+      text: text
+    } = message
+
+    %{
+      message: %{
+        chat: %{id: chat_id},
+        date: date,
+        from: from,
+        message_id: message_id,
+        text: text
+      },
       update_id: update_id
-    }, mode)
+    }
+  end
+
+  def unpack_update_struct(update) do
+    Logger.warn(inspect(update))
+    %{message: nil}
   end
 
   @impl :elli_handler

lib/mauricio/catchat.ex

@@ -100,8 +100,8 @@ defmodule Mauricio.CatChat do
     {:noreply, catsup_pid}
   end
 
-  def handle_update(%{message: %{chat: %{id: chat_id}, text: text} = message}, mode)
-      when not is_nil(message) do
+  def handle_update(%{message: message}, mode) when not is_nil(message) do
+    %{chat: %{id: chat_id}, text: text} = message
     Logger.log(:info, "Message from #{chat_id} with text #{text}")
 
     chat_pid = CatSup.get_chat(chat_id)
@@ -142,10 +142,7 @@ defmodule Mauricio.CatChat do
     end
   end
 
-  def handle_update(update, _mode) do
-    Logger.warn(inspect(update))
-    :ok
-  end
+  def handle_update(_, _), do: :ok
 
   def handle_cast({:process_update, update}, catsup_pid) do
     handle_update(update, :async)
@@ -161,7 +158,7 @@ defmodule Mauricio.CatChat do
   def process_update(update, :async),
     do: GenServer.cast(__MODULE__, {:process_update, update})
 
-    def process_update(%{message: message} = update, :sync) do
+  def process_update(%{message: message} = update, :sync) do
     case GenServer.call(__MODULE__, {:process_update, update}) do
       :ok ->
         :ok

lib/mauricio/catchat/chat/interaction.ex

@@ -2,7 +2,6 @@ defmodule Mauricio.CatChat.Chat.Interaction do
   require Logger
 
   alias Nadia.Model.User, as: NadiaUser
-
   alias Mauricio.CatChat.{Member, Cat}
   alias Mauricio.Text
 

lib/mauricio/poller.ex

@@ -4,6 +4,7 @@ defmodule Mauricio.Poller do
 
   alias Nadia.Model.Update, as: NadiaUpdate
   alias Mauricio.Acceptor
+  alias Mauricio.CatChat
 
   def start_link(_arg) do
     Logger.log(:info, "Started poller")
@@ -41,7 +42,7 @@ defmodule Mauricio.Poller do
 
   def process_message(%NadiaUpdate{update_id: update_id} = update) do
     Logger.log(:info, inspect(update))
-    Acceptor.call_process_update(update, :async)
+    Acceptor.unpack_update_struct(update) |> CatChat.process_update(:async)
     update_id
   end
 end

test/acceptor_test.exs

@@ -3,6 +3,7 @@ defmodule MauricioTest.Acceptor do
 
   alias Mauricio.Acceptor
   alias Mauricio.CatChat.Chats
+  alias MauricioTest.Helpers
 
   setup_all do
     children = [{Mauricio.Acceptor, [port: 4001]}]
@@ -101,4 +102,27 @@ defmodule MauricioTest.Acceptor do
              workers: 0
            }
   end
+
+  describe "unpack_update_struct" do
+    test "correctly unpacks new message struct" do
+      new_message = Helpers.update_with_text(1, "new message")
+
+      assert %{
+               message: %{
+                 chat: %{id: _},
+                 date: _,
+                 from: %{first_name: _, id: _, last_name: _, username: _},
+                 message_id: _,
+                 text: _
+               },
+               update_id: _
+             } = Acceptor.unpack_update_struct(new_message)
+    end
+
+    test "ignores edited message" do
+      edited_message = Helpers.edited_message(1, "edit")
+
+      assert %{message: nil} = Acceptor.unpack_update_struct(edited_message)
+    end
+  end
 end

test/cat_test.exs

@@ -3,7 +3,6 @@ defmodule MauricioTest.CatTest do
   use PropCheck
 
   alias Nadia.Model.User, as: NadiaUser
-
   alias Mauricio.CatChat.{Cat, Member}
   alias Mauricio.CatChat.Cat.State.{Awake, Away, WantCare}
   alias Mauricio.Storage.{Serializable, Decoder}

test/test_helper.exs

@@ -71,6 +71,37 @@ defmodule MauricioTest.Helpers do
     }
   end
 
+  def edited_message(chat_id, user_id \\ nil, text) do
+    user_id = user_id || chat_id
+
+    %NadiaUpdate{
+      callback_query: nil,
+      channel_post: nil,
+      chosen_inline_result: nil,
+      edited_message: %{
+        chat: %{
+          id: chat_id,
+          title: "Chat title",
+          type: "private"
+        },
+        date: 1_578_194_118,
+        edit_date: 1_578_194_119,
+        from: %{
+          first_name: "name",
+          id: user_id,
+          is_bot: false,
+          last_name: "name",
+          username: "username"
+        },
+        message_id: 123,
+        text: text
+      },
+      inline_query: nil,
+      message: nil,
+      update_id: 123_123_123
+    }
+  end
+
   def chat(chat_id) do
     %NadiaChat{
       first_name: "Yaropolk",