FFS-4592: Fix NSC test scenarios in launcher

app/app/controllers/launcher_controller.rb

@@ -377,6 +377,7 @@ def render_launcher_error(message)
     "lynette" => { first_name: "Lynette", last_name: "Oyola", date_of_birth: "1988-10-24" },
     "rick" => { first_name: "Rick", last_name: "Banas", date_of_birth: "1979-08-18" },
     "dominique" => { first_name: "Dominique", last_name: "Ricardo", date_of_birth: "1978-01-12" },
+    "scott" => { first_name: "Scott", last_name: "Tobin", date_of_birth: "1998-02-03" },
     "linda" => { first_name: "Linda", last_name: "Cooper", date_of_birth: "1999-01-01" }
   }.freeze
 

app/app/jobs/application_job.rb

@@ -1,9 +1,17 @@
 class ApplicationJob < ActiveJob::Base
   class SilencedError < StandardError; end
 
+  NON_RETRYABLE_ERRORS = [
+    NameError,
+    TypeError,
+    ArgumentError,
+    ActiveRecord::RecordInvalid
+  ].freeze
+
   around_perform :with_error_reporting
 
   retry_on Exception, wait: :polynomially_longer, attempts: 5
+  retry_on(*NON_RETRYABLE_ERRORS, attempts: 1)
 
   class_attribute :max_attempts, default: 5
 

app/app/models/education_activity.rb

@@ -131,9 +131,7 @@ def document_upload_header_title_i18n_key
   def document_upload_terms_to_verify
     return [] unless partially_self_attested?
 
-    nsc_enrollment_terms
-      .select(&:enrollment_less_than_half_time?)
-      .sort_by { |term| [ term.term_begin || Date.new(1900, 1, 1), term.term_end || Date.new(1900, 1, 1), term.school_name.to_s ] }
+    less_than_half_time_terms_in_reporting_window
   end
 
   def document_upload_term_credit_hours(term)

app/app/services/education_activity_card_builder.rb

@@ -71,9 +71,12 @@ def validated_month_data(month_start:, effective_term:)
   end
 
   def partial_self_attested_month_data(term:, month_start:)
+    credit_hours = @activity.review_term_credit_hours(term)
     {
       month: month_start,
-      enrollment_status: term.enrollment_status_display
+      enrollment_status: term.enrollment_status_display,
+      credit_hours: credit_hours,
+      community_engagement_hours: @activity.community_engagement_hours(credit_hours)
     }
   end
 

app/app/services/launcher/nsc_forward_dating_service.rb

@@ -1,9 +1,10 @@
 class Launcher::NscForwardDatingService
-  LAUNCHER_SCENARIO_KEYS = %w[lynette rick dominique linda].freeze
+  LAUNCHER_SCENARIO_KEYS = %w[lynette rick dominique scott linda].freeze
   # These dates match each persona's latest term end so NSC reports them as currently enrolled before forward-dating.
   LAUNCHER_AS_OF_DATES = {
     "lynette" => Date.new(2024, 11, 19),
-    "rick" => Date.new(2024, 11, 29)
+    "rick" => Date.new(2024, 11, 29),
+    "dominique" => Date.new(2024, 5, 9)
   }.freeze
 
   def self.applicable?(education_activity)
@@ -37,13 +38,10 @@ def launcher_as_of_date
   end
 
   def forward_dated_response(response)
-    latest_term_end = Array(response["enrollmentDetails"])
-      .flat_map { |detail| Array(detail["enrollmentData"]) }
-      .filter_map { |term| term["termEndDate"].presence && Date.parse(term["termEndDate"]) }
-      .max
-    return response unless latest_term_end
+    anchor_term_end = anchor_term_end_for(response)
+    return response unless anchor_term_end
 
-    delta_days = (@education_activity.activity_flow.reporting_window_range.max - latest_term_end).to_i
+    delta_days = (@education_activity.activity_flow.reporting_window_range.max - anchor_term_end).to_i
     transformed_response = response.deep_dup
 
     Array(transformed_response["enrollmentDetails"]).each do |detail|
@@ -56,6 +54,18 @@ def forward_dated_response(response)
     transformed_response
   end
 
+  def anchor_term_end_for(response)
+    term_ends = Array(response["enrollmentDetails"])
+      .flat_map { |detail| Array(detail["enrollmentData"]) }
+      .filter_map { |term| term["termEndDate"].presence && Date.parse(term["termEndDate"]) }
+    return if term_ends.empty?
+
+    as_of_date = launcher_as_of_date
+    return term_ends.max if as_of_date.blank?
+
+    term_ends.select { |term_end| term_end <= as_of_date }.max || term_ends.max
+  end
+
   def shift_date_string(date_str, delta_days)
     return date_str if date_str.blank?
 

