B 21367 INT B block third address if no second address is present #13954

joeydoyecaci · 2024-10-18T13:42:03Z

B-21367

Summary

Added new rules to MTO & PPM shipment validations to prevent tertiary addresses from being added/updated without a second one present. Additional utility functions added as well to support testing.

How to test.

Open Dbeaver and find a move ID to use later. Move should be in approved status
Open Postman, and run this one for Create http://primelocal:3000/prime/v3/mto-shipments using the following JSON

Example JSON

{
  "moveTaskOrderID": "99783f4d-ee83-4fc9-8e0c-d32496bef32b",
  "shipmentType": "PPM",
  "requestedPickupDate": "2024-01-01",
  "estimatedWeight": "1776",
  "pickupAddress": {
    "id": "tp1",
    "city": "Beverly Hills",
    "postalCode": "23231",
    "streetAddress1": "12 Any Street",
    "StreetAddress2": "P.O. Box 1234",
    "state": "CA"
  },
"tertiaryPickupAddress": {
    "id": "tp1",
    "city": "Beverly Hills",
    "postalCode": "23231",
    "streetAddress1": "12 Any Street",
    "StreetAddress2": "P.O. Box 1234",
    "state": "CA"
  },
    "destinationAddress": {
    "id": "tp2",
    "city": "Beverly Hills",
    "postalCode": "23231",
    "streetAddress1": "12 Any Street",
    "StreetAddress2": "P.O. Box 1234",
    "state": "CA"
  },
  "ppmShipment": {
    "expectedDepartureDate": "2024-01-01",
    "estimatedWeight": 2500,
    "hasProGear": false,
    "sitExpected": false,
    "pickupAddress": {
        "id": "ppmp1",
      "city": "Beverly Hills",
    "postalCode": "23231",
    "streetAddress1": "12 Any Street",
    "StreetAddress2": "P.O. Box 1234",
    "state": "CA"
    },
    "destinationAddress": {
        "id":"ppmd1",
      "city": "Beverly Hills",
    "postalCode": "23231",
    "streetAddress1": "12 Any Street",
    "StreetAddress2": "P.O. Box 1234",
    "state": "CA"
    },
  }
}

This should cause a validation error as a result

Run create shipment again using the following JSON

Example JSON

{
  "moveTaskOrderID": "99783f4d-ee83-4fc9-8e0c-d32496bef32b",
  "shipmentType": "PPM",
  "requestedPickupDate": "2024-01-01",
  "estimatedWeight": "1776",
  "pickupAddress": {
    "id": "tp1",
    "city": "Beverly Hills",
    "postalCode": "23231",
    "streetAddress1": "12 Any Street",
    "StreetAddress2": "P.O. Box 1234",
    "state": "CA"
  },
    "destinationAddress": {
    "id": "tp2",
    "city": "Beverly Hills",
    "postalCode": "23231",
    "streetAddress1": "12 Any Street",
    "StreetAddress2": "P.O. Box 1234",
    "state": "CA"
  },
"tertiaryDestinationAddress": {
    "id": "tp1",
    "city": "Beverly Hills",
    "postalCode": "23231",
    "streetAddress1": "12 Any Street",
    "StreetAddress2": "P.O. Box 1234",
    "state": "CA"
  },
  "ppmShipment": {
    "expectedDepartureDate": "2024-01-01",
    "estimatedWeight": 2500,
    "hasProGear": false,
    "sitExpected": false,
    "pickupAddress": {
        "id": "ppmp1",
      "city": "Beverly Hills",
    "postalCode": "23231",
    "streetAddress1": "12 Any Street",
    "StreetAddress2": "P.O. Box 1234",
    "state": "CA"
    },
    "destinationAddress": {
        "id":"ppmd1",
      "city": "Beverly Hills",
    "postalCode": "23231",
    "streetAddress1": "12 Any Street",
    "StreetAddress2": "P.O. Box 1234",
    "state": "CA"
    },
  }
}

An error should be returned here as well

Run Create MTO shipment again using this JSON

Example JSON

