Skip to content

Commit

Permalink
Merge branch 'main' into B-21583-gbloc-AK-moves
Browse files Browse the repository at this point in the history
  • Loading branch information
pambecker authored Jan 15, 2025
2 parents 346a838 + eb1960b commit 6f4aa0f
Show file tree
Hide file tree
Showing 75 changed files with 3,859 additions and 317 deletions.
1 change: 1 addition & 0 deletions migrations/app/migrations_manifest.txt
Original file line number Diff line number Diff line change
Expand Up @@ -1047,6 +1047,7 @@
20241122155416_total_dependents_calculation.up.sql
20241122220314_create_port_and_port_location_test_data.up.sql
20241126222026_add_sort_column_to_re_service_items.up.sql
20241127125545_add_excess_ub_weight_columns_to_move.up.sql
20241127133504_add_indexes_speed_up_counseling_offices.up.sql
20241202163059_create_test_sequence_dev_env.up.sql
20241203024453_add_ppm_max_incentive_column.up.sql
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
-- enable tracking of the timestamp a move with ub shipments are at risk of excess, as well as
-- the timestamp of when an office user dismisses the notification

ALTER TABLE moves ADD COLUMN IF NOT EXISTS excess_unaccompanied_baggage_weight_qualified_at timestamp with time zone;
ALTER TABLE moves ADD COLUMN IF NOT EXISTS excess_unaccompanied_baggage_weight_acknowledged_at timestamp with time zone;

COMMENT ON COLUMN moves.excess_unaccompanied_baggage_weight_qualified_at IS 'The date and time the sum of all the move''s unaccompanied baggage shipment weights met or exceeded the excess unaccompanied baggage weight qualification threshold.';
COMMENT ON COLUMN moves.excess_unaccompanied_baggage_weight_acknowledged_at IS 'The date and time the TOO dismissed the risk of excess unaccompanied baggage weight alert.';
5 changes: 5 additions & 0 deletions pkg/gen/ghcapi/configure_mymove.go
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,11 @@ func configureAPI(api *ghcoperations.MymoveAPI) http.Handler {
// You may change here the memory limit for this multipart form parser. Below is the default (32 MB).
// order.UploadAmendedOrdersMaxParseMemory = 32 << 20

if api.OrderAcknowledgeExcessUnaccompaniedBaggageWeightRiskHandler == nil {
api.OrderAcknowledgeExcessUnaccompaniedBaggageWeightRiskHandler = order.AcknowledgeExcessUnaccompaniedBaggageWeightRiskHandlerFunc(func(params order.AcknowledgeExcessUnaccompaniedBaggageWeightRiskParams) middleware.Responder {
return middleware.NotImplemented("operation order.AcknowledgeExcessUnaccompaniedBaggageWeightRisk has not yet been implemented")
})
}
if api.OrderAcknowledgeExcessWeightRiskHandler == nil {
api.OrderAcknowledgeExcessWeightRiskHandler = order.AcknowledgeExcessWeightRiskHandlerFunc(func(params order.AcknowledgeExcessWeightRiskParams) middleware.Responder {
return middleware.NotImplemented("operation order.AcknowledgeExcessWeightRisk has not yet been implemented")
Expand Down
159 changes: 159 additions & 0 deletions pkg/gen/ghcapi/embedded_spec.go

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

12 changes: 12 additions & 0 deletions pkg/gen/ghcapi/ghcoperations/mymove_api.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.

Loading

0 comments on commit 6f4aa0f

Please sign in to comment.