Int b 21507 pod poe too validation #14475

msaki-caci · 2024-12-26T22:04:39Z

B-21507

Summary

We are adding a view for the Port of Embark and Port of Debark for the TOO and any other office user with the ability to view the MTO page.

They should be able to view the Port of Embark or Port of Debark based on whichever one is populated the other port should be blank. Here is an example:

Verification Steps for the Author

These are to be checked by the author.

Tested in the Experimental environment (for changes to containers, app startup, or connection to data stores)
Have the Agility acceptance criteria been met for this change?

Verification Steps for Reviewers

These are to be checked by a reviewer.

Has the branch been pulled in and checked out?
Have the BL acceptance criteria been met for this change?
Was the CircleCI build successful?
Has the code been reviewed from a standards and best practices point of view?

Setup to Run the Code

How to test

NOTE: We are following the same steps for 1-5 from B-21505 to setup the location for the POE/POD.

Create an INTL UB shipment as a customer (CONUS -> AK or AK -> CONUS)
Manually create the mto_service_items table for the shipment: INSERT INTO mto_service_items ( id, mto_shipment_id, move_id, re_service_id, status, created_at, updated_at, approved_at ) VALUES ( uuid_generate_v4(), '8eeba537-bb40-4f58-a534-74ea9ff64590', '813b7a43-2e3f-42f3-8c4e-eca95390d5ca', '388115e8-abe9-441d-96cf-a39f24baa0a3', 'APPROVED'::service_item_status, NOW(), NOW(), NOW() );
In the prime v3 api, call getMoveTaskOrder using the move_id for the service item you created in step 2. You will need the etag for the newly created service item for the next step.
In the prime v1 api, call updateMTOServiceItem using a payload like this (adjust for you specific service item ID): { "id": "40b7e71a-6b03-4413-8601-dea694253ee3", "modelType": "UpdateMTOServiceItemInternationalPortFSC", "portCode": "PDX", "reServiceCode": "PODFSC" }
Verify that you receive a 200 response like this: { "reServiceCode": "PODFSC", "eTag": "MjAyNC0xMi0wMlQxNjo0MjoxNi42NjUwNDla", "id": "40b7e71a-6b03-4413-8601-dea694253ee3", "modelType": "MTOServiceItemBasic", "moveTaskOrderID": "813b7a43-2e3f-42f3-8c4e-eca95390d5ca", "mtoShipmentID": "8eeba537-bb40-4f58-a534-74ea9ff64590", "reServiceName": "International POD Fuel Surcharge", "status": "APPROVED" }
Login as a TOO user or any office user that has permissions to access the MTO page. Search up the move id that we used to setup the POD/POE. When you travel to the MTO Page, you should now see the Port of Embark or Debark populated with the Port Code, Port Name, City, State, and Zip associated with it.

Frontend

There are no aXe warnings for UI.
This works in Supported Browsers and their phone views (Chrome, Firefox, Edge).
There are no new console errors in the browser devtools.
There are no new console errors in the test output.
If this PR adds a new component to Storybook, it ensures the component is fully responsive, OR if it is intentionally not, a wrapping div using the officeApp class or custom min-width styling is used to hide any states the would not be visible to the user.
This change meets the standards for Section 508 compliance.

Backend

Code follows the guidelines for Logging.
The requirements listed in Querying the Database Safely have been satisfied.

Screenshots

Add descriptions for POE/POD Locations in swagger.

Update API call to pull Port info Update MTOShipment.yaml to include Port

Add POE/POD Location to MTOShipment payload Make methods to pull the port location into the payload update swagger definitions for POE/POD locations

Display Port Location and data on frontend MTO page

Pull the port location back in mto_shipment_fetcher

Add shipment display function for ports

Add Port Name and refactor format in shipment display

Consolidate getPoeLocation with getPodLocation for DRY code

update comment

Add port tests to model to payload for ghcapi

Restore FF for UB

Fix getPortLocation function

…tion

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

Use 'else if' to improve efficiency

…tion

brianmanley-caci

Looks good 🎉

danieljordan-caci

Some smaller changes, also please update the storybook - ShipmentDetails.stories.jsx

Right now it's showing blank locations - should have at least one

danieljordan-caci · 2025-01-07T17:09:50Z

src/utils/shipmentDisplay.jsx