{
  "moveTaskOrderID": "99783f4d-ee83-4fc9-8e0c-d32496bef32b",
  "shipmentType": "PPM",
  "requestedPickupDate": "2024-01-01",
  "estimatedWeight": "1776",
  "pickupAddress": {
    "id": "tp1",
    "city": "Beverly Hills",
    "postalCode": "23231",
    "streetAddress1": "12 Any Street",
    "StreetAddress2": "P.O. Box 1234",
    "state": "CA"
  },
    "destinationAddress": {
    "id": "tp2",
    "city": "Beverly Hills",
    "postalCode": "23231",
    "streetAddress1": "12 Any Street",
    "StreetAddress2": "P.O. Box 1234",
    "state": "CA"
  },
"tertiaryDestinationAddress": {
    "id": "tp1",
    "city": "Beverly Hills",
    "postalCode": "23231",
    "streetAddress1": "12 Any Street",
    "StreetAddress2": "P.O. Box 1234",
    "state": "CA"
  },
  "ppmShipment": {
    "expectedDepartureDate": "2024-01-01",
    "estimatedWeight": 2500,
    "hasProGear": false,
    "sitExpected": false,
    "pickupAddress": {
        "id": "ppmp1",
      "city": "Beverly Hills",
    "postalCode": "23231",
    "streetAddress1": "12 Any Street",
    "StreetAddress2": "P.O. Box 1234",
    "state": "CA"
    },
"secondaryPickupAddress": {
        "id": "ppmp1",
      "city": "Beverly Hills",
    "postalCode": "23231",
    "streetAddress1": "12 Any Street",
    "StreetAddress2": "P.O. Box 1234",
    "state": "CA"
    },
    "destinationAddress": {
        "id":"ppmd1",
      "city": "Beverly Hills",
    "postalCode": "23231",
    "streetAddress1": "12 Any Street",
    "StreetAddress2": "P.O. Box 1234",
    "state": "CA"
    },
  }
}

Run this JSON for create MTO Shipment

Example JSON

{
  "moveTaskOrderID": "99783f4d-ee83-4fc9-8e0c-d32496bef32b",
  "shipmentType": "PPM",
  "requestedPickupDate": "2024-01-01",
  "estimatedWeight": "1776",
  "pickupAddress": {
    "id": "tp1",
    "city": "Beverly Hills",
    "postalCode": "23231",
    "streetAddress1": "12 Any Street",
    "StreetAddress2": "P.O. Box 1234",
    "state": "CA"
  },
    "destinationAddress": {
    "id": "tp2",
    "city": "Beverly Hills",
    "postalCode": "23231",
    "streetAddress1": "12 Any Street",
    "StreetAddress2": "P.O. Box 1234",
    "state": "CA"
  },
"tertiaryDestinationAddress": {
    "id": "tp1",
    "city": "Beverly Hills",
    "postalCode": "23231",
    "streetAddress1": "12 Any Street",
    "StreetAddress2": "P.O. Box 1234",
    "state": "CA"
  },
  "ppmShipment": {
    "expectedDepartureDate": "2024-01-01",
    "estimatedWeight": 2500,
    "hasProGear": false,
    "sitExpected": false,
    "pickupAddress": {
        "id": "ppmp1",
      "city": "Beverly Hills",
    "postalCode": "23231",
    "streetAddress1": "12 Any Street",
    "StreetAddress2": "P.O. Box 1234",
    "state": "CA"
    },
"secondaryPickupAddress": {
        "id": "ppmp1",
      "city": "Beverly Hills",
    "postalCode": "23231",
    "streetAddress1": "12 Any Street",
    "StreetAddress2": "P.O. Box 1234",
    "state": "CA"
    },
    "destinationAddress": {
        "id":"ppmd1",
      "city": "Beverly Hills",
    "postalCode": "23231",
    "streetAddress1": "12 Any Street",
    "StreetAddress2": "P.O. Box 1234",
    "state": "CA"
    },
"tertiaryDestinationAddress": {
        "id":"ppmd1",
      "city": "Beverly Hills",
    "postalCode": "23231",
    "streetAddress1": "12 Any Street",
    "StreetAddress2": "P.O. Box 1234",
    "state": "CA"
    },
  }
}

