Add IPO trademark decision finder

alphagov · Feb 7, 2025 · a8a30da · a8a30da
1 parent 0b47a5c
commit a8a30da
Show file tree

Hide file tree

Showing 7 changed files with 57 additions and 1 deletion.
diff --git a/config/govuk_index/mapped_document_types.yaml b/config/govuk_index/mapped_document_types.yaml
@@ -69,6 +69,7 @@ traffic_commissioner_regulatory_decision: traffic_commissioner_regulatory_decisi
 tax_tribunal_decision: tax_tribunal_decision # Specialist Publisher
 taxon: edition # Content Tagger
 topic: edition # Collections Publisher
+trademark_decision: trademark_decision # Specialist Publisher
 transaction: edition
 travel_advice: edition # Travel advice publisher
 travel_advice_index: edition # Travel advice publisher

diff --git a/config/govuk_index/migrated_formats.yaml b/config/govuk_index/migrated_formats.yaml
@@ -58,6 +58,7 @@ migrated:
 - sfo_case
 - statutory_instrument
 - tax_tribunal_decision
+- trademark_decision
 - traffic_commissioner_regulatory_decision
 - utaac_decision
 - veterans_support_organisation

diff --git a/config/schema/elasticsearch_types/trademark_decision.json b/config/schema/elasticsearch_types/trademark_decision.json
@@ -0,0 +1,12 @@
+{
+  "fields": [
+    "ipo_british_library_number",
+    "ipo_type_of_hearing",
+    "ipo_mark",
+    "ipo_class",
+    "ipo_decision_date",
+    "ipo_appointed_person_hearing_officer",
+    "ipo_person_or_company_involved ipo_grounds_section",
+    "ipo_grounds_section"
+  ]
+}
diff --git a/config/schema/field_definitions.json b/config/schema/field_definitions.json
@@ -1067,7 +1067,7 @@
   "life_saving_maritime_appliance_manufacturer": {
     "type": "identifiers"
   },
-  
+
   "veterans_support_organisation_health_and_social_care": {
     "type": "identifiers"
   },
@@ -1121,5 +1121,30 @@
   },
   "data_ethics_guidance_document_technology_area": {
     "type": "identifiers"
+  },
+
+  "ipo_british_library_number": {
+    "type": "searchable_text"
+  },
+  "ipo_type_of_hearing": {
+    "type": "identifiers"
+  },
+  "ipo_mark": {
+    "type": "searchable_text"
+  },
+  "ipo_class": {
+    "type": "identifiers"
+  },
+  "ipo_decision_date": {
+    "type": "date"
+  },
+  "ipo_appointed_person_hearing_officer": {
+    "type": "identifiers"
+  },
+  "ipo_person_or_company_involved": {
+    "type": "searchable_text"
+  },
+  "ipo_person_or_company_involved ipo_grounds_section": {
+    "type": "identifiers"
   }
 }
diff --git a/config/schema/indexes/govuk.json b/config/schema/indexes/govuk.json
@@ -43,6 +43,7 @@
     "sfo_case",
     "statutory_instrument",
     "tax_tribunal_decision",
+    "trademark_decision",
     "traffic_commissioner_regulatory_decision",
     "utaac_decision",
     "veterans_support_organisation"

diff --git a/lib/govuk_index/presenters/elasticsearch_presenter.rb b/lib/govuk_index/presenters/elasticsearch_presenter.rb
@@ -91,6 +91,14 @@ def document
         indexable_content: indexable.indexable_content,
         industries: specialist.industries,
         internal_notes: specialist.internal_notes,
+        ipo_appointed_person_hearing_officer: specialist.ipo_appointed_person_hearing_officer,
+        ipo_british_library_number: specialist.ipo_british_library_number,
+        ipo_class: specialist.ipo_class,
+        ipo_decision_date: specialist.ipo_decision_date,
+        ipo_mark: specialist.ipo_mark,
+        ipo_person_or_company_involved: specialist.ipo_person_or_company_involved,
+        ipo_grounds_section: specialist.ipo_grounds_section,
+        ipo_type_of_hearing: specialist.ipo_type_of_hearing,
         is_historic: common_fields.historic?,
         is_political: common_fields.political?,
         is_withdrawn: common_fields.withdrawn?,

diff --git a/lib/govuk_index/presenters/specialist_presenter.rb b/lib/govuk_index/presenters/specialist_presenter.rb
@@ -66,6 +66,14 @@ class SpecialistPresenter
     delegate_to_payload :hidden_indexable_content
     delegate_to_payload :industries
     delegate_to_payload :internal_notes
+    delegate_to_payload :ipo_appointed_person_hearing_officer
+    delegate_to_payload :ipo_british_library_number
+    delegate_to_payload :ipo_class
+    delegate_to_payload :ipo_decision_date
+    delegate_to_payload :ipo_mark
+    delegate_to_payload :ipo_person_or_company_involved
+    delegate_to_payload :ipo_grounds_section
+    delegate_to_payload :ipo_type_of_hearing
     delegate_to_payload :issued_date
     delegate_to_payload :key_function, convert_to_array: true
     delegate_to_payload :keyword