refactor: extract append_schema_entries to Helpers module

Author: leonqadirie

lib/spark/builder/entity.ex

@@ -562,12 +562,7 @@ defmodule Spark.Builder.Entity do
   end
 
   defp merge_schema(%__MODULE__{} = builder, entries) do
-    %{builder | schema: append_schema_entries(builder.schema, entries)}
-  end
-
-  defp append_schema_entries(schema, entries) do
-    existing_keys = schema |> Keyword.keys() |> MapSet.new()
-    schema ++ Enum.reject(entries, fn {key, _} -> MapSet.member?(existing_keys, key) end)
+    %{builder | schema: Helpers.append_schema_entries(builder.schema, entries)}
   end
 
   defp resolve_entity(value) do

lib/spark/builder/helpers.ex

@@ -43,6 +43,13 @@ defmodule Spark.Builder.Helpers do
     Enum.map(values, &resolve(&1, build_fun, predicate))
   end
 
+  @spec append_schema_entries(Spark.Options.schema(), Spark.Options.schema()) ::
+          Spark.Options.schema()
+  def append_schema_entries(schema, entries) do
+    existing_keys = schema |> Keyword.keys() |> MapSet.new()
+    schema ++ Enum.reject(entries, fn {key, _} -> MapSet.member?(existing_keys, key) end)
+  end
+
   defp run_validations([]), do: :ok
 
   defp run_validations([validation | rest]) when is_function(validation, 0) do

lib/spark/builder/section.ex

@@ -116,7 +116,7 @@ defmodule Spark.Builder.Section do
   """
   @spec option(t(), atom(), keyword()) :: t()
   def option(%__MODULE__{} = builder, name, opts \\ []) when is_atom(name) and is_list(opts) do
-    %{builder | schema: append_schema_entries(builder.schema, [{name, opts}])}
+    %{builder | schema: Helpers.append_schema_entries(builder.schema, [{name, opts}])}
   end
 
   # ===========================================================================
@@ -455,9 +455,4 @@ defmodule Spark.Builder.Section do
   defp resolve_sections(values) do
     Helpers.resolve_list(values, &build!/1, &match?(%DslSection{}, &1))
   end
-
-  defp append_schema_entries(schema, entries) do
-    existing_keys = schema |> Keyword.keys() |> MapSet.new()
-    schema ++ Enum.reject(entries, fn {key, _} -> MapSet.member?(existing_keys, key) end)
-  end
 end