refactor(editor): validate_with logic re-org

Author: mydearxym

lib/helper/converter/editor_to_html/validator/index.ex

@@ -30,7 +30,15 @@ defmodule Helper.Converter.EditorToHTML.Validator do
   end
 
   defp validate_editor_fmt(data) do
-    validate_with("editor", EditorSchema.get("editor"), data)
+    try do
+      validate_with("editor", EditorSchema.get("editor"), data)
+    rescue
+      e in MatchError ->
+        format_parse_error(e)
+
+      _ ->
+        format_parse_error()
+    end
   end
 
   defp validate_blocks([]), do: {:ok, :pass}
@@ -69,43 +77,30 @@ defmodule Helper.Converter.EditorToHTML.Validator do
   end
 
   defp validate_block(%{"type" => type}), do: raise("undown #{type} block")
+
   defp validate_block(e), do: raise("undown block: #{e}")
 
   # validate with given schema
   defp validate_with(block, schema, data) do
     case Schema.cast(schema, data) do
       {:error, errors} ->
-        format_parse_error(block, errors)
+        {:error, message} = format_parse_error(block, errors)
+        raise %MatchError{term: {:error, message}}
 
       _ ->
         {:ok, :pass}
     end
   end
 
   defp validate_with(block, parent_schema, item_schema, data) do
-    case Schema.cast(parent_schema, data) do
-      {:error, errors} ->
-        {:error, message} = format_parse_error(block, errors)
-        raise %MatchError{term: {:error, message}}
+    with {:ok, _} <- validate_with(block, parent_schema, data),
+         %{"mode" => mode, "items" => items} <- data do
+      Enum.each(items, fn item ->
+        validate_with("#{block}(#{mode})", item_schema, item)
+      end)
 
-      _ ->
-        {:ok, :pass}
+      {:ok, :pass}
     end
-
-    %{"mode" => mode, "items" => items} = data
-
-    Enum.each(items, fn item ->
-      case Schema.cast(item_schema, item) do
-        {:error, errors} ->
-          {:error, message} = format_parse_error("#{block}(#{mode})", errors)
-          raise %MatchError{term: {:error, message}}
-
-        _ ->
-          {:ok, :pass}
-      end
-    end)
-
-    {:ok, :pass}
   end
 
   defp format_parse_error(type, error_list) when is_list(error_list) do

test/helper/converter/editor_to_html_test/list_test.exs

@@ -31,7 +31,7 @@ defmodule GroupherServer.Test.Helper.Converter.EditorToHTML.List do
       ],
       "version" => "2.15.0"
     }
-    @tag :wip
+    @tag :wip2
     test "valid list parse should work" do
       {:ok, editor_string} = Jason.encode(@editor_json)
       # assert {:ok, converted} = Parser.to_html(editor_string)
@@ -52,7 +52,7 @@ defmodule GroupherServer.Test.Helper.Converter.EditorToHTML.List do
       ],
       "version" => "2.15.0"
     }
-    @tag :wip2
+    @tag :wip
     test "invalid list mode parse should raise error message" do
       {:ok, editor_string} = Jason.encode(@editor_json)
       {:error, err_msg} = Parser.to_html(editor_string)