From de50a067c75018e9a7462b49e3115a212c142ff5 Mon Sep 17 00:00:00 2001
From: Ivan Ivanov <ivan.ivanoff.95@gmail.com>
Date: Thu, 7 Nov 2024 16:50:16 +0200
Subject: [PATCH] Rework Metric.Registry table. Improve edit/new form

---
 lib/sanbase/metric/registry/event_emitter.ex  |   4 +
 lib/sanbase/metric/registry/populate.ex       |   3 +-
 lib/sanbase/metric/registry/registry.ex       |  26 +-
 lib/sanbase/metric/registry/validation.ex     |   2 +-
 .../metric_registry_form_live.ex              | 302 ++++++++++++------
 .../metric_registry_show_live.ex              |  12 +-
 .../20241104115340_create_metric_registry.exs |   5 +-
 priv/repo/structure.sql                       |   4 +-
 8 files changed, 234 insertions(+), 124 deletions(-)

diff --git a/lib/sanbase/metric/registry/event_emitter.ex b/lib/sanbase/metric/registry/event_emitter.ex
index a53da5991..7d2bd25c0 100644
--- a/lib/sanbase/metric/registry/event_emitter.ex
+++ b/lib/sanbase/metric/registry/event_emitter.ex
@@ -21,6 +21,10 @@ defmodule Sanbase.Metric.Registry.EventEmitter do
     |> notify()
   end
 
+  def handle_event({:error, _changeset}, _event_type, _args) do
+    :ok
+  end
+
   defp notify(data) do
     Sanbase.EventBus.notify(%{topic: @topic, data: data})
     :ok
diff --git a/lib/sanbase/metric/registry/populate.ex b/lib/sanbase/metric/registry/populate.ex
index 4cdefaab5..1bce5e5f2 100644
--- a/lib/sanbase/metric/registry/populate.ex
+++ b/lib/sanbase/metric/registry/populate.ex
@@ -35,7 +35,8 @@ defmodule Sanbase.Metric.Registry.Populate do
       is_timebound: Map.get(map, "is_timebound", false),
       metric: map["name"],
       min_interval: map["min_interval"],
-      min_plan: Map.get(map, "min_plan", %{}),
+      sanbase_min_plan: get_in(map, ["min_plan", "SANBASE"]) || "free",
+      sanapi_min_plan: get_in(map, ["min_plan", "SANAPI"]) || "free",
       parameters: Map.get(map, "parameters", []),
       required_selectors: Map.get(map, "required_selectors", []) |> Enum.map(&%{type: &1}),
       selectors: Map.get(map, "selectors", []) |> Enum.map(&%{type: &1}),
diff --git a/lib/sanbase/metric/registry/registry.ex b/lib/sanbase/metric/registry/registry.ex
index d2099dce3..8211f1a7c 100644
--- a/lib/sanbase/metric/registry/registry.ex
+++ b/lib/sanbase/metric/registry/registry.ex
@@ -13,6 +13,8 @@ defmodule Sanbase.Metric.Registry do
   @human_readable_name_regex ~r|^[a-zA-Z0-9_\.\-{}():/\\ ]+$|
   @aggregations ["sum", "last", "count", "avg", "max", "min", "first"]
   def aggregations(), do: @aggregations