This should cause an error as well

Run this JSON with create MTO shipment, this should return OK

Example JSON

``` JSON{ "moveTaskOrderID": "99783f4d-ee83-4fc9-8e0c-d32496bef32b", "shipmentType": "PPM", "requestedPickupDate": "2024-01-01", "estimatedWeight": "1776", "pickupAddress": { "id": "tp1", "city": "Beverly Hills", "postalCode": "23231", "streetAddress1": "12 Any Street", "StreetAddress2": "P.O. Box 1234", "state": "CA" }, "secondaryPickupAddress": { "id": "tp2", "city": "Beverly Hills", "postalCode": "23231", "streetAddress1": "12 Any Street", "StreetAddress2": "P.O. Box 1234", "state": "CA" }, "tertiaryPickupAddress": { "id": "tp2", "city": "Beverly Hills", "postalCode": "23231", "streetAddress1": "12 Any Street", "StreetAddress2": "P.O. Box 1234", "state": "CA" }, "destinationAddress": { "id": "tp2", "city": "Beverly Hills", "postalCode": "23231", "streetAddress1": "12 Any Street", "StreetAddress2": "P.O. Box 1234", "state": "CA" }, "secondaryDestinationAddress": { "id": "tp2", "city": "Beverly Hills", "postalCode": "23231", "streetAddress1": "12 Any Street", "StreetAddress2": "P.O. Box 1234", "state": "CA" }, "tertiaryDestinationAddress": { "id": "tp1", "city": "Beverly Hills", "postalCode": "23231", "streetAddress1": "12 Any Street", "StreetAddress2": "P.O. Box 1234", "state": "CA" }, "ppmShipment": { "expectedDepartureDate": "2024-01-01", "estimatedWeight": 2500, "hasProGear": false, "sitExpected": false, "pickupAddress": { "id": "ppmp1", "city": "Beverly Hills", "postalCode": "23231", "streetAddress1": "12 Any Street", "StreetAddress2": "P.O. Box 1234", "state": "CA" }, "secondaryPickupAddress": { "id": "ppmp1", "city": "Beverly Hills", "postalCode": "23231", "streetAddress1": "12 Any Street", "StreetAddress2": "P.O. Box 1234", "state": "CA" }, "destinationAddress": { "id":"ppmd1", "city": "Beverly Hills", "postalCode": "23231", "streetAddress1": "12 Any Street", "StreetAddress2": "P.O. Box 1234", "state": "CA" }, "secondaryDestinationAddress": { "id":"ppmd1", "city": "Beverly Hills", "postalCode": "23231", "streetAddress1": "12 Any Street", "StreetAddress2": "P.O. Box 1234", "state": "CA" }, "tertiaryDestinationAddress": { "id":"ppmd1", "city": "Beverly Hills", "postalCode": "23231", "streetAddress1": "12 Any Street", "StreetAddress2": "P.O. Box 1234", "state": "CA" }, } }```

this should return OK

Create another shipment with only the base addresses

Example JSON

``` JSON{ "moveTaskOrderID": "99783f4d-ee83-4fc9-8e0c-d32496bef32b", "shipmentType": "PPM", "requestedPickupDate": "2024-01-01", "estimatedWeight": "1776", "pickupAddress": { "id": "tp1", "city": "Beverly Hills", "postalCode": "23231", "streetAddress1": "12 Any Street", "StreetAddress2": "P.O. Box 1234", "state": "CA" }, "destinationAddress": { "id": "tp2", "city": "Beverly Hills", "postalCode": "23231", "streetAddress1": "12 Any Street", "StreetAddress2": "P.O. Box 1234", "state": "CA" }, "ppmShipment": { "expectedDepartureDate": "2024-01-01", "estimatedWeight": 2500, "hasProGear": false, "sitExpected": false, "pickupAddress": { "id": "ppmp1", "city": "Beverly Hills", "postalCode": "23231", "streetAddress1": "12 Any Street", "StreetAddress2": "P.O. Box 1234", "state": "CA" }, "destinationAddress": { "id":"ppmd1", "city": "Beverly Hills", "postalCode": "23231", "streetAddress1": "12 Any Street", "StreetAddress2": "P.O. Box 1234", "state": "CA" }, } }```

