From 11c605367af9ce63477c0bae819fb8e02239a052 Mon Sep 17 00:00:00 2001
From: Nat Dean-Lewis <nat.dean-lewis@softwire.com>
Date: Thu, 23 Apr 2026 10:16:38 +0100
Subject: [PATCH] CLDC-4071: update export service

---
 app/models/user.rb                                | 7 -------
 app/services/exports/user_export_constants.rb     | 1 +
 app/services/exports/user_export_service.rb       | 3 ++-
 spec/fixtures/exports/user.xml                    | 3 ++-
 spec/services/exports/user_export_service_spec.rb | 2 +-
 5 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/app/models/user.rb b/app/models/user.rb
index 4e80df2b8..c81d17426 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -334,13 +334,6 @@ class User < ApplicationRecord
     save!(validate: false)
   end
 
-  def phone_with_extension
-    #use this
-    return phone if phone_extension.blank?
-
-    "#{phone}, Ext. #{phone_extension}"
-  end
-
   def assigned_to_lettings_logs
     lettings_logs.where(assigned_to: self)
   end
diff --git a/app/services/exports/user_export_constants.rb b/app/services/exports/user_export_constants.rb
index 9ce5840d9..15fa10ea0 100644
--- a/app/services/exports/user_export_constants.rb
+++ b/app/services/exports/user_export_constants.rb
@@ -6,6 +6,7 @@ module Exports::UserExportConstants
     "email",
     "name",
     "phone",
+    "extension_number",
     "organisation_id",
     "organisation_name",
     "role",
diff --git a/app/services/exports/user_export_service.rb b/app/services/exports/user_export_service.rb
index 0a8ebe34e..3a9f37417 100644
--- a/app/services/exports/user_export_service.rb
+++ b/app/services/exports/user_export_service.rb
@@ -64,7 +64,8 @@ module Exports
       attribute_hash["role"] = user.role
       attribute_hash["organisation_name"] = user.organisation.name
       attribute_hash["active"] = user.active?
-      attribute_hash["phone"] = [user.phone, user.phone_extension].compact.join(" ")
+      attribute_hash["phone"] = user.phone
+      attribute_hash["extension_number"] = user.phone_extension
       attribute_hash["last_sign_in_at"] = user.last_sign_in_at&.iso8601
       attribute_hash
     end
diff --git a/spec/fixtures/exports/user.xml b/spec/fixtures/exports/user.xml
index 4c5286c68..bf3f2fb4c 100644
--- a/spec/fixtures/exports/user.xml
+++ b/spec/fixtures/exports/user.xml
@@ -8,7 +8,8 @@
     <sign_in_count>5</sign_in_count>
     <last_sign_in_at>2022-03-03T00:00:00+00:00</last_sign_in_at>
     <role>data_provider</role>
-    <phone>1234512345123 123</phone>
+    <phone>1234512345123</phone>
+    <extension_number>ext. 123</extension_number>
     <is_dpo>false</is_dpo>
     <is_key_contact>false</is_key_contact>
     <active>true</active>
diff --git a/spec/services/exports/user_export_service_spec.rb b/spec/services/exports/user_export_service_spec.rb
index f62664945..a2f00f565 100644
--- a/spec/services/exports/user_export_service_spec.rb
+++ b/spec/services/exports/user_export_service_spec.rb
@@ -45,7 +45,7 @@ RSpec.describe Exports::UserExportService do
     end
 
     context "and one user is available for export" do
-      let!(:user) { create(:user, organisation:, name: "Danny Rojas", phone_extension: "123", last_sign_in_at: Time.zone.local(2022, 3, 3)) }
+      let!(:user) { create(:user, organisation:, name: "Danny Rojas", phone_extension: "ext. 123", last_sign_in_at: Time.zone.local(2022, 3, 3)) }
 
       it "generates a ZIP export file with the expected filename" do
         expect(storage_service).to receive(:write_file).with(expected_zip_filename, any_args)