+  @metric_regex ~r/^[a-z0-9_{}:]+$/
+  def metric_regex(), do: @metric_regex
 
   @type t :: %__MODULE__{
           id: integer(),
@@ -24,7 +26,8 @@ defmodule Sanbase.Metric.Registry do
           default_aggregation: String.t(),
           min_interval: String.t(),
           access: String.t(),
-          min_plan: map(),
+          sanbase_min_plan: String.t(),
+          sanapi_min_plan: String.t(),
           selectors: [String.t()],
           required_selectors: [String.t()],
           is_template: boolean(),
@@ -32,7 +35,6 @@ defmodule Sanbase.Metric.Registry do
           fixed_parameters: map(),
           is_timebound: boolean(),
           has_incomplete_data: boolean(),
-          is_exposed: boolean(),
           exposed_environments: String.t(),
           is_hidden: boolean(),
           is_deprecated: boolean(),
@@ -71,6 +73,7 @@ defmodule Sanbase.Metric.Registry do
       struct
       |> cast(attrs, [:name])
       |> validate_required([:name])
+      |> validate_format(:name, ~r/[a-z0-9_\-]/)
     end
   end
 
@@ -85,7 +88,9 @@ defmodule Sanbase.Metric.Registry do
     def changeset(%__MODULE__{} = struct, attrs) do
       struct
       |> cast(attrs, [:name])
-      |> validate_required([:name])
+      |> validate_required(:name)
+      |> validate_format(:name, Sanbase.Metric.Registry.metric_regex())
+      |> validate_length(:name, min: 3, max: 100)
     end
   end
 
@@ -118,7 +123,8 @@ defmodule Sanbase.Metric.Registry do
     field(:default_aggregation, :string)
     field(:min_interval, :string)
     field(:access, :string)
-    field(:min_plan, :map)
+    field(:sanbase_min_plan, :string)
+    field(:sanapi_min_plan, :string)
     embeds_many(:selectors, Selector, on_replace: :delete)
     embeds_many(:required_selectors, Selector, on_replace: :delete)
 
@@ -131,7 +137,6 @@ defmodule Sanbase.Metric.Registry do
     field(:is_timebound, :boolean, default: false)
     field(:has_incomplete_data, :boolean, default: false)
 
-    field(:is_exposed, :boolean, default: true)
     field(:exposed_environments, :string, default: "all")
 
     field(:is_hidden, :boolean, default: false)
@@ -159,13 +164,13 @@ defmodule Sanbase.Metric.Registry do
       :human_readable_name,
       :internal_metric,
       :is_deprecated,
-      :is_exposed,
       :is_hidden,
       :is_template,
       :is_timebound,
       :metric,
       :min_interval,
-      :min_plan,
+      :sanbase_min_plan,
+      :sanapi_min_plan,
       :parameters
     ])
     |> cast_embed(:selectors,
@@ -201,8 +206,8 @@ defmodule Sanbase.Metric.Registry do
       :metric,
       :min_interval
     ])
-    |> validate_format(:metric, ~r/^[a-z0-9_{}:]+$/)
-    |> validate_format(:internal_metric, ~r/^[a-z0-9_{}:]+$/)
+    |> validate_format(:metric, @metric_regex)
+    |> validate_format(:internal_metric, @metric_regex)
     |> validate_format(:human_readable_name, @human_readable_name_regex)
     |> validate_length(:metric, min: 3, max: 100)
     |> validate_length(:internal_metric, min: 3, max: 100)
@@ -212,7 +217,8 @@ defmodule Sanbase.Metric.Registry do
     |> validate_inclusion(:exposed_environments, ["all", "none", "stage", "prod"])
     |> validate_inclusion(:access, ["free", "restricted"])
     |> validate_change(:min_interval, &Validation.validate_min_interval/2)
-    |> validate_change(:min_plan, &Validation.validate_min_plan/2)
+    |> validate_inclusion(:sanbase_min_plan, ["free", "pro", "max"])
+    |> validate_inclusion(:sanapi_min_plan, ["free", "pro", "max"])
     |> Validation.validate_template_fields()
     |> unique_constraint([:metric, :data_type, :fixed_parameters],
       name: :metric_registry_composite_unique_index
diff --git a/lib/sanbase/metric/registry/validation.ex b/lib/sanbase/metric/registry/validation.ex
index 1b86869b8..d468de150 100644
--- a/lib/sanbase/metric/registry/validation.ex
+++ b/lib/sanbase/metric/registry/validation.ex
@@ -88,7 +88,7 @@ defmodule Sanbase.Metric.Registry.Validation do
         :parameters,
         """
         The provided parameters do not match the captures in the metric #{metric}.
-        Captures: #{Enum.join(captures, ", ")}
+        Captures: #{Enum.join(captures, ", ")},
         Parameters: #{Enum.join(parameter_keys, ", ")}
         """
       )