app/app/services/nsc_data_fetcher_service.rb

@@ -66,19 +66,23 @@ def update_education_activity(education_activity, response_data)
   def save_enrollment_terms(enrollment_details)
     activity_flow = @education_activity.activity_flow
 
+    identity = activity_flow.identity
+
     enrollment_details.each do |enrollment_detail|
       next unless enrollment_detail["currentEnrollmentStatus"] == CURRENTLY_ENROLLED
 
+      name_on_school_record = enrollment_detail["nameOnSchoolRecord"] || {}
+
       enrollment_detail["enrollmentData"].each do |enrollment_data|
         term_begin = Date.parse(enrollment_data["termBeginDate"])
         term_end = Date.parse(enrollment_data["termEndDate"])
         next unless activity_flow.within_reporting_window?(term_begin, term_end)
 
         @education_activity.nsc_enrollment_terms.create!(
           school_name: enrollment_detail["officialSchoolName"],
-          first_name: enrollment_detail["nameOnSchoolRecord"]["firstName"],
-          middle_name: enrollment_detail["nameOnSchoolRecord"]["middleName"],
-          last_name: enrollment_detail["nameOnSchoolRecord"]["lastName"],
+          first_name: name_on_school_record["firstName"] || identity&.first_name,
+          middle_name: name_on_school_record["middleName"],
+          last_name: name_on_school_record["lastName"] || identity&.last_name,
           enrollment_status: enrollment_status(enrollment_data),
           term_begin: term_begin,
           term_end: term_end,

app/app/views/activities/activities/index.html.erb

@@ -156,9 +156,10 @@
                   <div class="activity-month-details__data">
                     <% if month_data[:enrollment_status].present? %>
                       <p class="margin-y-0"><%= t("activities.hub.cards.enrollment_status", status: month_data[:enrollment_status]) %></p>
-                    <% else %>
-                      <p class="margin-y-0"><%= t("activities.hub.cards.credit_hours", amount: month_data[:credit_hours]) %></p>
-                      <p class="margin-y-0"><%= t("activities.hub.cards.hours", count: month_data[:community_engagement_hours]) %></p>
+                    <% end %>
+                    <% if month_data[:credit_hours].present? %>
+                      <p class="margin-y-0"><%= t("activities.hub.cards.credit_hours", amount: format_decimal_amount(month_data[:credit_hours])) %></p>
+                      <p class="margin-y-0"><%= t("activities.hub.cards.hours", count: format_decimal_amount(month_data[:community_engagement_hours])) %></p>
                     <% end %>
                   </div>
                 </div>

app/app/views/launcher/advanced.html.erb

@@ -105,13 +105,24 @@
                      data-reporting-window-months="2">
               <label class="usa-radio__label" for="test_scenario_dominique">
                 <strong>Dominique Ricardo</strong>
-                <span class="advanced-launcher__scenario-desc">Not currently enrolled (enrollments outside window)</span>
+                <span class="advanced-launcher__scenario-desc">Enrolled full time (1 school)</span>
+              </label>
+            </div>
+            <div class="usa-radio">
+              <input class="usa-radio__input usa-radio__input--tile" type="radio"
+                     name="test_scenario" id="test_scenario_scott" value="scott"
+                     data-action="advanced-launcher#selectScenario"
+                     data-reporting-window-months="2">
+              <label class="usa-radio__label" for="test_scenario_scott">
+                <strong>Scott Tobin</strong>
+                <span class="advanced-launcher__scenario-desc">Not currently enrolled (enrollment older than 18 months)</span>
               </label>
             </div>
             <div class="usa-radio">
               <input class="usa-radio__input usa-radio__input--tile" type="radio"
                      name="test_scenario" id="test_scenario_linda" value="linda"
-                     data-action="advanced-launcher#selectScenario">
+                     data-action="advanced-launcher#selectScenario"
+                     data-reporting-window-months="2">
               <label class="usa-radio__label" for="test_scenario_linda">
                 <strong>Linda Cooper</strong>
                 <span class="advanced-launcher__scenario-desc">No NSC record found</span>

app/app/views/launcher/launcher.html.erb

@@ -4,7 +4,7 @@
      data-launcher-flow-value="activity"
      data-launcher-window-value="application"
      data-launcher-months-value="2"
-     data-launcher-status-value="lynette">
+     data-launcher-status-value="dominique">
   <%= form_with(url: "/launcher", method: :post, html: { class: "launcher__main", autocomplete: "off" }, data: { turbo: false, launcher_target: "form" }) do |f| %>
     <div class="launcher__title">
       <h1>Emmy launcher</h1>
@@ -17,7 +17,7 @@
     <%= hidden_field_tag :flow_type, "activity", data: { launcher_target: "flowInput" } %>
     <%= hidden_field_tag :reporting_window, "application", data: { launcher_target: "windowInput" } %>
     <%= hidden_field_tag :reporting_window_months, "2", data: { launcher_target: "monthsInput" } %>
-    <%= hidden_field_tag :test_scenario, "lynette", data: { launcher_target: "statusInput" } %>
+    <%= hidden_field_tag :test_scenario, "dominique", data: { launcher_target: "statusInput" } %>
 
     <div class="launcher__step">
       <div class="launcher__step-header">
@@ -162,15 +162,16 @@
       </div>
       <div class="launcher__radio-col">
         <% [
-             [ "lynette",                             "Enrolled full time",           "Full-time enrollment verified automatically via the National Student Clearinghouse." ],
-             [ "renewal_half_time_last_4_of_6_avery", "Enrolled half-time",           "Half-time enrollment covering 4 of 6 months (good for renewal required-month testing)." ],
-             [ "partial_enrollment_maya",             "Enrolled less-than-half-time", "Less-than-half-time enrollment (sends user through partially self-attested flow)." ],
-             [ "linda",                               "No NSC enrollment found",      "Enrollment unable to be verified via NSC (sends user through self-attestation flow)." ]
+             [ "dominique",                           "Enrolled full time",              "Full-time enrollment verified automatically via the National Student Clearinghouse." ],
+             [ "renewal_half_time_last_4_of_6_avery", "Enrolled half-time",              "Half-time enrollment covering 4 of 6 months (good for renewal required-month testing)." ],
+             [ "partial_enrollment_maya",             "Enrolled less-than-half-time",    "Less-than-half-time enrollment (sends user through partially self-attested flow)." ],
+             [ "lynette",                             "Enrolled, intensity not reported", "NSC confirms enrollment but reports no intensity (asks the user for credit hours)." ],
+             [ "linda",                               "No NSC enrollment found",         "Enrollment unable to be verified via NSC (sends user through self-attestation flow)." ]
            ].each do |value, title, desc| %>
-          <div class="launcher__rcard <%= "launcher__rcard--selected" if value == "lynette" %>"
+          <div class="launcher__rcard <%= "launcher__rcard--selected" if value == "dominique" %>"
                role="radio"
                tabindex="0"
-               aria-checked="<%= value == "lynette" %>"
+               aria-checked="<%= value == "dominique" %>"
                data-launcher-target="statusCard"
                data-value="<%= value %>"
                data-action="click->launcher#selectStatus keydown.enter->launcher#selectStatus keydown.space->launcher#selectStatus">

app/spec/controllers/activities/activities_controller_spec.rb

@@ -648,16 +648,16 @@
       get :index
     end
 
-    it "shows only enrollment status on the education card" do
+    it "shows enrollment status alongside credit hours on the education card" do
       expect(response.body).to include("Test University")
       expect(response.body).to include(
         I18n.t(
           "activities.hub.cards.enrollment_status",
           status: I18n.t("components.enrollment_term_table_component.status.less_than_half_time")
         )
       )
-      expect(response.body).not_to include(I18n.t("activities.hub.cards.credit_hours", amount: 4))
-      expect(response.body).not_to include(I18n.t("activities.hub.cards.hours", count: 52))
+      expect(response.body).to include(I18n.t("activities.hub.cards.credit_hours", amount: 4))
+      expect(response.body).to include(I18n.t("activities.hub.cards.hours", count: 52))
       expect(response.body).not_to include(I18n.t("activities.hub.empty.education"))
     end
 
@@ -719,8 +719,8 @@
           status: I18n.t("components.enrollment_term_table_component.status.less_than_half_time")
         )
       ).length).to eq(2)
