Merge pull request #2892 from alphagov/changes-to-farming-grant-optio…

…ns-finder Remove facet from farming grant finder
alphagov · Apr 30, 2024 · d4ee634 · d4ee634
2 parents 0a86c3b + ff78f63
commit d4ee634
Show file tree

Hide file tree

Showing 4 changed files with 45 additions and 37 deletions.
diff --git a/config/schema/elasticsearch_types/farming_grant_option.json b/config/schema/elasticsearch_types/farming_grant_option.json
@@ -2,23 +2,18 @@
   "fields": [
     "areas_of_interest",
     "land_types",
-    "grant_schemes",
     "payment_types"
   ],
   "expanded_search_result_fields": {
     "areas_of_interest": [
       {
-        "label": "Access and engagement",
-        "value": "access-and-engagement"
+        "label": "Agroforestry",
+        "value": "agroforestry"
       },
       {
         "label": "Air quality",
         "value": "air-quality"
       },
-      {
-        "label": "Biodiversity",
-        "value": "biodiversity"
-      },
       {
         "label": "Boundaries",
         "value": "boundaries"
@@ -27,6 +22,10 @@
         "label": "Crops",
         "value": "crops"
       },
+      {
+        "label": "Equipment and machinery",
+        "value": "equipment-and-machinery"
+      },
       {
         "label": "Flood risk",
         "value": "flood-risk"
@@ -35,14 +34,35 @@
         "label": "Forestry",
         "value": "forestry"
       },
+      {
+        "label": "Hedgerows",
+        "value": "hedgerows"
+      },
+
       {
         "label": "Historic environment",
         "value": "historic-environment"
       },
+      {
+        "label": "Horticulture",
+        "value": "horticulture"
+      },
+      {
+        "label": "Land features and archaeological features",
+        "value": "land-features-and-archaeological-features"
+      },
       {
         "label": "Livestock management",
         "value": "livestock-management"
       },
+      {
+        "label": "Nutrient, manure and slurry management",
+        "value": "nutrient-manure-and-slurry-management"
+      },
+      {
+        "label": "Organic",
+        "value": "organic"
+      },
       {
         "label": "Peat",
         "value": "peat"
@@ -56,34 +76,38 @@
         "value": "precision-farming"
       },
       {
-        "label": "Slurry management",
-        "value": "slurry-management"
+        "label": "Public access and education",
+        "value": "public-access-and-education"
       },
       {
         "label": "Soil",
         "value": "soil"
       },
       {
-        "label": "Trees (non-woodland)",
-        "value": "trees-non-woodland"
+        "label": "Trees",
+        "value": "trees"
       },
       {
         "label": "Vegetation control",
         "value": "vegetation-control"
       },
       {
-        "label": "Water",
-        "value": "water"
+        "label": "Water availability and storage",
+        "value": "water-availability-and-storage"
+      },
+      {
+        "label": "Water quality",
+        "value": "water-quality"
       }
     ],
     "land_types": [
       {
-        "label": "Arable land",
-        "value": "arable-land"
+        "label": "Arable",
+        "value": "arable"
       },
       {
-        "label": "Coast",
-        "value": "coast"
+        "label": "Coastal",
+        "value": "coastal"
       },
       {
         "label": "Grassland",
@@ -97,14 +121,14 @@
         "label": "Moorland and upland",
         "value": "moorland-and-upland"
       },
-      {
-        "label": "Organic land",
-        "value": "organic-land"
-      },
       {
         "label": "Priority habitats",
         "value": "priority-habitats"
       },
+      {
+        "label": "Scrub",
+        "value": "scrub"
+      },
       {
         "label": "Waterbodies",
         "value": "waterbodies"
@@ -118,16 +142,6 @@
         "value": "woodland"
       }
     ],
-    "grant_schemes": [
-      {
-        "label": "Countryside Stewardship",
-        "value": "countryside-stewardship"
-      },
-      {
-        "label": "Sustainable Farming Incentive",
-        "value": "sustainable-farming-incentive"
-      }
-    ],
     "payment_types": [
       {
         "label": "Capital",

diff --git a/config/schema/field_definitions.json b/config/schema/field_definitions.json
@@ -1057,10 +1057,6 @@
     "description": "Land that the farming grant refers to",
     "type": "identifiers"
   },
-  "grant_schemes":  {
-    "description": "Type of scheme",
-    "type": "identifiers"
-  },
   "payment_types": {
     "description": "Farming grant payment type, i.e. capital, revenue",
     "type": "identifiers"

diff --git a/lib/govuk_index/presenters/elasticsearch_presenter.rb b/lib/govuk_index/presenters/elasticsearch_presenter.rb
@@ -82,7 +82,6 @@ def document
         government_document_supertype: common_fields.government_document_supertype,
         government_name: common_fields.government_name,
         grant_type: specialist.grant_type,
-        grant_schemes: specialist.grant_schemes,
         hidden_indexable_content: specialist.hidden_indexable_content,
         hmrc_manual_section_id: common_fields.section_id,
         image_url:,

diff --git a/lib/govuk_index/presenters/specialist_presenter.rb b/lib/govuk_index/presenters/specialist_presenter.rb
@@ -59,7 +59,6 @@ class SpecialistPresenter
     delegate_to_payload :fund_type
     delegate_to_payload :funding_amount
     delegate_to_payload :funding_source
-    delegate_to_payload :grant_schemes
     delegate_to_payload :grant_type, convert_to_array: true
     delegate_to_payload :hidden_indexable_content
     delegate_to_payload :industries