From 6a5920d52707f731bfb63339e0eaaec14d2d1845 Mon Sep 17 00:00:00 2001 From: Ivan Ivanov Date: Tue, 7 Jan 2025 11:34:33 +0200 Subject: [PATCH] Add human_readable_name to get_access_restrictions --- lib/sanbase/billing/plan/restrictions.ex | 8 ++++++++ lib/sanbase_web/graphql/schema/types/user_types.ex | 1 + test/sanbase_web/plans/business_plans_test.exs | 1 + 3 files changed, 10 insertions(+) diff --git a/lib/sanbase/billing/plan/restrictions.ex b/lib/sanbase/billing/plan/restrictions.ex index 9b530c0aa2..4f3ee93971 100644 --- a/lib/sanbase/billing/plan/restrictions.ex +++ b/lib/sanbase/billing/plan/restrictions.ex @@ -9,6 +9,7 @@ defmodule Sanbase.Billing.Plan.Restrictions do @type restriction :: %{ type: String.t(), name: String.t(), + human_readable_name: String.t(), internal_name: String.t(), min_interval: String.t(), is_accessible: boolean(), @@ -96,6 +97,7 @@ defmodule Sanbase.Billing.Plan.Restrictions do %{ type: type_str, name: name_str, + human_readable_name: name_str, is_accessible: false, is_restricted: true, restricted_from: nil, @@ -171,7 +173,10 @@ defmodule Sanbase.Billing.Plan.Restrictions do defp additional_data("metric", metric) do case Sanbase.Metric.metadata(metric) do {:ok, metadata} -> + {:ok, human_readable_name} = Sanbase.Metric.human_readable_name(metric) + %{ + human_readable_name: human_readable_name, min_interval: metadata.min_interval, internal_name: metadata.internal_metric, is_deprecated: metadata.is_deprecated, @@ -189,7 +194,10 @@ defmodule Sanbase.Billing.Plan.Restrictions do defp additional_data("signal", signal) do case Sanbase.Signal.metadata(signal) do {:ok, metadata} -> + {:ok, human_readable_name} = Sanbase.Signal.human_readable_name(signal) + %{ + human_readable_name: human_readable_name, min_interval: metadata.min_interval, internal_name: metadata.internal_signal, available_selectors: [], diff --git a/lib/sanbase_web/graphql/schema/types/user_types.ex b/lib/sanbase_web/graphql/schema/types/user_types.ex index 0ea9dd560a..dd0e2ee32d 100644 --- a/lib/sanbase_web/graphql/schema/types/user_types.ex +++ b/lib/sanbase_web/graphql/schema/types/user_types.ex @@ -324,6 +324,7 @@ defmodule SanbaseWeb.Graphql.UserTypes do object :access_restriction do field(:type, non_null(:string)) field(:name, non_null(:string)) + field(:human_readable_name, non_null(:string)) field(:internal_name, non_null(:string)) field(:min_interval, :string) field(:is_restricted, non_null(:boolean)) diff --git a/test/sanbase_web/plans/business_plans_test.exs b/test/sanbase_web/plans/business_plans_test.exs index f8671f0719..cc73e4408a 100644 --- a/test/sanbase_web/plans/business_plans_test.exs +++ b/test/sanbase_web/plans/business_plans_test.exs @@ -167,6 +167,7 @@ defmodule SanbaseWeb.Plans.BusinessPlansTest do getAccessRestrictions{ type name + humanReadableName minInterval internalName isRestricted