progress pr - Batch requests in task table

app/controllers/appeals_controller.rb

@@ -34,12 +34,24 @@ def show_case_list
     end
   end
 
-  def document_count
-    render json: { document_count: appeal.number_of_documents }
-  rescue Caseflow::Error::EfolderAccessForbidden => e
-    render(e.serialize_response)
-  rescue StandardError => e
-    handle_non_critical_error("document_count", e)
+  def document_counts_by_id
+    render json: { document_counts_by_id: build_document_counts_hash({}) }
+  rescue Caseflow::Error::EfolderAccessForbidden => error
+    render(error.serialize_response)
+  end
+
+  def build_document_counts_hash(document_counts_by_id_hash)
+    params[:appeal_ids].split(",").each do |appeal_id|
+      begin
+        document_counts_by_id_hash[appeal_id] =
+          Appeal.find_appeal_by_id_or_find_or_create_legacy_appeal_by_vacols_id(appeal_id)
+          .number_of_documents
+      rescue StandardError => error
+        document_counts_by_id_hash[appeal_id] = error
+        next
+      end
+    end
+    document_counts_by_id_hash
   end
 
   def power_of_attorney
@@ -50,26 +62,31 @@ def power_of_attorney
     }
   end
 
-  def hearings
+  def hearings_by_id
     log_hearings_request
-
-    most_recently_held_hearing = appeal.hearings
-      .select { |hearing| hearing.disposition.to_s == Constants.HEARING_DISPOSITION_TYPES.held }
-      .max_by(&:scheduled_for)
-
-    render json:
-      if most_recently_held_hearing
-        {
-          held_by: most_recently_held_hearing.judge.present? ? most_recently_held_hearing.judge.full_name : "",
-          viewed_by_judge: !most_recently_held_hearing.hearing_views.empty?,
-          date: most_recently_held_hearing.scheduled_for,
-          type: most_recently_held_hearing.readable_request_type,
-          external_id: most_recently_held_hearing.external_id,
-          disposition: most_recently_held_hearing.disposition
-        }
-      else
-        {}
+    render json: { most_recently_held_hearings_by_id: build_most_recently_held_hearings_hash }
+  end
+
+  def build_most_recently_held_hearings_hash
+    most_recently_held_hearings_by_id_hash = {}
+    params[:appeal_ids].split(",").each do |appeal_id|
+      begin
+        most_recently_held_hearings_by_id_hash[appeal_id] = HearingRepository
+          .build_hearing_object_for_appeal(most_recently_held_hearing(appeal_id))
+      rescue StandardError => error
+        most_recently_held_hearings_by_id_hash[appeal_id] = error
+        next
       end
+    end
+    most_recently_held_hearings_by_id_hash
+  end
+
+  def most_recently_held_hearing(appeal_id)
+    @most_recently_held_hearing =
+      Appeal.find_appeal_by_id_or_find_or_create_legacy_appeal_by_vacols_id(appeal_id)
+        .hearings
+        .select { |hearing| hearing.disposition.to_s == Constants.HEARING_DISPOSITION_TYPES.held }
+        .max_by(&:scheduled_for)
   end
 
   # For legacy appeals, veteran address and birth/death dates are

app/repositories/hearing_repository.rb

@@ -20,6 +20,17 @@ def fetch_hearings_for_judge(css_id, is_fetching_issues = false)
       hearings
     end
 
+    def build_hearing_object_for_appeal(hearing)
+      {
+        held_by: hearing&.judge.present? ? hearing.judge.full_name : "",
+        viewed_by_judge: hearing && !hearing.hearing_views.empty?,
+        date: hearing&.scheduled_for,
+        type: hearing&.readable_request_type,
+        external_id: hearing&.external_id,
+        disposition: hearing&.disposition
+      }
+    end
+
     def fetch_hearings_for_parent(hearing_day_id)
       # Implemented by call the array version of this method
       fetch_hearings_for_parents([hearing_day_id]).values.first || []

client/app/queue/AppealDocumentCount.jsx

