Refactor Get Involved

This page was created differently to all the other content types.

Refactoring so it is the same as everything else.

Co-authored-by: Jon Hallam <[email protected]>

Author: brucebolt

app/controllers/get_involved_controller.rb

@@ -1,2 +1,111 @@
 class GetInvolvedPresenter < ContentItemPresenter
+  def open_consultation_count
+    Services.search_api.search({ filter_content_store_document_type: "open_consultation", count: 0 })["total"]
+  end
+
+  def closed_consultation_count
+    query = {
+      filter_content_store_document_type: "closed_consultation",
+      filter_end_date: "from: #{1.year.ago}",
+      count: 0,
+    }
+
+    Services.search_api.search(query)["total"]
+  end
+
+  def next_closing_consultation
+    query = {
+      filter_content_store_document_type: "open_consultation",
+      filter_end_date: "from: #{Time.zone.now.to_date}",
+      fields: "end_date,title,link",
+      order: "end_date",
+      count: 1,
+    }
+
+    Services.search_api.search(query)["results"].first
+  end
+
+  def take_part_pages
+    content_item.dig("links", "take_part_pages")
+  end
+
+  def recently_opened
+    filtered_links(recently_opened_consultations, I18n.t("get_involved.closes"))
+  end
+
+  def recent_outcomes
+    filtered_links(recent_consultation_outcomes, I18n.t("get_involved.closed"))
+  end
+
+  def time_until_closure(consultation)
+    days_left = (consultation["end_date"].to_date - Time.zone.now.to_date).to_i
+    case days_left
+    when :negative?.to_proc
+      I18n.t("get_involved.closed")
+    when :zero?.to_proc
+      I18n.t("get_involved.closing_today")
+    when 1
+      I18n.t("get_involved.closing_tomorrow")
+    else
+      I18n.t("get_involved.days_left", number_of_days: days_left)
+    end
+  end
+
+  def consultations_link
+    filters = %w[open_consultations closed_consultations]
+    "/search/policy-papers-and-consultations?#{filters.to_query('content_store_document_type')}"
+  end
+
+private
+
+  def recently_opened_consultations
+    query = {
+      filter_content_store_document_type: "open_consultation",
+      fields: "end_date,title,link,organisations",
+      order: "-start_date",
+      count: 3,
+    }
+
+    Services.search_api.search(query)["results"]
+  end
+
+  def recent_consultation_outcomes
+    query = {
+      filter_content_store_document_type: "consultation_outcome",
+      filter_end_date: "to: #{Time.zone.now.to_date}",
+      fields: "end_date,title,link,organisations",
+      order: "-end_date",
+      count: 3,
+    }
+
+    Services.search_api.search(query)["results"]
+  end
+
+  def filtered_links(array, close_status)
+    array.map do |item|
+      {
+        link: {
+          text: item["title"],
+          path: item["link"],
+          description: "#{close_status} #{item['end_date'].to_date.strftime('%d %B %z')}",
+        },
+        metadata: {
+          public_updated_at: Time.zone.parse(org_time(item)),
+          document_type: org_acronym(item),
+        },
+      }
+    end
+  end
+
+  def org_time(item)
+    item["organisations"].map { |org|
+      org["public_timestamp"]
+    }.join(", ")
+  end
+
+  def org_acronym(item)
+    item["organisations"].map { |org|
+      org["acronym"]
+    }.join(", ")
+  end
 end

app/helpers/get_involved_helper.rb

@@ -1,15 +1,3 @@
-<% page_title %>
-<% page_class "govuk-main-wrapper" %>
-  <%= render "govuk_publishing_components/components/breadcrumbs", {
-    collapse_on_mobile: true,
-    breadcrumbs: [
-      {
-        title: "Home",
-        url: "/"
-      }
-    ]
-  } %>
-
 <div class="govuk-grid-row">
   <div class="govuk-grid-column-two-thirds">
     <%= render "govuk_publishing_components/components/title", {
@@ -51,32 +39,32 @@
     <div class="govuk-grid-row">
       <div class="govuk-grid-column-one-third">
         <%= render "govuk_publishing_components/components/big_number", {
-          number: @open_consultation_count,
+          number: @content_item.open_consultation_count,
           label: t('get_involved.open_consultations'),
           href: "/search/policy-papers-and-consultations?content_store_document_type=open_consultations"
         } %>
       </div>
       <div class="govuk-grid-column-two-thirds">
         <%= render "govuk_publishing_components/components/big_number", {
-          number: @closed_consultation_count,
+          number: @content_item.closed_consultation_count,
           label: t('get_involved.closed_consultations'),
           href: "/search/policy-papers-and-consultations?content_store_document_type=closed_consultations"
         } %>
       </div>
     </div>
 
-    <% if @next_closing_consultation %>
+    <% if @content_item.next_closing_consultation %>
       <%# Attention to closing consultation  %>
       <%= render "govuk_publishing_components/components/inset_text", {
       } do %>
         <%= render "govuk_publishing_components/components/heading", {
-          text: time_until_closure(@next_closing_consultation),
+          text: @content_item.time_until_closure(@content_item.next_closing_consultation),
           heading_level: 3
         } %>
         <p class="govuk-body">
-          <%= @next_closing_consultation['title'] %>
+          <%= @content_item.next_closing_consultation['title'] %>
         </p>
-        <%= link_to t('get_involved.read_respond'), @next_closing_consultation['link'], class: "govuk-link" %>
+        <%= link_to t('get_involved.read_respond'), @content_item.next_closing_consultation['link'], class: "govuk-link" %>
       <% end %>
     <% end %>
   </div>
@@ -93,9 +81,9 @@
       margin_bottom: 4
     } %>
     <%= render "govuk_publishing_components/components/document_list", {
-      items: @recently_opened
+      items: @content_item.recently_opened
     } %>
-    <%= link_to(t('get_involved.search_all'), get_consultations_link, class: "govuk-link" ) %>
+    <%= link_to(t('get_involved.search_all'), @content_item.consultations_link, class: "govuk-link" ) %>
   </div>
 </div>
 
@@ -111,10 +99,10 @@
     } %>
 
     <%= render "govuk_publishing_components/components/document_list", {
-      items: @recent_outcomes
+      items: @content_item.recent_outcomes
     } %>
 
-    <%= link_to(t('get_involved.search_all'), get_consultations_link, class: "govuk-link" ) %>
+    <%= link_to(t('get_involved.search_all'), @content_item.consultations_link, class: "govuk-link" ) %>
   </div>
 </div>
 
@@ -177,7 +165,7 @@
       id: "take-part"
     } %>
     <div role="list">
-    <% @take_part_pages.each_with_index do |take_part_page, index| %>
+    <% @content_item.take_part_pages.each_with_index do |take_part_page, index| %>
       <% if index % 3 == 0 && index != 0 %> </div> <% end %>
       <% if index % 3 == 0 %>
         <div class="govuk-grid-row">
@@ -193,7 +181,7 @@
               image_loading: "lazy",
             } %>
           </div>
-        <% if index == @take_part_pages.size-1 %>
+        <% if index == @content_item.take_part_pages.size-1 %>
         </div>
       <% end %>
     <% end %>

app/presenters/get_involved_presenter.rb

@@ -16,8 +16,6 @@
 
   get "/government/uploads/*path" => "asset_manager_redirect#show", format: false
 
-  get "/government/get-involved" => "get_involved#show"
-
   get "/service-manual/search",
       to: redirect { |_, request|
             query = request.query_parameters.merge(filter_manual: "/service-manual").to_query