Merge pull request #12237 from transcom/B-18329-remove-na-from-address

B-18329 Remove N/A customer's address
transcom · Mar 15, 2024 · b3aad1f · b3aad1f
2 parents 6a7c882 + 53991dc
commit b3aad1f
Show file tree

Hide file tree

Showing 5 changed files with 93 additions and 5 deletions.
diff --git a/pkg/handlers/ghcapi/internal/payloads/model_to_payload.go b/pkg/handlers/ghcapi/internal/payloads/model_to_payload.go
@@ -781,6 +781,8 @@ func PPMShipment(_ storage.FileStorer, ppmShipment *models.PPMShipment) *ghcmess
 		SecondaryDestinationPostalCode: ppmShipment.SecondaryDestinationPostalCode,
 		ActualDestinationPostalCode:    ppmShipment.ActualDestinationPostalCode,
 		SitExpected:                    ppmShipment.SITExpected,
+		PickupAddress:                  Address(ppmShipment.PickupAddress),
+		DestinationAddress:             Address(ppmShipment.DestinationAddress),
 		EstimatedWeight:                handlers.FmtPoundPtr(ppmShipment.EstimatedWeight),
 		HasProGear:                     ppmShipment.HasProGear,
 		ProGearWeight:                  handlers.FmtPoundPtr(ppmShipment.ProGearWeight),

diff --git a/pkg/handlers/ghcapi/internal/payloads/model_to_payload_test.go b/pkg/handlers/ghcapi/internal/payloads/model_to_payload_test.go
@@ -21,6 +21,54 @@ func TestMove(_ *testing.T) {
 	Move(&models.Move{})
 }
 
