[B] Allow accounts with ingestions to be deleted

api/app/models/concerns/tracked_creator.rb

@@ -3,7 +3,7 @@ module TrackedCreator
   extend ActiveSupport::Concern
 
   included do
-    belongs_to :creator, class_name: "User", foreign_key: "creator_id"
+    belongs_to :creator, class_name: "User", foreign_key: "creator_id", optional: true
 
     delegate :name, to: :creator, prefix: true
   end

api/app/serializers/v1/annotation_serializer.rb

@@ -37,7 +37,7 @@ class AnnotationSerializer < ManifoldSerializer
       anonymous?(object, params)
     end
     typed_attribute :creator_name, Types::String.meta(read_only: true) do |object, params|
-      next object.creator.full_name if creator_identity_visible?(object, params)
+      next object.creator&.full_name if creator_identity_visible?(object, params)
 
       object.anonymous_label
     end

api/app/services/notifications/fetch_users_for_comment_notification.rb

@@ -20,7 +20,7 @@ def execute
 
     def excluded
       @excluded ||= [creator].tap do |out|
-        out << parent.creator if parent.present?
+        out << parent.creator if parent&.creator.present?
       end.compact
     end
   end

api/app/services/notifications/fetch_users_for_reply_notification.rb

@@ -10,17 +10,17 @@ class FetchUsersForReplyNotification < ActiveInteraction::Base
 
     def execute
       [].tap do |recipients|
-        recipients.push(parent.creator) if notify_parent_creator?
-        recipients.push(subject.creator) if notify_subject_creator?
+        recipients.push(parent.creator) if notify_parent_creator? && parent.creator.present?
+        recipients.push(subject.creator) if notify_subject_creator? && subject.creator.present?
       end
     end
 
     def notify_parent_creator?
-      parent.present? && !reply_to_self? && creator_wants_notification?(parent.creator)
+      parent.present? && !reply_to_self? && parent.creator.present? && creator_wants_notification?(parent.creator)
     end
 
     def notify_subject_creator?
-      on_annotation? && creator_wants_notification?(subject.creator)
+      on_annotation? && subject.creator && creator_wants_notification?(subject.creator)
     end
 
     private

api/app/views/notification_mailer/reply_notification.html.erb

@@ -1,5 +1,5 @@
 <div>
-  <%= @comment.creator.full_name %> replied to your comment on <a href="<%= @comment.subject_url %>"><%= @comment.title %></a>.
+  <%= @comment.creator&.full_name || "A deleted user" %> replied to your comment on <a href="<%= @comment.subject_url %>"><%= @comment.title %></a>.
 
   <p style="margin-top: 15px; margin-bottom: 0;">
     <em><%= @comment.body %></em>

api/app/views/notification_mailer/reply_notification.text.erb

@@ -1,4 +1,4 @@
-<%= @comment.creator.full_name %> replied to your comment on "<%= @comment.title %>."
+<%= @comment.creator&.full_name || "A deleted user" %> replied to your comment on "<%= @comment.title %>."
 
 -----------------------------------------------------------
 <%= @comment.body %>

api/db/migrate/20231129172116_adjust_user_key_constraints.rb

@@ -0,0 +1,9 @@
+class AdjustUserKeyConstraints < ActiveRecord::Migration[6.1]
+  def change
+
+    remove_foreign_key :ingestions, :users, column: :creator_id
+    add_foreign_key :ingestions, :users, column: :creator_id, on_delete: :nullify
+
+    change_column_null :ingestions, :creator_id, true
+  end
+end

api/db/structure.sql

@@ -1486,7 +1486,7 @@ CREATE TABLE public.ingestions (
     strategy character varying,
     external_source_url character varying,
     ingestion_type character varying,
-    creator_id uuid NOT NULL,
+    creator_id uuid,
     text_id uuid,
     project_id uuid NOT NULL,
     created_at timestamp without time zone NOT NULL,
@@ -6494,7 +6494,7 @@ ALTER TABLE ONLY public.reading_group_text_sections
 --
 
 ALTER TABLE ONLY public.ingestions
-    ADD CONSTRAINT fk_rails_a143919a1e FOREIGN KEY (creator_id) REFERENCES public.users(id) ON DELETE RESTRICT;
+    ADD CONSTRAINT fk_rails_a143919a1e FOREIGN KEY (creator_id) REFERENCES public.users(id) ON DELETE SET NULL;
 
 
 --
@@ -7125,6 +7125,7 @@ INSERT INTO "schema_migrations" (version) VALUES
 ('20230823232509'),
 ('20230921024546'),
 ('20231005175407'),
-('20231010184158');
+('20231010184158'),
+('20231129172116');
 
 

api/spec/models/annotation_spec.rb

@@ -78,9 +78,9 @@
     expect(@annotation).to be_valid
   end
 
-  it "invalid without a creator" do
+  it "is valid without a creator" do
     @annotation.creator = nil
-    expect(@annotation).to_not be_valid
+    expect(@annotation).to be_valid
   end
 
   it "enqueues a TEXT_ANNOTATED event on creation" do

api/spec/models/flag_spec.rb

@@ -15,11 +15,6 @@
   describe "is invalid when" do
     let(:flag) { FactoryBot.build(:flag) }
 
-    it "creator is nil" do
-      flag.creator = nil
-      expect(flag).to_not be_valid
-    end
-
     it "flaggable is nil" do
       flag.flaggable = nil
       expect(flag).to_not be_valid

api/spec/models/project_spec.rb

@@ -55,9 +55,9 @@
     expect(project).to be_valid
   end
 
-  it "is invalid without a creator" do
+  it "is valid without a creator" do
     project = FactoryBot.build(:project, creator: nil)
-    expect(project).to_not be_valid
+    expect(project).to be_valid
   end
 
   it "triggers an event on create" do

client/src/config/app/locale/en-US/json/frontend/forms.json

@@ -237,7 +237,7 @@
       },
       "delete": {
         "header": "Delete your account",
-        "description": "This will delete your entire account and record from our databases.",
+        "description": "This will delete your entire account and any annotations you created from our database. Projects and texts that you created will not be deleted. It is not possible to recover deleted accounts so proceed with caution.",
         "button_label": "Delete my account",
         "confirm_header": "Are you sure you want to delete your account?",
         "confirm_instructions": "Please enter your email to continue.",