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.

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

B 22015 #14878

Merged
merged 10 commits into from
Feb 26, 2025
Merged

B 22015 #14878

merged 10 commits into from
Feb 26, 2025

Conversation

antgmann
Copy link
Contributor

@antgmann antgmann commented Feb 24, 2025

B-22015

Requires B-21473 to be merged first (complete).

This story was also identified as an upstream in order to deconflict work, however this may not be necessary. The implementation just had to support both stories, not necessarily proceed in order.

To elaborate, this pr was merged first with a solution that didn't work well with Paul's upstream, B-21473. This caused issues with this pr, and was brought in line with one another in this pr. The changes in this current PR that are not included in the integration PR can be found in the one just linked. Since then, additional changes have been required for B-21378 such as in this pr, that chronologically occur after the integration PR for 22015. This leads me to think that this is a false upstream that should be removed, and instead just monitored as a risk for merge conflicts. Please let me know any thoughts or opinions on this.

INT PR

Summary

This ticket attempts to add some NSRA15 rate area transit times of 60 for HHG and 30 for UB when calculating the required delivery date when traveling between these areas. These transit times are added to the estimated transit time for the domestic rate area provided to find the correct RDD. Some small backend changes had to be made to allow for shipment types to be selected to determine whether to apply the HHG or UB rate. Also of note, the provided database migration in Agility had to be altered to remove some duplicate values, and to set all of the values to Active so that they may be used in the calculation.

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?

How to test

NOTE: Make sure the FEATURE_FLAG_UNACCOMPANIED_BAGGAGE is ON and your duty location is OCONUS in order to be able to create a UB shipment

  1. Access the application as a customer
  2. Create a new move
  3. When adding shipments, add preferably 2 HHG and 2 UB. One of each kind will be using the NSRA15 location as origin, the other as destination. A handy zip code that falls within NSRA15 is 99721 for ANAKTUVUK AK, but others can be found if you search your database after running the migration.
  4. Submit your move.
  5. Log in as SC, approve the shipments.
  6. Log in as TOO, approve and send to prime.
  7. Log in as Prime, update the shipments with pickup dates, weights, etc.
  8. Log back in as TOO, view the Move Task Order page and observe the Required Delivery Date is greater than or equal to 60 days away from the pickup date for HHG, and 30 days for UB. These days are added to the domestic time, so the RDD can be quite some time away.

Backend

Database

Any new migrations/schema changes:

  • Follows our guidelines for Zero-Downtime Deploys.
  • Have been communicated to #g-database.
  • Secure migrations have been tested following the instructions in our docs.

Screenshots

Pasted Graphic 7 Pasted Graphic 8

@antgmann
Copy link
Contributor Author

Marking as ready for review to field thoughts on the potential removal of the upstream

@antgmann antgmann marked this pull request as ready for review February 25, 2025 17:21
@antgmann antgmann requested a review from a team as a code owner February 25, 2025 17:21
Copy link
Contributor

@ajlusk ajlusk left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Some the the changes in the main PR made their way into integrationTesting via a different PR that required the same changes. Those diffs were in integration when this backlog item was PO accepted so while it is a little messy this seems fine to me.

@r-mettler
Copy link
Contributor

Concur that B-21378 doesn't appear to be a upstream the implementation just needs to be able to support calculating RDD for NSRA15 rate areas as well as non NSRA15 rate areas.
The changes not present in the INT PR for B-22015 were added in the mentioned INT PR for B-21378. Everything looks good to me.

@r-mettler r-mettler merged commit 9703fbb into main Feb 26, 2025
11 of 14 checks passed
@r-mettler r-mettler deleted the B-22015 branch February 26, 2025 16:06
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Development

Successfully merging this pull request may close these issues.

3 participants