Merge pull request #20 from alphagov/database-column-changes-agnostic-api

hezzimo · web-flow · commit 5f6b838806a7 · 2026-02-04T16:34:40.000Z
Update database to match new agnostic api payload
diff --git a/app/models/request.rb b/app/models/request.rb
@@ -3,8 +3,8 @@ class Request < ApplicationRecord
   has_many :users, through: :collaborations
   has_one :response
 
-  validates :edition_id, :requester_name, :requester_email, :status, :current_content, :deadline, presence: true
-  scope :for_edition, ->(edition_id) { where(edition_id: edition_id) }
+  validates :source_id, :source_app, :requester_name, :requester_email, :status, :current_content, presence: true
+  scope :for_source, ->(source_id) { where(source_id: source_id) }
   scope :most_recent_first, -> { order(created_at: :desc) }
-  scope :most_recent_for_edition, ->(edition_id) { for_edition(edition_id).most_recent_first.first }
+  scope :most_recent_for_source, ->(source_id) { for_source(source_id).most_recent_first.first }
 end
diff --git a/db/migrate/20260107162918_create_requests.rb b/db/migrate/20260107162918_create_requests.rb
@@ -3,13 +3,16 @@ def change
     # Bigint ID column is added by default
     create_table :requests do |t|
       enable_extension 'pgcrypto' unless extension_enabled?('pgcrypto')
-      t.uuid :edition_id, index: true, null: false
+      t.uuid :source_id, index: true, null: false
+      t.string :source_app, null: false
+      t.string :source_url
+      t.string :source_title
       t.string :requester_name, null: false
       t.string :requester_email, null: false
       t.string :status, null: false, default: 'in_progress'
-      t.text :previous_published_edition
+      t.text :previous_content
       t.text :current_content, null: false
-      t.datetime :deadline, null: false
+      t.datetime :deadline
 
       t.timestamps
     end
diff --git a/db/schema.rb b/db/schema.rb
@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema[8.0].define(version: 2026_01_21_152056) do
+ActiveRecord::Schema[8.0].define(version: 2026_02_04_143415) do
   # These are extensions that must be enabled in order to support this database
   enable_extension "pg_catalog.plpgsql"
   enable_extension "pgcrypto"
@@ -27,17 +27,20 @@
   end
 
   create_table "requests", force: :cascade do |t|
-    t.uuid "edition_id", null: false
+    t.uuid "source_id", null: false
     t.string "requester_name", null: false
     t.string "requester_email", null: false
     t.string "status", default: "in_progress", null: false
-    t.text "previous_published_edition"
+    t.text "previous_content"
     t.text "current_content", null: false
-    t.datetime "deadline", null: false
+    t.datetime "deadline"
     t.datetime "created_at", null: false
     t.datetime "updated_at", null: false
+    t.string "source_app", null: false
+    t.string "source_url"
+    t.string "source_title"
     t.index ["created_at"], name: "index_requests_on_created_at"
-    t.index ["edition_id"], name: "index_requests_on_edition_id"
+    t.index ["source_id"], name: "index_requests_on_source_id"
   end
 
   create_table "responses", force: :cascade do |t|
diff --git a/spec/factories/request.rb b/spec/factories/request.rb
@@ -1,6 +1,7 @@
 FactoryBot.define do
   factory :request do
-    edition_id { SecureRandom.uuid }
+    source_id { SecureRandom.uuid }
+    source_app { "publisher" }
     requester_name { "Malcolm Tucker" }
     requester_email { "m.tucker@gov.uk" }
     current_content { "<HTML> Changes go here <HTML>" }
diff --git a/spec/models/request_spec.rb b/spec/models/request_spec.rb
@@ -7,11 +7,11 @@
     expect(record).not_to be_valid
   end
 
-  it "includes errors for each missing attribute" do
+  it "includes errors for each missing mandatory attribute" do
     record = described_class.new
     record.valid?
 
-    expect(record.errors.attribute_names).to include(:edition_id, :requester_name, :requester_email, :current_content, :deadline)
+    expect(record.errors.attribute_names).to include(:source_id, :source_app, :requester_name, :requester_email, :current_content)
   end
 
   it "is valid when all required attributes are set" do
@@ -20,14 +20,14 @@
     expect(record).to be_valid
   end
 
-  describe "searching by edition_id" do
-    it "can save and retrieve multiple requests that share the same edition_id" do
+  describe "searching by source_id" do
+    it "can save and retrieve multiple requests that share the same source_id" do
       shared_uuid = "a0eebc99-9c0b-4ef8-bb6d-6bb9bd380a11"
-      request_1 = create(:request, edition_id: shared_uuid, requester_email: "alice@gov.uk")
-      request_2 = create(:request, edition_id: shared_uuid, requester_email: "bob@gov.uk")
-      other_request = create(:request, edition_id: SecureRandom.uuid)
+      request_1 = create(:request, source_id: shared_uuid, requester_email: "alice@gov.uk")
+      request_2 = create(:request, source_id: shared_uuid, requester_email: "bob@gov.uk")
+      other_request = create(:request, source_id: SecureRandom.uuid)
 
-      results = Request.where(edition_id: shared_uuid)
+      results = Request.where(source_id: shared_uuid)
 
       expect(results).to include(request_1, request_2)
       expect(results).not_to include(other_request)
@@ -47,51 +47,51 @@
   end
 
   context "scopes" do
-    describe ".for_edition" do
-      it "returns only requests matching the given edition id" do
-        edition_id = SecureRandom.uuid
-        edition_request = FactoryBot.create(:request, edition_id: edition_id)
-        other_edition_request = FactoryBot.create(:request)
+    describe ".for_source" do
+      it "returns only requests matching the given source id" do
+        source_id = SecureRandom.uuid
+        source_request = FactoryBot.create(:request, source_id: source_id)
+        other_source_request = FactoryBot.create(:request)
 
-        requests = Request.for_edition(edition_id)
+        requests = Request.for_source(source_id)
 
-        expect(requests).to include(edition_request)
-        expect(requests).not_to include(other_edition_request)
+        expect(requests).to include(source_request)
+        expect(requests).not_to include(other_source_request)
       end
     end
 
     describe ".most_recent_first" do
       it "returns requests in descending order of created_at" do
-        edition_id = SecureRandom.uuid
-        older_request = FactoryBot.create(:request, edition_id: edition_id, created_at: Time.zone.now - 2.hours)
-        newer_request = FactoryBot.create(:request, edition_id: edition_id, created_at: Time.zone.now)
+        source_id = SecureRandom.uuid
+        older_request = FactoryBot.create(:request, source_id: source_id, created_at: Time.zone.now - 2.hours)
+        newer_request = FactoryBot.create(:request, source_id: source_id, created_at: Time.zone.now)
 
         requests = Request.most_recent_first
 
         expect(requests).to eq([newer_request, older_request])
       end
 
-      it "combines with .for_edition to return edition requests in descending order" do
-        edition_id = SecureRandom.uuid
-        older_request_for_edition = FactoryBot.create(:request, edition_id: edition_id, created_at: Time.zone.now - 2.hours)
-        newer_request_for_edition = FactoryBot.create(:request, edition_id: edition_id, created_at: Time.zone.now)
-        older_request_other_edition = FactoryBot.create(:request, created_at: Time.zone.now - 2.days)
-        newer_request_other_edition = FactoryBot.create(:request, created_at: Time.zone.now)
+      it "combines with .for_source to return source requests in descending order" do
+        source_id = SecureRandom.uuid
+        older_request_for_source = FactoryBot.create(:request, source_id: source_id, created_at: Time.zone.now - 2.hours)
+        newer_request_for_source = FactoryBot.create(:request, source_id: source_id, created_at: Time.zone.now)
+        older_request_other_source = FactoryBot.create(:request, created_at: Time.zone.now - 2.days)
+        newer_request_other_source = FactoryBot.create(:request, created_at: Time.zone.now)
 
-        requests = Request.for_edition(edition_id).most_recent_first
+        requests = Request.for_source(source_id).most_recent_first
 
-        expect(requests).to eq([newer_request_for_edition, older_request_for_edition])
-        expect(requests).not_to include(older_request_other_edition, newer_request_other_edition)
+        expect(requests).to eq([newer_request_for_source, older_request_for_source])
+        expect(requests).not_to include(older_request_other_source, newer_request_other_source)
       end
     end
 
-    describe ".most_recent_for_edition" do
-      it "returns the most recent request for the given edition ID" do
-        edition_id = SecureRandom.uuid
-        _older_request = FactoryBot.create(:request, edition_id: edition_id, created_at: Time.zone.now - 2.hours)
-        newer_request = FactoryBot.create(:request, edition_id: edition_id, created_at: Time.zone.now)
+    describe ".most_recent_for_source" do
+      it "returns the most recent request for the given source ID" do
+        source_id = SecureRandom.uuid
+        _older_request = FactoryBot.create(:request, source_id: source_id, created_at: Time.zone.now - 2.hours)
+        newer_request = FactoryBot.create(:request, source_id: source_id, created_at: Time.zone.now)
 
-        request = Request.most_recent_for_edition(edition_id)
+        request = Request.most_recent_for_source source_id
 
         expect(request).to eq(newer_request)
       end
