Merge pull request #1205 from Crown-Commercial-Service/feature/nrmi-177-delete-validation-failed-submission-entries-when-resolved

NRMI-177

Author: reemi1510

app/models/submission.rb

@@ -1,5 +1,8 @@
 class Submission < ApplicationRecord
   ERRORED_ROW_LIMIT = 10
+  REPLACEMENT_STATES = %i[validation_failed ingest_failed in_review completed].freeze
+
+  after_save :cleanup_prev_failed_entries, if: :state_changed_to_replacement?
 
   include AASM
 
@@ -123,6 +126,17 @@ def call_workday(workday_reference)
 
   private
 
+  def cleanup_prev_failed_entries
+    task.submissions.where(aasm_state: 'validation_failed').where.not(id: id).find_each do |s|
+      s.entries.destroy_all
+      s.staging_entries.destroy_all
+    end
+  end
+
+  def state_changed_to_replacement?
+    saved_change_to_aasm_state? && REPLACEMENT_STATES.include?(aasm_state.to_sym)
+  end
+
   def enqueue_reversal_invoice_creation_job(user)
     SubmissionReversalInvoiceCreationJob.perform_later(self, user)
   end

docker-compose.test.yml

@@ -27,7 +27,7 @@ services:
   db-test:
     image: postgres
     volumes:
-      - pg_test_data:/var/lib/postgresql/data/:cached
+      - test_data:/var/lib/postgresql/data/:cached
     networks:
       - tests
     restart: on-failure
@@ -39,5 +39,5 @@ networks:
   tests:
 
 volumes:
-  pg_test_data: {}
+  test_data: {}
   node_modules:

docker-compose.yml

@@ -56,7 +56,7 @@ services:
   db:
     image: postgres
     volumes:
-      - pg_data:/var/lib/postgresql/data/:cached
+      - data:/var/lib/postgresql/data/:cached
     restart: on-failure
     container_name: "data-submission-service-api_db"
     networks:
@@ -72,7 +72,7 @@ services:
       private:
 
 volumes:
-  pg_data: {}
+  data: {}
   node_modules:
 
 networks:

spec/models/submission_spec.rb

@@ -10,6 +10,20 @@
   it { is_expected.to have_many(:files) }
   it { is_expected.to have_many(:entries) }
 
+  describe 'replacing a validation_failed submission' do
+    let(:task) { FactoryBot.create(:task) }
+    let!(:failed_submission) { FactoryBot.create(:submission_with_invalid_entries, task: task) }
+
+    Submission::REPLACEMENT_STATES.each do |new_state|
+      it "deletes entries and staging entries for the failed submission when the new state is #{new_state}" do
+        FactoryBot.create(:submission, aasm_state: new_state, task: task)
+
+        expect(failed_submission.entries.reload).to be_empty
+        expect(failed_submission.staging_entries.reload).to be_empty
+      end
+    end
+  end
+
   describe '#ready_for_review state machine event' do
     it 'transitions from processing to in_review, with a valid submission' do
       submission = FactoryBot.create(:submission_with_validated_entries, aasm_state: :processing)