Use new index to simplify least new postcode collection

Author: KludgeKML

app/workers/postcodes_collection_worker.rb

@@ -12,9 +12,7 @@ def perform
 
   def postcodes
     Postcode.uncached do
-      onspd_candidates = Postcode.onspd.active.order("updated_at ASC").select { |r| r.results.first["ONS"]["TYPE"] == "S" }.first(POSTCODES_PER_SECOND)
-      os_places_candidates = Postcode.os_places.order("updated_at ASC").first(POSTCODES_PER_SECOND)
-      (onspd_candidates + os_places_candidates).sort_by(&:updated_at).first(POSTCODES_PER_SECOND).pluck(:postcode)
+      Postcode.active.small.order("updated_at ASC").limit(POSTCODES_PER_SECOND).pluck(:postcode)
     end
   end
 end

spec/workers/postcodes_collection_worker_spec.rb

@@ -20,7 +20,7 @@
 
     context "when an ONSPD small active postcode is older than the oldest OS Places postcode" do
       before do
-        Postcode.create(postcode: "E12AA", source: "onspd", updated_at: 3.days.ago, results: [{ "ONS" => { "TYPE" => "S" } }])
+        Postcode.create(postcode: "E12AA", source: "onspd", updated_at: 3.days.ago)
       end
 
       it "adds the onspd postcode to the update checker" do
@@ -35,7 +35,7 @@
 
     context "when an ONSPD small retired postcode is older than the oldest OS Places postcode" do
       before do
-        Postcode.create(postcode: "E12AA", source: "onspd", updated_at: 3.days.ago, results: [{ "ONS" => { "TYPE" => "S" } }], retired: true)
+        Postcode.create(postcode: "E12AA", source: "onspd", updated_at: 3.days.ago, retired: true)
       end
 
       it "does not attempt to update the ONSPD postcode" do
@@ -47,7 +47,7 @@
 
     context "when an ONSPD large active postcode is older than the oldest OS Places postcode" do
       before do
-        Postcode.create(postcode: "E12AA", source: "onspd", updated_at: 3.days.ago, results: [{ "ONS" => { "TYPE" => "L" } }])
+        Postcode.create(postcode: "E12AA", source: "onspd", updated_at: 3.days.ago, large_user_postcode: true)
       end
 
       it "does not attempt to update the ONSPD postcode" do