Remove no longer needed ConsolidatedView.enabled?/1

Author: aerosol

extra/lib/plausible/consolidated_view.ex

@@ -40,7 +40,7 @@ defmodule Plausible.ConsolidatedView do
     with %Team{} <- team,
          %User{} <- user,
          true <- flag_enabled?(team),
-         true <- enabled?(team),
+         true <- view_enabled?(team),
          true <- has_sites_to_consolidate?(team),
          :ok <- Plausible.Billing.Feature.ConsolidatedView.check_availability(team) do
       true
@@ -82,11 +82,6 @@ defmodule Plausible.ConsolidatedView do
     with :ok <- ensure_eligible(team), do: do_enable(team)
   end
 
-  @spec enabled?(Team.t()) :: boolean()
-  def enabled?(%Team{} = team) do
-    not is_nil(get(team))
-  end
-
   @spec disable(Team.t()) :: :ok
   def disable(%Team{} = team) do
     # consider `Plausible.Site.Removal.run/1` if we ever support memberships or invitations
@@ -231,4 +226,8 @@ defmodule Plausible.ConsolidatedView do
   defp flag_enabled?(team) do
     FunWithFlags.enabled?(:consolidated_view, for: team)
   end
+
+  defp view_enabled?(%Team{} = team) do
+    not is_nil(get(team))
+  end
 end

test/plausible/consolidated_view_test.exs

@@ -72,7 +72,7 @@ defmodule Plausible.ConsolidatedViewTest do
         new_site(team: team)
         team = Teams.complete_setup(team)
         assert {:ok, %Plausible.Site{consolidated: true}} = ConsolidatedView.enable(team)
-        assert ConsolidatedView.enabled?(team)
+        assert ConsolidatedView.get(team)
       end
 
       test "is idempotent", %{team: team} do
@@ -104,7 +104,7 @@ defmodule Plausible.ConsolidatedViewTest do
       test "returns {:error, :no_sites} when the team does not have any sites", %{team: team} do
         team = Teams.complete_setup(team)
         assert {:error, :no_sites} = ConsolidatedView.enable(team)
-        refute ConsolidatedView.enabled?(team)
+        refute ConsolidatedView.get(team)
       end
 
       test "returns {:error, :team_not_setup} when the team has sites but isn't setup", %{
@@ -113,12 +113,12 @@ defmodule Plausible.ConsolidatedViewTest do
         new_site(team: team)
         new_site(team: team)
         assert {:error, :team_not_setup} = ConsolidatedView.enable(team)
-        refute ConsolidatedView.enabled?(team)
+        refute ConsolidatedView.get(team)
       end
 
       test "returns {:error, :no_sites} when the team is not set up", %{team: team} do
         assert {:error, :no_sites} = ConsolidatedView.enable(team)
-        refute ConsolidatedView.enabled?(team)
+        refute ConsolidatedView.get(team)
       end
 
       @tag :skip
@@ -285,7 +285,7 @@ defmodule Plausible.ConsolidatedViewTest do
 
       test "no-op if disabled", %{team: team} do
         :ok = ConsolidatedView.reset_if_enabled(team)
-        refute ConsolidatedView.enabled?(team)
+        refute ConsolidatedView.get(team)
         refute ConsolidatedView.get(team)
       end
 
@@ -319,7 +319,7 @@ defmodule Plausible.ConsolidatedViewTest do
         Process.sleep(1_000)
 
         :ok = ConsolidatedView.reset_if_enabled(team)
-        assert ConsolidatedView.enabled?(team)
+        assert ConsolidatedView.get(team)
 
         consolidated_view = ConsolidatedView.get(team)
         assert consolidated_view.native_stats_start_at == another_site.native_stats_start_at

test/plausible/site/site_removal_test.exs

@@ -61,11 +61,11 @@ defmodule Plausible.Site.SiteRemovalTest do
       team = team_of(owner)
 
       new_consolidated_view(team)
-      assert Plausible.ConsolidatedView.enabled?(team)
+      assert Plausible.ConsolidatedView.get(team)
 
       assert {:ok, _} = Removal.run(site)
 
-      refute Plausible.ConsolidatedView.enabled?(team)
+      refute Plausible.ConsolidatedView.get(team)
     end
 
     test "site deletion keeps consolidated view if there's still regular sites" do
@@ -80,11 +80,11 @@ defmodule Plausible.Site.SiteRemovalTest do
       team = team_of(owner)
 
       new_consolidated_view(team)
-      assert Plausible.ConsolidatedView.enabled?(team)
+      assert Plausible.ConsolidatedView.get(team)
 
       assert {:ok, _} = Removal.run(site)
 
-      assert Plausible.ConsolidatedView.enabled?(team)
+      assert Plausible.ConsolidatedView.get(team)
     end
   end
 end

test/plausible/teams/sites/transfer_test.exs

@@ -94,7 +94,7 @@ defmodule Plausible.Teams.Sites.TransferTest do
         team = team_of(user)
 
         new_consolidated_view(team)
-        assert ConsolidatedView.enabled?(team)
+        assert ConsolidatedView.get(team)
 
         another_owner = new_user()
         subscribe_to_growth_plan(another_owner)
@@ -105,7 +105,7 @@ defmodule Plausible.Teams.Sites.TransferTest do
 
         :ok = Transfer.change_team(site, user, another_team)
 
-        refute ConsolidatedView.enabled?(team)
+        refute ConsolidatedView.get(team)
       end
     end
 

test/plausible_web/live/customer_support/teams_test.exs

@@ -225,7 +225,7 @@ defmodule PlausibleWeb.Live.CustomerSupport.TeamsTest do
 
         lv |> element(@create_consolidated_view_button) |> render_click()
 
-        assert Plausible.ConsolidatedView.enabled?(team)
+        assert Plausible.ConsolidatedView.get(team)
       end
 
       test "renders existing consolidated view", %{conn: conn, user: user} do
@@ -253,7 +253,7 @@ defmodule PlausibleWeb.Live.CustomerSupport.TeamsTest do
 
         lv |> element(@delete_consolidated_view_button) |> render_click()
 
-        assert not Plausible.ConsolidatedView.enabled?(team)
+        assert not Plausible.ConsolidatedView.get(team)
       end
     end