Merge pull request #252 from alphagov/Remove-early-access/waiting-list-users-from-metrics

Remove Early Access/Waiting List Users from Metrics

Author: kevindew

app/controllers/admin/metrics_controller.rb

@@ -6,26 +6,6 @@ class Admin::MetricsController < Admin::BaseController
     policy.style_src(*policy.style_src, :unsafe_inline)
   end
 
-  def early_access_users
-    active_scope = EarlyAccessUser.where(created_at: start_time..).group(:source)
-    active_count = count_by_period(active_scope, :created_at)
-
-    deleted_scope = DeletedEarlyAccessUser.where(user_created_at: start_time..).group(:user_source)
-    deleted_count = count_by_period(deleted_scope, :user_created_at)
-
-    render json: combine_data(active_count, deleted_count).chart_json
-  end
-
-  def waiting_list_users
-    active_scope = WaitingListUser.where(created_at: start_time..).group(:source)
-    active_count = count_by_period(active_scope, :created_at)
-
-    deleted_scope = DeletedWaitingListUser.where(user_created_at: start_time..).group(:user_source)
-    deleted_count = count_by_period(deleted_scope, :user_created_at)
-
-    render json: combine_data(active_count, deleted_count).chart_json
-  end
-
   def conversations
     scope = Conversation.where(created_at: start_time..)
 
@@ -157,8 +137,4 @@ def remove_empty_count_data(count_data)
     # so we reset any that
     count_data.values.all?(&:zero?) ? {} : count_data
   end
-
-  def combine_data(hash_a, hash_b)
-    hash_a.merge(hash_b) { |_, a_value, b_value| a_value + b_value }
-  end
 end

app/views/admin/metrics/index.html.erb

@@ -21,19 +21,6 @@ common_chart_options = { refresh: 30 }
   ],
 } %>
 
-<div class="govuk-grid-row govuk-!-margin-bottom-8">
-  <div class="govuk-grid-column-one-half" id="early-access-users">
-    <h2 class="govuk-heading-l">Early access users</h2>
-    <%= column_chart admin_metrics_early_access_users_path(period: @period),
-                     **(common_chart_options.merge(stacked: true, legend: legend_position)) %>
-  </div>
-  <div class="govuk-grid-column-one-half" id="waiting-list-users">
-    <h2 class="govuk-heading-l">Waiting list users</h2>
-    <%= column_chart admin_metrics_waiting_list_users_path(period: @period),
-                     **(common_chart_options.merge(stacked: true, legend: legend_position)) %>
-  </div>
-</div>
-
 <div class="govuk-grid-row govuk-!-margin-bottom-8">
   <div class="govuk-grid-column-one-half" id="conversations">
     <h2 class="govuk-heading-l">New conversations</h2>

config/routes.rb

@@ -60,8 +60,6 @@
     scope :metrics do
       get "", to: "metrics#index", as: :metrics
       scope defaults: { format: "json" }, constraints: html_json_constraint do
-        get "early-access-users", to: "metrics#early_access_users", as: :metrics_early_access_users
-        get "waiting-list-users", to: "metrics#waiting_list_users", as: :metrics_waiting_list_users
         get "conversations", to: "metrics#conversations", as: :metrics_conversations
         get "questions", to: "metrics#questions", as: :metrics_questions
         get "answer-feedback", to: "metrics#answer_feedback", as: :metrics_answer_feedback

spec/requests/admin/metrics_spec.rb

@@ -20,86 +20,6 @@
     end
   end
 
