Merge pull request #11380 from alphagov/remove-memcached-dependency

Remove broken memcached code [WHIT-3393]

Author: ChrisBAshton

Gemfile

@@ -12,7 +12,6 @@ gem "carrierwave"
 gem "carrierwave-i18n"
 gem "chronic"
 gem "content_block_tools"
-gem "dalli"
 gem "dartsass-rails"
 gem "diffy"
 gem "flipflop"

Gemfile.lock

@@ -180,8 +180,6 @@ GEM
       cucumber (>= 7, < 11)
       railties (>= 6.1, < 9)
     cucumber-tag-expressions (8.1.0)
-    dalli (5.0.2)
-      logger
     dartsass-rails (0.5.1)
       railties (>= 6.0.0)
       sass-embedded (~> 1.63)
@@ -1040,7 +1038,6 @@ DEPENDENCIES
   content_block_tools
   cucumber
   cucumber-rails
-  dalli
   dartsass-rails
   database_cleaner-active_record
   diffy

app/helpers/admin/taggable_content_helper.rb

@@ -31,7 +31,7 @@ def taggable_topical_event_documents_container(selected_ids = [])
   end
 
   def taggable_organisations_container(selected_ids = [])
-    cached_taggable_organisations.map do |o|
+    Organisation.with_translations.order("organisation_translations.name").map do |o|
       {
         text: o.select_name,
         value: o.id,
@@ -41,7 +41,7 @@ def taggable_organisations_container(selected_ids = [])
   end
 
   def taggable_ministerial_role_appointments_container(selected_ids = [])
-    cached_taggable_ministerial_role_appointments.map do |appointment|
+    role_appointments_container_for(RoleAppointment.for_ministerial_roles).map do |appointment|
       {
         text: role_appointment_option_label(appointment),
         value: appointment.id,
@@ -51,7 +51,7 @@ def taggable_ministerial_role_appointments_container(selected_ids = [])
   end
 
   def taggable_role_appointments_container(selected_ids = [])
-    cached_taggable_role_appointments.map do |appointment|
+    role_appointments_container_for(RoleAppointment).map do |appointment|
       {
         text: role_appointment_option_label(appointment),
         value: appointment.id,
@@ -61,7 +61,7 @@ def taggable_role_appointments_container(selected_ids = [])
   end
 
   def taggable_detailed_guides_container(selected_ids = [])
-    cached_taggable_detailed_guides.map do |d|
+    DetailedGuide.alphabetical.latest_edition.active.map do |d|
       {
         text: d.title,
         value: d.id,
@@ -71,7 +71,7 @@ def taggable_detailed_guides_container(selected_ids = [])
   end
 
   def taggable_statistical_data_sets_container(selected_ids = [])
-    cached_taggable_statistical_data_sets.map do |data_set|
+    StatisticalDataSet.with_translations.latest_edition.map do |data_set|
       {
         text: data_set.title,
         value: data_set.document_id,
@@ -81,7 +81,7 @@ def taggable_statistical_data_sets_container(selected_ids = [])
   end
 
   def taggable_world_locations_container(selected_ids = [])
-    cached_taggable_world_locations.map do |w|
+    WorldLocation.ordered_by_name.where(active: true).map do |w|
       {
         text: w.name,
         value: w.id,
@@ -91,7 +91,7 @@ def taggable_world_locations_container(selected_ids = [])
   end
 
   def taggable_roles_container(selected_ids = [])
-    cached_taggable_roles.map do |w|
+    Role.order(:name).map do |w|
       {
         text: w.name,
         value: w.id,
@@ -101,7 +101,7 @@ def taggable_roles_container(selected_ids = [])
   end
 
   def taggable_alternative_format_providers_container(selected_ids = [])
-    cached_taggable_alternative_format_providers.map do |o|
+    Organisation.alphabetical.map do |o|
       {
         text: "#{o.name} (#{o.alternative_format_contact_email.presence || '-'})",
         value: o.id,
@@ -111,7 +111,7 @@ def taggable_alternative_format_providers_container(selected_ids = [])
   end
 
   def taggable_worldwide_organisations_container(selected_ids = [])
-    cached_taggable_worldwide_organisations.map do |wo|
+    WorldwideOrganisation.with_translations.latest_edition.map do |wo|
       {
         text: wo.title,
         value: wo.document.id,
@@ -120,139 +120,8 @@ def taggable_worldwide_organisations_container(selected_ids = [])
     end
   end
 
-  def cached_taggable_organisations
-    Rails.cache.fetch(taggable_organisations_cache_digest, expires_in: 1.day) do
-      Organisation.with_translations.order("organisation_translations.name")
-    end
-  end
-
-  # Returns an MD5 digest representing the current set of taggable topical
-  # events. This will change if any of the Topics should change or if a new
-  # topic event is added.
-  def taggable_topical_events_cache_digest
-    # legacy
-    @taggable_topical_events_cache_digest ||= calculate_digest(TopicalEvent.order(:id), "topical-events")
-  end
-
-  # Returns an MD5 digest representing the current set of taggable
-  # organisations. This will change if any of the Topics should change or if a
-  # new organisation is added.
-  def taggable_organisations_cache_digest
-    @taggable_organisations_cache_digest ||= calculate_digest(Organisation.order(:id), "organisations")
-  end
-
-  def cached_taggable_ministerial_role_appointments
-    Rails.cache.fetch(taggable_ministerial_role_appointments_cache_digest, expires_in: 1.day) do
-      role_appointments_container_for(RoleAppointment.for_ministerial_roles)
-    end
-  end
-
-  # Returns an MD5 digest representing the current set of taggable ministerial
-  # role appointments. This will change if any role appointments are added or
-  # changed, and also if an occupied MinisterialRole is updated.
-  def taggable_ministerial_role_appointments_cache_digest
-    @taggable_ministerial_role_appointments_cache_digest ||= calculate_digest(
-      RoleAppointment
-                              .joins(:role)
-                              .where(roles: { type: "MinisterialRole" })
-                              .order("role_appointments.started_at"),
-      "ministerial-role-appointments",
-    )
-  end
-
-  def cached_taggable_role_appointments
-    Rails.cache.fetch(taggable_role_appointments_cache_digest, expires_in: 1.day) do
-      role_appointments_container_for(RoleAppointment)
-    end
-  end
-
-  # Returns an MD5 digest representing the current set of taggable ministerial
-  # role appointments. This will change if any role appointments are added or
-  # changed, and also if an occupied Role is updated.
-  def taggable_role_appointments_cache_digest
-    @taggable_role_appointments_cache_digest ||= calculate_digest(RoleAppointment.order(:id), "role-appointments")
-  end
-
-  def cached_taggable_detailed_guides
-    Rails.cache.fetch(taggable_detailed_guides_cache_digest, expires_in: 1.day) do
-      DetailedGuide.alphabetical.latest_edition.active
-    end
-  end
-
-  # Returns an MD5 digest representing all the detailed guides. This wil change
-  # if any detailed guides are added or updated.
-  def taggable_detailed_guides_cache_digest
-    @taggable_detailed_guides_cache_digest ||= calculate_digest(Document.where(document_type: "DetailedGuide").order(:id), "detailed-guides")
-  end
-
-  def cached_taggable_statistical_data_sets
-    Rails.cache.fetch(taggable_statistical_data_sets_cache_digest, expires_in: 1.day) do
-      StatisticalDataSet.with_translations.latest_edition
-    end
-  end
-
-  # Returns an MD5 digest representing the taggable statistical data sets. This
-  # will change if any statistical data set is added or updated.
-  def taggable_statistical_data_sets_cache_digest
-    @taggable_statistical_data_sets_cache_digest ||= calculate_digest(Document.where(document_type: "StatisticalDataSet").order(:id), "statistical-data-sets")
-  end
-
-  def cached_taggable_world_locations
-    Rails.cache.fetch(taggable_world_locations_cache_digest, expires_in: 1.day) do
-      WorldLocation.ordered_by_name.where(active: true)
-    end
-  end
-
-  # Returns an MD5 digest representing the taggable world locations. This will
-  # change if any world locations are added or updated.
-  def taggable_world_locations_cache_digest
-    @taggable_world_locations_cache_digest ||= calculate_digest(WorldLocation.order(:id), "world-locations")
-  end
-
-  def cached_taggable_roles
-    Rails.cache.fetch(taggable_roles_cache_digest, expires_in: 1.day) do
-      Role.order(:name)
-    end
-  end
-
-  # Returns an MD5 digest representing the taggable roles. This will
-  # change if any world locations are added or updated.
-  def taggable_roles_cache_digest
-    @taggable_roles_cache_digest ||= calculate_digest(Role.order(:id), "roles")
-  end
-
-  def cached_taggable_alternative_format_providers
-    Rails.cache.fetch(taggable_alternative_format_providers_cache_digest, expires_in: 1.day) do
-      Organisation.alphabetical
-    end
-  end
-
-  # Returns an MD5 digest representing the taggable alternative format
-  # providers. This will change if any alternative format providers are
-  # changed.
-  def taggable_alternative_format_providers_cache_digest
-    @taggable_alternative_format_providers_cache_digest ||= calculate_digest(Organisation.order(:id), "alternative-format-providers")
-  end
-
-  def cached_taggable_worldwide_organisations
-    Rails.cache.fetch(taggable_worldwide_organisations_cache_digest, expires_in: 1.day) do
-      WorldwideOrganisation.with_translations.latest_edition
-    end
-  end
-
-  # Returns an MD5 digest representing the taggable worldwide organisations. This
-  # will change if any worldwide organisation is added or updated.
-  def taggable_worldwide_organisations_cache_digest
-    @taggable_worldwide_organisations_cache_digest ||= calculate_digest(Document.where(document_type: "WorldwideOrganisation").order(:id), "worldwide-organisations")
-  end
-
 private
 
-  def calculate_digest(scope, digest_name)
-    update_timestamps = scope.pluck(:updated_at).map(&:to_i).join
-    Digest::MD5.hexdigest "taggable-#{digest_name}-#{update_timestamps}"
-  end
-
   def role_appointments_container_for(scope)
     scope
       .includes(:person)

app/models/person.rb

@@ -36,7 +36,7 @@ class Person < ApplicationRecord
   translates :biography
 
   before_destroy :prevent_destruction_if_appointed
-  after_update :touch_role_appointments, :republish_past_prime_ministers_page_to_publishing_api
+  after_update :republish_past_prime_ministers_page_to_publishing_api
   after_update :patch_links_ministers_index_page_to_publishing_api, :republish_how_government_works_page_to_publishing_api, if: :has_ministerial_appointments?
 
   def biography_without_markup
@@ -142,13 +142,6 @@ def prevent_destruction_if_appointed
     throw :abort unless destroyable?
   end
 
-  # Whenever a person is updated, we want touch the updated_at timestamps of
-  # any associated role appointments so that the cache digest for the
-  # taggable_ministerial_role_appointments_container gets invalidated.
-  def touch_role_appointments
-    role_appointments.update_all updated_at: Time.zone.now
-  end
-
   def truncated_biography
     biography&.split(/\n/)&.first
   end

app/models/role.rb

@@ -57,7 +57,6 @@ def self.columns
   validates_with SafeHtmlValidator
 
   before_destroy :prevent_destruction_unless_destroyable
-  after_update :touch_role_appointments
   after_save :republish_associated_editions_to_publishing_api, :republish_organisations_to_publishing_api
 
   accepts_nested_attributes_for :edition_roles
@@ -200,11 +199,4 @@ def prevent_destruction_unless_destroyable
   def default_person_name
     "No one is assigned to this role"
   end
-
-  # Whenever a ministerial role is updated, we want touch the updated_at
-  # timestamps of any associated role appointments so that the cache digest for
-  # the taggable_ministerial_role_appointments_container gets invalidated.
-  def touch_role_appointments
-    role_appointments.update_all updated_at: Time.zone.now
-  end
 end

app/views/admin/detailed_guides/_form.html.erb

@@ -14,18 +14,16 @@
       <%= render "organisation_fields", form: form, edition: edition %>
       <%= render "topical_event_fields", form: form, edition: edition %>
 
-      <% cache_if edition.related_detailed_guide_ids.empty?, "#{taggable_detailed_guides_cache_digest}-design-system" do %>
-        <%= render "govuk_publishing_components/components/select_with_search", {
-          id: "edition_related_detailed_guide_ids",
-          name: "edition[related_detailed_guide_ids][]",
-          error_items: errors_for(edition.errors, :related_detailed_guide_ids),
-          include_blank: true,
-          label: "Related guides",
-          heading_size: "m",
-          options: taggable_detailed_guides_container(edition.related_detailed_guide_ids),
-          multiple: true,
-        } %>
-      <% end %>
+      <%= render "govuk_publishing_components/components/select_with_search", {
+        id: "edition_related_detailed_guide_ids",
+        name: "edition[related_detailed_guide_ids][]",
+        error_items: errors_for(edition.errors, :related_detailed_guide_ids),
+        include_blank: true,
+        label: "Related guides",
+        heading_size: "m",
+        options: taggable_detailed_guides_container(edition.related_detailed_guide_ids),
+        multiple: true,
+      } %>
 
       <%= render "nation_fields", form: form, edition: edition %>
     </div>

app/views/admin/editions/_appointment_fields.html.erb

@@ -1,11 +1,9 @@
-<% cache_if edition.role_appointment_ids.empty?, "#{taggable_ministerial_role_appointments_cache_digest}-design-system" do %>
-  <%= render "govuk_publishing_components/components/select_with_search", {
-    id: "edition_role_appointment_ids",
-    name: "edition[role_appointment_ids][]",
-    include_blank: true,
-    label: "Ministers",
-    heading_size: "m",
-    options: taggable_ministerial_role_appointments_container(edition.role_appointment_ids),
-    multiple: true,
-  } %>
-<% end %>
+<%= render "govuk_publishing_components/components/select_with_search", {
+  id: "edition_role_appointment_ids",
+  name: "edition[role_appointment_ids][]",
+  include_blank: true,
+  label: "Ministers",
+  heading_size: "m",
+  options: taggable_ministerial_role_appointments_container(edition.role_appointment_ids),
+  multiple: true,
+} %>

app/views/admin/editions/_organisation_fields.html.erb

@@ -9,16 +9,14 @@
     <div class="govuk-!-margin-bottom-6">
       <% 0.upto(3) do |index| %>
         <% lead_organisation_id = lead_organisation_id_at_index(edition, index) %>
-        <% cache_if lead_organisation_id.nil?, "#{taggable_organisations_cache_digest}-lead" do %>
-          <%= render "govuk_publishing_components/components/select_with_search", {
-              id: "edition_lead_organisation_ids_#{index + 1}",
-              name: "edition[lead_organisation_ids][]",
-              label: "Lead organisation #{index + 1}",
-              heading_size: "s",
-              include_blank: true,
-              options: taggable_organisations_container([lead_organisation_id]),
-          } %>
-        <% end %>
+        <%= render "govuk_publishing_components/components/select_with_search", {
+            id: "edition_lead_organisation_ids_#{index + 1}",
+            name: "edition[lead_organisation_ids][]",
+            label: "Lead organisation #{index + 1}",
+            heading_size: "s",
+            include_blank: true,
+            options: taggable_organisations_container([lead_organisation_id]),
+        } %>
       <% end %>
     </div>
   <% end %>

app/views/admin/editions/_role_fields.html.erb

@@ -1,14 +1,12 @@
 <% required = false unless defined?(required) %>
 <% index = "1" unless defined?(index) %>
 
-<% cache_if edition.role_ids.empty?, "#{taggable_roles_cache_digest}-design-system" do %>
-  <%= render "govuk_publishing_components/components/select_with_search", {
-    id: "edition_roles",
-    name: "edition[role_ids][]",
-    error_items: errors_for(edition.errors, :roles),
-    label: "Roles" + "#{' (required)' if required}",
-    heading_size: "m",
-    options: taggable_roles_container(edition.role_ids),
-    multiple: true,
-  } %>
-<% end %>
+<%= render "govuk_publishing_components/components/select_with_search", {
+  id: "edition_roles",
+  name: "edition[role_ids][]",
+  error_items: errors_for(edition.errors, :roles),
+  label: "Roles" + "#{' (required)' if required}",
+  heading_size: "m",
+  options: taggable_roles_container(edition.role_ids),
+  multiple: true,
+} %>