-      expect(response.body).not_to include(I18n.t("activities.hub.cards.credit_hours", amount: 3))
-      expect(response.body).not_to include(I18n.t("activities.hub.cards.credit_hours", amount: 5))
+      expect(response.body).to include(I18n.t("activities.hub.cards.credit_hours", amount: 3))
+      expect(response.body).to include(I18n.t("activities.hub.cards.credit_hours", amount: 5))
     end
   end
 

app/spec/controllers/activities/document_uploads_controller_spec.rb

@@ -14,6 +14,7 @@
       reporting_window_months: 1
     )
   end
+  let(:reporting_window) { activity_flow.reporting_window_range }
 
   before do
     Rails.application.config.active_storage.service = :local
@@ -159,8 +160,8 @@
       term = create_partial_term(
         activity: partial_education_activity,
         school_name: "University of Illinois",
-        term_begin: Date.new(2026, 1, 5),
-        term_end: Date.new(2026, 5, 15)
+        term_begin: reporting_window.begin,
+        term_end: reporting_window.end
       )
 
       get :new, params: { education_id: partial_education_activity.id }
@@ -174,14 +175,14 @@
       create_partial_term(
         activity: partial_education_activity,
         school_name: "University A",
-        term_begin: Date.new(2026, 1, 5),
-        term_end: Date.new(2026, 5, 15)
+        term_begin: reporting_window.begin,
+        term_end: reporting_window.end
       )
       create_partial_term(
         activity: partial_education_activity,
         school_name: "College B",
-        term_begin: Date.new(2026, 1, 10),
-        term_end: Date.new(2026, 5, 20)
+        term_begin: reporting_window.begin,
+        term_end: reporting_window.end
       )
 
       get :new, params: { education_id: partial_education_activity.id }