diff --git a/lib/sanbase_web/live/metric_registry/metric_registry_form_live.ex b/lib/sanbase_web/live/metric_registry/metric_registry_form_live.ex
index 615fc01ca..e86c2e59b 100644
--- a/lib/sanbase_web/live/metric_registry/metric_registry_form_live.ex
+++ b/lib/sanbase_web/live/metric_registry/metric_registry_form_live.ex
@@ -21,7 +21,8 @@ defmodule SanbaseWeb.MetricRegistryFormLive do
      |> assign(
        metric_registry: metric_registry,
        age_title: page_title(socket.assigns.live_action),
-       form: form
+       form: form,
+       save_errors: []
      )}
   end
 
@@ -66,30 +67,37 @@ defmodule SanbaseWeb.MetricRegistryFormLive do
           label="Human Readable Name"
         />
         <.aliases_input form={@form} />
-
         <.tables_input form={@form} />
+        <.min_plan_input form={@form} />
+        <.input
+          type="select"
+          id="input-access"
+          field={@form[:access]}
+          label="Access"
+          options={["free", "restricted"]}
+        />
         <.input type="text" id="input-min-interval" field={@form[:min_interval]} label="Min Interval" />
         <.input
           type="select"
-          id="input-aggregation"
-          field={@form[:aggregation]}
+          id="input-default-aggregation"
+          field={@form[:default_aggregation]}
           label="Default Aggregation"
           options={Registry.aggregations()}
         />
 
         <.input
           type="select"
-          id="input-access"
-          field={@form[:access]}
-          label="Access"
-          options={["free", "restricted"]}
+          id="input-has-incomplete-data"
+          field={@form[:has_incomplete_data]}
+          label="Has Incomplete Data"
+          options={[true, false]}
         />
         <.input
           type="select"
           id="input-exposed-environments"
           field={@form[:exposed_environments]}
           label="Exposed on Environments"
-          options={["all", "stage", "prod"]}
+          options={["all", "none", "stage", "prod"]}
         />
 
         <.input
@@ -99,117 +107,183 @@ defmodule SanbaseWeb.MetricRegistryFormLive do
           label="Access"
           options={["timeseries", "histogram", "table"]}
         />
-
-        <.input type="textarea" id="input-parameters" field={@form[:parameters]} label="Parameters" />
         <.selectors_input form={@form} />
         <.required_selectors_input form={@form} />
+
+        <.input
+          type="select"
+          id="input-is-hidden"
+          field={@form[:is_hidden]}
+          label="Is Hidden"
+          options={[true, false]}
+        />
+        <.input
+          type="select"
+          id="input-is-timebound"
+          field={@form[:is_timebound]}
+          label="Is Timebound"
+          options={[true, false]}
+        />
+        <.input
+          type="textarea"
+          id="input-parameters"
+          field={@form[:parameters]}
+          value={Jason.encode!(@metric_registry.parameters)}
+          label="Parameters"
+        />
         <.button phx-disable-with="Saving...">Save</.button>
+
+        <.error :for={{field, [msg]} <- @save_errors}><%= to_string(field) <> ": " <> msg %></.error>
       </.simple_form>
     </div>
     """
   end
 
+  def min_plan_input(assigns) do
+    ~H"""
+    <div class="border border-gray-200 rounded-lg px-3 py-6">
+      <span class="text-sm font-semibold leading-6 text-zinc-800 mb-3">Min Plan per product</span>
+      <.input
+        type="select"
+        id="input-sanbase-min-plan"
+        field={@form[:sanbase_min_plan]}
+        label="Sanbase"
+        options={["free", "pro", "max"]}
+      />
+
+      <.input
+        type="select"
+        id="input-sanapi-min-plan"
+        field={@form[:sanapi_min_plan]}
+        label="Sanapi"
+        options={["free", "pro", "max"]}
+      />
+    </div>
+    """
+  end
+
   attr :name, :string, required: true
   attr :text, :string, required: true
-  attr :icon, :string, required: false, default: nil
-  attr :fp, :map, required: false, default: nil
+  attr :ef, :map, required: false, default: nil
 
-  def inputs_for_button(assigns) do
+  def inputs_for_drop_button(assigns) do
     ~H"""
