Merge pull request #6616 from NHSDigital/add-lat-lng-to-locations

Add position column to locations

Author: thomasleese

app/models/location.rb

@@ -15,6 +15,7 @@
 #  gias_year_groups          :integer          default([]), not null, is an Array
 #  name                      :text             not null
 #  ods_code                  :string
+#  position                  :geography        point, 4326
 #  site                      :string
 #  status                    :integer          default("unknown"), not null
 #  systm_one_code            :string
@@ -247,9 +248,15 @@ def phase
   end
 
   def as_json
-    super.except("created_at", "systm_one_code", "updated_at").merge(
+    super.except(
+      "created_at",
+      "systm_one_code",
+      "updated_at",
+      "position"
+    ).merge(
       "is_attached_to_team" =>
-        team_locations.any? { it.academic_year == AcademicYear.pending }
+        team_locations.any? { it.academic_year == AcademicYear.pending },
+      "position" => position ? [position.x, position.y] : nil
     )
   end
 

db/migrate/20260416132006_add_position_to_locations.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class AddPositionToLocations < ActiveRecord::Migration[8.1]
+  def change
+    add_column :locations, :position, :st_point, geographic: true
+  end
+end

db/schema.rb

@@ -536,6 +536,7 @@
     t.integer "gias_year_groups", default: [], null: false, array: true
     t.text "name", null: false
     t.string "ods_code"
+    t.geography "position", limit: {srid: 4326, type: "st_point", geographic: true}
     t.string "site"
     t.integer "status", default: 0, null: false
     t.string "systm_one_code"

spec/factories/locations.rb

@@ -15,6 +15,7 @@
 #  gias_year_groups          :integer          default([]), not null, is an Array
 #  name                      :text             not null
 #  ods_code                  :string
+#  position                  :geography        point, 4326
 #  site                      :string
 #  status                    :integer          default("unknown"), not null
 #  systm_one_code            :string
@@ -52,6 +53,9 @@
       address_line_1 { Faker::Address.street_address }
       address_town { Faker::Address.city }
       address_postcode { Faker::Address.uk_postcode }
+      position do
+        "POINT(#{Faker::Address.longitude} #{Faker::Address.latitude})"
+      end
     end
 
     factory :community_clinic do

spec/models/location_spec.rb

@@ -15,6 +15,7 @@
 #  gias_year_groups          :integer          default([]), not null, is an Array
 #  name                      :text             not null
 #  ods_code                  :string
+#  position                  :geography        point, 4326
 #  site                      :string
 #  status                    :integer          default("unknown"), not null
 #  systm_one_code            :string
@@ -432,6 +433,7 @@
           "is_attached_to_team" => false,
           "name" => location.name,
           "ods_code" => location.ods_code,
+          "position" => [location.position.x, location.position.y],
           "site" => location.site,
           "status" => "unknown",
           "type" => "community_clinic",