department-of-veterans-affairs · HunJerBAH · May 29, 2024 · May 14, 2024 · May 14, 2024 · May 15, 2024
diff --git a/app/controllers/concerns/correspondence_controller_concern.rb b/app/controllers/concerns/correspondence_controller_concern.rb
@@ -8,20 +8,20 @@ module CorrespondenceControllerConcern
 
   MAX_QUEUED_ITEMS = 60
 
-  def process_tasks_if_applicable(mail_team_user, task_ids, tab)
+  def process_tasks_if_applicable(inbound_ops_team_user, task_ids, tab)
     # candidate for refactor using PATCH request
-    return unless mail_team_user && task_ids.present?
+    return unless inbound_ops_team_user && task_ids.present?
 
-    set_banner_params(mail_team_user, task_ids.count, tab)
-    update_tasks(mail_team_user, task_ids)
+    set_banner_params(inbound_ops_team_user, task_ids.count, tab)
+    update_tasks(inbound_ops_team_user, task_ids)
   end
 
-  def update_tasks(mail_team_user, task_ids)
+  def update_tasks(inbound_ops_team_user, task_ids)
     return unless @response_type == "success"
 
     tasks = Task.where(id: task_ids)
     tasks.update_all(
-      assigned_to_id: mail_team_user.id,
+      assigned_to_id: inbound_ops_team_user.id,
       assigned_to_type: "User",
       status: Constants.TASK_STATUSES.assigned
     )

diff --git a/app/controllers/correspondence_intake_controller.rb b/app/controllers/correspondence_intake_controller.rb
@@ -93,7 +93,7 @@ def user_can_work_intake(task)
 
   # redirect if no access
   def route_user
-    if current_user.mail_team_user?
+    if current_user.inbound_ops_team_user?
       redirect_to "/queue/correspondence"
     elsif current_user.inbound_ops_team_superuser? || current_user.mail_supervisor?
       redirect_to "/queue/correspondence/team"

diff --git a/app/controllers/correspondence_queue_controller.rb b/app/controllers/correspondence_queue_controller.rb
@@ -4,7 +4,7 @@ class CorrespondenceQueueController < CorrespondenceController
   def correspondence_cases
     if current_user.mail_supervisor?
       redirect_to "/queue/correspondence/team"
-    elsif current_user.inbound_ops_team_superuser? || current_user.mail_team_user?
+    elsif current_user.inbound_ops_team_superuser? || current_user.inbound_ops_team_user?
       intake_cancel_message(action_type) if %w[continue_later cancel_intake].include?(action_type)
       respond_to do |format|
         format.html {}
@@ -20,7 +20,7 @@ def correspondence_cases
   def correspondence_team
     if current_user.inbound_ops_team_superuser? || current_user.mail_supervisor?
       correspondence_team_response
-    elsif current_user.mail_team_user?
+    elsif current_user.inbound_ops_team_user?
       redirect_to "/queue/correspondence"
     else
       redirect_to "/unauthorized"
@@ -30,14 +30,14 @@ def correspondence_team
   private
 
   def correspondence_team_response
-    mail_team_user = User.find_by(css_id: params[:user].strip) if params[:user].present?
+    inbound_ops_team_user = User.find_by(css_id: params[:user].strip) if params[:user].present?
     task_ids = params[:task_ids]&.split(",") if params[:task_ids].present?
     tab = params[:tab] if params[:tab].present?
 
     respond_to do |format|
       format.html do
-        @mail_team_users = User.mail_team_users.pluck(:css_id)
-        correspondence_team_html_response(mail_team_user, task_ids, tab)
+        @inbound_ops_team_user = User.inbound_ops_team_user.pluck(:css_id)
+        correspondence_team_html_response(inbound_ops_team_user, task_ids, tab)
       end
       format.json { correspondence_team_json_response }
     end
@@ -47,10 +47,10 @@ def correspondence_team_json_response
     render json: { correspondence_config: CorrespondenceConfig.new(assignee: InboundOpsTeam.singleton) }
   end
 
-  def correspondence_team_html_response(mail_team_user, task_ids, tab)
-    if mail_team_user && task_ids.present?
+  def correspondence_team_html_response(inbound_ops_team_user, task_ids, tab)
+    if inbound_ops_team_user && task_ids.present?
       # candidate for refactor using PATCH request
