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 21934 int #14629

Merged
merged 26 commits into from
Jan 23, 2025
Merged
Show file tree
Hide file tree
Changes from 17 commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
9db96ef
Merge remote-tracking branch 'origin/b-21938-entitlement-refactor-mai…
deandreJones Jan 16, 2025
4e79c09
B-21934
deandreJones Jan 7, 2025
13764bc
B-21934
deandreJones Jan 17, 2025
6204fed
B-21934
deandreJones Jan 21, 2025
5dbc184
Merge branch 'integrationTesting' into B-21934-int
deandreJones Jan 21, 2025
62a3b44
merge conflict fixes
deandreJones Jan 21, 2025
f88c16a
Merge branch 'integrationTesting' into B-21934-int
deandreJones Jan 21, 2025
6f96ae7
add tests
deandreJones Jan 22, 2025
c1c37b5
Merge remote-tracking branch 'origin/B-21934-main' into B-21934-int2
deandreJones Jan 22, 2025
0cc7a3a
fix test
deandreJones Jan 22, 2025
9070c36
fix test
deandreJones Jan 22, 2025
b4a649f
fix test add to create orders payload
deandreJones Jan 22, 2025
0e728d4
Merge branch 'integrationTesting' into B-21934-int
deandreJones Jan 22, 2025
2bd35bd
test fix
deandreJones Jan 22, 2025
c3a23c4
test fix
deandreJones Jan 22, 2025
a25402d
missing in payload for v2 and 3
deandreJones Jan 22, 2025
c17a897
Merge remote-tracking branch 'origin/B-21934-main' into B-21934-int2
deandreJones Jan 22, 2025
5f26682
refactored
deandreJones Jan 23, 2025
6061c7b
Merge remote-tracking branch 'origin/B-21934-main' into B-21934-int2
deandreJones Jan 23, 2025
3853b1c
fix dup id
deandreJones Jan 23, 2025
5b9f7ec
Merge remote-tracking branch 'origin/B-21934-main' into B-21934-int2
deandreJones Jan 23, 2025
637cdab
add logging to ecs deploy script
traskowskycaci Jan 23, 2025
cf6ac4c
Revert "add logging to ecs deploy script"
traskowskycaci Jan 23, 2025
3200c4e
add max, fix standards
deandreJones Jan 23, 2025
21612c9
Merge remote-tracking branch 'origin/B-21934-main' into B-21934-int2
deandreJones Jan 23, 2025
07cb5cf
Merge branch 'B-21934-int' of https://github.com/transcom/mymove into…
deandreJones Jan 23, 2025
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
2 changes: 2 additions & 0 deletions migrations/app/migrations_manifest.txt
Original file line number Diff line number Diff line change
Expand Up @@ -1073,6 +1073,8 @@
20241230190647_add_missing_AK_zips_to_zip3_distances.up.sql
20250103130619_revert_data_change_for_gbloc_for_ak.up.sql
20250103180420_update_pricing_proc_to_use_local_price_variable.up.sql
20250106153750_admin_weight_restriction.up.sql
20250106190758_admin_weight_restriction_convert_bool.up.sql
20250110001339_update_nts_release_enum_name.up.sql
20250110153428_add_shipment_address_updates_to_move_history.up.sql
20250110214012_homesafeconnect_cert.up.sql
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
ALTER TABLE entitlements
ADD COLUMN IF NOT EXISTS admin_restricted_weight_location BOOLEAN;
Copy link
Contributor

Choose a reason for hiding this comment

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

Recommending remove this boolean column and instead basing whether or not the entitlement is restricted based on entitlements.weight_restriction being null or not null.

Reason for recommendation is because this bool column would just be storing whether or not weight restriction is null or not and also we end up with the possibility of true weight restriction without any integer provided

Screen.Recording.2025-01-23.at.8.59.38.AM.mov

Screenshot 2025-01-23 at 9 00 48 AM
Screenshot 2025-01-23 at 9 01 11 AM

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Thinking.. im going to read up on the feature and weigh the pros/cons

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@transcom/mountain-movers would also love others thoughts on this

Copy link
Contributor

Choose a reason for hiding this comment

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

I wouldn't be opposed to just enforcing the constraight of if bool true that weight restriction int must also be present - but we'll want some method of enforcing that a restriction exists

Copy link
Contributor Author

Choose a reason for hiding this comment

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

actually.. I don't hate it.. refactoring now

Copy link
Contributor Author

Choose a reason for hiding this comment

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

ill just remove that column and variable, and the UI will read from the weightRestriction value being null or not
and if they check it.. they have to enter a value

Copy link
Contributor

Choose a reason for hiding this comment

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

Yeah I agree with this approach! Nice catch Cam!

Copy link
Contributor

Choose a reason for hiding this comment

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

Also agree! Seems clean

Copy link
Contributor Author

Choose a reason for hiding this comment

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

done - give it a re-review
I do like this much better

Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
ALTER TABLE entitlements
ALTER COLUMN admin_restricted_weight_location TYPE boolean USING (COALESCE(admin_restricted_weight_location, false)),
ALTER COLUMN admin_restricted_weight_location SET DEFAULT false,
ALTER COLUMN admin_restricted_weight_location SET NOT NULL;
74 changes: 68 additions & 6 deletions pkg/gen/ghcapi/embedded_spec.go

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

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

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

7 changes: 7 additions & 0 deletions pkg/gen/ghcmessages/counseling_update_allowance_payload.go

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

8 changes: 8 additions & 0 deletions pkg/gen/ghcmessages/entitlements.go

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

7 changes: 7 additions & 0 deletions pkg/gen/ghcmessages/update_allowance_payload.go

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

20 changes: 20 additions & 0 deletions pkg/gen/primeapi/embedded_spec.go

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

8 changes: 8 additions & 0 deletions pkg/gen/primemessages/entitlements.go

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

Loading
Loading