gds-api-adapters 67.2.0 → 69.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b9e99044909467134a19c5e0f273908fd94afbe72a40f50a5d81dfd4bf467d28
-  data.tar.gz: 0535e351b0d6899aa363f61bcd8c0ab9b3137389b4279bf9ff195250773c087d
+  metadata.gz: b5de255ce4237b87f433deb2306447f9bda4534d3d85cad5b2ea3053b8d2dda1
+  data.tar.gz: 2144a904a6f4b3eeb6d0ec0c14b11d680d844f37c432d8c2909f843ce67a6927
 SHA512:
-  metadata.gz: 796c442ffe778c4377f476db1fdae0d52592c776687aa4d52bc4e3e7f3f3a33fe7cd9e48e40af52e532943fe5b0549cf335ae516d7d4dd149e767f26b7142b7c
-  data.tar.gz: 3b37865fca30c9e7ff47bd9e8f64fe4579065b48a325eb59cad29a4722170873049c16373f4708c9601e015269875de3ec88612d2a84d64943337e6494aea9fa
+  metadata.gz: d045fefa180fd19839f9f10db2f6743bfe6e70f916434d486dd1745c8457b2874870f4fbd7f3f46eca5ee010afe9fc01b3b63e625694684d36feae3b69febb4b
+  data.tar.gz: 812e40c01ab8876121451782fbf6103facfe9dd97f2e1b246a047ef3ec628f116dda681f7de2bdd36dfdc8fafd8ae8ba450bfed00da3b9100a02abd8ee51c78e

data/lib/gds_api/email_alert_api.rb

@@ -10,39 +10,12 @@ class GdsApi::EmailAlertApi < GdsApi::Base
   #
   # @param attributes [Hash] document_type, links, tags used to search existing subscriber lists
   def find_or_create_subscriber_list(attributes)
-    find_subscriber_list(attributes)
-  rescue GdsApi::HTTPNotFound
-    create_subscriber_list(attributes)
-  end
-
-  # Get a subscriber list
-  #
-  # @param attributes [Hash] document_type, links, tags used to search existing subscriber lists
-  def find_subscriber_list(attributes)
-    tags = attributes["tags"]
-    links = attributes["links"]
-    document_type = attributes["document_type"]
-    email_document_supertype = attributes["email_document_supertype"]
-    government_document_supertype = attributes["government_document_supertype"]
-    gov_delivery_id = attributes["gov_delivery_id"]
-    combine_mode = attributes["combine_mode"]
-
-    if tags && links
+    if attributes["tags"] && attributes["links"]
       message = "please provide either tags or links (or neither), but not both"
       raise ArgumentError, message
     end
 
-    params = {}
-    params[:tags] = tags if tags
-    params[:links] = links if links
-    params[:document_type] = document_type if document_type
-    params[:email_document_supertype] = email_document_supertype if email_document_supertype
-    params[:government_document_supertype] = government_document_supertype if government_document_supertype
-    params[:gov_delivery_id] = gov_delivery_id if gov_delivery_id
-    params[:combine_mode] = combine_mode if combine_mode
-
-    query_string = nested_query_string(params)
-    get_json("#{endpoint}/subscriber-lists?" + query_string)
+    create_subscriber_list(attributes)
   end
 
   # Post a subscriber list
@@ -66,13 +39,6 @@ class GdsApi::EmailAlertApi < GdsApi::Base
     post_json("#{endpoint}/messages", message, headers)
   end
 
-  # Send email
-  #
-  # @param email_params [Hash] address, subject, body
-  def create_email(email_params)
-    post_json("#{endpoint}/emails", email_params)
-  end
-
   # Unpublishing alert
   #
   # @param message [Hash] content_id
@@ -131,7 +97,6 @@ class GdsApi::EmailAlertApi < GdsApi::Base
   # @return [Hash] subscriber_list: {
   #  id
   #  title
-  #  gov_delivery_id
   #  created_at
   #  updated_at
   #  document_type

data/lib/gds_api/exceptions.rb

@@ -40,6 +40,7 @@ module GdsApi
   class HTTPForbidden < HTTPClientError; end
   class HTTPConflict < HTTPClientError; end
   class HTTPUnprocessableEntity < HTTPClientError; end
+  class HTTPBadRequest < HTTPClientError; end
   class HTTPTooManyRequests < HTTPIntermittentClientError; end
 
   # Superclass & fallback for all 5XX errors
@@ -60,6 +61,8 @@ module GdsApi
 
     def error_class_for_code(code)
       case code
+      when 400
+        GdsApi::HTTPBadRequest
       when 401
         GdsApi::HTTPUnauthorized
       when 403

data/lib/gds_api/mapit.rb

@@ -37,6 +37,10 @@ class GdsApi::Mapit < GdsApi::Base
     def postcode
       @response["postcode"]
     end
