fix(editor-export): schema eadge case

Author: mydearxym

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

@@ -48,7 +48,7 @@ defmodule Helper.Converter.EditorToHTML.Validator.EditorSchema do
 
   def get("table") do
     [
-      parent: %{"columnCount" => [:number], "items" => [:list]},
+      parent: %{"columnCount" => [:number, min: 2], "items" => [:list]},
       item: %{
         "text" => [:string],
         "align" => [enum: @valid_table_align],

lib/helper/validator/schema.ex

@@ -107,36 +107,26 @@ defmodule Helper.Validator.Schema do
   # custom validate logic end
 
   # main type
-  defp match(field, value, :string, []) when is_binary(value) do
-    done(field, value)
-  end
-
-  defp match(field, value, :number, []) when is_integer(value) do
-    done(field, value)
-  end
-
-  defp match(field, value, :list, []) when is_list(value) do
-    done(field, value)
-  end
-
-  defp match(field, value, :boolean, []) when is_boolean(value) do
-    done(field, value)
-  end
-
+  defp match(field, value, :string, []) when is_binary(value), do: done(field, value)
+  defp match(field, value, :number, []) when is_integer(value), do: done(field, value)
+  defp match(field, value, :list, []) when is_list(value), do: done(field, value)
+  defp match(field, value, :boolean, []) when is_boolean(value), do: done(field, value)
   # main type end
 
-  defp match(field, value, _type, [option]) when is_tuple(option) and not is_nil(value) do
-    {k, v} = option
-    error(field, value, option: "#{to_string(k)}: #{to_string(v)}")
-  end
+  # judge option
+  defp match(field, value, type, [option]) when is_tuple(option) do
+    # 如果这里不判断的话会和下面的 match 冲突，是否有更好的写法？
+    case option_valid?(option) do
+      true ->
+        error(field, value, type)
 
-  defp match(field, value, _type, [_option]) when not is_nil(value) do
-    error(field, value, :option)
+      false ->
+        {k, v} = option
+        error(field, value, option: "#{to_string(k)}: #{to_string(v)}")
+    end
   end
 
-  defp match(field, value, type, _) do
-    error(field, value, type)
-  end
+  defp match(field, value, type, _), do: error(field, value, type)
 
   defp done(field, value), do: {:ok, %{field: field, value: value}}
 
@@ -155,4 +145,8 @@ defmodule Helper.Validator.Schema do
   defp error(field, value, schema) do
     {:error, %{field: field |> to_string, value: value, message: "should be: #{schema}"}}
   end
+
+  defp option_valid?({:min, v}) when is_integer(v), do: true
+  defp option_valid?({:required, v}) when is_boolean(v), do: true
+  defp option_valid?(_), do: false
 end

test/helper/converter/editor_to_html_test/header_test.exs

@@ -127,8 +127,6 @@ defmodule GroupherServer.Test.Helper.Converter.EditorToHTML.Header do
       {:ok, editor_string} = Jason.encode(json)
       {:ok, converted} = Parser.to_html(editor_string)
 
-      IO.inspect(converted, label: "converted --")
-
       assert Utils.str_occurence(converted, @eyebrow_class) == 0
       assert Utils.str_occurence(converted, @footer_class) == 1
     end

test/helper/converter/editor_to_html_test/list_test.exs

@@ -12,7 +12,7 @@ defmodule GroupherServer.Test.Helper.Converter.EditorToHTML.List do
 
   describe "[list block unit]" do
     defp set_items(mode, items) do
-      editor_json = %{
+      %{
         "time" => 1_567_250_876_713,
         "blocks" => [
           %{

test/helper/converter/editor_to_html_test/table_test.exs

@@ -119,6 +119,15 @@ defmodule GroupherServer.Test.Helper.Converter.EditorToHTML.Table do
                },
                %{block: "table", field: "items", message: "should be: list", value: "bb"}
              ]
+
+      editor_json = set_items(-2, "bb")
+      {:ok, editor_string} = Jason.encode(editor_json)
+      {:error, err_msg} = Parser.to_html(editor_string)
+
+      assert err_msg == [
+               %{block: "table", field: "columnCount", message: "min size: 2", value: -2},
+               %{block: "table", field: "items", message: "should be: list", value: "bb"}
+             ]
     end
   end
 end

test/helper/validator/schema_test.exs

@@ -83,13 +83,32 @@ defmodule GroupherServer.Test.Helper.Validator.Schema do
       {:error, error} = Schema.cast(schema, data)
       assert error == [%{field: "text", message: "should be: number", value: nil}]
 
+      # IO.inspect(Schema.cast(schema, data), label: "schema result")
+      # hello world
+    end
+
+    @tag :wip
+    test "number with wrong option" do
       schema = %{"text" => [:number, required: true, min: "5"]}
       data = %{"text" => 1}
+
       {:error, error} = Schema.cast(schema, data)
       assert error == [%{field: "text", message: "unknow option: min: 5", value: 1}]
 
-      # IO.inspect(Schema.cast(schema, data), label: "schema result")
-      # hello world
+      schema = %{"text" => [:number, required: true, no_exsit_option: "xxx"]}
+      data = %{"text" => 1}
+
+      {:error, error} = Schema.cast(schema, data)
+      assert error == [%{field: "text", message: "unknow option: no_exsit_option: xxx", value: 1}]
+    end
+
+    @tag :wip
+    test "number with options edage case" do
+      schema = %{"text" => [:number, min: 2]}
+      data = %{"text" => "aa"}
+
+      {:error, error} = Schema.cast(schema, data)
+      assert error == [%{field: "text", message: "should be: number", value: "aa"}]
     end
 
     @tag :wip