then in the results note the eTag
This value WILL change each and every time mto shipment is run, running an old one will yield an IF-Match precondition error!

run {{baseUrl}}/prime/v3/mto-shipments/:mtoShipmentID with the mto shipment ID added in the params, with the following json added in the body

Example JSON

``` JSON{ "ppmShipment": { "expectedDepartureDate": "2024-01-01", "estimatedWeight": 2500, "hasProGear": false, "sitExpected": false, "pickupAddress": { "id": "ppmp1", "city": "Beverly Hills", "postalCode": "23231", "streetAddress1": "12 Any Street", "StreetAddress2": "P.O. Box 1234", "state": "CA" }, "tertiaryPickupAddress": { "id": "ppmp3", "city": "Beverly Hills", "postalCode": "23231", "streetAddress1": "12 Any Street", "StreetAddress2": "P.O. Box 1234", "state": "CA" }, "destinationAddress": { "id":"ppmd1", "city": "Beverly Hills", "postalCode": "23231", "streetAddress1": "12 Any Street", "StreetAddress2": "P.O. Box 1234", "state": "CA" } } }```

This should yield an error like before

Update the eTag (you may need to pull it from the swagger "getMtoShipment" if the one for the shipment in the DB doesn't work. Rerun update-mto-shipment using the same shipment ID and the following JSON

Example JSON

``` JSON{ "ppmShipment": { "expectedDepartureDate": "2024-01-01", "estimatedWeight": 2500, "hasProGear": false, "sitExpected": false, "pickupAddress": { "id": "ppmp1", "city": "Beverly Hills", "postalCode": "23231", "streetAddress1": "12 Any Street", "StreetAddress2": "P.O. Box 1234", "state": "CA" }, "secondaryPickupAddress": { "id": "ppmp3", "city": "Beverly Hills", "postalCode": "23231", "streetAddress1": "12 Any Street", "StreetAddress2": "P.O. Box 1234", "state": "CA" }, "tertiaryPickupAddress": { "id": "ppmp3", "city": "Beverly Hills", "postalCode": "23231", "streetAddress1": "12 Any Street", "StreetAddress2": "P.O. Box 1234", "state": "CA" }, "destinationAddress": { "id":"ppmd1", "city": "Beverly Hills", "postalCode": "23231", "streetAddress1": "12 Any Street", "StreetAddress2": "P.O. Box 1234", "state": "CA" } "secondaryDestinationAddress": { "id": "ppmp3", "city": "Beverly Hills", "postalCode": "23231", "streetAddress1": "12 Any Street", "StreetAddress2": "P.O. Box 1234", "state": "CA" }, "tertiaryDestinationAddress": { "id": "ppmp3", "city": "Beverly Hills", "postalCode": "23231", "streetAddress1": "12 Any Street", "StreetAddress2": "P.O. Box 1234", "state": "CA" }, } }```

because the secondary addresses are present, this should pass.

…ess.

This reverts commit 8b7af07.

…ond-address-is-present

…-is-present' into B-21367-INT-B-Block-third-address-if-no-second-address-is-present

…ess-if-no-second-address-is-present

…ddress-is-present

…ess-if-no-second-address-is-present

…ddress-is-present

…ess-if-no-second-address-is-present

pkg/handlers/primeapiv3/payloads/payload_to_model.go

pkg/services/mto_shipment/rules.go

…resent' into B-21367-INT-B-Block-third-address-if-no-second-address-is-present

pambecker · 2024-10-24T16:52:05Z

conflicts

…resent' into B-21367-INT-B-Block-third-address-if-no-second-address-is-present

pambecker · 2024-11-01T12:24:17Z

I am not getting an error as expected when I try tertiary address and no secondary for PPMs, both pickup and destination.

joeydoyecaci · 2024-11-01T14:07:11Z

I am not getting an error as expected when I try tertiary address and no secondary for PPMs, both pickup and destination.

Additional context is required.
is this when calling the updateMTOShipment or createMTOShipment endpoint w/ PPM or both?

pambecker · 2024-11-01T15:10:10Z

I am not getting an error as expected when I try tertiary address and no secondary for PPMs, both pickup and destination.

Additional context is required. is this when calling the updateMTOShipment or createMTOShipment endpoint w/ PPM or both?

Sorry, I was testing the create, didn't look at update yet.

…ess-if-no-second-address-is-present

…or messages.

…ess-if-no-second-address-is-present

…ddress-is-present

…ess-if-no-second-address-is-present

…resent' into B-21367-INT-B-Block-third-address-if-no-second-address-is-present

…ddress-is-present

…esses for mto/ppm shipments

…resent' into B-21367-INT-B-Block-third-address-if-no-second-address-is-present

joeydoyecaci · 2024-11-15T12:39:43Z

The Playwright test failing in CI is passing locally.

pambecker · 2024-11-15T22:34:39Z

We can discuss on Monday when you are back, but I'm having problems getting an error for the update call and passing a PPMShipment with tertiary and no secondary.
Maybe someone else has tried this yet?

pambecker · 2024-11-18T15:58:43Z

We can discuss on Monday when you are back, but I'm having problems getting an error for the update call and passing a PPMShipment with tertiary and no secondary. Maybe someone else has tried this yet?

just for future and other testers. I wasn't aware that you have to pass the flag for PPM address updates. here's an example for the body in postman
{
"ppmShipment": {
"hasTertiaryPickupAddress": true,
"tertiaryPickupAddress": {
"id": "ppm3",
"city": "Beverly Hills",
"postalCode": "23231",
"streetAddress1": "12 new Any Street",
"StreetAddress2": "P.O. Box 1234",
"state": "CA"
}
}
}

…ess-if-no-second-address-is-present

joeydoyecaci added 5 commits October 17, 2024 21:37

Added validation rules for adding third address without a second addr…

Loading
Loading status checks…

9a9b3a5

…ess.

Merge Main into 21367 Main B

Loading
Loading status checks…

8b7af07

Revert "Merge Main into 21367 Main B"

Loading
Loading status checks…

33f2c0e

This reverts commit 8b7af07.

Merge branch 'main' into B-21367-MAIN-B-Block-third-address-if-no-sec…

Loading
Loading status checks…

e2a5b32

…ond-address-is-present

Merge branch 'B-21367-MAIN-B-Block-third-address-if-no-second-address…

Loading
Loading status checks…

bbd7c51

…-is-present' into B-21367-INT-B-Block-third-address-if-no-second-address-is-present

joeydoyecaci added INTEGRATION MAIN labels Oct 18, 2024

joeydoyecaci requested review from paulstonebraker, loganwc, pambecker and JonSpight October 18, 2024 13:42

joeydoyecaci self-assigned this Oct 18, 2024

joeydoyecaci marked this pull request as ready for review October 18, 2024 16:16

joeydoyecaci added 3 commits October 21, 2024 08:12

joeydoyecaci added G-Unit and removed MAIN labels Oct 22, 2024

joeydoyecaci added 5 commits October 22, 2024 10:28

pambecker reviewed Oct 23, 2024

View reviewed changes

pkg/handlers/primeapiv3/payloads/payload_to_model.go Outdated Show resolved Hide resolved

pkg/services/mto_shipment/rules.go Outdated Show resolved Hide resolved

joeydoyecaci added 4 commits October 23, 2024 19:00

Removed some duplicate code, and renamed rules function.

Loading
Loading status checks…

d0f2868

renamed mto/ppm shipment rules function.

Loading
Loading status checks…

fc27655

Merge branch 'B-21367-B-Block-third-address-if-no-second-address-is-p…

Loading
Loading status checks…

fb54293

…resent' into B-21367-INT-B-Block-third-address-if-no-second-address-is-present

Post merge prime feature flag fixes

Loading
Loading status checks…

01dadf1

joeydoyecaci and others added 4 commits October 31, 2024 13:05

Merge branch 'B-21367-B-Block-third-address-if-no-second-address-is-p…

Loading
Loading status checks…

bba58fd

…resent' into B-21367-INT-B-Block-third-address-if-no-second-address-is-present

Merge integrationTesting

Loading
Loading status checks…

bb8f1e2

remove bad merge conflict stuff

Loading
Loading status checks…

a82069d

fixed validation on 2nd address check

Loading
Loading status checks…

01b2b6a

begrohmann approved these changes Nov 1, 2024

View reviewed changes

joeydoyecaci and others added 9 commits November 4, 2024 10:31

Added additional test cases for mto_ppm_shipment validator. fixed err…

Loading
Loading status checks…

ba86dfe

…or messages.

merge main into B-21367

Loading
Loading status checks…

41fe629

Unit test revision to cover ppm shipments. fixes to errors as well.

Loading
Loading status checks…

6a60ccf

Merge branch 'main' into B-21367-B-Block-third-address-if-no-second-a…

Loading
Loading status checks…

a97a3c1

…ddress-is-present

Merge branch 'integrationTesting' into B-21367-INT-B-Block-third-addr…

7c7bdf8

…ess-if-no-second-address-is-present

Merge branch 'B-21367-B-Block-third-address-if-no-second-address-is-p…

Loading
Loading status checks…

57345b1

…resent' into B-21367-INT-B-Block-third-address-if-no-second-address-is-present

joeydoyecaci force-pushed the B-21367-INT-B-Block-third-address-if-no-second-address-is-present branch from 01716b9 to 57345b1 Compare November 8, 2024 13:02

joeydoyecaci added 4 commits November 14, 2024 20:13

Merge branch 'main' into B-21367-B-Block-third-address-if-no-second-a…

Loading
Loading status checks…

c058574

…ddress-is-present

Added fixes and additional unit tests for validation of multiple addr…

Loading
Loading status checks…

fe42092

…esses for mto/ppm shipments

Merged 'integrationTesting' into 'B-21367'

Loading
Loading status checks…

5c15c8f

Merge branch 'B-21367-B-Block-third-address-if-no-second-address-is-p…

Loading
Loading status checks…

67f7cc7

…resent' into B-21367-INT-B-Block-third-address-if-no-second-address-is-present

pambecker approved these changes Nov 18, 2024

View reviewed changes

loganwc approved these changes Nov 18, 2024

View reviewed changes

joeydoyecaci merged commit 8a4cdfb into integrationTesting Nov 18, 2024
30 checks passed

joeydoyecaci deleted the B-21367-INT-B-Block-third-address-if-no-second-address-is-present branch November 18, 2024 18:44

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

B 21367 INT B block third address if no second address is present #13954

B 21367 INT B block third address if no second address is present #13954

joeydoyecaci commented Oct 18, 2024 •

edited by pambecker

Loading

pambecker commented Oct 24, 2024

pambecker commented Nov 1, 2024

joeydoyecaci commented Nov 1, 2024 •

edited

Loading

pambecker commented Nov 1, 2024

joeydoyecaci commented Nov 15, 2024

pambecker commented Nov 15, 2024

pambecker commented Nov 18, 2024

B 21367 INT B block third address if no second address is present #13954

B 21367 INT B block third address if no second address is present #13954

Conversation

joeydoyecaci commented Oct 18, 2024 • edited by pambecker Loading

B-21367

Summary

How to test.

pambecker commented Oct 24, 2024

pambecker commented Nov 1, 2024

joeydoyecaci commented Nov 1, 2024 • edited Loading

pambecker commented Nov 1, 2024

joeydoyecaci commented Nov 15, 2024

pambecker commented Nov 15, 2024

pambecker commented Nov 18, 2024

joeydoyecaci commented Oct 18, 2024 •

edited by pambecker

Loading

joeydoyecaci commented Nov 1, 2024 •

edited

Loading