-    <label class="block cursor-pointer">
-      <input :if={@fp} type="checkbox" name={@name} value={@fp.index} class="hidden" />
-      <input :if={!@fp} type="checkbox" name={@name} class="hidden" />
+    <button
+      type="button"
+      class="text-gray-900 my-1 bg-white hover:bg-red-100 border border-gray-200 font-medium rounded-lg text-sm px-4 py-2 text-center inline-flex items-center"
+      name={@name}
+      value={@ef.index}
+      phx-click={JS.dispatch("change")}
+    >
+      <.icon name="hero-x-mark" class="w-6 h-6 relative bg-red-700" />
+      <%= @text %>
+    </button>
+    """
+  end
 
-      <div class="text-gray-900 bg-white hover:bg-gray-100 border border-gray-200 font-medium rounded-lg text-sm px-5 py-2.5 text-center inline-flex items-center">
-        <.icon :if={@icon} name={@icon} class="w-6 h-6 relative bg-red-800" />
-        <%= @text %>
-      </div>
-    </label>
+  attr :name, :string, required: true
+  attr :text, :string, required: true
+
+  def inputs_for_add_button(assigns) do
+    ~H"""
+    <hr class="h-px my-8 bg-gray-200 border-0 dark:bg-gray-700" />
+    <button
+      type="button"
+      name={@name}
+      value="new"
+      phx-click={JS.dispatch("change")}
+      class="text-gray-900 bg-white hover:bg-gray-100 border border-gray-200 font-medium rounded-lg text-sm px-5 py-2.5 text-center inline-flex items-center"
+    >
+      <%= @text %>
+    </button>
     """
   end
 
-  def inputs_for_drop_button(assigns) do
+  attr :form, :map, required: true
+  attr :singular, :string, required: true
+  attr :plural, :string, required: true
+  attr :form_field, :atom, required: true
+  attr :embeded_schema_field, :atom, required: true
+  attr :sort_param, :atom, required: true
+  attr :drop_param, :atom, required: true
+
+  def embeds_input(assigns) do
     ~H"""
-    <label class="cursor-pointer">
-      <input type="checkbox" name={@name} value={@fp.index} class="hidden" />
+    <div class="border border-gray-200 rounded-lg px-3 py-6">
+      <span class="text-sm font-semibold leading-6 text-zinc-800">
+        <%= Inflex.camelize(@plural) %>
+      </span>
+      <.inputs_for :let={ef} field={@form[@form_field]}>
+        <input type="hidden" name={"registry[#{@sort_param}][]"} value={ef.index} />
+        <.input type="text" field={ef[@embeded_schema_field]} placeholder={@singular} />
+
+        <.inputs_for_drop_button
+          ef={ef}
+          name={"registry[#{@drop_param}][]"}
+          text={"Remove #{@singular}"}
+        />
+      </.inputs_for>
 
-      <div class="text-gray-900 bg-white hover:bg-gray-100 border border-gray-200 font-medium rounded-lg text-sm px-5 py-2.5 text-center inline-flex items-center">
-        <.icon name="hero-x-mark" class="w-6 h-6 relative bg-red-800" /> <%= @text %>
-      </div>
-    </label>
+      <input type="hidden" name={"registry[#{@drop_param}][]"} />
+
+      <.inputs_for_add_button name={"registry[#{@sort_param}][]"} text={"Add new #{@singular}"} />
+    </div>
     """
   end
 
   def aliases_input(assigns) do
     ~H"""