+/**
+ * @description This function is used to format the port in the
+ * ShipmentAddresses component.
+ * It displays only the port code, port name, city, state and zip code.
+ * */
+export function formatPortInfo(port) {
+  if (port) {
+    return `${port.portCode} - ${port.portName}\n${port.city}, ${port.state} ${port.zip}`;
+  }
+  return '-';
+}
+


Can you move this to formatters.js instead of here? I think potentially we will need this in a more broad form throughout the app and that file seems more relevant.

This isn't a hill I want to die on, but I'd prefer Seattle, Washington over SEATTLE, WASHINGTON y'know? Not enforcing it, just want to bring that up.

Got this here 17cb068

src/components/Office/ShipmentAddresses/ShipmentAddresses.jsx

danieljordan-caci · 2025-01-07T17:12:13Z

pkg/services/mto_shipment/mto_shipment_fetcher.go

+		for _, serviceItem := range shipments[i].MTOServiceItems {
+			if serviceItem.PODLocation != nil {
+				loadErr := appCtx.DB().Load(serviceItem.PODLocation, "City", "Country", "UsPostRegionCity.UsPostRegion.State")
+				if loadErr != nil {
+					return nil, loadErr
+				}
+			}
+			if serviceItem.POELocation != nil {
+				loadErr := appCtx.DB().Load(serviceItem.POELocation, "City", "Country", "UsPostRegionCity.UsPostRegion.State")
+				if loadErr != nil {
+					return nil, loadErr
+				}
+			}
+		}


Can you update/add a test to reflect these changes?

Got this here f960e09

Add poe location to ShipmentDetails.stories.jsx

Hide POE/POD Location UI if there isn't a value

Move port location formatter to formatters.js Add toTitleCase function to formatters.js Update test files

Start adding test to mto_shipment_fetcher_test.go

Fix serviceItemPortFSC to link to shipment model and pass DB argument

…OD-POE_TOO_Validation

msaki-caci · 2025-01-08T15:07:59Z

Some smaller changes, also please update the storybook - ShipmentDetails.stories.jsx

Right now it's showing blank locations - should have at least one

Got this here f0d0742

Update test on ShipmentAddresses.test.jsx

…OD-POE_TOO_Validation

…tion

danieljordan-caci

LGTM! Tested CONUS -> OCONUS, OCONUS -> CONUS, intra-AK, and domestic. Port info only shows up when it should. Good work.

…tion

msaki-caci added 19 commits December 10, 2024 18:23

Merge MAIN-B-21505 into MAIN-B-21507

5ecb361

Merge MAIN-B-21505 into MAIN-B-21507

60572ec

B-21507

ea054ca

Add descriptions for POE/POD Locations in swagger.

B-21507

f229337

Update API call to pull Port info Update MTOShipment.yaml to include Port

Merge branch 'main' into MAIN-B-21507

329f2d9

B-21507

deeb1d5

Add POE/POD Location to MTOShipment payload Make methods to pull the port location into the payload update swagger definitions for POE/POD locations

B-21507

a416aaa

Display Port Location and data on frontend MTO page

B-21507

14e927f

Pull the port location back in mto_shipment_fetcher

B-21507

6ea7a07

Add shipment display function for ports

B-21507

1c54b1d

Add Port Name and refactor format in shipment display

Merge branch 'main' into MAIN-B-21507

db32cbd

Merge branch 'MAIN-B-21505' into MAIN-B-21507

4b45b01

Merge branch 'MAIN-B-21505' into MAIN-B-21507

fc704b8

MAIN-B-21507

5f72b9a

Consolidate getPoeLocation with getPodLocation for DRY code

B-21507

2e95c4b

update comment

B-21507

a58ee66

Add port tests to model to payload for ghcapi

B-21507

1b215b8

Restore FF for UB

B-21507

c6f0ec0

Fix getPortLocation function

Merge branch 'MAIN-B-21507' into INT-B-21507

a643ee2

msaki-caci added INTEGRATION Slated for Integration Testing Go-Rillaz Go-Rillaz frontend backend labels Dec 26, 2024

msaki-caci requested review from deandreJones, danieljordan-caci, taeJungCaci, r-mettler, brianmanley-caci, elizabeth-perkins and samaysofo December 26, 2024 22:04

msaki-caci added 2 commits January 6, 2025 17:38

Merge branch 'MAIN-B-21507' into INT-B-21507

b71c9a9

Merge branch 'integrationTesting' into INT-B-21507_POD-POE_TOO_Valida…

