Will/appeals 63607

app/models/request_issues_update_event.rb

@@ -94,6 +94,7 @@ def process_withdrawn_issues!
   end
 
   # rubocop:disable Metrics/MethodLength
+  # rubocop:disable Metrics/AbcSize
   def update_request_issue!(request_issue, parser_issue)
     request_issue.update(
       ineligible_reason: parser_issue.ri_ineligible_reason,
@@ -124,10 +125,12 @@ def update_request_issue!(request_issue, parser_issue)
       untimely_exemption: parser_issue.ri_untimely_exemption,
       untimely_exemption_notes: parser_issue.ri_untimely_exemption_notes,
       benefit_type: parser_issue.ri_benefit_type,
-      veteran_participant_id: parser_issue.ri_veteran_participant_id
+      veteran_participant_id: parser_issue.ri_veteran_participant_id,
+      end_product_establishment_id: @epe&.id || request_issue.end_product_establishment_id
     )
   end
   # rubocop:enable Metrics/MethodLength
+  # rubocop:enable Metrics/AbcSize
 
   # Set the closed_at date and closed_status for removed issues based on the event data
   def update_removed_issues!

spec/feature/intake/higher_level_review/edit_spec.rb

@@ -431,6 +431,37 @@
       end
     end
 
+    it "verifies we can return to the edit page when we have an ineligible issue along with past decisions" do
+      visit "higher_level_reviews/#{ep_claim_id}/edit"
+
+      number_of_issues = 8
+      expect(page).to have_content("#{number_of_issues} issues")
+
+      ri_legacy_issue_not_withdrawn_num = find_intake_issue_number_by_text(
+        ri_legacy_issue_not_withdrawn.contention_text
+      )
+      expect_ineligible_issue(ri_legacy_issue_not_withdrawn_num)
+      click_intake_add_issue
+      click_intake_no_matching_issues
+      add_intake_nonrating_issue(
+        category: "Active Duty Adjustments",
+        description: untimely_request_issue.contention_text,
+        date: "06/20/2021",
+        legacy_issues: true
+      )
+
+      expect(page).to have_text("Service connection, rheumatoid arthritis")
+
+      find("label", text: "Service connection, rheumatoid arthritis").click
+      safe_click ".add-issue"
+
+      safe_click("#button-submit-update")
+      safe_click ".confirm"
+      expect(page).to have_no_content("Something went wrong")
+      visit "higher_level_reviews/#{ep_claim_id}/edit"
+      expect(page).to have_no_content("Something went wrong")
+    end
+
     it "re-applies eligibility check on remove/re-add of ineligible issue" do
       visit "higher_level_reviews/#{ep_claim_id}/edit"
 

spec/models/request_issues_update_event_spec.rb

@@ -25,6 +25,8 @@
       allow(parser).to receive(:ineligible_to_ineligible_issues).and_return([])
       allow(parser).to receive(:end_product_establishment_last_synced_at).and_return(last_synced_at)
       allow(parser).to receive(:end_product_establishment_code).and_return("some_end_product_code")
+      allow(parser).to receive(:end_product_establishment_reference_id)
+        .and_return(EndProductEstablishment.last.reference_id)
       allow(parser).to receive(:veteran_participant_id).and_return("some_participant_id")
     end
   end
@@ -35,17 +37,17 @@
       allow(issue).to receive(:ri_original_caseflow_request_issue_id).and_return(nil)
       allow(issue).to receive(:ri_benefit_type).and_return("some_benefit_type")
       allow(issue).to receive(:ri_closed_at).and_return(last_synced_at)
-      allow(issue).to receive(:ri_closed_status).and_return("some_status")
+      allow(issue).to receive(:ri_closed_status).and_return(:ineligible)
       allow(issue).to receive(:ri_contested_issue_description).and_return("some_description")
-      allow(issue).to receive(:ri_contention_reference_id).and_return("some_contention_id")
+      allow(issue).to receive(:ri_contention_reference_id).and_return(26)
       allow(issue).to receive(:ri_contested_rating_issue_diagnostic_code).and_return("some_diagnostic_code")
       allow(issue).to receive(:ri_contested_rating_decision_reference_id).and_return("some_decision_id")
       allow(issue).to receive(:ri_contested_rating_issue_profile_date).and_return(Time.zone.today)
       allow(issue).to receive(:ri_contested_rating_issue_reference_id).and_return("some_issue_id")
       allow(issue).to receive(:ri_contested_decision_issue_id).and_return(nil)
       allow(issue).to receive(:ri_decision_date).and_return(Time.zone.today)
-      allow(issue).to receive(:ri_ineligible_due_to_id).and_return("some_ineligible_id")
-      allow(issue).to receive(:ri_ineligible_reason).and_return("some_reason")
+      allow(issue).to receive(:ri_ineligible_due_to_id).and_return(RequestIssue.first.id)
+      allow(issue).to receive(:ri_ineligible_reason).and_return(:untimely)
       allow(issue).to receive(:ri_is_unidentified).and_return(false)
       allow(issue).to receive(:ri_unidentified_issue_text).and_return("some_text")
       allow(issue).to receive(:ri_nonrating_issue_category).and_return("some_category")
@@ -57,9 +59,10 @@
       allow(issue).to receive(:ri_untimely_exemption).and_return(false)
       allow(issue).to receive(:ri_untimely_exemption_notes).and_return("some_notes")
       allow(issue).to receive(:ri_vacols_id).and_return("some_vacols_id")