-    <h3>Aliases</h3>
-    <.inputs_for :let={fp} field={@form[:aliases]}>
-      <.input field={fp[:name]} type="text" label="Alias" />
-
-      <.inputs_for_drop_button fp={fp} name="registry[aliases_drop][]" text="Remove alias" />
-    </.inputs_for>
-
-    <label class="block cursor-pointer">
-      <div class="text-gray-900 bg-white hover:bg-gray-100 border border-gray-200 font-medium rounded-lg text-sm px-5 py-2.5 text-center inline-flex items-center">
-        <input type="checkbox" name="registry[aliases_sort][]" class="hidden" /> Add new alias
-      </div>
-    </label>
+    <.embeds_input
+      form={@form}
+      plural="aliases"
+      singular="alias"
+      form_field={:aliases}
+      embeded_schema_field={:name}
+      sort_param={:aliases_sort}
+      drop_param={:aliases_drop}
+    />
     """
   end
 
   def tables_input(assigns) do
     ~H"""
-    <h3>Tables</h3>
-    <.inputs_for :let={fp} field={@form[:tables]}>
-      <.input field={fp[:name]} type="text" label="Table" />
-
-      <.inputs_for_drop_button fp={fp} name="registry[tables_drop][]" text="Remove table" />
-    </.inputs_for>
-
-    <label class="block cursor-pointer">
-      <div class="text-gray-900 bg-white hover:bg-gray-100 border border-gray-200 font-medium rounded-lg text-sm px-5 py-2.5 text-center inline-flex items-center">
-        <input type="checkbox" name="registry[tables_sort][]" class="hidden" /> Add new table
-      </div>
-    </label>
+    <.embeds_input
+      form={@form}
+      plural="tables"
+      singular="table"
+      form_field={:tables}
+      embeded_schema_field={:name}
+      sort_param={:tables_sort}
+      drop_param={:tables_drop}
+    />
     """
   end
 
   def selectors_input(assigns) do
     ~H"""
-    <h3>Selectors</h3>
-    <.inputs_for :let={fp} field={@form[:selectors]}>
-      <.input field={fp[:type]} type="text" label="Selector" />
-
-      <.inputs_for_drop_button fp={fp} name="registry[selectors_drop][]" text="Remove selector" />
-    </.inputs_for>
-
-    <label class="block cursor-pointer">
-      <div class="text-gray-900 bg-white hover:bg-gray-100 border border-gray-200 font-medium rounded-lg text-sm px-5 py-2.5 text-center inline-flex items-center">
-        <input type="checkbox" name="registry[selectors_sort][]" class="hidden" /> Add new selector
-      </div>
-    </label>
+    <.embeds_input
+      form={@form}
+      plural="selectors"
+      singular="selector"
+      form_field={:selectors}
+      embeded_schema_field={:type}
+      sort_param={:selectors_sort}
+      drop_param={:selectors_drop}
+    />
     """
   end
 
   def required_selectors_input(assigns) do
     ~H"""
