Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

IPO trademark decisions finder #3105

Merged
merged 3 commits into from
Feb 20, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions config/govuk_index/mapped_document_types.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,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
Expand Down
1 change: 1 addition & 0 deletions config/govuk_index/migrated_formats.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@ migrated:
- sfo_case
- statutory_instrument
- tax_tribunal_decision
- trademark_decision
- traffic_commissioner_regulatory_decision
- utaac_decision
- veterans_support_organisation
Expand Down
13 changes: 13 additions & 0 deletions config/schema/elasticsearch_types/trademark_decision.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
{
"fields": [
"trademark_decision_british_library_number",
"trademark_decision_type_of_hearing",
"trademark_decision_mark",
"trademark_decision_class",
"trademark_decision_date",
"trademark_decision_appointed_person_hearing_officer",
"trademark_decision_person_or_company_involved",
"trademark_decision_grounds_section",
"trademark_decision_grounds_sub_section"
]
}
30 changes: 29 additions & 1 deletion config/schema/field_definitions.json
Original file line number Diff line number Diff line change
Expand Up @@ -1067,7 +1067,7 @@
"life_saving_maritime_appliance_manufacturer": {
"type": "identifiers"
},

"veterans_support_organisation_health_and_social_care": {
"type": "identifiers"
},
Expand Down Expand Up @@ -1121,5 +1121,33 @@
},
"data_ethics_guidance_document_technology_area": {
"type": "identifiers"
},

"trademark_decision_british_library_number": {
"type": "searchable_text"
},
"trademark_decision_type_of_hearing": {
"type": "identifiers"
},
"trademark_decision_mark": {
"type": "searchable_text"
},
"trademark_decision_class": {
"type": "identifiers"
},
"trademark_decision_date": {
"type": "date"
},
"trademark_decision_appointed_person_hearing_officer": {
"type": "searchable_multivalued_text"
},
"trademark_decision_person_or_company_involved": {
"type": "searchable_text"
},
"trademark_decision_grounds_section": {
"type": "identifiers"
},
"trademark_decision_grounds_sub_section": {
"type": "identifiers"
}
}
1 change: 1 addition & 0 deletions config/schema/indexes/govuk.json
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@
"sfo_case",
"statutory_instrument",
"tax_tribunal_decision",
"trademark_decision",
"traffic_commissioner_regulatory_decision",
"utaac_decision",
"veterans_support_organisation"
Expand Down
9 changes: 9 additions & 0 deletions lib/govuk_index/presenters/elasticsearch_presenter.rb
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,15 @@ def document
indexable_content: indexable.indexable_content,
industries: specialist.industries,
internal_notes: specialist.internal_notes,
trademark_decision_appointed_person_hearing_officer: specialist.trademark_decision_appointed_person_hearing_officer,
trademark_decision_british_library_number: specialist.trademark_decision_british_library_number,
trademark_decision_class: specialist.trademark_decision_class,
trademark_decision_date: specialist.trademark_decision_date,
trademark_decision_mark: specialist.trademark_decision_mark,
trademark_decision_person_or_company_involved: specialist.trademark_decision_person_or_company_involved,
trademark_decision_grounds_section: specialist.trademark_decision_grounds_section,
trademark_decision_grounds_sub_section: specialist.trademark_decision_grounds_sub_section,
trademark_decision_type_of_hearing: specialist.trademark_decision_type_of_hearing,
is_historic: common_fields.historic?,
is_political: common_fields.political?,
is_withdrawn: common_fields.withdrawn?,
Expand Down
9 changes: 9 additions & 0 deletions lib/govuk_index/presenters/specialist_presenter.rb
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,15 @@ class SpecialistPresenter
delegate_to_payload :hidden_indexable_content
delegate_to_payload :industries
delegate_to_payload :internal_notes
delegate_to_payload :trademark_decision_appointed_person_hearing_officer
delegate_to_payload :trademark_decision_british_library_number
delegate_to_payload :trademark_decision_class
delegate_to_payload :trademark_decision_date
delegate_to_payload :trademark_decision_mark
delegate_to_payload :trademark_decision_person_or_company_involved
delegate_to_payload :trademark_decision_grounds_section
delegate_to_payload :trademark_decision_grounds_sub_section
delegate_to_payload :trademark_decision_type_of_hearing
delegate_to_payload :issued_date
delegate_to_payload :key_function, convert_to_array: true
delegate_to_payload :keyword
Expand Down