Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

B-21054 Prime can add second/third addresses to existing shipments #13691

Merged
merged 7 commits into from
Sep 23, 2024
Merged

B-21054 Prime can add second/third addresses to existing shipments #13691

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
f6a9d8a
Merge branch 'B-21040-MAIN' into B-21041-MAIN
paulstonebraker Sep 9, 2024
17202f7
update prime to allow adding of second/third addresses to shipments
paulstonebraker Sep 11, 2024
4a8b9e1
update for NTS and NTSR
paulstonebraker Sep 11, 2024
615a908
update playwright test to account for new fields
paulstonebraker Sep 12, 2024
2211099
update yaml comment
paulstonebraker Sep 12, 2024
4c8d9e0
Merge branch main into B-21054-MAIN
paulstonebraker Sep 20, 2024
99f623e
Merge branch 'main' into B-21054-MAIN
pambecker Sep 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
84 changes: 84 additions & 0 deletions pkg/gen/primev3api/embedded_spec.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

52 changes: 52 additions & 0 deletions pkg/gen/primev3messages/update_m_t_o_shipment.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

60 changes: 60 additions & 0 deletions pkg/gen/primev3messages/update_p_p_m_shipment.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

34 changes: 34 additions & 0 deletions pkg/handlers/primeapiv3/payloads/payload_to_model.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -341,6 +341,14 @@ func MTOShipmentModelFromUpdate(mtoShipment *primev3messages.UpdateMTOShipment,
model.HasSecondaryPickupAddress = handlers.FmtBool(true)
}

addressModel = AddressModel(&mtoShipment.TertiaryPickupAddress.Address)
if addressModel != nil {
model.TertiaryPickupAddress = addressModel
tertiaryPickupAddressID := uuid.FromStringOrNil(addressModel.ID.String())
model.TertiaryPickupAddressID = &tertiaryPickupAddressID
model.HasTertiaryPickupAddress = handlers.FmtBool(true)
}

addressModel = AddressModel(&mtoShipment.SecondaryDeliveryAddress.Address)
if addressModel != nil {
model.SecondaryDeliveryAddress = addressModel
Expand All @@ -349,6 +357,14 @@ func MTOShipmentModelFromUpdate(mtoShipment *primev3messages.UpdateMTOShipment,
model.HasSecondaryDeliveryAddress = handlers.FmtBool(true)
}

addressModel = AddressModel(&mtoShipment.TertiaryDeliveryAddress.Address)
if addressModel != nil {
model.TertiaryDeliveryAddress = addressModel
tertiaryDeliveryAddressID := uuid.FromStringOrNil(addressModel.ID.String())
model.TertiaryDeliveryAddressID = &tertiaryDeliveryAddressID
model.HasTertiaryDeliveryAddress = handlers.FmtBool(true)
}

if mtoShipment.PpmShipment != nil {
model.PPMShipment = PPMShipmentModelFromUpdate(mtoShipment.PpmShipment)
model.PPMShipment.Shipment = *model
Expand Down Expand Up @@ -391,6 +407,15 @@ func PPMShipmentModelFromUpdate(ppmShipment *primev3messages.UpdatePPMShipment)
}
}

if ppmShipment.HasTertiaryPickupAddress != nil && *ppmShipment.HasTertiaryPickupAddress {
addressModel = AddressModel(&ppmShipment.TertiaryPickupAddress.Address)
if addressModel != nil {
model.TertiaryPickupAddress = addressModel
tertiaryPickupAddressID := uuid.FromStringOrNil(addressModel.ID.String())
model.TertiaryPickupAddressID = &tertiaryPickupAddressID
}
}

addressModel = AddressModel(&ppmShipment.DestinationAddress.Address)
if addressModel != nil {
model.DestinationAddress = addressModel
Expand All @@ -406,6 +431,15 @@ func PPMShipmentModelFromUpdate(ppmShipment *primev3messages.UpdatePPMShipment)
}
}

if ppmShipment.HasTertiaryDestinationAddress != nil && *ppmShipment.HasTertiaryDestinationAddress {
addressModel = AddressModel(&ppmShipment.TertiaryDestinationAddress.Address)
if addressModel != nil {
model.TertiaryDestinationAddress = addressModel
tertiaryDestinationAddressID := uuid.FromStringOrNil(addressModel.ID.String())
model.TertiaryDestinationAddressID = &tertiaryDestinationAddressID
}
}

expectedDepartureDate := handlers.FmtDatePtrToPopPtr(ppmShipment.ExpectedDepartureDate)
if expectedDepartureDate != nil && !expectedDepartureDate.IsZero() {
model.ExpectedDepartureDate = *expectedDepartureDate
Expand Down
2 changes: 1 addition & 1 deletion playwright/tests/office/primesimulator/primeSimulatorFlows.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@ test.describe('Prime simulator user', () => {
await page.locator('input[name="destinationAddress.city"]').fill('Joshua Tree');
await page.locator('select[name="destinationAddress.state"]').selectOption({ label: 'CA' });
await page.locator('input[name="destinationAddress.postalCode"]').fill('92252');
await page.getByTestId('dropdown').nth(1).selectOption('Home of record (HOR)');
await page.getByTestId('dropdown').nth(5).selectOption('Home of record (HOR)');

await page.getByText('Save').click();
await expect(page.getByText('Successfully updated shipment')).toHaveCount(1);
Expand Down
Loading
Loading