@@ -2,8 +2,7 @@ import PropTypes from 'prop-types';
 import React from 'react';
 import { connect } from 'react-redux';
 import { bindActionCreators } from 'redux';
-
-import ApiUtil from '../util/ApiUtil';
+import _ from 'lodash';
 
 import { loadAppealDocCount, setAppealDocCount, errorFetchingDocumentCount } from './QueueActions';
 
@@ -15,48 +14,20 @@ const documentCountStyling = css({
 });
 
 class AppealDocumentCount extends React.PureComponent {
-  componentDidMount = () => {
-    const {
-      appeal,
-      docCountForAppeal
-    } = this.props;
-
-    if (appeal.isPaperCase) {
-      return;
-    }
-
-    if (docCountForAppeal && docCountForAppeal.docCount) {
-      return;
-    }
-
-    const requestOptions = {
-      withCredentials: true,
-      timeout: { response: 5 * 60 * 1000 }
-    };
-
-    this.props.loadAppealDocCount(this.props.externalId);
-
-    ApiUtil.get(`/appeals/${this.props.externalId}/document_count`, requestOptions).then((response) => {
-      const resp = JSON.parse(response.text);
-
-      this.props.setAppealDocCount(this.props.externalId, resp.document_count);
-    }, () => {
-      this.props.errorFetchingDocumentCount(this.props.externalId);
-    });
-  }
-
   render = () => {
     const {
-      docCountForAppeal,
-      loadingText
+      docCountsByAppealId,
+      loadingText,
+      externalId
     } = this.props;
+    const isLoadingOrError = loadingText && (docCountsByAppealId.loading || docCountsByAppealId.error);
 
-    if (docCountForAppeal) {
-      if (docCountForAppeal.docCount) {
-        return docCountForAppeal.docCount;
-      } else if (loadingText && (docCountForAppeal.loading || docCountForAppeal.error)) {
-        return docCountForAppeal.error || <span {...documentCountStyling}>Loading number of docs...</span>;
+    if (!_.isEmpty(docCountsByAppealId)) {
+      if (isLoadingOrError) {
+        return docCountsByAppealId.error || <span {...documentCountStyling}>Loading number of docs...</span>;
       }
+
+      return docCountsByAppealId[externalId] || null;
     }
 
     return null;
@@ -73,7 +44,7 @@ const mapStateToProps = (state, ownProps) => {
 
   return {
     externalId,
-    docCountForAppeal: state.queue.docCountForAppeal[externalId] || null
+    docCountsByAppealId: state.queue.docCountsByAppealId
   };
 };
 

client/app/queue/AttorneyTaskListView.jsx

@@ -11,6 +11,9 @@ import QueueOrganizationDropdown from './components/QueueOrganizationDropdown';
 import AppSegment from '@department-of-veterans-affairs/caseflow-frontend-toolkit/components/AppSegment';
 import Link from '@department-of-veterans-affairs/caseflow-frontend-toolkit/components/Link';
 import Alert from '../components/Alert';
+import { batchDocCountRequests, batchHearingBadgeRequests } from '../util/ApiUtil';
+import { loadAppealDocCount, setAppealDocCount,
+  errorFetchingDocumentCount, setMostRecentlyHeldHearingForAppeals } from './QueueActions';
 
 import {
   completeTasksByAssigneeCssIdSelector,
@@ -43,15 +46,19 @@ class AttorneyTaskListView extends React.PureComponent {
   componentDidMount = () => {
     this.props.clearCaseSelectSearch();
     this.props.resetErrorMessages();
+    const combinedTasks = [...this.props.workableTasks, ...this.props.onHoldTasks, ...this.props.completedTasks];
 
     if (_.some(
-      [...this.props.workableTasks, ...this.props.onHoldTasks, ...this.props.completedTasks],
+      combinedTasks,
       (task) => !task.taskId)) {
       this.props.showErrorMessage({
         title: COPY.TASKS_NEED_ASSIGNMENT_ERROR_TITLE,
         detail: COPY.TASKS_NEED_ASSIGNMENT_ERROR_MESSAGE
       });
     }
+    batchDocCountRequests(this.props, combinedTasks);
+    batchHearingBadgeRequests(this.props, combinedTasks);
+
   };
 
   render = () => {
@@ -141,7 +148,11 @@ const mapDispatchToProps = (dispatch) => ({
     resetErrorMessages,
     resetSuccessMessages,
     resetSaveState,
-    showErrorMessage
+    showErrorMessage,
+    loadAppealDocCount,
+    setAppealDocCount,
+    errorFetchingDocumentCount,
+    setMostRecentlyHeldHearingForAppeals
   }, dispatch)
 });
 

client/app/queue/ColocatedTaskListView.jsx

@@ -23,14 +23,20 @@ import {
 
 import Alert from '../components/Alert';
 import TabWindow from '../components/TabWindow';
+import { batchDocCountRequests, batchHearingBadgeRequests } from '../util/ApiUtil';
+import { loadAppealDocCount, setAppealDocCount,
+  errorFetchingDocumentCount, setMostRecentlyHeldHearingForAppeals } from './QueueActions';
 
 const containerStyles = css({
   position: 'relative'
 });
 
 class ColocatedTaskListView extends React.PureComponent {
   componentDidMount = () => {
+
     this.props.clearCaseSelectSearch();
+    batchDocCountRequests(this.props, this.props.combinedTasks);
+    batchHearingBadgeRequests(this.props, this.props.combinedTasks);
   };
 
   componentWillUnmount = () => this.props.hideSuccessMessage();
@@ -69,18 +75,30 @@ class ColocatedTaskListView extends React.PureComponent {
 
 const mapStateToProps = (state) => {
   const { success } = state.ui.messages;
+  const newTasks = newTasksByAssigneeCssIdSelector(state);
+  const onHoldTasks = onHoldTasksByAssigneeCssIdSelector(state);
+  const completedTasks = completeTasksByAssigneeCssIdSelector(state);
 
   return {
     success,
     organizations: state.ui.organizations,
-    numNewTasks: newTasksByAssigneeCssIdSelector(state).length,
-    numOnHoldTasks: onHoldTasksByAssigneeCssIdSelector(state).length
+    numNewTasks: newTasks.length,
+    numOnHoldTasks: onHoldTasks.length,
+    combinedTasks: [
+      ...newTasks,
+      ...onHoldTasks,
+      ...completedTasks
+    ]
   };
 };
 
 const mapDispatchToProps = (dispatch) => bindActionCreators({
   clearCaseSelectSearch,
-  hideSuccessMessage
+  hideSuccessMessage,
+  loadAppealDocCount,
+  setAppealDocCount,
+  errorFetchingDocumentCount,
+  setMostRecentlyHeldHearingForAppeals
 }, dispatch);
 
 export default (connect(mapStateToProps, mapDispatchToProps)(ColocatedTaskListView));

client/app/queue/JudgeDecisionReviewTaskListView.jsx

@@ -21,6 +21,8 @@ import { judgeDecisionReviewTasksSelector } from './selectors';
 
 import { fullWidth } from './constants';
 import COPY from '../../COPY.json';
+import { setMostRecentlyHeldHearingForAppeals } from './QueueActions';
+import { batchHearingBadgeRequests } from '../util/ApiUtil';
 
 const containerStyles = css({
   position: 'relative'
@@ -36,6 +38,7 @@ class JudgeDecisionReviewTaskListView extends React.PureComponent {
   componentDidMount = () => {
     this.props.clearCaseSelectSearch();
     this.props.resetErrorMessages();
+    batchHearingBadgeRequests(this.props, this.props.tasks);
   };
 
   render = () => {
@@ -102,7 +105,8 @@ const mapDispatchToProps = (dispatch) => (
     clearCaseSelectSearch,
     resetErrorMessages,
     resetSuccessMessages,
-    resetSaveState
+    resetSaveState,
+    setMostRecentlyHeldHearingForAppeals
   }, dispatch)
 );
 

client/app/queue/QueueActions.js

@@ -2,7 +2,7 @@
 import { associateTasksWithAppeals,
   prepareAllTasksForStore,
   extractAppealsAndAmaTasks,
-  prepareMostRecentlyHeldHearingForStore,
+  prepareMostRecentlyHeldHearingsForStore,
   prepareTasksForStore } from './utils';
 import { ACTIONS } from './constants';
 import { hideErrorMessage, showErrorMessage, showSuccessMessage } from './uiReducer/uiActions';
@@ -145,11 +145,11 @@ export const getNewDocumentsForTask = (taskId) => (dispatch) => {
   });
 };
 
-export const loadAppealDocCount = (appealId) => (dispatch) => {
+export const loadAppealDocCount = (appealIds) => (dispatch) => {
   dispatch({
     type: ACTIONS.STARTED_DOC_COUNT_REQUEST,
     payload: {
-      appealId
+      appealIds
     }
   });
 };
@@ -185,17 +185,16 @@ export const getAppealValue = (appealId, endpoint, name) => (dispatch) => {
   });
 };
 
-export const setAppealDocCount = (appealId, docCount) => ({
+export const setAppealDocCount = (docCountsByAppealId) => ({
   type: ACTIONS.SET_APPEAL_DOC_COUNT,
   payload: {
-    appealId,
-    docCount
+    docCountsByAppealId
   }
 });
 
-export const setMostRecentlyHeldHearingForAppeal = (appealId, hearing) => ({
+export const setMostRecentlyHeldHearingForAppeals = (mostRecentlyHeldHearingsById) => ({
   type: ACTIONS.SET_MOST_RECENTLY_HELD_HEARING_FOR_APPEAL,
-  payload: prepareMostRecentlyHeldHearingForStore(appealId, hearing)
+  payload: prepareMostRecentlyHeldHearingsForStore(mostRecentlyHeldHearingsById)
 });
 
 export const setDecisionOptions = (opts) => (dispatch) => {

client/app/queue/components/HearingBadge.jsx

@@ -3,14 +3,11 @@ import { css } from 'glamor';
 import _ from 'lodash';
 import * as React from 'react';
 import { connect } from 'react-redux';
-import { bindActionCreators } from 'redux';
 
 import Tooltip from '../../components/Tooltip';
 import { COLORS } from '../../constants/AppConstants';
 
-import ApiUtil from '../../util/ApiUtil';
 import { DateString } from '../../util/DateUtil';
-import { setMostRecentlyHeldHearingForAppeal } from '../QueueActions';
 
 /**
  * This component can accept either a Hearing object or a Task object.
@@ -43,16 +40,13 @@ const listStyling = css({
 });
 
 class HearingBadge extends React.PureComponent {
-  componentDidMount = () => {
-    if (!this.props.mostRecentlyHeldHearingForAppeal && !this.props.hearing && this.props.externalId) {
-      ApiUtil.get(`/appeals/${this.props.externalId}/hearings`).then((response) => {
-        this.props.setMostRecentlyHeldHearingForAppeal(this.props.externalId, JSON.parse(response.text));
-      });
-    }
-  }
 
   render = () => {
-    const hearing = this.props.mostRecentlyHeldHearingForAppeal || this.props.hearing;
+    const { externalId, mostRecentlyHeldHearingsById } = this.props;
+
+    const hearing =
+    mostRecentlyHeldHearingsById.filter((hearingObj) => hearingObj.appealId === externalId)[0] ||
+    this.props.hearing;
 
     if (!hearing || !hearing.date) {
       return null;
@@ -93,12 +87,8 @@ const mapStateToProps = (state, ownProps) => {
   return {
     hearing,
     externalId,
-    mostRecentlyHeldHearingForAppeal: state.queue.mostRecentlyHeldHearingForAppeal[externalId] || null
+    mostRecentlyHeldHearingsById: state.queue.mostRecentlyHeldHearingsById
   };
 };
 
-const mapDispatchToProps = (dispatch) => bindActionCreators({
-  setMostRecentlyHeldHearingForAppeal
-}, dispatch);
-
-export default connect(mapStateToProps, mapDispatchToProps)(HearingBadge);
+export default connect(mapStateToProps)(HearingBadge);