-      process_tasks_if_applicable(mail_team_user, task_ids, tab)
+      process_tasks_if_applicable(inbound_ops_team_userr, task_ids, tab)
     elsif %w[continue_later cancel_intake].include?(action_type)
       intake_cancel_message(action_type)
     end

diff --git a/app/controllers/correspondence_review_package_controller.rb b/app/controllers/correspondence_review_package_controller.rb
@@ -2,7 +2,7 @@
 
 class CorrespondenceReviewPackageController < CorrespondenceController
   def review_package
-    @mail_team_users = User.mail_team_users.select(:css_id).pluck(:css_id)
+    @inbound_ops_team_user = User.inbound_ops_team_user.select(:css_id).pluck(:css_id)
   end
 
   def package_documents

diff --git a/app/models/tasks/correspondence_task.rb b/app/models/tasks/correspondence_task.rb
@@ -18,7 +18,11 @@ def self.package_action_task_names
       ReassignPackageTask.name,
       RemovePackageTask.name,
       SplitPackageTask.name,
-      MergePackageTask.name
+      MergePackageTask.name,
+      CorrespondenceIntakeTask.name,
+      CorrespondenceRootTask.name,
+      EfolderUploadFailedTask.name,
+      CorrespondenceMailTask.name
     ]
   end
 

diff --git a/app/models/user.rb b/app/models/user.rb
@@ -22,7 +22,7 @@ class User < CaseflowRecord # rubocop:disable Metrics/ClassLength
 
   # Alternative: where("roles @> ARRAY[?]::varchar[]", role)
   scope :with_role, ->(role) { where("? = ANY(roles)", role) }
-  scope :mail_team_users, -> { joins(:organizations).where(organizations: { type: MailTeam.name }) }
+  scope :inbound_ops_team_user, -> { joins(:organizations).where(organizations: { type: InboundOpsTeam.name }) }
 
   BOARD_STATION_ID = "101"
   LAST_LOGIN_PRECISION = 5.minutes
@@ -102,8 +102,8 @@ def inbound_ops_team_superuser?
       (administered_teams.include?(BvaIntake.singleton) || administered_teams.include?(MailTeam.singleton))
   end
 
-  def mail_team_user?
-    organizations.include?(MailTeam.singleton)
+  def inbound_ops_team_user?
+    organizations.include?(InboundOpsTeam.singleton)
   end
 
   def mail_supervisor?

diff --git a/app/views/correspondence/correspondence_cases.html.erb b/app/views/correspondence/correspondence_cases.html.erb
@@ -4,7 +4,7 @@
     userId: current_user.id,
     userRole: (current_user.vacols_roles.first || "").capitalize,
     userCssId: current_user.css_id,
-    isMailTeamUser: current_user.mail_team_user?,
+    isInboundOpsTeamUser: current_user.inbound_ops_team_user?,
     isMailSupervisor: current_user.mail_supervisor?,
     isInboundOpsSuperuser: current_user.inbound_ops_team_superuser?,
     organizations: current_user.selectable_organizations.map {|o| o.slice(:name, :url)},

diff --git a/app/views/correspondence/correspondence_team.html.erb b/app/views/correspondence/correspondence_team.html.erb
@@ -11,10 +11,10 @@
     feedbackUrl: feedback_url,
     configUrl: '/queue/correspondence/team?json',
     flash: flash,
-    isMailTeamUser: current_user.mail_team_user?,
+    isInboundOpsUser: current_user.inbound_ops_team_user?,
     isMailSupervisor: current_user.mail_supervisor?,
     isInboundOpsSuperuser: current_user.inbound_ops_team_superuser?,
-    mailTeamUsers: @mail_team_users,
+    inboundOpsTeamUsers: @inbound_ops_team_user,
     responseType: @response_type,
     responseHeader: @response_header,
     responseMessage: @response_message,

diff --git a/app/views/correspondence/review_package.html.erb b/app/views/correspondence/review_package.html.erb
@@ -9,7 +9,7 @@
     organizations: current_user.selectable_organizations.map {|o| o.slice(:name, :url)},
     caseSearchHomePage: case_search_home_page,
     dropdownUrls: dropdown_urls,