-    <h3>Required Selectors</h3>
-    <.inputs_for :let={fp} field={@form[:required_selectors]}>
-      <.input field={fp[:type]} type="text" label="Required Selector" />
-
-      <.inputs_for_drop_button
-        fp={fp}
-        name="registry[required_selectors_drop][]"
-        text="Remove required_selector"
-      />
-    </.inputs_for>
-
-    <label class="block cursor-pointer">
-      <div class="text-gray-900 bg-white hover:bg-gray-100 border border-gray-200 font-medium rounded-lg text-sm px-5 py-2.5 text-center inline-flex items-center">
-        <input type="checkbox" name="registry[required_selectors_sort][]" class="hidden" />
-        Add new required selector
-      </div>
-    </label>
+    <.embeds_input
+      form={@form}
+      plural="required selectors"
+      singular="required selector"
+      form_field={:required_selectors}
+      embeded_schema_field={:type}
+      sort_param={:required_selectors_sort}
+      drop_param={:required_selectors_drop}
+    />
     """
   end
 
@@ -217,10 +291,29 @@ defmodule SanbaseWeb.MetricRegistryFormLive do
       when socket.assigns.live_action == :new do
     case socket.assigns.form.errors do
       [] ->
-        :ok
+        params = process_params(params)
+
+        case Sanbase.Metric.Registry.create(params) do
+          {:ok, struct} ->
+            {:noreply,
+             socket
+             |> assign(save_errors: [])
+             |> put_flash(:info, "Metric registry created")
+             |> push_navigate(to: ~p"/metric_registry/show/#{struct}")}
+
+          {:error, error} ->
+            errors = Sanbase.Utils.ErrorHandling.changeset_errors(error)
+
+            {:noreply,
+             socket
+             |> assign(:save_errors, errors)
+             |> put_flash(:error, "Address field validation errors before saving")}
+        end
 
-      [_ | _] ->
-        :ok
+      [_ | _] = errors ->
+        {:noreply,
+         socket
+         |> put_flash(:error, "Address field validation errors before saving: #{inspect(errors)}")}
     end
   end
 
@@ -229,17 +322,22 @@ defmodule SanbaseWeb.MetricRegistryFormLive do
       when socket.assigns.live_action == :edit do
     case socket.assigns.form.errors do
       [] ->
+        params = process_params(params)
+
         case Registry.update(socket.assigns.metric_registry, params) do
           {:ok, metric_registry} ->
             {:noreply,
              socket
-             |> assign(metric_registry: metric_registry)
+             |> assign(metric_registry: metric_registry, save_errors: [])
              |> put_flash(:info, "Metric registry updated")
              |> push_navigate(to: ~p"/metric_registry/show/#{metric_registry.id}")}
 
-          {:error, _} ->
+          {:error, changeset} ->
+            errors = Sanbase.Utils.ErrorHandling.changeset_errors(changeset)
+
             {:noreply,
              socket
+             |> assign(:save_errors, errors)
              |> put_flash(:error, "Failed to update metric registry")}
         end
 
@@ -252,39 +350,33 @@ defmodule SanbaseWeb.MetricRegistryFormLive do
 
   @impl true
   def handle_event("validate", %{"registry" => params}, socket) do
-    # with {:ok, params} <- process_params(params) do
-    IO.inspect(params)
+    params = process_params(params)
 
     form =
       socket.assigns.metric_registry
       |> Registry.changeset(params)
       |> to_form(action: :validate)
 
-    {:noreply, socket |> assign(form: form)}
-    # else
-    #   _ -> {:noreply, socket}
-    # end
+    {:noreply, socket |> assign(form: form, save_errors: [])}
   end
 
   defp process_params(params) do
-    {:ok, params}
+    params
     |> maybe_update_if_present("parameters")
-    |> maybe_update_if_present("table")
   end
 
-  defp maybe_update_if_present({:ok, %{"parameters" => _} = params}, "parameters") do
-    case Jason.decode(params["parameters"]) do
-      {:ok, decoded} -> {:ok, %{params | "parameters" => decoded}}
-      {:error, _} -> {:ok, params}
+  defp maybe_update_if_present(%{"parameters" => json} = params, "parameters") do
+    # If the parameters are not valid JSON, we will keep the old parameters.
+    # It will fail from the changeset validation with `invalid format`. If it is
+    # valid JSON, replace the string with the decoded JSON and let the Ecto changeset
+    # validate it further
+    case Jason.decode(json) do
+      {:ok, decoded} -> %{params | "parameters" => decoded}
+      {:error, _} -> params
     end
   end
 
-  defp maybe_update_if_present({:ok, %{"table" => _} = params}, "table") do
-    {:ok, %{params | "table" => List.wrap(params["table"])}}
-  end
-
-  defp maybe_update_if_present({:ok, params}, _), do: {:ok, params}
-  defp maybe_update_if_present({:error, error}, _), do: {:error, error}
+  defp maybe_update_if_present(params, _), do: params
 
   defp page_title(:new), do: "Create new metric"
   defp page_title(:edit), do: "Edit a metric"
diff --git a/lib/sanbase_web/live/metric_registry/metric_registry_show_live.ex b/lib/sanbase_web/live/metric_registry/metric_registry_show_live.ex
index 8ac890614..b830065dd 100644
--- a/lib/sanbase_web/live/metric_registry/metric_registry_show_live.ex
+++ b/lib/sanbase_web/live/metric_registry/metric_registry_show_live.ex
@@ -111,9 +111,15 @@ defmodule SanbaseWeb.MetricRegistryShowLive do
         popover_target_text: get_popover_text(%{key: "Frequency"})
       },
       %{
-        key: "Min Plan",
-        value: Jason.encode!(metric_registry.min_plan),
-        popover_target: "popover-frequency",
+        key: "SANBASE Min Plan",
+        value: metric_registry.sanbase_min_plan,
+        popover_target: "popover-sanbase-min-plan",
+        popover_target_text: get_popover_text(%{key: "Min Plan"})
+      },
+      %{
+        key: "SANAPI Min Plan",
+        value: metric_registry.sanapi_min_plan,
+        popover_target: "popover-sanapi-min-plan",
         popover_target_text: get_popover_text(%{key: "Min Plan"})
       },
       %{
diff --git a/priv/repo/migrations/20241104115340_create_metric_registry.exs b/priv/repo/migrations/20241104115340_create_metric_registry.exs
index 8b9f5b569..c2d57dac1 100644
--- a/priv/repo/migrations/20241104115340_create_metric_registry.exs
+++ b/priv/repo/migrations/20241104115340_create_metric_registry.exs
@@ -71,7 +71,6 @@ defmodule Sanbase.Repo.Migrations.CreateMetricRegistry do
       add(:fixed_parameters, :map, null: "false", default: "{}")
 
       add(:is_timebound, :boolean, null: false, null: false)
-      add(:is_exposed, :boolean, null: false, default: true)
       add(:exposed_environments, :string, null: false, default: "all")
 
       add(:version, :string)
@@ -79,7 +78,9 @@ defmodule Sanbase.Repo.Migrations.CreateMetricRegistry do
       add(:required_selectors, :map)
 
       add(:access, :string, null: false)
-      add(:min_plan, :jsonb, null: false, default: "{}")
+      add(:sanbase_min_plan, :string, null: false, default: "free")
+      add(:sanapi_min_plan, :string, null: false, default: "free")
+
       add(:default_aggregation, :string, null: false)
       add(:min_interval, :string, null: false)
       add(:has_incomplete_data, :boolean, null: false)
diff --git a/priv/repo/structure.sql b/priv/repo/structure.sql
index fc3df746e..ddcb1169d 100644
--- a/priv/repo/structure.sql
+++ b/priv/repo/structure.sql
@@ -2291,13 +2291,13 @@ CREATE TABLE public.metric_registry (
     parameters jsonb DEFAULT '{}'::jsonb NOT NULL,
     fixed_parameters jsonb DEFAULT '{}'::jsonb,
     is_timebound boolean NOT NULL,
-    is_exposed boolean DEFAULT true NOT NULL,
     exposed_environments character varying(255) DEFAULT 'all'::character varying NOT NULL,
     version character varying(255),
     selectors jsonb,
     required_selectors jsonb,
     access character varying(255) NOT NULL,
-    min_plan jsonb DEFAULT '{}'::jsonb NOT NULL,
+    sanbase_min_plan character varying(255) DEFAULT 'free'::character varying NOT NULL,
+    sanapi_min_plan character varying(255) DEFAULT 'free'::character varying NOT NULL,
     default_aggregation character varying(255) NOT NULL,
     min_interval character varying(255) NOT NULL,
     has_incomplete_data boolean NOT NULL,