+func (suite *PayloadsSuite) TestFetchPPMShipment() {
+
+	ppmShipmentID, _ := uuid.NewV4()
+	streetAddress1 := "MacDill AFB"
+	streetAddress2, streetAddress3 := "", ""
+	city := "Tampa"
+	state := "FL"
+	postalcode := "33621"
+	country := "US"
+
+	expectedAddress := models.Address{
+		StreetAddress1: streetAddress1,
+		StreetAddress2: &streetAddress2,
+		StreetAddress3: &streetAddress3,
+		City:           city,
+		State:          state,
+		PostalCode:     postalcode,
+		Country:        &country,
+	}
+
+	expectedPPMShipment := models.PPMShipment{
+		ID:                 ppmShipmentID,
+		PickupAddress:      &expectedAddress,
+		DestinationAddress: &expectedAddress,
+	}
+
+	suite.Run("Success -", func() {
+		returnedPPMShipment := PPMShipment(nil, &expectedPPMShipment)
+
+		suite.IsType(returnedPPMShipment, &ghcmessages.PPMShipment{})
+		suite.Equal(&streetAddress1, returnedPPMShipment.PickupAddress.StreetAddress1)
+		suite.Equal(expectedPPMShipment.PickupAddress.StreetAddress2, returnedPPMShipment.PickupAddress.StreetAddress2)
+		suite.Equal(expectedPPMShipment.PickupAddress.StreetAddress3, returnedPPMShipment.PickupAddress.StreetAddress3)
+		suite.Equal(&postalcode, returnedPPMShipment.PickupAddress.PostalCode)
+		suite.Equal(&city, returnedPPMShipment.PickupAddress.City)
+		suite.Equal(&state, returnedPPMShipment.PickupAddress.State)
+		suite.Equal(&country, returnedPPMShipment.PickupAddress.Country)
+
+		suite.Equal(&streetAddress1, returnedPPMShipment.DestinationAddress.StreetAddress1)
+		suite.Equal(expectedPPMShipment.DestinationAddress.StreetAddress2, returnedPPMShipment.DestinationAddress.StreetAddress2)
+		suite.Equal(expectedPPMShipment.DestinationAddress.StreetAddress3, returnedPPMShipment.DestinationAddress.StreetAddress3)
+		suite.Equal(&postalcode, returnedPPMShipment.DestinationAddress.PostalCode)
+		suite.Equal(&city, returnedPPMShipment.DestinationAddress.City)
+		suite.Equal(&state, returnedPPMShipment.DestinationAddress.State)
+		suite.Equal(&country, returnedPPMShipment.DestinationAddress.Country)
+	})
+}
+
 func (suite *PayloadsSuite) TestUpload() {
 	uploadID, _ := uuid.NewV4()
 	testURL := "https://testurl.com"

diff --git a/src/components/Office/ShipmentAddresses/ShipmentAddresses.test.jsx b/src/components/Office/ShipmentAddresses/ShipmentAddresses.test.jsx
@@ -28,7 +28,7 @@ const testProps = {
     country: 'USA',
   },
   destinationDutyLocation: {
-    streetAddress1: '',
+    streetAddress1: 'Street Address',
     city: 'Fort Irwin',
     state: 'CA',
     postalCode: '92310',
@@ -42,6 +42,33 @@ const testProps = {
   },
 };
 
+const ppmShipment = {
+  pickupAddress: {
+    city: 'Tampa',
+    state: 'FL',
+    postalCode: '33621',
+    streetAddress1: '123 Fake Street',
+    streetAddress2: '',
+    streetAddress3: '',
+    country: 'USA',
+  },
+  destinationAddress: {
+    city: 'Chicago',
+    state: 'IL',
+    postalCode: '01054',
+    streetAddress1: '5 Main Street',
+    streetAddress2: '',
+    streetAddress3: '',
+    country: 'USA',
+  },
+  shipmentInfo: {
+    id: '1234',
+    eTag: 'abc123',
+    status: 'APPROVED',
+    shipmentType: SHIPMENT_OPTIONS.PPM,
+  },
+};
+
 const cancelledShipment = {
   pickupAddress: {
     city: 'Fairfax',
@@ -141,4 +168,11 @@ describe('ShipmentAddresses', () => {
     expect(screen.getByText('Facility address')).toBeInTheDocument();
     expect(screen.getByText('Delivery address')).toBeInTheDocument();
   });
+
+  it('shows correct headings for PPM', () => {
+    render(<ShipmentAddresses {...ppmShipment} />);
+
+    expect(screen.getByText("Customer's addresses")).toBeInTheDocument();
+    expect(screen.getByText('Authorized addresses')).toBeInTheDocument();
+  });
 });
diff --git a/src/components/Office/ShipmentDetails/ShipmentDetailsMain.jsx b/src/components/Office/ShipmentDetails/ShipmentDetailsMain.jsx
@@ -161,8 +161,8 @@ const ShipmentDetailsMain = ({
       plannedMoveDate = ppmShipment.expectedDepartureDate;
       actualMoveDate = ppmShipment.actualMoveDate;
       weightResult = ppmShipment.estimatedWeight;
-      displayedPickupAddress = pickupAddress;
-      displayedDeliveryAddress = destinationAddress || destinationDutyLocationAddress;
+      displayedPickupAddress = ppmShipment.pickupAddress;
+      displayedDeliveryAddress = ppmShipment.destinationAddress || destinationDutyLocationAddress;
       break;
     default:
       pickupRequestedDate = requestedPickupDate;

diff --git a/src/utils/shipmentDisplay.jsx b/src/utils/shipmentDisplay.jsx
@@ -6,8 +6,12 @@ import { LOA_TYPE, shipmentOptionLabels } from 'shared/constants';
 import { shipmentStatuses, shipmentModificationTypes } from 'constants/shipments';
 import affiliations from 'content/serviceMemberAgencies';
 
-export function formatAddress(address) {
-  const { streetAddress1, streetAddress2, city, state, postalCode } = address;
+export function formatAddress(pickupAddress) {
+  const { streetAddress1, streetAddress2, city, state, postalCode } = pickupAddress;
+
+  if (streetAddress1 === 'n/a') {
+    return city ? `${city}, ${state} ${postalCode}` : postalCode;
+  }
   return (
     <>
       {streetAddress1 && <>{streetAddress1},&nbsp;</>}