-    mailTeamUsers: @mail_team_users,
+    inboundOpsTeamUser: @inbound_ops_team_user,
     featureToggles: {
       correspondence_queue: FeatureToggle.enabled?(:correspondence_queue, user: current_user)
     }

diff --git a/app/views/queue/index.html.erb b/app/views/queue/index.html.erb
@@ -21,7 +21,7 @@
     userCanViewHearingSchedule: current_user.can_view_hearing_schedule?,
     userCanViewOvertimeStatus: current_user.can_view_overtime_status?,
     userCanViewEditNodDate: current_user.can_view_edit_nod_date?,
-    isMailTeamUser: current_user.mail_team_user?,
+    isInboundOpsTeamUser: current_user.inbound_ops_team_user?,
     isMailSupervisor: current_user.mail_supervisor?,
     isInboundOpsSuperuser: current_user.inbound_ops_team_superuser?,
     canEditCavcRemands: current_user.can_edit_cavc_remands?,

diff --git a/client/app/queue/correspondence/correspondenceReducer/correspondenceConstants.js b/client/app/queue/correspondence/correspondenceReducer/correspondenceConstants.js
@@ -3,7 +3,7 @@ export const ACTIONS = {
   LOAD_VETERAN_INFORMATION: 'LOAD_VETERAN_INFORMATION',
   LOAD_VET_CORRESPONDENCE: 'LOAD_VET_CORRESPONDENCE',
   LOAD_CORRESPONDENCE_CONFIG: 'LOAD_CORRESPONDENCE_CONFIG',
-  LOAD_MAIL_TEAM_USERS: 'LOAD_MAIL_TEAM_USERS',
+  LOAD_INBOUND_OPS_TEAM_USER: 'LOAD_INBOUND_OPS_TEAM_USER',
   UPDATE_RADIO_VALUE: 'UPDATE_RADIO_VALUE',
   SAVE_CHECKBOX_STATE: 'SAVE_CHECKBOX_STATE',
   CLEAR_CHECKBOX_STATE: 'CLEAR_CHECKBOX_STATE',

diff --git a/client/app/queue/correspondence/correspondenceReducer/correspondenceReducer.js b/client/app/queue/correspondence/correspondenceReducer/correspondenceReducer.js
@@ -49,7 +49,7 @@ export const intakeCorrespondenceReducer = (state = initialState, action = {}) =
       }
     });
 