b88fa45

…tion

brianmanley-caci reviewed Jan 6, 2025

View reviewed changes

pkg/handlers/ghcapi/internal/payloads/model_to_payload.go Outdated Show resolved Hide resolved

msaki-caci and others added 4 commits January 6, 2025 21:34

B-21507

a77c1e9

Use 'else if' to improve efficiency

Merge branch 'MAIN-B-21507' into INT-B-21507

78c6dbd

Merge branch 'integrationTesting' into INT-B-21507_POD-POE_TOO_Valida…

75c8c89

…tion

Merge branch 'integrationTesting' into INT-B-21507_POD-POE_TOO_Valida…

ba5bc84

…tion

brianmanley-caci self-requested a review January 7, 2025 14:21

brianmanley-caci previously approved these changes Jan 7, 2025

View reviewed changes

danieljordan-caci requested changes Jan 7, 2025

View reviewed changes

msaki-caci added 6 commits January 7, 2025 18:07

B-21507

f0d0742

Add poe location to ShipmentDetails.stories.jsx

B-21507

4ed67d0

Hide POE/POD Location UI if there isn't a value

B-21507

17cb068

Move port location formatter to formatters.js Add toTitleCase function to formatters.js Update test files

B-21507

502e892

Start adding test to mto_shipment_fetcher_test.go

B-21507

f960e09

Fix serviceItemPortFSC to link to shipment model and pass DB argument

Merge branch 'MAIN-B-21507_POD-POE_TOO_Validation' into INT-B-21507_P…

9cb77f9

…OD-POE_TOO_Validation

msaki-caci dismissed brianmanley-caci’s stale review via 9cb77f9 January 8, 2025 15:04

msaki-caci added 3 commits January 8, 2025 15:43

B-21507

d2e43bc

Update test on ShipmentAddresses.test.jsx

Merge branch 'MAIN-B-21507_POD-POE_TOO_Validation' into INT-B-21507_P…

d66bebd

…OD-POE_TOO_Validation

Merge branch 'integrationTesting' into INT-B-21507_POD-POE_TOO_Valida…

6f6b88b

…tion

danieljordan-caci self-requested a review January 8, 2025 18:22

danieljordan-caci approved these changes Jan 8, 2025

View reviewed changes

brianmanley-caci self-requested a review January 8, 2025 18:44

brianmanley-caci approved these changes Jan 8, 2025

View reviewed changes

Merge branch 'integrationTesting' into INT-B-21507_POD-POE_TOO_Valida…

a5be26c

…tion

msaki-caci merged commit b5abcdc into integrationTesting Jan 8, 2025
34 checks passed

msaki-caci deleted the INT-B-21507_POD-POE_TOO_Validation branch January 8, 2025 19:59

This was referenced Jan 10, 2025

Int b 21507 pod poe too validation #14557

Merged

Main b 21507 pod poe too validation #14556

Open

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Int b 21507 pod poe too validation #14475

Int b 21507 pod poe too validation #14475

msaki-caci commented Dec 26, 2024 •

edited

Loading

brianmanley-caci left a comment

danieljordan-caci left a comment •

edited

Loading

danieljordan-caci Jan 7, 2025

msaki-caci Jan 8, 2025

danieljordan-caci Jan 7, 2025

msaki-caci Jan 8, 2025

msaki-caci commented Jan 8, 2025

danieljordan-caci left a comment

Int b 21507 pod poe too validation #14475

Int b 21507 pod poe too validation #14475

Conversation

msaki-caci commented Dec 26, 2024 • edited Loading

B-21507

Summary

Verification Steps for the Author

Verification Steps for Reviewers

Setup to Run the Code

How to test

Frontend

Backend

Screenshots

brianmanley-caci left a comment

Choose a reason for hiding this comment

danieljordan-caci left a comment • edited Loading

Choose a reason for hiding this comment

danieljordan-caci Jan 7, 2025

Choose a reason for hiding this comment

msaki-caci Jan 8, 2025

Choose a reason for hiding this comment

danieljordan-caci Jan 7, 2025

Choose a reason for hiding this comment

msaki-caci Jan 8, 2025

Choose a reason for hiding this comment

msaki-caci commented Jan 8, 2025

danieljordan-caci left a comment

Choose a reason for hiding this comment

msaki-caci commented Dec 26, 2024 •

edited

Loading

danieljordan-caci left a comment •

edited

Loading