B 21983 MAIN - Display Counseling Office in Move Details (Review After B-21977)

pkg/handlers/ghcapi/internal/payloads/model_to_payload.go

@@ -122,6 +122,8 @@ func Move(move *models.Move, storer storage.FileStorer) (*ghcmessages.Move, erro
 		SCAssignedUser:                                 AssignedOfficeUser(move.SCAssignedUser),
 		TOOAssignedUser:                                AssignedOfficeUser(move.TOOAssignedUser),
 		TIOAssignedUser:                                AssignedOfficeUser(move.TIOAssignedUser),
+		CounselingOfficeID:                             handlers.FmtUUIDPtr(move.CounselingOfficeID),
+		CounselingOffice:                               TransportationOffice(move.CounselingOffice),
 	}
 
 	return payload, nil

pkg/handlers/ghcapi/transportation_offices_test.go

@@ -181,7 +181,6 @@ func (suite *HandlerSuite) TestShowCounselingOfficesHandler() {
 			},
 		},
 	}, nil)
-	suite.MustSave(&origDutyLocation)
 
 	path := fmt.Sprintf("/transportation_offices/%v/counseling_offices/%v", origDutyLocation.ID.String(), serviceMember.ID.String())
 	req := httptest.NewRequest("GET", path, nil)

pkg/handlers/internalapi/transportation_offices_test.go

@@ -153,7 +153,6 @@ func (suite *HandlerSuite) TestShowCounselingOfficesHandler() {
 			},
 		},
 	}, nil)
-	suite.MustSave(&origDutyLocation)
 
 	path := fmt.Sprintf("/transportation_offices/%v/counseling_offices", origDutyLocation.ID.String())
 	req := httptest.NewRequest("GET", path, nil)

pkg/services/move/move_fetcher.go

@@ -27,7 +27,7 @@ func (f moveFetcher) FetchMove(appCtx appcontext.AppContext, locator string, sea
 	move := &models.Move{}
 	query := appCtx.DB().
 		EagerPreload("CloseoutOffice.Address", "Contractor", "ShipmentGBLOC", "LockedByOfficeUser", "LockedByOfficeUser.TransportationOffice", "AdditionalDocuments",
-			"AdditionalDocuments.UserUploads").
+			"AdditionalDocuments.UserUploads", "CounselingOffice").
 		LeftJoin("move_to_gbloc", "move_to_gbloc.move_id = moves.id").
 		LeftJoin("office_users", "office_users.id = moves.locked_by").
 		Where("locator = $1", locator)

src/components/Office/AddOrdersForm/AddOrdersForm.test.jsx

@@ -439,8 +439,8 @@ describe('AddOrdersForm - With Counseling Office', () => {
     );
 
     await userEvent.selectOptions(await screen.findByLabelText(/Orders type/), 'PERMANENT_CHANGE_OF_STATION');
-    await userEvent.type(screen.getByLabelText(/Orders date/), '08 Nov 2020');
-    await userEvent.type(screen.getByLabelText(/Report by date/), '26 Nov 2020');
+    await userEvent.paste(screen.getByLabelText(/Orders date/), '08 Nov 2020');
+    await userEvent.paste(screen.getByLabelText(/Report by date/), '26 Nov 2020');
     await userEvent.click(screen.getByLabelText('No'));
     await userEvent.selectOptions(screen.getByLabelText(/Pay grade/), ['E_5']);
 

src/components/Office/DefinitionLists/OrdersList.jsx

@@ -15,7 +15,7 @@ import {
   ordersTypeDetailReadable,
 } from 'utils/formatters';
 
-const OrdersList = ({ ordersInfo, showMissingWarnings }) => {
+const OrdersList = ({ ordersInfo, moveInfo, showMissingWarnings }) => {
   const { ordersType } = ordersInfo;
   const isRetiree = ordersType === 'RETIREMENT';
   const isSeparatee = ordersType === 'SEPARATION';
@@ -57,6 +57,12 @@ const OrdersList = ({ ordersInfo, showMissingWarnings }) => {
           <dt>Current duty location</dt>
           <dd data-testid="currentDutyLocation">{ordersInfo.currentDutyLocation?.name}</dd>
         </div>
+        <div className={descriptionListStyles.row}>
+          <dt>Counseling office</dt>
+          <dd data-testid="counselingOffice">
+            {moveInfo?.counselingOffice?.name ? moveInfo.counselingOffice.name : '—'}
+          </dd>
+        </div>
         <div
           className={classnames(descriptionListStyles.row, {
             [styles.missingInfoError]: !ordersInfo.newDutyLocation?.name,
@@ -66,7 +72,7 @@ const OrdersList = ({ ordersInfo, showMissingWarnings }) => {
             {isRetiree || isSeparatee ? 'HOR, HOS, or PLEAD' : 'New duty location'}
           </dt>
           <dd data-testid="newDutyLocation">
-            {ordersInfo.newDutyLocation?.name ? ordersInfo.newDutyLocation?.name : '-'}
+            {ordersInfo.newDutyLocation?.name ? ordersInfo.newDutyLocation?.name : '—'}
           </dd>
         </div>
         <div
@@ -135,6 +141,7 @@ OrdersList.defaultProps = {
 
 OrdersList.propTypes = {
   ordersInfo: OrdersInfoShape.isRequired,
+  moveInfo: PropTypes.object.isRequired,
   showMissingWarnings: PropTypes.bool,
 };
 

src/components/Office/DefinitionLists/OrdersList.stories.jsx

@@ -43,6 +43,9 @@ export const Basic = () => (
         NTStac: text('ordersInfo.NTStac', '9999'),
         payGrade: text('ordersInfo.payGrade', 'E_5'),
       }}
+      moveInfo={{
+        name: 'PPPO Los Angeles SFB - USAF',
+      }}
     />
   </div>
 );
@@ -81,6 +84,9 @@ export const AsServiceCounselor = () => (
         NTStac: '',
         payGrade: text('ordersInfo.payGrade', 'E_5'),
       }}
+      moveInfo={{
+        name: 'PPPO Los Angeles SFB - USAF',
+      }}
     />
   </div>
 );
@@ -105,6 +111,9 @@ export const AsServiceCounselorProcessingRetirement = () => (
         NTStac: '',
         payGrade: text('ordersInfo.payGrade', 'E_5'),
       }}
+      moveInfo={{
+        name: 'PPPO Los Angeles SFB - USAF',
+      }}
     />
   </div>
 );
@@ -129,6 +138,9 @@ export const AsServiceCounselorProcessingSeparation = () => (
         NTStac: '',
         payGrade: text('ordersInfo.payGrade', 'E_5'),
       }}
+      moveInfo={{
+        name: 'PPPO Los Angeles SFB - USAF',
+      }}
     />
   </div>
 );
@@ -166,6 +178,9 @@ export const AsTOO = () => (
         NTStac: '',
         payGrade: text('ordersInfo.payGrade', 'E_5'),
       }}