app/spec/controllers/launcher_controller_advanced_spec.rb

@@ -45,13 +45,26 @@
       expect(rendered).to include('Rick Banas')
       expect(rendered).to match(/Enrolled half-time.*2 schools/)
       expect(rendered).to include('Dominique Ricardo')
+      expect(rendered).to match(/Enrolled full time.*1 school/)
+      expect(rendered).to include('Scott Tobin')
       expect(rendered).to include('Not currently enrolled')
       expect(rendered).to include('Linda Cooper')
       expect(rendered).to include('No NSC record found')
       expect(rendered).to include('Sam Testuser')
       expect(rendered).to include('Ziggy Testuser')
     end
 
+    it "gives every NSC test scenario a reporting window so selecting one does not leave a stale months pill", :aggregate_failures do
+      get :advanced
+      rendered = response.body
+
+      %w[lynette rick dominique scott linda].each do |scenario_key|
+        radio = rendered[/<input[^>]*id="test_scenario_#{scenario_key}"[^>]*>/]
+        expect(radio).to be_present, "expected a radio for #{scenario_key}"
+        expect(radio).to include('data-reporting-window-months'), "expected #{scenario_key} to set reporting window months"
+      end
+    end
+
     it "displays fake test scenario options with single and multi-term" do
       get :advanced
       rendered = response.body
@@ -649,6 +662,7 @@
       it_behaves_like "creates CbvApplicant with correct data", "lynette", "Lynette", "Oyola", "1988-10-24"
       it_behaves_like "creates CbvApplicant with correct data", "rick", "Rick", "Banas", "1979-08-18"
       it_behaves_like "creates CbvApplicant with correct data", "dominique", "Dominique", "Ricardo", "1978-01-12"
+      it_behaves_like "creates CbvApplicant with correct data", "scott", "Scott", "Tobin", "1998-02-03"
       it_behaves_like "creates CbvApplicant with correct data", "linda", "Linda", "Cooper", "1999-01-01"
 
       it "creates an ActivityFlowInvitation and redirects to its URL" do

app/spec/controllers/launcher_controller_spec.rb

@@ -63,13 +63,23 @@
       expect(body).to include("Enrolled full time")
       expect(body).to include("Enrolled half-time")
       expect(body).to include("Enrolled less-than-half-time")
+      expect(body).to include("Enrolled, intensity not reported")
       expect(body).to include("No NSC enrollment found")
-      expect(body).to include('value="lynette"')
+      expect(body).to include('value="dominique"')
       expect(body).to include('value="renewal_half_time_last_4_of_6_avery"')
       expect(body).to include('value="partial_enrollment_maya"')
+      expect(body).to include('value="lynette"')
       expect(body).to include('value="linda"')
     end
 
+    it "preselects the full-time scenario as the default student status" do
+      get :launcher
+      body = response.body
+      expect(body).to include('data-launcher-status-value="dominique"')
+      expect(body).to match(/launcher__rcard--selected[^>]*data-value="dominique"/)
+      expect(body).to match(/name="test_scenario"[^>]*value="dominique"/)
+    end
+
     it "renders the launch buttons posting to /launcher" do
       get :launcher
       body = response.body

app/spec/factories/identity.rb

@@ -34,5 +34,11 @@
       last_name { "Ricardo" }
       date_of_birth { "1978-01-12" }
     end
+
+    trait :nsc_scott do
+      first_name { "Scott" }
+      last_name { "Tobin" }
+      date_of_birth { "1998-02-03" }
+    end
   end
 end