-      allow(issue).to receive(:ri_vacols_sequence_id).and_return("some_sequence_id")
+      allow(issue).to receive(:ri_vacols_sequence_id).and_return(453)
       allow(issue).to receive(:ri_type).and_return("some_type")
       allow(issue).to receive(:ri_edited_description).and_return("Edited description")
+      allow(issue).to receive(:ri_veteran_participant_id).and_return("some_participant_id")
     end
   end
 
@@ -353,4 +356,98 @@
       expect(subject.processed_at).to eq(parser.end_product_establishment_last_synced_at)
     end
   end
+
+  describe "#update_request_issue!" do
+    context "when epe is nil" do
+      it "does not update end_product_establishment_id with epe id" do
+        request_issue = existing_request_issue
+        event = described_class.new(
+          review: review,
+          user: user,
+          parser: parser,
+          event: event,
+          epe: nil
+        )
+        expect(request_issue.end_product_establishment_id).to eq(request_issue.end_product_establishment_id)
+        event.update_request_issue!(request_issue, parser_issue)
+
+        request_issue.reload
+        expect(request_issue.end_product_establishment_id).to eq(request_issue.end_product_establishment_id)
+      end
+    end
+
+    context "when epe is provided" do
+      it "updates end_product_establishment_id with epe id" do
+        request_issue = existing_request_issue
+
+        event = described_class.new(
+          review: review,
+          user: user,
+          parser: parser,
+          event: event,
+          epe: epe
+        )
+        expect(request_issue.end_product_establishment_id).not_to eq(epe.id)
+        event.update_request_issue!(request_issue, parser_issue)
+
+        request_issue.reload
+        expect(request_issue.end_product_establishment_id).to eq(epe.id)
+      end
+    end
+
+    context "confirm request issue" do
+      it "is updated with passed in data for all attributes" do
+        request_issue = existing_request_issue
+
+        event = described_class.new(
+          review: review,
+          user: user,
+          parser: parser,
+          event: event,
+          epe: epe
+        )
+        event.update_request_issue!(request_issue, parser_issue)
+
+        request_issue.reload
+        expect(request_issue.end_product_establishment_id).to eq(epe.id)
+        expect(request_issue.ineligible_reason).to eq(parser_issue.ri_ineligible_reason.to_s)
+        expect(request_issue.closed_at).to eq(parser_issue.ri_closed_at.to_s)
+        expect(request_issue.closed_status).to eq(parser_issue.ri_closed_status.to_s)
+        expect(request_issue.contested_issue_description).to eq(parser_issue.ri_contested_issue_description.to_s)
+        expect(request_issue.nonrating_issue_category).to eq(parser_issue.ri_nonrating_issue_category.to_s)
+        expect(request_issue.nonrating_issue_description).to eq(parser_issue.ri_nonrating_issue_description.to_s)
+        expect(request_issue.contention_updated_at).to eq(parser.end_product_establishment_last_synced_at.to_s)
+        expect(request_issue.contention_reference_id).to eq(parser_issue.ri_contention_reference_id)
+        expect(request_issue.contested_decision_issue_id).to eq(parser_issue.ri_contested_decision_issue_id)
+        expect(request_issue.contested_rating_issue_reference_id).to eq(
+          parser_issue.ri_contested_rating_issue_reference_id.to_s
+        )
+        expect(request_issue.contested_rating_issue_diagnostic_code).to eq(
+          parser_issue.ri_contested_rating_issue_diagnostic_code.to_s
+        )
+        expect(request_issue.contested_rating_decision_reference_id).to eq(
+          parser_issue.ri_contested_rating_decision_reference_id.to_s
+        )
+        expect(request_issue.contested_rating_issue_profile_date).to eq(
+          parser_issue.ri_contested_rating_issue_profile_date.to_s
+        )
+        expect(request_issue.nonrating_issue_bgs_source).to eq(parser_issue.ri_nonrating_issue_bgs_source.to_s)
+        expect(request_issue.nonrating_issue_bgs_id).to eq(parser_issue.ri_nonrating_issue_bgs_id.to_s)
+        expect(request_issue.unidentified_issue_text).to eq(parser_issue.ri_unidentified_issue_text.to_s)
+        expect(request_issue.vacols_sequence_id).to eq(parser_issue.ri_vacols_sequence_id)
+        expect(request_issue.ineligible_due_to_id).to eq(parser_issue.ri_ineligible_due_to_id)
+        expect(request_issue.reference_id).to eq(parser_issue.ri_reference_id)
+        expect(request_issue.rating_issue_associated_at).to eq(parser_issue.ri_rating_issue_associated_at.to_s)
+        expect(request_issue.edited_description).to eq(parser_issue.ri_edited_description.to_s)
+        expect(request_issue.ramp_claim_id).to eq(parser_issue.ri_ramp_claim_id)
+        expect(request_issue.vacols_id).to eq(parser_issue.ri_vacols_id)
+        expect(request_issue.decision_date.strftime("%Y-%m-%d")).to eq(parser_issue.ri_decision_date.to_s)
+        expect(request_issue.is_unidentified).to eq(parser_issue.ri_is_unidentified)
+        expect(request_issue.untimely_exemption).to eq(parser_issue.ri_untimely_exemption)
+        expect(request_issue.untimely_exemption_notes).to eq(parser_issue.ri_untimely_exemption_notes.to_s)
+        expect(request_issue.benefit_type).to eq(parser_issue.ri_benefit_type.to_s)
+        expect(request_issue.veteran_participant_id).to eq(parser_issue.ri_veteran_participant_id)
+      end
+    end
+  end
 end