change validation and do not destroy declarations

app/services/applications/revert_to_pending.rb

@@ -1,6 +1,6 @@
 module Applications
   class RevertToPending
-    REMOVEABLE_DECLARATION_STATES = %w[submitted voided ineligible].freeze
+    REVERTABLE_DECLARATION_STATES = %w[voided ineligible awaiting_clawback clawed_back].freeze
 
     include ActiveModel::Model
     include ActiveModel::Attributes
@@ -20,7 +20,6 @@ def revert
 
       Application.transaction do
         application.application_states.destroy_all
-        application.declarations.destroy_all
         application.funded_place = nil
         application.pending_lead_provider_approval_status!
 
@@ -31,7 +30,7 @@ def revert
   private
 
     def application_has_no_unremoveable_declarations
-      if application.declarations.where.not(state: REMOVEABLE_DECLARATION_STATES).any?
+      if application.declarations.where.not(state: REVERTABLE_DECLARATION_STATES).any?
         errors.add :base, :pending_unremoveable_declarations
       end
     end

spec/services/applications/revert_to_pending_spec.rb

@@ -84,7 +84,7 @@
     context "when status set to no" do
       let :application do
         create(:application, :accepted, funded_place: true).tap do |application|
-          create(:declaration, :submitted, application:)
+          create(:declaration, :voided, application:)
           create(:application_state, application:)
         end
       end
@@ -115,7 +115,7 @@
     context "when already pending" do
       let :application do
         create(:application, :pending, funded_place: true).tap do |application|
-          create(:declaration, :submitted, application:)
+          create(:declaration, :voided, application:)
           create(:application_state, application:)
         end
       end
@@ -141,9 +141,9 @@
       end
     end
 
-    context "when Application already has declarations" do
-      %i[submitted voided ineligible].each do |declaration_state|
-        context "with #{declaration_state} state" do
+    context "when application already has declarations" do
+      %i[voided ineligible awaiting_clawback clawed_back].each do |declaration_state|
+        context "with a revertable state: #{declaration_state}" do
           let(:application) { create(:declaration, declaration_state).application }
 
           it "returns true" do
@@ -155,13 +155,13 @@
               .to change { application.reload.lead_provider_approval_status }
                   .from("accepted")
                   .to("pending")
-              .and change { application.declarations.count }.to(0)
+              .and(not_change { application.declarations.count })
           end
         end
       end
 
-      %i[eligible payable paid awaiting_clawback clawed_back].each do |declaration_state|
-        context "with #{declaration_state} state" do
+      Declaration.states.keys.excluding(%w[voided ineligible awaiting_clawback clawed_back]).each do |declaration_state|
+        context "with a state that cannot be reverted: #{declaration_state}" do
           let(:application) { create(:declaration, declaration_state).application }
 
           it "returns false" do

spec/services/bulk_operation/bulk_change_applications_to_pending_spec.rb

@@ -40,7 +40,7 @@
       it_behaves_like "changes to pending", "rejected"
     end
 
-    %i[submitted voided ineligible].each do |state|
+    Applications::RevertToPending::REVERTABLE_DECLARATION_STATES.each do |state|
       context "when the application has #{state} declarations" do
         let(:declaration) { create(:declaration, state) }
 
@@ -75,7 +75,7 @@
       it { expect(run[application_ecf_id]).to eq("Not found") }
     end
 
-    Declaration.states.keys.excluding("submitted", "voided", "ineligible").each do |state|
+    Declaration.states.keys.excluding(Applications::RevertToPending::REVERTABLE_DECLARATION_STATES).each do |state|
       context "when the application has #{state} declarations" do
         let(:declaration) { create(:declaration, state) }
         let(:application) { declaration.application }