diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index efcfa99a..e14a4667 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -102,12 +102,6 @@ jobs:
with:
pact_artifact: pacts
- whitehall_pact:
- needs: generate_pacts
- uses: alphagov/whitehall/.github/workflows/pact-verify.yml@main
- with:
- pact_artifact: pacts
-
publish_pacts:
needs:
- account_api_pact
@@ -119,7 +113,6 @@ jobs:
- link_checker_api_pact
- locations_api_pact
- publishing_api_pact
- - whitehall_pact
if: ${{ github.ref == 'refs/heads/main' }}
runs-on: ubuntu-latest
steps:
diff --git a/CHANGELOG.md b/CHANGELOG.md
index e0a35f2e..5e9d4bde 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,7 @@
+# 90.0.0
+
+* BREAKING: Change source for `GdsApi.worldwide.organisations_for_world_location` method, remove pagination and remove `stub_worldwide_api_has_organisations_for_location` method.
+
# 89.0.0
* BREAKING: Change source for `GdsApi.worldwide.world_locations` method and remove pagination.
diff --git a/lib/gds_api/test_helpers/worldwide.rb b/lib/gds_api/test_helpers/worldwide.rb
index 10baefc3..7645f063 100644
--- a/lib/gds_api/test_helpers/worldwide.rb
+++ b/lib/gds_api/test_helpers/worldwide.rb
@@ -52,18 +52,28 @@ def stub_worldwide_api_has_location(location_slug)
stub_worldwide_api_has_locations([location_slug])
end
- def stub_worldwide_api_has_organisations_for_location(location_slug, json_or_hash)
- json = json_or_hash.is_a?(Hash) ? json_or_hash.to_json : json_or_hash
- url = "#{WORLDWIDE_API_ENDPOINT}/api/world-locations/#{location_slug}/organisations"
- stub_request(:get, url)
- .to_return(status: 200, body: json, headers: { "Link" => "<#{url}; rel\"self\"" })
+ def stub_search_api_has_organisations_for_location(location_slug, organisation_content_items)
+ response = {
+ "results": organisation_content_items.map do |content_item|
+ {
+ "link": content_item["base_path"],
+ }
+ end,
+ }
+
+ stub_request(:get, "#{WORLDWIDE_API_ENDPOINT}/api/search.json?filter_format=worldwide_organisation&filter_world_locations=#{location_slug}")
+ .to_return(status: 200, body: response.to_json)
+
+ organisation_content_items.each do |content_item|
+ stub_content_store_has_worldwide_organisation(content_item)
+ end
end
- def stub_worldwide_api_has_no_organisations_for_location(location_slug)
- details = { "results" => [], "total" => 0, "_response_info" => { "status" => "ok" } }
- url = "#{WORLDWIDE_API_ENDPOINT}/api/world-locations/#{location_slug}/organisations"
- stub_request(:get, url)
- .to_return(status: 200, body: details.to_json, headers: { "Link" => "<#{url}; rel\"self\"" })
+ def stub_content_store_has_worldwide_organisation(content_item)
+ base_path = content_item["base_path"]
+
+ stub_request(:get, "#{WORLDWIDE_API_ENDPOINT}/api/content#{base_path}")
+ .to_return(status: 200, body: content_item.to_json)
end
end
end
diff --git a/lib/gds_api/version.rb b/lib/gds_api/version.rb
index e7d2e12f..ea2832ef 100644
--- a/lib/gds_api/version.rb
+++ b/lib/gds_api/version.rb
@@ -1,3 +1,3 @@
module GdsApi
- VERSION = "89.0.0".freeze
+ VERSION = "90.0.0".freeze
end
diff --git a/lib/gds_api/worldwide.rb b/lib/gds_api/worldwide.rb
index d6bf274b..bd739141 100644
--- a/lib/gds_api/worldwide.rb
+++ b/lib/gds_api/worldwide.rb
@@ -16,7 +16,11 @@ def world_location(location_slug)
end
def organisations_for_world_location(location_slug)
- get_list("#{base_url}/world-locations/#{location_slug}/organisations")
+ worldwide_organisations = worldwide_organisations_for_location(location_slug)
+
+ worldwide_organisations.map do |organisation|
+ worldwide_organisation(organisation["link"])
+ end
end
private
@@ -55,4 +59,87 @@ def format_locations(locations, type)
}
end
end
+
+ def worldwide_organisations_for_location(world_location)
+ search_results = JSON.parse(get_raw("#{base_url}/search.json?filter_format=worldwide_organisation&filter_world_locations=#{world_location}"))
+
+ search_results["results"]
+ end
+
+ def worldwide_organisation(path)
+ content_item = JSON.parse(get_raw("#{base_url}/content#{path}"))
+
+ {
+ "id" => "#{Plek.new.website_root}#{path}",
+ "title" => content_item["title"],
+ "format" => "Worldwide Organisation",
+ "updated_at" => content_item["updated_at"],
+ "web_url" => "#{Plek.new.website_root}#{path}",
+ "details" => {
+ "slug" => path.gsub("/world/organisations/", ""),
+ },
+ "analytics_identifier" => content_item["analytics_identifier"],
+ "offices" => {
+ "main" => format_office(content_item.dig("links", "main_office", 0)),
+ "other" => content_item.dig("links", "home_page_offices")&.map do |office|
+ format_office(office)
+ end || [],
+ },
+ "sponsors" => content_item.dig("links", "sponsoring_organisations")&.map do |sponsor|
+ format_sponsor(sponsor)
+ end || [],
+ }
+ end
+
+ def format_office(office)
+ return {} unless office
+
+ contact = office.dig("links", "contact", 0)
+
+ {
+ "title" => office["title"],
+ "format" => "World Office",
+ "updated_at" => office["public_updated_at"],
+ "web_url" => office["web_url"],
+ "details" => {
+ "email" => contact&.dig("details", "email_addresses"),
+ "description" => contact&.dig("details", "description"),
+ "contact_form_url" => contact&.dig("details", "contact_form_links"),
+ "access_and_opening_times" => office.dig("details", "access_and_opening_times"),
+ "type" => office.dig("details", "type"),
+ },
+ "address" => {
+ "adr" => {
+ "fn" => contact&.dig("details", "post_addresses", 0, "title"),
+ "street-address" => contact&.dig("details", "post_addresses", 0, "street_address"),
+ "postal-code" => contact&.dig("details", "post_addresses", 0, "postal_code"),
+ "locality" => contact&.dig("details", "post_addresses", 0, "locality"),
+ "region" => contact&.dig("details", "post_addresses", 0, "region"),
+ "country-name" => contact&.dig("details", "post_addresses", 0, "world_location"),
+ },
+ },
+ "contact_numbers" => contact&.dig("details", "phone_numbers")&.map do |phone_number|
+ {
+ "label" => phone_number["title"],
+ "number" => phone_number["number"],
+ }
+ end,
+ "services" => contact&.dig("details", "services")&.map do |service|
+ {
+ title: service["title"],
+ type: service["type"],
+ }
+ end,
+ }
+ end
+
+ def format_sponsor(sponsor)
+ {
+ "title" => sponsor["title"],
+ "web_url" => sponsor["web_url"],
+ "details" => {
+ "acronym" => sponsor.dig("details", "acronym"),
+ },
+ }
+ end
end
diff --git a/test/fixtures/world_organisations_australia.json b/test/fixtures/world_organisations_australia.json
deleted file mode 100644
index 208fa1ff..00000000
--- a/test/fixtures/world_organisations_australia.json
+++ /dev/null
@@ -1,490 +0,0 @@
-{
- "results": [
- {
- "id": "https://www.gov.uk/api/worldwide-organisations/uk-trade-investment-australia",
- "title": "UK Trade & Investment Australia",
- "format": "Worldwide Organisation",
- "updated_at": "2013-04-10T13:51:59+01:00",
- "web_url": "https://www.gov.uk/government/world/organisations/uk-trade-investment-australia",
- "details": {
- "slug": "uk-trade-investment-australia",
- "summary": "UK Trade & Investment (UKTI) helps UK-based companies succeed in the global economy. We also help overseas companies bring their high-quality investment to the UK’s dynamic economy.",
- "description": "UKTI offers expertise and contacts through its extensive network of specialists in the UK, and in British embassies and other diplomatic offices around the world. We provide companies with the tools they require to be competitive on the world stage.
\n\n
Responsibilities
\n\n
UKTI in Australia helps companies in Britain increase their competitiveness through overseas trade in Australia. We also offer professional, authoritative and personalised assistance to help companies in Australia locate and expand in the UK.
\n\n
You can find out more about how we are increasing business with Australia.
We represent the British government in its relations with the Australian government and present British policies to the Australian government and to Australians. We report and explain Australian policies to the British government and support British interests as well as co-ordinating the political, economic, environmental and commercial activities of the British government.
\n\n
We have consulate-generals in Sydney and Melbourne and consulates in Brisbane and Perth. With over one million Britons living in Australia and over 640,000 visiting every year, the consulates support British nationals if they require assistance.
\n
For information on whether you require a visa for the United Kingdom and how to apply go to the UK Border Agency website
\n\n
\n
Information on how you can register a birth or death which occurred overseas, and legal documents for couples marrying or entering into civil partnerships abroad.
\n\n
\n
How to renew or replace your British passport when visiting the UK and information on getting replacement travel documents if your passport is lost or stolen.
\n\n
\n
Information on staying safe and avoiding problems when living or travelling abroad, with links to our embassies, high commissions and other diplomatic posts across the world.