+      moveInfo={{
+        name: 'PPPO Los Angeles SFB - USAF',
+      }}
     />
   </div>
 );
@@ -212,6 +227,9 @@ export const AsTOOProcessingSeparation = () => (
         NTStac: '',
         payGrade: text('ordersInfo.payGrade', 'E_5'),
       }}
+      moveInfo={{
+        name: 'PPPO Los Angeles SFB - USAF',
+      }}
     />
   </div>
 );

src/components/Office/DefinitionLists/OrdersList.test.jsx

@@ -32,9 +32,16 @@ const ordersInfo = {
   payGrade: 'E_7',
 };
 
+const moveInfo = {
+  counselingOffice: {
+    name: 'PPPO Los Angeles SFB - USAF',
+  },
+};
+
 // what ordersInfo from above should be rendered as
 const expectedRenderedOrdersInfo = {
   currentDutyLocation: 'JBSA Lackland',
+  counselingOffice: 'PPPO Los Angeles SFB - USAF',
   newDutyLocation: 'JB Lewis-McChord',
   issuedDate: '08 Mar 2020',
   reportByDate: '01 Apr 2020',
@@ -65,7 +72,7 @@ const ordersInfoMissing = {
 
 describe('OrdersList', () => {
   it('renders formatted orders info', () => {
-    render(<OrdersList ordersInfo={ordersInfo} />);
+    render(<OrdersList ordersInfo={ordersInfo} moveInfo={moveInfo} />);
     Object.keys(expectedRenderedOrdersInfo).forEach((key) => {
       expect(screen.getByText(expectedRenderedOrdersInfo[key])).toBeInTheDocument();
     });

src/pages/Office/MoveDetails/MoveDetails.jsx

@@ -678,7 +678,7 @@ const MoveDetails = ({
               }
               shipmentsInfoNonPpm={shipmentsInfoNonPPM}
             >
-              <OrdersList ordersInfo={ordersInfo} />
+              <OrdersList ordersInfo={ordersInfo} moveInfo={move} />
             </DetailsPanel>
           </div>
           <div className={styles.section} id="allowances">

src/pages/Office/ServicesCounselingMoveDetails/ServicesCounselingMoveDetails.jsx

@@ -879,7 +879,7 @@ const ServicesCounselingMoveDetails = ({
               }
               ppmShipmentInfoNeedsApproval={ppmShipmentsInfoNeedsApproval}
             >
-              <OrdersList ordersInfo={ordersInfo} />
+              <OrdersList ordersInfo={ordersInfo} moveInfo={move} />
             </DetailsPanel>
           </div>
           <div className={styles.section} id="allowances">

swagger-def/ghc.yaml

@@ -5344,6 +5344,13 @@ definitions:
         format: uuid
         description: The transportation office that will handle reviewing PPM Closeout documentation for Army and Air Force service members
         x-nullable: true
+      counselingOffice:
+        $ref: 'definitions/TransportationOffice.yaml'
+      counselingOfficeId:
+        type: string
+        format: uuid
+        description: The transportation office that will handle services counseling for this move
+        x-nullable: true
       approvalsRequestedAt:
         type: string
         format: date-time

swagger/ghc.yaml

@@ -5574,6 +5574,15 @@ definitions:
           The transportation office that will handle reviewing PPM Closeout
           documentation for Army and Air Force service members
         x-nullable: true
+      counselingOffice:
+        $ref: '#/definitions/TransportationOffice'
+      counselingOfficeId:
+        type: string
+        format: uuid
+        description: >-
+          The transportation office that will handle services counseling for
+          this move
+        x-nullable: true
       approvalsRequestedAt:
         type: string
         format: date-time