From a110e2336f485721c87a09ad9521ea6c2749556a Mon Sep 17 00:00:00 2001
From: Martin Fenner <martin.fenner@datacite.org>
Date: Sat, 29 Feb 2020 11:20:33 +0100
Subject: [PATCH] don't use billing_street_number

---
 app/controllers/export_controller.rb | 1 -
 app/models/provider.rb               | 7 -------
 2 files changed, 8 deletions(-)

diff --git a/app/controllers/export_controller.rb b/app/controllers/export_controller.rb
index 44e22c30f..1dd512abd 100644
--- a/app/controllers/export_controller.rb
+++ b/app/controllers/export_controller.rb
@@ -160,7 +160,6 @@ def organizations
               accountType: provider.member_type_label,
               generalContactEmail: provider.system_email,
               groupEmail: provider.group_email,
-              billingStreetNumber: provider.billing_street_number,
               billingStreet: provider.billing_address,
               billingPostalCode: provider.billing_post_code,
               billingCity: provider.billing_city,
diff --git a/app/models/provider.rb b/app/models/provider.rb
index 0a54c3d41..305f34e10 100644
--- a/app/models/provider.rb
+++ b/app/models/provider.rb
@@ -128,7 +128,6 @@ class Provider < ActiveRecord::Base
         department: { type: :text},
         city: { type: :text },
         country: { type: :keyword },
-        streetNumber: { type: :text },
         address: { type: :text }}
       indexes :technical_contact, type: :object, properties: {
         email: { type: :text },
@@ -209,7 +208,6 @@ def as_indexed_json(options={})
       "salesforce_id" => salesforce_id,
       "globus_uuid" => globus_uuid,
       "billing_information" => {
-        "streetNumber" => billing_street_number,
         "address" => billing_address,
         "organization" => billing_organization,
         "department" => billing_department,
@@ -283,7 +281,6 @@ def csv
       voting_contact_email: voting_contact_email,
       voting_contact_given_name: voting_contact_given_name,
       voting_contact_family_name: voting_contact_family_name,
-      billing_street_number: billing_street_number,
       billing_address: billing_address,
       billing_post_code: billing_post_code,
       billing_city: billing_city,
@@ -391,10 +388,6 @@ def billing_organization
     billing_information.fetch("organization",nil) if billing_information.present?
   end
 
-  def billing_street_number
-    billing_information.fetch("street_number",nil) if billing_information.present?
-  end
-
   def billing_address
     billing_information.fetch("address",nil) if billing_information.present?
   end