+
+    def country_name
+      @response["country_name"]
+    end
   end
 
 private

data/lib/gds_api/publishing_api/special_route_publisher.rb

@@ -12,6 +12,9 @@ module GdsApi
       def publish(options)
         logger.info("Publishing #{options.fetch(:type)} route #{options.fetch(:base_path)}, routing to #{options.fetch(:rendering_app)}")
 
+        update_type = options.fetch(:update_type, "major")
+        locale = options.fetch(:locale, "en")
+
         put_content_response = publishing_api.put_content(
           options.fetch(:content_id),
           base_path: options.fetch(:base_path),
@@ -19,7 +22,7 @@ module GdsApi
           schema_name: options.fetch(:schema_name, "special_route"),
           title: options.fetch(:title),
           description: options.fetch(:description, ""),
-          locale: options.fetch(:locale, "en"),
+          locale: locale,
           details: {},
           routes: [
             {
@@ -30,11 +33,11 @@ module GdsApi
           publishing_app: options.fetch(:publishing_app),
           rendering_app: options.fetch(:rendering_app),
           public_updated_at: time.now.iso8601,
-          update_type: options.fetch(:update_type, "major"),
+          update_type: update_type,
         )
 
         publishing_api.patch_links(options.fetch(:content_id), links: options[:links]) if options[:links]
-        publishing_api.publish(options.fetch(:content_id))
+        publishing_api.publish(options.fetch(:content_id), update_type, locale: locale)
         put_content_response
       end
 

data/lib/gds_api/test_helpers/email_alert_api.rb

@@ -124,19 +124,6 @@ module GdsApi
         matching.last
       end
 
-      def stub_email_alert_api_has_subscriber_list(attributes)
-        stub_request(:get, build_subscriber_lists_url(attributes))
-          .to_return(
-            status: 200,
-            body: get_subscriber_list_response(attributes).to_json,
-          )
-      end
-
-      def stub_email_alert_api_does_not_have_subscriber_list(attributes)
-        stub_request(:get, build_subscriber_lists_url(attributes))
-          .to_return(status: 404)
-      end
-
       def stub_email_alert_api_creates_subscriber_list(attributes)
         stub_request(:post, build_subscriber_lists_url)
           .to_return(
@@ -218,27 +205,31 @@ module GdsApi
           .to_return(status: 404)
       end
 
-      def stub_email_alert_api_creates_a_subscription(subscriber_list_id, address, frequency, returned_subscription_id, skip_confirmation_email: false)
-        stub_request(:post, "#{EMAIL_ALERT_API_ENDPOINT}/subscriptions")
-          .with(
-            body: {
-              subscriber_list_id: subscriber_list_id,
-              address: address,
-              frequency: frequency,
-              skip_confirmation_email: skip_confirmation_email,
-            }.to_json,
-          ).to_return(status: 201, body: { id: returned_subscription_id }.to_json)
-      end
+      def stub_email_alert_api_creates_a_subscription(
+        subscriber_list_id: nil,
+        address: nil,
+        frequency: nil,
+        returned_subscription_id: nil,
+        skip_confirmation_email: false,
+        subscriber_id: nil
+      )
+        response = get_subscription_response(
+          returned_subscription_id,
+          frequency: frequency,
+          subscriber_list_id: subscriber_list_id,
+          subscriber_id: subscriber_id,
+        )
+
+        request_params = {
+          subscriber_list_id: subscriber_list_id,
+          address: address,
+          frequency: frequency,
+          skip_confirmation_email: skip_confirmation_email,
+        }
 
-      def stub_email_alert_api_creates_an_existing_subscription(subscriber_list_id, address, frequency, returned_subscription_id)
         stub_request(:post, "#{EMAIL_ALERT_API_ENDPOINT}/subscriptions")
-          .with(
-            body: hash_including(
-              subscriber_list_id: subscriber_list_id,
-              address: address,
-              frequency: frequency,
-            ),
-          ).to_return(status: 200, body: { id: returned_subscription_id }.to_json)
+          .with(body: hash_including(request_params.compact))
+          .to_return(status: 200, body: response.to_json)
       end
 
       def stub_email_alert_api_refuses_to_create_subscription(subscriber_list_id, address, frequency)
@@ -394,7 +385,6 @@ module GdsApi
           document_type = attributes["document_type"]
           email_document_supertype = attributes["email_document_supertype"]
           government_document_supertype = attributes["government_document_supertype"]
-          gov_delivery_id = attributes["gov_delivery_id"]
           content_purpose_supergroup = attributes["content_purpose_supergroup"]
           combine_mode = attributes["combine_mode"]
 
@@ -404,7 +394,6 @@ module GdsApi
           params[:document_type] = document_type if document_type
           params[:email_document_supertype] = email_document_supertype if email_document_supertype
           params[:government_document_supertype] = government_document_supertype if government_document_supertype
-          params[:gov_delivery_id] = gov_delivery_id if gov_delivery_id
           params[:content_purpose_supergroup] = content_purpose_supergroup if content_purpose_supergroup
           params[:combine_mode] = combine_mode if combine_mode
 

data/lib/gds_api/test_helpers/local_links_manager.rb

@@ -5,13 +5,14 @@ module GdsApi
     module LocalLinksManager
       LOCAL_LINKS_MANAGER_ENDPOINT = Plek.current.find("local-links-manager")
 
-      def stub_local_links_manager_has_a_link(authority_slug:, lgsl:, lgil:, url:)
+      def stub_local_links_manager_has_a_link(authority_slug:, lgsl:, lgil:, url:, country_name: "England")
         response = {
           "local_authority" => {
             "name" => authority_slug.capitalize,
             "snac" => "00AG",
             "tier" => "unitary",
             "homepage_url" => "http://#{authority_slug}.example.com",
+            "country_name" => country_name,
           },
           "local_interaction" => {
             "lgsl_code" => lgsl,
@@ -25,13 +26,14 @@ module GdsApi
           .to_return(body: response.to_json, status: 200)
       end
 
-      def stub_local_links_manager_has_no_link(authority_slug:, lgsl:, lgil:)
+      def stub_local_links_manager_has_no_link(authority_slug:, lgsl:, lgil:, country_name: "England")
         response = {
           "local_authority" => {
             "name" => authority_slug.capitalize,
             "snac" => "00AG",
             "tier" => "unitary",
             "homepage_url" => "http://#{authority_slug}.example.com",
+            "country_name" => country_name,
           },
         }
 
@@ -40,13 +42,14 @@ module GdsApi
           .to_return(body: response.to_json, status: 200)
       end
 
-      def stub_local_links_manager_has_no_link_and_no_homepage_url(authority_slug:, lgsl:, lgil:)
+      def stub_local_links_manager_has_no_link_and_no_homepage_url(authority_slug:, lgsl:, lgil:, country_name: "England")
         response = {
           "local_authority" => {
             "name" => authority_slug.capitalize,
             "snac" => "00AG",
             "tier" => "unitary",
             "homepage_url" => nil,
+            "country_name" => country_name,
           },
         }
 
@@ -82,6 +85,7 @@ module GdsApi
             {
               "name" => authority_slug.capitalize,
               "homepage_url" => "http://#{authority_slug}.example.com",
+              "country_name" => "England",
               "tier" => "unitary",
             },
           ],
@@ -98,11 +102,13 @@ module GdsApi
             {
               "name" => district_slug.capitalize,
               "homepage_url" => "http://#{district_slug}.example.com",
+              "country_name" => "England",
               "tier" => "district",
             },
             {
               "name" => county_slug.capitalize,
               "homepage_url" => "http://#{county_slug}.example.com",
+              "country_name" => "England",
               "tier" => "county",
             },
           ],
@@ -131,6 +137,7 @@ module GdsApi
             {
               "name" => authority_slug.capitalize,
               "homepage_url" => "",
+              "country_name" => "England",
               "tier" => "unitary",
             },
           ],

data/lib/gds_api/test_helpers/mapit.rb

@@ -43,6 +43,20 @@ module GdsApi
           .to_return(body: response.to_json, status: 200)
       end
 
+      def stub_mapit_has_a_postcode_and_country_name(postcode, coords, country_name)
+        response = {
+          "wgs84_lat" => coords.first,
+          "wgs84_lon" => coords.last,
+          "postcode" => postcode,
+          "country_name" => country_name,
+        }
+
+        stub_request(:get, "#{MAPIT_ENDPOINT}/postcode/" + postcode.tr(" ", "+") + ".json")
+          .to_return(body: response.to_json, status: 200)
+        stub_request(:get, "#{MAPIT_ENDPOINT}/postcode/partial/" + postcode.split(" ").first + ".json")
+          .to_return(body: response.to_json, status: 200)
+      end
+
       def stub_mapit_does_not_have_a_postcode(postcode)
         stub_request(:get, "#{MAPIT_ENDPOINT}/postcode/" + postcode.tr(" ", "+") + ".json")
           .to_return(body: { "code" => 404, "error" => "No Postcode matches the given query." }.to_json, status: 404)

data/lib/gds_api/version.rb

@@ -1,3 +1,3 @@
 module GdsApi
-  VERSION = "67.2.0".freeze
+  VERSION = "69.0.0".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gds-api-adapters
 version: !ruby/object:Gem::Version
-  version: 67.2.0
+  version: 69.0.0
 platform: ruby
 authors:
 - GOV.UK Dev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-12-09 00:00:00.000000000 Z
+date: 2021-01-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable