Merge remote-tracking branch 'upstream/pull/4566'

diff --git a/app/models/redaction.rb b/app/models/redaction.rb
index f4eedde0a2daddb172843d910507494261c1b4ae..5e9e0decde935a87b1514e3a8ffec16085026b79 100644 (file)
--- a/app/models/redaction.rb
+++ b/app/models/redaction.rb
@@ -3,8 +3,8 @@
 # Table name: redactions
 #
 #  id                 :integer          not null, primary key
-#  title              :string
-#  description        :text
+#  title              :string           not null
+#  description        :text             not null
 #  created_at         :datetime
 #  updated_at         :datetime
 #  user_id            :bigint(8)        not null

diff --git a/db/migrate/20240307180830_add_check_constraint_to_redaction_title_and_description.rb b/db/migrate/20240307180830_add_check_constraint_to_redaction_title_and_description.rb
new file mode 100644 (file)
index 0000000..46de9e1
--- /dev/null
+++ b/db/migrate/20240307180830_add_check_constraint_to_redaction_title_and_description.rb
@@ -0,0 +1,24 @@
+class AddCheckConstraintToRedactionTitleAndDescription < ActiveRecord::Migration[7.1]
+  disable_ddl_transaction!
+
+  def up
+    Redaction.where(:title => nil).find_in_batches(:batch_size => 1000) do |redactions|
+      redactions.each do |r|
+        r.title = "Redaction #{r.id}"
+        r.save!(:validate => false)
+      end
+    end
+
+    Redaction.where(:description => nil).find_in_batches(:batch_size => 1000) do |redactions|
+      redactions.each { |r| r.update!(:description => "No description") }
+    end
+
+    add_check_constraint :redactions, "title IS NOT NULL", :name => "redaction_title_not_null", :validate => false
+    add_check_constraint :redactions, "description IS NOT NULL", :name => "redaction_description_not_null", :validate => false
+  end
+
+  def down
+    remove_check_constraint :redactions, :name => "redaction_title_not_null", :if_exists => true
+    remove_check_constraint :redactions, :name => "redaction_description_not_null", :if_exists => true
+  end
+end

diff --git a/db/migrate/20240307181018_validate_and_modify_redaction_title_and_description.rb b/db/migrate/20240307181018_validate_and_modify_redaction_title_and_description.rb
new file mode 100644 (file)
index 0000000..9df7016
--- /dev/null
+++ b/db/migrate/20240307181018_validate_and_modify_redaction_title_and_description.rb
@@ -0,0 +1,19 @@
+class ValidateAndModifyRedactionTitleAndDescription < ActiveRecord::Migration[7.1]
+  disable_ddl_transaction!
+
+  def up
+    validate_check_constraint :redactions, :name => "redaction_title_not_null"
+    validate_check_constraint :redactions, :name => "redaction_description_not_null"
+
+    change_column_null :redactions, :title, false
+    change_column_null :redactions, :description, false
+
+    remove_check_constraint :redactions, :name => "redaction_title_not_null"
+    remove_check_constraint :redactions, :name => "redaction_description_not_null"
+  end
+
+  def down
+    change_column_null :redactions, :title, true
+    change_column_null :redactions, :description, true
+  end
+end

diff --git a/db/structure.sql b/db/structure.sql
index a41cb6991f5715054451e17c74a9a0202da8d78e..294fda4c8f503e9472bbf1db16f2d3b1c462c8e0 100644 (file)
--- a/db/structure.sql
+++ b/db/structure.sql
@@ -1304,8 +1304,8 @@ ALTER SEQUENCE public.oauth_tokens_id_seq OWNED BY public.oauth_tokens.id;
 
 CREATE TABLE public.redactions (
     id integer NOT NULL,
-    title character varying,
-    description text,
+    title character varying NOT NULL,
+    description text NOT NULL,
     created_at timestamp without time zone,
     updated_at timestamp without time zone,
     user_id bigint NOT NULL,
@@ -3512,6 +3512,8 @@ INSERT INTO "schema_migrations" (version) VALUES
 ('23'),
 ('22'),
 ('21'),
+('20240307181018'),
+('20240307180830'),
 ('20240228205723'),
 ('20240117185445'),
 ('20231213182102'),
@@ -3597,3 +3599,4 @@ INSERT INTO "schema_migrations" (version) VALUES
 ('11'),
 ('10'),
 ('1');
+

diff --git a/test/models/redaction_test.rb b/test/models/redaction_test.rb
index 00133f1f48a70c14bde549f89699359f81805f47..4aa37f49228cfa9a2abda9a605cafd45b8d38775 100644 (file)
--- a/test/models/redaction_test.rb
+++ b/test/models/redaction_test.rb
@@ -33,4 +33,16 @@ class RedactionTest < ActiveSupport::TestCase
     assert_predicate(node_v1, :redacted?, "Expected node version 1 to be redacted after redact! call.")
     assert_not_predicate(node_v2, :redacted?, "Expected node version 2 to not be redacted after redact! call.")
   end
+
+  def test_invalid_with_empty_title
+    redaction = build(:redaction, :title => "")
+    assert_not redaction.valid?
+    assert_includes redaction.errors.messages[:title], "can't be blank"
+  end
+
+  def test_invalid_with_empty_description
+    redaction = build(:redaction, :description => "")
+    assert_not redaction.valid?
+    assert_includes redaction.errors.messages[:description], "can't be blank"
+  end
 end