-  case ACTIONS.LOAD_MAIL_TEAM_USERS:
+  case ACTIONS.LOAD_INBOUND_OPS_TEAM_USER:
     return update(state, {
       mailTeamUsers: {
         $set: action.payload.mailTeamUsers

diff --git a/client/app/queue/uiReducer/uiActions.js b/client/app/queue/uiReducer/uiActions.js
@@ -220,9 +220,9 @@ export const setOrganizations = (organizations) => ({
   payload: { organizations }
 });
 
-export const setMailTeamUser = (isMailTeamUser) => ({
-  type: ACTIONS.SET_MAIL_TEAM_USER,
-  payload: { isMailTeamUser }
+export const setMailTeamUser = (isInboundOpsTeamUser) => ({
+  type: ACTIONS.SET_INBOUND_OPS_TEAM_USER,
+  payload: { isInboundOpsTeamUser }
 });
 
 export const setMailSupervisor = (isMailSupervisor) => ({

diff --git a/client/app/queue/uiReducer/uiConstants.js b/client/app/queue/uiReducer/uiConstants.js
@@ -39,7 +39,7 @@ export const ACTIONS = {
   SET_USER_IS_SCT_COORDINATOR: 'SET_USER_IS_SCT_COORDINATOR',
   SET_ORGANIZATION_IDS: 'SET_ORGANIZATION_IDS',
   SET_ORGANIZATIONS: 'SET_ORGANIZATIONS',
-  SET_MAIL_TEAM_USER: 'SET_MAIL_TEAM_USER',
+  SET_INBOUND_OPS_TEAM_USER: 'SET_INBOUND_OPS_TEAM_USER',
   SET_MAIL_SUPERVISOR: 'SET_MAIL_SUPERVISOR',
   SET_INBOUND_OPS_SUPERUSER: 'SET_INBOUND_OPS_SUPERUSER',
 

diff --git a/client/app/queue/uiReducer/uiReducer.js b/client/app/queue/uiReducer/uiReducer.js
@@ -257,10 +257,10 @@ const workQueueUiReducer = (state = initialState, action = {}) => {
         $set: null
       }
     });
-  case ACTIONS.SET_MAIL_TEAM_USER:
+  case ACTIONS.SET_INBOUND_OPS_TEAM_USER:
     return update(state, {
       isMailTeamUser: {
-        $set: action.payload.isMailTeamUser
+        $set: action.payload.isInboundOpsTeamUser
       }
     });
   case ACTIONS.SET_MAIL_SUPERVISOR:

diff --git a/db/seeds/correspondence_auto_assign.rb b/db/seeds/correspondence_auto_assign.rb
@@ -8,7 +8,7 @@ def seed!
       create_inbound_ops_team_auto_assign_user
       create_inbound_ops_team_user_with_no_permissions
       create_inbound_ops_team_supervisor
-      create_mail_team_user
+      create_inbound_ops_team_user
       create_mail_team_superuser
     end
 
@@ -108,11 +108,11 @@ def create_inbound_ops_team_supervisor
       end
     end
 
-    def create_mail_team_user
+    def create_inbound_ops_team_user
       users_info = [
-        { css_id: "MAIL_TEAM_USER_U1", full_name: "Cedar Rain" },
-        { css_id: "MAIL_TEAM_USER_U2", full_name: "Ivy Stone" },
-        { css_id: "MAIL_TEAM_USER_U3", full_name: "Ocean Breeze" }
+        { css_id: "INBOUND_OPS_TEAM_USER_U1", full_name: "Cedar Rain" },
+        { css_id: "INBOUND_OPS_TEAM_USER_U2", full_name: "Ivy Stone" },
+        { css_id: "INBOUND_OPS_TEAM_USER_U3", full_name: "Ocean Breeze" }
       ]
       users_info.map do |user_info|
         u = User.find_or_create_by!(

diff --git a/db/seeds/queue_correspondences.rb b/db/seeds/queue_correspondences.rb
@@ -13,8 +13,8 @@ def initialize
       RequestStore[:current_user] = User.find_by_css_id("JOLLY_POSTMAN") if RequestStore[:current_user].blank?
     end
 
-    def mail_team_user
-      @mail_team_user ||= User.find_by_css_id("JOLLY_POSTMAN")
+    def inbound_ops_team_user
+      @inbound_ops_team_user ||= User.find_by_css_id("JOLLY_POSTMAN")
     end
 
     def mail_team_superuser
@@ -27,7 +27,7 @@ def seed!(user = {}, veteran = {})
 
       return create_queue_correspondences(user, veteran) unless user.blank? && veteran.blank?
 
-      create_queue_correspondences(mail_team_user)
+      create_queue_correspondences(inbound_ops_team_user)
       create_queue_correspondences(mail_team_superuser)
     end
 

diff --git a/db/seeds/users.rb b/db/seeds/users.rb
@@ -91,7 +91,7 @@ def create_users
       create_inbound_ops_team_user
       create_cavc_lit_support_user
       create_pulac_cerullo_user
-      create_mail_team_user
+      create_inbound_ops_team_user
       create_clerk_of_the_board_users
       create_case_search_only_user
       create_split_appeals_test_users
@@ -416,9 +416,9 @@ def create_pulac_cerullo_user
       PulacCerullo.singleton.add_user(u)
     end
 
-    def create_mail_team_user
+    def create_inbound_ops_team_user
       u = User.create!(station_id: 101, css_id: "JOLLY_POSTMAN", full_name: "Huan MailUser Tiryaki")
-      MailTeam.singleton.add_user(u)
+      InboundOpsTeam.singleton.add_user(u)
     end
 
     def create_clerk_of_the_board_users

diff --git a/spec/controllers/tasks_controller_spec.rb b/spec/controllers/tasks_controller_spec.rb
@@ -609,9 +609,9 @@
 
     context "When the current user is a member of the Mail team" do
       before do
-        mail_team_user = create(:user)
-        MailTeam.singleton.add_user(mail_team_user)
-        User.authenticate!(user: mail_team_user)
+        InboundOpsTeam = create(:user)
+        InboundOpsTeam.singleton.add_user(inbound_ops_team_user)
+        User.authenticate!(user: inbound_ops_team_user)
       end
 
       context "when an AddressChangeMailTask is created for an inactive appeal" do
@@ -629,7 +629,7 @@
          allow(AddressChangeMailTask).to receive(:case_active?).and_return(false)
        end

        it "returns a response indicating failure to create task" do
          subject

          response_body = JSON.parse(response.body)

diff --git a/spec/feature/queue/correspondence/correspondence_cases_spec.rb b/spec/feature/queue/correspondence/correspondence_cases_spec.rb
@@ -19,7 +19,7 @@
      expect(page).to have_current_path("/under_construction")
    end

    it "routes to correspondence cases if feature toggle is enabled" do
      FeatureToggle.enable!(:correspondence_queue)
      visit "/queue/correspondence"
      expect(current_path.include?("/queue/correspondence")).to eq true
@@ -75,12 +75,12 @@
      FeatureToggle.enable!(:correspondence_queue)
    end

    it "successfully loads the in progress tab" do
      visit "/queue/correspondence?tab=correspondence_in_progress&page=1&sort_by=vaDor&order=asc"
      expect(page).to have_content("Correspondence in progress")
    end

    it "uses veteran details sort correctly." do
      visit "/queue/correspondence?tab=correspondence_in_progress&page=1&sort_by=vaDor&order=asc"
      # put page in the sorted A-Z state
      find("[aria-label='Sort by Veteran Details']").click
@@ -96,7 +96,7 @@
      expect(page.all("#task-link")[0].text == last_vet_info)
    end

    it "uses VA DOR sort correctly." do
      visit "/queue/correspondence?tab=correspondence_in_progress&page=1&sort_by=vaDor&order=asc"
      # put page in the sorted A-Z state
      find("[aria-label='Sort by VA DOR']").click
@@ -112,7 +112,7 @@
      expect(find("tbody > tr:nth-child(1) > td:nth-child(2)").text == last_date)
    end

    it "uses tasks sort correctly." do
      visit "/queue/correspondence?tab=correspondence_in_progress&page=1&sort_by=vaDor&order=asc"
      # put page in the sorted A-Z state
      find("[aria-label='Sort by Tasks']").click
@@ -128,7 +128,7 @@
      expect(find("tbody > tr:nth-child(1) > td:nth-child(3)").text == second_task_type)
    end

    it "uses days waiting sort correctly" do
      visit "/queue/correspondence?tab=correspondence_in_progress&page=1&sort_by=vaDor&order=asc"
      # put page in the sorted A-Z state
      find("[aria-label='Sort by Days Waiting']").click
@@ -144,7 +144,7 @@
      expect(find("tbody > tr:nth-child(1) > td:nth-child(4)").text == second_day_amount)
    end

    it "uses notes sort correctly" do
      visit "/queue/correspondence?tab=correspondence_in_progress&page=1&sort_by=vaDor&order=asc"
      # put page in the sorted A-Z state
      find("[aria-label='Sort by Notes']").click
@@ -160,7 +160,7 @@
      expect(find("tbody > tr:nth-child(1) > td:nth-child(5)").text == second_note)
    end

    it "uses receipt date between filter correctly" do
      visit "/queue/correspondence?tab=correspondence_in_progress&page=1&sort_by=vaDor&order=asc"
      all(".unselected-filter-icon")[1].click
      find_by_id("reactSelectContainer").click
@@ -171,7 +171,7 @@
      expect(all("tbody > tr:nth-child(1) > td:nth-child(5)").length == 1)
    end

    it "uses receipt date before filter correctly" do
      visit "/queue/correspondence?tab=correspondence_in_progress&page=1&sort_by=vaDor&order=asc"
      all(".unselected-filter-icon")[1].click
      find_by_id("reactSelectContainer").click
@@ -181,7 +181,7 @@
      expect(all("tbody > tr:nth-child(1) > td:nth-child(5)").length == 1)
    end

    it "uses receipt date after filter correctly" do
      visit "/queue/correspondence?tab=correspondence_in_progress&page=1&sort_by=vaDor&order=asc"
      all(".unselected-filter-icon")[1].click
      find_by_id("reactSelectContainer").click
@@ -1230,7 +1230,7 @@
 
   context "Banner alert for approval and reject request" do
     let(:current_user) { create(:user) }
-    let(:mail_team_user) { create(:user) }
+    let(:inbound_ops_team_user) { create(:user) }
     before :each do
       MailTeam.singleton.add_user(current_user)
       InboundOpsTeam.singleton.add_user(current_user)
@@ -1451,7 +1451,7 @@
   context "Package document type column" do
     let(:current_user) { create(:user) }
     let(:alt_user) { create(:user) }
-    let(:mail_team_user) { create(:user) }
+    let(:inbound_ops_team_user) { create(:user) }
     before :each do
       MailTeam.singleton.add_user(current_user)
       MailTeam.singleton.add_user(alt_user)

diff --git a/spec/feature/queue/correspondence/edit_cmp_information_spec.rb b/spec/feature/queue/correspondence/edit_cmp_information_spec.rb
@@ -5,7 +5,7 @@
   let(:veteran) { create(:veteran) }
   let(:package_document_type) { PackageDocumentType.create!(id: 15, active: true, created_at: Time.zone.now, name: "10_182", updated_at: Time.zone.now) }
   let(:correspondence_documents) { create(:correspondence_document, correspondence: correspondence, document_file_number: veteran.file_number) }
-  let(:mail_team_user) { create(:user) }
+  let(:inbound_ops_team_user) { create(:user) }
   let(:mail_team_org) { MailTeam.singleton }
   let(:current_user) { User.create!(station_id: 101, css_id: "MAIL_TEAM_SUPERVISOR_ADMIN_USER", full_name: "Jon MailTeam Snow Admin") }
   let!(:correspondence_type) { CorrespondenceType.create!(name: "a correspondence type.") }
@@ -14,8 +14,8 @@
       :correspondence,
       veteran_id: veteran.id,
       uuid: SecureRandom.uuid,
-      assigned_by_id: mail_team_user.id,
-      updated_by_id: mail_team_user.id,
+      assigned_by_id: inbound_ops_team_user.id,
+      updated_by_id: inbound_ops_team_user.id,
       package_document_type: package_document_type
     )
   end
@@ -24,8 +24,8 @@
     before :each do
       # User.authenticate!(roles: ["Mail Intake"])
       FeatureToggle.enable!(:correspondence_queue)
-      mail_team_org.add_user(mail_team_user)
-      User.authenticate!(user: mail_team_user)
+      mail_team_org.add_user(inbound_ops_team_user)
+      User.authenticate!(user: inbound_ops_team_user)
     end
 
     it "routes user to /under_construction if the feature toggle is disabled" do
@@ -152,8 +152,8 @@
   context "Checking VADOR field is disabled for General mail user" do
     before do
       FeatureToggle.enable!(:correspondence_queue)
-      mail_team_org.add_user(mail_team_user)
-      User.authenticate!(user: mail_team_user)
+      mail_team_org.add_user(inbound_ops_team_user)
+      User.authenticate!(user: inbound_ops_team_user)
       visit "/queue/correspondence/#{correspondence.uuid}/review_package"
     end
 

diff --git a/spec/feature/queue/correspondence/review_package_spec.rb b/spec/feature/queue/correspondence/review_package_spec.rb
@@ -7,7 +7,7 @@
   let(:correspondence) { create(:correspondence, :with_single_doc, veteran_id: veteran.id, package_document_type_id: package_document_type.id) }
   let(:mail_team_supervisor_user) { create(:user, roles: ["Mail Intake"]) }
   let(:mail_team_supervisor_org) { InboundOpsTeam.singleton }
-  let(:mail_team_user) { create(:user) }
+  let(:inbound_ops_team_user) { create(:user) }
   let(:mail_team_org) { MailTeam.singleton }
 
   context "Review package feature toggle" do