-  describe "GET :early_access_users" do
-    it "renders a successful JSON response" do
-      get admin_metrics_early_access_users_path
-      expect(response).to have_http_status(:ok)
-      expect(response.headers["Content-Type"]).to match("application/json")
-      expect(JSON.parse(response.body)).to eq([])
-    end
-
-    it "returns data of the combined current and deleted early access users by source and hour" do
-      create_list(:early_access_user, 5, created_at: 4.hours.ago, source: :admin_added)
-      create_list(:early_access_user, 2, created_at: 1.hour.ago, source: :admin_added)
-      create_list(:early_access_user, 3, created_at: 1.hour.ago, source: :instant_signup)
-      create_list(:deleted_early_access_user, 2, user_created_at: 1.hour.ago, user_source: :instant_signup)
-      create(:early_access_user, created_at: 25.hours.ago)
-      create(:deleted_early_access_user, user_created_at: 25.hours.ago)
-
-      get admin_metrics_early_access_users_path
-
-      expect(JSON.parse(response.body)).to contain_exactly(
-        { "name" => "admin_added", "data" => counts_for_last_24_hours(hours_ago_4: 5, hours_ago_1: 2) },
-        { "name" => "instant_signup", "data" => counts_for_last_24_hours(hours_ago_1: 5) },
-      )
-    end
-
-    context "when period is last_7_days" do
-      it "returns data of the combined current and deleted early access users by source and date" do
-        create_list(:early_access_user, 5, created_at: 4.days.ago, source: :admin_added)
-        create_list(:early_access_user, 2, created_at: 1.day.ago, source: :admin_added)
-        create_list(:early_access_user, 3, created_at: 1.day.ago, source: :instant_signup)
-        create_list(:deleted_early_access_user, 2, user_created_at: 1.day.ago, user_source: :instant_signup)
-
-        get admin_metrics_early_access_users_path(period: "last_7_days")
-
-        expect(JSON.parse(response.body)).to contain_exactly(
-          { "name" => "admin_added", "data" => counts_for_last_7_days(days_ago_4: 5, days_ago_1: 2) },
-          { "name" => "instant_signup", "data" => counts_for_last_7_days(days_ago_1: 5) },
-        )
-      end
-    end
-  end
-
-  describe "GET :waiting_list_users" do
-    it "renders a successful JSON response" do
-      get admin_metrics_waiting_list_users_path
-      expect(response).to have_http_status(:ok)
-      expect(response.headers["Content-Type"]).to match("application/json")
-      expect(JSON.parse(response.body)).to eq([])
-    end
-
-    it "returns data of the combined current and deleted waiting list users by source and hour" do
-      create_list(:waiting_list_user, 2, created_at: 5.hours.ago, source: :admin_added)
-      create(:deleted_waiting_list_user, user_created_at: 5.hours.ago, user_source: :admin_added)
-      create_list(:deleted_waiting_list_user, 4, user_source: :insufficient_instant_places)
-      create(:waiting_list_user, created_at: 25.hours.ago)
-      create(:deleted_waiting_list_user, user_created_at: 25.hours.ago)
-
-      get admin_metrics_waiting_list_users_path
-
-      expect(JSON.parse(response.body)).to contain_exactly(
-        { "name" => "admin_added", "data" => counts_for_last_24_hours(hours_ago_5: 3) },
-        { "name" => "insufficient_instant_places", "data" => counts_for_last_24_hours(hours_ago_0: 4) },
-      )
-    end
-
-    context "when period is last_7_days" do
-      it "returns data of the combined current and deleted waiting list users by source and date" do
-        create_list(:waiting_list_user, 2, created_at: 5.days.ago, source: :admin_added)
-        create(:deleted_waiting_list_user, user_created_at: 5.days.ago, user_source: :admin_added)
-        create_list(:deleted_waiting_list_user, 4, user_source: :insufficient_instant_places)
-
-        get admin_metrics_waiting_list_users_path(period: "last_7_days")
-
-        expect(JSON.parse(response.body)).to contain_exactly(
-          { "name" => "admin_added", "data" => counts_for_last_7_days(days_ago_5: 3) },
-          { "name" => "insufficient_instant_places", "data" => counts_for_last_7_days(days_ago_0: 4) },
-        )
-      end
-    end
-  end
-
   describe "GET :conversations" do
     it "renders a successful JSON response" do
       get admin_metrics_conversations_path

spec/system/admin/user_views_metrics_spec.rb

@@ -13,8 +13,6 @@
   end
 
   def and_there_has_been_activity
-    create_list(:early_access_user, 2, created_at: 2.hours.ago)
-    create_list(:waiting_list_user, 2)
     create_list(:question, 2)
     create_list(:answer_feedback, 1, created_at: 1.hour.ago)
     create_list(:answer, 2, created_at: 6.hours.ago, status: :unanswerable_llm_cannot_answer)
@@ -43,8 +41,6 @@ def and_i_browse_to_the_metrics_section
   def then_i_can_see_activity
     # We're relying on the rendering of a successful chart results in a canvas
     # element, unclear how to assert correct chart
-    expect(page).to have_selector("#early-access-users canvas")
-    expect(page).to have_selector("#waiting-list-users canvas")
     expect(page).to have_selector("#conversations canvas")
     expect(page).to have_selector("#questions canvas")
     expect(page).to have_selector("#answer-feedback canvas")